monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 7c5d9b39bcd71507f8e49a4587d5e74ab15cceb8 2 parents 6655550a 8a0feddf

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

故障管理优化



See merge request !832
Inline Side-by-side
Showing 6 changed files with 45 additions and 25 deletions
@@ -183,7 +183,6 @@ a { @@ -183,7 +183,6 @@ a {
183 .p-6 { 183 .p-6 {
184 padding: 6px; 184 padding: 6px;
185 } 185 }
186 -  
187 .p-l-6 { 186 .p-l-6 {
188 padding: 6px; 187 padding: 6px;
189 } 188 }
@@ -226,8 +225,25 @@ a { @@ -226,8 +225,25 @@ a {
226 color:#1e9fff; 225 color:#1e9fff;
227 226
228 } 227 }
  228 +
229 .border-solid{ 229 .border-solid{
230 border: solid 1px #bbb8b8; 230 border: solid 1px #bbb8b8;
231 } 231 }
232 232
  233 +.border-top{
  234 + border-top: 1px solid var(--el-border-color);
  235 +}
  236 +
  237 +.border-right{
  238 + border-right: 1px solid var(--el-border-color);
  239 +}
  240 +
  241 +.border-bottom{
  242 + border-bottom: 1px solid var(--el-border-color);
  243 +}
  244 +
  245 +.border-left{
  246 + border-left: 1px solid var(--el-border-color);
  247 +}
  248 +
233 249
@@ -65,27 +65,27 @@ @@ -65,27 +65,27 @@
65 <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 12px;"> 65 <img src="../src/style/img/fault/apm/apmAbout.png" style="padding-top: 12px;">
66 <div style="padding-top: 10px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass,'应用')">{{item.applicationName}}</span></div> 66 <div style="padding-top: 10px;font-size: 18px;color: #333333">应用：<span class="text-link" @click="openBusScenarios(item.resClass,'应用')">{{item.applicationName}}</span></div>
67 <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1> 67 <hr style="FILTER: alpha(opacity=100,finishopacity=0,style=3)" width="80%" color=#aed6f4 size=1>
68 - <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 16px;">  
69 - <div style="width: 230px;display: flex;align-self: center;align-items:center;"> 68 + <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 14px;">
  69 + <div style="width: 220px;display: flex;align-self: center;align-items:center;">
70 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 70 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
71 - <span style="margin: 0px 6px;width: 133px;">响应时间告警量:</span> 71 + <span style="margin: 0px 6px;width: 110px;">响应时间告警量:</span>
72 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.responseNum}}</span> 72 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.responseNum}}</span>
73 </div> 73 </div>
74 - <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;"> 74 + <div style="width: 220px;margin-left: 20px;display: flex;align-self: center;align-items:center;">
75 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 75 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
76 - <span style="margin: 0px 6px 0px 6px;width: 115px;">Fullgc告警量:</span> 76 + <span style="margin: 0px 6px 0px 6px;width: 90px;">Fullgc告警量:</span>
77 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.FullGcNum}}</span> 77 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.FullGcNum}}</span>
78 </div> 78 </div>
79 </div> 79 </div>
80 - <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 16px;">  
81 - <div style="width: 230px;display: flex;align-self: center;align-items:center;"> 80 + <div style="text-align: left;display: flex;margin-top: 10px;margin-left: 50px;font-size: 14px;">
  81 + <div style="width: 220px;display: flex;align-self: center;align-items:center;">
82 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 82 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
83 - <span style="margin: 0px 6px;width: 133px;">线程总数告警量:</span> 83 + <span style="margin: 0px 6px;width: 110px;">线程总数告警量:</span>
84 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.threadNum}}</span> 84 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.threadNum}}</span>
85 </div> 85 </div>
86 - <div style="width: 230px;margin-left: 20px;display: flex;align-self: center;align-items:center;"> 86 + <div style="width: 220px;margin-left: 20px;display: flex;align-self: center;align-items:center;">
87 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;"> 87 <img src="../src/style/img/fault/base/alarm.png" style="width:22px;height: 22px;">
88 - <span style="margin: 0px 6px 0px 6px;width: 115px;">错误率告警量:</span> 88 + <span style="margin: 0px 6px 0px 6px;width: 90px;">错误率告警量:</span>
89 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.errorNum}}</span> 89 <span class="text-link" @click="openAlarm(item.kpiId,item.resClass)">{{item.errorNum}}</span>
90 </div> 90 </div>
91 </div> 91 </div>
@@ -75,7 +75,7 @@ @@ -75,7 +75,7 @@
75 <span :style="item.shortName?(item.shortName.length>4?'padding:10px;':'padding:15px;'):''">{{item.shortName}}</span> 75 <span :style="item.shortName?(item.shortName.length>4?'padding:10px;':'padding:15px;'):''">{{item.shortName}}</span>
76 </div> 76 </div>
77 <div class="text-overflow-line2 align-center" style="padding: 0px 25px;"> 77 <div class="text-overflow-line2 align-center" style="padding: 0px 25px;">
78 - <el-tooltip :content="item.taskName" placement="top" effect="light" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false"> 78 + <el-tooltip :content="item.taskName" placement="top" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
79 <span class="member-label member-span text-hidden" @mouseenter="visibilityChange($event,item)"> {{item.taskName}}</span> 79 <span class="member-label member-span text-hidden" @mouseenter="visibilityChange($event,item)"> {{item.taskName}}</span>
80 </el-tooltip> 80 </el-tooltip>
81 </div> 81 </div>
@@ -78,30 +78,30 @@ @@ -78,30 +78,30 @@
78 <div style="line-height: 60px;" class="m-l-6"> 78 <div style="line-height: 60px;" class="m-l-6">
79 <el-tooltip effect="light" > 79 <el-tooltip effect="light" >
80 <template #content> 80 <template #content>
81 - <div style="width: 140px"> 81 + <div style="width: 260px">
82 <el-row> 82 <el-row>
83 - <el-col :span="12" class="align-left border-solid p-6">  
84 - 连接状态 83 + <el-col :span="10" class="align-left border-bottom border-right p-6">
  84 + {{item.kpiName}}
85 </el-col> 85 </el-col>
86 - <el-col :span="12" class="align-right border-solid p-6"> 86 + <el-col :span="14" class="align-right border-bottom p-6">
87 {{item.linkState}} 87 {{item.linkState}}
88 </el-col> 88 </el-col>
89 - <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database' && resClass!='other'">  
90 - CPU 89 + <el-col :span="10" class="align-left border-bottom border-right p-6" v-if="resClass!='database' && resClass!='other'">
  90 + {{item.cpuName}}
91 </el-col> 91 </el-col>
92 - <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database' && resClass!='other'"> 92 + <el-col :span="14" class="align-right border-bottom p-6" v-if="resClass!='database' && resClass!='other'">
93 {{item.cpu}}{{item.cpuUnit}} 93 {{item.cpu}}{{item.cpuUnit}}
94 </el-col> 94 </el-col>
95 - <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database' && resClass!='other'">  
96 - 内存 95 + <el-col :span="10" class="align-left border-bottom border-right p-6" v-if="resClass!='database' && resClass!='other'">
  96 + {{item.menName}}
97 </el-col> 97 </el-col>
98 - <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database' && resClass!='other'"> 98 + <el-col :span="14" class="align-right border-bottom p-6" v-if="resClass!='database' && resClass!='other'">
99 {{item.men}}{{item.menUnit}} 99 {{item.men}}{{item.menUnit}}
100 </el-col> 100 </el-col>
101 - <el-col :span="12" class="align-left border-solid p-6"> 101 + <el-col :span="10" class="align-left border-right p-6">
102 告警量 102 告警量
103 </el-col> 103 </el-col>
104 - <el-col :span="12" class="align-right border-solid p-6"> 104 + <el-col :span="14" class="align-right p-6">
105 {{item.alarm}} 105 {{item.alarm}}
106 </el-col> 106 </el-col>
107 </el-row> 107 </el-row>
@@ -66,6 +66,8 @@ export default { @@ -66,6 +66,8 @@ export default {
66 menUnit:'', 66 menUnit:'',
67 kpiId:'', 67 kpiId:'',
68 resId:'', 68 resId:'',
  69 + cpuName:'cpu使用率',
  70 + menName:'内存使用率',
69 resTypeName:'' 71 resTypeName:''
70 } 72 }
71 for (let j = 0; j < data[i].length; j++) { 73 for (let j = 0; j < data[i].length; j++) {
@@ -80,10 +82,12 @@ export default { @@ -80,10 +82,12 @@ export default {
80 if (data[i][j].kpiId=='KPI31CB8D97'){ 82 if (data[i][j].kpiId=='KPI31CB8D97'){
81 resItem.men=data[i][j].diagnosisResult; 83 resItem.men=data[i][j].diagnosisResult;
82 resItem.menUnit=data[i][j].unit; 84 resItem.menUnit=data[i][j].unit;
  85 + resItem.menName=data[i][j].kpiName;
83 resItem.kpiId=data[i][j].kpiId; 86 resItem.kpiId=data[i][j].kpiId;
84 }else if (data[i][j].kpiId=='KPI7054BC34'){ 87 }else if (data[i][j].kpiId=='KPI7054BC34'){
85 resItem.cpu=data[i][j].diagnosisResult; 88 resItem.cpu=data[i][j].diagnosisResult;
86 resItem.cpuUnit=data[i][j].unit; 89 resItem.cpuUnit=data[i][j].unit;
  90 + resItem.cpuName=data[i][j].kpiName;
87 resItem.kpiId=data[i][j].kpiId; 91 resItem.kpiId=data[i][j].kpiId;
88 }else if (data[i][j].kpiId=='KPIE13DD9A3'||data[i][j].kpiId=='KPI4DA976AF'){ 92 }else if (data[i][j].kpiId=='KPIE13DD9A3'||data[i][j].kpiId=='KPI4DA976AF'){
89 resItem.linkState=data[i][j].diagnosisResult; 93 resItem.linkState=data[i][j].diagnosisResult;
@@ -197,7 +197,7 @@ export default { @@ -197,7 +197,7 @@ export default {
197 }, { 197 }, {
198 prop: 'reason', 198 prop: 'reason',
199 label: '原因分析', 199 label: '原因分析',
200 - width: 250, 200 + width: 350,
201 }, /*{ 201 }, /*{
202 prop: 'solution', 202 prop: 'solution',
203 label: '处理方案', 203 label: '处理方案',