diff --git a/README.md b/README.md index 67777b3..4bd47b9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Django-Vue-Admin -[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE) [![img](https://img.shields.io/pypi/v/django-simpleui.svg)](https://pypi.org/project/django-simpleui/#history) [![img](https://img.shields.io/badge/python-%3E=3.6.x-green.svg)](https://python.org/) ![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-2.2-blue)![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen) +[![img](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitee.com/liqianglog/django-vue-admin/blob/master/LICENSE) [![img](https://img.shields.io/badge/python-%3E=3.6.x-green.svg)](https://python.org/) ![PyPI - Django Version badge](https://img.shields.io/badge/django%20versions-2.2-blue)![img](https://img.shields.io/badge/node-%3E%3D%2012.0.0-brightgreen) ![img](https://gitee.com/liqianglog/django-vue-admin/badge/star.svg?theme=dark) @@ -47,12 +47,13 @@ github地址：[https://github.com/liqianglog/django-vue-admin](https://github.c 13. 在线用户：当前系统中活跃用户状态监控、用户强退功能。 14. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 15. 在线构建器：拖动表单元素生成相应的HTML代码。 +16. 服务监控：进行可视化的服务器监控，CPU、内存、文件使用率等信息。 ## 在线体验 -演示地址：[http://demo.django-vue-admin.com/](http://demo.django-vue-admin.com/) 账号：admin 密码：123456 +演示地址：[http://demo.django-vue-admin.com](http://demo.django-vue-admin.com) 账号：admin 密码：123456 -文档地址：[http://django-vue-admin.com/](http://django-vue-admin.com/) +文档地址：[http://django-vue-admin.com](http://django-vue-admin.com) ## 前端 @@ -92,9 +93,8 @@ npm run build:prod 2. 在项目根目录中，复制 ./conf/env.example.py 文件为一份新的到 ./conf 文件夹下，并重命名为 env.py 3. 在 env.py 中配置数据库信息 - mysql数据库版本建议:5.7以上 + mysql数据库版本建议：8.0 mysql数据库字符集：utf8mb4 - mysql数据库排序规则：utf8mb4_0900_ai_ci 4. 安装依赖环境 pip3 install -r requirements.txt @@ -138,31 +138,40 @@ exit - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + + + + +
+ diff --git a/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql b/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql index 34db389..f9a35da 100644 --- a/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql +++ b/dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql @@ -126,5 +126,4 @@ INSERT INTO `permission_menu` (id, description, modifier, update_datetime, creat INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (94, '', 'admin', '2021-04-27 23:58:44.705142', '2021-04-27 23:58:13.384483', '2', NULL, '修改服务器信息', 2, '1', NULL, NULL, '/admin/monitor/server/{id}/', 'PUT', 'admin:monitor:server:{id}:put', '1', '1', '1', 1, 92, '1'); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (95, '', 'admin', '2021-04-27 23:59:29.530633', '2021-04-27 23:59:07.744938', '2', NULL, '修改监控信息', 3, '1', NULL, NULL, '/admin/monitor/monitor/enabled/', 'GET', 'admin:monitor:monitor:enabled:get', '1', '1', '1', 1, 92, '1'); INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (96, '', 'admin', '2021-04-28 00:01:15.071889', '2021-04-27 23:59:48.612905', '2', NULL, '清空监控记录', 4, '1', NULL, NULL, '/admin/monitor/monitor/clean/', 'GET', 'admin:monitor:monitor:clean:get', '1', '1', '1', 1, 92, '1'); -INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (97, '', 'admin', '2021-05-02 19:12:06.813143', '2021-05-02 18:58:06.260280', '0', 'dashboard', '首页', 0, '1', '/home', NULL, NULL, 'GET', NULL, '1', '1', '1', 1, NULL, '1'); -INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (98, '', 'admin', '2021-05-02 19:10:34.233070', '2021-05-02 19:10:34.233125', '0', 'dashboard', '首页', 1, '1', 'index', 'index', NULL, 'GET', NULL, '1', '1', '1', 1, 97, '1'); +INSERT INTO `permission_menu` (id, description, modifier, update_datetime, create_datetime, menuType, icon, name, orderNum, isFrame, web_path, component_path, interface_path, interface_method, perms, status, visible, isCache, creator_id, parentId_id, dept_belong_id) VALUES (97, '', 'admin', '2021-05-02 19:12:06.813143', '2021-05-02 18:58:06.260280', '0', 'dashboard', '首页', 0, '1', '/index', 'Layout/index', NULL, 'GET', NULL, '1', '1', '1', 1, NULL, '1'); diff --git a/dvadmin-ui/package.json b/dvadmin-ui/package.json index f27a1ff..8b89ac3 100755 --- a/dvadmin-ui/package.json +++ b/dvadmin-ui/package.json @@ -1,6 +1,6 @@ { - "name": "ruoyi", - "version": "3.3.0", + "name": "dvadmin", + "version": "1.1.0", "description": "dvAdmin管理系统", "author": "dvAdmin", "license": "MIT", diff --git a/dvadmin-ui/src/assets/images/collection_code.jpg b/dvadmin-ui/src/assets/images/collection_code.jpg new file mode 100644 index 0000000..4bca8fe Binary files /dev/null and b/dvadmin-ui/src/assets/images/collection_code.jpg differ diff --git a/dvadmin-ui/src/assets/images/login-background.jpg b/dvadmin-ui/src/assets/images/login-background.jpg old mode 100755 new mode 100644 index 8a89eb8..ba7a62c Binary files a/dvadmin-ui/src/assets/images/login-background.jpg and b/dvadmin-ui/src/assets/images/login-background.jpg differ diff --git a/dvadmin-ui/src/components/Breadcrumb/index.vue b/dvadmin-ui/src/components/Breadcrumb/index.vue index b313fdd..2e0c775 100755 --- a/dvadmin-ui/src/components/Breadcrumb/index.vue +++ b/dvadmin-ui/src/components/Breadcrumb/index.vue @@ -35,7 +35,7 @@ export default { const first = matched[0] if (!this.isDashboard(first)) { - matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched) + // matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched) } this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false) diff --git a/dvadmin-ui/src/components/RuoYi/Doc/index.vue b/dvadmin-ui/src/components/RuoYi/Doc/index.vue index a6187f3..bf2679d 100755 --- a/dvadmin-ui/src/components/RuoYi/Doc/index.vue +++ b/dvadmin-ui/src/components/RuoYi/Doc/index.vue @@ -9,7 +9,7 @@ export default { name: 'RuoYiDoc', data() { return { - url: 'http://doc.ruoyi.vip/ruoyi-vue' + url: 'http://django-vue-admin.com' } }, methods: { @@ -18,4 +18,4 @@ export default { } } } - \ No newline at end of file + diff --git a/dvadmin-ui/src/layout/components/Navbar.vue b/dvadmin-ui/src/layout/components/Navbar.vue index 5990cd6..76e7800 100755 --- a/dvadmin-ui/src/layout/components/Navbar.vue +++ b/dvadmin-ui/src/layout/components/Navbar.vue @@ -109,7 +109,7 @@ export default { type: "warning", }).then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/home/index"; + location.href = "/index"; }); }); }, diff --git a/dvadmin-ui/src/router/index.js b/dvadmin-ui/src/router/index.js index c58ed4a..c1d3a3b 100755 --- a/dvadmin-ui/src/router/index.js +++ b/dvadmin-ui/src/router/index.js @@ -56,7 +56,7 @@ export const constantRoutes = [ { path: '', component: Layout, - redirect: '/home/index', + redirect: '/index', children: [ // { // path: 'index', diff --git a/dvadmin-ui/src/store/modules/permission.js b/dvadmin-ui/src/store/modules/permission.js index 59f55e4..16395e2 100755 --- a/dvadmin-ui/src/store/modules/permission.js +++ b/dvadmin-ui/src/store/modules/permission.js @@ -52,6 +52,21 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) { route.component = Layout } else if (route.component === 'ParentView') { route.component = ParentView + } else if (typeof route.component === "string" && route.component === 'Layout/index' && !route.children) { // 首页定制 + route.meta.affix = true + route.children = [ + { + path: 'index', + component: 'index', + name: route.name, + meta: route.meta + } + ] + route.path = '' + route.name = '' + route.redirect = '/index' + route.alwaysShow = false + route.component = Layout } else { route.component = loadView(route.component) } diff --git a/dvadmin-ui/src/views/home_index.vue b/dvadmin-ui/src/views/home_index.vue new file mode 100755 index 0000000..d591c99 --- /dev/null +++ b/dvadmin-ui/src/views/home_index.vue @@ -0,0 +1,102 @@ + + + + + diff --git a/dvadmin-ui/src/views/index.vue b/dvadmin-ui/src/views/index.vue index 5a93fb0..9111823 100755 --- a/dvadmin-ui/src/views/index.vue +++ b/dvadmin-ui/src/views/index.vue @@ -1,41 +1,51 @@ diff --git a/dvadmin-ui/src/views/login.vue b/dvadmin-ui/src/views/login.vue index 22b2714..c2278fc 100755 --- a/dvadmin-ui/src/views/login.vue +++ b/dvadmin-ui/src/views/login.vue @@ -48,7 +48,10 @@
- Copyright © 2018-2021 ruoyi.vip All Rights Reserved. + Copyright © 2018-2021 django-vue-admin.com All Rights Reserved. | + 晋ICP备18005113号-3