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 | 119 ++++++++---------------------------------------------------
1 files changed, 17 insertions(+), 102 deletions(-)
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index d7b7ab0..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,24 +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
- }
+ screenHeight: 0,
+ };
},
mounted() {
this.screenHeight = document.documentElement.clientHeight;
@@ -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;
@@ -144,86 +141,4 @@
background-size: 100% 100%;
}
}
-// .column {
-// overflow-y: hidden;
-// display: flex;
-// width: 100%;
-// height: 100%;
-// }
-// .column-left {
-// height: 100%;
-// padding-bottom: 20px;
-// box-sizing: border-box;
-// // height: inherit;
-// background-color: #fff;
-// position: relative;
-// //float: left;
-// }
-// .column-right {
-// position: relative;
-// flex: 1;
-// background-color: #fff;
-// box-sizing: border-box;
-// overflow-y: hidden;
-// height: 100%;
-// min-width: 1602px;
-// }
-// .resize-save {
-// position: absolute;
-// top: 0;
-// right: 5px;
-// bottom: 0;
-// left: 0;
-// padding: 14px;
-// overflow-x: hidden;
-// overflow-y: hidden;
-// }
-// .resize-bar {
-// width: 310px;
-// height: inherit;
-// resize: horizontal;
-// cursor: ew-resize;
-// opacity: 0;
-// overflow: scroll;
-// max-width: 500px; //璁惧畾鏈�澶ф媺浼搁暱搴�
-// min-width: 33px; //璁惧畾鏈�灏忓搴�
-// }
-// /* 鎷栨嫿绾� */
-// .resize-line {
-// position: absolute;
-// right: 0;
-// top: 0;
-// bottom: 0;
-// 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 {
-// border-left: 1px dashed skyblue;
-// }
-// .resize-bar::-webkit-scrollbar {
-// width: 200px;
-// height: inherit;
-// }
-
-// /* Firefox鍙湁涓嬮潰涓�灏忓潡鍖哄煙鍙互鎷変几 */
-// @supports (-moz-user-select: none) {
-// .resize-bar:hover ~ .resize-line,
-// .resize-bar:active ~ .resize-line {
-// border-left: 1px solid #bbb;
-// }
-// .resize-bar:hover ~ .resize-line::after,
-// .resize-bar:active ~ .resize-line::after {
-// content: "";
-// position: absolute;
-// width: 16px;
-// height: 16px;
-// bottom: 0;
-// right: -8px;
-// // background: url(./resize.svg);
-// background-size: 100% 100%;
-// }
-// }
</style>
--
Gitblit v1.8.0