diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index c12876d..78bf408 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -174,7 +174,7 @@
.list-group-item {
border-bottom: 1px solid #e7eaec;
- border-top: 1px solid #e7eaec;
+ // border-top: 1px solid #e7eaec;
margin-bottom: -1px;
padding: 11px 0px;
font-size: 13px;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 8bbab70..f9d72d4 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -359,7 +359,7 @@ export default {
getDept(row.deptId).then(response => {
this.form = response.data
this.open = true
- this.title = this.$t('page.system.dept.modifyDept')
+ this.title = readonly? this.$t('form.detail'): this.$t('page.system.dept.modifyDept')
listDeptExcludeChild(row.deptId).then(response => {
this.deptOptions = this.handleTree(response.data, "deptId")
if (this.deptOptions.length == 0) {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 275b5ac..9e8ecf8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -229,7 +229,7 @@
-
+
-
用户名称
@@ -45,9 +45,9 @@
基本资料
-
+
@@ -72,7 +72,7 @@ export default {
user: {},
roleGroup: {},
postGroup: {},
- selectedTab: "userinfo"
+ selectedTab: "resetPwd"
}
},
created() {
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index 2614e31..399783c 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -57,6 +57,9 @@ export default {
if (valid) {
updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
this.$modal.msgSuccess("修改成功")
+ this.$store.dispatch('LogOut').then(() => {
+ location.href = '/'
+ })
})
}
})