Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk

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

@@ -1,5 +1,5 @@
 <template>
-  <el-card style="width: 100%">
+  <el-card style="width: 100%;height: 100%">
     <template #header>
       <div style="text-align: left">
         <el-button v-if="classInfo.teacher.length > 0" type="danger" @click="deleteClassRoom">删除班级</el-button>

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

@@ -15,12 +15,15 @@
       </el-aside>
       <el-main :style="{'min-height': (viewportHeight - 160) + 'px'}">
 <!--        <router-view :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}" :key="route.path"></router-view>-->
+        <div :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
           <!--        班级概况-->
           <ClassInfo v-if="currentIndex==0" :classId="classId"></ClassInfo>
           <!--        学生列表-->
           <StudentList v-else-if="currentIndex==1" :classId="classId"></StudentList>
           <!--        分组情况-->
           <BasicGroup v-else-if="currentIndex==2" :classId="classId"></BasicGroup>
+        </div>
+
       </el-main>
     </el-container>
   </div>

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height: 100%">
     <el-card style="width: 100%;height: 100%">
       <template #header>
         <div style="text-align: left;display: flex;justify-content: space-between">