From 013c4922a3296e95a54c1902c09b44d62a000eb2 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 27 七月 2022 17:14:02 +0800
Subject: [PATCH] Merge branch 'shandong' of ssh://192.168.5.5:29418/web/saas-web into shandong
---
src/views/search/components/CardItem.vue | 122 ++++++++++++++++++++++++++++++----------
1 files changed, 90 insertions(+), 32 deletions(-)
diff --git a/src/views/search/components/CardItem.vue b/src/views/search/components/CardItem.vue
index f192109..1446eff 100644
--- a/src/views/search/components/CardItem.vue
+++ b/src/views/search/components/CardItem.vue
@@ -36,10 +36,15 @@
class="s-card-left-isCompare-div compareScore111"
:style="{
bottom: '0',
- background: getUrl(data.baseInfo[initialIndex].bwType),
+ background: getUrl(
+ data.baseInfo[initialIndex] && data.baseInfo[initialIndex].bwType
+ ),
}"
>
- <b>{{ data.baseInfo[initialIndex].compareScore | percentage }}</b>
+ <b>{{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].compareScore | percentage
+ }}</b>
</div>
</div>
</div>
@@ -155,21 +160,47 @@
<p>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].tableName
+ "
+ >{{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].tableName
+ }}</span
>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span
- >
- <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].targetName
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].targetName
+ }}</span
>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].labels
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].labels | idCard
+ }}</span
+ >
+ <span
+ class="fontStyle"
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].monitorLevel
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].monitorLevel
+ }}</span
>
</p>
</div>
@@ -188,6 +219,7 @@
>
<span
:style="
+ data.baseInfo[initialIndex] &&
data.baseInfo[initialIndex].bwType === '1'
? 'color: red;font-size:12px;line-height:20px'
: 'font-size:12px;line-height:20px'
@@ -195,21 +227,47 @@
>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].tableName"
- >{{ data.baseInfo[initialIndex].tableName }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].tableName
+ "
+ >{{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].tableName
+ }}</span
>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].targetName"
- >/ {{ data.baseInfo[initialIndex].targetName }}</span
- >
- <span class="fontStyle" v-if="data.baseInfo[initialIndex].labels"
- >/ {{ data.baseInfo[initialIndex].labels | idCard }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].targetName
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].targetName
+ }}</span
>
<span
class="fontStyle"
- v-if="data.baseInfo[initialIndex].monitorLevel"
- >/ {{ data.baseInfo[initialIndex].monitorLevel }}</span
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].labels
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].labels | idCard
+ }}</span
+ >
+ <span
+ class="fontStyle"
+ v-if="
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].monitorLevel
+ "
+ >/ {{
+ data.baseInfo[initialIndex] &&
+ data.baseInfo[initialIndex].monitorLevel
+ }}</span
>
</span>
</el-button>
@@ -225,9 +283,9 @@
<el-tooltip content="鍔犲叆搴曞簱" placement="top" popper-class="atooltip">
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
<!-- 搴曞簱浜哄憳妯″紡 -->
@@ -260,7 +318,7 @@
{{ data.baseInfo[0].tableName }}
</p>
<p :style="data.baseInfo[0].bwType == '0' ? '' : 'color:red'">
- <span>{{ data.baseInfo[0].targetName }}</span
+ <span>{{ data.baseInfo[0] && data.baseInfo[0].targetName }}</span
>
<span v-if="data.baseInfo[0].labels"
>/ {{ data.baseInfo[0].labels | idCard }}</span
@@ -364,9 +422,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -389,9 +447,9 @@
>
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2" @click="dialogVisible = true"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
@@ -485,7 +543,7 @@
<el-tooltip
placement="right"
popper-class="atooltip"
- v-if="data.baseInfo && data.baseInfo[0].targetName != ''"
+ v-if="data.baseInfo[0] && data.baseInfo[0].targetName != ''"
>
<div slot="content">
<p v-for="(item, index) in data.baseInfo" :key="index + 'base1'">
@@ -584,9 +642,9 @@
<el-tooltip content="璇︽儏" placement="top" popper-class="atooltip">
<i class="iconfont iconcaidan" @click="detailsClick($event)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
<!-- :class="
data.isAlarm ? 'iconfont systemmm' : 'iconfont systemxing'
"-->
@@ -612,9 +670,9 @@
>
<i class="iconfont icontianjiaren" @click="toAdd(data)"></i>
</el-tooltip>
- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
+ <!-- <el-tooltip content="鏀惰棌" placement="top" popper-class="atooltip">
<i class="iconfont iconshoucang2"></i>
- </el-tooltip>
+ </el-tooltip> -->
</div>
</div>
</div>
--
Gitblit v1.8.0