monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit 96650f78b66ddf59e7f4231f9b88a78d3758fb41 2 parents 3a8eb46c 6655550a

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx

Inline Side-by-side
Showing 2 changed files with 3 additions and 3 deletions
@@ -68,8 +68,8 @@ @@ -68,8 +68,8 @@
68 <div v-if="cardData.length == 0" class="align-center" style="flex: 1"> 68 <div v-if="cardData.length == 0" class="align-center" style="flex: 1">
69 <el-empty :image-size="50" /> 69 <el-empty :image-size="50" />
70 </div> 70 </div>
71 - <div v-else v-for="item in cardData" style="width: 340px;">  
72 - <div style="width: 340px;min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;"> 71 + <div v-else v-for="item in cardData" style="width: 25%;">
  72 + <div style="min-width: 340px;min-height: 184px;background: url('../src/style/img/fault/npm/npmCard.png') no-repeat;background-size: 100% 100%;padding-top: 20px;margin-bottom: 26px;box-sizing: border-box;">
73 <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px"> 73 <div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px">
74 <!-- {{item.streamName}}--> 74 <!-- {{item.streamName}}-->
75 <el-tooltip ref="tlp" :content="item.streamName" placement="bottom" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false"> 75 <el-tooltip ref="tlp" :content="item.streamName" placement="bottom" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
@@ -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}`,"90%","90%") 156 + proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"80%","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>`