From 4a800a8fc83c6bd1f86a8e847b079a51a7532c09 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期三, 20 七月 2022 15:05:58 +0800
Subject: [PATCH] 修复国标配置的bug
---
src/pages/cameraAccess/index/VideoManage.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/pages/cameraAccess/index/VideoManage.vue b/src/pages/cameraAccess/index/VideoManage.vue
index 1e264f4..49dd4f0 100644
--- a/src/pages/cameraAccess/index/VideoManage.vue
+++ b/src/pages/cameraAccess/index/VideoManage.vue
@@ -114,19 +114,22 @@
}
},
"TreeDataPool.selectedNode": function (node) {
+ console.log(this.TreeDataPool.selectedNode);
if (this.activeName == "camera-info") {
if (this.TreeDataPool.treeActiveName == "camera") {
this.$refs.cameraInfo.selectCamera(node);
}
} 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,
@@ -139,6 +142,7 @@
this.$nextTick(() => {
if (this.activeName == "camera-info") {
this.$refs.dataStackInfo.selectDir(node);
+ this.$refs.dataStackInfo.getRule();
} else if (this.activeName == "separate-rule" && node.length !== 0) {
this.$refs.sepRule.initCameraData(node.id);
}
@@ -220,15 +224,19 @@
this.$refs.cameraInfo.selectCamera(this.TreeDataPool.selectedNode);
} else if (this.TreeDataPool.treeActiveName == "dataStack") {
this.$refs.dataStackInfo.selectDir(this.DataStackPool.selectedDir);
+ this.$refs.dataStackInfo.getRule();
}
} 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 +250,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 +267,6 @@
// border-radius: 5px;
// }
.el-tabs--border-card {
- height: 100%;
width: 100%;
&.video-tab {
& > .el-tabs__header {
@@ -301,7 +308,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