diff --git a/.env.development b/.env.development index 302ecd1..3dbc6ed 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能车联管理系统 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 +# 智能车联管理系统/开发环境 VUE_APP_BASE_API = '/dev-api' # 路由懒加载 diff --git a/.env.production b/.env.production index b4893b0..4d19804 100644 --- a/.env.production +++ b/.env.production @@ -1,8 +1,8 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能车联管理系统 # 生产环境配置 ENV = 'production' -# 若依管理系统/生产环境 +# 智能车联管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' diff --git a/.env.staging b/.env.staging index 361859f..cd372b0 100644 --- a/.env.staging +++ b/.env.staging @@ -1,10 +1,10 @@ # 页面标题 -VUE_APP_TITLE = 若依管理系统 +VUE_APP_TITLE = 智能车联管理系统 NODE_ENV = production # 测试环境配置 ENV = 'staging' -# 若依管理系统/测试环境 +# 智能车联管理系统/测试环境 VUE_APP_BASE_API = '/stage-api' diff --git a/package.json b/package.json index 6a46cc5..fe726dd 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "muyu", "version": "3.6.3", - "description": "若依管理系统", - "author": "若依", + "description": "智能车联管理系统", + "author": "智能车联", "license": "MIT", "scripts": { "dev": "vue-cli-service serve", diff --git a/src/components/DictData/index.js b/src/components/DictData/index.js index 81d65b7..b1c2856 100644 --- a/src/components/DictData/index.js +++ b/src/components/DictData/index.js @@ -258,6 +258,322 @@ let dictDataMap = "status": "0", "remark": "关闭状态" } + ], + // 系统状态 + "sys_common_status": [ + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 28, + "dictSort": 1, + "dictLabel": "成功", + "dictValue": "0", + "dictType": "sys_common_status", + "cssClass": "", + "listClass": "primary", + "isDefault": "N", + "status": "0", + "remark": "正常状态" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 29, + "dictSort": 2, + "dictLabel": "失败", + "dictValue": "1", + "dictType": "sys_common_status", + "cssClass": "", + "listClass": "danger", + "isDefault": "N", + "status": "0", + "remark": "停用状态" + } + ], + // 定时任务组 + "sys_job_group": [ + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 10, + "dictSort": 1, + "dictLabel": "默认", + "dictValue": "DEFAULT", + "dictType": "sys_job_group", + "cssClass": "", + "listClass": "", + "isDefault": "Y", + "status": "0", + "remark": "默认分组" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 11, + "dictSort": 2, + "dictLabel": "系统", + "dictValue": "SYSTEM", + "dictType": "sys_job_group", + "cssClass": "", + "listClass": "", + "isDefault": "N", + "status": "0", + "remark": "系统分组" + } + ], + // 定时任务状态 + "sys_job_status": [ + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 8, + "dictSort": 1, + "dictLabel": "正常", + "dictValue": "0", + "dictType": "sys_job_status", + "cssClass": "", + "listClass": "primary", + "isDefault": "Y", + "status": "0", + "remark": "正常状态" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 9, + "dictSort": 2, + "dictLabel": "暂停", + "dictValue": "1", + "dictType": "sys_job_status", + "cssClass": "", + "listClass": "danger", + "isDefault": "N", + "status": "0", + "remark": "停用状态" + } + ], + // 操作类型 + "sys_oper_type": [ + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 19, + "dictSort": 1, + "dictLabel": "新增", + "dictValue": "1", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "info", + "isDefault": "N", + "status": "0", + "remark": "新增操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 20, + "dictSort": 2, + "dictLabel": "修改", + "dictValue": "2", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "info", + "isDefault": "N", + "status": "0", + "remark": "修改操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 21, + "dictSort": 3, + "dictLabel": "删除", + "dictValue": "3", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "danger", + "isDefault": "N", + "status": "0", + "remark": "删除操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 22, + "dictSort": 4, + "dictLabel": "授权", + "dictValue": "4", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "primary", + "isDefault": "N", + "status": "0", + "remark": "授权操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 23, + "dictSort": 5, + "dictLabel": "导出", + "dictValue": "5", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "warning", + "isDefault": "N", + "status": "0", + "remark": "导出操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 24, + "dictSort": 6, + "dictLabel": "导入", + "dictValue": "6", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "warning", + "isDefault": "N", + "status": "0", + "remark": "导入操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 25, + "dictSort": 7, + "dictLabel": "强退", + "dictValue": "7", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "danger", + "isDefault": "N", + "status": "0", + "remark": "强退操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 26, + "dictSort": 8, + "dictLabel": "生成代码", + "dictValue": "8", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "warning", + "isDefault": "N", + "status": "0", + "remark": "生成操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 27, + "dictSort": 9, + "dictLabel": "清空数据", + "dictValue": "9", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "danger", + "isDefault": "N", + "status": "0", + "remark": "清空操作" + }, + { + "createBy": 1, + "createTime": "2023-09-29 11:47:28", + "updateBy": null, + "updateTime": null, + "params": { + "@type": "java.util.HashMap" + }, + "dictCode": 18, + "dictSort": 99, + "dictLabel": "其他", + "dictValue": "0", + "dictType": "sys_oper_type", + "cssClass": "", + "listClass": "info", + "isDefault": "N", + "status": "0", + "remark": "其他操作" + } ] } /** diff --git a/src/router/index.js b/src/router/index.js index 2afac71..d0eb4ba 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -146,20 +146,6 @@ export const dynamicRoutes = [ meta: {title: '调度日志', activeMenu: '/monitor/job'} } ] - }, - { - path: '/tool/gen-edit', - component: Layout, - hidden: true, - permissions: ['tool:gen:edit'], - children: [ - { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: {title: '修改生成配置', activeMenu: '/tool/gen'} - } - ] } ] diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index ef48664..91e556f 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -136,7 +136,7 @@ let routeResponse = { "name": "Operlog", "path": "operlog", "hidden": false, - "component": "monitor/operlog/index", + "component": "system/operlog/index", "meta": { "title": "操作日志", "icon": "form", @@ -148,7 +148,7 @@ let routeResponse = { "name": "Logininfor", "path": "logininfor", "hidden": false, - "component": "monitor/logininfor/index", + "component": "system/logininfor/index", "meta": { "title": "登录日志", "icon": "logininfor", @@ -197,120 +197,8 @@ let routeResponse = { "noCache": false, "link": null } - }, - { - "name": "Druid", - "path": "druid", - "hidden": false, - "component": "monitor/druid/index", - "meta": { - "title": "数据监控", - "icon": "druid", - "noCache": false, - "link": null - } - }, - { - "name": "Server", - "path": "server", - "hidden": false, - "component": "monitor/server/index", - "meta": { - "title": "服务监控", - "icon": "server", - "noCache": false, - "link": null - } - }, - { - "name": "Cache", - "path": "cache", - "hidden": false, - "component": "monitor/cache/index", - "meta": { - "title": "缓存监控", - "icon": "redis", - "noCache": false, - "link": null - } - }, - { - "name": "CacheList", - "path": "cacheList", - "hidden": false, - "component": "monitor/cache/list", - "meta": { - "title": "缓存列表", - "icon": "redis-list", - "noCache": false, - "link": null - } } ] - }, - { - "name": "Tool", - "path": "/tool", - "hidden": false, - "redirect": "noRedirect", - "component": "Layout", - "alwaysShow": true, - "meta": { - "title": "系统工具", - "icon": "tool", - "noCache": false, - "link": null - }, - "children": [ - { - "name": "Build", - "path": "build", - "hidden": false, - "component": "tool/build/index", - "meta": { - "title": "表单构建", - "icon": "build", - "noCache": false, - "link": null - } - }, - { - "name": "Gen", - "path": "gen", - "hidden": false, - "component": "tool/gen/index", - "meta": { - "title": "代码生成", - "icon": "code", - "noCache": false, - "link": null - } - }, - { - "name": "Swagger", - "path": "swagger", - "hidden": false, - "component": "tool/swagger/index", - "meta": { - "title": "系统接口", - "icon": "swagger", - "noCache": false, - "link": null - } - } - ] - }, - { - "name": "Http://ruoyi.vip", - "path": "http://ruoyi.vip", - "hidden": true, - "component": "Layout", - "meta": { - "title": "若依官网", - "icon": "guide", - "noCache": false, - "link": "http://ruoyi.vip" - } } ] } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 0a4a7f9..1e3449e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -75,7 +75,7 @@ const user = { "userId": 1, "deptId": 103, "userName": "admin", - "nickName": "若依", + "nickName": "智能车联", "email": "ry@163.com", "phonenumber": "15888888888", "sex": "1", @@ -95,7 +95,7 @@ const user = { "ancestors": "0,100,101", "deptName": "研发部门", "orderNum": 1, - "leader": "若依", + "leader": "智能车联", "phone": null, "email": null, "status": "0", diff --git a/src/views/index.vue b/src/views/index.vue index 93edae1..0b5f48b 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,885 +1,6 @@ @@ -893,76 +14,10 @@ export default { }; }, methods: { - goTarget(href) { - window.open(href, "_blank"); - }, }, }; diff --git a/src/views/login.vue b/src/views/login.vue index 0ff1b6f..b4af5bb 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,7 +1,7 @@