Merge branch 'fix/DEFECT-1477' into 'main_dev'

fix: 修改任务中心时modBUS轮询字段在列表不显示

See merge request yunteng/thingskit-front!791

@@ -89,7 +89,7 @@ export const step1Schemas: FormSchema[] = [
             transportType,
             transportType,
             deviceProfileId: id,
             deviceProfileId: id,
             gatewayId: null,
             gatewayId: null,
-            codeType: transportType === TransportTypeEnum.TCP ? TaskTypeEnum.MODBUS : null,
+            codeType: transportType === TransportTypeEnum.TCP ? TaskTypeEnum.MODBUS_RTU : null,
             code: null,
             code: null,
             addressCode: null,
             addressCode: null,
           });
           });
@@ -140,7 +140,7 @@ export const step1Schemas: FormSchema[] = [
       return {
       return {
         options: [
         options: [
           { label: '自定义', value: TaskTypeEnum.CUSTOM },
           { label: '自定义', value: TaskTypeEnum.CUSTOM },
-          { label: 'ModBus', value: TaskTypeEnum.MODBUS },
+          { label: 'ModBus', value: TaskTypeEnum.MODBUS_RTU },
         ],
         ],
       };
       };
     },
     },
@@ -172,7 +172,7 @@ export const step1Schemas: FormSchema[] = [
         values?.transportType === TransportTypeEnum.TCP &&
         values?.transportType === TransportTypeEnum.TCP &&
         (values.deviceType === DeviceTypeEnum.SENSOR ||
         (values.deviceType === DeviceTypeEnum.SENSOR ||
           values.deviceType === DeviceTypeEnum.GATEWAY) &&
           values.deviceType === DeviceTypeEnum.GATEWAY) &&
-        values?.codeType === TaskTypeEnum.MODBUS
+        values?.codeType === TaskTypeEnum.MODBUS_RTU
       );
       );
     },
     },
   },
   },

@@ -60,7 +60,7 @@
 
 
     //是modBUS类型的就用另外的表单
     //是modBUS类型的就用另外的表单
     //判断是否是TCP ==> modBus的下发命令
     //判断是否是TCP ==> modBus的下发命令
-    if (codeType == TaskTypeEnum.MODBUS && transportType == 'TCP') {
+    if (codeType == TaskTypeEnum.MODBUS_RTU && transportType == 'TCP') {
       isShowModBUS.value = true;
       isShowModBUS.value = true;
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',

@@ -183,8 +183,8 @@ export const formSchemas: FormSchema[] = [
             value: TaskTypeEnum.CUSTOM,
             value: TaskTypeEnum.CUSTOM,
           },
           },
           {
           {
-            label: TaskTypeNameEnum.MODBUS,
-            value: TaskTypeEnum.MODBUS,
+            label: TaskTypeNameEnum.MODBUS_RTU,
+            value: TaskTypeEnum.MODBUS_RTU,
             disabled: transportType ? transportType && transportType !== PushWayEnum.TCP : true,
             disabled: transportType ? transportType && transportType !== PushWayEnum.TCP : true,
           },
           },
         ],
         ],
@@ -240,7 +240,7 @@ export const formSchemas: FormSchema[] = [
     label: 'ModbusRTU轮询',
     label: 'ModbusRTU轮询',
     rules: [{ required: true, message: '请输入Modbus RTU 轮询指令' }],
     rules: [{ required: true, message: '请输入Modbus RTU 轮询指令' }],
     ifShow: ({ model }) =>
     ifShow: ({ model }) =>
-      model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS &&
+      model[FormFieldsEnum.EXECUTE_CONTENT_TYPE] === TaskTypeEnum.MODBUS_RTU &&
       model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.TCP,
       model[FormFieldsEnum.PUSH_WAY] === PushWayEnum.TCP,
     valueField: 'value',
     valueField: 'value',
     changeEvent: 'update:value',
     changeEvent: 'update:value',

@@ -27,11 +27,11 @@ export enum TaskTargetNameEnum {
 
 
 export enum TaskTypeEnum {
 export enum TaskTypeEnum {
   CUSTOM = 'CUSTOM',
   CUSTOM = 'CUSTOM',
-  MODBUS = 'MODBUS_RTU',
+  MODBUS_RTU = 'MODBUS_RTU',
 }
 }
 
 
 export enum TaskTypeNameEnum {
 export enum TaskTypeNameEnum {
-  MODBUS = 'MODBUS_RTU轮询',
+  MODBUS_RTU = 'MODBUS_RTU轮询',
   CUSTOM = '自定义数据下发',
   CUSTOM = '自定义数据下发',
 }
 }