Commit 2ffaff40 authored by zhengke's avatar zhengke

修改显示

parent 12ab2c5c
<style> <style>
.lesson_Form .calendar-day { .lesson_Form .calendar-day {
text-align: center; text-align: center;
color: #202535; /* color: #202535; */
line-height: 30px; line-height: 30px;
font-size: 12px; font-size: 12px;
} }
...@@ -49,6 +49,11 @@ ...@@ -49,6 +49,11 @@
.lesson_Form .el-calendar-table .el-calendar-day { .lesson_Form .el-calendar-table .el-calendar-day {
padding: 5px; padding: 5px;
height: 120px;
}
.lesson_Form .el-calendar-table:not(.is-range) td.next, .el-calendar-table:not(.is-range) td.prev{
pointer-events: none;
} }
.lesson_Form .caldendarTeacher { .lesson_Form .caldendarTeacher {
...@@ -118,7 +123,7 @@ ...@@ -118,7 +123,7 @@
margin: 20px; margin: 20px;
padding-left: 20px; padding-left: 20px;
font-size: 12px; font-size: 12px;
color:#000; color: #000;
} }
.lessStuInnerList { .lessStuInnerList {
...@@ -158,12 +163,16 @@ ...@@ -158,12 +163,16 @@
.classQue .commonLessName { .classQue .commonLessName {
color: #fff; color: #fff;
} }
.el-select-dropdown,.el-picker-panel{
z-index:9999!important; .el-select-dropdown,
.el-picker-panel {
z-index: 9999 !important;
} }
.lesson_Form .el-calendar__header{
display:none; .lesson_Form .el-calendar__header {
display: none;
} }
</style> </style>
<template> <template>
<div v-if="!isShowSign"> <div v-if="!isShowSign">
...@@ -231,13 +240,8 @@ ...@@ -231,13 +240,8 @@
</div> </div>
</div> </div>
<div style="text-align:right;margin:12px 20px 8px 0"> <div style="text-align:right;margin:12px 20px 8px 0">
<el-date-picker <el-date-picker v-model="comMsg.QMonth" type="month" size="small"  value-format="yyyy-MM"
v-model="comMsg.QMonth" @change="getClassPlan()" placeholder="选择月">
type="month"
size="small"
 value-format="yyyy-MM"
@change="getClassPlan()"
placeholder="选择月">
</el-date-picker> </el-date-picker>
</div> </div>
...@@ -260,8 +264,8 @@ ...@@ -260,8 +264,8 @@
<div class="calenderDialog"> <div class="calenderDialog">
<div style="margin:10px 0 15px 0;">{{props.row.ClassDateStr}}课程安排</div> <div style="margin:10px 0 15px 0;">{{props.row.ClassDateStr}}课程安排</div>
<q-select filled stack-label option-value="TId" option-label="TeacherName" <q-select filled stack-label option-value="TId" option-label="TeacherName"
v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" v-model="addMsg.TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false"
:dense="false" class="col-6 q-pb-lg" emit-value map-options /> class="col-6 q-pb-lg" emit-value map-options />
<q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" mask="date" label="上课时间"> <q-input filled v-model="addMsg.ClassDate" class="col-6 q-pb-lg" mask="date" label="上课时间">
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
...@@ -278,8 +282,7 @@ ...@@ -278,8 +282,7 @@
v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室" v-model="addMsg.ClassRoomId" ref="ClassRoomId" :options="ClassRoomList" label="关联教室"
:dense="false" class="col-6 q-pb-lg" emit-value map-options /> :dense="false" class="col-6 q-pb-lg" emit-value map-options />
<div style="display:flex;justify-content:flex-end;margin-bottom:20px;"> <div style="display:flex;justify-content:flex-end;margin-bottom:20px;">
<q-btn @click="addStep()" size="10px" round color="primary" <q-btn @click="addStep()" size="10px" round color="primary" icon="iconfont icon-img_haha" />
icon="iconfont icon-img_haha" />
</div> </div>
<div class="row wrap" style="position:relative;" <div class="row wrap" style="position:relative;"
v-for="(subItem,subIndex) in addMsg.PlanTimeList"> v-for="(subItem,subIndex) in addMsg.PlanTimeList">
...@@ -306,7 +309,7 @@ ...@@ -306,7 +309,7 @@
</q-card-actions> </q-card-actions>
</div> </div>
</q-banner> </q-banner>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="查看" <q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="查看"
@click.stop="getClicked(props.row)"></q-btn> @click.stop="getClicked(props.row)"></q-btn>
...@@ -319,7 +322,7 @@ ...@@ -319,7 +322,7 @@
</q-table> </q-table>
</template> </template>
<template v-else> <template v-else>
<el-calendar v-model="value" id="calendar"> <el-calendar v-model="value" id="calendar" style="margin-bottom:40px;">
<!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法--> <!-- 这里使用的是 2.5 slot 语法,对于新项目请使用 2.6 slot 语法-->
<template slot="dateCell" slot-scope="{date, data}"> <template slot="dateCell" slot-scope="{date, data}">
<!--自定义内容--> <!--自定义内容-->
...@@ -436,15 +439,16 @@ ...@@ -436,15 +439,16 @@
<div class="lessStuTitle"> <div class="lessStuTitle">
学生签到情况 学生签到情况
</div> </div>
<q-table :pagination="msg" no-data-label="暂无相关数据" flat <q-table :pagination="msg" no-data-label="暂无相关数据" flat class="sticky-column-table" separator="none" hide-bottom
class="sticky-column-table" separator="none" hide-bottom :data="dayObj.GuestList" :columns="columns2"> :data="dayObj.GuestList" :columns="columns2">
<template v-slot:body-cell-GuestName="props"> <template v-slot:body-cell-GuestName="props">
<q-td auto-width :props="props" style="width:25%;"> <q-td auto-width :props="props" style="width:25%;">
<div style="display:flex;align-items:center;"> <div style="display:flex;align-items:center;">
<q-avatar size="sm" style="margin:0 5px 5px 0" v-if="props.row.UserIcon"> <q-avatar size="sm" style="margin:0 5px 5px 0" v-if="props.row.UserIcon">
<img :src="props.row.UserIcon" /> <img :src="props.row.UserIcon" />
</q-avatar> </q-avatar>
<q-avatar size="sm" color="teal-10" style="margin:5px 0 5px 0" text-color="white" v-if="!props.row.UserIcon"> <q-avatar size="sm" color="teal-10" style="margin:5px 0 5px 0" text-color="white"
v-if="!props.row.UserIcon">
{{props.row.GuestName[0]}}</q-avatar><span style="margin-left:5px;">{{props.row.GuestName}}</span> {{props.row.GuestName[0]}}</q-avatar><span style="margin-left:5px;">{{props.row.GuestName}}</span>
</div> </div>
</q-td> </q-td>
...@@ -459,7 +463,8 @@ ...@@ -459,7 +463,8 @@
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props" style="width:15%;"> <q-td :props="props" style="width:15%;">
<el-input v-model="props.row.StudyNum" size="small" maxlength="4" @keyup.native="checkInteger(props.row,'StudyNum')"></el-input> <el-input v-model="props.row.StudyNum" size="small" maxlength="4"
@keyup.native="checkInteger(props.row,'StudyNum')"></el-input>
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
...@@ -554,12 +559,12 @@ ...@@ -554,12 +559,12 @@
isShowSignBtn: false, //是否显示签到提交按钮 isShowSignBtn: false, //是否显示签到提交按钮
comChecked: {}, //点击选中复制 comChecked: {}, //点击选中复制
isSigned: true, isSigned: true,
columns:[{ columns: [{
name: 'RoomName', name: 'RoomName',
label: '教室名称', label: '教室名称',
field: 'RoomName', field: 'RoomName',
align: 'left', align: 'left',
},{ }, {
name: 'ClassDateStr', name: 'ClassDateStr',
label: '上课日期', label: '上课日期',
field: 'ClassDateStr', field: 'ClassDateStr',
...@@ -584,10 +589,10 @@ ...@@ -584,10 +589,10 @@
align: 'center' align: 'center'
} }
], ],
msg:{ msg: {
rowsPerPage: 100 rowsPerPage: 100
}, },
comMsg:{ comMsg: {
ClassId: 0, ClassId: 0,
QMonth: '' QMonth: ''
}, },
...@@ -626,10 +631,9 @@ ...@@ -626,10 +631,9 @@
} }
}, },
created() { created() {
if(this.setingObj&&this.setingObj.ClassId) if (this.setingObj && this.setingObj.ClassId) {
{ this.addMsg.ClassId = this.setingObj.ClassId;
this.addMsg.ClassId=this.setingObj.ClassId; }
}
}, },
mounted() { mounted() {
//this.initData(); //this.initData();
...@@ -719,13 +723,13 @@ ...@@ -719,13 +723,13 @@
var month = d.getMonth() + 1; var month = d.getMonth() + 1;
var strDate = d.getDate(); var strDate = d.getDate();
if (month >= 1 && month <= 9) { if (month >= 1 && month <= 9) {
month = "0" + month; month = "0" + month;
} }
if (strDate >= 0 && strDate <= 9) { if (strDate >= 0 && strDate <= 9) {
strDate = "0" + strDate; strDate = "0" + strDate;
} }
var currentdate = year + seperator1 + month + seperator1 + strDate; var currentdate = year + seperator1 + month + seperator1 + strDate;
this.addMsg.ClassDate = currentdate; this.addMsg.ClassDate = currentdate;
this.addMsg.ClassPlanId = 0; this.addMsg.ClassPlanId = 0;
this.addMsg.PlanTimeList = [{ this.addMsg.PlanTimeList = [{
ClassTimeId: 0, ClassTimeId: 0,
...@@ -860,7 +864,7 @@ ...@@ -860,7 +864,7 @@
TeacherId: this.comChecked.TeacherId, TeacherId: this.comChecked.TeacherId,
OrderGuestId: x.Id, OrderGuestId: x.Id,
CheckStatus: x.IsCheck, CheckStatus: x.IsCheck,
StudyNum:x.StudyNum==''?0:x.StudyNum StudyNum: x.StudyNum == '' ? 0 : x.StudyNum
} }
signMsg.push(obj); signMsg.push(obj);
}) })
......
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