diff --git a/web/src/i18n/lang/en.ts b/web/src/i18n/lang/en.ts index 11f9d54..d4213cc 100644 --- a/web/src/i18n/lang/en.ts +++ b/web/src/i18n/lang/en.ts @@ -14,65 +14,6 @@ export default { limitsFrontEndBtn: 'FrontEndBtn', limitsBackEnd: 'BackEnd', limitsBackEndEndPage: 'BackEndEndPage', - menu: 'menu', - menu1: 'menu1', - menu11: 'menu11', - menu12: 'menu12', - menu121: 'menu121', - menu122: 'menu122', - menu13: 'menu13', - menu2: 'menu2', - funIndex: 'function', - funTagsView: 'funTagsView', - funCountup: 'countup', - funWangEditor: 'wangEditor', - funCropper: 'cropper', - funQrcode: 'qrcode', - funEchartsMap: 'EchartsMap', - funPrintJs: 'PrintJs', - funClipboard: 'Copy cut', - funGridLayout: 'Drag layout', - funSplitpanes: 'Pane splitter', - funDragVerify: 'Validator', - pagesIndex: 'pages', - pagesFiltering: 'Filtering', - pagesFilteringDetails: 'FilteringDetails', - pagesFilteringDetails1: 'FilteringDetails1', - pagesIocnfont: 'iconfont icon', - pagesElement: 'element icon', - pagesAwesome: 'awesome icon', - pagesFormAdapt: 'FormAdapt', - pagesTableRules: 'pagesTableRules', - pagesFormI18n: 'FormI18n', - pagesFormRules: 'Multi form validation', - pagesDynamicForm: 'Dynamic complex form', - pagesWorkflow: 'Workflow', - pagesListAdapt: 'ListAdapt', - pagesWaterfall: 'Waterfall', - pagesSteps: 'Steps', - pagesPreview: 'Large preview', - pagesWaves: 'Wave effect', - pagesTree: 'tree alter table', - pagesDrag: 'Drag command', - pagesLazyImg: 'Image lazy loading', - makeIndex: 'makeIndex', - makeSelector: 'Icon selector', - makeNoticeBar: 'notification bar', - makeSvgDemo: 'Svgicon demo', - paramsIndex: 'Routing parameters', - paramsCommon: 'General routing', - paramsDynamic: 'Dynamic routing', - paramsCommonDetails: 'General routing details', - paramsDynamicDetails: 'Dynamic routing details', - chartIndex: 'chartIndex', - visualizingIndex: 'visualizingIndex', - visualizingLinkDemo1: 'visualizingLinkDemo1', - visualizingLinkDemo2: 'visualizingLinkDemo2', - personal: 'personal', - tools: 'tools', - layoutLinkView: 'LinkView', - layoutIfameView: 'IfameView', - demo1:'demo1' }, staticRoutes: { signIn: 'signIn', diff --git a/web/src/i18n/lang/zh-cn.ts b/web/src/i18n/lang/zh-cn.ts index bec73ad..96ec7a5 100644 --- a/web/src/i18n/lang/zh-cn.ts +++ b/web/src/i18n/lang/zh-cn.ts @@ -2,12 +2,22 @@ export default { router: { home: '首页', - system: '系统设置', + system: '系统管理', + config: '常规配置', + log: '日志管理', + /* 常规配置 */ + configSystem: '系统配置', + configDict: '字典管理', + configArea: '地区管理', + configFile: '附件管理', + /* 系统管理 */ systemMenu: '菜单管理', systemRole: '角色管理', systemUser: '用户管理', systemDept: '部门管理', - systemDic: '字典管理', + /* 日志管理 */ + loginLog: '登录日志', + operationLog: '操作日志', systemApiWhiteList: '接口白名单', limits: '权限管理', limitsFrontEnd: '前端控制', @@ -15,65 +25,6 @@ export default { limitsFrontEndBtn: '按钮权限', limitsBackEnd: '后端控制', limitsBackEndEndPage: '页面权限', - menu: '菜单嵌套', - menu1: '菜单1', - menu11: '菜单11', - menu12: '菜单12', - menu121: '菜单121', - menu122: '菜单122', - menu13: '菜单13', - menu2: '菜单2', - funIndex: '功能', - funTagsView: 'tagsView 操作', - funCountup: '数字滚动', - funWangEditor: 'Editor 编辑器', - funCropper: '图片裁剪', - funQrcode: '二维码生成', - funEchartsMap: '地理坐标/地图', - funPrintJs: '页面打印', - funClipboard: '复制剪切', - funGridLayout: '拖拽布局', - funSplitpanes: '窗格拆分器', - funDragVerify: '验证器', - pagesIndex: '页面', - pagesFiltering: '过滤筛选组件', - pagesFilteringDetails: '过滤筛选组件详情', - pagesFilteringDetails1: '过滤筛选组件详情111', - pagesIocnfont: 'ali 字体图标', - pagesElement: 'ele 字体图标', - pagesAwesome: 'awe 字体图标', - pagesFormAdapt: '表单自适应', - pagesTableRules: '表单表格验证', - pagesFormI18n: '表单国际化', - pagesFormRules: '多表单验证', - pagesDynamicForm: '动态复杂表单', - pagesWorkflow: '工作流', - pagesListAdapt: '列表自适应', - pagesWaterfall: '瀑布屏', - pagesSteps: '步骤条', - pagesPreview: '大图预览', - pagesWaves: '波浪效果', - pagesTree: '树形改表格', - pagesDrag: '拖动指令', - pagesLazyImg: '图片懒加载', - makeIndex: '组件封装', - makeSelector: '图标选择器', - makeNoticeBar: '滚动通知栏', - makeSvgDemo: 'svgIcon 演示', - paramsIndex: '路由参数', - paramsCommon: '普通路由', - paramsDynamic: '动态路由', - paramsCommonDetails: '普通路由详情', - paramsDynamicDetails: '动态路由详情', - chartIndex: '大数据图表', - visualizingIndex: '数据可视化', - visualizingLinkDemo1: '数据可视化演示1', - visualizingLinkDemo2: '数据可视化演示2', - personal: '个人中心', - tools: '工具类集合', - layoutLinkView: '外链', - layoutIfameView: '内嵌 iframe', - demo1: 'demo1', }, staticRoutes: { signIn: '登录', diff --git a/web/src/router/route.ts b/web/src/router/route.ts index c9cf0be..748f3db 100644 --- a/web/src/router/route.ts +++ b/web/src/router/route.ts @@ -47,7 +47,7 @@ export const dynamicRoutes: Array = [ }, }, { - path: '/system', + path: '/config', name: 'system', component: () => import('/@/layout/routerView/parent.vue'), redirect: '/system/menu', @@ -122,21 +122,6 @@ export const dynamicRoutes: Array = [ icon: 'ele-OfficeBuilding', }, }, - { - path: '/system/dic', - name: 'systemDic', - component: () => import('/@/views/system/dic/index.vue'), - meta: { - title: 'message.router.systemDic', - isLink: '', - isHide: false, - isKeepAlive: true, - isAffix: false, - isIframe: false, - roles: ['admin'], - icon: 'ele-SetUp', - }, - }, { path: '/system/apiWhiteList', name: 'apiWhiteList', @@ -154,6 +139,132 @@ export const dynamicRoutes: Array = [ }, ], }, + { + path: '/config', + name: 'config', + component: () => import('/@/layout/routerView/parent.vue'), + redirect: '/config/menu', + meta: { + title: 'message.router.config', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-configure', + }, + children: [ + { + path: '/system/configSystem', + name: 'configSystem', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.configSystem', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-system', + }, + }, + { + path: '/system/dict', + name: 'configDict', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.configDict', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-dict', + }, + }, + { + path: '/system/area', + name: 'configArea', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.configArea', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-Area', + }, + }, + { + path: '/system/file', + name: 'configFile', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.configFile', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-file', + }, + }, + ], + }, + { + path: '/log', + name: 'log', + component: () => import('/@/layout/routerView/parent.vue'), + redirect: '/log/loginLog', + meta: { + title: 'message.router.log', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-rizhi', + }, + children: [ + { + path: '/log/loginLog', + name: 'loginLog', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.loginLog', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-guanlidenglurizhi', + }, + }, + { + path: '/log/operationLog', + name: 'operationLog', + component: () => import('/@/views/system/dic/index.vue'), + meta: { + title: 'message.router.operationLog', + isLink: '', + isHide: false, + isKeepAlive: true, + isAffix: false, + isIframe: false, + roles: ['admin'], + icon: 'iconfont icon-caozuorizhi', + }, + }, + ], + }, ], }, ]; diff --git a/web/src/utils/setIconfont.ts b/web/src/utils/setIconfont.ts index a6acf68..c005a8b 100644 --- a/web/src/utils/setIconfont.ts +++ b/web/src/utils/setIconfont.ts @@ -1,6 +1,7 @@ // 字体图标 url const cssCdnUrlList: Array = [ '//at.alicdn.com/t/font_2298093_y6u00apwst.css', + '//at.alicdn.com/t/c/font_3882322_8vb7gh5lw4t.css', //dvadmin3项目用icon '//netdna.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css', ]; // 第三方 js url