From 4f7f16803ab5ed7b8a8a0dc087792d9b2fcefe2b Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 15 六月 2022 14:39:15 +0800
Subject: [PATCH] 统计查询
---
src/views/hashrate/CameraManage/CameraRules/index.vue | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index 6c3c454..402d63d 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -6,7 +6,7 @@
<!-- 鍦烘櫙鍙婅鍒� -->
<div class="left-top-left">
<div class="title">鍦烘櫙</div>
- <slide-scene :sceneData="Camera.rules"></slide-scene>
+ <slide-scene :sceneData="Camera.allSceneRule"></slide-scene>
</div>
<!-- 绠楀姏淇℃伅杩涘害鏉� -->
@@ -242,7 +242,7 @@
:linkEditCamera="
ruleType === 'linkage' && editSdkObj ? editSdkObj.camera_polygons : null
"
- :Cameras="ruleType === 'linkage' ? Carmeras : [Camera]"
+ :Cameras="ruleType === 'linkage' ? addData.cameras : [Camera]"
></SdkSettingBox>
<!-- 閬僵灞� -->
@@ -543,8 +543,6 @@
return;
}
- console.log("init");
-
this.plumbIns.deleteEveryConnection();
this.connectArr.forEach((item) => {
item.deleteEveryConnection();
@@ -587,16 +585,8 @@
.then((rsp) => {
if (rsp && rsp.success) {
rules = rsp.data.rules;
- // 缁熶竴瑙勫垯缂栬緫鐨勬暟鎹粨鏋�
- for (let i = 0; i < rules.length; i++) {
- rules[i].group_rules = rules[i].rules;
- }
this.linkageRule = rules;
-
- console.log(this.linkageRule);
-
- this.$set(this.Camera, "rules", this.Camera.rules.concat(rules));
this.$nextTick(() => {
this.connectLine2();
@@ -909,6 +899,16 @@
type,
index,
};
+ if (this.addData.type === "linkage") {
+ this.addData.cameras = [];
+ this.linkageRule[index].camera_polygons.forEach((item) => {
+ this.addData.cameras.push({
+ polygonData: item.polygon,
+ cameraName: item.camera_name,
+ cameraId: item.camera_id,
+ });
+ });
+ }
this.showSdkBox = false;
this.showSdkSettingBox = true;
},
@@ -921,6 +921,7 @@
newRule.rule_with_pre = "&&";
newRule.is_save_anyhow = true;
}
+
this.SeparateRules[this.addData.index].rules.push(newRule);
}
@@ -968,7 +969,6 @@
let rules = rsp.data.rules ? rsp.data.rules : [];
if (rules[index]) {
this.linkageRule[index] = rules[index];
- this.linkageRule.group_rules = this.linkageRule.rules;
} else {
this.linkageRule.splice(index, 1);
}
--
Gitblit v1.8.0