Commit ef236ac6 authored by zhengke's avatar zhengke

修改

parent 6490dd3e
...@@ -12,7 +12,7 @@ export default { ...@@ -12,7 +12,7 @@ export default {
<style> <style>
@import url('~assets/css/font.css'); @import url('~assets/css/font.css');
@import url('//at.alicdn.com/t/font_2077629_pdphpdntjxl.css'); @import url('//at.alicdn.com/t/font_2077629_3yray8qk6mp.css');
html, html,
body, body,
......
...@@ -34,11 +34,10 @@ ...@@ -34,11 +34,10 @@
.classinfo_Dialog .normalInner { .classinfo_Dialog .normalInner {
color: #111111; color: #111111;
} }
</style> </style>
<template> <template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm"> <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
<q-card style="margin-top:61px;width:800px" class="no-border-radius classinfo_Dialog"> <q-card style="margin-top:61px;width:850px" class="no-border-radius classinfo_Dialog">
<div class="drawerTop"> <div class="drawerTop">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
<q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;"> <q-avatar size="md" style="background:#d4dfff;color:#2961FE;font-weight:bold;">
...@@ -83,7 +82,6 @@ ...@@ -83,7 +82,6 @@
<q-tab :ripple="false" name="second" label="上课计划" /> <q-tab :ripple="false" name="second" label="上课计划" />
<q-tab :ripple="false" name="third" label="上课记录" /> <q-tab :ripple="false" name="third" label="上课记录" />
<q-tab :ripple="false" name="fourth" label="班级日志" /> <q-tab :ripple="false" name="fourth" label="班级日志" />
<q-tab :ripple="false" name="fifth" label="待定" />
</q-tabs> </q-tabs>
<div v-if="tabCheck=='first'" style="margin:0 15px;"> <div v-if="tabCheck=='first'" style="margin:0 15px;">
<div style="text-align:right;"> <div style="text-align:right;">
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
.calendar-day { .calendar-day {
position: absolute; position: absolute;
bottom: 5px; bottom: -5px;
left: 15px; left: 5px;
} }
.calenderHeader { .calenderHeader {
...@@ -31,14 +31,37 @@ ...@@ -31,14 +31,37 @@
justify-content: space-between; justify-content: space-between;
padding: 0 20px; padding: 0 20px;
} }
.calendarTop{
display: flex;
justify-content: space-between;
font-size:12px;
margin-left:-7px;
align-items: center;
transform: scale(0.9);
}
.calendarInner{
font-size:12px;
margin:-4px 0 0 -7px;
transform: scale(0.9);
}
.lesson_Form .el-calendar-table .el-calendar-day{
padding: 5px;
}
.caldendarTeacher{
display: flex;
font-size:12px;
margin-left:40px;
justify-content: space-between;
align-items: center;
margin-top:-2px;
transform: scale(0.9);
}
</style><template> </style><template>
<div class="lesson_Form"> <div class="lesson_Form">
<div class="calenderHeader"> <div class="calenderHeader">
<div> <div>
<el-radio-group v-model="checkedDays" size="mini"> <el-radio-group v-model="checkedDays" size="mini">
<el-radio-button label="日"></el-radio-button> <el-radio-button label="日"></el-radio-button>
<el-radio-button label="周"></el-radio-button>
<el-radio-button label="月"></el-radio-button> <el-radio-button label="月"></el-radio-button>
<el-radio-button style="margin-left:20px;border-left:1px solid #DCDFE6;" label="今天"></el-radio-button> <el-radio-button style="margin-left:20px;border-left:1px solid #DCDFE6;" label="今天"></el-radio-button>
</el-radio-group> </el-radio-group>
...@@ -53,7 +76,7 @@ ...@@ -53,7 +76,7 @@
<!--自定义内容--> <!--自定义内容-->
<div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div> <div class="calendar-day">{{ data.day.split('-').slice(2).join('-') }}</div>
<div v-for="item in calendarData"> <div v-for="item in calendarData">
<div v-if="(item.months).indexOf(data.day.split('-').slice(1)[0])!=-1"> <!-- <div v-if="(item.months).indexOf(data.day.split('-').slice(1)[0])!=-1">
<div v-if="(item.days).indexOf(data.day.split('-').slice(2).join('-'))!=-1"> <div v-if="(item.days).indexOf(data.day.split('-').slice(2).join('-'))!=-1">
<el-tooltip class="item" effect="dark" :content="item.things" placement="right"> <el-tooltip class="item" effect="dark" :content="item.things" placement="right">
<div class="is-selected">{{item.things}}</div> <div class="is-selected">{{item.things}}</div>
...@@ -61,7 +84,30 @@ ...@@ -61,7 +84,30 @@
</div> </div>
<div v-else></div> <div v-else></div>
</div> </div>
<div v-else></div> -->
<div v-if="item.ClassDateStr==data.day">
<div class="calendarTop">
<div>{{item.RoomName}}</div>
<div><i class="iconfont icon-edit"></i></div>
</div>
<div class="calendarInner">
<div v-for="(subItem,subIndex) in item.TimeList">
{{subIndex+1}}节课 {{subItem.StartTime}}-{{subItem.EndTime}}
</div>
</div>
<div class="caldendarTeacher">
<div>{{item.TeacherName}}</div>
<div>
<q-avatar size="sm" v-if="item.UserIcon">
<img :src="item.UserIcon" />
</q-avatar>
<q-avatar size="md" color="teal-10" text-color="white" v-if="!item.UserIcon">
{{GetFirst(item.TeacherName)}}</q-avatar>
</div>
</div>
</div>
<div v-else></div> <div v-else></div>
</div> </div>
</template> </template>
</el-calendar> </el-calendar>
...@@ -82,27 +128,7 @@ ...@@ -82,27 +128,7 @@
name: "calendar", name: "calendar",
data() { data() {
return { return {
calendarData: [{ calendarData: [],
months: ['09', '11'],
days: ['15'],
things: '看电影'
},
{
months: ['10', '11'],
days: ['02'],
things: '去公园野炊'
},
{
months: ['11'],
days: ['02'],
things: '看星星'
},
{
months: ['11'],
days: ['02'],
things: '看月亮'
}
],
value: new Date(), value: new Date(),
checkedDays: '月' checkedDays: '月'
} }
...@@ -111,20 +137,43 @@ ...@@ -111,20 +137,43 @@
}, },
mounted() { mounted() {
this.getClassPlan(); var day2 = new Date();
day2.setTime(day2.getTime());
var s2 = day2.getFullYear()+"-" + (day2.getMonth()+1);
this.getClassPlan(s2);
}, },
methods: { methods: {
//获取第一个字
GetFirst(val) {
if (val) {
return val.substr(0, 1);
}
},
//获取班级上课计划列表 //获取班级上课计划列表
getClassPlan() { getClassPlan(datetime) {
var msg = { var msg = {
ClassId: this.setingObj.ClassId, ClassId: this.setingObj.ClassId,
QMonth: "2020-12" QMonth: datetime
}; };
quertClassPlan(msg).then(res => { quertClassPlan(msg).then(res => {
console.log("res", res); console.log("res", res);
if(res.Code==1){
this.calendarData = res.Data;
}
}) })
} }
} },
watch: {
'value': {
handler(newValue) {
var d = new Date(newValue);
var datetime=d.getFullYear() + '-' + (d.getMonth() + 1);
this.getClassPlan(datetime);
console.log(datetime,'newwww');
},
deep: true
},
},
} }
</script> </script>
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