Skip to content

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

修改

parent 60fc11bc
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 34 deletions
src/pages/course/classPlan.vue
View file @ b45d3977
<style> <style>
.planTable { .MainPlan .ClassPlanTable {
width: 100%; width: 100%;
color: #000; color: #000;
} }
.MainPlan th, .ClassPlanTable th,
.MainPlan td { .ClassPlanTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
height: 40px; height: 40px;
} }
...@@ -19,16 +19,16 @@ ...@@ -19,16 +19,16 @@
margin: 20px; margin: 20px;
} }
.plan_ClassDate { .MainPlan .plan_ClassDate {
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
font-size: 16px; font-size: 15px;
font-weight: bold; font-weight: bold;
} }
.plantHead th{ .MainPlan .plantHead th{
border-bottom:0; border-bottom:0;
} }
.planTabDiv{ .MainPlan .planTabDiv{
max-height:calc(100vh - 235px); max-height:calc(100vh - 235px);
height:calc(100vh - 235px); height:calc(100vh - 235px);
overflow-y:auto; overflow-y:auto;
...@@ -58,36 +58,42 @@ ...@@ -58,36 +58,42 @@
line-height: normal; line-height: normal;
color:#000; color:#000;
} }
.plan_Inner{ .MainPlan .plan_Inner{
font-size:12px; font-size:12px;
color:#000; color:#000;
display: flex; display: flex;
margin-top:5px; margin-top:5px;
} }
.plan_LeftTitle{ .MainPlan .plan_LeftTitle{
width:60px; width:60px;
text-align: right; text-align: right;
flex-shrink: 0 flex-shrink: 0
} }
.plan_RightInner{ .MainPlan .plan_RightInner{
width:100%; width:100%;
} }
.commonTimeStr{ .MainPlan .commonTimeStr{
display:inline-block; display:inline-block;
color:#fff; color:#fff;
padding:1px 3px; padding:1px 3px;
border-radius: 5px; border-radius: 5px;
} }
.greenTime{ .MainPlan .greenTime{
background-color:green; background-color:green;
} }
.blueTime{ .MainPlan .blueTime{
background-color:blue; background-color:blue;
} }
.orangeTime{ .MainPlan .orangeTime{
background-color:orange; background-color:orange;
} }
.MainPlan .plan_Tdiv{
/* min-width:126px;
white-space: nowrap; */
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
</style> </style>
<template> <template>
<div class="page-body MainPlan"> <div class="page-body MainPlan">
...@@ -117,7 +123,7 @@ ...@@ -117,7 +123,7 @@
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<table class="planTable plantHead" style="border-collapse:collapse;width:100%;margin:15px 0 0 0;"> <table class="ClassPlanTable plantHead" style="border-collapse:collapse;width:100%;margin:15px 0 0 0;">
<thead> <thead>
<tr> <tr>
<th colspan="16">甲鹤校区教室使用情况</th> <th colspan="16">甲鹤校区教室使用情况</th>
...@@ -134,7 +140,7 @@ ...@@ -134,7 +140,7 @@
</thead> </thead>
</table> </table>
<div class="planTabDiv"> <div class="planTabDiv">
<table class="planTable" style="border-collapse:collapse;margin-top:0;"> <table class="ClassPlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody> <tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index"> <tr v-for="(item,index) in dataList.fridayList" :key="index">
<td> <td>
...@@ -143,11 +149,13 @@ ...@@ -143,11 +149,13 @@
<el-collapse-item v-for="(subItem,subIndex) in dataList.mondayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.mondayList[index].SubList" :key="subIndex"
:name="subIndex"> :name="subIndex">
<template slot="title"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span> <span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span> <span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span> <span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
老师:<span style="color:red;">{{subItem.TeacherName}}</span> <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span style="margin-left:5px;">【{{subItem.RoomName}}】</span> <span>[{{subItem.RoomName}}]</span>
</div>
</template> </template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
...@@ -173,8 +181,16 @@ ...@@ -173,8 +181,16 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.tuesdayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.tuesdayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.tuesdayList[index].SubList&&dataList.tuesdayList[index].SubList.length>0"> <el-collapse v-if="dataList.tuesdayList[index].SubList&&dataList.tuesdayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.tuesdayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.tuesdayList[index].SubList" :key="subIndex":name="subIndex">
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
...@@ -199,8 +215,18 @@ ...@@ -199,8 +215,18 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.wednesdayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.wednesdayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.wednesdayList[index].SubList&&dataList.wednesdayList[index].SubList.length>0"> <el-collapse v-if="dataList.wednesdayList[index].SubList&&dataList.wednesdayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex" <!-- <el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex"
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> :title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> -->
<el-collapse-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="subIndex" :name="subIndex">
<template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
...@@ -225,8 +251,16 @@ ...@@ -225,8 +251,16 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.thursdayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.thursdayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.thursdayList[index].SubList&&dataList.thursdayList[index].SubList.length>0"> <el-collapse v-if="dataList.thursdayList[index].SubList&&dataList.thursdayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.thursdayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.thursdayList[index].SubList" :key="subIndex" :name="subIndex">
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
...@@ -251,8 +285,16 @@ ...@@ -251,8 +285,16 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.fridayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.fridayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.fridayList[index].SubList&&dataList.fridayList[index].SubList.length>0"> <el-collapse v-if="dataList.fridayList[index].SubList&&dataList.fridayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.fridayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.fridayList[index].SubList" :key="subIndex" :name="subIndex">
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
...@@ -277,8 +319,16 @@ ...@@ -277,8 +319,16 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.saturdayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.saturdayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.saturdayList[index].SubList&&dataList.saturdayList[index].SubList.length>0"> <el-collapse v-if="dataList.saturdayList[index].SubList&&dataList.saturdayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.saturdayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.saturdayList[index].SubList" :key="subIndex" :name="subIndex">
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
...@@ -303,8 +353,16 @@ ...@@ -303,8 +353,16 @@
<td> <td>
<div class="plan_ClassDate">{{dataList.sundayList[index].ClassDate}}</div> <div class="plan_ClassDate">{{dataList.sundayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.sundayList[index].SubList&&dataList.sundayList[index].SubList.length>0"> <el-collapse v-if="dataList.sundayList[index].SubList&&dataList.sundayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.sundayList[index].SubList" :key="subIndex" <el-collapse-item v-for="(subItem,subIndex) in dataList.sundayList[index].SubList" :key="subIndex" :name="subIndex">
:title="'老师：'+subItem.TeacherName+' 教室：'+subItem.RoomName" :name="subIndex"> <template slot="title">
<div class="plan_Tdiv">
<span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
<span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
<span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
<span>[{{subItem.RoomName}}]</span>
</div>
</template>
<div class="plan_Inner"> <div class="plan_Inner">
<div class="plan_LeftTitle">上课时间：</div> <div class="plan_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div> <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
......
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