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

告警处理知识库详情页面优化



See merge request !541

@@ -137,6 +137,8 @@
 .detail_comments_title{
 .detail_comments_title{
     text-align: left;
     text-align: left;
     padding-bottom: 10px;
     padding-bottom: 10px;
+    width: 86%;
+    float: left;
 }
 }
 .update-icon,.more-style{
 .update-icon,.more-style{
     cursor: pointer;
     cursor: pointer;
@@ -168,7 +170,6 @@
 }
 }
 .clearDetail-handlePer{
 .clearDetail-handlePer{
     padding:10px 0;
     padding:10px 0;
-    color:#999999;
 }
 }
 .editor{
 .editor{
     text-align: left;
     text-align: left;

 <div class="clearDetail-container">
 <div class="clearDetail-container">
-    <div class="clearDetail-title">消除原因:{{handleInfoObj.reason}}</div>
-    <div class="clearDetail-handlePer">
-        <div class="handlePer-left">
-            <span>处理人：{{handleInfoObj.managenameName}}</span>
-        </div>
-        <div>
-            <span>处理时间：{{handleInfoObj.managetime}}</span>
-        </div>
-        <div class="handlePer-left">
-            <span>审批人：{{handleInfoObj.approverName}}</span>
-        </div>
-    </div>
     <div class="info-title">
     <div class="info-title">
-        <span>告警信息</span>
+        <span style="font-weight:bold">告警信息</span>
         <span>告警编号：{{alarmInfo.alarmNo}}</span>
         <span>告警编号：{{alarmInfo.alarmNo}}</span>
     </div>
     </div>
     <div class="info-content">
     <div class="info-content">
         <div class="info-content-body">
         <div class="info-content-body">
-            <div class="content-title">告警主体</div>
             <div class="content-body-info">
             <div class="content-body-info">
                 <div class="info-item">
                 <div class="info-item">
                     资源名称：{{alarmInfo.resName}}
                     资源名称：{{alarmInfo.resName}}
@@ -37,13 +24,6 @@
                 <div class="info-item">
                 <div class="info-item">
                     指标标识：{{alarmInfo.flag}}
                     指标标识：{{alarmInfo.flag}}
                 </div>
                 </div>
-            </div>
-        </div>
-    </div>
-    <div class="info-content">
-        <div class="info-content-body">
-            <div class="content-title">告警信息</div>
-            <div class="content-body-info">
                 <div class="info-item">
                 <div class="info-item">
                     告警级别：<sapn>{{alarmInfo.alarmLevel==1?'一般':alarmInfo.alarmLevel==2?'重要':'严重'}}</sapn>
                     告警级别：<sapn>{{alarmInfo.alarmLevel==1?'一般':alarmInfo.alarmLevel==2?'重要':'严重'}}</sapn>
                 </div>
                 </div>
@@ -65,22 +45,37 @@
                 <div class="info-item">
                 <div class="info-item">
                     告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
                     告警次数：{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
                 </div>
                 </div>
-                <!--    <div class="info-item">
-                        实际告警值：{{alarmInfo.kpiValue}}
-                    </div>-->
+                <div class="info-item">通知人：{{alarmInfo.nickName}}</div>
+                <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
 
 
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
+    <div class="info-title">
+        <span style="font-weight:bold">知识信息</span>
+    </div>
     <div class="info-content">
     <div class="info-content">
         <div class="info-content-body">
         <div class="info-content-body">
             <div class="content-body-info">
             <div class="content-body-info">
-                <div class="info-item-notice">通知信息：{{alarmInfo.alarmContent}}</div>
-                <div class="info-item-notice">通知人：{{alarmInfo.nickName}}</div>
-
+                <div class="info-item">
+                    <span>处理人：{{handleInfoObj.managenameName}}</span>
+                </div>
+                <div class="info-item">
+                    <span>处理时间：{{handleInfoObj.managetime}}</span>
+                </div>
+                <div class="info-item">
+                    <span>消除原因：{{handleInfoObj.reason}}</span>
+                </div>
+                <div class="info-item">
+                    <span>审批人：{{handleInfoObj.approverName}}</span>
+                </div>
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>
+
+    <div class="info-title">
+        <span style="font-weight:bold">处理方案</span>
+    </div>
     <div class="clearDetail-pcontent" v-html="handleInfoObj.pcontent">
     <div class="clearDetail-pcontent" v-html="handleInfoObj.pcontent">
         图文信息{{handleInfoObj.pcontent}}
         图文信息{{handleInfoObj.pcontent}}
     </div>
     </div>

@@ -35,14 +35,9 @@ export default {
                     let data = res.object;
                     let data = res.object;
                     if (data) {
                     if (data) {
                         alarmInfo.value = data;
                         alarmInfo.value = data;
-                        // if (alarmInfo.value.approver) {
-                        //     approverName.value = alarmInfo.value.approver;
-                        //     userList.value.map(item => {
-                        //         if (item.userName == alarmInfo.value.approver) {
-                        //             approverLabel.value = item.nickname;
-                        //         }
-                        //     })
-                        // }
+                        if( alarmInfo.value.busTypeName==null || alarmInfo.value.busTypeName==''){
+                            alarmInfo.value.busTypeName="暂未绑定业务"
+                        }
                     }
                     }
                 }
                 }
             })
             })

@@ -130,7 +130,12 @@
         </div>
         </div>
     </div>
     </div>
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
     <div class="detail_comments"  v-if="isExamine && ((status==3 || (status==1  && !isView)) || status==2) ">
-        <div class="detail_comments_title">审核意见</div>
+        <div>
+            <div class="detail_comments_title">审核意见</div>
+            <span>快捷输入：</span>
+            <el-tag  class="ml-2"  type="success" size="small" style="cursor:pointer; margin-right: 5px" @click="onInput(true)">同意</el-tag>
+            <el-tag  class="ml-2"  type="danger" size="small" style=" cursor:pointer;"  @click="onInput(false)">不同意</el-tag>
+        </div>
 
 
         <el-input
         <el-input
                 v-if="status==1 && approverName==loginName && !isView"
                 v-if="status==1 && approverName==loginName && !isView"

@@ -480,6 +480,14 @@ export default {
             })
             })
 
 
         }
         }
+        //快捷输入是否同意
+        let onInput=(val)=>{
+            if (val){
+                opinion.value="同意"
+            }else {
+                opinion.value="不同意"
+            }
+        }
         Vue.onUnmounted(()=>{
         Vue.onUnmounted(()=>{
             timer.value=null;
             timer.value=null;
         })
         })
@@ -490,7 +498,7 @@ export default {
             title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
             title, dialogVisible, height, dataList, columns, closeDetail,okfunc, getPage,selectionChange,dynamicTagsAppend,
             showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,buttonTexts,
             showUserDialog,showUserDialogVisible,userFileRight,userList,selectUser,getUserList,titles,buttonTexts,
             getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
             getAlarmInfo,alarmInfo,cascaderValue,propsTrigger,handleChange,cascaderOptions,noticeFlag,
-            getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmIdVal
+            getUserByToken,getUser,cancleBtn,repositoryInfo,repositoryId,opinion,getAlarmStatis,handleInfoObj,alarmIdVal,onInput
         }
         }
     }
     }