From aaf3198eb598932a788561d715bdf2a91330d259 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 13 八月 2020 14:53:19 +0800
Subject: [PATCH] 左侧树高度超出显示滚动条,鼠标移入应用小图标显示实时快照,样式调整

---
 src/pages/cameraVideo/index/Video.vue |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/cameraVideo/index/Video.vue b/src/pages/cameraVideo/index/Video.vue
index 789a470..8bc9049 100644
--- a/src/pages/cameraVideo/index/Video.vue
+++ b/src/pages/cameraVideo/index/Video.vue
@@ -29,7 +29,7 @@
         </div>
         <div
           :class="guid === 1 ? 'video-main-box' : 'video-main-box-side'"
-          style="width: 100%; height: calc(100% - 52px);"
+          style="width: 100%; height: calc(100% - 35px);"
           v-if="visibilityState"
         >
           <video-item
@@ -555,7 +555,7 @@
 .monitoring-right {
   width: 100%;
   height: 100%;
-  min-width: 1243px;
+  min-width: 981px;
   //float: right;
   box-sizing: border-box;
   padding: 10px;
@@ -564,7 +564,7 @@
     width: 70.5%;
     min-width: 740px;
     max-width: 1208px;
-    height: 75%;
+    height: 71%;
     float: left;
     box-sizing: border-box;
     // box-shadow: #e4e7ed 0px 0px 9px inset;
@@ -613,7 +613,7 @@
     //width: calc(29.5% - 10px);
     width: calc(34% - 10px);
     //width: auto;
-    height: 73%;
+    height: 70.5%;
     background-color: #fff;
     float: left;
     margin: 0px 0px 0px 10px;
@@ -626,11 +626,11 @@
 
   .monitoring-photo {
     width: 100%;
-    height: calc(25% + 10px);
+    height: calc(25% + 32px);
     background-color: #fff;
     float: left;
     padding: 10px;
-    margin-top: -10px;
+    //margin-top: -10px;
     box-sizing: border-box;
     border: 1px solid #e4e7ed;
     // box-shadow: #e4e7ed 0px 0px 9px inset;

--
Gitblit v1.8.0