Commit c1f1307caae3c1e6d091836dddc280e5d2b56d9b
Merge branch 'perf/product-detail-desc' into 'main_dev'
perf: 优化Tcp产品传输配置新增Modbus于自定义标志 See merge request yunteng/thingskit-front!1231
Showing
2 changed files
with
15 additions
and
4 deletions
| 1 | 1 | <script lang="ts" setup> |
| 2 | 2 | import { Button, Tag } from 'ant-design-vue'; |
| 3 | 3 | import { h, onMounted, ref, unref, Ref } from 'vue'; |
| 4 | - import { DeviceRecord } from '/@/api/device/model/deviceModel'; | |
| 4 | + import { DeviceProfileModel } from '/@/api/device/model/deviceModel'; | |
| 5 | 5 | import { getScriptManageMeList } from '/@/api/scriptmanage/scriptManager'; |
| 6 | 6 | import { Description, useDescription } from '/@/components/Description'; |
| 7 | 7 | import { useModal } from '/@/components/Modal'; |
| 8 | 8 | import { ConverScriptModal } from '/@/views/rule/script/TcpConversionScript/components'; |
| 9 | 9 | import { SelectTypes } from 'ant-design-vue/es/select'; |
| 10 | 10 | import { BusinessConvertScriptTextEnum } from '/@/views/rule/script/TcpConversionScript/config'; |
| 11 | + import { TCPProtocolTypeEnum, TCPProtocolTypeNameEnum } from '/@/enums/deviceEnum'; | |
| 11 | 12 | |
| 12 | 13 | const props = defineProps<{ |
| 13 | - record: DeviceRecord['profileData']['transportConfiguration']; | |
| 14 | + record: DeviceProfileModel['profileData']['transportConfiguration']; | |
| 14 | 15 | }>(); |
| 15 | 16 | |
| 16 | 17 | const authScriptIdStr = ref(''); |
| ... | ... | @@ -53,6 +54,16 @@ |
| 53 | 54 | field: 'type', |
| 54 | 55 | label: '接入协议', |
| 55 | 56 | span: 2, |
| 57 | + render: (value: string) => { | |
| 58 | + return h('div', { class: 'flex' }, [ | |
| 59 | + h('div', { class: 'mr-2' }, value), | |
| 60 | + h(Tag, { color: 'blue' }, () => | |
| 61 | + props.record.protocol === TCPProtocolTypeEnum.MODBUS_RTU | |
| 62 | + ? TCPProtocolTypeNameEnum.MODBUS_RTU | |
| 63 | + : TCPProtocolTypeNameEnum.CUSTOM | |
| 64 | + ), | |
| 65 | + ]); | |
| 66 | + }, | |
| 56 | 67 | }, |
| 57 | 68 | { |
| 58 | 69 | field: 'authScriptId', | ... | ... |
| ... | ... | @@ -6,11 +6,11 @@ |
| 6 | 6 | import MQTTConfiguration from './MQTTConfiguration.vue'; |
| 7 | 7 | import SNMPDescription from './SNMPDescription.vue'; |
| 8 | 8 | import TCPDescription from './TCPDescription.vue'; |
| 9 | - import { DeviceRecord } from '/@/api/device/model/deviceModel'; | |
| 9 | + import { DeviceProfileDetail } from '/@/api/device/model/deviceConfigModel'; | |
| 10 | 10 | import { TransportTypeEnum } from '/@/enums/deviceEnum'; |
| 11 | 11 | |
| 12 | 12 | const props = defineProps<{ |
| 13 | - record: DeviceRecord; | |
| 13 | + record: DeviceProfileDetail; | |
| 14 | 14 | }>(); |
| 15 | 15 | |
| 16 | 16 | const getTransportInfo = computed(() => { | ... | ... |