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/LeftNav.vue | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index bc714e8..055b299 100644
--- a/src/components/LeftNav.vue
+++ b/src/components/LeftNav.vue
@@ -210,7 +210,7 @@
<el-tab-pane
label="鏁版嵁鏍�"
name="dataStack"
- :style="`height:${height - 56}px;`"
+
v-if="showDataStack"
>
<div class="local-vedio-area">
@@ -258,7 +258,7 @@
</div>
<!-- 鏈湴瑙嗛婧愬垪琛� -->
- <div class="dev-vedio-list">
+ <div class="dev-vedio-list" >
<!-- 娣诲姞鏂囦欢澶瑰浘鏍� -->
<div class="tree-edit area-add" v-show="!DataStackPool.readonly">
<el-tooltip content="娣诲姞鏂囦欢澶�" placement="bottom" popper-class="atooltip">
@@ -871,15 +871,17 @@
}
.dev-vedio-list {
padding: 0 15px;
- max-height: 740px;
+ box-sizing: border-box;
+ height: calc(100vh - 80px);
+ //max-height: 740px;
overflow-x: hidden;
overflow-y: auto;
- @media screen and (max-height: 720px) {
- max-height: 580px;
- }
- @media screen and (min-height: 900px) {
- max-height: 740px;
- }
+ // @media screen and (max-height: 720px) {
+ // max-height: 580px;
+ // }
+ // @media screen and (min-height: 900px) {
+ // max-height: 740px;
+ // }
}
.dev-vedio-list::-webkit-scrollbar {
/*婊氬姩鏉℃暣浣撴牱寮�*/
--
Gitblit v1.8.0