monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit c474a79bf357fbbaac103bf07c5d561b7271ab6e 1 parent 88c8fc09

告警消除页面审批人修改

Inline Side-by-side
Showing 3 changed files with 15 additions and 4 deletions
@@ -120,4 +120,8 @@ @@ -120,4 +120,8 @@
120 .detail_comments_title{ 120 .detail_comments_title{
121 text-align: left; 121 text-align: left;
122 padding-bottom: 10px; 122 padding-bottom: 10px;
  123 +}
  124 +.update-icon{
  125 + cursor: pointer;
  126 + color:#409EFF;
123 } 127 }
@@ -106,7 +106,8 @@ @@ -106,7 +106,8 @@
106 clearable 106 clearable
107 /> 107 />
108 </span> 108 </span>
109 - <span class="title-handle-per" v-if="!isExamine">审批人：{{approverName}} <el-button v-if="!isExamine" type="primary" @click="showUserDialog(true)" size="small">选择审批人</el-button> 109 + <span class="title-handle-per" v-if="!isExamine">审批人：<span class="approve-name">{{approverLabel}} <i class="el-icon-edit-outline update-icon" v-if="!isExamine" @click="showUserDialog(true)" ></i></span>
  110 +<!-- <el-button v-if="!isExamine" type="primary" @click="showUserDialog(true)" size="small">选择审批人</el-button>-->
110 </span> 111 </span>
111 <span class="title-handle-per" v-if="!isExamine">时间：{{dateTime}}</span> 112 <span class="title-handle-per" v-if="!isExamine">时间：{{dateTime}}</span>
112 </div> 113 </div>
@@ -22,6 +22,7 @@ export default { @@ -22,6 +22,7 @@ export default {
22 //审批人 22 //审批人
23 let approver=Vue.ref(''); 23 let approver=Vue.ref('');
24 let approverName=Vue.ref('admin'); 24 let approverName=Vue.ref('admin');
  25 + let approverLabel=Vue.ref('admin');
25 //操作人 26 //操作人
26 let loginName=Vue.ref(''); 27 let loginName=Vue.ref('');
27 let options=Vue.ref([{value:'001',name:'admin'},{value:'002',name:'root'}]) 28 let options=Vue.ref([{value:'001',name:'admin'},{value:'002',name:'root'}])
@@ -89,7 +90,7 @@ export default { @@ -89,7 +90,7 @@ export default {
89 90
90 //关键字标签 91 //关键字标签
91 const inputValue = Vue.ref('') 92 const inputValue = Vue.ref('')
92 - const dynamicTags = Vue.ref(['Tag 1', 'Tag 2', 'Tag 3']) 93 + const dynamicTags = Vue.ref(['服务器', '虚拟机'])
93 const inputVisible = Vue.ref(false) 94 const inputVisible = Vue.ref(false)
94 95
95 //tag标签 96 //tag标签
@@ -247,8 +248,12 @@ export default { @@ -247,8 +248,12 @@ export default {
247 let userIds = userObj.user.map(function (v) { 248 let userIds = userObj.user.map(function (v) {
248 return v.username; 249 return v.username;
249 }); 250 });
  251 + let userNames = userObj.user.map(function (v) {
  252 + return v.nickname;
  253 + });
250 console.log("userIds",userObj) 254 console.log("userIds",userObj)
251 approverName.value=userIds[0]; 255 approverName.value=userIds[0];
  256 + approverLabel.value=userNames[0];
252 257
253 } 258 }
254 259
@@ -397,7 +402,8 @@ export default { @@ -397,7 +402,8 @@ export default {
397 if (res && res.code == 0) { 402 if (res && res.code == 0) {
398 let data=res.object; 403 let data=res.object;
399 if(data){ 404 if(data){
400 - approverName.value=data.adminName; 405 + approverName.value=data.admin;
  406 + approverLabel.value=data.adminName;
401 } 407 }
402 } 408 }
403 }) 409 })
@@ -415,7 +421,7 @@ export default { @@ -415,7 +421,7 @@ export default {
415 timer.value=null; 421 timer.value=null;
416 }) 422 })
417 return { 423 return {
418 - change,changetext,saveDetail,approver,approverName,loginName,detailText,detail,repositoryInto,reason,citeCover,alarmType, 424 + change,changetext,saveDetail,approver,approverName,approverLabel,loginName,detailText,detail,repositoryInto,reason,citeCover,alarmType,
419 options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm, 425 options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm,
420 getKeyword, timer,dateTime,getDateTime,timeFormat, 426 getKeyword, timer,dateTime,getDateTime,timeFormat,
421 title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend, 427 title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,