From cd90af7c05f76194ac167d40c8a62e0885889a4a Mon Sep 17 00:00:00 2001
From: "1147680382@qq.com" <zhu668899>
Date: Tue, 20 May 2025 17:58:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/index.js                |  9 ++++++-
 src/layout/header/components/avatar.vue |  8 ++++--
 src/views/groupManagement/index.vue     | 35 ++++++++++++++++++++-----
 src/views/login/index.vue               |  6 +++--
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/src/api/modules/index.js b/src/api/modules/index.js
index fb0ab63..16afd82 100644
--- a/src/api/modules/index.js
+++ b/src/api/modules/index.js
@@ -2,7 +2,7 @@ import service from "../request.js";
 // 登录
 export function login(authCode) {
   return service({
-    url: `/sso/login?code=${authCode}`,
+    url: `/login?code=${authCode}`,
     method: "get",
   });
 }
@@ -72,3 +72,10 @@ export function deleteGroupUser(groupId, userid) {
     method: "delete",
   });
 }
+
+export function obtainUserInformationApi(groupId, userid) {
+  return service({
+    url: `/user`,
+    method: "get",
+  });
+}
diff --git a/src/layout/header/components/avatar.vue b/src/layout/header/components/avatar.vue
index 966d4d3..1c683db 100644
--- a/src/layout/header/components/avatar.vue
+++ b/src/layout/header/components/avatar.vue
@@ -2,9 +2,11 @@
   <el-dropdown placement="bottom">
     <div class="flx-center">
       <div class="avatar">
-        <img src="../../../assets/images/avart.jpg" alt="avatar" />
+        <img :src="userInfo.avatar" alt="avatar" />
       </div>
-      <span class="username" :style="{ color: themeConfig.footColor }">BIG CUTE</span>
+      <span class="username" :style="{ color: themeConfig.footColor }">{{
+        userInfo.name
+      }}</span>
     </div>
     <template #dropdown>
       <el-dropdown-menu>
@@ -25,6 +27,8 @@ const handleClick = () => {
   // eslint-disable-next-line no-alert
   alert("button click");
 };
+const userInfo = ref(null);
+userInfo.value = JSON.parse(sessionStorage.getItem("userInfo"));
 
 const gotoLogin = () => {
   sessionStorage.removeItem("token");
diff --git a/src/views/groupManagement/index.vue b/src/views/groupManagement/index.vue
index 4b6b9be..9880ad3 100644
--- a/src/views/groupManagement/index.vue
+++ b/src/views/groupManagement/index.vue
@@ -9,7 +9,11 @@
             <el-button type="primary" @click="handleAdd">添加组别</el-button>
           </div>
         </template>
-        <el-table :data="groupList" style="width: 100%" @row-click="handleGroupSelect">
+        <el-table
+          :data="groupList"
+          style="width: 100%"
+          @row-click="handleGroupSelect"
+        >
           <el-table-column prop="groupId" label="组别ID" width="180" />
           <el-table-column prop="groupName" label="组别名称" />
           <el-table-column prop="createTime" label="创建时间">
@@ -22,7 +26,10 @@
               <el-button type="primary" link @click.stop="handleEdit(scope.row)"
                 >编辑</el-button
               >
-              <el-button type="danger" link @click.stop="handleDelete(scope.row)"
+              <el-button
+                type="danger"
+                link
+                @click.stop="handleDelete(scope.row)"
                 >删除</el-button
               >
             </template>
@@ -67,7 +74,10 @@
                 </el-table-column>
                 <el-table-column label="操作" width="100">
                   <template #default="scope">
-                    <el-button type="danger" link @click="handleRemoveUser(scope.row)"
+                    <el-button
+                      type="danger"
+                      link
+                      @click="handleRemoveUser(scope.row)"
                       >移除</el-button
                     >
                   </template>
@@ -97,7 +107,10 @@
                       <el-option label="综合部" :value="2" />
                       <el-option label="财务部" :value="3" />
                     </el-select>
-                    <el-button type="primary" link @click="handleAddUser(scope.row)"
+                    <el-button
+                      type="primary"
+                      link
+                      @click="handleAddUser(scope.row)"
                       >添加</el-button
                     >
                   </template>
@@ -118,7 +131,10 @@
     >
       <el-form :model="groupForm" label-width="80px">
         <el-form-item label="组别名称" required>
-          <el-input v-model="groupForm.groupName" placeholder="请输入组别名称" />
+          <el-input
+            v-model="groupForm.groupName"
+            placeholder="请输入组别名称"
+          />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -167,6 +183,9 @@ const fetchGroupList = async () => {
     const res = await getGroupList();
     if (res.errcode === 0) {
       groupList.value = res.result;
+      if (groupList.value && groupList.value.length) {
+        handleGroupSelect(groupList.value[0]);
+      }
     }
   } catch (error) {
     ElMessage.error("获取组别列表失败");
@@ -229,7 +248,11 @@ const handleAddUser = async (user) => {
 // 修改成员角色
 const handleRoleChange = async (user, role) => {
   try {
-    const res = await updateGroupUserRole(currentGroup.value.groupId, user.userid, role);
+    const res = await updateGroupUserRole(
+      currentGroup.value.groupId,
+      user.userid,
+      role
+    );
     if (res.errcode === 0) {
       ElMessage.success("修改成功");
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e57a9eb..e145b14 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -23,7 +23,7 @@
 import { useRouter } from "vue-router";
 import { ref } from "vue";
 // import { login, obtainUserInformationApi } from "../../api/modules/index";
-import { login } from "../../api/modules/index";
+import { login, obtainUserInformationApi } from "../../api/modules/index";
 import { ElMessage } from "element-plus";
 import dd from "dingtalk-jsapi";
 const router = useRouter();
@@ -31,6 +31,7 @@ const router = useRouter();
 // 登录
 const loginIn = async (code) => {
   let res = await login(code);
+  console.log(res);
   sessionStorage.setItem("token", res.result.token);
   ElMessage({
     message: "授权成功",
@@ -58,7 +59,7 @@ if (token) {
       dd.runtime.permission.requestAuthCode({
         corpId: "ding03f8e88dde9b426835c2f4657eb6378f", //企业id
         onSuccess: function (info) {
-          console.log(info);
+          console.log(info.code, "code");
           loginIn(info.code);
         },
       });
@@ -71,6 +72,7 @@ if (token) {
 const obInformation = async () => {
   let res = await obtainUserInformationApi();
   const userInfo = res.result;
+  console.log(userInfo, "userInfo");
   ElMessage({
     message: "获取个人信息成功",
     type: "success",