Merge branch 'dev-fix-ww' into 'main_dev'

fix: 修复teambition BUG

See merge request yunteng/thingskit-front!563

@@ -133,7 +133,6 @@
         } = props.schema;
         } = props.schema;
 
 
         if (isFunction(dynamicRules)) {
         if (isFunction(dynamicRules)) {
-          console.log(dynamicRules(unref(getValues)));
           return dynamicRules(unref(getValues)) as ValidationRule[];
           return dynamicRules(unref(getValues)) as ValidationRule[];
         }
         }
 
 

@@ -140,9 +140,10 @@
             confirmLoading: true,
             confirmLoading: true,
           });
           });
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
+            const stepRecord = unref(stepState);
             const editData = {
             const editData = {
-              sn: 'XXXX',
-              ...unref(stepState),
+              ...stepRecord,
+              sn: stepRecord.name,
               customerId: currentDeviceData.customerId,
               customerId: currentDeviceData.customerId,
               deviceInfo: {
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 avatar: DeviceStep1Ref.value?.devicePic,
@@ -151,9 +152,10 @@
             };
             };
             await createOrEditDevice(editData);
             await createOrEditDevice(editData);
           } else {
           } else {
+            const stepRecord = unref(stepState);
             const createData = {
             const createData = {
-              sn: 'XXXX',
-              ...unref(stepState),
+              ...stepRecord,
+              sn: stepRecord.name,
               deviceInfo: {
               deviceInfo: {
                 avatar: DeviceStep1Ref.value?.devicePic,
                 avatar: DeviceStep1Ref.value?.devicePic,
                 ...DeviceStep1Ref.value?.positionState,
                 ...DeviceStep1Ref.value?.positionState,

@@ -305,6 +305,7 @@
         const markerList: MarkerList[] = [];
         const markerList: MarkerList[] = [];
         data.forEach((item) => {
         data.forEach((item) => {
           const {
           const {
+            alias,
             name,
             name,
             deviceState,
             deviceState,
             deviceInfo: { longitude, latitude },
             deviceInfo: { longitude, latitude },
@@ -313,7 +314,7 @@
           const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
           const rivet = deviceState === 'INACTIVE' ? djx : deviceState === 'ONLINE' ? zx : lx;
           const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
           const myIcon = new BMap.Icon(rivet, new BMap.Size(20, 30));
           const marker = new BMap.Marker(point, { icon: myIcon });
           const marker = new BMap.Marker(point, { icon: myIcon });
-          const label = new BMap.Label(name, {
+          const label = new BMap.Label(alias || name, {
             position: point,
             position: point,
             offset: new BMap.Size(-15, -45),
             offset: new BMap.Size(-15, -45),
           });
           });

@@ -148,7 +148,7 @@ export const parseData = (result: TaskRecordType): Required<FormValueType> => {
     period,
     period,
     periodType: executeTimeType === ExecuteTimeTypeEnum.CUSTOM ? periodType : null,
     periodType: executeTimeType === ExecuteTimeTypeEnum.CUSTOM ? periodType : null,
     time: executeTimeType === ExecuteTimeTypeEnum.CUSTOM ? time : null,
     time: executeTimeType === ExecuteTimeTypeEnum.CUSTOM ? time : null,
-    interval: executeTimeType === ExecuteTimeTypeEnum.POLL ? time : null,
+    interval: executeTimeType === ExecuteTimeTypeEnum.POLL ? Number(time) : null,
     pollUnit: executeTimeType === ExecuteTimeTypeEnum.POLL ? pollUnit : TimeUnitEnum.SECOND,
     pollUnit: executeTimeType === ExecuteTimeTypeEnum.POLL ? pollUnit : TimeUnitEnum.SECOND,
   };
   };
 };
 };