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

基础资源页面调整



See merge request !788

@@ -54,6 +54,6 @@
     </div>
 
 
-    <res-item v-if="cardOpen" />
+    <res-item v-for="item in card" v-if="cardOpen" :cardList="item" />
 
 </div>

@@ -37,9 +37,12 @@ export default {
 
             store.dispatch('getFaultList', params).then((res) => {
                 if (res.data && res.success) {
-                    debugger
                     dialTest.value = res.data[0];
-                    card.value = dialTest.value.faultFixInfoList[0];
+                    let arr=[];
+                    for(var i=1;i<res.data.length;i++ ){
+                        arr.push(res.data[i])
+                    }
+                    card.value = arr;
                 }
             }).catch(e => {
                 console.log(e);

 <el-divider/>
-<div class="d-flex" v-model="dialTest">
-    <div class="d-flex align-center" style="width: 300px;justify-content: center;">
+<div class="d-flex" v-model="cardList">
+    <div class="d-flex align-center" style="width: 187px;padding-left: 113px;">
         <!--<span style="width: 10px;height: 10px;background-color: red;border-radius: 50%">&nbsp;</span>-->
         <i class="iconfont icon-dian" style="font-size: 32px;color: red;"/>
-        <img class="m-l-6" src="../src/style/img/fault/base/resType/数据库.png">
-        <a class="m-l-6">数据库</a>
+        <img class="m-l-6"  :src="'../src/style/img/fault/base/resType/'+cardList.resClass+'.png'" >
+        <a class="m-l-6">{{cardList.resClassName}}</a>
     </div>
     <div>
         <div class="d-flex align-left">
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
                 <img src="../src/style/img/disRes.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断资源</span>
-                <h>{{dialTest && dialTest.diagnosticResources ?dialTest.diagnosticResources:0}}</h>
+                <h>{{cardList && cardList.diagnosticResources ?cardList.diagnosticResources:0}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
                 <img src="../src/style/img/disKpi.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断指标</span>
-                <h>{{dialTest && dialTest.diagnosticIndicators ?dialTest.diagnosticIndicators:0}}</h>
+                <h>{{cardList && cardList.diagnosticIndicators ?cardList.diagnosticIndicators:0}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
                 <img src="../src/style/img/disItem.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断项</span>
-                <h>{{dialTest && dialTest.diagnosticItem ?dialTest.diagnosticItem:0}}</h>
+                <h>{{cardList && cardList.diagnosticItem ?cardList.diagnosticItem:0}}</h>
             </div>
         </div>
         <div style="text-align: left;display: flex;margin-top: 10px;">
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: yellowgreen">
                 <img src="../src/style/img/success.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px;">正常</span>
-                <h style="font-size: 20px">{{dialTest && dialTest.normal ?dialTest.normal:0}}</h>
+                <h style="font-size: 20px">{{cardList && cardList.normal ?cardList.normal:0}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #f8d305">
                 <img src="../src/style/img/error.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 异常</span>
-                <h style="font-size: 20px">{{dialTest && dialTest.abnormal ?dialTest.abnormal:0}}</h>
+                <h style="font-size: 20px">{{cardList && cardList.abnormal ?cardList.abnormal:0}}</h>
             </div>
             |
             <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red">
                 <img src="../src/style/img/fault/base/alarm.png">
                 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 告警</span>
-                <h style="font-size: 20px">{{dialTest && dialTest.abnormal ?dialTest.abnormal:0}}</h>
+                <h style="font-size: 20px">{{cardList && cardList.abnormal ?cardList.abnormal:0}}</h>
             </div>
         </div>
     </div>
@@ -53,7 +53,7 @@
 </div>
 <div v-if="cardOpen"
      style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;">
-    <div v-for="item in 10" style="width: 25%">
+    <div v-for="item in cardList.faultFixInfoList" style="width: 25%">
         <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;">

@@ -4,12 +4,7 @@ export default {
     name: 'faultDialTest',
     template: '',
     components: {},
-    props: {
-        faultNo: {
-            type: String,
-            default: ''
-        }
-    },
+    props: ['cardList'],
     data() {
         return {}
     },
@@ -41,8 +36,10 @@ export default {
             // })
         }
 
+
         // 挂载完
         Vue.onMounted(() => {
+            let cardList = props.cardList
             getDialtestList();
         })
 

@@ -133,6 +133,10 @@ const routes = [{
 		path: '/fault/result/faultDetail',
 		name: 'faultResultDetail',
 		component: () => myImport('views/faultDiagnosis/result/faultDetail')
+	},{
+		path: '/fault/apm/index',
+		name: 'faultApm',
+		component: () => myImport('views/faultDiagnosis/apm/index')
 	}/*,
 	{
 		path: '/fault/faultAddIndex',