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 | 45 +++++++++++++++++++++------------------------ 1 files changed, 21 insertions(+), 24 deletions(-) diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue index ab129ce..cc9702d 100644 --- a/src/pages/cameraAccess/index/App.vue +++ b/src/pages/cameraAccess/index/App.vue @@ -4,7 +4,11 @@ <div class="resize-bar"></div> <div class="resize-line"></div> <div class="resize-save"> - <left-nav :appName="app" :height="screenHeight"></left-nav> + <left-nav + :appName="app" + :height="screenHeight" + ref="leftTree" + ></left-nav> </div> </div> <div class="column-right"> @@ -16,26 +20,27 @@ <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: "VideoManage", components: { LeftNav, - RightSide + RightSide, }, computed: { - app () { - return this.getUrlKey() !== null ? "DataStack" : "Camera" - } + app() { + return getUrlKey("dataStack") !== null ? "DataStack" : "Camera"; + }, }, - data () { + data() { return { leftWith: 0, - screenHeight: 0 - } + screenHeight: 0, + }; }, - mounted () { + mounted() { this.screenHeight = document.documentElement.clientHeight; window.onresize = () => { return (() => { @@ -43,25 +48,19 @@ })(); }; - this.leftWith = this.$refs['left'].offsetWidth; + this.leftWith = this.$refs["left"].offsetWidth; this.TreeDataPool.readonly = false; this.TreeDataPool.gbReadonly = false; this.DataStackPool.readonly = false; - }, - methods: { - getUrlKey () { - let name = "dataStack" - return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null - } - } + methods: {}, }; </script> <style lang="scss" scoped> .column { overflow: hidden; - min-width: 1399px; + //min-width: 1399px; //min-width: 1920px; height: 100%; } @@ -75,9 +74,7 @@ height: 100vh; background-color: #eee; box-sizing: border-box; - //overflow: hidden; - overflow-y: hidden; - overflow-x: auto; + overflow: scroll; } .heigher-index { position: absolute; @@ -98,7 +95,7 @@ overflow-y: hidden; } .resize-bar { - width: 310px; + width: 338px; height: inherit; resize: horizontal; cursor: ew-resize; @@ -134,7 +131,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