From f20a554bdb24e9dfde9dc6a69d78595944f61d15 Mon Sep 17 00:00:00 2001 From: mark <mark18340872469@163.com> Date: 星期二, 25 十月 2022 14:53:57 +0800 Subject: [PATCH] 设备管理 样式调整 --- src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue | 67 ++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue b/src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue index c1e1726..e984e29 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.camera_name + ":" + polygon.name, + cameraId: camera.camera_id, + }); + }); + }); } 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(); @@ -491,7 +500,6 @@ }, validateArgVal(sdkArgItem, e) { - console.log(sdkArgItem); if ( typeof sdkArgItem.sdk_arg_value == "string" && sdkArgItem.sdk_arg_value == "" @@ -725,6 +733,8 @@ setOptArgValueOptions(optArg) { let alias = optArg.alias; + console.log(121212); + console.log(alias); optArg.valueOptions = this.VideoManageData.Dictionary[alias].map((r) => { return { name: r.name, @@ -884,6 +894,11 @@ } }); let optArgDesc = " "; + + //鏂板 + + //鏂板 + this.sdkItem.optArg.forEach((arg) => { let val = ""; let valRange = ""; @@ -925,11 +940,19 @@ optArgDesc.substring(optArgDesc.length - 1, optArgDesc.length); optArgDesc += ")"; tempObj.sdk_set = defaultArgs.concat(optArgs); - tempObj.icon_blob = this.$store.state.newSdk.iconBlob; + 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; this.$emit("getNewSdk", tempObj); } }, @@ -1070,17 +1093,17 @@ } .el-input ::v-deep { - width: 50px; + width: 100px; height: 32px; input { - width: 50px; + width: 100px; height: 32px; } } .el-select { - width: 68px; + width: 100px; } .font { @@ -1107,7 +1130,7 @@ .btns { position: absolute; display: flex; - justify-content: end; + justify-content: flex-end; align-items: center; left: 0; right: 0; -- Gitblit v1.8.0