From 994e5e08cba4e6b9ce321b7cf5cb1ec8d19dfa22 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 12 四月 2022 17:50:21 +0800
Subject: [PATCH] 摄像机管理
---
src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
index c1e1726..30dab1d 100644
--- a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
+++ b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue
@@ -295,7 +295,6 @@
} else {
sdkItem = this.$store.state.newSdk;
}
- console.log(typeof sdkItem.argDef);
if (typeof sdkItem.argDef === "string") {
sdkItem.argDef = JSON.parse(sdkItem.argDef);
}
@@ -339,25 +338,35 @@
initPolygon() {
let cameras = [];
if (this.linkEditCamera) {
+ this.allPolygonData = [];
cameras = this.linkEditCamera;
+ this.linkEditCamera.forEach((camera) => {
+ camera.polygon.forEach((polygon) => {
+ this.allPolygonData.push({
+ defence_state: polygon.defenceState,
+ polygonId: polygon.id,
+ name: camera.cameraName + ":" + polygon.name,
+ cameraId: camera.cameraId,
+ });
+ });
+ });
} else {
cameras = [...this.Cameras];
- }
+ for (let i = 0; i < cameras.length; i++) {
+ let polyOpt = cameras[i].polygonData.map((p) => {
+ return {
+ defence_state: p.defence_state,
+ polygonId: p.id,
+ name:
+ this.isLinkRule || this.linkEditCamera
+ ? cameras[i].cameraName + ":" + p.name
+ : p.name,
- for (let i = 0; i < cameras.length; i++) {
- let polyOpt = cameras[i].polygonData.map((p) => {
- return {
- defence_state: p.defence_state,
- polygonId: p.id,
- name:
- this.isLinkRule || this.linkEditCamera
- ? cameras[i].cameraName + ":" + p.name
- : p.name,
-
- cameraId: cameras[i].cameraId,
- };
- });
- this.allPolygonData = this.allPolygonData.concat(polyOpt);
+ cameraId: cameras[i].cameraId,
+ };
+ });
+ this.allPolygonData = this.allPolygonData.concat(polyOpt);
+ }
}
this.$forceUpdate();
@@ -925,11 +934,12 @@
optArgDesc.substring(optArgDesc.length - 1, optArgDesc.length);
optArgDesc += ")";
tempObj.sdk_set = defaultArgs.concat(optArgs);
- tempObj.icon_blob = this.$store.state.newSdk.iconBlob;
if (this.editSdk) {
+ tempObj.icon_blob = this.editSdk.icon_blob;
this.$emit("getEditSdk", tempObj);
} else {
+ tempObj.icon_blob = this.$store.state.newSdk.iconBlob;
this.$emit("getNewSdk", tempObj);
}
},
--
Gitblit v1.8.0