From 71f7e4e5a159889bcf5b1a407c26b163d3eb8672 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 22 Sep 2024 10:38:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E8=B4=A6=E5=8F=B7-?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/views/login/components/Register.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/renderer/src/views/login/components/Register.vue b/src/renderer/src/views/login/components/Register.vue
index f61a870..53bc7f5 100644
--- a/src/renderer/src/views/login/components/Register.vue
+++ b/src/renderer/src/views/login/components/Register.vue
@@ -211,12 +211,6 @@ const rules = reactive({
       message: '请选择地址',
       trigger: 'change',
   },],
-  class:[ {
-      type:'array',
-      required: true,
-      message: '请选择班级',
-      trigger: 'change',
-  },],
   discipline:[ {
       type: 'array',
       required: true,

From 19a3b948c5f3e85c1b81b3c92fbf469bf52beade Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Sun, 22 Sep 2024 12:34:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=AB=A0=E8=8A=82=20?=
 =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=AB=A0=E8=8A=82id=20=EF=BC=88=E4=B8=B4?=
 =?UTF-8?q?=E6=97=B6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/choose-textbook/index.vue  | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/renderer/src/components/choose-textbook/index.vue b/src/renderer/src/components/choose-textbook/index.vue
index 2436521..b71d22d 100644
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/src/renderer/src/components/choose-textbook/index.vue
@@ -109,6 +109,19 @@ const emitChangeBook = async () => {
     },
     node: curData
   }
+  /**
+   * 临时用 后续删除 unitId
+   */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (curData.parentNode) {
+    levelFirstId = curData.parentNode.id
+    levelSecondId = curData.id
+  } else {
+    levelFirstId = curData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
   emit('changeBook', data)
 }
 
@@ -187,6 +200,21 @@ const handleNodeClick = (data, node) => {
   }
   localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
   localStorage.setItem('curNode', JSON.stringify(nodeData))
+
+  /**
+ * 临时用 后续删除 unitId
+ */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (nodeData.parentNode) {
+    levelFirstId = nodeData.parentNode.id
+    levelSecondId = nodeData.id
+  } else {
+    levelFirstId = nodeData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+
   emit('nodeClick', curData)
 
 }

From a64ba247428834ae76750ca6b913c3dfcc90fd13 Mon Sep 17 00:00:00 2001
From: yangws <1607839436@qq.com>
Date: Sun, 22 Sep 2024 12:51:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:2.0.4bug=E4=BF=AE=E6=94=B9;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/classManage/basicGroup.vue      | 10 +++----
 src/renderer/src/views/classManage/index.vue  | 11 +++----
 src/renderer/src/views/profile/index.vue      |  6 ++--
 src/renderer/src/views/profile/userInfo.vue   | 29 +++++++++++++------
 4 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/renderer/src/views/classManage/basicGroup.vue b/src/renderer/src/views/classManage/basicGroup.vue
index 148553a..879385a 100644
--- a/src/renderer/src/views/classManage/basicGroup.vue
+++ b/src/renderer/src/views/classManage/basicGroup.vue
@@ -1,10 +1,10 @@
 <template>
   <el-card style="width: 100%;height: 100%;overflow: auto">
-<!--    <template #header>-->
-<!--      <div class="card-header" style="text-align: left">-->
-<!--        <el-button type="primary" @click="addGroup">新建分组</el-button>-->
-<!--      </div>-->
-<!--    </template>-->
+    <template #header>
+      <div class="card-header" style="text-align: left">
+        <el-button type="primary" @click="addGroup">新建分组</el-button>
+      </div>
+    </template>
     <template v-if="groupList.length > 0">
       <div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
       <div class="groupList">
diff --git a/src/renderer/src/views/classManage/index.vue b/src/renderer/src/views/classManage/index.vue
index 8ef42c2..058a0f9 100644
--- a/src/renderer/src/views/classManage/index.vue
+++ b/src/renderer/src/views/classManage/index.vue
@@ -186,7 +186,8 @@
   ])
   //选择的班级
   const classids = ref('')
-
+  // 未加入的班级
+  const classesNotAMemberOf = ref([])
   // 获取班级信息
   const getClassInfo = () => {
     classList.value = []
@@ -199,13 +200,13 @@
     });
     listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
       //清除已有的班级
-      let arr = [...response.rows]
+      classesNotAMemberOf.value = [...response.rows]
       classList.value.forEach(item => {
-        const currentIndex = arr.findIndex(items => items.id === item.id)
-        if(currentIndex) arr.splice(currentIndex, 1)
+        const currentIndex = classesNotAMemberOf.value.findIndex(items => items.id === item.id)
+        if(currentIndex) classesNotAMemberOf.value.splice(currentIndex, 1)
       })
       //这里获取组装所有班级
-      gradeTree.value = groupByCondition(arr, item => item.agekey);
+      gradeTree.value = groupByCondition(classesNotAMemberOf.value, item => item.agekey);
     })
   }
   //将所有班级筛选成二级的数组
diff --git a/src/renderer/src/views/profile/index.vue b/src/renderer/src/views/profile/index.vue
index 45eaa40..32ec999 100644
--- a/src/renderer/src/views/profile/index.vue
+++ b/src/renderer/src/views/profile/index.vue
@@ -30,9 +30,9 @@
               <li class="list-group-item">
                 <div class="left-align">
                   <Message class="Message"/>
-                  <span>用户邮箱</span>
+                  <span>身份证号</span>
                 </div>
-                <div class="right-align">{{ state.user.email }}</div>
+                <div class="right-align">{{ state.user.identity }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
@@ -48,7 +48,7 @@
                   <Avatar class="Avatar"/>
                   <span>所属角色</span>
                 </div>
-                <div class="right-align">{{ state.roleGroup }}</div>
+                <div class="right-align">{{ state.roleGroup || '教师' }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
diff --git a/src/renderer/src/views/profile/userInfo.vue b/src/renderer/src/views/profile/userInfo.vue
index 18e7dc5..708da12 100644
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/src/renderer/src/views/profile/userInfo.vue
@@ -6,10 +6,10 @@
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="user.email" maxlength="50" />
+    <el-form-item label="身份证号" prop="identity">
+      <el-input v-model="user.identity" maxlength="50" />
     </el-form-item>
-    <el-form-item label="性别">
+    <el-form-item label="性别" style="display: none">
       <el-radio-group v-model="user.sex">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
@@ -18,8 +18,8 @@
     <el-form-item label="学段">
       <el-radio-group v-model="user.edustage" @change="semeterChange">
         <template v-for="(item,index) in semesterList" :key="index">
-          <el-radio :value="item.title">
-            {{item.title }}
+          <el-radio :value="item.label">
+            {{item.label }}
           </el-radio>
         </template>
       </el-radio-group>
@@ -42,6 +42,7 @@
  <script setup>
 import { ref, getCurrentInstance,onMounted } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
+import {getDept } from '@/api/login'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
@@ -60,21 +61,30 @@ const userStore = useUserStore()
 const semesterList = ref([
   {
     id:1,
-    title:'幼儿园'
+    label:'幼儿园'
   },
   {
     id:2,
-    title:'小学'
+    label:'小学'
   },
   {
     id:3,
-    title:'初中'
+    label:'初中'
   },
   {
     id:4,
-    title:'高中'
+    label:'高中'
   },
 ])
+// 获取学校所存在的学段
+
+const getTheSection = () => {
+  getDept({deptId:userStore.user.deptId}).then(res => {
+    //获取该学校可以选择的学科
+    const arr = res.data.studying.split(',')
+    semesterList.value = semesterList.value.filter(items => {return arr.includes(items.label)}).map(item => item)
+  })
+}
 
 const rules = ref({
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -159,5 +169,6 @@ const semeterChange = (item) => {
 }
 onMounted(() => {
   getSubject()
+  getTheSection()
 })
 </script>