Skip to content

C
confucius
Commit c56085e4 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 7b9d4512
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 89 deletions
src/pages/course/classPlan.vue
View file @ c56085e4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
.planTable { .planTable {
width: 100%; width: 100%;
margin: 10px; margin: 10px;
color:#000; color: #000;
} }
.PlanRight th, .PlanRight th,
...@@ -11,6 +11,18 @@ ...@@ -11,6 +11,18 @@
height: 40px; height: 40px;
} }
.PlanRight td {
vertical-align: top;
padding: 5px;
min-width: 225px;
}
.moreInfo {
margin-left: 20px;
color: blue;
cursor: pointer;
}
</style> </style>
<template> <template>
<div class="page-body MainPlan"> <div class="page-body MainPlan">
...@@ -38,7 +50,7 @@ ...@@ -38,7 +50,7 @@
option-label="RoomName" v-model="msg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" option-label="RoomName" v-model="msg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
:dense="false" emit-value map-options /> --> :dense="false" emit-value map-options /> -->
</div> </div>
<div class="PlanRight" style="width:100%;"> <div class="PlanRight" style="width:100%;overflow:auto;">
<table class="planTable" style="border-collapse:collapse;"> <table class="planTable" style="border-collapse:collapse;">
<thead> <thead>
<tr> <tr>
...@@ -55,105 +67,83 @@ ...@@ -55,105 +67,83 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr v-for="(item,index) in dataList" :key="index"> <tr v-for="(item,index) in dataList.fridayList" :key="index">
<td> <td>
<template v-if="getWeek(item.WeekStr)==='一'"> <div class="plan_ClassDate">{{dataList.mondayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.mondayList[index].SubList&&dataList.mondayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.mondayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='二'"> <div class="plan_ClassDate">{{dataList.tuesdayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.tuesdayList[index].SubList&&dataList.tuesdayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.tuesdayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='三'"> <div class="plan_ClassDate">{{dataList.wednesdayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.wednesdayList[index].SubList&&dataList.wednesdayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='四'"> <div class="plan_ClassDate">{{dataList.thursdayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.thursdayList[index].SubList&&dataList.thursdayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.thursdayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='五'"> <div class="plan_ClassDate">{{dataList.fridayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.fridayList[index].SubList&&dataList.fridayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.fridayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='六'"> <div class="plan_ClassDate">{{dataList.saturdayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.saturdayList[index].SubList&&dataList.saturdayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.saturdayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
<td> <td>
<template v-if="getWeek(item.WeekStr)==='天'"> <div class="plan_ClassDate">{{dataList.sundayList[index].ClassDate}}</div>
<div>日期：{{item.ClassDate}}</div> <el-collapse v-if="dataList.sundayList[index].SubList&&dataList.sundayList[index].SubList.length>0">
<template v-for="subItem in item.SubList"> <el-collapse-item v-for="(subItem,subIndex) in dataList.sundayList[index].SubList" :key="subIndex" :title="'老师：'+subItem.TeacherName+' 名称：'+subItem.RoomName" :name="subIndex">
<div>带班老师：{{subItem.TeacherName}}</div>
<div>课程名称：{{subItem.CourseName}}</div> <div>课程名称：{{subItem.CourseName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>教室名称：{{subItem.RoomName}}</div>
<div>学生名称： <div>学生名称：
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div> </div>
</template> </el-collapse-item>
</template> </el-collapse>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -185,7 +175,8 @@ ...@@ -185,7 +175,8 @@
TeacherId: 0, TeacherId: 0,
ClassRoomId: 0 ClassRoomId: 0
}, },
dataList: [] dataList: [],
activeNames:[1]
}; };
}, },
created() { created() {
...@@ -252,14 +243,11 @@ ...@@ -252,14 +243,11 @@
width: 200px; width: 200px;
background-color: rgb(245, 246, 247); background-color: rgb(245, 246, 247);
padding: 5px; padding: 5px;
flex-shrink: 0;
} }
.plan_ClassDate{
.dateModel { height:30px;
padding: 20px 10px; line-height: 30px;
display: flex;
flex-wrap: wrap;
justify-content: center;
align-content: space-around;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment