diff --git a/apps/web-antd/src/api/iot/thingmodel/index.ts b/apps/web-antd/src/api/iot/thingmodel/index.ts index 354088704..9e89b869c 100644 --- a/apps/web-antd/src/api/iot/thingmodel/index.ts +++ b/apps/web-antd/src/api/iot/thingmodel/index.ts @@ -140,19 +140,11 @@ export function getThingModel(id: number) { /** 根据产品 ID 查询物模型列表 */ export function getThingModelListByProductId(productId: number) { return requestClient.get( - '/iot/thing-model/list-by-product-id', + '/iot/thing-model/list', { params: { productId } }, ); } -/** 根据产品标识查询物模型列表 */ -export function getThingModelListByProductKey(productKey: string) { - return requestClient.get( - '/iot/thing-model/list-by-product-key', - { params: { productKey } }, - ); -} - /** 新增物模型 */ export function createThingModel(data: ThingModelData) { return requestClient.post('/iot/thing-model/create', data); @@ -168,13 +160,6 @@ export function deleteThingModel(id: number) { return requestClient.delete(`/iot/thing-model/delete?id=${id}`); } -/** 批量删除物模型 */ -export function deleteThingModelList(ids: number[]) { - return requestClient.delete('/iot/thing-model/delete-list', { - params: { ids: ids.join(',') }, - }); -} - /** 获取物模型 TSL */ export function getThingModelTSL(productId: number) { return requestClient.get( diff --git a/apps/web-antd/src/views/iot/alert/config/index.vue b/apps/web-antd/src/views/iot/alert/config/index.vue index 4797250dc..0f23562bc 100644 --- a/apps/web-antd/src/views/iot/alert/config/index.vue +++ b/apps/web-antd/src/views/iot/alert/config/index.vue @@ -10,7 +10,7 @@ import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { deleteAlertConfig, getAlertConfigPage } from '#/api/iot/alert/config'; import { $t } from '#/locales'; -import AlertConfigForm from '../modules/AlertConfigForm.vue'; +import AlertConfigForm from '../modules/alert-config-form.vue'; import { useGridColumns, useGridFormSchema } from './data'; defineOptions({ name: 'IoTAlertConfig' }); diff --git a/apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue b/apps/web-antd/src/views/iot/alert/modules/alert-config-form.vue similarity index 100% rename from apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue rename to apps/web-antd/src/views/iot/alert/modules/alert-config-form.vue diff --git a/apps/web-antd/src/views/iot/device/device/index.vue b/apps/web-antd/src/views/iot/device/device/index.vue index d06649d66..659f6b98d 100644 --- a/apps/web-antd/src/views/iot/device/device/index.vue +++ b/apps/web-antd/src/views/iot/device/device/index.vue @@ -32,10 +32,10 @@ import { getSimpleProductList } from '#/api/iot/product/product'; import { $t } from '#/locales'; import { useGridColumns } from './data'; -import DeviceCardView from './modules/DeviceCardView.vue'; -import DeviceForm from './modules/DeviceForm.vue'; -import DeviceGroupForm from './modules/DeviceGroupForm.vue'; -import DeviceImportForm from './modules/DeviceImportForm.vue'; +import DeviceCardView from './modules/device-card-view.vue'; +import DeviceForm from './modules/device-form.vue'; +import DeviceGroupForm from './modules/device-group-form.vue'; +import DeviceImportForm from './modules/device-import-form.vue'; /** IoT 设备列表 */ defineOptions({ name: 'IoTDevice' }); diff --git a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue b/apps/web-antd/src/views/iot/device/device/modules/components/device-table-select.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue rename to apps/web-antd/src/views/iot/device/device/modules/components/device-table-select.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-detail-config.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-detail-config.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-header.vue similarity index 98% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-header.vue index 8c0acd85a..d0de74904 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-header.vue @@ -8,7 +8,7 @@ import { useRouter } from 'vue-router'; import { Button, Card, Descriptions, message } from 'ant-design-vue'; -import DeviceForm from '../DeviceForm.vue'; +import DeviceForm from '../device-form.vue'; interface Props { product: IotProductApi.Product; diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-info.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-info.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-message.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-message.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-simulator.vue similarity index 99% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-simulator.vue index 4e203e3d4..19ae1dc67 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-simulator.vue @@ -22,13 +22,13 @@ import { } from 'ant-design-vue'; import { DeviceStateEnum, sendDeviceMessage } from '#/api/iot/device/device'; -import DataDefinition from '#/views/iot/thingmodel/modules/components/DataDefinition.vue'; +import DataDefinition from '#/views/iot/thingmodel/modules/components/data-definition.vue'; import { IotDeviceMessageMethodEnum, IoTThingModelTypeEnum, } from '#/views/iot/utils/constants'; -import DeviceDetailsMessage from './DeviceDetailsMessage.vue'; +import DeviceDetailsMessage from './device-details-message.vue'; const props = defineProps<{ device: IotDeviceApi.Device; diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSubDevice.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-sub-device.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSubDevice.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-sub-device.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-event.vue similarity index 100% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-event.vue diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property-history.vue similarity index 98% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property-history.vue index cdc541cd5..998486742 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property-history.vue @@ -354,7 +354,7 @@ async function handleExport() { ...list.value.map((item, index) => { return [ index + 1, - formatDate(new Date(item.updateTime)), + formatDateTime(new Date(item.updateTime)), isComplexDataType.value ? `"${JSON.stringify(item.value)}"` : item.value, @@ -553,15 +553,17 @@ defineExpose({ open }); // 提供 open 方法,用于打开弹窗 .toolbar-wrapper { padding: 16px; - background-color: #fafafa; + background-color: hsl(var(--card) / 0.9); border-radius: 8px; + border: 1px solid hsl(var(--border) / 0.6); } .chart-container, .table-container { padding: 16px; - background-color: #fff; + background-color: hsl(var(--card)); border-radius: 8px; + border: 1px solid hsl(var(--border) / 0.6); } } diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property.vue similarity index 96% rename from apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue rename to apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property.vue index 283a2d133..d15e649c7 100644 --- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue +++ b/apps/web-antd/src/views/iot/device/device/modules/detail/device-details-thing-model-property.vue @@ -22,7 +22,8 @@ import { import { getLatestDeviceProperties } from '#/api/iot/device/device'; -import DeviceDetailsThingModelPropertyHistory from './DeviceDetailsThingModelPropertyHistory.vue'; +import DeviceDetailsThingModelPropertyHistory + from './device-details-thing-model-property-history.vue'; const props = defineProps<{ deviceId: number }>(); @@ -123,10 +124,12 @@ onMounted(() => { style="width: 240px" @press-enter="handleQuery" /> -
- 自动刷新 - -
+