From ef4bfde4a8d43e012ade7c3e8946f4c121fc578d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 22 十一月 2021 18:06:44 +0800
Subject: [PATCH] 优化提示信息
---
ruoyi-ui/src/views/system/dict/data.vue | 2
ruoyi-ui/src/views/system/role/selectUser.vue | 4 ++
ruoyi-ui/src/views/system/user/profile/resetPwd.vue | 9 +---
ruoyi-ui/src/views/system/role/index.vue | 3 -
ruoyi-ui/src/views/system/menu/index.vue | 35 +++++++++--------
ruoyi-ui/src/views/system/user/index.vue | 3 -
ruoyi-ui/src/views/system/dept/index.vue | 6 +--
ruoyi-ui/src/views/monitor/operlog/index.vue | 4 +-
ruoyi-ui/src/components/RightToolbar/index.vue | 2
ruoyi-ui/src/views/login.vue | 8 +++-
ruoyi-ui/src/plugins/tab.js | 4 -
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java | 2
ruoyi-ui/src/api/monitor/server.js | 2
ruoyi-ui/src/views/system/user/profile/userAvatar.vue | 4 +-
ruoyi-ui/src/views/monitor/logininfor/index.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 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 @@
},
// 鍙充晶鍒楄〃鍏冪礌鍙樺寲
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 @@
path: '/redirect' + path
})
})
-
-
},
// 鍏抽棴褰撳墠tab椤电锛屾墦寮�鏂伴〉绛�
closeOpenPage(obj) {
@@ -56,7 +54,7 @@
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 @@
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">鑻ヤ緷鍚庡彴绠＄悊绯荤粺</h3>
<el-form-item prop="username">
- <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
+ <el-input
+ v-model="loginForm.username"
+ type="text"
+ auto-complete="off"
+ placeholder="璐﹀彿"
+ >
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -66,7 +71,6 @@
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"
/>
</el-form-item>
@@ -16,8 +16,8 @@
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
+ size="small"
style="width: 240px;"
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
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"
/>
</el-form-item>
@@ -16,8 +16,8 @@
v-model="queryParams.operName"
placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
clearable
- style="width: 240px;"
size="small"
+ style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
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 @@
isExpandAll: true,
// 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
refreshTable: true,
- // 鏄惁灞曞紑
- expand: false,
// 鏌ヨ鍙傛暟
queryParams: {
deptName: undefined,
@@ -276,7 +274,7 @@
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 @@
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 @@
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 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button size="mini"
+ <el-button
+ size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
@@ -126,8 +127,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item v-if="form.menuType != 'F'" label="鑿滃崟鍥炬爣">
+ <el-col :span="24" v-if="form.menuType != 'F'">
+ <el-form-item label="鑿滃崟鍥炬爣">
<el-popover
placement="bottom-start"
width="460"
@@ -158,8 +159,8 @@
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鏄閾惧垯璺敱鍦板潃闇�瑕佷互`http(s)://`寮�澶�" placement="top">
<i class="el-icon-question"></i>
@@ -172,8 +173,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'" prop="path">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item prop="path">
<span slot="label">
<el-tooltip content="璁块棶鐨勮矾鐢卞湴鍧�锛屽锛歚user`锛屽澶栫綉鍦板潃闇�鍐呴摼璁块棶鍒欎互`http(s)://`寮�澶�" placement="top">
<i class="el-icon-question"></i>
@@ -194,8 +195,8 @@
<el-input v-model="form.component" placeholder="璇疯緭鍏ョ粍浠惰矾寰�" />
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'M'">
+ <el-col :span="12" v-if="form.menuType != 'M'">
+ <el-form-item>
<el-input v-model="form.perms" placeholder="璇疯緭鍏ユ潈闄愭爣璇�" maxlength="100" />
<span slot="label">
<el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasPermi('system:user:list')`)" placement="top">
@@ -205,8 +206,8 @@
</span>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType == 'C'">
+ <el-col :span="12" v-if="form.menuType == 'C'">
+ <el-form-item>
<el-input v-model="form.query" placeholder="璇疯緭鍏ヨ矾鐢卞弬鏁�" maxlength="255" />
<span slot="label">
<el-tooltip content='璁块棶璺敱鐨勯粯璁や紶閫掑弬鏁帮紝濡傦細`{"id": 1, "name": "ry"}`' placement="top">
@@ -216,8 +217,8 @@
</span>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType == 'C'">
+ <el-col :span="12" v-if="form.menuType == 'C'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鏄垯浼氳`keep-alive`缂撳瓨锛岄渶瑕佸尮閰嶇粍浠剁殑`name`鍜屽湴鍧�淇濇寔涓�鑷�" placement="top">
<i class="el-icon-question"></i>
@@ -230,8 +231,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨闅愯棌鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼絾浠嶇劧鍙互璁块棶" placement="top">
<i class="el-icon-question"></i>
@@ -247,8 +248,8 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item v-if="form.menuType != 'F'">
+ <el-col :span="12" v-if="form.menuType != 'F'">
+ <el-form-item>
<span slot="label">
<el-tooltip content="閫夋嫨鍋滅敤鍒欒矾鐢卞皢涓嶄細鍑虹幇鍦ㄤ晶杈规爮锛屼篃涓嶈兘琚闂�" placement="top">
<i class="el-icon-question"></i>
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index b2cfd6b..5b99d17 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -355,8 +355,7 @@
/** 鏌ヨ瑙掕壊鍒楄〃 */
getList() {
this.loading = true;
- listRole(this.addDateRange(this.queryParams, this.dateRange)).then(
- response => {
+ listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.roleList = response.rows;
this.total = response.total;
this.loading = false;
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index a9e2ce0..02610d8 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -123,6 +123,10 @@
handleSelectUser() {
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
+ if (userIds == "") {
+ this.$modal.msgError("璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛");
+ return;
+ }
authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2b7283f..3525c9b 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -206,7 +206,7 @@
</el-col>
</el-row>
- <!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
@@ -652,7 +652,6 @@
/** 涓嬭浇妯℃澘鎿嶄綔 */
importTemplate() {
this.download('system/user/importTemplate', {
- ...this.queryParams
}, `user_template_${new Date().getTime()}.xlsx`)
},
// 鏂囦欢涓婁紶涓鐞�
diff --git a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
index 3437abc..06715e5 100644
--- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -29,7 +29,6 @@
}
};
return {
- test: "1test",
user: {
oldPassword: undefined,
newPassword: undefined,
@@ -55,11 +54,9 @@
submit() {
this.$refs["form"].validate(valid => {
if (valid) {
- updateUserPwd(this.user.oldPassword, this.user.newPassword).then(
- response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- }
- );
+ updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ });
}
});
},
diff --git a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
index 402d9cc..63903a7 100644
--- a/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+++ b/ruoyi-ui/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="鐐瑰嚮涓婁紶澶村儚" class="img-circle img-lg" /></div>
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog()">
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper
@@ -140,7 +140,7 @@
// 鍏抽棴绐楀彛
closeDialog() {
this.options.img = store.getters.avatar
- this.visible = false;
+ this.visible = false;
}
}
};
--
Gitblit v1.9.3