From 9a6f37528c119f25285e2846a8910b1e626b44c6 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Tue, 6 Aug 2024 15:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/select-subject/index.vue   | 26 ++++++++++++++++---
 src/renderer/src/views/login/index.vue        |  5 ++--
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/components/select-subject/index.vue b/src/renderer/src/components/select-subject/index.vue
index 9071092..bec856c 100644
--- a/src/renderer/src/components/select-subject/index.vue
+++ b/src/renderer/src/components/select-subject/index.vue
@@ -23,7 +23,7 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button type="primary" @click="editUserInfo">
+        <el-button type="primary" @click="editUserInfo" :loading="subjectLoading">
           确定
         </el-button>
       </div>
@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, watch } from 'vue'
+import { ref, watch } from 'vue'
 import { listEvaluation } from '@/api/subject'
 import { updateUserInfo } from '@/api/system/user'
 import useUserStore from '@/store/modules/user'
@@ -42,12 +42,20 @@ const userStore = useUserStore()
 const { userId, userName } = userStore.user
 
 const props = defineProps({
+  loginData: {
+    type: Object,
+    default(){
+      return {}
+    }
+  },
   modelValue: {
     type: Boolean,
     default: false
   },
 })
 
+const subjectLoading = ref(false)
+
 // 定义要发送的emit事件
 const emit = defineEmits(['update:modelValue', 'onSuccess'])
 
@@ -111,8 +119,18 @@ const editUserInfo = async () =>{
     edustage: gradeVal.value,
     edusubject:  subjectVal.value
   }
-  await updateUserInfo(data)
-  await userStore.getInfo()
+
+  // 修改之后需要重新登录 查询用户信息，否则不登录 查询的用户信息是未修改之前的
+  // 接口如此，我也不知道为啥要这样
+  subjectLoading.value = true
+  try {
+    //修改用户信息
+    await updateUserInfo(data)
+    await userStore.login(props.loginData)
+    await userStore.getInfo()
+  } finally {
+    subjectLoading.value = false
+  }
   emit('onSuccess')
 }
 
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 8b8df3d..5d98726 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -24,7 +24,7 @@
     </div>
   </div>
   <!--选择学科-->
-  <SelectSubject v-model="isSubject" @onSuccess="successEditSubject" />
+  <SelectSubject v-model="isSubject" :loginData="loginForm" @onSuccess="successEditSubject"/>
 </template>
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
@@ -35,7 +35,7 @@ import leftBg2 from '@/assets/images/login/left-bg2.png'
 import WindowTools from '@/components/window-tools/index.vue'
 import SelectSubject from '@/components/select-subject/index.vue'
 
-const { BrowserWindow, session } = require('@electron/remote')
+const { session } = require('@electron/remote')
 
 const { ipcRenderer } = window.electron || {}
 const formRef = ref()
@@ -48,6 +48,7 @@ const loginForm = reactive({
   password: '',
   rememberMe: false
 })
+
 //表单规则
 const rules = reactive({
   username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],