monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 843b25106d6bc55a6c7737545cda62f0f970fa57 2 parents 1cf1bfd1 d48973a1

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

基础资源页面调整



See merge request !788
Inline Side-by-side
Showing 9 changed files with 24 additions and 20 deletions
@@ -54,6 +54,6 @@ @@ -54,6 +54,6 @@
54 </div> 54 </div>
55 55
56 56
57 - <res-item v-if="cardOpen" /> 57 + <res-item v-for="item in card" v-if="cardOpen" :cardList="item" />
58 58
59 </div> 59 </div>
@@ -37,9 +37,12 @@ export default { @@ -37,9 +37,12 @@ export default {
37 37
38 store.dispatch('getFaultList', params).then((res) => { 38 store.dispatch('getFaultList', params).then((res) => {
39 if (res.data && res.success) { 39 if (res.data && res.success) {
40 - debugger  
41 dialTest.value = res.data[0]; 40 dialTest.value = res.data[0];
42 - card.value = dialTest.value.faultFixInfoList[0]; 41 + let arr=[];
  42 + for(var i=1;i<res.data.length;i++ ){
  43 + arr.push(res.data[i])
  44 + }
  45 + card.value = arr;
43 } 46 }
44 }).catch(e => { 47 }).catch(e => {
45 console.log(e); 48 console.log(e);
1 <el-divider/> 1 <el-divider/>
2 -<div class="d-flex" v-model="dialTest">  
3 - <div class="d-flex align-center" style="width: 300px;justify-content: center;"> 2 +<div class="d-flex" v-model="cardList">
  3 + <div class="d-flex align-center" style="width: 187px;padding-left: 113px;">
4 <!--<span style="width: 10px;height: 10px;background-color: red;border-radius: 50%">&nbsp;</span>--> 4 <!--<span style="width: 10px;height: 10px;background-color: red;border-radius: 50%">&nbsp;</span>-->
5 <i class="iconfont icon-dian" style="font-size: 32px;color: red;"/> 5 <i class="iconfont icon-dian" style="font-size: 32px;color: red;"/>
6 - <img class="m-l-6" src="../src/style/img/fault/base/resType/数据库.png">  
7 - <a class="m-l-6">数据库</a> 6 + <img class="m-l-6" :src="'../src/style/img/fault/base/resType/'+cardList.resClass+'.png'" >
  7 + <a class="m-l-6">{{cardList.resClassName}}</a>
8 </div> 8 </div>
9 <div> 9 <div>
10 <div class="d-flex align-left"> 10 <div class="d-flex align-left">
11 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;"> 11 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
12 <img src="../src/style/img/disRes.png"> 12 <img src="../src/style/img/disRes.png">
13 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断资源</span> 13 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断资源</span>
14 - <h>{{dialTest && dialTest.diagnosticResources ?dialTest.diagnosticResources:0}}</h> 14 + <h>{{cardList && cardList.diagnosticResources ?cardList.diagnosticResources:0}}</h>
15 </div> 15 </div>
16 | 16 |
17 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;"> 17 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
18 <img src="../src/style/img/disKpi.png"> 18 <img src="../src/style/img/disKpi.png">
19 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断指标</span> 19 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断指标</span>
20 - <h>{{dialTest && dialTest.diagnosticIndicators ?dialTest.diagnosticIndicators:0}}</h> 20 + <h>{{cardList && cardList.diagnosticIndicators ?cardList.diagnosticIndicators:0}}</h>
21 </div> 21 </div>
22 | 22 |
23 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;"> 23 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;">
24 <img src="../src/style/img/disItem.png"> 24 <img src="../src/style/img/disItem.png">
25 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断项</span> 25 <span style="margin: 0px 6px 0px 6px;width: 95px">诊断项</span>
26 - <h>{{dialTest && dialTest.diagnosticItem ?dialTest.diagnosticItem:0}}</h> 26 + <h>{{cardList && cardList.diagnosticItem ?cardList.diagnosticItem:0}}</h>
27 </div> 27 </div>
28 </div> 28 </div>
29 <div style="text-align: left;display: flex;margin-top: 10px;"> 29 <div style="text-align: left;display: flex;margin-top: 10px;">
30 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: yellowgreen"> 30 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: yellowgreen">
31 <img src="../src/style/img/success.png"> 31 <img src="../src/style/img/success.png">
32 <span style="margin: 0px 6px 0px 6px;width: 95px;">正常</span> 32 <span style="margin: 0px 6px 0px 6px;width: 95px;">正常</span>
33 - <h style="font-size: 20px">{{dialTest && dialTest.normal ?dialTest.normal:0}}</h> 33 + <h style="font-size: 20px">{{cardList && cardList.normal ?cardList.normal:0}}</h>
34 </div> 34 </div>
35 | 35 |
36 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #f8d305"> 36 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: #f8d305">
37 <img src="../src/style/img/error.png"> 37 <img src="../src/style/img/error.png">
38 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 异常</span> 38 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 异常</span>
39 - <h style="font-size: 20px">{{dialTest && dialTest.abnormal ?dialTest.abnormal:0}}</h> 39 + <h style="font-size: 20px">{{cardList && cardList.abnormal ?cardList.abnormal:0}}</h>
40 </div> 40 </div>
41 | 41 |
42 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red"> 42 <div style="width: 200px;margin-left: 20px;display: flex;align-self: center;color: red">
43 <img src="../src/style/img/fault/base/alarm.png"> 43 <img src="../src/style/img/fault/base/alarm.png">
44 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 告警</span> 44 <span style="margin: 0px 6px 0px 6px;width: 95px;"> 告警</span>
45 - <h style="font-size: 20px">{{dialTest && dialTest.abnormal ?dialTest.abnormal:0}}</h> 45 + <h style="font-size: 20px">{{cardList && cardList.abnormal ?cardList.abnormal:0}}</h>
46 </div> 46 </div>
47 </div> 47 </div>
48 </div> 48 </div>
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 </div> 53 </div>
54 <div v-if="cardOpen" 54 <div v-if="cardOpen"
55 style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;"> 55 style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;">
56 - <div v-for="item in 10" style="width: 25%"> 56 + <div v-for="item in cardList.faultFixInfoList" style="width: 25%">
57 <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;"> 57 <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;">
58 <el-row style="height: 70px;padding: 10px 30px;"> 58 <el-row style="height: 70px;padding: 10px 30px;">
59 <el-col :span="4" style="line-height: 55px;"> 59 <el-col :span="4" style="line-height: 55px;">
@@ -4,12 +4,7 @@ export default { @@ -4,12 +4,7 @@ export default {
4 name: 'faultDialTest', 4 name: 'faultDialTest',
5 template: '', 5 template: '',
6 components: {}, 6 components: {},
7 - props: {  
8 - faultNo: {  
9 - type: String,  
10 - default: ''  
11 - }  
12 - }, 7 + props: ['cardList'],
13 data() { 8 data() {
14 return {} 9 return {}
15 }, 10 },
@@ -41,8 +36,10 @@ export default { @@ -41,8 +36,10 @@ export default {
41 // }) 36 // })
42 } 37 }
43 38
  39 +
44 // 挂载完 40 // 挂载完
45 Vue.onMounted(() => { 41 Vue.onMounted(() => {
  42 + let cardList = props.cardList
46 getDialtestList(); 43 getDialtestList();
47 }) 44 })
48 45
@@ -133,6 +133,10 @@ const routes = [{ @@ -133,6 +133,10 @@ const routes = [{
133 path: '/fault/result/faultDetail', 133 path: '/fault/result/faultDetail',
134 name: 'faultResultDetail', 134 name: 'faultResultDetail',
135 component: () => myImport('views/faultDiagnosis/result/faultDetail') 135 component: () => myImport('views/faultDiagnosis/result/faultDetail')
  136 + },{
  137 + path: '/fault/apm/index',
  138 + name: 'faultApm',
  139 + component: () => myImport('views/faultDiagnosis/apm/index')
136 }/*, 140 }/*,
137 { 141 {
138 path: '/fault/faultAddIndex', 142 path: '/fault/faultAddIndex',