Skip to content

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

修改

parent 2e8aa449
Hide whitespace changes
Inline Side-by-side
Showing with 614 additions and 449 deletions
src/components/course/classmate-form.vue 0 → 100644
View file @ 655172cb
<style>
.MainPlan .ClassPlanTable {
width: 100%;
color: #000;
}
.ClassPlanTable th,
.ClassPlanTable td {
border: 1px solid #d1d1d1;
height: 40px;
}
.MainPlan td {
vertical-align: top;
padding: 5px;
width: 14%;
}
.MainPlan {
margin: 20px;
}
.MainPlan .plan_ClassDate {
height: 30px;
line-height: 30px;
font-size: 15px;
font-weight: bold;
}
.MainPlan .plantHead th {
border-bottom: 0;
}
.MainPlan .planTabDiv {
max-height: calc(100vh - 235px);
height: calc(100vh - 235px);
overflow-y: overlay;
/* margin-right: -3px; */
}
.planTabDiv::-webkit-scrollbar {
width: 3px;
height: 3px;
background-color: #F5F5F5;
}
/*!*定义滚动条轨道 内阴影+圆角*!*/
.planTabDiv::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*!*定义滑块 内阴影+圆角*!*/
.planTabDiv::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae;
}
.MainPlan .el-collapse-item__header {
font-size: 12px;
line-height: normal;
color: #000;
}
.MainPlan .plan_Inner {
font-size: 12px;
color: #000;
display: flex;
margin-top: 5px;
}
.MainPlan .plan_LeftTitle {
width: 60px;
text-align: right;
flex-shrink: 0
}
.MainPlan .plan_RightInner {
width: 100%;
}
.MainPlan .commonTimeStr {
display: inline-block;
color: #fff;
padding: 1px 3px;
border-radius: 5px;
}
.MainPlan .greenTime {
background-color: green;
}
.MainPlan .blueTime {
background-color: blue;
}
.MainPlan .orangeTime {
background-color: orange;
}
.MainPlan .plan_Tdiv {
/* min-width:126px;
white-space: nowrap; */
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
</style>
<template>
<div>
<table class="ClassPlanTable plantHead" style="border-collapse:collapse;width:100%;margin:15px 0 0 0;">
<thead>
<tr>
<th colspan="16">甲鹤校区教室使用情况</th>
</tr>
<tr>
<th>周一</th>
<th>周二</th>
<th>周三</th>
<th>周四</th>
<th>周五</th>
<th>周六</th>
<th>周日</th>
</tr>
</thead>
</table>
<div class="planTabDiv" ref="planTabDiv">
<table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index">
<td>
<div class="plan_ClassDate">{{dataList.mondayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.mondayList[index].SubList&&dataList.mondayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.mondayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.tuesdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.thursdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.fridayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.saturdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.sundayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</template>
<script>
import {
GetClassPlanStatistical
} from '../../api/system/index';
export default {
props: {
StartTime: {
type: String,
default: null,
},
EndTime: {
type: String,
default: null,
},
TeacherId: {
type: Number,
default: null,
},
ClassRoomId: {
type: Number,
default: null,
},
},
data() {
return {
msg: {
StartTime: "",
EndTime: '',
TeacherId: 0,
ClassRoomId: 0
},
dataList: []
};
},
created() {
},
mounted() {
},
methods: {
// 获取校区教室导航列表
getPlanList(StartTime, EndTime, TeacherId, ClassRoomId) {
if (StartTime) {
this.msg.StartTime = StartTime;
}
if (StartTime == null) {
this.msg.StartTime = '';
}
if (EndTime) {
this.msg.EndTime = EndTime;
}
if (EndTime == null) {
this.msg.EndTime = '';
}
if (TeacherId >= 0) {
this.msg.TeacherId = JSON.parse(TeacherId);
}
if (ClassRoomId >= 0) {
this.msg.ClassRoomId = JSON.parse(ClassRoomId);
}
GetClassPlanStatistical(this.msg).then(res => {
if (res.Code == 1) {
this.dataList = res.Data;
}
}).catch(() => {
})
},
//获取进度条
getProgress(num, total) {
if (num == 0 || total == 0) {
return 0;
}
return (Math.round(num / total * 100) / 100.00);
}
}
};
</script>
src/components/schedul/schedul-orderlist.vue
View file @ 655172cb
...@@ -283,8 +283,8 @@ ...@@ -283,8 +283,8 @@
</div> </div>
</div> </div>
<div class="WorkObj_ImgList"> <div class="WorkObj_ImgList">
<el-scrollbar> <el-scrollbar v-if="WorkObj.FileList&&WorkObj.FileList.length>0">
<template v-if="WorkObj.FileList&&WorkObj.FileList.length>0"> <template>
<div class="SchImg_List" style="width:50px;height:50px;border:0;" <div class="SchImg_List" style="width:50px;height:50px;border:0;"
v-for="(item,index) in WorkObj.FileList"> v-for="(item,index) in WorkObj.FileList">
<el-image :src="item" style="width:100%;height:100%;" :preview-src-list="WorkObj.FileList"> <el-image :src="item" style="width:100%;height:100%;" :preview-src-list="WorkObj.FileList">
......
src/pages/Work.vue
View file @ 655172cb
...@@ -35,19 +35,25 @@ ...@@ -35,19 +35,25 @@
<q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理"> <q-btn @click="changeMenu(2)" v-if="AccountType==2 || ispower==true" flat :color="chosenMenu==2?'primary':'blue-grey-14'" :class="[chosenMenu==2?'text-weight-bold':'']" label="备课管理">
</q-btn> </q-btn>
<q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn> <q-btn flat @click="changeMenu(3)" :color="chosenMenu==3?'primary':'blue-grey-14'" :class="[chosenMenu==3?'text-weight-bold':'']" label="我的排班计划"></q-btn>
<q-btn flat @click="changeMenu(4)" v-if="AccountType==2" :color="chosenMenu==4?'primary':'blue-grey-14'" :class="[chosenMenu==4?'text-weight-bold':'']" label="我的上课计划"></q-btn>
</div> </div>
<div v-if="chosenMenu==1" class="flex col" style="flex: 1"> <div v-if="chosenMenu==1" class="flex col" style="flex: 1">
<okr v-if="okrMenu==1"></okr> <okr v-if="okrMenu==1"></okr>
<align-view v-if="okrMenu==2"></align-view> <align-view v-if="okrMenu==2"></align-view>
</div> </div>
<div v-if="chosenMenu==2" class="col" style="height: 750px;overflow: auto"> <div v-if="chosenMenu==2" class="col comWorkDiv" style="overflow: auto">
<teachplan></teachplan> <teachplan></teachplan>
</div> </div>
<!-- 备课管理 --> <!-- 备课管理 -->
<div v-if="chosenMenu==3" style="height: 750px;overflow: auto"> <div v-if="chosenMenu==3" class="comWorkDiv" style="overflow: auto">
<mySchedule></mySchedule> <mySchedule></mySchedule>
</div> </div>
<!-- 我的上课计划 -->
<div v-if="chosenMenu==4" class="comWorkDiv" style="overflow: auto">
<myClassmate></myClassmate>
</div>
<!-- zk新增公告弹窗 --> <!-- zk新增公告弹窗 -->
<notice-form v-if="isShowNotice" @fathergoBefore="fathergoBefore" @fathergoAfter="fathergoAfter" :seting-obj="noticeObj" @close="closeNoticeForm"> <notice-form v-if="isShowNotice" @fathergoBefore="fathergoBefore" @fathergoAfter="fathergoAfter" :seting-obj="noticeObj" @close="closeNoticeForm">
</notice-form> </notice-form>
...@@ -66,6 +72,7 @@ ...@@ -66,6 +72,7 @@
import alignView from './okr/okr-align-view' import alignView from './okr/okr-align-view'
import noticeForm from '../components/course/notice-form' import noticeForm from '../components/course/notice-form'
import mySchedule from './scheduling/mySchedule' import mySchedule from './scheduling/mySchedule'
import myClassmate from './scheduling/myClassmate';
export default { export default {
components:{ components:{
...@@ -73,7 +80,8 @@ ...@@ -73,7 +80,8 @@
okr, okr,
alignView, alignView,
noticeForm, noticeForm,
mySchedule mySchedule,
myClassmate
}, },
name: 'PageIndex', name: 'PageIndex',
data(){ data(){
...@@ -216,4 +224,7 @@ ...@@ -216,4 +224,7 @@
margin: 0; margin: 0;
padding: 10px 20px; padding: 10px 20px;
} }
.comWorkDiv{
height: 100vh
}
</style> </style>
src/pages/course/classPlan.vue
View file @ 655172cb
<style>
.MainPlan .ClassPlanTable {
width: 100%;
color: #000;
}
.ClassPlanTable th,
.ClassPlanTable td {
border: 1px solid #d1d1d1;
height: 40px;
}
.MainPlan td {
vertical-align: top;
padding: 5px;
width: 14%;
}
.MainPlan {
margin: 20px;
}
.MainPlan .plan_ClassDate {
height: 30px;
line-height: 30px;
font-size: 15px;
font-weight: bold;
}
.MainPlan .plantHead th{
border-bottom:0;
}
.MainPlan .planTabDiv{
max-height:calc(100vh - 235px);
height:calc(100vh - 235px);
overflow-y:auto;
margin-right:-3px;
}
.planTabDiv::-webkit-scrollbar {
width: 3px;
height: 3px;
background-color: #F5F5F5;
}
/*!*定义滚动条轨道 内阴影+圆角*!*/
.planTabDiv::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
border-radius: 10px;
background-color: #F5F5F5;
}
/*!*定义滑块 内阴影+圆角*!*/
.planTabDiv::-webkit-scrollbar-thumb {
border-radius: 10px;
-webkit-box-shadow: -webkit-gradient(linear, 0 0, 0 100%, color-stop(.5, rgba(255, 255, 255, .2)), color-stop(.5, transparent), to(transparent));
background-color: #0ae;
}
.MainPlan .el-collapse-item__header{
font-size:12px;
line-height: normal;
color:#000;
}
.MainPlan .plan_Inner{
font-size:12px;
color:#000;
display: flex;
margin-top:5px;
}
.MainPlan .plan_LeftTitle{
width:60px;
text-align: right;
flex-shrink: 0
}
.MainPlan .plan_RightInner{
width:100%;
}
.MainPlan .commonTimeStr{
display:inline-block;
color:#fff;
padding:1px 3px;
border-radius: 5px;
}
.MainPlan .greenTime{
background-color:green;
}
.MainPlan .blueTime{
background-color:blue;
}
.MainPlan .orangeTime{
background-color:orange;
}
.MainPlan .plan_Tdiv{
/* min-width:126px;
white-space: nowrap; */
text-overflow: ellipsis;
overflow: hidden;
word-break: break-all;
}
</style>
<template> <template>
<div class="page-body MainPlan"> <div class="page-body MainPlan">
<div class="col row wrap q-col-gutter-md"> <div class="col row wrap q-col-gutter-md">
<div class="col-2"> <div class="col-2">
<el-select v-model="msg.TeacherId" style="width:100%;" placeholder="教师团队" size="small" <el-select v-model="TeacherId" style="width:100%;" placeholder="教师团队" size="small"
@change="getPlanList()"> @change="changeClassMate()">
<el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId"> <el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="col-2"> <div class="col-2">
<el-select v-model="msg.ClassRoomId" style="width:100%;" placeholder="教室" size="small" <el-select v-model="ClassRoomId" style="width:100%;" placeholder="教室" size="small"
@change="getPlanList()"> @change="changeClassMate()">
<el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId"> <el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="col-2"> <div class="col-2">
<el-date-picker v-model="msg.StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开始日期" size="small" <el-date-picker v-model="StartTime" type="date" value-format="yyyy-MM-dd" placeholder="开始日期" size="small"
style="width:100%;" @change="getPlanList" clear-icon="iconfont icon-guanbi"> style="width:100%;" @change="changeClassMate()" clear-icon="iconfont icon-guanbi">
</el-date-picker> </el-date-picker>
</div> </div>
<div class="col-2"> <div class="col-2">
<el-date-picker v-model="msg.EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期" size="small" <el-date-picker v-model="EndTime" type="date" value-format="yyyy-MM-dd" placeholder="结束日期" size="small"
style="width:100%;" @change="getPlanList" clear-icon="iconfont icon-guanbi"> style="width:100%;" @change="changeClassMate()" clear-icon="iconfont icon-guanbi">
</el-date-picker> </el-date-picker>
</div> </div>
</div> </div>
<table class="ClassPlanTable plantHead" style="border-collapse:collapse;width:100%;margin:15px 0 0 0;"> <classmateForm ref="classmate"></classmateForm>
<thead>
<tr>
<th colspan="16">甲鹤校区教室使用情况</th>
</tr>
<tr>
<th>周一</th>
<th>周二</th>
<th>周三</th>
<th>周四</th>
<th>周五</th>
<th>周六</th>
<th>周日</th>
</tr>
</thead>
</table>
<div class="planTabDiv">
<table class="ClassPlanTable" style="border-collapse:collapse;margin-top:0;">
<tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index">
<td>
<div class="plan_ClassDate">{{dataList.mondayList[index].ClassDate}}</div>
<el-collapse v-if="dataList.mondayList[index].SubList&&dataList.mondayList[index].SubList.length>0">
<el-collapse-item v-for="(subItem,subIndex) in dataList.mondayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.tuesdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.wednesdayList[index].SubList" :key="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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.thursdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.fridayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.saturdayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
<td>
<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-item v-for="(subItem,subIndex) in dataList.sundayList[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_LeftTitle">上课时间：</div>
<div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">班级：</div>
<div class="plan_RightInner">{{subItem.ClassName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">课程名称：</div>
<div class="plan_RightInner">{{subItem.CourseName}}</div>
</div>
<div class="plan_Inner">
<div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner">
<span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
</div>
</div>
<div class="plan_Inner" style="align-items:center;">
<div class="plan_LeftTitle">课程进度：</div>
<div class="plan_RightInner">
<el-progress :percentage="subItem.CompleteProgress"></el-progress>
</div>
</div>
</el-collapse-item>
</el-collapse>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
</template> </template>
<script> <script>
import {
GetClassPlanStatistical
} from '../../api/system/index';
import { import {
getTeacherDropDownList, getTeacherDropDownList,
queryClassRoomList queryClassRoomList
} from '../../api/school/index' } from '../../api/school/index'
import classmateForm from '../../components/course/classmate-form';
export default { export default {
meta: { meta: {
title: "上课计划" title: "上课计划"
}, },
components: {}, components: {
classmateForm
},
data() { data() {
return { return {
TeacherList: [], //教师团队 TeacherList: [], //教师团队
ClassRoomList: [], // ClassRoomList: [], //
msg: { StartTime: "",
StartTime: "", EndTime: '',
EndTime: '', TeacherId: 0,
TeacherId: 0, ClassRoomId: 0,
ClassRoomId: 0
},
dataList: [], dataList: [],
activeNames: [1] activeNames: [1]
}; };
...@@ -465,30 +60,35 @@ ...@@ -465,30 +60,35 @@
this.getClassRoomList(); this.getClassRoomList();
}, },
mounted() { mounted() {
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
if (this.$route.query.StartTime) { if (this.$route.query.StartTime) {
this.msg.StartTime = this.$route.query.StartTime this.StartTime = this.$route.query.StartTime
}else {
this.StartTime = nowDate;
} }
if (this.$route.query.EndTime) { if (this.$route.query.EndTime) {
this.msg.EndTime = this.$route.query.EndTime this.EndTime = this.$route.query.EndTime
}else{
this.EndTime = this.addMoth(nowDate, 1);
} }
if (this.$route.query.TeacherId) { if (this.$route.query.TeacherId) {
this.msg.TeacherId = JSON.parse(this.$route.query.TeacherId); this.TeacherId = JSON.parse(this.$route.query.TeacherId);
} }
if (this.$route.query.ClassRoomId) {
this.getPlanList(); this.ClassRoomId = JSON.parse(this.$route.query.ClassRoomId);
}
this.$refs.classmate.getPlanList(this.StartTime,this.EndTime,this.TeacherId,this.ClassRoomId);
}, },
methods: { methods: {
// 获取校区教室导航列表 //调用子组件方法
getPlanList() { changeClassMate(){
let that = this this.$refs.classmate.getPlanList(this.StartTime,this.EndTime,this.TeacherId,this.ClassRoomId);
GetClassPlanStatistical(this.msg).then(res => {
console.log(res, '数据');
if (res.Code == 1) {
this.dataList = res.Data;
}
}).catch(() => {
})
}, },
//获取教师下拉 //获取教师下拉
GetTeacherList() { GetTeacherList() {
...@@ -516,12 +116,16 @@ ...@@ -516,12 +116,16 @@
} }
}) })
}, },
//获取进度条 addMoth(d, m) {
getProgress(num, total) { let ds = d.split("-"),
if (num == 0 || total == 0) { _d = ds[2] - 0;
return 0; let nextM = new Date(ds[0], ds[1] - 1 + m + 1, 0);
} let max = nextM.getDate();
return (Math.round(num / total * 100) / 100.00); d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d
.toLocaleDateString()
.match(/\d+/g)
.join("-");
} }
} }
}; };
......
src/pages/scheduling/myClassmate.vue 0 → 100644
View file @ 655172cb
<style>
.myClassMate .planTabDiv{
height:calc(100vh - 290px);
max-height:calc(100vh - 290px);
}
</style>
<template>
<div class="page-body MainPlan myClassMate">
<classmateForm ref="classmate"></classmateForm>
</div>
</template>
<script>
import classmateForm from '../../components/course/classmate-form';
export default {
meta: {
title: "我的上课计划"
},
components: {
classmateForm
},
data() {
return {
}
},
created() {
},
mounted() {
let userinfo = this.getLocalStorage();
let AccountId = userinfo.AccountId;
this.$refs.classmate.getPlanList(null,null,AccountId,0);
},
methods: {
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</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