monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 645ffa62ee43ec01d5fd66f44e419fe4598c6963 1 parent 81c0a7d2

悬浮展示优化；曲线图展示异常；

Inline Side-by-side
Showing 2 changed files with 8 additions and 4 deletions
@@ -74,16 +74,16 @@ @@ -74,16 +74,16 @@
74 <el-col :span="12" class="align-right border-solid p-6"> 74 <el-col :span="12" class="align-right border-solid p-6">
75 {{item.linkState}} 75 {{item.linkState}}
76 </el-col> 76 </el-col>
77 - <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database'"> 77 + <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database' && resClass!='other'">
78 CPU 78 CPU
79 </el-col> 79 </el-col>
80 - <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database'"> 80 + <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database' && resClass!='other'">
81 {{item.cpu}}{{item.cpuUnit}} 81 {{item.cpu}}{{item.cpuUnit}}
82 </el-col> 82 </el-col>
83 - <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database'"> 83 + <el-col :span="12" class="align-left border-solid p-6" v-if="resClass!='database' && resClass!='other'">
84 内存 84 内存
85 </el-col> 85 </el-col>
86 - <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database'"> 86 + <el-col :span="12" class="align-right border-solid p-6" v-if="resClass!='database' && resClass!='other'">
87 {{item.men}}{{item.menUnit}} 87 {{item.men}}{{item.menUnit}}
88 </el-col> 88 </el-col>
89 <el-col :span="12" class="align-left border-solid p-6"> 89 <el-col :span="12" class="align-left border-solid p-6">
@@ -15,6 +15,9 @@ const lineService = () => { @@ -15,6 +15,9 @@ const lineService = () => {
15 15
16 let closeLineDialog = (flg) => { 16 let closeLineDialog = (flg) => {
17 showLineDialog.value = flg; 17 showLineDialog.value = flg;
  18 + if(!flg){
  19 + dataSet.value = [];
  20 + }
18 } 21 }
19 22
20 let openLine = (proxy, faultNo, targetType, resId, kpiId, flag, title) => { 23 let openLine = (proxy, faultNo, targetType, resId, kpiId, flag, title) => {
@@ -34,6 +37,7 @@ const lineService = () => { @@ -34,6 +37,7 @@ const lineService = () => {
34 kpiId: kpiId, 37 kpiId: kpiId,
35 flag: flag 38 flag: flag
36 } 39 }
  40 +
37 proxy.$http.get('/api-web/fault/result/findLineData', params, function (res) { 41 proxy.$http.get('/api-web/fault/result/findLineData', params, function (res) {
38 if (res && res.success) { 42 if (res && res.success) {
39 if (res.data) { 43 if (res.data) {