From d4cd7df0bd1484c31e37bcb0642e89ecdcf7ab29 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 17 九月 2020 10:55:22 +0800
Subject: [PATCH] 处理外网端口映射无法跳转的问题

---
 src/pages/cameraAccess/components/SeparateRules.vue |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/pages/cameraAccess/components/SeparateRules.vue b/src/pages/cameraAccess/components/SeparateRules.vue
index a92430e..d372181 100644
--- a/src/pages/cameraAccess/components/SeparateRules.vue
+++ b/src/pages/cameraAccess/components/SeparateRules.vue
@@ -106,7 +106,7 @@
             :showRealPoll="cameraType === 'camera'"
             :ShowLocalVedio="cameraType === 'dataStack'"
             v-if="showSysInfo"
-            style="margin-left: 10px;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')
+ 
         }
       });
     },
@@ -520,16 +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%;
-
-      // height: 124px;
+      width: 86%;
     }
     .swiper-slide {
       position: relative;
@@ -568,10 +572,6 @@
           backdrop-filter: blur(1px) brightness(100%);
           display: none;
         }
-
-        // @media screen and(max-width: 1280px) {
-        //   max-width: 110px;
-        // }
         @media screen and(max-width: 1440px) {
           max-width: 110px;
         }
@@ -613,8 +613,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;
@@ -783,13 +792,6 @@
     color: #3d68e1;
     margin-left: 10px;
     font-size: 14px;
-  }
-  .task-tip {
-    font-family: PingFangSC-Regular;
-    font-size: 12px;
-    color: #cccccc;
-    margin-top: 10%;
-    margin-left: 38%;
   }
 
   .marker {

--
Gitblit v1.8.0