ZZJ
2022-06-08 6b31092156a10b808e8f27c00644850b7e900395
添加联动场景参数
2个文件已修改
26 ■■■■■ 已修改文件
src/views/hashrate/CameraManage/CameraRules/components/SdkSettingBox.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hashrate/CameraManage/CameraRules/index.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
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);
      }