From 681c802826e3ce47f428358cf6b4838712f54de1 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期五, 05 三月 2021 15:52:00 +0800
Subject: [PATCH] 全景追踪关联摄像机轮播组件标题部分样式更新；检索查询详情卡片摄像机名称限制展示宽度；事件推送人员等级选项调试
---
src/components/subComponents/ModelCard.vue | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/components/subComponents/ModelCard.vue b/src/components/subComponents/ModelCard.vue
index 53946a4..19c543b 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>
@@ -63,8 +63,8 @@
<p>
<span class="fontStyleForModel">{{ data.picDate | formatTime}}</span>
</p>
- <p>
- <span class="fontStyleForModel">{{ data.cameraAddr }}</span>
+ <p class="align-right">
+ <span class="fontStyleForModel camera-addr" :title="data.cameraAddr">{{ 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,
};
},
@@ -501,6 +503,17 @@
float: left;
margin-top: 5px;
p {
+ &.align-right{
+ text-align: right;
+ .camera-addr{
+ display: inline-block;
+ vertical-align: top;
+ width: 90px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+ }
b {
//color: #e43933;
}
--
Gitblit v1.8.0