Merge branch 'ft_local_dev' into 'main'

feat：新增物模型表单数据收集

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

@@ -23,31 +23,31 @@ export const physicalColumn: BasicColumn[] = [
   {
   {
     title: '功能名称',
     title: '功能名称',
     dataIndex: 'name',
     dataIndex: 'name',
-    width: 80,
+    width: 90,
   },
   },
   {
   {
     title: '标识符',
     title: '标识符',
     dataIndex: 'type',
     dataIndex: 'type',
-    width: 80,
+    width: 90,
   },
   },
   {
   {
     title: '数据类型',
     title: '数据类型',
     dataIndex: 'transportType',
     dataIndex: 'transportType',
-    width: 80,
+    width: 100,
   },
   },
   {
   {
     title: '单位',
     title: '单位',
     dataIndex: 'description1',
     dataIndex: 'description1',
-    width: 70,
+    width: 90,
   },
   },
   {
   {
     title: '读写类型',
     title: '读写类型',
     dataIndex: 'default',
     dataIndex: 'default',
-    width: 70,
+    width: 60,
     customRender: ({ record }) => {
     customRender: ({ record }) => {
       const status = record.actionStatus;
       const status = record.actionStatus;
       const enable = status === 'SUCCESS' ? '读写' : '只读';
       const enable = status === 'SUCCESS' ? '读写' : '只读';
-      const color = enable === '读写' ? 'blue' : 'blue';
+      const color = enable === '读写' ? 'blue' : 'green';
       const text = enable === '读写' ? '读写' : '只读';
       const text = enable === '读写' ? '读写' : '只读';
       return h(Tag, { color }, () => text);
       return h(Tag, { color }, () => text);
     },
     },
@@ -55,12 +55,12 @@ export const physicalColumn: BasicColumn[] = [
   {
   {
     title: '创建人',
     title: '创建人',
     dataIndex: 'description',
     dataIndex: 'description',
-    width: 90,
+    width: 80,
   },
   },
   {
   {
     title: '创建时间',
     title: '创建时间',
     dataIndex: 'createTime',
     dataIndex: 'createTime',
-    width: 140,
+    width: 150,
   },
   },
 ];
 ];
 
 
@@ -406,3 +406,119 @@ export const formSchema: FormSchema[] = [
     },
     },
   },
   },
 ];
 ];
+
+export const mockData: any = async () => {
+  const res = await [
+    {
+      name: '亮度百分比',
+      type: 'Brightness',
+      transportType: 'int32(整数型)',
+      description1: '饱和度/aw',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '运行状态',
+      type: 'RunningState',
+      transportType: 'bool(布尔型)',
+      description1: '',
+      default: '1',
+      actionStatus: 'FA',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '设备运行状态',
+      type: 'E_Status_UP',
+      transportType: 'text(字符串)',
+      description1: '',
+      default: '1',
+      actionStatus: 'D',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '过流告警使能',
+      type: 'OverCurrentEnable',
+      transportType: 'struct(结构体)',
+      description1: '',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '变频器运行状态1',
+      type: 'Brightness',
+      transportType: 'int32(整数型)',
+      description1: '转每分钟/turn/m',
+      default: '1',
+      actionStatus: 'Fa',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '产品序列号',
+      type: 'SerialNo',
+      transportType: 'text(字符串)',
+      description1: '',
+      default: '1',
+      actionStatus: 'FA',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '音量百分比',
+      type: 'Volume',
+      transportType: 'int32(整数型)',
+      description1: '分贝/db',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '易释放氰化物',
+      type: 'easy_release_cyanide',
+      transportType: 'double(双精度浮点型)',
+      description1: '毫克每升/mg/L',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '湿度',
+      type: 'Humidity',
+      transportType: 'float(单精度浮点型)',
+      description1: '相对湿度/%RH',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '设备固件版本',
+      type: 'FirmwareVersion',
+      transportType: 'text(字符串)',
+      description1: '',
+      default: '1',
+      actionStatus: 'SUCCESS',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+    {
+      name: '用电量',
+      type: 'PowerConsumption',
+      transportType: 'float(单精度浮点型)',
+      description1: '千瓦时/kW.h',
+      default: '1',
+      actionStatus: 'F',
+      description: 'cheche',
+      createTime: '2022-10-20 10:24:22',
+    },
+  ];
+  return res;
+};

@@ -8,20 +8,20 @@
       <template #toolbar>
       <template #toolbar>
         <div class="p-column">
         <div class="p-column">
           <div class="p-content">
           <div class="p-content">
-            <a-alert
-              style="width: 420px"
-              message="当前展示的是已发布到线上的功能定义，如需修改，请点击"
-              type="info"
-              show-icon
-            />
-            <span
-              @click="handleEditPhysicalModel"
-              class="ml-2"
-              style="color: #409eff; cursor: pointer"
-              type="primary"
-              size="small"
-              >“编辑物模型”</span
-            >
+            <a-alert v-if="!isShowBtn" style="width: 511px" type="info" show-icon>
+              <template #message>
+                <span
+                  >当前展示的是已发布到线上的功能定义，如需修改，请点击
+                  <span
+                    @click="handleEditPhysicalModel"
+                    class="ml-2"
+                    style="color: #409eff; cursor: pointer"
+                    size="small"
+                    >“编辑物模型”</span
+                  ></span
+                >
+              </template>
+            </a-alert>
           </div>
           </div>
           <div style="height: 20px"></div>
           <div style="height: 20px"></div>
           <div class="p-bottom">
           <div class="p-bottom">
@@ -131,11 +131,12 @@
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { deleteReportManage } from '/@/api/report/reportManager';
   import { deleteReportManage } from '/@/api/report/reportManager';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
-  import { deviceConfigGetQuery } from '/@/api/device/deviceConfigApi';
+  // import { mockData } from '/@/api/device/deviceConfigApi';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelModal from './cpns/physical/PhysicalModelModal.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
   import PhysicalModelTsl from './cpns/physical/PhysicalModelTsl.vue';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { mockData } from '../device.profile.data';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
   const { createMessage } = useMessage();
   const { createMessage } = useMessage();
@@ -144,7 +145,8 @@
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
   const [registerModalTsl, { openModal: openModalTsl }] = useModal();
 
 
   const [registerTable, { reload, setProps }] = useTable({
   const [registerTable, { reload, setProps }] = useTable({
-    api: deviceConfigGetQuery,
+    // api: deviceConfigGetQuery,
+    api: mockData,
     columns: physicalColumn,
     columns: physicalColumn,
     showIndexColumn: false,
     showIndexColumn: false,
     clickToRowSelect: false,
     clickToRowSelect: false,
@@ -184,6 +186,7 @@
         isUpdate: true,
         isUpdate: true,
         record,
         record,
         isView: true,
         isView: true,
+        isText: 'view',
       });
       });
     }
     }
   };
   };
@@ -194,11 +197,13 @@
         isUpdate: false,
         isUpdate: false,
         record,
         record,
         isView: false,
         isView: false,
+        isText: 'edit',
       });
       });
     } else {
     } else {
       openModal(true, {
       openModal(true, {
         isUpdate: true,
         isUpdate: true,
         isView: false,
         isView: false,
+        isText: 'add',
       });
       });
     }
     }
   };
   };

@@ -35,12 +35,13 @@
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
-  import { ref, unref } from 'vue';
+  import { ref, unref, reactive } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { Tabs, TabPane, Typography, TypographyParagraph } from 'ant-design-vue';
   import { Tabs, TabPane, Typography, TypographyParagraph } from 'ant-design-vue';
   import Attribute from './cpns/Attribute.vue';
   import Attribute from './cpns/Attribute.vue';
   import Service from './cpns/Service.vue';
   import Service from './cpns/Service.vue';
   import Events from './cpns/Events.vue';
   import Events from './cpns/Events.vue';
+  import { mockData } from '../physical/cpns/components/mock';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
   const blockContent = `属性一般是设备的运行状态，如当前温度等；服务是设备可被调用的方法，支持定义参数，如执行某项任务；事件则是设备上报的
   const blockContent = `属性一般是设备的运行状态，如当前温度等；服务是设备可被调用的方法，支持定义参数，如执行某项任务；事件则是设备上报的
@@ -52,29 +53,50 @@
   const EventsRef = ref<InstanceType<typeof Events>>();
   const EventsRef = ref<InstanceType<typeof Events>>();
   const isUpdate = ref(false);
   const isUpdate = ref(false);
   const isViewDetail = ref('');
   const isViewDetail = ref('');
+  const isText = ref('');
+  const allData: any = reactive({
+    properties: [],
+    events: [],
+    services: [],
+    productKey: '',
+    _ppk: {},
+  });
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     setModalProps({ loading: true });
+    handleCancel(false);
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
     isViewDetail.value = data.isView;
     isViewDetail.value = data.isView;
-    // AttrRef.value?.setFormData()
-    setModalProps({ loading: false });
+    isText.value = data.isText;
     if (!unref(isViewDetail)) {
     if (!unref(isViewDetail)) {
       const title = !unref(isUpdate) ? '编辑物模型' : '新增物模型';
       const title = !unref(isUpdate) ? '编辑物模型' : '新增物模型';
+      if (!unref(isUpdate)) {
+        AttrRef.value?.setFormData(mockData.properties);
+      }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true });
       setModalProps({ title, showOkBtn: true, showCancelBtn: true });
       if (!unref(isUpdate)) {
       if (!unref(isUpdate)) {
       }
       }
     } else {
     } else {
       setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
       setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
+      AttrRef.value?.setFormData(mockData.properties);
     }
     }
+    setModalProps({ loading: false });
   });
   });
-  const handleCancel = () => {
+  const handleCancel = (flag) => {
     AttrRef.value?.resetFormData();
     AttrRef.value?.resetFormData();
-    closeModal();
+    activeKey.value = '1';
+    allData.properties = [];
+    allData.events = [];
+    allData.services = [];
+    if (flag) {
+      closeModal();
+    }
   };
   };
   const handleSubmit = async () => {
   const handleSubmit = async () => {
     const value = await AttrRef.value?.getFormData();
     const value = await AttrRef.value?.getFormData();
     if (!value) return;
     if (!value) return;
-    console.log('搜集值', value);
+    allData.properties.push(value);
+    console.log('搜集值', allData);
+    closeModal();
   };
   };
 </script>
 </script>
 
 

 <template>
 <template>
   <div>
   <div>
-    <BasicForm @register="register" />
+    <BasicForm @register="register">
+      <template #valueRangeSlot>
+        <div style="display: flex">
+          <Input
+            type="number"
+            v-model:vlaue="minMaxObj.min"
+            placeholder="最小值"
+            @blur="onInputBlurMin"
+          />
+          <span>~</span>
+          <Input
+            type="number"
+            v-model:vlaue="minMaxObj.max"
+            placeholder="最大值"
+            @blur="onInputBlurMax"
+          />
+        </div>
+      </template>
+      <template #outputParamSlot>
+        <div>
+          <template v-for="(item, index) in outputParamData" :key="item">
+            <span style="display: none">{{ item }}</span>
+            <InputParamItem
+              :title="item.name"
+              :item="item"
+              class="mt-4"
+              :index="index"
+              :ref="dynamicBindRef.outputParamItemRef"
+              @delete="deleteOutParItem"
+              @edit="editOutParItem"
+            />
+          </template>
+          <div style="display: flex" class="mt-2">
+            <span style="color: #0170cc; cursor: pointer">+</span>
+            <span style="color: #0170cc; cursor: pointer" @click="handleAddOutParam">增加参数</span>
+          </div>
+        </div>
+      </template>
+    </BasicForm>
+    <AddParamsModal @register="registerModal" @data="getData" />
   </div>
   </div>
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
+  import { ref, unref, reactive } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { attrSchemas } from './config';
   import { attrSchemas } from './config';
+  import { useModal } from '/@/components/Modal';
+  import InputParamItem from './components/InputParamItem.vue';
+  import AddParamsModal from './components/AddParamsModal.vue';
+  import { Input } from 'ant-design-vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const { createMessage } = useMessage();
+  const outputParamData: any = ref([]);
+  const minMaxObj = reactive({
+    min: '',
+    max: '',
+  });
+
+  const dynamicBindRef = {
+    outputParamItemRef: ref([]),
+  };
+  const [registerModal, { openModal }] = useModal();
 
 
   const [register, { validate, setFieldsValue, resetFields }] = useForm({
   const [register, { validate, setFieldsValue, resetFields }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
@@ -17,20 +74,91 @@
     submitOnReset: false,
     submitOnReset: false,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
   });
   });
+  const onInputBlurMin = (e) => (minMaxObj.min = e.target.value);
+  const onInputBlurMax = (e) => (minMaxObj.max = e.target.value);
+
+  const getData = (d, f) => {
+    if (f == 'output') {
+      unref(outputParamData).push(d);
+      if (d.id !== null) {
+        const findIndex = unref(outputParamData).findIndex((f) => f.id !== d.id);
+        if (findIndex !== -1) unref(outputParamData).splice(findIndex, 1);
+      }
+    }
+  };
+
+  const handleAddOutParam = () => {
+    openModal(true, {
+      isUpdate: true,
+      flag: 'output',
+      excludeStruct: true,
+    });
+  };
+
+  const deleteOutParItem = (index) => {
+    unref(outputParamData).splice(index, 1);
+  };
+  const editOutParItem = (item) => {
+    openModal(true, {
+      isUpdate: false,
+      record: item,
+      flag: 'output',
+      excludeStruct: true,
+    });
+  };
 
 
   //回显数据
   //回显数据
   const setFormData = (v) => {
   const setFormData = (v) => {
-    setFieldsValue(v);
+    setFieldsValue(v[0]);
+    const { dataSpecsList } = v[0];
+    outputParamData.value = [...new Array(dataSpecsList.length).keys()];
+    outputParamData.value = v[0].dataSpecsList;
+    // dataSpecsList.forEach((item, index) => {
+    //   nextTick(() => {
+    //     unref(dynamicBindRef.outputParamItemRef)[index].setFormData(dataSpecsList)
+    //   })
+    // });
   };
   };
   //获取数据
   //获取数据
+  const getStructList = () => {
+    const val = unref(dynamicBindRef.outputParamItemRef)?.map((item: any) => item.getFormData());
+    return val;
+  };
+
   async function getFormData() {
   async function getFormData() {
     const values = await validate();
     const values = await validate();
     if (!values) return;
     if (!values) return;
-    return values;
+    const dataSpecsList = getStructList();
+    if (Number(minMaxObj.min) > Number(minMaxObj.max)) {
+      createMessage.error('最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16');
+      throw '最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16';
+    }
+    if (Number(values.step) > Number(minMaxObj.max) - Number(minMaxObj.min)) {
+      createMessage.error('步长不能大于取值范围的差值');
+      throw '步长不能大于取值范围的差值';
+    }
+    const isStruct = values.dataType === 'STRUCT';
+    const dataSpecs = {
+      ...minMaxObj,
+      ...{ step: values.step },
+      ...{ unit: values.unit },
+      ...{ dataType: values.dataType },
+    };
+    Reflect.deleteProperty(values, 'valueRange');
+    Reflect.deleteProperty(values, 'step');
+    Reflect.deleteProperty(values, 'unit');
+    Reflect.deleteProperty(values, 'outputParam');
+    return {
+      ...values,
+      ...{ dataSpecs: isStruct ? null : dataSpecs },
+      ...{ dataSpecsList: isStruct ? dataSpecsList : null },
+    };
   }
   }
   //清空数据
   //清空数据
   const resetFormData = () => {
   const resetFormData = () => {
     resetFields();
     resetFields();
+    Reflect.set(minMaxObj, 'min', '');
+    Reflect.set(minMaxObj, 'max', '');
   };
   };
 
 
   defineExpose({
   defineExpose({

@@ -61,6 +61,7 @@
     openModal(true, {
     openModal(true, {
       isUpdate: true,
       isUpdate: true,
       flag: 'output',
       flag: 'output',
+      excludeStruct: false,
     });
     });
   };
   };
   const deleteOutParItem = (index) => {
   const deleteOutParItem = (index) => {

@@ -92,12 +92,14 @@
     openModal(true, {
     openModal(true, {
       isUpdate: true,
       isUpdate: true,
       flag: 'input',
       flag: 'input',
+      excludeStruct: false,
     });
     });
   };
   };
   const handleAddOutParam = () => {
   const handleAddOutParam = () => {
     openModal(true, {
     openModal(true, {
       isUpdate: true,
       isUpdate: true,
       flag: 'output',
       flag: 'output',
+      excludeStruct: false,
     });
     });
   };
   };
 
 

-{
-  "_ppk": {},
-  "events": [],
-  "productKey": "hsrnBYoBGFe",
-  "properties": [],
-  "services": [
-    {
-      "callType": "ASYNC",
-      "createTs": 1666172133097,
-      "custom": true,
-      "identifier": "1",
-      "inputParams": [
-        {
-          "custom": true,
-          "dataSpecs": {
-            "dataType": "INT",
-            "max": "2",
-            "min": "1",
-            "step": "1",
-            "unit": "W/㎡",
-            "unitName": "太阳总辐射"
-          },
-          "dataType": "INT",
-          "direction": "PARAM_INPUT",
-          "identifier": "1",
-          "name": "1",
-          "paraOrder": 0
-        }
-      ],
-      "outputParams": [],
-      "productKey": "hsrnBYoBGFe",
-      "required": false,
-      "serviceName": "1"
-    },
-    {
-      "callType": "ASYNC",
-      "createTs": 1666172369588,
-      "custom": true,
-      "identifier": "wufu1",
-      "inputParams": [
-        {
-          "custom": true,
-          "dataSpecs": {
-            "dataType": "INT",
-            "max": "200",
-            "min": "100",
-            "step": "11",
-            "unit": "dS/m",
-            "unitName": "土壤EC值"
-          },
-          "dataType": "INT",
-          "direction": "PARAM_INPUT",
-          "identifier": "ceshi",
-          "name": "ceshi1",
-          "paraOrder": 0
-        }
-      ],
-      "outputParams": [],
-      "productKey": "hsrnBYoBGFe",
-      "required": false,
-      "serviceName": "服务1"
-    }
-  ]
-}

@@ -3,9 +3,9 @@
     <BasicForm @register="registerForm">
     <BasicForm @register="registerForm">
       <template #valueRangeSlot>
       <template #valueRangeSlot>
         <div style="display: flex">
         <div style="display: flex">
-          <a-input v-model:vlaue="minMaxObj.min" placeholder="最小值" />
+          <a-input v-model:vlaue="minMaxObj.min" placeholder="最小值" @blur="onInputBlurMin" />
           <span>~</span>
           <span>~</span>
-          <a-input v-model:vlaue="minMaxObj.max" placeholder="最大值" />
+          <a-input v-model:vlaue="minMaxObj.max" placeholder="最大值" @blur="onInputBlurMax" />
         </div>
         </div>
       </template>
       </template>
       <template #structSlot>
       <template #structSlot>
@@ -39,8 +39,11 @@
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import InputParamItem from './InputParamItem.vue';
   import InputParamItem from './InputParamItem.vue';
   import AddParamsModal from './AddParamsModal.vue';
   import AddParamsModal from './AddParamsModal.vue';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
+  const { createMessage } = useMessage();
   const outputParamData: any = ref([]);
   const outputParamData: any = ref([]);
   const dynamicBindRef = {
   const dynamicBindRef = {
     outputParamItemRef: ref([]),
     outputParamItemRef: ref([]),
@@ -51,7 +54,7 @@
   });
   });
   const [registerModal, { openModal }] = useModal();
   const [registerModal, { openModal }] = useModal();
 
 
-  const [registerForm, { validate, setFieldsValue, resetFields }] = useForm({
+  const [registerForm, { validate, setFieldsValue, resetFields, updateSchema }] = useForm({
     labelWidth: 100,
     labelWidth: 100,
     schemas: addParamsSchemas,
     schemas: addParamsSchemas,
     actionColOptions: {
     actionColOptions: {
@@ -61,6 +64,8 @@
     submitOnReset: false,
     submitOnReset: false,
     showActionButtonGroup: false,
     showActionButtonGroup: false,
   });
   });
+  const onInputBlurMin = (e) => (minMaxObj.min = e.target.value);
+  const onInputBlurMax = (e) => (minMaxObj.max = e.target.value);
 
 
   const getData = (d, f) => {
   const getData = (d, f) => {
     if (f == 'output') {
     if (f == 'output') {
@@ -76,6 +81,7 @@
     openModal(true, {
     openModal(true, {
       isUpdate: true,
       isUpdate: true,
       flag: 'output',
       flag: 'output',
+      excludeStruct: true,
     });
     });
   };
   };
 
 
@@ -90,10 +96,67 @@
     });
     });
   };
   };
 
 
+  const updateFormExcludeStruct = async (flag) => {
+    const res: any = await findDictItemByCode({ dictCode: 'data_type' });
+    const optionTrue = res
+      .map((m) => {
+        if (flag) {
+          if (m.itemValue !== 'STRUCT') {
+            return {
+              value: m.itemValue,
+              label: m.itemText,
+            };
+          }
+        } else {
+          return {
+            value: m.itemValue,
+            label: m.itemText,
+          };
+        }
+      })
+      .filter(Boolean);
+    updateSchema({
+      field: 'dataType',
+      componentProps: {
+        options: optionTrue,
+      },
+    });
+  };
+
   const getFormData = async () => {
   const getFormData = async () => {
-    const value = await validate();
-    if (!value) return;
-    return value;
+    const values = await validate();
+    if (!values) return;
+    if (Number(minMaxObj.min) > Number(minMaxObj.max)) {
+      createMessage.error('最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16');
+      throw '最大值必须大于最小值，整数型不能有小数位，单精度有效位为7，双精度为16';
+    }
+    if (Number(values.step) > Number(minMaxObj.max) - Number(minMaxObj.min)) {
+      createMessage.error('步长不能大于取值范围的差值');
+      throw '步长不能大于取值范围的差值';
+    }
+    const childSpecsDTO = {
+      dataType: values.dataType,
+      max: values.max,
+      min: values.min,
+      step: values.step,
+      unit: values.unit,
+    };
+    const dataSpecs = {
+      dataType: values.dataType,
+      max: values.max,
+      min: values.min,
+      step: values.step,
+      unit: values.unit,
+    };
+    return {
+      ...values,
+      ...{ dataSpecs },
+      ...{ childSpecsDTO },
+      ...{
+        childDataType: values.dataType,
+        childName: values.name,
+      },
+    };
   };
   };
   const setFormData = (v) => {
   const setFormData = (v) => {
     setFieldsValue(v);
     setFieldsValue(v);
@@ -108,6 +171,7 @@
     setFormData,
     setFormData,
     getFormData,
     getFormData,
     resetFormData,
     resetFormData,
+    updateFormExcludeStruct,
   });
   });
 </script>
 </script>
 
 

@@ -25,6 +25,7 @@
   const AddParamFormRef = ref<InstanceType<typeof AddParamForm>>();
   const AddParamFormRef = ref<InstanceType<typeof AddParamForm>>();
   const isUpdate = ref(false);
   const isUpdate = ref(false);
   const isFlag = ref('');
   const isFlag = ref('');
+  const excludeStruct = ref(false);
   const getTitle = computed(() => (!isUpdate.value ? '编辑参数' : '新增参数'));
   const getTitle = computed(() => (!isUpdate.value ? '编辑参数' : '新增参数'));
 
 
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
@@ -32,9 +33,15 @@
     handleCancel(false);
     handleCancel(false);
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
     isFlag.value = data.flag;
     isFlag.value = data.flag;
+    excludeStruct.value = data.excludeStruct;
     AddParamFormRef.value?.setFormData(data.record);
     AddParamFormRef.value?.setFormData(data.record);
     setEditData.getEditData = data.record;
     setEditData.getEditData = data.record;
     setModalProps({ loading: false });
     setModalProps({ loading: false });
+    if (excludeStruct.value) {
+      AddParamFormRef.value?.updateFormExcludeStruct(true);
+    } else {
+      AddParamFormRef.value?.updateFormExcludeStruct(false);
+    }
   });
   });
 
 
   const handleCancel = (flag) => {
   const handleCancel = (flag) => {

@@ -17,7 +17,7 @@
   import { buildUUID } from '/@/utils/uuid';
   import { buildUUID } from '/@/utils/uuid';
 
 
   const emit = defineEmits(['delete', 'edit']);
   const emit = defineEmits(['delete', 'edit']);
-  defineProps({
+  const props = defineProps({
     index: {
     index: {
       type: Number,
       type: Number,
       required: true,
       required: true,
@@ -43,6 +43,16 @@
     };
     };
     emit('edit', value);
     emit('edit', value);
   };
   };
+
+  const getFormData = () => {
+    return props.item;
+  };
+  // const setFormData = (v) => {
+  //   console.log(v)
+  // }
+  defineExpose({
+    getFormData,
+  });
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
   :deep(.ant-card-body) {
   :deep(.ant-card-body) {

+export const mockData = {
+  _ppk: {},
+  events: [],
+  productKey: 'hsrnXEfGFDv',
+  properties: [
+    {
+      createTs: 1666259889029,
+      custom: true,
+      customFlag: true,
+      dataSpecsList: [
+        {
+          childDataType: 'INT',
+          childName: '测试参数1',
+          childSpecsDTO: {
+            dataType: 'INT',
+            max: '30',
+            min: '20',
+            step: '1',
+            unit: 'mm/hour',
+            unitName: '降雨量',
+          },
+          custom: true,
+          dataSpecs: {
+            dataType: 'INT',
+            max: '30',
+            min: '20',
+            step: '1',
+            unit: 'mm/hour',
+            unitName: '降雨量',
+          },
+          dataType: 'STRUCT',
+          identifier: 'iden2',
+          isStd: 0,
+          name: '测试参数1',
+        },
+        {
+          childDataType: 'INT',
+          childName: '测试参数2',
+          childSpecsDTO: {
+            dataType: 'INT',
+            max: '40',
+            min: '30',
+            step: '2',
+            unit: 'pH',
+            unitName: 'PH值',
+          },
+          custom: true,
+          dataSpecs: {
+            dataType: 'INT',
+            max: '40',
+            min: '30',
+            step: '2',
+            unit: 'pH',
+            unitName: 'PH值',
+          },
+          dataType: 'STRUCT',
+          identifier: 'idne2',
+          isStd: 0,
+          name: '测试参数2',
+        },
+      ],
+      dataType: 'STRUCT',
+      description: '21212',
+      identifier: 'iden1',
+      name: '测试功能',
+      productKey: 'hsrnXEfGFDv',
+      required: false,
+      rwFlag: 'READ_WRITE',
+      std: false,
+    },
+  ],
+  services: [],
+};

@@ -26,7 +26,7 @@ export const defaultTslContent = {
 
 
 export const attrSchemas: FormSchema[] = [
 export const attrSchemas: FormSchema[] = [
   {
   {
-    field: 'configName',
+    field: 'name',
     label: '功能名称',
     label: '功能名称',
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
@@ -39,7 +39,7 @@ export const attrSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'configName1',
+    field: 'identifier',
     label: '标识符',
     label: '标识符',
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
@@ -59,7 +59,7 @@ export const attrSchemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 9,
       span: 9,
     },
     },
-    defaultValue: 'int32',
+    defaultValue: 'INT',
     componentProps: {
     componentProps: {
       placeholder: '请选择数据类型',
       placeholder: '请选择数据类型',
       api: findDictItemByCode,
       api: findDictItemByCode,
@@ -71,7 +71,30 @@ export const attrSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'accessKeyId',
+    field: 'valueRange',
+    label: '取值范围',
+    component: 'Input',
+    slot: 'valueRangeSlot',
+    colProps: {
+      span: 18,
+    },
+    ifShow: ({ values }) => isNumber(values.dataType),
+  },
+  {
+    field: 'step',
+    label: '步长',
+    component: 'Input',
+    colProps: {
+      span: 18,
+    },
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入步长',
+    },
+    ifShow: ({ values }) => isNumber(values.dataType),
+  },
+  {
+    field: 'unit',
     label: '单位',
     label: '单位',
     component: 'ApiSelect',
     component: 'ApiSelect',
     colProps: {
     colProps: {
@@ -89,7 +112,7 @@ export const attrSchemas: FormSchema[] = [
     ifShow: ({ values }) => isNumber(values.dataType),
     ifShow: ({ values }) => isNumber(values.dataType),
   },
   },
   {
   {
-    field: 'field1',
+    field: 'boolClose',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '0 -',
     label: '0 -',
@@ -102,7 +125,7 @@ export const attrSchemas: FormSchema[] = [
     ifShow: ({ values }) => isBool(values.dataType),
     ifShow: ({ values }) => isBool(values.dataType),
   },
   },
   {
   {
-    field: 'field11',
+    field: 'boolOpen',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '1 -',
     label: '1 -',
@@ -115,7 +138,7 @@ export const attrSchemas: FormSchema[] = [
     ifShow: ({ values }) => isBool(values.dataType),
     ifShow: ({ values }) => isBool(values.dataType),
   },
   },
   {
   {
-    field: 'field2',
+    field: 'length',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '数据长度',
     label: '数据长度',
@@ -127,7 +150,7 @@ export const attrSchemas: FormSchema[] = [
     ifShow: ({ values }) => isString(values.dataType),
     ifShow: ({ values }) => isString(values.dataType),
   },
   },
   {
   {
-    field: 'brand',
+    field: 'rwFlag',
     component: 'ApiRadioGroup',
     component: 'ApiRadioGroup',
     label: '读写类型',
     label: '读写类型',
     required: true,
     required: true,
@@ -146,12 +169,21 @@ export const attrSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'outputParam',
+    label: 'JSON 对象',
+    component: 'Input',
+    // required: true,
+    slot: 'outputParamSlot',
+    colProps: { span: 24 },
+    ifShow: ({ values }) => isStruct(values.dataType),
+  },
+  {
     label: '描述',
     label: '描述',
     field: 'description',
     field: 'description',
     component: 'InputTextArea',
     component: 'InputTextArea',
     componentProps: {
     componentProps: {
       rows: 6,
       rows: 6,
-      maxLength: 255,
+      maxLength: 100,
       placeholder: '请输入描述',
       placeholder: '请输入描述',
     },
     },
   },
   },
@@ -223,7 +255,7 @@ export const serviceSchemas: FormSchema[] = [
     component: 'InputTextArea',
     component: 'InputTextArea',
     componentProps: {
     componentProps: {
       rows: 6,
       rows: 6,
-      maxLength: 255,
+      maxLength: 100,
       placeholder: '请输入描述',
       placeholder: '请输入描述',
     },
     },
   },
   },
@@ -288,7 +320,7 @@ export const eventSchemas: FormSchema[] = [
     component: 'InputTextArea',
     component: 'InputTextArea',
     componentProps: {
     componentProps: {
       rows: 6,
       rows: 6,
-      maxLength: 255,
+      maxLength: 100,
       placeholder: '请输入描述',
       placeholder: '请输入描述',
     },
     },
   },
   },
@@ -298,11 +330,11 @@ export const eventSchemas: FormSchema[] = [
  * 新增参数 动态显示表单
  * 新增参数 动态显示表单
  */
  */
 enum DateTypeEnum {
 enum DateTypeEnum {
-  IS_NUMBER_INT = 'int32',
-  IS_NUMBER_DOUBLE = 'double',
-  IS_STRING = 'text',
-  IS_STRUCT = 'struct',
-  IS_BOOL = 'bool',
+  IS_NUMBER_INT = 'INT',
+  IS_NUMBER_DOUBLE = 'DOUBLE',
+  IS_STRING = 'TEXT',
+  IS_STRUCT = 'STRUCT',
+  IS_BOOL = 'BOOL',
 }
 }
 const isNumber = (type: string) => {
 const isNumber = (type: string) => {
   return type === DateTypeEnum.IS_NUMBER_INT || type === DateTypeEnum.IS_NUMBER_DOUBLE;
   return type === DateTypeEnum.IS_NUMBER_INT || type === DateTypeEnum.IS_NUMBER_DOUBLE;
@@ -354,7 +386,7 @@ export const addParamsSchemas: FormSchema[] = [
     colProps: {
     colProps: {
       span: 23,
       span: 23,
     },
     },
-    defaultValue: 'int32',
+    defaultValue: 'INT',
     componentProps: {
     componentProps: {
       placeholder: '请选择数据类型',
       placeholder: '请选择数据类型',
       api: findDictItemByCode,
       api: findDictItemByCode,
@@ -366,7 +398,7 @@ export const addParamsSchemas: FormSchema[] = [
     },
     },
   },
   },
   {
   {
-    field: 'configNam2112111',
+    field: 'structSlot',
     label: 'JSON 对象',
     label: 'JSON 对象',
     required: true,
     required: true,
     component: 'Input',
     component: 'Input',
@@ -377,7 +409,7 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isStruct(values.dataType),
     ifShow: ({ values }) => isStruct(values.dataType),
   },
   },
   {
   {
-    field: 'field1',
+    field: 'boolClose',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '0 -',
     label: '0 -',
@@ -390,7 +422,7 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isBool(values.dataType),
     ifShow: ({ values }) => isBool(values.dataType),
   },
   },
   {
   {
-    field: 'field11',
+    field: 'boolOpen',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '1 -',
     label: '1 -',
@@ -403,7 +435,7 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isBool(values.dataType),
     ifShow: ({ values }) => isBool(values.dataType),
   },
   },
   {
   {
-    field: 'field2',
+    field: 'length',
     component: 'Input',
     component: 'Input',
     required: true,
     required: true,
     label: '数据长度',
     label: '数据长度',
@@ -415,7 +447,7 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isString(values.dataType),
     ifShow: ({ values }) => isString(values.dataType),
   },
   },
   {
   {
-    field: 'configNam2112',
+    field: 'valueRange',
     label: '取值范围',
     label: '取值范围',
     component: 'Input',
     component: 'Input',
     slot: 'valueRangeSlot',
     slot: 'valueRangeSlot',
@@ -425,7 +457,7 @@ export const addParamsSchemas: FormSchema[] = [
     ifShow: ({ values }) => isNumber(values.dataType),
     ifShow: ({ values }) => isNumber(values.dataType),
   },
   },
   {
   {
-    field: 'configNam22',
+    field: 'step',
     label: '步长',
     label: '步长',
     component: 'Input',
     component: 'Input',
     colProps: {
     colProps: {

@@ -103,7 +103,9 @@
       var str = "";
       var str = "";
       for(var i = 6;i<20;i+=2){
       for(var i = 6;i<20;i+=2){
         str += String.fromCharCode(parseInt(trimSource[i]+trimSource[i+1],16));
         str += String.fromCharCode(parseInt(trimSource[i]+trimSource[i+1],16));
-      }`
+      }
+    }
+      `
     );
     );
     beautify(aceEditor.value.session);
     beautify(aceEditor.value.session);
     scriptForm.scriptContent = aceEditor.value.getValue();
     scriptForm.scriptContent = aceEditor.value.getValue();

@@ -10,7 +10,7 @@
       @cancel="handleCancel"
       @cancel="handleCancel"
       @ok="handleSubmit"
       @ok="handleSubmit"
     >
     >
-      <ConverScript :ifAdd="true" ref="converScriptRef" />
+      <ConverScript :ifAdd="isTest ? false : true" ref="converScriptRef" />
     </BasicModal>
     </BasicModal>
   </div>
   </div>
 </template>
 </template>
@@ -23,16 +23,28 @@
   const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
   const getTitle = computed(() => (isUpdate.value ? '编辑转换脚本' : '新增转换脚本'));
   const isUpdate = ref(false);
   const isUpdate = ref(false);
   const isViewDetail = ref('');
   const isViewDetail = ref('');
+  const isTest = ref(false);
+  const isText = ref('');
+  const isTitle = ref('');
   const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
   const [register, { setModalProps, closeModal }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     setModalProps({ loading: true });
     handleCancel(false);
     handleCancel(false);
     isUpdate.value = data.isUpdate;
     isUpdate.value = data.isUpdate;
     isViewDetail.value = data.isView;
     isViewDetail.value = data.isView;
+    isTest.value = data.isTest;
+    isText.value = data.isText;
+    isTitle.value = data.isTitle;
     converScriptRef.value?.initEditor(data.record?.configuration?.jsScript);
     converScriptRef.value?.initEditor(data.record?.configuration?.jsScript);
     setModalProps({ loading: false });
     setModalProps({ loading: false });
     if (!unref(isViewDetail)) {
     if (!unref(isViewDetail)) {
-      const title = !unref(isUpdate) ? '编辑转换脚本' : '新增转换脚本';
-      setModalProps({ title, showOkBtn: true, showCancelBtn: true });
+      const title =
+        unref(isTitle) == 'edit'
+          ? '编辑转换脚本'
+          : unref(isTitle) == 'add'
+          ? '新增转换脚本'
+          : '测试转换脚本';
+      const okText = isText.value == 'test' ? '测试' : '确定';
+      setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
       if (!unref(isUpdate)) {
       if (!unref(isUpdate)) {
       }
       }
     } else {
     } else {

@@ -91,3 +91,72 @@ export const formSchema: FormSchema[] = [
     colProps: { span: 24 },
     colProps: { span: 24 },
   },
   },
 ];
 ];
+
+export const mockData: any = async () => {
+  const res = await [
+    {
+      reportConfigName: '风机转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '风机转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '水电转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '水电转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '摄像头转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '摄像头转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '变压器转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '变压器转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '设备状态转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '设备状态转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '电流转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '电流转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '电压转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '电压转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '传感器转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '传感器转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+    {
+      reportConfigName: '物模型转换',
+      organizationName: 1,
+      dataType: 'function',
+      executeWay: '物模型转换脚本使用js',
+      executeTime: '2022-10-20 10:24:22',
+    },
+  ];
+  return res;
+};

@@ -25,6 +25,12 @@
         <TableAction
         <TableAction
           :actions="[
           :actions="[
             {
             {
+              label: '测试',
+              icon: 'clarity:note-edit-line',
+              auth: '',
+              onClick: handleBindTest.bind(null, record),
+            },
+            {
               label: '编辑',
               label: '编辑',
               icon: 'clarity:note-edit-line',
               icon: 'clarity:note-edit-line',
               auth: '',
               auth: '',
@@ -51,18 +57,19 @@
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { reactive, nextTick } from 'vue';
   import { reactive, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { searchFormSchema, columns } from './config.data';
+  import { searchFormSchema, columns, mockData } from './config.data';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Popconfirm } from 'ant-design-vue';
   import { Popconfirm } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import { useModal } from '/@/components/Modal';
   import ConverScriptModal from './ConverScriptModal.vue';
   import ConverScriptModal from './ConverScriptModal.vue';
-  import { exportPage, deleteExportManage } from '/@/api/export/exportManager';
+  import { deleteExportManage } from '/@/api/export/exportManager';
 
 
   const searchInfo = reactive<Recordable>({});
   const searchInfo = reactive<Recordable>({});
   const [registerTable, { reload, setProps }] = useTable({
   const [registerTable, { reload, setProps }] = useTable({
     title: '转换脚本列表',
     title: '转换脚本列表',
-    api: exportPage,
+    // api: exportPage,
+    api: mockData,
     columns,
     columns,
     showIndexColumn: false,
     showIndexColumn: false,
     clickToRowSelect: false,
     clickToRowSelect: false,
@@ -107,11 +114,28 @@
         isUpdate: false,
         isUpdate: false,
         record,
         record,
         isView: false,
         isView: false,
+        isTest: false,
+        isText: 'confirm',
+        isTitle: 'edit',
       });
       });
     } else {
     } else {
       openModal(true, {
       openModal(true, {
         isUpdate: true,
         isUpdate: true,
         isView: false,
         isView: false,
+        isTest: false,
+        isText: 'confirm',
+        isTitle: 'add',
+      });
+    }
+  };
+  const handleBindTest = (record: Recordable | null) => {
+    if (record) {
+      openModal(true, {
+        isUpdate: false,
+        record,
+        isTest: true,
+        isText: 'test',
+        isTitle: 'test',
       });
       });
     }
     }
   };
   };