Skip to content

C
confucius
Commit b39ea38c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent f1209590
Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 79 deletions
src/components/course/record-form.vue
View file @ b39ea38c
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
height: 81px; height: 81px;
color: #333333; color: #333333;
} }
#timeleft div:last-child{
height:71px; #timeleft div:last-child {
height: 71px;
} }
#timecenter div { #timecenter div {
height: 65px; height: 65px;
color: #333333; color: #333333;
...@@ -66,19 +68,24 @@ ...@@ -66,19 +68,24 @@
position: absolute; position: absolute;
left: 130px; left: 130px;
} }
.record_List{
margin-bottom:10px; .record_List {
margin-bottom: 10px;
} }
.record_List:last-child{
margin-bottom:0; .record_List:last-child {
margin-bottom: 0;
} }
.TeacherNameList{
.TeacherNameList {
position: relative; position: relative;
} }
.recordForm .underLine{
.recordForm .underLine {
text-decoration: underline; text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
</style> </style>
<template> <template>
<div class="page-body"> <div class="page-body">
...@@ -92,45 +99,60 @@ ...@@ -92,45 +99,60 @@
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select filled stack-label option-value="TId" @input="changeRecord()" option-label="TeacherName" <q-select filled stack-label option-value="TId" @input="changeRecord()" option-label="TeacherName"
v-model="TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false" v-model="TeacherId" ref="Teacher_Id" :options="TeacherList" label="关联教师" :dense="false" class="col-6"
class="col-6" emit-value map-options /> emit-value map-options />
</div> </div>
</div> </div>
<div> <div>
<template v-if="checkType==1"> <template v-if="checkType==1">
<q-table :pagination="msg" no-data-label="暂无相关数据" flat <q-table :pagination="msg" no-data-label="暂无相关数据" flat class="sticky-column-table" separator="none"
class="sticky-column-table" separator="none" :data="dataList.resultList" :columns="columns"> :data="dataList" :columns="columns">
<template v-slot:body-cell-YearStr="props"> <template v-slot:body-cell-YearStr="props">
<q-td auto-width :props="props" style="width:25%"> <q-td auto-width :props="props" style="width:25%">
{{props.row.YearStr}}-{{props.row.MonthStr}}-{{props.row.DayStr}} {{props.row.YearStr}}-{{props.row.MonthStr}}-{{props.row.DayStr}}
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-ClassTime="props">
<q-td auto-width :props="props" style="width:25%">
<div v-for="(item,index) in props.row.TimeList">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div>
</q-td>
</template>
<template v-slot:body-cell-CheckNum="props"> <template v-slot:body-cell-CheckNum="props">
<q-td auto-width :props="props" style="width:25%"> <q-td auto-width :props="props" style="width:25%">
<span style="color:green;" :class="{'underLine':props.row.CheckList.length>0}"> <div v-for="(item,index) in props.row.TimeList">
{{props.row.CheckNum}} <span style="color:green;" :class="{'underLine':item.CheckList.length>0}">
<q-popup-proxy v-if="props.row.CheckList.length>0"> {{item.CheckNum}}
<q-popup-proxy v-if="item.CheckList.length>0">
<div style="max-width:360px;"> <div style="max-width:360px;">
<q-banner> <q-banner>
<q-chip dense v-for="(subItem,subindex) in props.row.CheckList" :key="subindex">{{subItem.GuestName}}</q-chip> <q-chip dense v-for="(subItem,subindex) in item.CheckList" :key="subindex">
{{subItem.GuestName}}</q-chip>
</q-banner> </q-banner>
</div> </div>
</q-popup-proxy> </q-popup-proxy>
</span> </span>
</div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-NoCheckNum="props"> <template v-slot:body-cell-NoCheckNum="props">
<q-td auto-width :props="props" style="width:25%"> <q-td auto-width :props="props" style="width:25%">
<span style="color:red;" :class="{'underLine':props.row.NoCheckList.length>0}"> <div v-for="(item,index) in props.row.TimeList">
{{props.row.NoCheckNum}} <span style="color:red;" :class="{'underLine':item.NoCheckList.length>0}">
<q-popup-proxy v-if="props.row.NoCheckList.length>0"> {{item.NoCheckNum}}
<q-popup-proxy v-if="item.NoCheckList.length>0">
<div style="min-width:360px;max-width:360px;"> <div style="min-width:360px;max-width:360px;">
<q-banner> <q-banner>
<q-chip dense v-for="(subItem,subindex) in props.row.NoCheckList" :key="subindex">{{subItem.GuestName}}</q-chip> <q-chip dense v-for="(subItem,subindex) in item.NoCheckList" :key="subindex">
{{subItem.GuestName}}</q-chip>
</q-banner> </q-banner>
</div> </div>
</q-popup-proxy> </q-popup-proxy>
</span> </span>
</div>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
...@@ -140,15 +162,15 @@ ...@@ -140,15 +162,15 @@
</q-table> </q-table>
</template> </template>
<template v-else> <template v-else>
<div class="col-10" style="margin-bottom:20px;display:flex;" <div class="col-10" style="margin-bottom:20px;display:flex;" v-if="dataList&&dataList.length>0">
v-if="dataList.resultList&&dataList.resultList.length>0">
<div class="col-4" id="timeleft"> <div class="col-4" id="timeleft">
<div v-for="item in dataList.resultList"> <div v-for="item in dataList">
{{item.YearStr}}-{{item.MonthStr}}-{{item.DayStr}} {{item.YearStr}}-{{item.MonthStr}}-{{item.DayStr}}
</div> </div>
</div> </div>
<div class="col-4" id="timeright" style="padding-left:25px;margin-left:25px;width:80%;border-left: 1px solid #d1d1d1;"> <div class="col-4" id="timeright"
<div v-for="item in dataList.resultList" class="record_List"> style="padding-left:25px;margin-left:25px;width:80%;border-left: 1px solid #d1d1d1;">
<div v-for="item in dataList" class="record_List">
<div class="TeacherNameList"> <div class="TeacherNameList">
{{item.TeacherName}} {{item.TeacherName}}
<li class="cicle1" :class="{'reCordRed':item.ColorType==1,'reCordBlue':item.ColorType==2, <li class="cicle1" :class="{'reCordRed':item.ColorType==1,'reCordBlue':item.ColorType==2,
...@@ -162,9 +184,8 @@ ...@@ -162,9 +184,8 @@
</div> </div>
</div> </div>
</div> </div>
<q-pagination class="full-width justify-end" style="margin-bottom:80px;padding-right:43px;" v-model="msg.PageIndex" color="primary" :max="pageCount" <q-pagination class="full-width justify-end" style="margin-bottom:80px;padding-right:43px;"
:input="true" @input="changePage" /> v-model="msg.PageIndex" color="primary" :max="pageCount" :input="true" @input="changePage" />
</template> </template>
</div> </div>
</div> </div>
...@@ -197,10 +218,10 @@ ...@@ -197,10 +218,10 @@
School_Id: 0, School_Id: 0,
ClassId: 0 ClassId: 0
}, },
TeacherId:0, TeacherId: 0,
dataList: {}, dataList: [],
TeacherList: [], //关联老师下拉 TeacherList: [], //关联老师下拉
pageCount:0, pageCount: 0,
columns: [{ columns: [{
name: 'TeacherName', name: 'TeacherName',
label: '教师', label: '教师',
...@@ -213,6 +234,12 @@ ...@@ -213,6 +234,12 @@
field: 'YearStr', field: 'YearStr',
align: 'left', align: 'left',
}, },
{
name: 'ClassTime',
label: '上课时间',
field: 'ClassTime',
align: 'left'
},
{ {
name: 'CheckNum', name: 'CheckNum',
label: '签到数', label: '签到数',
...@@ -226,7 +253,7 @@ ...@@ -226,7 +253,7 @@
align: 'left' align: 'left'
} }
], ],
checkType:1, //默认列表模式 checkType: 1, //默认列表模式
} }
}, },
created() { created() {
...@@ -243,13 +270,14 @@ ...@@ -243,13 +270,14 @@
this.msg.ClassId = this.setingObj.ClassId; this.msg.ClassId = this.setingObj.ClassId;
this.msg.TeacherId = this.setingObj.Teacher_Id; this.msg.TeacherId = this.setingObj.Teacher_Id;
GetClassPlanLogPageList(this.msg).then(res => { GetClassPlanLogPageList(this.msg).then(res => {
console.log("res,", res.Data)
if (res.Code == 1) { if (res.Code == 1) {
this.dataList = res.Data.PageData; this.dataList = res.Data.PageData;
this.pageCount = res.Data.PageCount; this.pageCount = res.Data.PageCount;
} }
}) })
}, },
changeRecord(){ changeRecord() {
this.msg.School_Id = this.setingObj.School_Id; this.msg.School_Id = this.setingObj.School_Id;
this.msg.ClassId = this.setingObj.ClassId; this.msg.ClassId = this.setingObj.ClassId;
this.msg.TeacherId = this.TeacherId; this.msg.TeacherId = this.TeacherId;
......
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