From 24886024f56264fe5453a331bc076a52c19dc5bb Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 06 八月 2020 13:38:16 +0800
Subject: [PATCH] 区域/时间规则/系统维护/实时监控/应用窗口全屏布局更新

---
 src/pages/cameraVideo/index/App.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/cameraVideo/index/App.vue b/src/pages/cameraVideo/index/App.vue
index ccaf13f..b2fc260 100644
--- a/src/pages/cameraVideo/index/App.vue
+++ b/src/pages/cameraVideo/index/App.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="column">
-    <div class="column-left" :style="`height:${screenHeight}px;`">
+    <div class="column-left" >
       <div class="resize-bar"></div>
       <div class="resize-line"></div>
       <div class="resize-save">
         <left-nav :appName="'Camera'" :height="screenHeight - 40"></left-nav>
       </div>
     </div>
-    <div class="column-right" :style="`height:${screenHeight}px;`">
+    <div class="column-right" >
       <right-side />
     </div>
     <card-window></card-window>
@@ -44,7 +44,7 @@
 
 <style lang="scss" scoped>
 .column {
-  overflow: hidden;
+  height:100%;
 }
 .column-left {
   height: inherit;
@@ -57,6 +57,7 @@
   background-color: #fff;
   box-sizing: border-box;
   overflow: hidden;
+  
 }
 .resize-save {
   position: absolute;
@@ -64,7 +65,7 @@
   right: 5px;
   bottom: 0;
   left: 0;
-  padding: 16px;
+  padding: 14px;
   overflow-x: hidden;
 }
 .resize-bar {
@@ -84,8 +85,8 @@
   top: 0;
   bottom: 0;
   z-index: 100;
-  border-right: 2px solid #eee;
-  border-left: 1px solid #bbb;
+  border-right: 2px solid #efefef;
+  border-left: 1px solid #e0e0e0;
   pointer-events: none;
 }
 .resize-bar:hover ~ .resize-line,

--
Gitblit v1.8.0