diff --git a/apps/web-antd/.env.development b/apps/web-antd/.env.development index 3ead9bd..43923b4 100644 --- a/apps/web-antd/.env.development +++ b/apps/web-antd/.env.development @@ -36,9 +36,9 @@ VITE_REFRESH_ROLE = true # 后端接口地址 #VITE_APP_API_ADDRESS=http://47.110.53.196:28080 - VITE_APP_API_ADDRESS=http://10.10.90.12:10500 + VITE_APP_API_ADDRESS=http://10.10.10.103:10500 # websocket地址 -VITE_WEBSOCKET_URL=http://10.10.90.12:10500/signalr/notification +VITE_WEBSOCKET_URL=http://10.10.10.103:10500/signalr/notification diff --git a/apps/web-antd/src/adapter/component/index.ts b/apps/web-antd/src/adapter/component/index.ts index de22655..c1eb4b6 100644 --- a/apps/web-antd/src/adapter/component/index.ts +++ b/apps/web-antd/src/adapter/component/index.ts @@ -112,7 +112,6 @@ export type ComponentType = | 'DatePicker' | 'DefaultButton' | 'DeviceSelect' - | 'StandardThingModelCodeSelect' | 'Divider' | 'IconPicker' | 'Input' @@ -126,6 +125,7 @@ export type ComponentType = | 'Rate' | 'Select' | 'Space' + | 'StandardThingModelCodeSelect' | 'Switch' | 'Textarea' | 'TimePicker' @@ -172,11 +172,17 @@ async function initComponentAdapter() { DatePicker, // 自定义设备选择组件 DeviceSelect: defineAsyncComponent( - () => import('#/views/iotdbdatamanagement/deviceData/DeviceSelect.vue') as any, + () => + import( + '#/views/iotdbdatamanagement/deviceData/DeviceSelect.vue' + ) as any, ), // 自定义标准物模型编码选择组件(分页搜索) StandardThingModelCodeSelect: defineAsyncComponent( - () => import('#/views/devicemanagement/thingmodelinfo/StandardThingModelCodeSelect.vue') as any, + () => + import( + '#/views/thingmodelinfo/ioTPlatformThingModelInfo/StandardThingModelCodeSelect.vue' + ) as any, ), // 自定义默认按钮 DefaultButton: (props, { attrs, slots }) => { diff --git a/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue b/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue index 45994d0..11817f6 100644 --- a/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue +++ b/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue @@ -12,18 +12,17 @@ import { message as Message, Tag } from 'ant-design-vue'; import { useVbenForm } from '#/adapter/form'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; import { - postFilesDownload, - postFilesUpload, postCtWingProductDeleteAsync, postCtWingProductInsertAsync, postCtWingProductListAsync, postCtWingProductModifyAsync, postCtWingProductProductStatusChangeAsync, + postFilesDownload, + postFilesUpload, } from '#/api-client'; import { TableAction } from '#/components/table-action'; import { $t } from '#/locales'; - -import ThingModelInfoModal from '#/views/devicemanagement/thingmodelinfo/index.vue'; +import ThingModelInfoModal from '#/views/thingmodelinfo/ioTPlatformThingModelInfo/index.vue'; import { addProductFormSchema, @@ -179,7 +178,8 @@ async function submit() { if (fileInfo && fileInfo.id) { formValues.deviceThingModelFileId = fileInfo.id; // 设置文件名 - formValues.deviceThingModelFileName = fileInfo.fileName || selectedFile.name; + formValues.deviceThingModelFileName = + fileInfo.fileName || selectedFile.name; } else { Message.error('文件上传成功但未获取到文件ID'); userModalApi.setState({ loading: false, confirmLoading: false }); @@ -336,7 +336,8 @@ function closeThingModelModal() { - + - +