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

故障诊断诊断项弹框 See merge request !798

Merge branch 'master-v32-xwx' into 'master'
故障诊断诊断项弹框 See merge request !798
王涛
Commit 5ee44fc6777784a9c9619089ec6d2c3992c3ffa5 2 parents 2cf74c2a c140af98
Showing 11 changed files with 55 additions and 31 deletions
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/apm/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.js
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/components/page/faultDiagnosis/result/npm/index.html
hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/service.js
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.html
View file @5ee44fc
 <div v-model="dialTest">
     <div class="d-flex">
-        <img src="../src/style/img/fault/apm.gif">
+        <img src="../src/style/img/fault/apm.gif" style="object-fit: contain">
         <h3 style="margin-left: 10px;color: #666666;font-size: 18px">APM</h3>
         <div style="width: calc(100% - 200px);line-height: 54px;font-size: 14px" class="align-right">
             <a class="m-r-20"  v-if="card && card.length > 0" @click="openMoreDialog">更多</a>
@@ -27,20 +27,20 @@
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
+                    <h class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h class="text-link" style="font-size: 24px">{{getFaultItemValue(dialTest,'normal')}}</h>
+                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h class="text-link" style="font-size: 24px">{{getFaultItemValue(dialTest,'abnormal')}}</h>
+                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
                 </div>
             </div>
         </div>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/apm/index.js
View file @5ee44fc
@@ -115,6 +115,10 @@ export default {
         const openKpiList = () => {
             service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
         }
+        //诊断项（正常、异常）
+        const openDiagnosticItem = (type) => {
+            service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
+        }
         // 挂载完
         Vue.onMounted(() => {
             getNpmList();
@@ -134,7 +138,8 @@ export default {
             openAlarm,
             getFaultItemValue: service.getFaultItemValue,
             openBusScenarios,
-            openKpiList
+            openKpiList,
+            openDiagnosticItem
         }
     }
 }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.html
View file @5ee44fc
 <div v-model="dialTest">
     <div class="d-flex">
-        <img src="../src/style/img/fault/dialtest.gif">
+        <img src="../src/style/img/fault/dialtest.gif" style="object-fit: contain">
         <h3 style="margin-left: 10px;color: #666666;font-size: 18px">业务拨测</h3>
         <div style="line-height: 60px;" class="m-l-6">
             <el-tooltip
@@ -38,14 +38,14 @@
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
-                    <h class="text-link">{{ getFaultItemValue(dialTest,'diagnosticItem') }}</h>
+                    <h class="text-link" @click="openDiagnosticItem('')">{{ getFaultItemValue(dialTest,'diagnosticItem') }}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px;">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h class="text-link" style="font-size: 24px"@click="openDiagnosticItem('normal')" >{{ getFaultItemValue(dialTest,'normal')}}</h>
+                    <h class="text-link" style="font-size: 24px" @click="openDiagnosticItem('normal')">{{ getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/dialtest/index.js
View file @5ee44fc
@@ -102,6 +102,7 @@ export default {
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, card.value);
         }
+        //诊断项（正常、异常）
         const openDiagnosticItem = (type) => {
             service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
         }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.html
View file @5ee44fc
 <div>
     <div class="d-flex">
-        <img src="../src/style/img/fault/base.gif">
+        <img src="../src/style/img/fault/base.gif" style="object-fit: contain">
         <h3 style="margin-left: 10px;color: #666666;font-size: 18px">基础资源</h3>
         <div style="line-height: 60px;" class="m-l-6">
             <el-tooltip
@@ -37,20 +37,20 @@
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断项</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
+                    <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 22px;height: 22px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h style="font-size: 24px" class="text-link">{{getFaultItemValue(dialTest,'normal')}}</h>
+                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png"style="width: 22px;height: 22px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h style="font-size: 24px" class="text-link">{{getFaultItemValue(dialTest,'abnormal')}}</h>
+                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
                 </div>
             </div>
         </div>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/index.js
View file @5ee44fc
@@ -90,6 +90,12 @@ export default {
         const openKpiList = () => {
             service.sendEventDiagnoseKpiList(emit, props.faultNo, props.targetType.toLocaleLowerCase());
         }
+
+        //诊断项（正常、异常）
+        const openDiagnosticItem = (type) => {
+            service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
+        }
+
         // 挂载完
         Vue.onMounted(() => {
             getDialtestList();
@@ -107,7 +113,8 @@ export default {
             openKpiList,
             faultNo,
             targetType,
-            parentEmit: emit
+            parentEmit: emit,
+            openDiagnosticItem
         }
     }
 }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.html
View file @5ee44fc
@@ -22,20 +22,20 @@
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                 <img src="../src/style/img/fault/disItem.png">
                 <span style="margin: 0px 6px 0px 6px;width: 105px">诊断项</span>
-                <h class="text-link">{{getFaultItemValue(cardList,'diagnosticItem')}}</h>
+                <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(cardList,'diagnosticItem')}}</h>
             </div>
         </div>
         <div style="text-align: left;display: flex;margin-top: 10px;">
             <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
                 <img src="../src/style/img/fault/success.png" style="width:22px;height: 22px;">
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;">正常</span>
-                <h style="font-size: 20px" class="text-link">{{getFaultItemValue(cardList,'normal')}}</h>
+                <h style="font-size: 20px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(cardList,'normal')}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
                 <img src="../src/style/img/fault/error.png" style="width:22px;height: 22px;">
                 <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px;"> 异常</span>
-                <h style="font-size: 24px" class="text-link">{{getFaultItemValue(cardList,'abnormal')}}</h>
+                <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(cardList,'abnormal')}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red">
@@ -46,7 +46,7 @@
         </div>
     </div>
     <div class="align-center" style="flex: 1;text-align: right;margin-right: 80px;">
-        <a class="m-r-20" v-if="cardList.faultFixInfoList && cardList.faultFixInfoList.length > 0"  @click="openOrCloseNpm()">更多</a>
+        <a class="m-r-20" v-if="cardList.faultFixInfoList && cardList.faultFixInfoList.length > 0"  @click="openMoreDialog()">更多</a>
         <a v-model="cardName" v-if="cardList.faultFixInfoList && cardList.faultFixInfoList.length > 0" @click="openOrCloseCard()">{{cardName}}</a>
     </div>
 </div>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/item/resItem/index.js
View file @5ee44fc
@@ -102,7 +102,7 @@ export default {
             });
         }
         const openMoreDialog = () => {
-            service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList);
+            service.sendEventMoreDialog(props.parentEmit, proxy.$global, props.cardList.faultFixInfoList);
         }
         //诊断资源
@@ -130,6 +130,11 @@ export default {
             service.sendEventDiagnoseKpiList(props.parentEmit, faultNo,targetType);
         }
+        //诊断项（正常、异常）
+        const openDiagnosticItem = (type) => {
+            service.sendEventNormalDialog(props.parentEmit, proxy.$global, faultNo, targetType, resClass,type);
+        }
+
         // 挂载完
         Vue.onMounted(() => {
             let cardList = props.cardList;
@@ -150,7 +155,8 @@ export default {
             targetType,
             openBusScenarios,
             openKpiList,
-            resClass
+            resClass,
+            openDiagnosticItem
         }
     }
 }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.html
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.html
View file @5ee44fc
 <div v-model="dialTest">
     <div class="d-flex">
-        <img src="../src/style/img/fault/npm.gif">
+        <img src="../src/style/img/fault/npm.gif" style="object-fit: contain">
         <h3 style="margin-left: 10px;color: #666666;font-size: 18px">NPM</h3>
         <div style="line-height: 60px;" class="m-l-6">
             <el-tooltip
@@ -38,20 +38,20 @@
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disItem.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px"> 诊断项</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
+                    <h class="text-link" @click="openDiagnosticItem('')">{{getFaultItemValue(dialTest,'diagnosticItem')}}</h>
                 </div>
             </div>
             <div style="text-align: left;display: flex;margin-top: 10px;">
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #75af49;">
                     <img src="../src/style/img/fault/success.png" style="width: 20px;height: 20px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px">正常</span>
-                    <h style="font-size: 24px" class="text-link">{{getFaultItemValue(dialTest,'normal')}}</h>
+                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('normal')">{{getFaultItemValue(dialTest,'normal')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #febb1a;">
                     <img src="../src/style/img/fault/error.png" style="width: 20px;height: 20px">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;font-size: 16px"> 异常</span>
-                    <h style="font-size: 24px" class="text-link">{{getFaultItemValue(dialTest,'abnormal')}}</h>
+                    <h style="font-size: 24px" class="text-link" @click="openDiagnosticItem('abnormal')">{{getFaultItemValue(dialTest,'abnormal')}}</h>
                 </div>
             </div>
         </div>
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/faultDiagnosis/result/npm/index.js
View file @5ee44fc
@@ -113,6 +113,10 @@ export default {
         const openKpiList = () => {
             service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
         }
+        //诊断项（正常、异常）
+        const openDiagnosticItem = (type) => {
+            service.sendEventNormalDialog(emit, proxy.$global, props.faultNo, props.targetType.toLocaleLowerCase(), '',type);
+        }
         // 挂载完
         Vue.onMounted(() => {
@@ -132,7 +136,8 @@ export default {
             getFaultItemValue: service.getFaultItemValue,
             openBusScenarios,
             openKpiList,
-            openResPonse
+            openResPonse,
+            openDiagnosticItem
         }
     }
 }
--- a/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/service.js
View file @5ee44fc
+++ b/hg-monitor-web-zj/src/main/resources/static/vue3/src/views/faultDiagnosis/result/service.js
View file @5ee44fc
@@ -346,16 +346,17 @@ const faultEvent = () => {
         //     return;
         // }
-        var title = type == 'normal' ? '诊断项(正常)' : '诊断项(异常)';
-        if (!title) {
-            title = '更多';
+        var title ='';
+        if (type=='') {
+            title = '诊断项';
+        }else {
+            title = type == 'normal' ? '诊断项(正常)' : '诊断项(异常)';
         }
         var obj = {
             title: title,
             columns: [{
-                prop: 'taskName',
-                width: 120,
+                prop: 'name',
                 label: '名称',
             }, {
                 prop: 'kpiName',
@@ -388,7 +389,7 @@ const faultEvent = () => {
         // 正常
         if (type == 'normal') {
             isAbnormal = 0;
-        } else {
+        } else if(type == 'abnormal'){
             isAbnormal = 1;
         }
@@ -406,7 +407,6 @@ const faultEvent = () => {
             }
         });
-        emit('openDialog', 'more', {}, obj);
     }
     /**