From ec3eae7baee563710ba8dc404a5a15497b796c8a Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Thu, 16 Nov 2023 10:24:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=88=86=E9=85=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E5=89=8D=E5=8F=B0=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/user/authRole.vue   | 44 +++++++------------
 .../src/views/system/user/profile/index.vue   |  2 +-
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/authRole.vue b/ruoyi-ui/src/views/system/user/authRole.vue
index cdb45e6..e769080 100644
--- a/ruoyi-ui/src/views/system/user/authRole.vue
+++ b/ruoyi-ui/src/views/system/user/authRole.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <h4 class="form-header h4">基本信息</h4>
-    <el-form ref="form" :model="form" label-width="80px">
+    <el-form :model="form" label-width="80px">
       <el-row>
         <el-col :span="8" :offset="2">
           <el-form-item label="用户昵称" prop="nickName">
@@ -47,7 +47,6 @@
 
 <script setup>
 import { getAuthRole, updateAuthRole } from "@/api/system/user";
-import {getCurrentInstance, reactive, ref, toRefs} from "vue";
 import {useRoute} from "vue-router";
 const route = useRoute();
 const { proxy } = getCurrentInstance();
@@ -64,16 +63,6 @@ const form = ref({
   userId: undefined
 });
 
-// const data = reactive({
-//   form: {
-//     nickName: undefined,
-//     userName: undefined,
-//     userId: undefined
-//   }});
-//
-// const {  form } = toRefs(data);
-
-
 /** 单击选中行数据 */
 function clickRow(row) {
   proxy.$refs["roleRef"].toggleRowSelection(row);
@@ -93,7 +82,6 @@ function close() {
 }
 /** 提交按钮 */
 function submitForm() {
-  //console.log("form.value.userId="+form.value.userId)
   const userId = form.value.userId;
   const rIds = roleIds.value.join(",");
   updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
@@ -102,27 +90,25 @@ function submitForm() {
   });
 }
 
-(() => {
+const getList = async () => {
   const userId = route.params && route.params.userId;
   if (userId) {
     loading.value = true;
-    getAuthRole(userId).then(response => {
-      Object.assign(form.value, response.user);
-      Object.assign(roles.value, response.roles);
-      //form.value = response.user;
-      //console.log("form.value.userName ="+form.value.userName );
-     // roles.value = response.roles;
-      total.value = roles.value.length;
-      nextTick(() => {
-        roles.value.forEach(row => {
-          if (row.flag) {
-            proxy.$refs["roleRef"].toggleRowSelection(row);
-          }
-        });
+    const res = await getAuthRole(userId);
+    form.value=res.data.user;
+    roles.value=res.data.roles;
+    total.value = roles.value.length;
+    await nextTick(() => {
+      roles.value.forEach(row => {
+        if (row?.flag) {
+          proxy.$refs["roleRef"].toggleRowSelection(row);
+        }
       });
-      loading.value = false;
     });
+    loading.value = false;
   }
-})();
+};
+
+getList();
 
 </script>
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index d52fddb..378e005 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -85,7 +85,7 @@ function getUser() {
     state.roleGroup = response.data.roleGroup;
     state.postGroup = response.data.postGroup;
   });
-};
+}
 
 getUser();
 </script>