From ecb6cadc3f016cf9968f48e0cc77479a1e56365b Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期日, 20 十二月 2020 17:32:06 +0800
Subject: [PATCH] 标定添加关联摄像机tab,绘制区域组件参数更新
---
src/pages/cameraAccess/index/App.vue | 71 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 20 deletions(-)
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index c88ca57..e843f32 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -1,13 +1,13 @@
<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"></left-nav>
</div>
</div>
- <div class="column-right" :style="`height:${screenHeight}px;`">
+ <div class="column-right">
<right-side />
</div>
</div>
@@ -19,43 +19,72 @@
import RightSide from "./VideoManage"
export default {
- name: "SearchPage",
+ name: "VideoManage",
components: {
LeftNav,
RightSide
},
- data() {
- return {
- screenHeight: 0,
+ computed: {
+ app () {
+ return this.getUrlKey() !== null ? "DataStack" : "Camera"
}
},
- mounted() {
- this.screenHeight = document.documentElement.clientHeight - 20;
+ data () {
+ return {
+ leftWith: 0,
+ screenHeight: 0
+ }
+ },
+ mounted () {
+ this.screenHeight = document.documentElement.clientHeight;
window.onresize = () => {
return (() => {
- this.screenHeight = document.documentElement.clientHeight - 20;
+ this.screenHeight = document.documentElement.clientHeight;
})();
};
+
+ 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
+ }
+ }
};
</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: hidden;
+ overflow-y: hidden;
+ overflow-x: auto;
+}
+.heigher-index {
+ position: absolute;
+ top: 0;
+ z-index: 10;
+ width: 100%;
+ height: 100%;
}
.resize-save {
position: absolute;
@@ -64,17 +93,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 +113,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,
@@ -103,7 +134,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