From feaf0a9778879ef211c5587a513ba4cbdabb52d0 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期四, 23 六月 2022 17:42:58 +0800
Subject: [PATCH] bug修复
---
src/pages/cameraAccess/index/VideoManage.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index 1e264f4..0ce1280 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -120,13 +120,15 @@
}
} else if (this.activeName === "separate-rule") {
this.$refs.sepRule.Camera = {};
- this.$refs.sepRule.initCameraData(node.id);
+ this.$refs.sepRule.initCameraData(node.id, node.cameraType);
}
},
"TreeDataPool.selectedNodes": {
- handler(nodes) {
+ handler() {
if (this.activeName == "linkage-rule") {
- this.$refs.linkRule.initCameraData();
+ this.$refs.linkRule.initCameraData(
+ this.TreeDataPool.selectedNode.cameraType
+ );
}
},
deep: true,
@@ -223,12 +225,15 @@
}
} else if (tab.name === "separate-rule") {
if (this.TreeDataPool.treeActiveName == "camera") {
- this.$refs.sepRule.initCameraData(this.TreeDataPool.selectedNode.id);
+ this.$refs.sepRule.initCameraData(
+ this.TreeDataPool.selectedNode.id,
+ this.TreeDataPool.selectedNode.cameraType
+ );
} else if (this.TreeDataPool.treeActiveName == "dataStack") {
this.$refs.sepRule.initCameraData(this.DataStackPool.selectedDir.id);
}
} else if (this.activeName == "linkage-rule") {
- this.$refs.linkRule.initCameraData();
+ // this.$refs.linkRule.initCameraData();
} else if (this.activeName == "poll-setting") {
this.$nextTick(() => {
this.$refs.pullSetting.initLineChart();
@@ -242,9 +247,9 @@
.s-video-manage {
width: 100%;
min-width: 1599px;
- height: 100%;
float: left;
box-sizing: border-box;
+ user-select: none;
.el-tabs--border-card {
box-shadow: none;
-webkit-box-shadow: none;
@@ -259,7 +264,6 @@
// border-radius: 5px;
// }
.el-tabs--border-card {
- height: 100%;
width: 100%;
&.video-tab {
& > .el-tabs__header {
@@ -301,7 +305,6 @@
.video-tab > .el-tabs__content {
width: 100%;
//margin-top: 52px;
- height: calc(100% - 36px);
box-sizing: border-box;
overflow-y: auto;
padding: 0;
--
Gitblit v1.8.0