From 2609151b51ad624f7007a4348e8a7e7dc8d8bc3b Mon Sep 17 00:00:00 2001 From: zuohuaijun Date: Wed, 13 Aug 2025 14:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E1=E3=80=81=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=B5=81=E6=B0=B4=E5=8F=B7=E7=9B=B8=E5=85=B3=20=202=E3=80=81?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8F=9C=E5=8D=95=E5=90=84=E4=B8=AA=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=20=203=E3=80=81=E4=BF=AE=E6=94=B9=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=B2=97=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SeedData/SysMenuSeedData.cs | 12 ++++---- Web/src/i18n/menu/en.ts | 1 + Web/src/i18n/menu/zh-CN.ts | 1 + Web/src/i18n/menu/zh-HK.ts | 1 + Web/src/i18n/menu/zh-TW.ts | 1 + Web/src/layout/logo/index.vue | 2 +- .../system/serial/component/editSerial.vue | 30 +++++++------------ Web/src/views/system/serial/index.vue | 19 ++++-------- 8 files changed, 27 insertions(+), 40 deletions(-) diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs index 7188a9c6..142bb598 100644 --- a/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs +++ b/Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs @@ -145,7 +145,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000386, Pid=1310000000381, Title="同步国家统计局", Permission="sysRegion/syncRegionStats", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000387, Pid=1310000000381, Title="同步国家地名信息库", Permission="sysRegion/syncRegionMca", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, - new SysMenu{ Id=1310000000391, Pid=1310000000301, Title="文件管理", Path="/platform/file", Name="sysFile", Component="/system/file/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=180 }, + new SysMenu{ Id=1310000000391, Pid=1310000000301, Title="文件管理", Path="/platform/file", Name="sysFile", Component="/system/file/index", Icon="ele-Files", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=180 }, new SysMenu{ Id=1310000000392, Pid=1310000000391, Title="查询", Permission="sysFile/page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000393, Pid=1310000000391, Title="上传", Permission="sysFile/uploadFile", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000394, Pid=1310000000391, Title="下载", Permission="sysFile/downloadFile", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, @@ -179,14 +179,14 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000445, Pid=1310000000441, Title="获取支付订单详情(微信接口)", Permission="sysWechatPay/payInfoFromWechat", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000446, Pid=1310000000441, Title="退款申请", Permission="sysWechatPay/refundDomestic", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, - new SysMenu{ Id=1310000000451, Pid=1310000000301, Title="更新日志", Path="/platform/upgrade", Name="sysUpgrade", Component="/system/upgrade/index", Icon="ele-Paperclip", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=240 }, + new SysMenu{ Id=1310000000451, Pid=1310000000301, Title="更新日志", Path="/platform/upgrade", Name="sysUpgrade", Component="/system/upgrade/index", Icon="ele-Document", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=240 }, //new SysMenu{ Id=1310000000461, Pid=1310000000301, Title="数据库备份", Path="/platform/dbBackup", Name="dbBackup", Component="/system/database/dbBackup", Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=240 }, //new SysMenu{ Id=1310000000462, Pid=1310000000461, Title="查询", Permission="dbBackup/page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, //new SysMenu{ Id=1310000000463, Pid=1310000000461, Title="删除", Permission="dbBackup/delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, //new SysMenu{ Id=1310000000464, Pid=1310000000461, Title="增加", Permission="dbBackup/add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, - new SysMenu{ Id=1310000000471, Pid=1310000000301, Title="流水序号", Path="/platform/serial", Name="sysSerial", Component="/system/serial/index", Icon="ele-Link", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=250 }, + new SysMenu{ Id=1310000000471, Pid=1310000000301, Title="流水序号", Path="/platform/serial", Name="sysSerial", Component="/system/serial/index", Icon="ele-Finished", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=250 }, new SysMenu{ Id=1310000000472, Pid=1310000000471, Title="查询", Permission="sysSerial/page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000473, Pid=1310000000471, Title="编辑", Permission="sysSerial/update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1310000000474, Pid=1310000000471, Title="增加", Permission="sysSerial/add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, @@ -215,9 +215,9 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000601, Pid=0, Title="开发工具", Path="/develop", Name="develop", Component="Layout", Icon="ele-Cpu", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=13000 }, new SysMenu{ Id=1310000000611, Pid=1310000000601, Title="库表管理", Path="/develop/database", Name="sysDatabase", Component="/system/database/index",Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, - new SysMenu{ Id=1310000000621, Pid=1310000000601, Title="代码生成", Path="/develop/codeGen", Name="sysCodeGen", Component="/system/codeGen/index", Icon="ele-Crop", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 }, + new SysMenu{ Id=1310000000621, Pid=1310000000601, Title="代码生成", Path="/develop/codeGen", Name="sysCodeGen", Component="/system/codeGen/index", Icon="ele-DocumentCopy", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 }, new SysMenu{ Id=1310000000631, Pid=1310000000601, Title="表单设计", Path="/develop/formDes", Name="sysFormDes", Component="/system/formDes/index", Icon="ele-Edit", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 }, - new SysMenu{ Id=1310000000641, Pid=1310000000601, Title="系统接口", Path="/develop/api", Name="sysApi", Component="layout/routerView/iframe", IsIframe=true, OutLink="http://localhost:5005", Icon="ele-Help", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 }, + new SysMenu{ Id=1310000000641, Pid=1310000000601, Title="系统接口", Path="/develop/api", Name="sysApi", Component="layout/routerView/iframe", IsIframe=true, OutLink="http://localhost:5005", Icon="ele-Link", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=140 }, new SysMenu{ Id=1310000000651, Pid=1310000000601, Title="接口压测", Path="/develop/stressTest", Name="sysStressTest", Component="/system/stressTest/index", Icon="ele-Compass", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2024-12-28 00:00:00"), OrderNo=150 }, new SysMenu{ Id=1310000000701, Pid=0, Title="报表开发", Path="/report", Name="report", Component="Layout", Icon="ele-Histogram", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=14000 }, @@ -234,7 +234,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData new SysMenu{ Id=1310000000761, Pid=1310000000721, Title="删除", Permission="sysReportConfig/delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1320000000101, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=15000 }, - new SysMenu{ Id=1320000000111, Pid=1320000000101, Title="框架教程", Path="/doc/admin", Name="sysAdmin", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://adminnet.top/", Icon="ele-Sunny", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, + new SysMenu{ Id=1320000000111, Pid=1320000000101, Title="框架教程", Path="/doc/admin", Name="sysAdmin", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://adminnet.top/", Icon="ele-Guide", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 }, new SysMenu{ Id=1320000000121, Pid=1320000000101, Title="SqlSugar", Path="/doc/SqlSugar", Name="sysSqlSugar", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://www.donet5.com/Home/Doc", Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=130 }, new SysMenu{ Id=1320000000201, Pid=0, Title="关于项目", Path="/about", Name="about", Component="/about/index", Icon="ele-InfoFilled", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2023-03-12 00:00:00"), OrderNo=16000 }, diff --git a/Web/src/i18n/menu/en.ts b/Web/src/i18n/menu/en.ts index 59dc317f..e3196ce7 100644 --- a/Web/src/i18n/menu/en.ts +++ b/Web/src/i18n/menu/en.ts @@ -65,6 +65,7 @@ export default { 动态插件: 'Dynamic Plugin', 更新日志: 'Update Log', 微信支付: 'WeChat Payment', + 流水序号: 'Serial Number', 超级API: 'Super API', 报表开发: 'Report', 数据源配置: 'Data Source Configuration', diff --git a/Web/src/i18n/menu/zh-CN.ts b/Web/src/i18n/menu/zh-CN.ts index 8a711b6d..cf983d57 100644 --- a/Web/src/i18n/menu/zh-CN.ts +++ b/Web/src/i18n/menu/zh-CN.ts @@ -65,6 +65,7 @@ export default { 动态插件: '动态插件', 更新日志: '更新日志', 微信支付: '微信支付', + 流水序号: '流水序号', 超级API: '超级API', 报表开发: '报表开发', 数据源配置: '数据源配置', diff --git a/Web/src/i18n/menu/zh-HK.ts b/Web/src/i18n/menu/zh-HK.ts index d917f586..57c126db 100644 --- a/Web/src/i18n/menu/zh-HK.ts +++ b/Web/src/i18n/menu/zh-HK.ts @@ -65,6 +65,7 @@ export default { 动态插件: '動態插件', 更新日志: '更新日誌', 微信支付: '微信支付', + 流水序号: '流水序號', 超级API: '超級API', 帮助文档: '幫助文檔', 框架教程: '框架教程', diff --git a/Web/src/i18n/menu/zh-TW.ts b/Web/src/i18n/menu/zh-TW.ts index 64b68377..dee03383 100644 --- a/Web/src/i18n/menu/zh-TW.ts +++ b/Web/src/i18n/menu/zh-TW.ts @@ -65,6 +65,7 @@ export default { 动态插件: '動態外掛', 更新日志: '更新日誌', 微信支付: '微信支付', + 流水序号: '流水序號', 超级API: '超級API', 帮助文档: '幫助文檔', 框架教程: '框架教程', diff --git a/Web/src/layout/logo/index.vue b/Web/src/layout/logo/index.vue index 32db79a3..8ed42747 100644 --- a/Web/src/layout/logo/index.vue +++ b/Web/src/layout/logo/index.vue @@ -49,7 +49,7 @@ const onThemeConfigChange = () => { span { white-space: nowrap; display: inline-block; - font-weight: bold; + font-weight: 900; font-size: 18px; } &:hover { diff --git a/Web/src/views/system/serial/component/editSerial.vue b/Web/src/views/system/serial/component/editSerial.vue index 1c30ac57..93e538cb 100644 --- a/Web/src/views/system/serial/component/editSerial.vue +++ b/Web/src/views/system/serial/component/editSerial.vue @@ -16,16 +16,16 @@ - + - + @@ -102,7 +101,7 @@ const options = useVxeTable( // { field: 'seq', type: 'seq', title: '序号', width: 60, fixed: 'left' }, { field: 'seq', title: '序列号', minWidth: 80, showOverflow: 'tooltip' }, { field: 'expy', title: '有效期', minWidth: 150, showOverflow: 'tooltip', slots: { default: 'row_expy' } }, - { field: 'type', title: '使用分类', minWidth: 150, showOverflow: 'tooltip', slots: { default: 'row_type' } }, + { field: 'type', title: '分类', minWidth: 150, showOverflow: 'tooltip', slots: { default: 'row_type' } }, { field: 'resetInterval', title: '重置间隔', minWidth: 120, showOverflow: 'tooltip', slots: { default: 'row_resetInterval' } }, { field: 'formater', title: '表达式', minWidth: 220, showOverflow: 'tooltip' }, { field: 'min', title: '最小值', minWidth: 80, showOverflow: 'tooltip' }, @@ -111,7 +110,7 @@ const options = useVxeTable( { field: 'status', title: '状态', minWidth: 100, showOverflow: 'tooltip', slots: { default: 'row_status' } }, { field: 'remark', title: '备注', minWidth: 150, showOverflow: 'tooltip' }, { field: 'record', title: '修改记录', width: 100, showOverflow: 'tooltip', slots: { default: 'row_record' } }, - { field: 'buttons', title: '操作', fixed: 'right', width: 200, showOverflow: true, slots: { default: 'row_buttons' } }, + { field: 'buttons', title: '操作', fixed: 'right', width: 180, showOverflow: true, slots: { default: 'row_buttons' } }, ], }, // vxeGrid配置参数(此处可覆写任何参数)，参考vxe-table官方文档 @@ -158,7 +157,7 @@ const resetQuery = async () => { // 打开新增页面 const handleAdd = () => { state.title = '添加流水号'; // i18n.t('message.list.addPosition'); - editSerialRef.value?.openDialog({ status: 1, orderNo: 100 }); + editSerialRef.value?.openDialog({ type: 999, resetInterval: 1, min: 1, max: 99999999, status: 1, orderNo: 100 }); }; // 打开编辑页面 @@ -167,12 +166,6 @@ const handleEdit = async (row: any) => { editSerialRef.value?.openDialog(row); }; -// 打开详情页面 -const handleDetail = async (row: any) => { - state.title = '流水号详情'; //i18n.t('message.list.editPosition'); - editSerialRef.value?.openDialog(row); -}; - // 删除 const handleDelete = (row: any) => { ElMessageBox.confirm(i18n.t('message.list.confirmDeletePosition', { name: row.name }), i18n.t('message.list.hint'), {