From ecb6cadc3f016cf9968f48e0cc77479a1e56365b Mon Sep 17 00:00:00 2001 From: hanbaoshan <hanbaoshan@aiotlink.com> Date: 星期日, 20 十二月 2020 17:32:06 +0800 Subject: [PATCH] 标定添加关联摄像机tab,绘制区域组件参数更新 --- src/components/subComponents/ModelCard.vue | 56 ++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue index 7c07467..0450892 100644 --- a/src/components/subComponents/ModelCard.vue +++ b/src/components/subComponents/ModelCard.vue @@ -1,6 +1,6 @@ <template> <div class="model-card-box" :style="`height:${height};width:${width};`"> - <el-tabs style="height: 100%;" @before-leave="changeTabs" v-model="VideoPhotoData.activeName"> + <el-tabs style="height: 100%;" @before-leave="changeTabs" v-model="activeName"> <el-tab-pane label="澶у浘" name="pic"> <div class="model-card-box-left" @@ -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 analyServer" 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'"> @@ -61,7 +64,7 @@ <span class="fontStyleForModel">{{ data.picDate | formatTime}}</span> </p> <p> - <span class="fontStyleForModel">{{ data.cameraAddr }}</span> + <span class="fontStyleForModel">{{ data.cameraAddr }}</span> <span class="fontStyleForModel analyServer" style="margin-left:20px;">{{ data.analyServerName }}</span> </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,15 +324,41 @@ }, 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() { + console.log('ModelCard data',this.data); console.log(this.data.baseInfo) console.log(this.initialIndex) - this.VideoPhotoData.activeName = "pic" + //this.VideoPhotoData.activeName = "pic" }, data() { return { + activeName:'pic', initialIndex: 0, }; }, @@ -463,10 +492,9 @@ b { //color: #e43933; } - width: 40%; text-align: left; - float: left; - margin: 4px 0px; + margin: 4px 0; + } } .describeBigImage { -- Gitblit v1.8.0