From c99cad106ef5be9f818e45d385dfdcec29ce19e5 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 03 十二月 2020 16:52:24 +0800
Subject: [PATCH] 修复绘制多边形撤销错误的bug
---
src/components/subComponents/ModelCard.vue | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 53946a4..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"
@@ -41,7 +41,7 @@
<span class="fontStyleForModel" style="font-weight:normal">{{ data.picDate | formatTime }}</span>
</p>
<p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span> <span class="fontStyleForModel" style="margin-left:20px;">{{ data.analyServerName }}</span>
+ <span class="fontStyleForModel">{{ data.cameraAddr }}</span> <span class="fontStyleForModel analyServer" style="margin-left:20px;">{{ data.analyServerName }}</span>
</p>
<p>
@@ -64,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'">
@@ -351,12 +351,14 @@
}
},
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,
};
},
--
Gitblit v1.8.0