flx:修改摄像机分组回显 工作票id丢失

src/views/equipmentCenter/videoManage/videoConfig.vue

@@ -2237,12 +2237,31 @@ export default {
       this.addGroupDialog = true;
       this.addGroupForm = JSON.parse(JSON.stringify(item));
       this.$nextTick(() => {
-        if (this.addGroupForm.parentObj) {
+        const find = this.findNodeById(this.videoTreeData, item.parentId);
-          this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName;
+        if(find) {
+          this.selectVal = find.groupName;
           this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId);
         }
+        // if (this.addGroupForm.parentObj) {
+        //   this.selectVal = JSON.parse(this.addGroupForm.parentObj).groupName;
+        //   this.$refs.groupTree.setCurrentKey(this.addGroupForm.parentId);
+        // }
       });
     },
+    findNodeById(node, id) {
+      const find = node.find((item) => item.id === id);
+      if (find) {
+        return find;
+      }
+      for (let child of node) {
+        if (child.children && child.children.length > 0) {
+          const found = this.findNodeById(child.children, id);
+          if (found) return found;
+        }
+      }
+
+      return null;
+    },
     deleteGroupFn(item) {
       // 确定删除分组
       this.$confirm(
@@ -2607,17 +2626,23 @@ export default {
         ? obj.enterpriseIds.split(",")
         : [];
       this.$nextTick(() => {
-        if (this.currentVideoTypeDetail.parentObj) {
+        const find = this.findNodeById(this.videoTreeData, obj.groupId);
-          this.selectFormVal = JSON.parse(
+        if(find) {
-            this.currentVideoTypeDetail.parentObj
+          this.selectFormVal = find.groupName;
-          ).groupName;
+          this.$refs.groupTree.setCurrentKey(this.currentVideoTypeDetail.groupId);
-          this.selectFormTreeData = JSON.parse(
-            this.currentVideoTypeDetail.parentObj
-          );
-          this.$refs.groupFormTree.setCurrentKey(
-            this.currentVideoTypeDetail.parentId
-          );
         }
+        
+        // if (this.currentVideoTypeDetail.parentObj) {
+        //   this.selectFormVal = JSON.parse(
+        //     this.currentVideoTypeDetail.parentObj
+        //   ).groupName;
+        //   this.selectFormTreeData = JSON.parse(
+        //     this.currentVideoTypeDetail.parentObj
+        //   );
+        //   this.$refs.groupFormTree.setCurrentKey(
+        //     this.currentVideoTypeDetail.parentId
+        //   );
+        // }
       });
       console.log("编辑内容", obj);
     },

src/views/projectFront/workTicketManage/homeworkControlProcess.vue

@@ -1390,6 +1390,7 @@ export default {
       }
     },
     onExamineClick(row) {
+      console.log(112233, row)
       this.workTicketId = row.id;
       this.getWorkTicketQueryById();
       this.getWorkTicketHistoryList();
@@ -1700,8 +1701,10 @@ export default {
       });
     },
     onChangeState(operateStatus) {
+      console.log(55555, this.workTicketId);
+      const workTicketId = this.workTicketId;
       let data = {
-        id: this.workTicketId,
+        id: workTicketId,
         projectSn: this.projectSn,
         operateStatus,
       };
@@ -1711,8 +1714,10 @@ export default {
           this.initWorkTicketClose();
           this.getWorkTicketList();
           this.getWorkTicketCountWorkTicket();
+          console.log(44444, workTicketId);
+
           this.onExamineClick({
-            id: this.workTicketId,
+            id: workTicketId,
           });
         }
       });