diff --git a/src/renderer/src/components/select-subject/index.vue b/src/renderer/src/components/select-subject/index.vue
index 52f306a..4c7cd97 100644
--- a/src/renderer/src/components/select-subject/index.vue
+++ b/src/renderer/src/components/select-subject/index.vue
@@ -1,5 +1,5 @@
-
import { ref, watch } from 'vue'
+import { ElMessage } from 'element-plus'
import { listEvaluation } from '@/api/subject'
import { updateUserInfo } from '@/api/system/user'
import useUserStore from '@/store/modules/user'
const userStore = useUserStore()
const { userId, userName } = userStore.user
+const { ipcRenderer } = window.electron || {}
const props = defineProps({
loginData: {
@@ -48,17 +50,11 @@ const props = defineProps({
return {}
}
},
- modelValue: {
- type: Boolean,
- default: false
- },
})
+const model = defineModel();
const subjectLoading = ref(false)
-
-// 定义要发送的emit事件
-const emit = defineEmits(['update:modelValue', 'onSuccess'])
-
+// 默认学段 前端写死 参照web AIx
const gradeList = ref([
{
label: '高中',
@@ -85,7 +81,6 @@ gradeVal.value = gradeList.value[0].value
//学科列表数据
const subjectList = ref([])
const allSubject = ref([])
-const dialogVisible = ref(false)
//切换年级
const changeGrade = ()=>{
@@ -98,8 +93,8 @@ const changeGrade = ()=>{
// 默认选中第一个学科
subjectVal.value = subjectList.value[0].itemtitle
}
-// 获取学科数据
+// 获取学科数据
const getSubject = async ()=>{
const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
// 所有学科
@@ -119,7 +114,6 @@ const editUserInfo = async () =>{
edustage: gradeVal.value,
edusubject: subjectVal.value
}
-
// 修改之后需要重新登录 查询用户信息,否则不登录 查询的用户信息是未修改之前的
// 接口如此,我也不知道为啥要这样
subjectLoading.value = true
@@ -128,14 +122,15 @@ const editUserInfo = async () =>{
await updateUserInfo(data)
await userStore.login(props.loginData)
await userStore.getInfo()
+ ElMessage.success('登录成功')
+ model.value = false
+ ipcRenderer && ipcRenderer.send('openMainWindow')
} finally {
subjectLoading.value = false
}
- emit('onSuccess')
}
-watch(() => props.modelValue, (newVal) => {
- dialogVisible.value = newVal
+watch(() => model.value, (newVal) => {
if(newVal){
getSubject()
}
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 2828429..b11d241 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -47,7 +47,7 @@
/>
-
+