monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 3773f479db7eafae563470846ff9bcdd6f7c6eea 2 parents 73feba23 cb935325

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 4 changed files with 18 additions and 9 deletions
... ... @@ -79,11 +79,8 @@
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
<el-radio-group v-model="ruleForm.state">
<el-radio :label="1">在职</el-radio>
<el-radio :label="2">离职</el-radio>
</el-radio-group>
<el-form-item label="身份证" prop="idcard" class="form-class">
<el-input v-model="ruleForm.idcard"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
... ... @@ -109,6 +106,17 @@
</el-row>
<el-row :gutter="5">
<el-col :span="8">
<el-form-item label="在职状态" prop="certificate" :readonly="isAdmin()" class="form-class">
<el-radio-group v-model="ruleForm.state">
<el-radio :label="1">在职</el-radio>
<el-radio :label="2">离职</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="5">
<el-col :span="24">
<el-form-item label="获得证书" prop="post" class="form-textarea">
<el-input v-model="ruleForm.certificate" type="textarea"></el-input>
... ...
... ... @@ -226,7 +226,8 @@ export default {
projectId: null,
quitTime: '',
state: '',
tel: ''
tel: '',
idcard:''
})
// 获取表格数据
... ...
... ... @@ -251,7 +251,7 @@ export default {
},
legend: {
data: legendArr,
data: ["80.12.97.3","80.12.97.2"],
itemHeight:0,//图例圆圈大小设置
right: '5%',
top: '5%',
... ... @@ -286,7 +286,7 @@ export default {
},
yAxis: {
type: 'value',
name:'cpu%',
name:'cpu使用率%',
nameTextStyle:{
color:'#ffffff',
padding:[0,0,0,-20]
... ...
... ... @@ -237,7 +237,7 @@ export default {
},
legend: {
data: legendArr,
data: ["80.12.97.7","80.12.97.8"],
itemHeight:0,//图例圆圈大小设置
right: '5%',
top: '5%',
... ...