monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 7b0f3e3310628a582fa517e451a79f20174ed5da 2 parents 7c58b331 3a0802bb

Merge branch 'master-v32-lushangqing' into 'master' 

故障诊断明细及故障诊断配置中的顺序调整，业务拨测->网络链路->NPM->APM->基础资源;故障定义->业务拨测->网络链路->NPM->APM->基础资源,故障配置中的名称按照此顺序中的名称更改



See merge request !815
Inline Side-by-side
Showing 2 changed files with 19 additions and 19 deletions
@@ -30,19 +30,19 @@ @@ -30,19 +30,19 @@
30 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==1}]" @click="clickDaultDefinitionFunc(1)" shadow="hover"><span class="card-name">故障定义</span></el-card> 30 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==1}]" @click="clickDaultDefinitionFunc(1)" shadow="hover"><span class="card-name">故障定义</span></el-card>
31 </el-col> 31 </el-col>
32 <el-col :span="3"> 32 <el-col :span="3">
33 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==2}]" @click="clickNetworkMonitorFunc(2)" shadow="hover"><span class="card-name">网络检测</span></el-card> 33 + <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="dialtestMonitorFunc(6)" shadow="hover"><span class="card-name">业务拨测</span></el-card>
34 </el-col> 34 </el-col>
35 <el-col :span="3"> 35 <el-col :span="3">
36 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==3}]" @click="applicationMonitorFunc(3)" shadow="hover"><span class="card-name">应用检测</span></el-card> 36 + <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==2}]" @click="clickNetworkMonitorFunc(2)" shadow="hover"><span class="card-name">网络链路</span></el-card>
37 </el-col> 37 </el-col>
38 <el-col :span="3"> 38 <el-col :span="3">
39 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==4}]" @click="basicEnvironmentFunc(4)" shadow="hover"><span class="card-name">基础环境</span></el-card> 39 + <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==3}]" @click="applicationMonitorFunc(3)" shadow="hover"><span class="card-name">NPM</span></el-card>
40 </el-col> 40 </el-col>
41 <el-col :span="3"> 41 <el-col :span="3">
42 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==5}]" @click="apmMonitorFunc(5)" shadow="hover"><span class="card-name">APM</span></el-card> 42 <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==5}]" @click="apmMonitorFunc(5)" shadow="hover"><span class="card-name">APM</span></el-card>
43 </el-col> 43 </el-col>
44 <el-col :span="3"> 44 <el-col :span="3">
45 - <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="dialtestMonitorFunc(6)" shadow="hover"><span class="card-name">拨测分析</span></el-card> 45 + <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==4}]" @click="basicEnvironmentFunc(4)" shadow="hover"><span class="card-name">基础环境</span></el-card>
46 </el-col> 46 </el-col>
47 <!-- <el-col :span="3">--> 47 <!-- <el-col :span="3">-->
48 <!-- <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="logDetectionFunc(6)" shadow="hover"><span class="card-name">日志检测</span></el-card>--> 48 <!-- <el-card :class="['fault-book-title-card-text',{'isActive':isActiveIndex==6}]" @click="logDetectionFunc(6)" shadow="hover"><span class="card-name">日志检测</span></el-card>-->
@@ -33,13 +33,6 @@ export default { @@ -33,13 +33,6 @@ export default {
33 kpiId: '', 33 kpiId: '',
34 flag: '', 34 flag: '',
35 items: [{ 35 items: [{
36 - faultType: 'NETLINK',  
37 - faultTypeName: '网络链路',  
38 - components: 'netLinks',  
39 - color: '#409EFF',  
40 - detail: true,  
41 - state: '0'  
42 - }, {  
43 faultType: 'DIALTEST', 36 faultType: 'DIALTEST',
44 faultTypeName: '拨测', 37 faultTypeName: '拨测',
45 components: 'dialtest-item', 38 components: 'dialtest-item',
@@ -49,6 +42,13 @@ export default { @@ -49,6 +42,13 @@ export default {
49 colType: 'kpi', 42 colType: 'kpi',
50 state: '0' 43 state: '0'
51 }, { 44 }, {
  45 + faultType: 'NETLINK',
  46 + faultTypeName: '网络链路',
  47 + components: 'netLinks',
  48 + color: '#409EFF',
  49 + detail: true,
  50 + state: '0'
  51 + }, {
52 faultType: 'NPM', 52 faultType: 'NPM',
53 faultTypeName: 'NPM', 53 faultTypeName: 'NPM',
54 components: 'npm-item', 54 components: 'npm-item',
@@ -58,19 +58,19 @@ export default { @@ -58,19 +58,19 @@ export default {
58 colType: 'kpi', 58 colType: 'kpi',
59 state: '0' 59 state: '0'
60 }, { 60 }, {
61 - faultType: 'BASE',  
62 - faultTypeName: '基础',  
63 - components: 'result-item',  
64 - color: '#67C23A', 61 + faultType: 'APM',
  62 + faultTypeName: 'APM',
  63 + components: 'apm-item',
  64 + color: '#F56C6C',
65 itemName: '检测指标', 65 itemName: '检测指标',
66 detail: true, 66 detail: true,
67 colType: 'flag', 67 colType: 'flag',
68 state: '0' 68 state: '0'
69 }, { 69 }, {
70 - faultType: 'APM',  
71 - faultTypeName: 'APM',  
72 - components: 'apm-item',  
73 - color: '#F56C6C', 70 + faultType: 'BASE',
  71 + faultTypeName: '基础',
  72 + components: 'result-item',
  73 + color: '#67C23A',
74 itemName: '检测指标', 74 itemName: '检测指标',
75 detail: true, 75 detail: true,
76 colType: 'flag', 76 colType: 'flag',