feat:修改物模型

fengtao
1 parent e34fd64f
Showing 10 changed files with 118 additions and 29 deletions
src/views/device/profiles/DeviceProfileModal.vue
src/views/device/profiles/device.profile.data.ts
src/views/device/profiles/step/cpns/physical/PhysicalModelModal.vue
src/views/device/profiles/step/cpns/physical/cpns/Attribute.vue
src/views/device/profiles/step/cpns/physical/cpns/Events.vue
src/views/device/profiles/step/cpns/physical/cpns/Service.vue
src/views/device/profiles/step/cpns/physical/cpns/components/AddParamForm.vue
src/views/device/profiles/step/cpns/tcp/index.vue
src/views/scriptmanage/converscript/ConverScript.vue
src/views/scriptmanage/converscript/config.data.ts
--- a/src/views/device/profiles/DeviceProfileModal.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/DeviceProfileModal.vue
View file @f5cb7ff
@@ -3,7 +3,7 @@
     <BasicModal
       :maskClosable="false"
       v-bind="$attrs"
-      width="60rem"
+      :width="dynamicWidth"
       @register="register"
       @ok="handleSubmit"
       @cancel="handleCancel"
@@ -86,6 +86,7 @@
     profileData: {},
   });
   const transportTypeStr = ref('');
+  const dynamicWidth = ref('55rem');
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
     setModalProps({ confirmLoading: false });
     current.value = 0;
@@ -95,6 +96,7 @@
     isEditId.value = data.record !== undefined ? data.record.id : null;
     isEditCreatTime.value = data.record !== undefined ? data.record.createTime : null;
     if (!unref(isViewDetail)) {
+      dynamicWidth.value = 55 + 'rem';
       const title = !unref(isUpdate) ? '编辑设备配置' : '新增设备配置';
       setModalProps({ title, showOkBtn: true, showCancelBtn: true });
       if (!unref(isUpdate)) {
@@ -103,6 +105,7 @@
         handleStepNext(false, res);
       }
     } else {
+      dynamicWidth.value = 60 + 'rem';
       setModalProps({ showOkBtn: false, showCancelBtn: false, title: '设备配置详情' });
       await setDeviceConfEditFormData(res);
       await setTransConfEditFormData(res);
--- a/src/views/device/profiles/device.profile.data.ts
View file @f5cb7ff
+++ b/src/views/device/profiles/device.profile.data.ts
View file @f5cb7ff
@@ -21,6 +21,11 @@ export const steps = [
 export const physicalColumn: BasicColumn[] = [
   {
+    title: '功能类型',
+    dataIndex: 'dType',
+    width: 90,
+  },
+  {
     title: '功能名称',
     dataIndex: 'name',
     width: 90,
@@ -410,6 +415,7 @@ export const formSchema: FormSchema[] = [
 export const mockData: any = async () => {
   const res = await [
     {
+      dType: 'events',
       name: '亮度百分比',
       type: 'Brightness',
       transportType: 'int32(整数型)',
@@ -420,6 +426,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'service',
       name: '运行状态',
       type: 'RunningState',
       transportType: 'bool(布尔型)',
@@ -430,6 +437,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'attr',
       name: '设备运行状态',
       type: 'E_Status_UP',
       transportType: 'text(字符串)',
@@ -440,6 +448,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'attr',
       name: '过流告警使能',
       type: 'OverCurrentEnable',
       transportType: 'struct(结构体)',
@@ -450,6 +459,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'events',
       name: '变频器运行状态1',
       type: 'Brightness',
       transportType: 'int32(整数型)',
@@ -460,6 +470,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'service',
       name: '产品序列号',
       type: 'SerialNo',
       transportType: 'text(字符串)',
@@ -470,6 +481,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'service',
       name: '音量百分比',
       type: 'Volume',
       transportType: 'int32(整数型)',
@@ -480,6 +492,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'attr',
       name: '易释放氰化物',
       type: 'easy_release_cyanide',
       transportType: 'double(双精度浮点型)',
@@ -490,6 +503,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'attr',
       name: '湿度',
       type: 'Humidity',
       transportType: 'float(单精度浮点型)',
@@ -500,6 +514,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'attr',
       name: '设备固件版本',
       type: 'FirmwareVersion',
       transportType: 'text(字符串)',
@@ -510,6 +525,7 @@ export const mockData: any = async () => {
       createTime: '2022-10-20 10:24:22',
     },
     {
+      dType: 'events',
       name: '用电量',
       type: 'PowerConsumption',
       transportType: 'float(单精度浮点型)',
--- a/src/views/device/profiles/step/cpns/physical/PhysicalModelModal.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/physical/PhysicalModelModal.vue
View file @f5cb7ff
@@ -10,6 +10,8 @@
     >
       <div v-if="isViewDetail">
         <Attribute v-show="activeKey === '1'" ref="AttrRef" />
+        <Service v-show="activeKey === '2'" ref="ServiceRef" />
+        <Events v-show="activeKey === '3'" ref="EventsRef" />
       </div>
       <div v-if="!isViewDetail">
         <div>
@@ -20,13 +22,19 @@
           </Typography>
         </div>
         <Tabs type="card" v-model:activeKey="activeKey" :size="size">
-          <TabPane forceRender key="1" tab="属性">
+          <TabPane :disabled="attrDisable" forceRender key="1" tab="属性">
             <Attribute v-show="activeKey === '1'" ref="AttrRef" />
           </TabPane>
-          <TabPane forceRender key="2" tab="服务">
+          <TabPane :disabled="serveiceDisable" forceRender key="2" tab="服务">
             <Service v-show="activeKey === '2'" ref="ServiceRef" />
           </TabPane>
-          <TabPane forceRender key="3" v-show="activeKey === '3'" tab="事件">
+          <TabPane
+            :disabled="eventDisable"
+            forceRender
+            key="3"
+            v-show="activeKey === '3'"
+            tab="事件"
+          >
             <Events v-show="activeKey === '3'" ref="EventsRef" />
           </TabPane>
         </Tabs>
@@ -44,6 +52,9 @@
   import { mockData } from '../physical/cpns/components/mock';
   defineEmits(['register']);
+  const attrDisable = ref(false);
+  const serveiceDisable = ref(false);
+  const eventDisable = ref(false);
   const blockContent = `属性一般是设备的运行状态，如当前温度等；服务是设备可被调用的方法，支持定义参数，如执行某项任务；事件则是设备上报的
 通知，如告警，需要被及时处理。`;
   const activeKey = ref('1');
@@ -54,6 +65,7 @@
   const isUpdate = ref(false);
   const isViewDetail = ref('');
   const isText = ref('');
+  const dType = ref('');
   const allData: any = reactive({
     properties: [],
     events: [],
@@ -61,28 +73,63 @@
     productKey: '',
     _ppk: {},
   });
+
+  const setAttrFormData = (data: {}) => AttrRef.value?.setFormData(data);
+  const setServiceFormData = (data: {}) => ServiceRef.value?.setFormData(data);
+  const setEventsFormData = (data: {}) => EventsRef.value?.setFormData(data);
+  const enums = {
+    attr: setAttrFormData,
+    service: setServiceFormData,
+    events: setEventsFormData,
+  };
+  function action(val, data) {
+    let F = enums[val];
+    F(data);
+  }
+  const dynamicData = (t, a, s, e) => {
+    switch (t) {
+      case 'attr':
+        activeKey.value = '1';
+        action(t, a);
+        attrDisable.value = false;
+        serveiceDisable.value = true;
+        eventDisable.value = true;
+        break;
+      case 'service':
+        activeKey.value = '2';
+        action(t, s);
+        attrDisable.value = true;
+        serveiceDisable.value = false;
+        eventDisable.value = true;
+        break;
+      case 'events':
+        activeKey.value = '3';
+        action(t, e);
+        attrDisable.value = true;
+        serveiceDisable.value = true;
+        eventDisable.value = false;
+        break;
+    }
+  };
   const [register, { closeModal, setModalProps }] = useModalInner(async (data) => {
     setModalProps({ loading: true });
     handleCancel(false);
     isUpdate.value = data.isUpdate;
     isViewDetail.value = data.isView;
     isText.value = data.isText;
+    dType.value = data.record?.dType;
     if (!unref(isViewDetail)) {
       const title = !unref(isUpdate) ? '编辑物模型' : '新增物模型';
       if (!unref(isUpdate)) {
         nextTick(() => {
-          AttrRef.value?.setFormData(mockData.properties);
-          ServiceRef.value?.setFormData(mockData.services);
-          EventsRef.value?.setFormData(mockData.events);
+          dynamicData(dType.value, mockData.properties, mockData.services, mockData.events);
         });
       }
       setModalProps({ title, showOkBtn: true, showCancelBtn: true });
     } else {
       setModalProps({ showOkBtn: false, showCancelBtn: false, title: '查看物模型' });
       nextTick(() => {
-        AttrRef.value?.setFormData(mockData.properties);
-        ServiceRef.value?.setFormData(mockData.services);
-        EventsRef.value?.setFormData(mockData.events);
+        dynamicData(dType.value, mockData.properties, mockData.services, mockData.events);
       });
     }
     setModalProps({ loading: false });
@@ -95,6 +142,9 @@
     allData.properties = [];
     allData.events = [];
     allData.services = [];
+    attrDisable.value = false;
+    serveiceDisable.value = false;
+    eventDisable.value = false;
     if (flag) {
       closeModal();
     }
--- a/src/views/device/profiles/step/cpns/physical/cpns/Attribute.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/physical/cpns/Attribute.vue
View file @f5cb7ff
@@ -5,14 +5,14 @@
         <div style="display: flex">
           <Input
             type="number"
-            v-model:vlaue="minMaxObj.min"
+            v-model:value="minMaxObj.min"
             placeholder="最小值"
             @blur="onInputBlurMin"
           />
           <span>~</span>
           <Input
             type="number"
-            v-model:vlaue="minMaxObj.max"
+            v-model:value="minMaxObj.max"
             placeholder="最大值"
             @blur="onInputBlurMax"
           />
@@ -185,6 +185,7 @@
   //清空数据
   const resetFormData = () => {
     resetFields();
+    outputParamData.value = [];
     Reflect.set(minMaxObj, 'min', '');
     Reflect.set(minMaxObj, 'max', '');
   };
--- a/src/views/device/profiles/step/cpns/physical/cpns/Events.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/physical/cpns/Events.vue
View file @f5cb7ff
@@ -106,6 +106,7 @@
   //清空数据
   const resetFormData = () => {
     resetFields();
+    outputParamData.value = [];
   };
   defineExpose({
--- a/src/views/device/profiles/step/cpns/physical/cpns/Service.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/physical/cpns/Service.vue
View file @f5cb7ff
@@ -169,6 +169,8 @@
   //清空数据
   const resetFormData = () => {
     resetFields();
+    inputParamData.value = [];
+    outputParamData.value = [];
   };
   defineExpose({
--- a/src/views/device/profiles/step/cpns/physical/cpns/components/AddParamForm.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/physical/cpns/components/AddParamForm.vue
View file @f5cb7ff
@@ -3,9 +3,9 @@
     <BasicForm @register="registerForm">
       <template #valueRangeSlot>
         <div style="display: flex">
-          <a-input v-model:vlaue="minMaxObj.min" placeholder="最小值" @blur="onInputBlurMin" />
+          <Input v-model:value="minMaxObj.min" placeholder="最小值" @blur="onInputBlurMin" />
           <span>~</span>
-          <a-input v-model:vlaue="minMaxObj.max" placeholder="最大值" @blur="onInputBlurMax" />
+          <Input v-model:value="minMaxObj.max" placeholder="最大值" @blur="onInputBlurMax" />
         </div>
       </template>
       <template #structSlot>
@@ -42,6 +42,7 @@
   import { findDictItemByCode } from '/@/api/system/dict';
   import { validateValueRangeAndStep, validateValueBool } from '../../hook/useValidateParital';
   import { buildUUID } from '/@/utils/uuid';
+  import { Input } from 'ant-design-vue';
   defineEmits(['register']);
   const outputParamData: any = ref([]);
@@ -152,13 +153,13 @@
     const childEnumSpecsDTO = [
       {
         dataType: values.dataType,
-        name: '0',
-        value: values.boolClose,
+        name: values.boolClose,
+        value: 0,
       },
       {
         dataType: values.dataType,
-        name: '1',
-        value: values.boolOpen,
+        name: values.boolOpen,
+        value: 1,
       },
     ];
     const dataSpecsList = childEnumSpecsDTO;
@@ -200,7 +201,7 @@
     };
   };
   const setFormData = (v) => {
-    console.log(v);
+    console.log('回显', v);
     setFieldsValue(v);
     setFieldsValue({
       ...v.dataSpecs,
--- a/src/views/device/profiles/step/cpns/tcp/index.vue
View file @f5cb7ff
+++ b/src/views/device/profiles/step/cpns/tcp/index.vue
View file @f5cb7ff
@@ -39,7 +39,9 @@
   import { Select } from 'ant-design-vue';
   import { useModal } from '/@/components/Modal';
   import ConverScriptModal from './ConverScriptModal.vue';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { createMessage } = useMessage();
   const selectScript = reactive({
     script: null,
   });
@@ -78,6 +80,10 @@
   };
   const getFormData = () => {
+    if (!selectScript.script) {
+      createMessage.error('请选择转换脚本');
+      throw '请选择转换脚本';
+    }
     const value = {
       ...{
         scriptId: selectScript.script,
--- a/src/views/scriptmanage/converscript/ConverScript.vue
View file @f5cb7ff
+++ b/src/views/scriptmanage/converscript/ConverScript.vue
View file @f5cb7ff
@@ -16,16 +16,16 @@
         <a-input v-if="ifAdd" v-model:value="scriptForm.scriptName" placeholder="请输入脚本名称" />
         <a-input v-else v-model:value="scriptForm.inputParams" placeholder="请输入参数" />
       </a-form-item>
-      <a-form-item label="上报数据类型" name="reportType">
+      <a-form-item
+        label="上报数据类型"
+        name="reportType"
+        :rules="[{ required: true, message: '请选择上报数据类型' }]"
+      >
         <a-space direction="vertical">
           <a-radio-group v-model:value="scriptForm.reportType" :options="typeOptions" />
         </a-space>
       </a-form-item>
-      <a-form-item
-        label="脚本内容"
-        name="scriptContent"
-        :rules="[{ required: true, message: '请输入脚本内容' }]"
-      >
+      <a-form-item label="脚本内容" name="scriptContent">
         <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
           <template #extra>
             <a-button @click="handleFormat" size="small">格式化</a-button>
@@ -60,7 +60,7 @@
   </div>
 </template>
 <script setup lang="ts">
-  import { ref, unref, reactive, onMounted, toRef } from 'vue';
+  import { ref, unref, reactive, onMounted, toRefs } from 'vue';
   import ace from 'ace-builds';
   import { Card, Button } from 'ant-design-vue';
   import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
@@ -81,12 +81,12 @@
     scriptContent: '',
     inputParams: '',
     outputParams: '',
-    reportType: ['define 16'],
+    reportType: 'HEX',
   });
   const reportTypeOptions = reactive({
     typeOptions: [],
   });
-  const typeOptions = toRef(reportTypeOptions, 'typeOptions');
+  const { typeOptions } = toRefs(reportTypeOptions);
   const { createMessage } = useMessage();
   const { clipboardRef, copiedRef } = useCopyToClipboard();
   const aceEditor = ref();
@@ -144,8 +144,16 @@
   const formRef = ref();
   const getFormData = async () => {
     const value = await formRef.value.validateFields();
+    scriptForm.scriptContent = aceEditor.value.getValue();
+    if (scriptForm.scriptContent == '') {
+      createMessage.error('请编写脚本内容');
+      throw '请编写脚本内容';
+    }
     if (!value) return;
-    return value;
+    return {
+      ...value,
+      ...{ scriptContent: scriptForm.scriptContent },
+    };
   };
   const setFormData = (v) => {
     for (let i in scriptForm) {
--- a/src/views/scriptmanage/converscript/config.data.ts
View file @f5cb7ff
+++ b/src/views/scriptmanage/converscript/config.data.ts
View file @f5cb7ff
@@ -90,6 +90,7 @@ export const formSchema: FormSchema[] = [
     colProps: {
       span: 23,
     },
+    defaultValue: 'HEX',
     componentProps: {
       placeholder: '请上报数据类型',
       api: findDictItemByCode,