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 | 54 ++++++++++++++++++++++++++++++------------------------
1 files changed, 30 insertions(+), 24 deletions(-)
diff --git a/src/pages/cameraAccess/index/App.vue b/src/pages/cameraAccess/index/App.vue
index e60b5dc..e843f32 100644
--- a/src/pages/cameraAccess/index/App.vue
+++ b/src/pages/cameraAccess/index/App.vue
@@ -4,10 +4,10 @@
<div class="resize-bar"></div>
<div class="resize-line"></div>
<div class="resize-save">
- <left-nav :appName="app" :edit="editTree" :height="screenHeight"></left-nav>
+ <left-nav :appName="app" :height="screenHeight"></left-nav>
</div>
</div>
- <div class="column-right" >
+ <div class="column-right">
<right-side />
</div>
</div>
@@ -25,18 +25,17 @@
RightSide
},
computed: {
- app() {
+ app () {
return this.getUrlKey() !== null ? "DataStack" : "Camera"
}
},
- data() {
+ data () {
return {
leftWith: 0,
- screenHeight: 0,
- editTree: true
+ screenHeight: 0
}
},
- mounted() {
+ mounted () {
this.screenHeight = document.documentElement.clientHeight;
window.onresize = () => {
return (() => {
@@ -45,9 +44,13 @@
};
this.leftWith = this.$refs['left'].offsetWidth;
+ this.TreeDataPool.readonly = false;
+ this.TreeDataPool.gbReadonly = false;
+ this.DataStackPool.readonly = false;
+
},
methods: {
- getUrlKey() {
+ getUrlKey () {
let name = "dataStack"
return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
}
@@ -57,28 +60,31 @@
<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: 100%;
- padding-bottom: 20px;
- box-sizing: border-box;
- // 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: hidden;
overflow-y: hidden;
-
+ overflow-x: auto;
+}
+.heigher-index {
+ position: absolute;
+ top: 0;
+ z-index: 10;
+ width: 100%;
height: 100%;
- min-width: 1433px;
}
.resize-save {
position: absolute;
@@ -86,12 +92,13 @@
right: 5px;
bottom: 0;
left: 0;
- padding: 14px;
+ padding: 16px;
+ padding-top: 8px;
overflow-x: hidden;
overflow-y: hidden;
}
.resize-bar {
- width: 310px;
+ width: 338px;
height: inherit;
resize: horizontal;
cursor: ew-resize;
@@ -109,7 +116,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 {
@@ -128,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