Merge branch 'main' into lyc-dev

Reviewed-on: #12

src/renderer/src/views/profile/components/selectClass.vue

@@ -27,7 +27,7 @@
             <template #dropdown>
                 <el-dropdown-menu>
                 <template v-for="(item, index) in subjectList">
-                    <el-dropdown-item :command="item.itemtitle">{{
+                    <el-dropdown-item v-if="item.edustage == userStore.edustage" :command="item.itemtitle">{{
                     item.itemtitle }}</el-dropdown-item>
                 </template>
                 </el-dropdown-menu>
@@ -51,18 +51,24 @@ const getSubject = () => {
   listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
     const arr = userStore.subject.split(',')
     subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
+    console.log(subjectList,'subjectList');
+    
   })
 }
 // 选择学段
 const handleUserEduStage = (item) => {
     userStore.edustage = item
+    if(item === '幼儿园'){
+        // 默认语文
+        userStore.edusubject = '语文'
+    }
 }
+// 选择学科
 const handleUserEduSubject = (item) => {
     userStore.edusubject = item
 }
 onMounted(() => {
     getSubject()
-    console.log(userStore,'123')
 })
 </script>
 <style scoped>