Authored by xwx

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

... ... @@ -68,8 +68,8 @@
<div v-if="cardData.length == 0" class="align-center" style="flex: 1">
<el-empty :image-size="50" />
</div>
<div v-else v-for="item in cardData" style="width: 340px;">
<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;">
<div v-else v-for="item in cardData" style="width: 25%;">
<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;">
<div class="text-overflow" style="width: 220px;margin-left: 40px;font-size: 16px">
<!-- {{item.streamName}}-->
<el-tooltip ref="tlp" :content="item.streamName" placement="bottom" :disabled="item.isShowTooltip == undefined || item.isShowTooltip == false">
... ...
... ... @@ -153,7 +153,7 @@ export default {
let title = `${row.faultBody}${row.faultNo})诊断报告`;
let configId = row.faultconfid;
// 设置相信信息
proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"90%","90%")
proxy.$global.openBlankWindow(`/vue3/index.html#/fault/result/faultDetail?faultNo=${row.faultNo}&faultTitle=${title}&configId=${configId}`,"80%","90%")
},
render: function (row) {
return `<span style="text-decoration: underline;color: blue;">${row.faultBody}</span>`
... ...