Merge branch 'main' into zhuhao_dev

# Conflicts:
#	src/renderer/src/views/classManage/index.vue

src/renderer/src/views/classManage/basicGroup.vue

@@ -110,7 +110,6 @@
 import {listClassmain, listClassuser, addClassgroup, listClassgroup, delClassgroup,getClassgroup,updateClassgroup} from '@/api/classManage/index'
 import {ref, onMounted, reactive, defineProps, watch} from 'vue'
 import useUserStore from '@/store/modules/user'
-import {useRoute} from 'vue-router'
 import {ElMessage} from "element-plus";
 
 const userStore = useUserStore().user

src/renderer/src/views/classManage/classInfo.vue

@@ -9,9 +9,10 @@
       <el-descriptions :column="1">
         <el-descriptions-item label="班级名称">{{ classInfo.className }}</el-descriptions-item>
         <el-descriptions-item label="教师">
-          <template>
+          <template v-if="classInfo.teacher.length > 0">
             <el-tag type="primary" v-for="(item, index) in classInfo.teacher" :key="index">{{item.name}}</el-tag>
           </template>
+          <template v-else>暂无</template>
         </el-descriptions-item>
         <el-descriptions-item label="学生人数">{{ classInfo.student.length }}人</el-descriptions-item>
       </el-descriptions>

src/renderer/src/views/classManage/index.vue

@@ -110,7 +110,7 @@
   //学科列表
   const courseList = ref([])
   //班级id
-  const classId = ref(null)
+  const classId = ref(0)
   //当前页面
   const currentIndex = ref(0)
   //年级
@@ -265,7 +265,6 @@
   onMounted(() => {
     getClassInfo()
     nextTick(() => {
-      console.log(userStore.deptId,'123')
       viewportHeight.value = getViewportHeight()
     })
     window.addEventListener('resize', () => {

src/renderer/src/views/classManage/studentList.vue

@@ -20,6 +20,7 @@
                 />
               </div>
               <div>{{ item.name }}</div>
+              <div>{{ item.username }}</div>
             </div>
           </template>
           <template v-else>