From 21a340c24815a55a07db2dc3d2e5a19e7de440cd Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 29 八月 2020 19:27:57 +0800
Subject: [PATCH] 添加摄像机区域管理应用

---
 src/pages/cameraAccess/index/VideoManage.vue |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index c7369b9..2cba6b9 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="s-video-manage">
-    <el-tabs class="video-tab" v-model="activeName" type="border-card" @tab-click="handleClick">
+    <el-tabs class="video-tab" ref="topTab" v-model="activeName" type="border-card" @tab-click="handleClick">
       <el-tab-pane
         :label="firstLabeName"
         name="camera-info"
@@ -50,7 +50,7 @@
 // import fTemplate from "@/components/common/fTemplate";
 // import localSeparate from "@/components/camera/localSeparate";
 
-//import bus from "@/main";
+import bus from "@/plugin/bus";
 //import TreeDataPool from "@/Pool/TreeData";
 
 export default {
@@ -123,7 +123,8 @@
         })
       },
       deep: true
-    }
+    },
+    
   },
   created() {
     if (this.TreeDataPool.treeActiveName == 'camera') {
@@ -160,13 +161,13 @@
   },
   mounted() {
     this.$nextTick(() => {
-      //   bus.$on("addCameraOnTree", node => {
-      //     this.handAddDevice(node);
-      //   });
-      //   bus.$on("addDirOnTree", node => {
-      //     this.handAddDIr(node);
-      //   });
-      //   this.TreeDataPool.clean();
+      bus.$on("addCameraOnTree", node => {
+        this.handAddDevice(node);
+      });
+      bus.$on("addDirOnTree", node => {
+        this.handAddDIr(node);
+      });
+      this.TreeDataPool.clean();
     });
 
     let _this = this
@@ -249,17 +250,15 @@
     width: 100%;
     &.video-tab{
       &>.el-tabs__header{
-        position: fixed;
-        top:0;
-        
-        width:100%;
-        z-index:999;
+        //position: fixed;
+        //position: absolute;
+        //top:0;
+        //left: 0;
         height: 54px;
         overflow-y: hidden;
       }
     }
     .el-tabs__header {
-       
       .is-active {
         color: #3d68e1 !important;
       }
@@ -286,16 +285,17 @@
       }
     }
   }
-  .video-tab>.el-tabs__content {
+  .video-tab > .el-tabs__content {
     width: 100%;
-    margin-top: 52px;
-    //height: calc(100% - 52px);
+    //margin-top: 52px;
+    height: calc(100% - 78px);
     box-sizing: border-box;
-    padding: 13px 0;
+    overflow-y: auto;
+    padding: 0;
   }
   .el-tab-pane {
     width: 100%;
-    height: 100%;
+    //height: 100%;
   }
 }
 </style>

--
Gitblit v1.8.0