Skip to content

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

页面修改

parent b5834441
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 367 additions and 471 deletions
src/components/course/classmate-form.vue
View file @ f4b5bd60
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
</thead> </thead>
</table> </table>
<div class="planTabDiv" ref="planTabDiv"> <div class="planTabDiv" ref="planTabDiv">
<table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;"> <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;" v-loading="loading">
<tbody> <tbody>
<tr v-for="(item,index) in dataList.fridayList" :key="index"> <tr v-for="(item,index) in dataList.fridayList" :key="index">
<td> <td>
...@@ -176,6 +176,10 @@ ...@@ -176,6 +176,10 @@
type: Object, type: Object,
default: null default: null
}, },
loading:{
type:Boolean,
default:false,
}
}, },
components: { components: {
mateitem, mateitem,
......
src/pages/stuMan/classPlan.vue
View file @ f4b5bd60
This diff is collapsed.
src/pages/stuMan/classRecord.vue
View file @ f4b5bd60
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="true" <teachTable v-if="commonType == 2" :tableData="tableData" :PageCount="PageCount" :setMsg="tabMsg" :showCZ="true"
@getChange="getChange"></teachTable> @getChange="getChange" :loading="loading"></teachTable>
</div> </div>
</template> </template>
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
TeacherId: 0, TeacherId: 0,
ClassRoomId: 0, ClassRoomId: 0,
dataList: {}, dataList: {},
loading:false,
msg: { msg: {
StartTime: "", StartTime: "",
EndTime: "", EndTime: "",
...@@ -211,7 +212,9 @@ ...@@ -211,7 +212,9 @@
this.tabMsg.ClassRoomId = this.msg.ClassRoomId; this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
this.tabMsg.ClassType = this.msg.ClassType; this.tabMsg.ClassType = this.msg.ClassType;
this.tabMsg.TeacherId=this.msg.TeacherId; this.tabMsg.TeacherId=this.msg.TeacherId;
this.loading=true;
GetClassPlanStatisticalPage(this.tabMsg).then((res) => { GetClassPlanStatisticalPage(this.tabMsg).then((res) => {
this.loading=false;
if (res.Code == 1) { if (res.Code == 1) {
this.tableData = res.Data.PageData; this.tableData = res.Data.PageData;
this.PageCount = res.Data.PageCount; this.PageCount = res.Data.PageCount;
......
src/pages/teacher/components/teachTable.vue
View file @ f4b5bd60
<template> <template>
<div style="padding: 20px 0"> <div style="padding: 20px 0">
<div class="page-content"> <div class="page-content">
<q-table <q-table :pagination="setMsg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
:pagination="setMsg" separator="none" :data="tableData" :columns="showCZ ? columns : columns2" row-key="name">
no-data-label="暂无相关数据"
flat
class="sticky-column-table sticky-right-column-table"
separator="none"
:data="tableData"
:columns="showCZ ? columns : columns2"
row-key="name"
>
<template v-slot:body-cell-GuestList="props"> <template v-slot:body-cell-GuestList="props">
<q-td auto-width :props="props"> <q-td auto-width :props="props">
<span <span v-for="(item, index) in props.row.GuestList" style="margin-right: 5px" :key="index">
v-for="(item, index) in props.row.GuestList"
style="margin-right: 5px"
>
{{ item.GuestName }} {{ item.GuestName }}
</span> </span>
</q-td> </q-td>
...@@ -31,198 +20,178 @@ ...@@ -31,198 +20,178 @@
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td> <q-td>
<q-btn <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
flat style="font-weight: 400" label="课程回顾" @click="goCourseRecord(props.row)" />
size="xs" <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType == 1" color="accent"
icon="iconfont icon-view" style="font-weight: 400" label="课程反馈" @click="goFeedBack(props.row)" />
v-if="props.row.ClassType == 1"
color="accent"
style="font-weight: 400"
label="课程回顾"
@click="goCourseRecord(props.row)"
/>
<q-btn
flat
size="xs"
icon="iconfont icon-view"
v-if="props.row.ClassType == 1"
color="accent"
style="font-weight: 400"
label="课程反馈"
@click="goFeedBack(props.row)"
/>
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
<q-pagination <q-pagination class="full-width justify-end" v-model="PageIndex" color="primary" :max="PageCount"
class="full-width justify-end" :input="true" @input="changePage" />
v-model="PageIndex"
color="primary"
:max="PageCount"
:input="true"
@input="changePage"
/>
</template> </template>
</q-table> </q-table>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
setMsg: { setMsg: {
type: Object, type: Object,
default: null, default: null,
}, },
tableData: { tableData: {
type: Array, type: Array,
default: null, default: null,
}, },
PageCount: { PageCount: {
type: Number, type: Number,
default: null, default: null,
},
showCZ: {
//是否显示操作栏
Type: Boolean,
default: true,
},
loading:{
type:Boolean,
default:false,
}
}, },
showCZ: { meta: {
//是否显示操作栏 title: "我的课表",
Type: Boolean,
default: true,
}, },
}, components: {},
meta: { data() {
title: "我的课表", return {
}, columns: [{
components: {}, name: "ClassDate",
data() { label: "日期",
return { field: "ClassDate",
columns: [ align: "left",
{ },
name: "ClassDate", {
label: "日期", name: "StartTime",
field: "ClassDate", label: "上课时间",
align: "left", field: "StartTime",
}, align: "left",
{ },
name: "StartTime", {
label: "上课时间", name: "ClassName",
field: "StartTime", label: "班级",
align: "left", field: "ClassName",
}, align: "left",
{ },
name: "ClassName", {
label: "班级", name: "CourseName",
field: "ClassName", label: "课程名称",
align: "left", field: "CourseName",
}, align: "left",
{ },
name: "CourseName", {
label: "课程名称", name: "GuestList",
field: "CourseName", label: "学员名称",
align: "left", field: "GuestList",
}, align: "left",
{ },
name: "GuestList", {
label: "学员名称", name: "TeacherName",
field: "GuestList", label: "教师",
align: "left", field: "TeacherName",
}, align: "left",
{ },
name: "TeacherName", {
label: "教师", name: "TotalPlanNum",
field: "TeacherName", label: "课程进度",
align: "left", field: "TotalPlanNum",
}, align: "left",
{ },
name: "TotalPlanNum", {
label: "课程进度", name: "optioned",
field: "TotalPlanNum", label: "操作",
align: "left", field: "Id",
}, },
{ ],
name: "optioned", columns2: [{
label: "操作", name: "ClassDate",
field: "Id", label: "日期",
field: "ClassDate",
align: "left",
},
{
name: "StartTime",
label: "上课时间",
field: "StartTime",
align: "left",
},
{
name: "ClassName",
label: "班级",
field: "ClassName",
align: "left",
},
{
name: "CourseName",
label: "课程名称",
field: "CourseName",
align: "left",
},
{
name: "GuestList",
label: "学员名称",
field: "GuestList",
align: "left",
},
{
name: "TeacherName",
label: "教师",
field: "TeacherName",
align: "left",
},
{
name: "TotalPlanNum",
label: "课程进度",
field: "TotalPlanNum",
align: "left",
},
],
tabMsg: {
PageIndex: 1,
PageSize: 15,
rowsPerPage: 15,
StartTime: "",
EndTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassType: 0,
}, },
],
columns2: [
{
name: "ClassDate",
label: "日期",
field: "ClassDate",
align: "left",
},
{
name: "StartTime",
label: "上课时间",
field: "StartTime",
align: "left",
},
{
name: "ClassName",
label: "班级",
field: "ClassName",
align: "left",
},
{
name: "CourseName",
label: "课程名称",
field: "CourseName",
align: "left",
},
{
name: "GuestList",
label: "学员名称",
field: "GuestList",
align: "left",
},
{
name: "TeacherName",
label: "教师",
field: "TeacherName",
align: "left",
},
{
name: "TotalPlanNum",
label: "课程进度",
field: "TotalPlanNum",
align: "left",
},
],
tabMsg: {
PageIndex: 1, PageIndex: 1,
PageSize: 15, };
rowsPerPage: 15,
StartTime: "",
EndTime: "",
TeacherId: 0,
ClassRoomId: 0,
ClassType: 0,
},
PageIndex: 1,
};
},
created() {},
mounted() {},
methods: {
//翻页
changePage(val) {
this.PageIndex = val;
this.$emit("getChange", this.PageIndex);
},
//跳转到课程回顾
goCourseRecord(item) {
this.OpenNewUrl("../../classroom/courseInfo", {
id: item.Id,
});
}, },
//跳转到课程反馈 created() {},
goFeedBack(item) { mounted() {},
this.OpenNewUrl("/teacher/feedBackList", { methods: {
id: item.Id, //翻页
}); changePage(val) {
this.PageIndex = val;
this.$emit("getChange", this.PageIndex);
},
//跳转到课程回顾
goCourseRecord(item) {
this.OpenNewUrl("../../classroom/courseInfo", {
id: item.Id,
});
},
//跳转到课程反馈
goFeedBack(item) {
this.OpenNewUrl("/teacher/feedBackList", {
id: item.Id,
});
},
}, },
}, };
};
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
\ No newline at end of file
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