bugfix

src/api/push/push.ts

@@ -1,10 +1,15 @@
 import { http } from '@/utils/http/axios';
 
+interface WorkshopType {
+  name: string;
+  code: string;
+}
+
 export interface RobotType {
   id?: number;
   robotName?: string;
   robotUrl?: string;
-  workshopCodes?: string;
+  workshopCodes?: WorkshopType[];
   workshopName?: string[];
   isPush?: boolean;
   tenantId?: number;

src/views/alarm-push/component/AddRobot.vue

@@ -85,7 +85,7 @@
   const ruleForm = ref<RobotType>({
     robotName: '',
     robotUrl: '',
-    workshopCodes: '',
+    workshopCodes: [],
     workshopName: [],
     isPush: true,
   });
@@ -100,7 +100,7 @@
   const resetDrawer = () => {
     ruleForm.value.robotName = '';
     ruleForm.value.robotUrl = '';
-    ruleForm.value.workshopCodes = '';
+    ruleForm.value.workshopCodes = [];
     ruleForm.value.workshopName = [];
     ruleForm.value.isPush = true;
   };
@@ -127,25 +127,16 @@
   };
 
   const handleTreeSelect = (code: string) => {
-    console.log('code', code);
-    console.log('flattendWorkspaces', flattenedWorkshops.value);
-    console.log('name', ruleForm.value.workshopName);
-
-    ruleForm.value.workshopCodes = JSON.stringify(
-      flattenedWorkshops.value
-        .filter((item) => code.includes(item.code))
-        .map(({ code, name }) => ({ code, name })),
-    );
+    ruleForm.value.workshopCodes = flattenedWorkshops.value
+      .filter((item) => code.includes(item.code))
+      .map(({ code, name }) => ({ code, name }));
   };
 
   onBeforeMount(() => {
     getScenesTree({ level: 2, valueKey: 'code', labelKey: 'name', disabled: true });
     if (props.robotList) {
       ruleForm.value = cloneDeep(props.robotList);
-      console.log('props.robotList', props.robotList);
-      ruleForm.value.workshopName = JSON.parse(ruleForm.value.workshopCodes!).map(
-        (item) => item.code,
-      );
+      ruleForm.value.workshopName = ruleForm.value.workshopCodes!.map((item) => item.code);
     }
   });
 </script>

src/views/alarm-push/constant.ts

@@ -28,8 +28,7 @@ export const columns: BasicColumn[] = [
         {},
         {
           default: () => {
-            const toParse = JSON.parse(record.row.workshopCodes);
-            return toParse.map((item) => item.name).join(' , ');
+            return record.row.workshopCodes.map((item) => item.name).join(' , ');
           },
         },
       );