Merge branch 'master-v32-xwx' into 'master'

故障诊断优化 See merge request !829

Merge branch 'master-v32-xwx' into 'master'
故障诊断优化 See merge request !829
王涛
Commit 9eb9d54555370d6a1de850c256a764218b2e4ef8 2 parents fc7ad3e3 f4885823
Showing 5 changed files with 32 additions and 16 deletions
hg-monitor-web-zj/src/main/resources/static/src/style/img/fault/apm/apmCard.png
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/index.js
--- a/hg-monitor-web-zj/src/main/resources/static/src/style/img/fault/apm/apmCard.png
View file @9eb9d54
+++ b/hg-monitor-web-zj/src/main/resources/static/src/style/img/fault/apm/apmCard.png
View file @9eb9d54
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @9eb9d54
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @9eb9d54
@@ -60,12 +60,12 @@
             <el-empty  :image-size="50" />
         </div>
         <div v-else v-for="item in cardData" style="width: 50%;overflow: hidden;">
-            <div style="width: 566px;min-height: 357px;background: url('../src/style/img/fault/apm/apmCard.png') no-repeat;background-size: 100% 100%;margin: 0px 0px 26px 90px;box-sizing: border-box;text-align: center;margin: 0 auto;padding-top: 65px">
+            <div style="width: 453px;min-height: 286px;;background: url('../src/style/img/fault/apm/apmCard.png') no-repeat;background-size: 100% 100%;margin: 0px 0px 26px 90px;box-sizing: border-box;text-align: center;margin: 0 auto;padding-top: 50px">
                 <div style="color: #ffffff;font-size: 24px;">{{item.resClassName}}</div>
-                <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 30px;">
-                <div style="padding-top: 30px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass,'应用')">{{item.applicationName}}</span></div>
+                <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 12px;">
+                <div style="padding-top: 10px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass,'应用')">{{item.applicationName}}</span></div>
                 <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1>
-                <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;">
+                <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 16px;">
                     <div style="width: 230px;display: flex;align-self: center;align-items:center;">
                         <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
                         <span style="margin: 0px 6px;width: 133px;">响应时间告警量:</span>
@@ -77,7 +77,7 @@
                         <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.FullGcNum}}</span>
                     </div>
                 </div>
-                <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 76px;font-size: 18px;">
+                <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 16px;">
                     <div style="width: 230px;display: flex;align-self: center;align-items:center;">
                         <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
                         <span style="margin: 0px 6px;width: 133px;">线程总数告警量:</span>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @9eb9d54
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @9eb9d54
@@ -41,7 +41,7 @@
             <div style="width: 200px;margin-left: 40px;display: flex;align-self: center;color: red;align-items: center;">
                 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 告警</span>
-                <h style="font-size: 24px;color: red;" class="text-link" @click="openAlarm()">{{getFaultItemValue(cardList,'alarm')}}</h>
+                <h style="font-size: 24px;color: red;" class="text-link" @click="openAlarm('')">{{getFaultItemValue(cardList,'alarm')}}</h>
             </div>
         </div>
     </div>
@@ -52,14 +52,26 @@
 </div>
 <div v-if="cardOpen"
      style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 330px;overflow-y: auto;">
-    <div v-for="item in dialTest" style="width: 25%">
+    <div v-for="item in dialTest">
         <div style="min-width: 338px;height: 160px;background: url(../src/style/img/fault/base/bg.png) no-repeat;background-size: 100% 100%;padding-top: 10px;">
             <el-row style="height: 70px;padding: 10px 30px;">
                 <el-col :span="4" style="line-height: 55px;">
-                    <img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+item.health+'.png'">
+                    <el-tooltip
+                            placement="top-start">
+                        <template #content>
+                            {{item.resTypeName}}
+                        </template>
+                        <img :src="'../src/style/img/fault/base/base-'+item.resClass+'-'+item.health+'.png'">
+                    </el-tooltip>
                 </el-col>
                 <el-col :span="16" style="color: #666666;">
-                    <div class="text-overflow" style="font-size: 16px">{{item.resName}}</div>
+                    <el-tooltip
+                            placement="top-start">
+                        <template #content>
+                            {{item.resName}}
+                        </template>
+                        <div class="text-overflow" style="font-size: 16px">{{item.resName}}</div>
+                    </el-tooltip>
                     <div style="font-size: 14px">IP地址：{{item.ipAddr}}</div>
                 </el-col>
                 <el-col :span="4" class="align-right">
@@ -123,7 +135,7 @@
                     <img src="../src/style/img/fault/base/men.png"><br/>
                     {{item.men}}{{item.menUnit}}
                 </el-col>
-                <el-col :span="5" class="align-center">
+                <el-col :span="5" class="text-link align-center" @click="openAlarm(item.resId)">
                     <img src="../src/style/img/fault/base/alarm.png"><br/>
                     {{item.alarm}}
                 </el-col>
@@ -159,7 +171,7 @@
                 <el-col :span="1" class="align-center">
                     <img src="../src/style/img/fault/base/alarm.png">
                 </el-col>
-                <el-col :span="3" class="align-center">
+                <el-col :span="3" class="text-link align-center" @click="openAlarm(item.resId)">
                     {{item.alarm}}
                 </el-col>
                 <el-col :span="8" style="line-height: 36px;color: gainsboro;">
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.js
View file @9eb9d54
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.js
View file @9eb9d54
@@ -65,11 +65,12 @@ export default {
                     cpuUnit:'',
                     menUnit:'',
                     kpiId:'',
-                    resId:''
+                    resId:'',
+                    resTypeName:''
                 }
                 for (let j = 0; j < data[i].length; j++) {
                     resItem.resName=data[i][j].resName;
-                    resItem.kpiId=data[i][j].kpiId;
+                    resItem.resTypeName=data[i][j].resTypeName;
                     resItem.resId=data[i][j].resId;
                     resItem.ipAddr=data[i][j].ipAddr;
                     resItem.alarm=data[i][j].alarmNum;
@@ -79,9 +80,11 @@ export default {
                     if (data[i][j].kpiId=='KPI31CB8D97'){
                         resItem.men=data[i][j].diagnosisResult;
                         resItem.menUnit=data[i][j].unit;
+                        resItem.kpiId=data[i][j].kpiId;
                     }else if (data[i][j].kpiId=='KPI7054BC34'){
                         resItem.cpu=data[i][j].diagnosisResult;
                         resItem.cpuUnit=data[i][j].unit;
+                        resItem.kpiId=data[i][j].kpiId;
                     }else if (data[i][j].kpiId=='KPIE13DD9A3'||data[i][j].kpiId=='KPI4DA976AF'){
                         resItem.linkState=data[i][j].diagnosisResult;
                         resItem.kpiName=data[i][j].kpiName;
@@ -103,12 +106,13 @@ export default {
                 alarmColor.value = '#ff0000';
             }
         }
-        const openAlarm = () => {
+        const openAlarm = (resId) => {
             service.sendEventAlarmDialog(props.parentEmit, {
                 cardList: props.cardList,
                 targetType: targetType,
                 faultNo: faultNo,
-                resClass:resClass
+                resClass:resClass,
+                resId:resId
             });
         }
         const openMoreDialog = () => {
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/index.js
View file @9eb9d54
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/index.js
View file @9eb9d54
@@ -153,7 +153,7 @@ export default {
                     let title = `${row.faultBody}（${row.faultNo}）诊断报告`;
                     let configId = row.faultconfid;
                     // 设置相信信息
-                    proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"90%","90%")
+                    proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"85%","90%")
                 },
                 render: function (row) {
                     return `<span style="text-decoration: underline;color: blue;">${row.faultBody}</span>`