From a8f585d7e925f9eeb7d09102fb281e96a4ee5360 Mon Sep 17 00:00:00 2001 From: ChenYi <296215406@outlook.com> Date: Fri, 25 Jul 2025 11:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-antd/src/adapter/component/index.ts | 5 +- .../web-antd/src/locales/langs/en-US/abp.json | 3 - .../web-antd/src/locales/langs/zh-CN/abp.json | 3 - apps/web-antd/src/preferences.ts | 2 +- .../account/index.vue | 0 .../account/schema.ts | 0 .../privateProduct/index.vue | 0 .../privateProduct/schema.ts | 0 .../dataManger/concentratorStatus/index.vue | 66 ------------------- .../dataManger/concentratorStatus/schema.ts | 47 ------------- .../deviceinfo}/index.vue | 0 .../deviceinfo}/schema.ts | 0 .../focus/index.vue | 0 .../focus/schema.ts | 0 .../ctwingLog/README.md | 0 .../ctwingLog/index.vue | 0 .../ctwingLog/schema.ts | 6 -- .../deviceData/DeviceSelect.vue | 0 .../deviceData/README.md | 0 .../deviceData/dynamicColumns.ts | 4 +- .../deviceData/index.vue | 0 .../deviceData/schema.ts | 0 .../deviceData/types.ts | 0 .../onenetLog/index.vue | 0 .../onenetLog/schema.ts | 6 -- .../telemetryLog}/index.vue | 0 .../telemetryLog}/schema.ts | 0 .../account/index.vue | 0 .../account/schema.ts | 0 .../privateProduct/index.vue | 0 .../privateProduct/schema.ts | 0 internal/vite-config/src/plugins/license.ts | 14 ++-- packages/@core/preferences/src/config.ts | 6 +- .../layouts/src/basic/copyright/copyright.vue | 4 +- 34 files changed, 21 insertions(+), 145 deletions(-) rename apps/web-antd/src/views/{ctwingManger => ctwingmanagement}/account/index.vue (100%) rename apps/web-antd/src/views/{ctwingManger => ctwingmanagement}/account/schema.ts (100%) rename apps/web-antd/src/views/{ctwingManger => ctwingmanagement}/privateProduct/index.vue (100%) rename apps/web-antd/src/views/{ctwingManger => ctwingmanagement}/privateProduct/schema.ts (100%) delete mode 100644 apps/web-antd/src/views/dataManger/concentratorStatus/index.vue delete mode 100644 apps/web-antd/src/views/dataManger/concentratorStatus/schema.ts rename apps/web-antd/src/views/{device/meter => devicemanagement/deviceinfo}/index.vue (100%) rename apps/web-antd/src/views/{device/meter => devicemanagement/deviceinfo}/schema.ts (100%) rename apps/web-antd/src/views/{device => devicemanagement}/focus/index.vue (100%) rename apps/web-antd/src/views/{device => devicemanagement}/focus/schema.ts (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/ctwingLog/README.md (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/ctwingLog/index.vue (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/ctwingLog/schema.ts (98%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/DeviceSelect.vue (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/README.md (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/dynamicColumns.ts (98%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/index.vue (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/schema.ts (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/deviceData/types.ts (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/onenetLog/index.vue (100%) rename apps/web-antd/src/views/{dataManger => iotdbdatamanagement}/onenetLog/schema.ts (97%) rename apps/web-antd/src/views/{dataManger/collectionLog => iotdbdatamanagement/telemetryLog}/index.vue (100%) rename apps/web-antd/src/views/{dataManger/collectionLog => iotdbdatamanagement/telemetryLog}/schema.ts (100%) rename apps/web-antd/src/views/{onenetManger => onenetmanagement}/account/index.vue (100%) rename apps/web-antd/src/views/{onenetManger => onenetmanagement}/account/schema.ts (100%) rename apps/web-antd/src/views/{onenetManger => onenetmanagement}/privateProduct/index.vue (100%) rename apps/web-antd/src/views/{onenetManger => onenetmanagement}/privateProduct/schema.ts (100%) diff --git a/apps/web-antd/src/adapter/component/index.ts b/apps/web-antd/src/adapter/component/index.ts index 8632bf2..1de9782 100644 --- a/apps/web-antd/src/adapter/component/index.ts +++ b/apps/web-antd/src/adapter/component/index.ts @@ -170,8 +170,9 @@ async function initComponentAdapter() { CheckboxGroup, DatePicker, // 自定义设备选择组件 - DeviceSelect: defineAsyncComponent(() => - import('../../views/dataManger/deviceData/DeviceSelect.vue') + DeviceSelect: defineAsyncComponent( + () => + import('../../views/iotdbdatamanagement/deviceData/DeviceSelect.vue'), ), // 自定义默认按钮 DefaultButton: (props, { attrs, slots }) => { diff --git a/apps/web-antd/src/locales/langs/en-US/abp.json b/apps/web-antd/src/locales/langs/en-US/abp.json index ad91ac8..5d2819f 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -226,9 +226,6 @@ "archivesIssued": "archivesIssued" }, "IoTDBBase": { - "SystemName": "SystemName", - "ProjectId": "ProjectId", - "ProjectName": "ProjectName", "IoTDataType": "IoTDataType", "DeviceType": "DeviceType", "Timestamps": "Timestamps", diff --git a/apps/web-antd/src/locales/langs/zh-CN/abp.json b/apps/web-antd/src/locales/langs/zh-CN/abp.json index 7c4ca42..e432789 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -226,9 +226,6 @@ "archivesIssued": "档案下发" }, "IoTDBBase": { - "SystemName": "所属系统", - "ProjectId": "项目编码", - "ProjectName": "项目名称", "IoTDataType": "数据类型", "DeviceType": "设备类型", "Timestamps": "时标(纳秒)", diff --git a/apps/web-antd/src/preferences.ts b/apps/web-antd/src/preferences.ts index 4d7f4d6..74f8994 100644 --- a/apps/web-antd/src/preferences.ts +++ b/apps/web-antd/src/preferences.ts @@ -28,7 +28,7 @@ export const overridesPreferences = defineOverridesPreferences({ mode: 'light', }, copyright: { - companyName: 'Abp Vben5 Antd', + companyName: '集社云信息科技有限公司', }, logo: { source: '/logo-v1.webp', // 网站图标 diff --git a/apps/web-antd/src/views/ctwingManger/account/index.vue b/apps/web-antd/src/views/ctwingmanagement/account/index.vue similarity index 100% rename from apps/web-antd/src/views/ctwingManger/account/index.vue rename to apps/web-antd/src/views/ctwingmanagement/account/index.vue diff --git a/apps/web-antd/src/views/ctwingManger/account/schema.ts b/apps/web-antd/src/views/ctwingmanagement/account/schema.ts similarity index 100% rename from apps/web-antd/src/views/ctwingManger/account/schema.ts rename to apps/web-antd/src/views/ctwingmanagement/account/schema.ts diff --git a/apps/web-antd/src/views/ctwingManger/privateProduct/index.vue b/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue similarity index 100% rename from apps/web-antd/src/views/ctwingManger/privateProduct/index.vue rename to apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue diff --git a/apps/web-antd/src/views/ctwingManger/privateProduct/schema.ts b/apps/web-antd/src/views/ctwingmanagement/privateProduct/schema.ts similarity index 100% rename from apps/web-antd/src/views/ctwingManger/privateProduct/schema.ts rename to apps/web-antd/src/views/ctwingmanagement/privateProduct/schema.ts diff --git a/apps/web-antd/src/views/dataManger/concentratorStatus/index.vue b/apps/web-antd/src/views/dataManger/concentratorStatus/index.vue deleted file mode 100644 index 7fece70..0000000 --- a/apps/web-antd/src/views/dataManger/concentratorStatus/index.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - diff --git a/apps/web-antd/src/views/dataManger/concentratorStatus/schema.ts b/apps/web-antd/src/views/dataManger/concentratorStatus/schema.ts deleted file mode 100644 index e84633b..0000000 --- a/apps/web-antd/src/views/dataManger/concentratorStatus/schema.ts +++ /dev/null @@ -1,47 +0,0 @@ -import type { VxeGridProps } from '#/adapter/vxe-table'; - -import { computed } from 'vue'; - -import dayjs from 'dayjs'; - -import { $t } from '#/locales'; - -export const querySchema = computed(() => [ - { - component: 'DatePicker', - fieldName: 'Timestamps', - label: $t('abp.log.timestamps'), - }, -]); -export const tableSchema: any = computed((): VxeGridProps['columns'] => [ - { title: $t('common.seq'), type: 'seq', width: 50 }, - { field: 'systemName', title: $t('abp.log.systemName'), minWidth: '150' }, - { - field: 'projectId', - title: $t('abp.log.projectId'), - minWidth: '150', - }, - { - field: 'dataType', - title: $t('abp.log.dataType'), - minWidth: '150', - }, - { - field: 'deviceType', - title: $t('abp.log.deviceType'), - minWidth: '150', - }, - { - field: 'type', - title: $t('abp.dataDictionary.status'), - minWidth: '100', - }, - { - field: 'times', - title: $t('abp.log.timestamps'), - minWidth: '150', - formatter: ({ cellValue }) => { - return dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss'); - }, - }, -]); diff --git a/apps/web-antd/src/views/device/meter/index.vue b/apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue similarity index 100% rename from apps/web-antd/src/views/device/meter/index.vue rename to apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue diff --git a/apps/web-antd/src/views/device/meter/schema.ts b/apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts similarity index 100% rename from apps/web-antd/src/views/device/meter/schema.ts rename to apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts diff --git a/apps/web-antd/src/views/device/focus/index.vue b/apps/web-antd/src/views/devicemanagement/focus/index.vue similarity index 100% rename from apps/web-antd/src/views/device/focus/index.vue rename to apps/web-antd/src/views/devicemanagement/focus/index.vue diff --git a/apps/web-antd/src/views/device/focus/schema.ts b/apps/web-antd/src/views/devicemanagement/focus/schema.ts similarity index 100% rename from apps/web-antd/src/views/device/focus/schema.ts rename to apps/web-antd/src/views/devicemanagement/focus/schema.ts diff --git a/apps/web-antd/src/views/dataManger/ctwingLog/README.md b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/README.md similarity index 100% rename from apps/web-antd/src/views/dataManger/ctwingLog/README.md rename to apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/README.md diff --git a/apps/web-antd/src/views/dataManger/ctwingLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue similarity index 100% rename from apps/web-antd/src/views/dataManger/ctwingLog/index.vue rename to apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/index.vue diff --git a/apps/web-antd/src/views/dataManger/ctwingLog/schema.ts b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts similarity index 98% rename from apps/web-antd/src/views/dataManger/ctwingLog/schema.ts rename to apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts index 85faa44..b5efea8 100644 --- a/apps/web-antd/src/views/dataManger/ctwingLog/schema.ts +++ b/apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts @@ -158,12 +158,6 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : ''; }, }, - { - field: 'systemName', - title: $t('abp.IoTDBBase.SystemName'), - minWidth: 150, - slots: {}, - }, { field: 'deviceType', title: $t('abp.IoTDBBase.DeviceType'), diff --git a/apps/web-antd/src/views/dataManger/deviceData/DeviceSelect.vue b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/DeviceSelect.vue similarity index 100% rename from apps/web-antd/src/views/dataManger/deviceData/DeviceSelect.vue rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/DeviceSelect.vue diff --git a/apps/web-antd/src/views/dataManger/deviceData/README.md b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/README.md similarity index 100% rename from apps/web-antd/src/views/dataManger/deviceData/README.md rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/README.md diff --git a/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts similarity index 98% rename from apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts index 86bf3b9..5db7c8d 100644 --- a/apps/web-antd/src/views/dataManger/deviceData/dynamicColumns.ts +++ b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/dynamicColumns.ts @@ -7,7 +7,7 @@ import type { // 字段名映射配置 export const fieldNameMapping: FieldMapping = { - SystemName: '系统名称', + // SystemName: '系统名称', // ProjectId: '项目ID', // ProjectName: '项目名称', IoTDataType: 'IoT数据类型', @@ -34,7 +34,7 @@ export const fieldTypeConfig: FieldTypeConfig = { // 固定字段列表 - 这些字段已经在固定列中定义，不需要在动态列中重复生成 const FIXED_FIELDS = [ - 'SystemName', + // 'SystemName', 'DeviceType', 'IoTDataType', 'DeviceId', diff --git a/apps/web-antd/src/views/dataManger/deviceData/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue similarity index 100% rename from apps/web-antd/src/views/dataManger/deviceData/index.vue rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/index.vue diff --git a/apps/web-antd/src/views/dataManger/deviceData/schema.ts b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/schema.ts similarity index 100% rename from apps/web-antd/src/views/dataManger/deviceData/schema.ts rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/schema.ts diff --git a/apps/web-antd/src/views/dataManger/deviceData/types.ts b/apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts similarity index 100% rename from apps/web-antd/src/views/dataManger/deviceData/types.ts rename to apps/web-antd/src/views/iotdbdatamanagement/deviceData/types.ts diff --git a/apps/web-antd/src/views/dataManger/onenetLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue similarity index 100% rename from apps/web-antd/src/views/dataManger/onenetLog/index.vue rename to apps/web-antd/src/views/iotdbdatamanagement/onenetLog/index.vue diff --git a/apps/web-antd/src/views/dataManger/onenetLog/schema.ts b/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts similarity index 97% rename from apps/web-antd/src/views/dataManger/onenetLog/schema.ts rename to apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts index bbe96cc..606d52a 100644 --- a/apps/web-antd/src/views/dataManger/onenetLog/schema.ts +++ b/apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts @@ -158,12 +158,6 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [ return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : ''; }, }, - { - field: 'systemName', - title: $t('abp.IoTDBBase.SystemName'), - minWidth: '120', - slots: {}, - }, { field: 'deviceType', title: $t('abp.IoTDBBase.DeviceType'), diff --git a/apps/web-antd/src/views/dataManger/collectionLog/index.vue b/apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/index.vue similarity index 100% rename from apps/web-antd/src/views/dataManger/collectionLog/index.vue rename to apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/index.vue diff --git a/apps/web-antd/src/views/dataManger/collectionLog/schema.ts b/apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/schema.ts similarity index 100% rename from apps/web-antd/src/views/dataManger/collectionLog/schema.ts rename to apps/web-antd/src/views/iotdbdatamanagement/telemetryLog/schema.ts diff --git a/apps/web-antd/src/views/onenetManger/account/index.vue b/apps/web-antd/src/views/onenetmanagement/account/index.vue similarity index 100% rename from apps/web-antd/src/views/onenetManger/account/index.vue rename to apps/web-antd/src/views/onenetmanagement/account/index.vue diff --git a/apps/web-antd/src/views/onenetManger/account/schema.ts b/apps/web-antd/src/views/onenetmanagement/account/schema.ts similarity index 100% rename from apps/web-antd/src/views/onenetManger/account/schema.ts rename to apps/web-antd/src/views/onenetmanagement/account/schema.ts diff --git a/apps/web-antd/src/views/onenetManger/privateProduct/index.vue b/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue similarity index 100% rename from apps/web-antd/src/views/onenetManger/privateProduct/index.vue rename to apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue diff --git a/apps/web-antd/src/views/onenetManger/privateProduct/schema.ts b/apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts similarity index 100% rename from apps/web-antd/src/views/onenetManger/privateProduct/schema.ts rename to apps/web-antd/src/views/onenetmanagement/privateProduct/schema.ts diff --git a/internal/vite-config/src/plugins/license.ts b/internal/vite-config/src/plugins/license.ts index 81fc4ff..c3aa97b 100644 --- a/internal/vite-config/src/plugins/license.ts +++ b/internal/vite-config/src/plugins/license.ts @@ -1,3 +1,9 @@ +/* + * @Description: 文件内容描述 + * @Author: 陈益 + * @Date: 2025-06-19 15:33:55 + * @LastEditors: 陈益 + */ import type { NormalizedOutputOptions, OutputBundle, @@ -30,15 +36,15 @@ async function viteLicensePlugin( handler: (_options: NormalizedOutputOptions, bundle: OutputBundle) => { const date = dateUtil().format('YYYY-MM-DD '); const copyrightText = `/*! - * Vben Admin + * 集社云信息科技有限公司 * Version: ${version} - * Author: vben - * Copyright (C) 2024 Vben + * 集社云信息科技有限公司 + * Copyright (C) 2025 集社云信息科技有限公司 * License: MIT License * Description: ${description} * Date Created: ${date} * Homepage: ${homepage} - * Contact: ann.vben@gmail.com + * Contact: 集社云信息科技有限公司 */ `.trim(); diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts index 8a7fa8e..0930345 100644 --- a/packages/@core/preferences/src/config.ts +++ b/packages/@core/preferences/src/config.ts @@ -32,9 +32,9 @@ const defaultPreferences: Preferences = { styleType: 'normal', }, copyright: { - companyName: 'Abp Vben5', - companySiteLink: 'https://doc.cncore.club/', - date: '2024', + companyName: '集社云信息科技有限公司', + companySiteLink: 'https://www.jisheyun.com/', + date: '2025', enable: true, icp: '', icpLink: '', diff --git a/packages/effects/layouts/src/basic/copyright/copyright.vue b/packages/effects/layouts/src/basic/copyright/copyright.vue index de49c7c..c1a9685 100644 --- a/packages/effects/layouts/src/basic/copyright/copyright.vue +++ b/packages/effects/layouts/src/basic/copyright/copyright.vue @@ -12,9 +12,9 @@ defineOptions({ }); withDefaults(defineProps(), { - companyName: 'Vben Admin', + companyName: '集社云信息科技有限公司', companySiteLink: '', - date: '2024', + date: '2025', icp: '', icpLink: '', });