From 559b773a18f8f303e94a924a7aece06c2773dd06 Mon Sep 17 00:00:00 2001
From: xwx <1594082401@qq.com>
Date: Mon, 18 Apr 2022 11:25:20 +0800
Subject: [PATCH] 告警处理知识库详情页面优化

---
 hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.html | 49 ++++++++++++++++++++++---------------------------
 hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.js   | 11 +++--------
 2 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.html b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.html
index da12504..0297332 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.html
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.html
@@ -1,23 +1,10 @@
 <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">
-        <span>告警信息</span>
+        <span style="font-weight:bold">告警信息</span>
         <span>告警编号:{{alarmInfo.alarmNo}}</span>
     </div>
     <div class="info-content">
         <div class="info-content-body">
-            <div class="content-title">告警主体</div>
             <div class="content-body-info">
                 <div class="info-item">
                     资源名称:{{alarmInfo.resName}}
@@ -37,13 +24,6 @@
                 <div class="info-item">
                     指标标识:{{alarmInfo.flag}}
                 </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">
                     告警级别:<sapn>{{alarmInfo.alarmLevel==1?'一般':alarmInfo.alarmLevel==2?'重要':'严重'}}</sapn>
                 </div>
@@ -65,22 +45,37 @@
                 <div class="info-item">
                     告警次数:{{alarmInfo.alarmRepeatCnt?alarmInfo.alarmRepeatCnt:0}} 次
                 </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 class="info-title">
+        <span style="font-weight:bold">知识信息</span>
+    </div>
     <div class="info-content">
         <div class="info-content-body">
             <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 class="info-title">
+        <span style="font-weight:bold">处理方案</span>
+    </div>
     <div class="clearDetail-pcontent" v-html="handleInfoObj.pcontent">
         图文信息{{handleInfoObj.pcontent}}
     </div>
diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.js
index d2d5f54..7657eda 100644
--- a/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.js
+++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/views/alarmsClearEditor/clearDetail/index.js
@@ -35,14 +35,9 @@ export default {
                     let data = res.object;
                     if (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="暂未绑定业务"
+                        }
                     }
                 }
             })
--
libgit2 0.24.0