优化菜单,调整目录结构

This commit is contained in:
ChenYi 2025-07-25 11:55:18 +08:00
parent 7aace52177
commit a8f585d7e9
34 changed files with 21 additions and 145 deletions

View File

@ -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 }) => {

View File

@ -226,9 +226,6 @@
"archivesIssued": "archivesIssued"
},
"IoTDBBase": {
"SystemName": "SystemName",
"ProjectId": "ProjectId",
"ProjectName": "ProjectName",
"IoTDataType": "IoTDataType",
"DeviceType": "DeviceType",
"Timestamps": "Timestamps",

View File

@ -226,9 +226,6 @@
"archivesIssued": "档案下发"
},
"IoTDBBase": {
"SystemName": "所属系统",
"ProjectId": "项目编码",
"ProjectName": "项目名称",
"IoTDataType": "数据类型",
"DeviceType": "设备类型",
"Timestamps": "时标(纳秒)",

View File

@ -28,7 +28,7 @@ export const overridesPreferences = defineOverridesPreferences({
mode: 'light',
},
copyright: {
companyName: 'Abp Vben5 Antd',
companyName: '集社云信息科技有限公司',
},
logo: {
source: '/logo-v1.webp', // 网站图标

View File

@ -1,66 +0,0 @@
<script setup lang="ts">
import type { VbenFormProps } from '#/adapter/form';
import type { VxeGridProps } from '#/adapter/vxe-table';
import { useRoute } from 'vue-router';
import { Page } from '@vben/common-ui';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import { postTreeModelFocusStatusInfoPage } from '#/api-client';
import { querySchema, tableSchema } from './schema';
defineOptions({
name: 'ConcentratorStatus',
});
const route = useRoute();
const { DeviceType, DeviceId, FocusAddress } = route.query;
const formOptions: VbenFormProps = {
schema: querySchema.value,
};
const gridOptions: VxeGridProps<any> = {
checkboxConfig: {
highlight: true,
labelField: 'name',
},
columns: tableSchema.value,
height: 'auto',
keepSource: true,
pagerConfig: {},
// toolbarConfig: {
// custom: true,
// },
customConfig: {
storage: true,
},
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
const { data } = await postTreeModelFocusStatusInfoPage({
body: {
...formValues,
pageIndex: page.currentPage,
pageSize: page.pageSize,
DeviceType,
DeviceId,
FocusAddress,
},
});
return data;
},
},
},
};
const [Grid] = useVbenVxeGrid({ formOptions, gridOptions });
</script>
<template>
<Page auto-content-height>
<Grid />
</Page>
</template>

View File

@ -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');
},
},
]);

View File

@ -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'),

View File

@ -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',

View File

@ -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'),

View File

@ -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();

View File

@ -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: '',

View File

@ -12,9 +12,9 @@ defineOptions({
});
withDefaults(defineProps<Props>(), {
companyName: 'Vben Admin',
companyName: '集社云信息科技有限公司',
companySiteLink: '',
date: '2024',
date: '2025',
icp: '',
icpLink: '',
});