From 929cf4c7be11bfd1e134d0cb0d7cbbe94772ebdf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期一, 07 九月 2020 15:35:14 +0800
Subject: [PATCH] 摄像机树增加导入功能

---
 src/pages/library/components/carList.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/library/components/carList.vue b/src/pages/library/components/carList.vue
index 9e03c14..0b4f134 100644
--- a/src/pages/library/components/carList.vue
+++ b/src/pages/library/components/carList.vue
@@ -196,7 +196,7 @@
         tooltip-effect="dark"
         style="width: 100%;"
         :fit="true"
-        :max-height="tableHeight"
+      
         :default-sort="{prop: 'createTime', order: 'descending'}"
         @selection-change="handleSelectionChange"
         :header-cell-style="{background:'#f8f8f8',color:'#222222'}"
@@ -1294,8 +1294,8 @@
   .el-drawer.ltr,
   .el-drawer.rtl {
     width: 27% !important;
-    height: 90%;
-    top: 9%;
+    //height: 90%;
+    //top: 9%;
     .el-drawer__header {
       border-bottom: 2px solid #eee;
       padding-bottom: 10px;
@@ -1445,9 +1445,9 @@
 .el-drawer.rtl {
   min-width: 450px;
   width: 25% !important;
-  height: 90%;
-  min-height: 1100px;
-  top: 9%;
+  //height: 90%;
+  //min-height: 1100px;
+  //top: 9%;
   .el-drawer__header {
     border-bottom: 2px solid #eee;
     padding-bottom: 10px;
@@ -1460,7 +1460,8 @@
 }
 
 .drawerSpace {
-  height: 900px;
+  height: calc(100% - 140px);
+  box-sizing: border-box;
   margin-bottom: 30px;
   overflow-y: scroll;
   .uploadLine {

--
Gitblit v1.8.0