From 4652707705b3277d0341a945bff00960b3d905cc Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期二, 27 十月 2020 14:00:51 +0800
Subject: [PATCH] release V1.1.0 修改webpack，分离了chunkjs到各个应用
---
src/components/subComponents/ModelCard.vue | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 7c07467..53946a4 100644
--- a/src/components/subComponents/ModelCard.vue
+++ b/src/components/subComponents/ModelCard.vue
@@ -38,10 +38,13 @@
v-if="data.targetInfo == null || data.targetInfo[0].picSmUrl == ''"
>
<p>
- <span class="fontStyleForModel">{{ data.picDate | formatTime }}</span>
+ <span class="fontStyleForModel" style="font-weight:normal">{{ data.picDate | formatTime }}</span>
</p>
<p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
+ <span class="fontStyleForModel">{{ data.cameraAddr }}</span> <span class="fontStyleForModel" style="margin-left:20px;">{{ data.analyServerName }}</span>
+ </p>
+ <p>
+
</p>
<p style="width:100%">
<span v-for="(item,index) in data.alarmRules" :key="index+'rule'">
@@ -148,15 +151,15 @@
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | sex}}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[1]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | idCard}}</span>
</p>
<p>
<span class="labelInfo">鎵嬫満鍙�</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[2]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | phoneNum}}</span>
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
@@ -255,15 +258,15 @@
</p>
<p>
<span class="labelInfo">鎬у埆</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[0]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | sex}}</span>
</p>
<p>
<span class="labelInfo">韬唤璇佸彿</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[1]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | idCard}}</span>
</p>
<p>
<span class="labelInfo">鎵嬫満鍙�</span>
- <span class="val">{{data.baseInfo[initialIndex].labels.split("/")[2]}}</span>
+ <span class="val">{{data.baseInfo[initialIndex].labels | phoneNum}}</span>
</p>
<p>
<span class="labelInfo">浜哄憳绛夌骇</span>
@@ -321,6 +324,30 @@
},
percentage(score) {
return score.toFixed(2) + "%"
+ },
+ sex(v) {
+ try {
+ let obj = JSON.parse(v)
+ return obj.sex
+ } catch (error) {
+ return v.split("/")[0]
+ }
+ },
+ idCard(v) {
+ try {
+ let obj = JSON.parse(v)
+ return obj.idCard
+ } catch (error) {
+ return v.split("/")[1]
+ }
+ },
+ phoneNum(v) {
+ try {
+ let obj = JSON.parse(v)
+ return obj.phone
+ } catch (error) {
+ return v.split("/")[2]
+ }
}
},
mounted() {
@@ -463,10 +490,9 @@
b {
//color: #e43933;
}
- width: 40%;
text-align: left;
- float: left;
- margin: 4px 0px;
+ margin: 4px 0;
+
}
}
.describeBigImage {
--
Gitblit v1.8.0