Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -47,17 +47,19 @@
     <cm-dialog :title="faultDetailDialogTitle" width="80%" :showDialogVisible="showFaultDetailDialog"
                @hidedialog="closeFaultDetailDialog" :showFooter="false">
         <template v-slot>
-            <div style="text-align: left;height:720px;max-height:720px;overflow-y: auto;overflow-x: hidden;">
+            <div style="text-align: left;height:750px;max-height:720px;overflow-y: auto;overflow-x: hidden;">
                 <div style="text-align: right;padding-right: 10px">
                     <el-button type="text" size="small"
                                @click.prevent="$global.openReport('GZZDS',{faultNumber:faultDetailDetailInfo.faultNo},'60%','80%')">
                         <i class="iconfont iconfont-small icon-icon-rizhi"/> 报表
                     </el-button>
                 </div>
-                <el-timeline>
-                    <el-timeline-item v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName"
-                                      placement="top" :color="item.color" :hollow="true">
-                        <el-card>
+                <el-timeline >
+
+                    <el-timeline-item  v-for="item in faultDetailDetailInfo.items" center :timestamp="item.faultTypeName"
+                                       placement="top" :color="item.color" :hollow="true"  >
+<!--                        {{item.state==1}}-->
+                        <el-card v-if="item.state==1">
                             <component v-bind:is="item.components"
                                        :targetType="item.faultType"
                                        :faultNo="faultDetailDetailInfo.faultNo"

@@ -15,7 +15,8 @@ const faultDetail = () => {
             faultTypeName: '网络链路',
             components: 'netLinks',
             color: '#409EFF',
-            detail:true
+            detail:true,
+            state:'0'
         },{
             faultType: 'DIALTEST',
             faultTypeName: '拨测',
@@ -23,7 +24,8 @@ const faultDetail = () => {
             color: '#67C23A',
             itemName: '场景名称',
             detail: false,
-            colType: 'kpi'
+            colType: 'kpi',
+            state:'0'
         }, {
             faultType: 'NPM',
             faultTypeName: 'NPM',
@@ -31,7 +33,8 @@ const faultDetail = () => {
             color: '#E6A23C',
             itemName: '链路（流名称）',
             detail: false,
-            colType: 'kpi'
+            colType: 'kpi',
+            state:'0'
         }, {
             faultType: 'BASE',
             faultTypeName: '基础',
@@ -39,7 +42,8 @@ const faultDetail = () => {
             color: '#67C23A',
             itemName: '检测指标',
             detail: true,
-            colType: 'flag'
+            colType: 'flag',
+            state:'0'
         }, {
             faultType: 'APM',
             faultTypeName: 'APM',
@@ -47,7 +51,8 @@ const faultDetail = () => {
             color: '#F56C6C',
             itemName: '检测指标',
             detail: true,
-            colType: 'flag'
+            colType: 'flag',
+            state:'0'
         }, {
             faultType: 'faultHis',
             faultTypeName: '知识库',
@@ -55,7 +60,8 @@ const faultDetail = () => {
             color: '#8a9718',
             itemName: '知识库',
             detail: true,
-            colType: 'flag'
+            colType: 'flag',
+            state:'1'
         }]
     });
 
@@ -74,6 +80,30 @@ const faultDetail = () => {
      * @param row
      */
     let settingDetail = (row) => {
+        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)
+                }
+            })
+        });
         // 设置标题
         faultDetailDialogTitle.value = `${row.faultBody}（${row.faultNo}）诊断报告`;
         // 当前故障编号