monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit b661cf87e24b6afe52ab047d23dabc6323d9399a 2 parents 3d159ab4 aeedac44

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

故障诊断优化



See merge request !831
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 </div> 52 </div>
53 <div v-if="cardOpen" 53 <div v-if="cardOpen"
54 style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 330px;overflow-y: auto;"> 54 style="margin-top: 10px;background-color: whitesmoke;display: flex;justify-content: flex-start;flex-wrap: wrap;padding: 6px;max-height: 330px;overflow-y: auto;">
55 - <div v-for="item in dialTest"> 55 + <div v-for="item in dialTest" style="width: 25%">
56 <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;"> 56 <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 <el-row style="height: 70px;padding: 10px 30px;"> 57 <el-row style="height: 70px;padding: 10px 30px;">
58 <el-col :span="4" style="line-height: 55px;"> 58 <el-col :span="4" style="line-height: 55px;">
@@ -153,7 +153,7 @@ export default { @@ -153,7 +153,7 @@ export default {
153 let title = `${row.faultBody}（${row.faultNo}）诊断报告`; 153 let title = `${row.faultBody}（${row.faultNo}）诊断报告`;
154 let configId = row.faultconfid; 154 let configId = row.faultconfid;
155 // 设置相信信息 155 // 设置相信信息
156 - proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"85%","90%") 156 + proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"90%","90%")
157 }, 157 },
158 render: function (row) { 158 render: function (row) {
159 return `<span style="text-decoration: underline;color: blue;">${row.faultBody}</span>` 159 return `<span style="text-decoration: underline;color: blue;">${row.faultBody}</span>`