zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 24 Wiki Activity

Merge branch 'main' into lyc-dev

This commit is contained in:
lyc 2024-07-26 17:24:07 +08:00
parent ef77069329 1da1db8378
commit e3016b5aff
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/src/views/classManage/classInfo.vue
View File

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

3
src/renderer/src/views/classManage/index.vue
View File

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

2
src/renderer/src/views/classManage/studentList.vue
View File

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