From 2a2c2c4bedd9328f0d7fad78e58e2ac74dface43 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期三, 09 九月 2020 19:26:00 +0800
Subject: [PATCH] 摄像机配置限制最小宽度

---
 src/pages/cameraAccess/components/SeparateRules.vue |   44 +++++++++++++++++++++++++++++++++++---------
 1 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index 807cc3b..cd82320 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -61,7 +61,7 @@
             v-if="Camera.analytics"
             class="flex-box"
           >
-            <span >绠楁硶蹇�熼�氶亾</span>
+            <span class="label">绠楁硶蹇�熼�氶亾</span>
             <div class="channel flex-box" >
               <el-tooltip
                 effect="dark"
@@ -95,7 +95,7 @@
 
     <div class="devide"></div>
 
-    <div class="top" style="top:60px;">
+    <div class="top" >
       <p class="task-css">
         <b style="font-size: 14px; line-height: 18px;">鍦烘櫙</b>
       </p>
@@ -106,7 +106,7 @@
             :showRealPoll="cameraType === 'camera'"
             :ShowLocalVedio="cameraType === 'dataStack'"
             v-if="showSysInfo"
-            style="margin-left: 25px;margin-top:-10px"
+            style="margin-top:-10px"
           />
         </div>
       </div>
@@ -253,7 +253,8 @@
     };
   },
   mounted() {
-    this.mockAsync()
+    this.mockAsync();
+    this.PollData.statistics();
   },
 
   methods: {
@@ -320,6 +321,7 @@
     saveSceneRule(groupRule) {
       const payload = { ...groupRule }
       payload.cameraIds = [this.Camera.cameraId];
+      let _this = this;
       saveCameraScene(payload).then(rsp => {
         if (rsp && rsp.success) {
           this.Camera.update();
@@ -327,6 +329,10 @@
             type: "success",
             message: "绛栫暐淇濆瓨鎴愬姛锛�"
           });
+          //鍒锋柊宸︿晶鏍�
+          debugger
+          _this.$root.$children[0].$children[0].querySearchAsync('camera')
+ 
         }
       });
     },
@@ -470,7 +476,7 @@
 <style lang="scss">
 .s-separate-rules {
   width: 100%;
-
+  padding: 13px 0 20px;
   .ai {
     //width: calc(100% + 76px);
     // height: 38px;
@@ -484,8 +490,18 @@
       -webkit-box-sizing: border-box;
       box-sizing: border-box;
       .ai-select{
+        text-align: left;
         line-height: 30px;
         height: 30px;
+        .flex-box{
+          .label{
+            &+label,&+div{
+              margin-left: 10px;
+              line-height: 1;
+            }
+            
+          }
+        }
       }
       .ai-select>div{
         display: inline-block;
@@ -494,6 +510,7 @@
         
         .channel{
           display: inline-block;
+          vertical-align: middle;
         }
       }
     }
@@ -509,14 +526,14 @@
     .swiper-box {
       height: 100%;
       float: left;
-      width: 48%;
+      width: 46%;
       margin-top: -10px;
       position: relative;
     }
     .swiper-container {
       position: initial;
       min-width: 472px;
-      width: 80%;
+      width: 86%;
 
       // height: 124px;
     }
@@ -602,8 +619,17 @@
     }
     .top-right {
       float: right;
-      width: 52%;
+      width: 54%;
       height: 144px;
+      .card-box{
+        width: 54%!important;
+      }
+      .eCharts-box{
+        width: 45%;
+        canvas{
+          width: 98%!important;
+        } 
+      }
     }
     .task-css {
       text-align: left;
@@ -612,7 +638,7 @@
   }
   .bottom {
     width: 100%;
-  
+    margin-bottom: 15px;
     .bottom-side {
       height: 100%;
       width: 250px;

--
Gitblit v1.8.0