From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/cameraAccess/index/App.vue | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index d320c13..f3325ed 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -1,13 +1,17 @@
<template>
- <div class="column" :style="`height:${screenHeight}px;`">
+ <div class="column">
<div class="column-left" ref="left">
<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"
+ ref="leftTree"
+ ></left-nav>
</div>
</div>
- <div class="column-right" >
+ <div class="column-right">
<right-side />
</div>
</div>
@@ -16,25 +20,25 @@
<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"
- }
+ return getUrlKey("dataStack") !== null ? "DataStack" : "Camera";
+ },
},
data() {
return {
leftWith: 0,
screenHeight: 0,
- editTree: true
- }
+ };
},
mounted() {
this.screenHeight = document.documentElement.clientHeight;
@@ -43,39 +47,41 @@
this.screenHeight = document.documentElement.clientHeight;
})();
};
- debugger
- 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-y: 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 {
- position: relative;
- flex:1;
- background-color: #fff;
+ height: 100vh;
+ background-color: #eee;
box-sizing: border-box;
- overflow-y: hidden;
-
+ overflow: scroll;
+}
+.heigher-index {
+ position: absolute;
+ top: 0;
+ z-index: 10;
+ width: 100%;
height: 100%;
- min-width: 1433px;
}
.resize-save {
position: absolute;
@@ -83,12 +89,13 @@
right: 5px;
bottom: 0;
left: 0;
- padding: 14px;
+ padding: 16px;
+ padding-top: 8px;
overflow-x: hidden;
- overflow-y: hidden;
+ overflow-y: auto;
}
.resize-bar {
- width: 310px;
+ width: 338px;
height: inherit;
resize: horizontal;
cursor: ew-resize;
@@ -106,7 +113,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 {
--
Gitblit v1.8.0