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/search/index/App.vue | 47 ++++++++++++++++++++++-------------------------
1 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/src/pages/search/index/App.vue b/src/pages/search/index/App.vue
index 13ae06d..9d5ea11 100644
--- a/src/pages/search/index/App.vue
+++ b/src/pages/search/index/App.vue
@@ -1,13 +1,13 @@
<template>
<div class="column">
- <div class="column-left" >
+ <div class="column-left">
<div class="resize-bar"></div>
<div class="resize-line"></div>
<div class="resize-save">
<left-nav :appName="'Search'" :height="screenHeight - 40"></left-nav>
</div>
</div>
- <div class="column-right" >
+ <div class="column-right">
<right-side />
</div>
<card-window></card-window>
@@ -32,6 +32,10 @@
screenHeight: 0,
}
},
+ created() {
+ // this.parseUrl();
+
+ },
mounted() {
this.screenHeight = document.documentElement.clientHeight - 20;
window.onresize = () => {
@@ -40,37 +44,29 @@
})();
};
- this.parseUrl();
},
methods: {
parseUrl() {
- if (this.getUrlKey("showType")) {
- this.VideoPhotoData.uploadDiaplay = true;
- console.log("鍒璺宠繃鏉ョ殑浠ュ浘鎼滃浘");
- this.VideoPhotoData.picUrl = this.getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadImg = this.getUrlKey("picSmUrl");
- this.VideoPhotoData.uploadType = true
- this.VideoPhotoData.compTargetId = this.getUrlKey("targetId")
- this.VideoPhotoData.compTargetType = this.getUrlKey("compType")
- this.VideoPhotoData.size = 30
- this.VideoPhotoData.compareTabs = ["esData"];
- this.VideoPhotoData.findPerson2(); // 鏌ユ壘姝や汉
- }
- },
- getUrlKey(name) {
- return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) || [, ""])[1].replace(/\+/g, '%20')) || null
+
}
}
};
</script>
-<style lang="scss" scoped>
+<style lang="scss" >
+.left-tree-box .local-vedio-area .dev-vedio-list{
+ height: calc(100vh - 130px);
+}
+.left-tree-box .el-tabs--border-card .el-tabs__header{
+ display: block!important;
+ margin-bottom: 10px;
+}
.column {
overflow: hidden;
- min-width: 1402px;
+ min-width: 1399px;
+ height: 100%;
}
.column-left {
- height: 100vh;
background-color: #fff;
position: relative;
float: left;
@@ -96,17 +92,18 @@
bottom: 0;
left: 0;
padding: 16px;
+ padding-top: 8px;
overflow-x: 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 {
@@ -114,8 +111,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,
--
Gitblit v1.8.0