From 6fe80cff6b3dcd990108c8bd5a1ca642842f8977 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 01 十月 2022 23:26:18 +0800
Subject: [PATCH] fix 修复开启账号同端互斥登录 被顶掉后登出报null异常问题

---
 ruoyi-ui/src/views/system/user/index.vue |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 0eb8ddc..72bb942 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -21,19 +21,19 @@
             :filter-node-method="filterNode"
             ref="tree"
             default-expand-all
+            highlight-current
             @node-click="handleNodeClick"
           />
         </div>
       </el-col>
       <!--鐢ㄦ埛鏁版嵁-->
       <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
             <el-input
               v-model="queryParams.userName"
               placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
               clearable
-              size="small"
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
@@ -43,7 +43,6 @@
               v-model="queryParams.phonenumber"
               placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
               clearable
-              size="small"
               style="width: 240px"
               @keyup.enter.native="handleQuery"
             />
@@ -53,7 +52,6 @@
               v-model="queryParams.status"
               placeholder="鐢ㄦ埛鐘舵��"
               clearable
-              size="small"
               style="width: 240px"
             >
               <el-option
@@ -67,7 +65,6 @@
           <el-form-item label="鍒涘缓鏃堕棿">
             <el-date-picker
               v-model="dateRange"
-              size="small"
               style="width: 240px"
               value-format="yyyy-MM-dd"
               type="daterange"
@@ -248,7 +245,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="鐢ㄦ埛鎬у埆">
-              <el-select v-model="form.sex" placeholder="璇烽�夋嫨">
+              <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
                 <el-option
                   v-for="dict in dict.type.sys_user_sex"
                   :key="dict.value"
@@ -273,7 +270,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="宀椾綅">
-              <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨">
+              <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨宀椾綅">
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -286,7 +283,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="瑙掕壊">
-              <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨">
+              <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -345,9 +342,8 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -443,7 +439,7 @@
         email: [
           {
             type: "email",
-            message: "'璇疯緭鍏ユ纭殑閭鍦板潃",
+            message: "璇疯緭鍏ユ纭殑閭鍦板潃",
             trigger: ["blur", "change"]
           }
         ],
@@ -465,7 +461,7 @@
   },
   created() {
     this.getList();
-    this.getTreeselect();
+    this.getDeptTree();
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
@@ -482,8 +478,8 @@
       );
     },
     /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
-    getTreeselect() {
-      treeselect().then(response => {
+    getDeptTree() {
+      deptTreeSelect().then(response => {
         this.deptOptions = response.data;
       });
     },
@@ -495,7 +491,7 @@
     // 鑺傜偣鍗曞嚮浜嬩欢
     handleNodeClick(data) {
       this.queryParams.deptId = data.id;
-      this.getList();
+      this.handleQuery();
     },
     // 鐢ㄦ埛鐘舵�佷慨鏀�
     handleStatusChange(row) {
@@ -564,7 +560,6 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.reset();
-      this.getTreeselect();
       getUser().then(response => {
         this.postOptions = response.data.posts;
         this.roleOptions = response.data.roles;
@@ -576,7 +571,6 @@
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.reset();
-      this.getTreeselect();
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data.user;

--
Gitblit v1.9.3