From 1e09a7a01a6c1888e1a2a832eb007fb8c2b653a0 Mon Sep 17 00:00:00 2001 From: ZZJ <zzjdsg2300@163.com> Date: 星期三, 26 一月 2022 11:06:27 +0800 Subject: [PATCH] Merge branch 'bhomebus' of http://192.168.5.5:10010/r/web/vue-smart-ai into bhomebus --- src/pages/cameraAccess/index/App.vue | 74 +++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 23 deletions(-) diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue index c88ca57..cc9702d 100644 --- a/src/pages/cameraAccess/index/App.vue +++ b/src/pages/cameraAccess/index/App.vue @@ -1,13 +1,17 @@ <template> - <div class="column"> - <div class="column-left" :style="`height:${screenHeight}px;`"> + <div class="column" :style="`height:${screenHeight}px;`"> + <div class="column-left" ref="left"> <div class="resize-bar"></div> <div class="resize-line"></div> <div class="resize-save"> - <left-nav :appName="'Video'" :height="screenHeight - 40"></left-nav> + <left-nav + :appName="app" + :height="screenHeight" + ref="leftTree" + ></left-nav> </div> </div> - <div class="column-right" :style="`height:${screenHeight}px;`"> + <div class="column-right"> <right-side /> </div> </div> @@ -16,46 +20,68 @@ <script> import LeftNav from "@/components/LeftNav"; // import CameraVideo from "./components/Video.vue"; -import RightSide from "./VideoManage" +import RightSide from "./VideoManage"; +import { getUrlKey } from "@/api/utils"; export default { - name: "SearchPage", + name: "VideoManage", components: { LeftNav, - RightSide + RightSide, + }, + computed: { + app() { + return getUrlKey("dataStack") !== null ? "DataStack" : "Camera"; + }, }, data() { return { + leftWith: 0, screenHeight: 0, - } - }, - mounted() { - this.screenHeight = document.documentElement.clientHeight - 20; - window.onresize = () => { - return (() => { - this.screenHeight = document.documentElement.clientHeight - 20; - })(); }; }, + mounted() { + this.screenHeight = document.documentElement.clientHeight; + window.onresize = () => { + return (() => { + this.screenHeight = document.documentElement.clientHeight; + })(); + }; + + this.leftWith = this.$refs["left"].offsetWidth; + this.TreeDataPool.readonly = false; + this.TreeDataPool.gbReadonly = false; + this.DataStackPool.readonly = false; + }, + methods: {}, }; </script> <style lang="scss" scoped> .column { 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 { - height: 100%; - padding: 16px; + height: 100vh; background-color: #eee; box-sizing: border-box; - overflow: hidden; + overflow: scroll; +} +.heigher-index { + position: absolute; + top: 0; + z-index: 10; + width: 100%; + height: 100%; } .resize-save { position: absolute; @@ -64,17 +90,19 @@ bottom: 0; left: 0; padding: 16px; + padding-top: 8px; overflow-x: hidden; + overflow-y: hidden; } .resize-bar { - width: 310px; + width: 338px; height: inherit; resize: horizontal; cursor: ew-resize; opacity: 0; overflow: scroll; max-width: 500px; //璁惧畾鏈�澶ф媺浼搁暱搴� - min-width: 310px; //璁惧畾鏈�灏忓搴� + min-width: 33px; //璁惧畾鏈�灏忓搴� } /* 鎷栨嫿绾� */ .resize-line { @@ -82,8 +110,8 @@ right: 0; top: 0; bottom: 0; - border-right: 2px solid #eee; - border-left: 1px solid #bbb; + border-right: 2px solid #efefef; + border-left: 1px solid #e0e0e0; pointer-events: none; } .resize-bar:hover ~ .resize-line, -- Gitblit v1.8.0