Merge branch 'ft_local_dev' into 'main'

fix:修改脚本管理 转换函数 上报数据类型字段名

See merge request huang/yun-teng-iot-front!373

@@ -18,11 +18,11 @@
       </a-form-item>
       <a-form-item
         label="上报数据类型"
-        name="reportType"
-        :rules="[{ required: false, message: '请选择上报数据类型' }]"
+        name="dataType"
+        :rules="[{ required: true, message: '请选择上报数据类型' }]"
       >
         <a-space direction="vertical">
-          <a-radio-group v-model:value="scriptForm.reportType" :options="typeOptions" />
+          <a-radio-group v-model:value="scriptForm.dataType" :options="typeOptions" />
         </a-space>
       </a-form-item>
       <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
@@ -84,7 +84,7 @@
     script: '',
     params: '',
     output: '',
-    reportType: 'HEX',
+    dataType: 'HEX',
   });
   const reportTypeOptions = reactive({
     typeOptions: [],
@@ -101,6 +101,7 @@
     reportTypeOptions.typeOptions = res.map((m) => {
       return { label: m.itemText, value: m.itemValue };
     });
+    scriptForm.dataType = 'HEX';
   });
   // 初始化编辑器
   const initEditor = (jsScript?: string) => {