From ef4bfde4a8d43e012ade7c3e8946f4c121fc578d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 22 Nov 2021 18:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/quartz/config/ScheduleConfig.java | 2 +- ruoyi-ui/src/api/monitor/server.js | 2 +- .../src/components/RightToolbar/index.vue | 2 +- ruoyi-ui/src/plugins/tab.js | 4 +-- ruoyi-ui/src/views/login.vue | 8 +++-- .../src/views/monitor/logininfor/index.vue | 4 +-- ruoyi-ui/src/views/monitor/operlog/index.vue | 4 +-- ruoyi-ui/src/views/system/dept/index.vue | 6 ++-- ruoyi-ui/src/views/system/dict/data.vue | 2 +- ruoyi-ui/src/views/system/menu/index.vue | 35 ++++++++++--------- ruoyi-ui/src/views/system/role/index.vue | 3 +- ruoyi-ui/src/views/system/role/selectUser.vue | 4 +++ ruoyi-ui/src/views/system/user/index.vue | 3 +- .../views/system/user/profile/resetPwd.vue | 9 ++--- .../views/system/user/profile/userAvatar.vue | 4 +-- 15 files changed, 46 insertions(+), 46 deletions(-) diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java index e466ed0..e35eb26 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java @@ -7,7 +7,7 @@ import javax.sql.DataSource; import java.util.Properties; /** - * 定时任务配置 + * 定时任务配置(单机部署建议删除此类和qrtz数据库表,默认走内存会最高效) * * @author ruoyi */ diff --git a/ruoyi-ui/src/api/monitor/server.js b/ruoyi-ui/src/api/monitor/server.js index 4991a44..cac7791 100644 --- a/ruoyi-ui/src/api/monitor/server.js +++ b/ruoyi-ui/src/api/monitor/server.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询服务器详细 +// 获取服务信息 export function getServer() { return request({ url: '/monitor/server', diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue index c7ab139..976974e 100644 --- a/ruoyi-ui/src/components/RightToolbar/index.vue +++ b/ruoyi-ui/src/components/RightToolbar/index.vue @@ -62,7 +62,7 @@ export default { }, // 右侧列表元素变化 dataChange(data) { - for (var item in this.columns) { + for (let item in this.columns) { const key = this.columns[item].key; this.columns[item].visible = !data.includes(key); } diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js index f2d7b22..95a3848 100644 --- a/ruoyi-ui/src/plugins/tab.js +++ b/ruoyi-ui/src/plugins/tab.js @@ -20,8 +20,6 @@ export default { path: '/redirect' + path }) }) - - }, // 关闭当前tab页签,打开新页签 closeOpenPage(obj) { @@ -56,7 +54,7 @@ export default { return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute); }, // 添加tab页签 - addPage(title, url) { + openPage(title, url) { var obj = { path: url, meta: { title: title } } store.dispatch('tagsView/addView', obj); return router.push(url); diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue index 255eafc..3baaf24 100644 --- a/ruoyi-ui/src/views/login.vue +++ b/ruoyi-ui/src/views/login.vue @@ -3,7 +3,12 @@

若依后台管理系统

- + @@ -66,7 +71,6 @@ export default { data() { return { codeUrl: "", - cookiePassword: "", loginForm: { username: "admin", password: "admin123", diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue index 0f4ecbb..98bd743 100644 --- a/ruoyi-ui/src/views/monitor/logininfor/index.vue +++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue @@ -6,8 +6,8 @@ v-model="queryParams.ipaddr" placeholder="请输入登录地址" clearable + size="small" style="width: 240px;" - size="small" @keyup.enter.native="handleQuery" /> @@ -16,8 +16,8 @@ v-model="queryParams.userName" placeholder="请输入用户名称" clearable + size="small" style="width: 240px;" - size="small" @keyup.enter.native="handleQuery" /> diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue index 28f705b..9b8b785 100644 --- a/ruoyi-ui/src/views/monitor/operlog/index.vue +++ b/ruoyi-ui/src/views/monitor/operlog/index.vue @@ -6,8 +6,8 @@ v-model="queryParams.title" placeholder="请输入系统模块" clearable - style="width: 240px;" size="small" + style="width: 240px;" @keyup.enter.native="handleQuery" /> @@ -16,8 +16,8 @@ v-model="queryParams.operName" placeholder="请输入操作人员" clearable - style="width: 240px;" size="small" + style="width: 240px;" @keyup.enter.native="handleQuery" /> diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue index f9c7741..e215b1c 100644 --- a/ruoyi-ui/src/views/system/dept/index.vue +++ b/ruoyi-ui/src/views/system/dept/index.vue @@ -179,8 +179,6 @@ export default { isExpandAll: true, // 重新渲染表格状态 refreshTable: true, - // 是否展开 - expand: false, // 查询参数 queryParams: { deptName: undefined, @@ -276,7 +274,7 @@ export default { this.open = true; this.title = "添加部门"; listDept().then(response => { - this.deptOptions = this.handleTree(response.data, "deptId"); + this.deptOptions = this.handleTree(response.data, "deptId"); }); }, /** 展开/折叠操作 */ @@ -296,7 +294,7 @@ export default { this.title = "修改部门"; }); listDeptExcludeChild(row.deptId).then(response => { - this.deptOptions = this.handleTree(response.data, "deptId"); + this.deptOptions = this.handleTree(response.data, "deptId"); }); }, /** 提交按钮 */ diff --git a/ruoyi-ui/src/views/system/dict/data.vue b/ruoyi-ui/src/views/system/dict/data.vue index aa878bd..c08c28a 100644 --- a/ruoyi-ui/src/views/system/dict/data.vue +++ b/ruoyi-ui/src/views/system/dict/data.vue @@ -325,7 +325,7 @@ export default { this.queryParams.pageNum = 1; this.getList(); }, - // 返回按钮 + /** 返回按钮操作 */ handleClose() { const obj = { path: "/system/dict" }; this.$tab.closeOpenPage(obj); diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index a89e1ee..d65773a 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -78,7 +78,8 @@