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

故障诊断诊断业务场景和诊断指标弹框



See merge request !795

@@ -15,13 +15,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/npm/npmLink.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断应用</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
+                    <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
+                    <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">

@@ -92,7 +92,22 @@ export default {
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, card.value);
         }
-
+        //诊断应用
+        const openBusScenarios = () => {
+            let param = [{
+                prop: 'taskName',
+                width: 150,
+                label: '名称',
+            },{
+                prop: 'taskType',
+                width: 120,
+                label: '类型',
+            }]
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+        }
+        const openKpiList = () => {
+            service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
+        }
         // 挂载完
         Vue.onMounted(() => {
             getNpmList();
@@ -110,7 +125,9 @@ export default {
             getDialtestCard,
             openMoreDialog,
             openAlarm,
-            getFaultItemValue: service.getFaultItemValue
+            getFaultItemValue: service.getFaultItemValue,
+            openBusScenarios,
+            openKpiList
         }
     }
 }

@@ -15,14 +15,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disRes.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断业务场景</span>
-
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
+                    <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
-                    <h class="text-link">{{ getFaultItemValue(dialTest,'diagnosticIndicators') }}</h>
+                    <h class="text-link" @click="openKpiList()">{{ getFaultItemValue(dialTest,'diagnosticIndicators') }}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">

@@ -83,6 +83,22 @@ export default {
             });
         }
 
+        const openBusScenarios = () => {
+            let param = [{
+                prop: 'taskName',
+                width: 150,
+                label: '名称',
+            },{
+                prop: 'taskType',
+                width: 120,
+                label: '类型',
+            }]
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+        }
+        const openKpiList = () => {
+            service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
+        }
+
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, card.value);
         }
@@ -102,7 +118,9 @@ export default {
             getDialtestCard,
             cardData,
             openMoreDialog,
-            getFaultItemValue: service.getFaultItemValue
+            openBusScenarios,
+            openKpiList,
+            getFaultItemValue: service.getFaultItemValue,
         }
     }
 }

@@ -15,13 +15,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disRes.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px;">诊断资源</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
+                    <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
+                    <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">

@@ -66,6 +66,23 @@ export default {
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, card.value);
         }
+        //诊断资源
+        const openBusScenarios = () => {
+            let param = [{
+                prop: 'taskName',
+                width: 150,
+                label: '名称',
+            },{
+                prop: 'taskType',
+                width: 120,
+                label: '类型',
+            }]
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+        }
+        //诊断指标
+        const openKpiList = () => {
+            service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
+        }
         // 挂载完
         Vue.onMounted(() => {
             getDialtestList();
@@ -79,7 +96,9 @@ export default {
             openOrCloseBase,
             openMoreDialog,
             openAlarm,
-            getFaultItemValue: service.getFaultItemValue
+            getFaultItemValue: service.getFaultItemValue,
+            openBusScenarios,
+            openKpiList
         }
     }
 }

@@ -64,7 +64,7 @@ export default {
         }
         let getAlarmColor = (cardList) =>{
             if (cardList.alarmLevel = '0'){
-                alarmColor.value = '#05345d';
+                alarmColor.value = '#00A522';
             }else if (cardList.alarmLevel = '1'){
                 alarmColor.value = '#f97d04';
             }else if (cardList.alarmLevel = '2'){
@@ -75,19 +75,18 @@ export default {
         }
         const openAlarm = () => {
             service.sendEventAlarmDialog(emit, {
-                cardList: props.cardList
+                cardList: props.cardList,
+                targetType: props.targetType
             });
         }
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, cardList.faultFixInfoList);
         }
 
-
         // 挂载完
         Vue.onMounted(() => {
             let cardList = props.cardList;
             getAlarmColor(cardList);
-            getDialtestList();
         })
 
         return {

@@ -15,13 +15,13 @@
                 <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/npm/npmLink.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px" >诊断链路场景</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
+                    <h class="text-link" @click="openBusScenarios()">{{getFaultItemValue(dialTest,'diagnosticResources')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">
                     <img src="../src/style/img/fault/disKpi.png">
                     <span style="margin: 0px 6px 0px 6px;width: 105px">诊断指标</span>
-                    <h class="text-link">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
+                    <h class="text-link" @click="openKpiList()">{{getFaultItemValue(dialTest,'diagnosticIndicators')}}</h>
                 </div>
                 |
                 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #666666;font-size: 16px">

@@ -89,6 +89,24 @@ export default {
         const openMoreDialog = () => {
             service.sendEventMoreDialog(emit, proxy.$global, card.value);
         }
+        //诊断链路场景
+        const openBusScenarios = () => {
+            let param = [{
+                prop: 'taskName',
+                width: 150,
+                label: '名称',
+            },{
+                prop: 'taskType',
+                width: 120,
+                label: '类型',
+            }]
+            service.sendEventDiagnoseBusinessScenarios(emit, props.faultNo,props.targetType.toLocaleLowerCase(),param);
+        }
+
+        //诊断指标
+        const openKpiList = () => {
+            service.sendEventDiagnoseKpiList(emit, props.faultNo,props.targetType.toLocaleLowerCase());
+        }
 
         // 挂载完
         Vue.onMounted(() => {
@@ -106,7 +124,9 @@ export default {
             cardData,
             openMoreDialog,
             openAlarm,
-            getFaultItemValue: service.getFaultItemValue
+            getFaultItemValue: service.getFaultItemValue,
+            openBusScenarios,
+            openKpiList
         }
     }
 }

@@ -344,7 +344,7 @@ const faultEvent = () => {
         store.dispatch('getFaultBusinessList', {faultNo: faultNo, targetType: targetType}).then((res) => {
             if (res && res.success) {
                 obj.data = res.data;
-                emit('openDialog', 'more', obj);
+                emit('openDialog', 'more', {},obj);
             }
         });
     }
@@ -360,8 +360,7 @@ const faultEvent = () => {
     const sendEventDiagnoseKpiList = (emit, faultNo, targetType) => {
 
         var obj = {
-            columns: columns,
-            data: [{
+            columns: [{
                 prop: 'kpiId',
                 label: "指标ID",
             },{
@@ -381,13 +380,14 @@ const faultEvent = () => {
                         return '基本指标';
                     }
                 }
-            }]
+            }],
+            data: '',
         }
 
         store.dispatch('getFaultKpiList', {faultNo: faultNo, targetType: targetType}).then((res) => {
             if (res && res.success) {
                 obj.data = res.data;
-                emit('openDialog', 'more', obj);
+                emit('openDialog', 'more',{}, obj);
             }
         });