From ddb0df2153bc75e54c3f7c1049be663d4d2dba96 Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 15 八月 2020 19:10:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/vue-smart-ai
---
src/pages/cameraAccess/index/App.vue | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index d320c13..bf4b566 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -4,7 +4,7 @@
<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" :edit="editTree" :height="screenHeight"></left-nav>
</div>
</div>
<div class="column-right" >
@@ -37,13 +37,14 @@
}
},
mounted() {
+ debugger
this.screenHeight = document.documentElement.clientHeight;
window.onresize = () => {
return (() => {
this.screenHeight = document.documentElement.clientHeight;
})();
};
- debugger
+
this.leftWith = this.$refs['left'].offsetWidth;
},
methods: {
@@ -63,7 +64,10 @@
height: 100%;
}
.column-left {
- height: inherit;
+ height: 100%;
+ padding-bottom: 20px;
+ box-sizing: border-box;
+ // height: inherit;
background-color: #fff;
position: relative;
}
--
Gitblit v1.8.0