From 6b31092156a10b808e8f27c00644850b7e900395 Mon Sep 17 00:00:00 2001
From: ZZJ <10913410+zzj2100@user.noreply.gitee.com>
Date: 星期三, 08 六月 2022 16:46:51 +0800
Subject: [PATCH] 添加联动场景参数
---
src/views/hashrate/CameraManage/CameraRules/index.vue | 13 ++++++++++++-
src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue | 13 ++++++++++++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
index 677c756..7748a4a 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
@@ -500,7 +500,6 @@
},
validateArgVal(sdkArgItem, e) {
- console.log(sdkArgItem);
if (
typeof sdkArgItem.sdk_arg_value == "string" &&
sdkArgItem.sdk_arg_value == ""
@@ -893,6 +892,11 @@
}
});
let optArgDesc = " ";
+
+ //鏂板
+
+ //鏂板
+
this.sdkItem.optArg.forEach((arg) => {
let val = "";
let valRange = "";
@@ -934,9 +938,16 @@
optArgDesc.substring(optArgDesc.length - 1, optArgDesc.length);
optArgDesc += ")";
tempObj.sdk_set = defaultArgs.concat(optArgs);
+ tempObj.ruleDes = defaultArgDesc + optArgDesc;
+ console.log(tempObj.ruleDes);
if (this.editSdk) {
tempObj.icon_blob = this.editSdk.icon_blob;
+ tempObj.group_id = this.editSdk.group_id;
+ tempObj.sort = this.editSdk.sort;
+ tempObj.id = this.editSdk.id;
+ tempObj.icon_blob = this.editSdk.icon_blob;
+ tempObj.icon_blob2 = this.editSdk.icon_blob2;
this.$emit("getEditSdk", tempObj);
} else {
tempObj.icon_blob = this.$store.state.newSdk.iconBlob;
diff --git a/src/views/hashrate/CameraManage/CameraRules/index.vue b/src/views/hashrate/CameraManage/CameraRules/index.vue
index abca946..402d63d 100644
--- a/src/views/hashrate/CameraManage/CameraRules/index.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -242,7 +242,7 @@
:linkEditCamera="
ruleType === 'linkage' && editSdkObj ? editSdkObj.camera_polygons : null
"
- :Cameras="ruleType === 'linkage' ? Carmeras : [Camera]"
+ :Cameras="ruleType === 'linkage' ? addData.cameras : [Camera]"
></SdkSettingBox>
<!-- 閬僵灞� -->
@@ -899,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;
},
@@ -911,6 +921,7 @@
newRule.rule_with_pre = "&&";
newRule.is_save_anyhow = true;
}
+
this.SeparateRules[this.addData.index].rules.push(newRule);
}
--
Gitblit v1.8.0