From c99cad106ef5be9f818e45d385dfdcec29ce19e5 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期四, 03 十二月 2020 16:52:24 +0800
Subject: [PATCH] 修复绘制多边形撤销错误的bug

---
 src/pages/cameraAccess/index/App.vue |   57 ++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index 5e0faaf..ab129ce 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -4,10 +4,10 @@
       <div class="resize-bar"></div>
       <div class="resize-line"></div>
       <div class="resize-save">
-        <left-nav :appName="app" :edit="editTree"></left-nav>
+        <left-nav :appName="app" :height="screenHeight"></left-nav>
       </div>
     </div>
-    <div class="column-right" >
+    <div class="column-right">
       <right-side />
     </div>
   </div>
@@ -25,29 +25,32 @@
     RightSide
   },
   computed: {
-    app() {
+    app () {
       return this.getUrlKey() !== null ? "DataStack" : "Camera"
     }
   },
-  data() {
+  data () {
     return {
       leftWith: 0,
-      screenHeight: 0,
-      editTree: true
+      screenHeight: 0
     }
   },
-  mounted() {
+  mounted () {
     this.screenHeight = document.documentElement.clientHeight;
     window.onresize = () => {
       return (() => {
         this.screenHeight = document.documentElement.clientHeight;
       })();
     };
-    debugger
-    this.leftWith = this.$refs['left'].width;
+
+    this.leftWith = this.$refs['left'].offsetWidth;
+    this.TreeDataPool.readonly = false;
+    this.TreeDataPool.gbReadonly = false;
+    this.DataStackPool.readonly = false;
+
   },
   methods: {
-    getUrlKey() {
+    getUrlKey () {
       let name = "dataStack"
       return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
     }
@@ -57,23 +60,31 @@
 
 <style lang="scss" scoped>
 .column {
-  //overflow: hidden;
-  display: flex;
-  width: 100%;
+  overflow: hidden;
+  min-width: 1399px;
+  //min-width: 1920px;
+  height: 100%;
 }
 .column-left {
-  height: inherit;
   background-color: #fff;
   position: relative;
+  float: left;
+  height: 100vh;
 }
 .column-right {
-  min-width: 1442px;
-  flex:1;
-  position: relative;
-  background-color: #fff;
+  height: 100vh;
+  background-color: #eee;
   box-sizing: border-box;
-  overflow: auto;
-  //height: 100%;
+  //overflow: hidden;
+  overflow-y: hidden;
+  overflow-x: auto;
+}
+.heigher-index {
+  position: absolute;
+  top: 0;
+  z-index: 10;
+  width: 100%;
+  height: 100%;
 }
 .resize-save {
   position: absolute;
@@ -81,7 +92,8 @@
   right: 5px;
   bottom: 0;
   left: 0;
-  padding: 14px;
+  padding: 16px;
+  padding-top: 8px;
   overflow-x: hidden;
   overflow-y: hidden;
 }
@@ -104,7 +116,6 @@
   border-right: 2px solid #efefef;
   border-left: 1px solid #e0e0e0;
   pointer-events: none;
-  cursor: ew-resize;
 }
 .resize-bar:hover ~ .resize-line,
 .resize-bar:active ~ .resize-line {
@@ -123,7 +134,7 @@
   }
   .resize-bar:hover ~ .resize-line::after,
   .resize-bar:active ~ .resize-line::after {
-    content: "";
+    content: '';
     position: absolute;
     width: 16px;
     height: 16px;

--
Gitblit v1.8.0