ZZJ
2022-06-22 01b516a3c3304c966d413b768d2e3078bf83b61c
联动场景传参
5个文件已修改
27 ■■■■ 已修改文件
src/Pool/TreeData.ts 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/scripts/httpRequest.ts 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hashrate/CameraManage/CameraRules/index.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/hashrate/CameraManage/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Pool/TreeData.ts
@@ -128,6 +128,7 @@
    function nodeFilter(node: any) {
      if (node.type === '4' && node.selected) {
        _selected.push(node.id)
        sessionStorage.setItem('cameraDevId',node.devId)
      }
      if (node.children) {
        node.children.forEach((n: any) => {
@@ -170,6 +171,7 @@
    function nodeFilter(node: any) {
      if (node.type === '4' && (node.selected || node.checked)) {
      sessionStorage.setItem("cameraDevId", node.devId);
        _this.selectedNodes.push(node.id)
      }
      if (node.children) {
src/scripts/httpRequest.ts
@@ -12,6 +12,10 @@
/* //POST传参序列化(添加请求拦截器) */
Axios.interceptors.request.use(
  config => {
    console.log(9898);
    console.log(config);
    if (
      config.method === "post" &&
      sessionStorage.getItem('clusterId') ||
@@ -25,6 +29,10 @@
       config.data.clusterId = sessionStorage.getItem('clusterId')
       config.data.devId = sessionStorage.getItem('devId')
      }
      if(config.url === '/saas/api-s/camera/rule/getLinkRulesByCameraIds') {
         config.data.devId = sessionStorage.getItem('cameraDevId')
      }
     
    }
src/views/hashrate/CameraManage/CameraRules/components/scene/Editor.vue
@@ -809,6 +809,8 @@
        ? rule.polygonObj.cameraId
        : rule.camera_id;
      rule.group_id = this.group_id;
      console.log(9799898);
      this.$forceUpdate();
    },
    //选择算法 resetArgs为true是添加为false是初始化编辑
    selectSDKOption(sdkItem, resetArgs) {
src/views/hashrate/CameraManage/CameraRules/index.vue
@@ -901,20 +901,19 @@
      };
      if (this.addData.type === "linkage") {
        this.addData.cameras = [];
        this.linkageRule[index].camera_polygons = [];
        this.Carmeras.forEach((camera) => {
          this.addData.cameras.push({
            polygonData: camera.polygonData,
            cameraName: camera.cameraName,
            cameraId: camera.cameraId,
          });
        });
        /*   this.linkageRule[index].camera_polygons.forEach((item) => {
          this.addData.cameras.push({
            polygonData: item.polygon,
            cameraName: item.camera_name,
            cameraId: item.camera_id,
          this.linkageRule[index].camera_polygons.push({
            polygon: camera.polygonData,
            camera_name: camera.cameraName,
            camera_id: camera.cameraId,
          });
        }); */
        });
      }
      this.showSdkBox = false;
      this.showSdkSettingBox = true;
src/views/hashrate/CameraManage/index.vue
@@ -79,7 +79,7 @@
  watch: {
    "TreeDataPool.activeNode": function (node) {
      console.log("cclickaaa");
      sessionStorage.setItem("cameraDevId", node.devId);
      if (this.activeTab == "信息维护") {
        if (this.TreeDataPool.treeActiveName == "camera") {
          this.$refs.cameraInfo.selectCamera(node);