Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

告警消除页面审批人修改



See merge request !488

@@ -120,4 +120,8 @@
 .detail_comments_title{
     text-align: left;
     padding-bottom: 10px;
+}
+.update-icon{
+    cursor: pointer;
+    color:#409EFF;
 }
\ No newline at end of file

@@ -106,7 +106,8 @@
                         clearable
                 />
             </span>
-            <span class="title-handle-per"  v-if="!isExamine">审批人：{{approverName}} <el-button  v-if="!isExamine" type="primary" @click="showUserDialog(true)" size="small">选择审批人</el-button>
+            <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>
+<!--                <el-button  v-if="!isExamine" type="primary" @click="showUserDialog(true)" size="small">选择审批人</el-button>-->
             </span>
             <span class="title-handle-per"  v-if="!isExamine">时间：{{dateTime}}</span>
         </div>
@@ -169,7 +170,7 @@
         <el-button type="primary" @click="saveDetail(3)" v-if="isExamine" size="small">不通过</el-button>
         <el-button @click="cancleBtn"  size="small">取消</el-button>
     </div>
-    <cm-userright title="审批人" :titles="titles" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
+    <cm-userright  title="审批人(不支持多人，多选默认取第一个人)" :titles="titles" :showRole="false" :showGroup="false" :showDialogVisible="showUserDialogVisible" :selectedArr="userFileRight" :userArr="userList" :isUser="false" :showOrg="false" @callback="selectUser"
                   @hideDialog="showUserDialog"></cm-userright>
     <!--关键字提取列表-->
     <cm-dialog :title="title" width="60%" :showDialogVisible="dialogVisible" :showFooter="true" @okfunc="okfunc" @hidedialog="closeDetail" :showOkBtn="true">

@@ -22,6 +22,7 @@ export default {
         //审批人
         let approver=Vue.ref('');
         let approverName=Vue.ref('admin');
+        let approverLabel=Vue.ref('admin');
         //操作人
         let loginName=Vue.ref('');
         let options=Vue.ref([{value:'001',name:'admin'},{value:'002',name:'root'}])
@@ -59,7 +60,6 @@ export default {
                 aralmid:alarmInfo.id,//告警id
                 // manageTime:dateTime.value,//处理时间
                 // manageName:loginName.value,//处理人
-                // repositoryId:repositoryId.value,//引用知识库id
                 repositoryInto:repositoryInto.value,//是否入知识库 1入，0不入
                 citeCover:citeCover.value?1:0,//引用是否覆盖 0 未覆盖 1已覆盖
                 reason:reason.value,//消除原因
@@ -70,6 +70,10 @@ export default {
             if(opinion.value){
                 params.opinion=opinion.value;//审批意见
             }
+            if(repositoryId.value){
+                params.repositoryId=repositoryId.value;//引用知识库id
+
+            }
             proxy.$http.post(`/api-web/bAlarmManage/clearAlarm`, params, function (res) {
                 if (res && res.code == 0) {
                     proxy.$global.showMsg(res.msg, 'success');
@@ -86,7 +90,7 @@ export default {
 
         //关键字标签
         const inputValue = Vue.ref('')
-        const dynamicTags = Vue.ref(['Tag 1', 'Tag 2', 'Tag 3'])
+        const dynamicTags = Vue.ref(['服务器', '虚拟机'])
         const inputVisible = Vue.ref(false)
 
         //tag标签
@@ -232,7 +236,7 @@ export default {
                 // if (arr && arr.length > 0) {
                 //     showUserDialogVisible.value = flg;
                 // }
-                getUserList();
+                // getUserList();
                 showUserDialogVisible.value = flg;
 
             } else {
@@ -244,8 +248,12 @@ export default {
             let userIds = userObj.user.map(function (v) {
                 return v.username;
             });
+            let userNames = userObj.user.map(function (v) {
+                return v.nickname;
+            });
             console.log("userIds",userObj)
-            approverName.value=userIds.join(',')
+            approverName.value=userIds[0];
+            approverLabel.value=userNames[0];
 
         }
 
@@ -394,13 +402,15 @@ export default {
                 if (res && res.code == 0) {
                     let data=res.object;
                     if(data){
-                        approverName.value=data.adminName;
+                        approverName.value=data.admin;
+                        approverLabel.value=data.adminName;
                     }
                 }
             })
         }
         // 挂载完
         Vue.onMounted(() => {
+            getUserList();
             //定时器每秒调用一次fnDate()
             timer.value=setInterval(function(){
                 getDateTime();
@@ -411,7 +421,7 @@ export default {
             timer.value=null;
         })
         return {
-            change,changetext,saveDetail,approver,approverName,loginName,detailText,detail,repositoryInto,reason,citeCover,alarmType,
+            change,changetext,saveDetail,approver,approverName,approverLabel,loginName,detailText,detail,repositoryInto,reason,citeCover,alarmType,
             options,inputValue,dynamicTags,inputVisible,handleClose,showInput,handleInputConfirm,
             getKeyword, timer,dateTime,getDateTime,timeFormat,
             title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,