From 1485adf5dfe927e3b193cfe9aff0536e6f5d2e56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com> Date: Wed, 3 Mar 2021 23:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BA=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dvadmin-backend/conf/env.example.py | 2 +- .../scripts/permission/permission_menu.sql | 34 +++++++++++++++++++ .../scripts/permission/permission_role.sql | 34 +++++++++++++++++++ .../permission/permission_userprofile.sql | 3 ++ dvadmin-ui/.env.production | 8 ++++- dvadmin-ui/src/api/system/config.js | 2 +- dvadmin-ui/src/api/system/dict/type.js | 4 +-- dvadmin-ui/src/api/system/savefile.js | 2 +- .../src/views/permission/dept/index.vue | 8 ++--- .../src/views/permission/menu/index.vue | 32 +++++++++++------ .../src/views/permission/post/index.vue | 12 +++---- .../src/views/permission/role/index.vue | 14 ++++---- .../src/views/permission/user/index.vue | 17 +++++----- dvadmin-ui/src/views/system/config/index.vue | 14 ++++---- dvadmin-ui/src/views/system/dict/data.vue | 12 +++---- dvadmin-ui/src/views/system/dict/index.vue | 14 ++++---- .../src/views/system/savefile/index.vue | 10 +++--- 17 files changed, 155 insertions(+), 67 deletions(-) diff --git a/dvadmin-backend/conf/env.example.py b/dvadmin-backend/conf/env.example.py index 526290f..f88c0f5 100644 --- a/dvadmin-backend/conf/env.example.py +++ b/dvadmin-backend/conf/env.example.py @@ -28,7 +28,7 @@ MONGO_PORT = 27017 REDIS_DB = 1 REDIS_HOST = '127.0.0.1' REDIS_PORT = 6379 -REDIS_PASSWORD = '123456' +REDIS_PASSWORD = 'q1w2e3r4T%Y^U&' # ================================================= # # ************** 默认配置 ************** # diff --git a/dvadmin-backend/scripts/permission/permission_menu.sql b/dvadmin-backend/scripts/permission/permission_menu.sql index 33ebf15..d3df3ea 100644 --- a/dvadmin-backend/scripts/permission/permission_menu.sql +++ b/dvadmin-backend/scripts/permission/permission_menu.sql @@ -43,3 +43,37 @@ INSERT INTO `permission_menu` VALUES (8, '', 'admin', 'admin', '2021-02-27 08:29 INSERT INTO `permission_menu` VALUES (9, '', 'admin', 'admin', '2021-02-27 08:30:14.030845', '2021-02-27 08:30:14.030888', '1', 'user', '用户管理', 5, '1', '/permission/user', 'permission/user/index', 'permission/user', 'GET', 'permission:user:get', '1', '1', '1', 2); INSERT INTO `permission_menu` VALUES (10, '', 'admin', 'admin', '2021-02-27 08:37:24.948235', '2021-02-27 08:36:04.824117', '0', 'guide', 'dvAdmin官网', 9, '0', 'https://django-vue-admin.com', '', NULL, 'GET', NULL, '1', '1', '1', NULL); INSERT INTO `permission_menu` VALUES (11, '', 'admin', 'admin', '2021-02-27 16:19:21.529666', '2021-02-27 16:17:36.685174', '1', 'job', '文件管理', 3, '1', '/system/savefile', 'system/savefile/index', '/system/savefile', 'GET', 'system:savefile:get', '1', '1', '1', 1); +INSERT INTO `permission_menu` VALUES (13, '', 'admin', 'admin', '2021-03-03 14:41:08.227821', '2021-03-03 14:18:52.530449', '2', NULL, '用户新增', 1, '1', NULL, NULL, '/permission/user/', 'POST', 'permission:user:post', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (14, '', 'admin', 'admin', '2021-03-03 14:43:34.207938', '2021-03-03 14:43:34.208093', '2', NULL, '用户修改', 2, '1', NULL, NULL, '/permission/user/{id}/', 'PUT', 'permission:user:{id}:put', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (15, '', 'admin', 'admin', '2021-03-03 14:44:58.006289', '2021-03-03 14:44:58.006338', '2', NULL, '用户删除', 3, '1', '', NULL, '/permission/user/{id}/', 'DELETE', 'permission:user:{id}:delete', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (16, '', 'admin', 'admin', '2021-03-03 14:45:50.575443', '2021-03-03 14:45:50.575507', '2', NULL, '用户导出', 4, '1', NULL, NULL, '/permission/user/export/', 'GET', 'permission:user:export:get', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (17, '', 'admin', 'admin', '2021-03-03 14:51:14.157310', '2021-03-03 14:51:14.157447', '2', NULL, '用户导入', 5, '1', NULL, NULL, '/permission/user/import/', 'POST', 'permission:user:import:post', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (18, '', 'admin', 'admin', '2021-03-03 14:51:51.220886', '2021-03-03 14:51:51.220933', '2', NULL, '重置密码', 6, '1', NULL, NULL, '/permission/user/resetPwd/', 'PUT', 'permission:user:resetpwd:put', '1', '1', '1', 9); +INSERT INTO `permission_menu` VALUES (19, '', 'admin', 'admin', '2021-03-03 14:53:47.877063', '2021-03-03 14:53:47.877116', '2', NULL, '角色新增', 1, '1', NULL, NULL, '/permission/role/', 'POST', 'permission:role:post', '1', '1', '1', 8); +INSERT INTO `permission_menu` VALUES (20, '', 'admin', 'admin', '2021-03-03 14:54:28.794968', '2021-03-03 14:54:28.795015', '2', NULL, '角色修改', 2, '1', NULL, NULL, '/permission/role/{id}/', 'PUT', 'permission:role:{id}:put', '1', '1', '1', 8); +INSERT INTO `permission_menu` VALUES (21, '', 'admin', 'admin', '2021-03-03 14:58:00.798718', '2021-03-03 14:58:00.798813', '2', NULL, '删除角色', 3, '1', NULL, NULL, '/permission/role/{id}/', 'DELETE', 'permission:role:{id}:delete', '1', '1', '1', 8); +INSERT INTO `permission_menu` VALUES (22, '', 'admin', 'admin', '2021-03-03 14:58:28.940577', '2021-03-03 14:58:28.940625', '2', NULL, '角色导出', 4, '1', NULL, NULL, '/permission/role/export/', 'GET', 'permission:role:export:get', '1', '1', '1', 8); +INSERT INTO `permission_menu` VALUES (23, '', 'admin', 'admin', '2021-03-03 15:00:41.081771', '2021-03-03 15:00:41.081832', '2', NULL, '菜单新增', 1, '1', NULL, NULL, '/permission/menus/', 'POST', 'permission:menus:post', '1', '1', '1', 7); +INSERT INTO `permission_menu` VALUES (24, '', 'admin', 'admin', '2021-03-03 15:01:03.178824', '2021-03-03 15:01:03.178874', '2', NULL, '菜单修改', 2, '1', NULL, NULL, '/permission/menus/{id}/', 'PUT', 'permission:menus:{id}:put', '1', '1', '1', 7); +INSERT INTO `permission_menu` VALUES (25, '', 'admin', 'admin', '2021-03-03 15:02:56.123525', '2021-03-03 15:02:56.123571', '2', NULL, '菜单删除', 3, '1', NULL, NULL, '/permission/menus/{id}/', 'DELETE', 'permission:menus:{id}:delete', '1', '1', '1', 7); +INSERT INTO `permission_menu` VALUES (26, '', 'admin', 'admin', '2021-03-03 15:04:35.191774', '2021-03-03 15:04:35.191856', '2', NULL, '部门新增', 1, '1', NULL, NULL, '/permission/dept/', 'POST', 'permission:dept:post', '1', '1', '1', 6); +INSERT INTO `permission_menu` VALUES (27, '', 'admin', 'admin', '2021-03-03 15:04:56.963168', '2021-03-03 15:04:56.963214', '2', NULL, '部门修改', 2, '1', NULL, NULL, '/permission/dept/{id}/', 'PUT', 'permission:dept:{id}:put', '1', '1', '1', 6); +INSERT INTO `permission_menu` VALUES (28, '', 'admin', 'admin', '2021-03-03 15:05:39.602577', '2021-03-03 15:05:39.602622', '2', NULL, '部门删除', 3, '1', NULL, NULL, '/permission/dept/{id}/', 'DELETE', 'permission:dept:{id}:delete', '1', '1', '1', 6); +INSERT INTO `permission_menu` VALUES (29, '', 'admin', 'admin', '2021-03-03 15:06:50.095341', '2021-03-03 15:06:50.095388', '2', NULL, '岗位新增', 1, '1', NULL, NULL, '/permission/post/', 'POST', 'permission:post:post', '1', '1', '1', 5); +INSERT INTO `permission_menu` VALUES (30, '', 'admin', 'admin', '2021-03-03 15:07:36.013313', '2021-03-03 15:07:36.013358', '2', NULL, '岗位修改', 2, '1', NULL, NULL, '/permission/post/{id}/', 'PUT', 'permission:post:{id}:put', '1', '1', '1', 5); +INSERT INTO `permission_menu` VALUES (31, '', 'admin', 'admin', '2021-03-03 15:08:10.371530', '2021-03-03 15:08:10.371575', '2', NULL, '岗位删除', 3, '1', NULL, NULL, '/permission/post/{id}/', 'DELETE', 'permission:post:{id}:delete', '1', '1', '1', 5); +INSERT INTO `permission_menu` VALUES (32, '', 'admin', 'admin', '2021-03-03 15:09:02.213084', '2021-03-03 15:09:02.213131', '2', NULL, '岗位导出', 4, '1', NULL, NULL, '/permission/post/export/', 'GET', 'permission:post:export:get', '1', '1', '1', 5); +INSERT INTO `permission_menu` VALUES (33, '', 'admin', 'admin', '2021-03-03 15:11:37.616329', '2021-03-03 15:11:37.616415', '2', NULL, '字典新增', 1, '1', NULL, NULL, '/system/dict/type/', 'POST', 'system:dict:type:post', '1', '1', '1', 3); +INSERT INTO `permission_menu` VALUES (34, '', 'admin', 'admin', '2021-03-03 15:12:47.237658', '2021-03-03 15:12:47.237713', '2', NULL, '字典修改', 2, '1', NULL, NULL, '/system/dict/type/{id}/', 'PUT', 'system:dict:type:{id}:put', '1', '1', '1', 3); +INSERT INTO `permission_menu` VALUES (35, '', 'admin', 'admin', '2021-03-03 15:13:40.185174', '2021-03-03 15:13:40.185230', '2', NULL, '字典删除', 3, '1', NULL, NULL, '/system/dict/type/{id}/', 'DELETE', 'system:dict:type:{id}:delete', '1', '1', '1', 3); +INSERT INTO `permission_menu` VALUES (36, '', 'admin', 'admin', '2021-03-03 15:15:12.950584', '2021-03-03 15:15:12.950684', '2', NULL, '字典导出', 4, '1', NULL, NULL, '/system/dict/type/export/', 'GET', 'system:dict:type:export:get', '1', '1', '1', 3); +INSERT INTO `permission_menu` VALUES (37, '', 'admin', 'admin', '2021-03-03 15:16:54.709780', '2021-03-03 15:16:20.868146', '2', NULL, '清理缓存', 5, '1', NULL, NULL, '/system/dict/type/clearCache/', 'DELETE', 'system:dict:type:clearcache:delete', '1', '1', '1', 3); +INSERT INTO `permission_menu` VALUES (38, '', 'admin', 'admin', '2021-03-03 15:17:54.232085', '2021-03-03 15:17:54.232166', '2', NULL, '参数新增', 1, '1', NULL, NULL, '/system/config/', 'POST', 'system:config:post', '1', '1', '1', 4); +INSERT INTO `permission_menu` VALUES (39, '', 'admin', 'admin', '2021-03-03 15:18:37.088187', '2021-03-03 15:18:37.088237', '2', NULL, '参数修改', 2, '1', NULL, NULL, '/system/config/{id}/', 'PUT', 'system:config:{id}:put', '1', '1', '1', 4); +INSERT INTO `permission_menu` VALUES (40, '', 'admin', 'admin', '2021-03-03 15:19:05.532556', '2021-03-03 15:19:05.532616', '2', NULL, '参数删除', 3, '1', NULL, NULL, '/system/config/{id}/', 'DELETE', 'system:config:{id}:delete', '1', '1', '1', 4); +INSERT INTO `permission_menu` VALUES (41, '', 'admin', 'admin', '2021-03-03 15:19:49.576174', '2021-03-03 15:19:49.576221', '2', NULL, '参数导出', 4, '1', NULL, NULL, '/system/config/export/', 'GET', 'system:config:export:get', '1', '1', '1', 4); +INSERT INTO `permission_menu` VALUES (42, '', 'admin', 'admin', '2021-03-03 15:21:20.098250', '2021-03-03 15:21:20.098345', '2', NULL, '清理缓存', 5, '1', NULL, NULL, '/system/config/clearCache/', 'DELETE', 'system:config:clearcache:delete', '1', '1', '1', 4); +INSERT INTO `permission_menu` VALUES (43, '', 'admin', 'admin', '2021-03-03 15:22:48.492613', '2021-03-03 15:22:48.492666', '2', NULL, '文件上传', 1, '1', NULL, NULL, '/system/savefile/', 'POST', 'system:savefile:post', '1', '1', '1', 11); +INSERT INTO `permission_menu` VALUES (44, '', 'admin', 'admin', '2021-03-03 15:23:58.219105', '2021-03-03 15:23:58.219155', '2', NULL, '文件删除', 2, '1', NULL, NULL, '/system/savefile/{id}/', 'DELETE', 'system:savefile:{id}:delete', '1', '1', '1', 11); +INSERT INTO `permission_menu` VALUES (45, '', 'admin', 'admin', '2021-03-03 15:25:15.224971', '2021-03-03 15:25:15.225018', '2', NULL, '清理废弃文件', 3, '1', NULL, NULL, '/system/clearsavefile/', 'POST', 'system:clearsavefile:post', '1', '1', '1', 11); +INSERT INTO `permission_menu` VALUES (46, '', 'admin', 'admin', '2021-03-03 15:28:30.061632', '2021-03-03 15:27:19.945663', '2', NULL, '文件下载', 4, '1', NULL, NULL, NULL, 'GET', 'system:clearsavefile:download:post', '1', '1', '1', 11); diff --git a/dvadmin-backend/scripts/permission/permission_role.sql b/dvadmin-backend/scripts/permission/permission_role.sql index e04587f..8fd846a 100644 --- a/dvadmin-backend/scripts/permission/permission_role.sql +++ b/dvadmin-backend/scripts/permission/permission_role.sql @@ -104,6 +104,40 @@ INSERT INTO `permission_role_menu` VALUES (8, 1, 8); INSERT INTO `permission_role_menu` VALUES (9, 1, 9); INSERT INTO `permission_role_menu` VALUES (10, 1, 10); INSERT INTO `permission_role_menu` VALUES (21, 1, 11); +INSERT INTO `permission_role_menu` VALUES (22, 1, 13); +INSERT INTO `permission_role_menu` VALUES (23, 1, 14); +INSERT INTO `permission_role_menu` VALUES (24, 1, 15); +INSERT INTO `permission_role_menu` VALUES (25, 1, 16); +INSERT INTO `permission_role_menu` VALUES (26, 1, 17); +INSERT INTO `permission_role_menu` VALUES (27, 1, 18); +INSERT INTO `permission_role_menu` VALUES (28, 1, 19); +INSERT INTO `permission_role_menu` VALUES (29, 1, 20); +INSERT INTO `permission_role_menu` VALUES (30, 1, 21); +INSERT INTO `permission_role_menu` VALUES (31, 1, 22); +INSERT INTO `permission_role_menu` VALUES (32, 1, 23); +INSERT INTO `permission_role_menu` VALUES (33, 1, 24); +INSERT INTO `permission_role_menu` VALUES (34, 1, 25); +INSERT INTO `permission_role_menu` VALUES (35, 1, 26); +INSERT INTO `permission_role_menu` VALUES (36, 1, 27); +INSERT INTO `permission_role_menu` VALUES (37, 1, 28); +INSERT INTO `permission_role_menu` VALUES (38, 1, 29); +INSERT INTO `permission_role_menu` VALUES (39, 1, 30); +INSERT INTO `permission_role_menu` VALUES (40, 1, 31); +INSERT INTO `permission_role_menu` VALUES (41, 1, 32); +INSERT INTO `permission_role_menu` VALUES (42, 1, 33); +INSERT INTO `permission_role_menu` VALUES (43, 1, 34); +INSERT INTO `permission_role_menu` VALUES (44, 1, 35); +INSERT INTO `permission_role_menu` VALUES (45, 1, 36); +INSERT INTO `permission_role_menu` VALUES (46, 1, 37); +INSERT INTO `permission_role_menu` VALUES (47, 1, 38); +INSERT INTO `permission_role_menu` VALUES (48, 1, 39); +INSERT INTO `permission_role_menu` VALUES (49, 1, 40); +INSERT INTO `permission_role_menu` VALUES (50, 1, 41); +INSERT INTO `permission_role_menu` VALUES (51, 1, 42); +INSERT INTO `permission_role_menu` VALUES (52, 1, 43); +INSERT INTO `permission_role_menu` VALUES (53, 1, 44); +INSERT INTO `permission_role_menu` VALUES (54, 1, 45); +INSERT INTO `permission_role_menu` VALUES (55, 1, 46); INSERT INTO `permission_role_menu` VALUES (11, 2, 1); INSERT INTO `permission_role_menu` VALUES (12, 2, 2); INSERT INTO `permission_role_menu` VALUES (13, 2, 3); diff --git a/dvadmin-backend/scripts/permission/permission_userprofile.sql b/dvadmin-backend/scripts/permission/permission_userprofile.sql index dc99b9c..48762f3 100644 --- a/dvadmin-backend/scripts/permission/permission_userprofile.sql +++ b/dvadmin-backend/scripts/permission/permission_userprofile.sql @@ -34,6 +34,7 @@ -- Records of permission_userprofile -- ---------------------------- INSERT INTO `permission_userprofile` VALUES (1, 'pbkdf2_sha256$150000$OjTMSXJgkzrE$jEQCjWbIbXwpN4k2z0o8Yvou1UQGuoJALyL/kGDZFd4=', '2021-02-27 06:20:28.214775', 1, '', '', 1, 1, '2021-02-27 06:20:09.188689', 'demo', '3704adf3-380f-4c27-a8da-60420e8cb4ab', 'demo@qq.com', NULL, NULL, '测试账号', '2', '1', 2, '2021-02-27 06:20:09.263192', '2021-02-27 09:14:30.009998', 8); +INSERT INTO `permission_userprofile` VALUES (2, 'pbkdf2_sha256$150000$5Z9LSi7LpNms$xVguE/dOEpI4D95LjSaKm0xzG7vNSopUolANr8f/6/E=', NULL, 0, '', '', 0, 1, '2021-03-03 15:38:27.009893', 'dvadmin', 'b4c5d79a-f01c-4244-92f8-b5288eca1d50', NULL, NULL, NULL, '普通用户', '2', NULL, 0, '2021-03-03 15:38:27.010771', '2021-03-03 15:38:27.086069', 8); -- ---------------------------- -- Table structure for permission_userprofile_post -- ---------------------------- @@ -52,6 +53,7 @@ INSERT INTO `permission_userprofile` VALUES (1, 'pbkdf2_sha256$150000$OjTMSXJgkz -- Records of permission_userprofile_post -- ---------------------------- INSERT INTO `permission_userprofile_post` VALUES (1, 1, 1); +INSERT INTO `permission_userprofile_post` VALUES (2, 2, 4); -- ---------------------------- -- Table structure for permission_userprofile_role @@ -71,3 +73,4 @@ INSERT INTO `permission_userprofile_post` VALUES (1, 1, 1); -- Records of permission_userprofile_role -- ---------------------------- INSERT INTO `permission_userprofile_role` VALUES (1, 1, 1); +INSERT INTO `permission_userprofile_role` VALUES (2, 2, 2); diff --git a/dvadmin-ui/.env.production b/dvadmin-ui/.env.production index 27c717e..c2c534d 100755 --- a/dvadmin-ui/.env.production +++ b/dvadmin-ui/.env.production @@ -2,4 +2,10 @@ ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = 'https://api.django-vue-admin.com' + +# 前端端口 +PORT=8080 + +# 系统名称 +VUE_APP_TITLE = 'dvAdmin管理系统' diff --git a/dvadmin-ui/src/api/system/config.js b/dvadmin-ui/src/api/system/config.js index 34d055e..fd4096f 100755 --- a/dvadmin-ui/src/api/system/config.js +++ b/dvadmin-ui/src/api/system/config.js @@ -62,7 +62,7 @@ export function clearCache() { // 导出参数 export function exportConfig(query) { return request({ - url: '/system/config/export', + url: '/system/config/export/', method: 'get', params: query }) diff --git a/dvadmin-ui/src/api/system/dict/type.js b/dvadmin-ui/src/api/system/dict/type.js index 052c4f2..cf0abf3 100755 --- a/dvadmin-ui/src/api/system/dict/type.js +++ b/dvadmin-ui/src/api/system/dict/type.js @@ -46,7 +46,7 @@ export function delType(dictId) { // 清理参数缓存 export function clearCache() { return request({ - url: '/system/dict/type/clearCache', + url: '/system/dict/type/clearCache/', method: 'delete' }) } @@ -54,7 +54,7 @@ export function clearCache() { // 导出字典类型 export function exportType(query) { return request({ - url: '/system/dict/type/export', + url: '/system/dict/type/export/', method: 'get', params: query }) diff --git a/dvadmin-ui/src/api/system/savefile.js b/dvadmin-ui/src/api/system/savefile.js index 62e5497..1eb5d91 100644 --- a/dvadmin-ui/src/api/system/savefile.js +++ b/dvadmin-ui/src/api/system/savefile.js @@ -31,6 +31,6 @@ export function delSaveFile(menuId) { export function clearSaveFile() { return request({ url: '/system/clearsavefile/', - method: 'get' + method: 'post' }) } diff --git a/dvadmin-ui/src/views/permission/dept/index.vue b/dvadmin-ui/src/views/permission/dept/index.vue index 9e7f623..d28ab0d 100755 --- a/dvadmin-ui/src/views/permission/dept/index.vue +++ b/dvadmin-ui/src/views/permission/dept/index.vue @@ -34,7 +34,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:dept:add']" + v-hasPermi="['permission:dept:post']" >新增 @@ -67,14 +67,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:dept:edit']" + v-hasPermi="['permission:dept:{id}:put']" >修改 新增 删除 diff --git a/dvadmin-ui/src/views/permission/menu/index.vue b/dvadmin-ui/src/views/permission/menu/index.vue index b9b579c..819d794 100755 --- a/dvadmin-ui/src/views/permission/menu/index.vue +++ b/dvadmin-ui/src/views/permission/menu/index.vue @@ -44,7 +44,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:menu:add']" + v-hasPermi="['permission:menus:post']" >新增 @@ -67,8 +67,8 @@ - - + + @@ -185,7 +185,7 @@ - + @@ -320,14 +320,24 @@ selected(name) { this.form.icon = name; }, + /** 接口路径变化，必须斜杠开头，不能斜杠结尾*/ + InterfacePathChange() { + if (this.form.interface_path.indexOf("/") !== 0) { + this.form.interface_path = "/" + this.form.interface_path + } + if (!this.form.interface_path.endsWith('/')) { + this.form.interface_path = this.form.interface_path + "/" + } + this.CreatePerms() + }, /** 自动生成权限标识 */ CreatePerms() { let res = this.form.interface_path + ":" + this.form.interface_method - this.form.perms = res.toLocaleLowerCase().replace(/(\/)/g,':').replace(/(::)/g,':').replace(/(^:)|(:$)/g, "") + this.form.perms = res.toLocaleLowerCase().replace(/(\/)/g, ':').replace(/(::)/g, ':').replace(/(^:)|(:$)/g, "") }, /** 组件路径变化，替换斜杠开头 */ - ComponentPathChange(){ - this.form.component_path = this.form.component_path.replace(/(^\/)/g,'') + ComponentPathChange() { + this.form.component_path = this.form.component_path.replace(/(^\/)/g, '') }, /** 查询菜单列表 */ getList() { @@ -431,7 +441,7 @@ this.$refs["form"].validate(valid => { if (valid) { const cloneData = JSON.parse(JSON.stringify(this.form)) - if (cloneData.parentId===0){ + if (cloneData.parentId === 0) { delete cloneData['parentId'] } if (this.form.id != undefined) { diff --git a/dvadmin-ui/src/views/permission/post/index.vue b/dvadmin-ui/src/views/permission/post/index.vue index 18a4a2d..3e6fdcd 100755 --- a/dvadmin-ui/src/views/permission/post/index.vue +++ b/dvadmin-ui/src/views/permission/post/index.vue @@ -43,7 +43,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:post:add']" + v-hasPermi="['permission:post:post']" >新增 @@ -54,7 +54,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:post:edit']" + v-hasPermi="['permission:post:{id}:put']" >修改 @@ -65,7 +65,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:post:remove']" + v-hasPermi="['permission:post:{id}:delete']" >删除 @@ -75,7 +75,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:post:export']" + v-hasPermi="['permission:post:export:get']" >导出 @@ -100,14 +100,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:post:edit']" + v-hasPermi="['permission:post:{id}:put']" >修改 删除 diff --git a/dvadmin-ui/src/views/permission/role/index.vue b/dvadmin-ui/src/views/permission/role/index.vue index 92cb845..51c5d50 100755 --- a/dvadmin-ui/src/views/permission/role/index.vue +++ b/dvadmin-ui/src/views/permission/role/index.vue @@ -63,7 +63,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:role:add']" + v-hasPermi="['permission:role:post']" >新增 @@ -74,7 +74,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:role:edit']" + v-hasPermi="['permission:role:{id}:put']" >修改 @@ -85,7 +85,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:role:remove']" + v-hasPermi="['permission:role:{id}:delete']" >删除 @@ -95,7 +95,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:role:export']" + v-hasPermi="['permission:role:export:get']" >导出 @@ -130,21 +130,21 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:role:edit']" + v-hasPermi="['permission:role:{id}:put']" >修改 数据权限 删除 diff --git a/dvadmin-ui/src/views/permission/user/index.vue b/dvadmin-ui/src/views/permission/user/index.vue index 2bc5fea..1baf865 100755 --- a/dvadmin-ui/src/views/permission/user/index.vue +++ b/dvadmin-ui/src/views/permission/user/index.vue @@ -90,7 +90,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:user:add']" + v-hasPermi="['permission:user:post']" >新增 @@ -101,7 +101,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:user:edit']" + v-hasPermi="['permission:user:{id}:put']" >修改 @@ -112,7 +112,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:user:remove']" + v-hasPermi="['permission:user:{id}:delete']" >删除 @@ -122,7 +122,7 @@ icon="el-icon-upload2" size="mini" @click="handleImport" - v-hasPermi="['system:user:import']" + v-hasPermi="['permission:user:import:post']" >导入 @@ -132,7 +132,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:user:export']" + v-hasPermi="['permission:user:export:get']" >导出 @@ -150,6 +150,7 @@ @@ -170,7 +171,7 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" + v-hasPermi="['permission:user:{id}:put']" >修改 删除 重置 diff --git a/dvadmin-ui/src/views/system/config/index.vue b/dvadmin-ui/src/views/system/config/index.vue index 2d6a78a..b036ceb 100755 --- a/dvadmin-ui/src/views/system/config/index.vue +++ b/dvadmin-ui/src/views/system/config/index.vue @@ -45,7 +45,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:config:add']" + v-hasPermi="['system:config:post']" >新增 @@ -56,7 +56,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:config:edit']" + v-hasPermi="['system:config:{id}:put']" >修改 @@ -67,7 +67,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:config:remove']" + v-hasPermi="['system:config:{id}:delete']" >删除 @@ -77,7 +77,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:config:export']" + v-hasPermi="['system:config:export:get']" >导出 @@ -87,7 +87,7 @@ icon="el-icon-refresh" size="mini" @click="handleClearCache" - v-hasPermi="['system:config:remove']" + v-hasPermi="['system:config:clearcache:get']" >清理缓存 @@ -114,14 +114,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:config:edit']" + v-hasPermi="['system:config:{id}:put']" >修改 删除 diff --git a/dvadmin-ui/src/views/system/dict/data.vue b/dvadmin-ui/src/views/system/dict/data.vue index 9f880ea..7a0f8b6 100755 --- a/dvadmin-ui/src/views/system/dict/data.vue +++ b/dvadmin-ui/src/views/system/dict/data.vue @@ -44,7 +44,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:dict:add']" + v-hasPermi="['system:dict:type:post']" >新增 @@ -55,7 +55,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:dict:edit']" + v-hasPermi="['system:dict:type:{id}:put']" >修改 @@ -66,7 +66,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:dict:remove']" + v-hasPermi="['system:dict:type:{id}:delete']" >删除 @@ -76,7 +76,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:dict:export']" + v-hasPermi="['system:dict:type:export:get']" >导出 @@ -110,14 +110,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:dict:edit']" + v-hasPermi="['system:dict:type:{id}:put']" >修改 删除 diff --git a/dvadmin-ui/src/views/system/dict/index.vue b/dvadmin-ui/src/views/system/dict/index.vue index 5c41356..e242593 100755 --- a/dvadmin-ui/src/views/system/dict/index.vue +++ b/dvadmin-ui/src/views/system/dict/index.vue @@ -63,7 +63,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['system:dict:add']" + v-hasPermi="['system:dict:type:post']" >新增 @@ -74,7 +74,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['system:dict:edit']" + v-hasPermi="['system:dict:type:{id}:put']" >修改 @@ -85,7 +85,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:dict:remove']" + v-hasPermi="['system:dict:type:{id}:delete']" >删除 @@ -95,7 +95,7 @@ icon="el-icon-download" size="mini" @click="handleExport" - v-hasPermi="['system:dict:export']" + v-hasPermi="['system:dict:type:export:get']" >导出 @@ -105,7 +105,7 @@ icon="el-icon-refresh" size="mini" @click="handleClearCache" - v-hasPermi="['system:dict:remove']" + v-hasPermi="['system:dict:type:clearcache:delete']" >清理缓存 @@ -136,14 +136,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['system:dict:edit']" + v-hasPermi="['system:dict:type:{id}:put']" >修改 删除 diff --git a/dvadmin-ui/src/views/system/savefile/index.vue b/dvadmin-ui/src/views/system/savefile/index.vue index 04fa2f3..b072dc4 100755 --- a/dvadmin-ui/src/views/system/savefile/index.vue +++ b/dvadmin-ui/src/views/system/savefile/index.vue @@ -35,7 +35,7 @@ icon="el-icon-upload" size="mini" @click="handleAdd" - v-hasPermi="['system:config:add']" + v-hasPermi="['system:savefile:post']" >文件上传 @@ -47,7 +47,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['system:config:remove']" + v-hasPermi="['system:savefile:{id}:delete']" >批量删除 @@ -58,7 +58,7 @@ icon="el-icon-download" size="mini" @click="handleClear" - v-hasPermi="['system:post:export']" + v-hasPermi="['system:clearsavefile:post']" >清理废弃文件 @@ -86,7 +86,7 @@ type="text" icon="el-icon-download" @click="handleDownload(scope.row)" - v-hasPermi="['system:post:edit']" + v-hasPermi="['system:clearsavefile:download:post']" >下载 删除