From d7c6e0d1ec18f391243f77eb62bcb111378cb40f Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期一, 21 十二月 2020 10:13:46 +0800
Subject: [PATCH] 修复清空关联设备分组默认选中第一个添加执行条件
---
src/components/LeftNav.vue | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/components/LeftNav.vue b/src/components/LeftNav.vue
index 947c935..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">
@@ -238,7 +238,7 @@
size="small"
clearable
@input="querySearchAsync('dir')"
- :style="'width:103px;'"
+ :style="'width:148px;'"
>
<i
class="el-icon-search el-input__icon"
@@ -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">
@@ -531,6 +531,9 @@
this.timeout = setTimeout(() => {
if (type === "camera") {
this.TreeDataPool.fetchTreeData();
+ }
+ if(type === "cluster"){
+ this.TreeDataPool.fetchClusterTree();
}
if (type === "dir") {
this.DataStackPool.fetchFiles();
@@ -868,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 {
/*婊氬姩鏉℃暣浣撴牱寮�*/
@@ -896,7 +901,7 @@
}
.tree-edit {
- z-index: 1;
+ z-index: 2;
font-size: 16px;
position: absolute;
top: 56px;
--
Gitblit v1.8.0