Merge pull request 'fix:高度自适应问题;' (#76) from yangws into main
Reviewed-on: #76
This commit is contained in:
commit
fb607c6f83
|
@ -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>
|
||||||
|
|
|
@ -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>
|
||||||
|
|
|
@ -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">
|
||||||
|
|
Loading…
Reference in New Issue