Merge branch 'master-V32-LH' into 'master'

故障弹框 不展示禁用得模块优化



See merge request !375

@@ -58,8 +58,7 @@
 
 
                     <el-timeline-item  v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName"
                     <el-timeline-item  v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName"
                                        placement="top" :color="item.color" :hollow="true"  >
                                        placement="top" :color="item.color" :hollow="true"  >
-<!--                        {{item.state==1}}-->
-                        <el-card v-if="item.state==1">
+                        <el-card v-if="item && item.state =='1'">
                             <component v-bind:is="item.components"
                             <component v-bind:is="item.components"
                                        :targetType="item.faultType"
                                        :targetType="item.faultType"
                                        :faultNo="faultDetailDetailInfo.faultNo"
                                        :faultNo="faultDetailDetailInfo.faultNo"
@@ -68,6 +67,7 @@
                                        :itemName="item.itemName"
                                        :itemName="item.itemName"
                                        :showDetail="item.detail"/>
                                        :showDetail="item.detail"/>
                         </el-card>
                         </el-card>
+
                     </el-timeline-item>
                     </el-timeline-item>
                 </el-timeline>
                 </el-timeline>
             </div>
             </div>

@@ -72,6 +72,62 @@ const faultDetail = () => {
      * 时间：2021/12/13 20:14
      * 时间：2021/12/13 20:14
      */
      */
     let closeFaultDetailDialog = (flg) => {
     let closeFaultDetailDialog = (flg) => {
+        if(!flg){
+            faultDetailDetailInfo.value.items=[{
+                faultType: 'NETLINK',
+                faultTypeName: '网络链路',
+                components: 'netLinks',
+                color: '#409EFF',
+                detail:true,
+                state:'0'
+            },{
+                faultType: 'DIALTEST',
+                faultTypeName: '拨测',
+                components: 'result-item',
+                color: '#67C23A',
+                itemName: '场景名称',
+                detail: false,
+                colType: 'kpi',
+                state:'0'
+            }, {
+                faultType: 'NPM',
+                faultTypeName: 'NPM',
+                components: 'result-item',
+                color: '#E6A23C',
+                itemName: '链路（流名称）',
+                detail: false,
+                colType: 'kpi',
+                state:'0'
+            }, {
+                faultType: 'BASE',
+                faultTypeName: '基础',
+                components: 'result-item',
+                color: '#67C23A',
+                itemName: '检测指标',
+                detail: true,
+                colType: 'flag',
+                state:'0'
+            }, {
+                faultType: 'APM',
+                faultTypeName: 'APM',
+                components: 'result-item',
+                color: '#F56C6C',
+                itemName: '检测指标',
+                detail: true,
+                colType: 'flag',
+                state:'0'
+            }, {
+                faultType: 'faultHis',
+                faultTypeName: '知识库',
+                components: 'faultHis',
+                color: '#8a9718',
+                itemName: '知识库',
+                detail: true,
+                colType: 'flag',
+                state:'1'
+            }];
+        }
+
         showFaultDetailDialog.value = flg;
         showFaultDetailDialog.value = flg;
     }
     }
 
 
@@ -81,28 +137,36 @@ const faultDetail = () => {
      */
      */
     let settingDetail = (row) => {
     let settingDetail = (row) => {
         proxy.$http.get('/api-web/fault/conf/detail/getDetailByNo', {faultNo:row.faultNo},function(res) {
         proxy.$http.get('/api-web/fault/conf/detail/getDetailByNo', {faultNo:row.faultNo},function(res) {
-            res.forEach(item=>{
-                if(item.type.toUpperCase()=='NETLINK'){
-                    faultDetailDetailInfo.value.items[0].state= item.state
-                }
-                if(item.type.toUpperCase()=='DIALTEST'){
-                    faultDetailDetailInfo.value.items[1].state= item.state
-                }
-                if(item.type.toUpperCase()=='NPM'){
-                    faultDetailDetailInfo.value.items[2].state= item.state
-                }
-                if(item.type.toUpperCase()=='BASE'){
-                    faultDetailDetailInfo.value.items[3].state= item.state
-                }
-                if(item.type.toUpperCase()=='APM'){
-                    faultDetailDetailInfo.value.items[4].state= item.state
-                }
-            })
-            faultDetailDetailInfo.value.items.forEach((item1,i)=>{
-                if(item1.state=='0'){
-                    faultDetailDetailInfo.value.items.splice(i,1)
+            console.log("------******----------",res);
+            if(res.length>0){
+                res.forEach((item)=>{
+                    if(item.type.toUpperCase()=='NETLINK'){
+                        faultDetailDetailInfo.value.items[0].state= item.state
+                    }
+
+                    if(item.type.toUpperCase()=='DIALTEST'){
+                        faultDetailDetailInfo.value.items[1].state= item.state
+                    }
+                    if(item.type.toUpperCase()=='NPM'){
+                        faultDetailDetailInfo.value.items[2].state= item.state
+
+                    }
+                    if(item.type.toUpperCase()=='BASE'){
+                        faultDetailDetailInfo.value.items[3].state= item.state
+                    }
+                    if(item.type.toUpperCase()=='APM'){
+                        faultDetailDetailInfo.value.items[4].state= item.states
+                    }
+                })
+            }
+
+            let arr=[];
+            for(var i=0;i<faultDetailDetailInfo.value.items.length;i++ ){
+                if(faultDetailDetailInfo.value.items[i].state=='1'){
+                    arr.push(faultDetailDetailInfo.value.items[i])
                 }
                 }
-            })
+            }
+            faultDetailDetailInfo.value.items=   arr;
         });
         });
         // 设置标题
         // 设置标题
         faultDetailDialogTitle.value = `${row.faultBody}（${row.faultNo}）诊断报告`;
         faultDetailDialogTitle.value = `${row.faultBody}（${row.faultNo}）诊断报告`;
@@ -118,6 +182,7 @@ const faultDetail = () => {
         closeFaultDetailDialog,
         closeFaultDetailDialog,
         faultDetailDetailInfo
         faultDetailDetailInfo
     }
     }
+
 }
 }
 
 
 /**
 /**