Skip to content

C
confucius
Commit 51b7815f authored by 罗超's avatar 罗超
Browse files
Options

22

parent a75ba11d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 375 additions and 124 deletions
src/pages/studyAbroad/subscribe.vue
View file @ 51b7815f
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
emit-value emit-value
map-options map-options
label="老师" label="老师"
@input="getData"
/> />
</div> </div>
<div class="col-2"> <div class="col-2">
...@@ -25,6 +26,7 @@ ...@@ -25,6 +26,7 @@
emit-value emit-value
map-options map-options
label="教室" label="教室"
@input="getData"
/> />
</div> </div>
<div class="col-2"> <div class="col-2">
...@@ -38,6 +40,7 @@ ...@@ -38,6 +40,7 @@
emit-value emit-value
map-options map-options
label="课程类型" label="课程类型"
@input="getData"
/> />
</div> </div>
<div class="col-2"> <div class="col-2">
...@@ -51,13 +54,14 @@ ...@@ -51,13 +54,14 @@
emit-value emit-value
map-options map-options
label="约课状态" label="约课状态"
@input="getData"
/> />
</div> </div>
<!-- <div class="col-2"> <div class="col-2">
<q-field filled dense label="开始日期" stack-label> <q-field filled dense label="选择日期" stack-label>
<template v-slot:control> <template v-slot:control>
<el-date-picker <el-date-picker
v-model="msg.StartDate" v-model="selectedDate"
type="date" type="date"
size="mini" size="mini"
placeholder="开始日期" placeholder="开始日期"
...@@ -68,21 +72,6 @@ ...@@ -68,21 +72,6 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<div class="col-2">
<q-field filled dense label="结束日期" stack-label>
<template v-slot:control>
<el-date-picker
v-model="msg.EndDate"
type="date"
size="mini"
placeholder="结束日期"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
>>
</el-date-picker>
</template>
</q-field>
</div> -->
<div class="col-2"> <div class="col-2">
<q-select <q-select
filled filled
...@@ -97,10 +86,24 @@ ...@@ -97,10 +86,24 @@
/> />
</div> </div>
</div> </div>
<div class="row justify-center items-center"> <div class="row justify-center items-center q-mt-sm">
<q-btn dense flat label="上一周" @click="calendarPrev" /> <q-btn
dense
text-color="primary"
flat
unelevated
:label="viewType == 'day' ? '上一天' : '上一周'"
@click="calendarPrev"
/>
<q-separator vertical /> <q-separator vertical />
<q-btn dense flat label="下一周" @click="calendarNext" /> <q-btn
dense
text-color="primary"
flat
unelevated
:label="viewType == 'day' ? '下一天' : '下一周'"
@click="calendarNext"
/>
</div> </div>
<q-calendar <q-calendar
v-model="selectedDate" v-model="selectedDate"
...@@ -147,7 +150,6 @@ ...@@ -147,7 +150,6 @@
:key="__index" :key="__index"
class="my-event justify-center ellipsis courseItem" class="my-event justify-center ellipsis courseItem"
:class="badgeClasses(__item, 'body', _item.TeacherId)" :class="badgeClasses(__item, 'body', _item.TeacherId)"
style="overflow:auto"
:style=" :style="
badgeStyles( badgeStyles(
__item, __item,
...@@ -160,28 +162,84 @@ ...@@ -160,28 +162,84 @@
" "
@click.stop="showDetail(__item)" @click.stop="showDetail(__item)"
> >
<div v-if="viewType == 'day'"> <div v-if="viewType == 'day' || item.RList.length == 1">
<div class="itemRow">{{ _item.TeacherName }}</div> <div class="itemRow">{{ _item.TeacherName }}</div>
<div class="itemRow">{{ __item.CourseName }}</div> <div class="itemRow">{{ __item.CourseName }}</div>
<div>{{ __item.ClassName }}</div> <div>班级：{{ __item.ClassName }}</div>
<div>{{ __item.StartTime }}-{{ __item.EndTime }}</div> <div>{{ __item.StartTime }}-{{ __item.EndTime }}</div>
<div>类型：{{ __item.ClassType }}</div>
<div> <div>
进度:{{ 进度:{{
__item.TotalPlanNum < 0 ? 0 : __item.TotalPlanNum __item.TotalPlanNum < 0 ? 0 : __item.TotalPlanNum
}}% }}%
</div> </div>
<div>学员名单：{{ __item.GuestList }}</div>
</div> </div>
<el-popover placement="top-start" width="200" trigger="hover" v-if="viewType == 'week'"> <el-popover
placement="top-start"
width="200"
trigger="hover"
v-if="viewType == 'week' && item.RList.length > 1"
>
<div slot="reference" style="height:100vh"></div> <div slot="reference" style="height:100vh"></div>
<div> <div>
<div class="itemRow">{{ _item.TeacherName }}</div> <div class="flex">
<div class="itemRow">{{ __item.CourseName }}</div> <span class="detailLabel">老师：</span
<div>{{ __item.ClassName }}</div> ><span>{{ _item.TeacherName }}</span>
<div>{{ __item.StartTime }}-{{ __item.EndTime }}</div> </div>
<div class="flex">
<span class="detailLabel">教室：</span
>{{ __item.RoomName }}
</div>
<div class="flex no-wrap">
<span class="detailLabel">课程：</span
><span>{{ __item.CourseName }}</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel">班级：</span
><span>{{ __item.ClassName }}</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel">时间：</span
><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel">
类型：<span></span
><span v-if="__item.ClassType == 1">跟班</span
><span v-if="__item.ClassType == 2">试听课</span
><span v-if="__item.ClassType == 3">约课</span></span
>
</div>
<div class="flex no-wrap">
<span class="detailLabel">进度：</span
><span>{{ __item.Ranks }}/{{ __item.TotalPlanNum }}</span>
</div>
<div class="flex no-wrap">
<span class="detailLabel">学员：</span
><span>{{
__item.GuestList.map(e => e.GuestName).toString()
}}</span>
</div>
<div class="flex no-wrap" v-if="__item.ClassType == 3">
<span class="detailLabel">
预约状态：<span></span
><span v-if="__item.AppointState == 1">待确认</span
><span v-if="__item.AppointState == 2">已确认</span
></span
>
</div>
<div class="flex no-wrap">
<span class="">最小成班人数：</span
><span>{{ __item.ScrollMinNum }}</span>
</div>
<div class="flex no-wrap">
<span class="">最大成班人数：</span
><span>{{ __item.ScrollMaxNum }}</span>
</div>
<div> <div>
进度:{{
__item.TotalPlanNum < 0 ? 0 : __item.TotalPlanNum
}}%
</div> </div>
</div> </div>
</el-popover> </el-popover>
...@@ -201,13 +259,14 @@ ...@@ -201,13 +259,14 @@
<script> <script>
import { GetAppointmentPlanStat } from "../../api/studyabroad/subscribe.js"; import { GetAppointmentPlanStat } from "../../api/studyabroad/subscribe.js";
import {queryChapterTree} from "../../api/course/index";
import { date } from "quasar"; import { date } from "quasar";
import { import {
getTeacherDropDownList, getTeacherDropDownList,
queryClassRoomList queryClassRoomList
} from "../../api/school/index"; } from "../../api/school/index";
import SubscribeForm from "../../components/stuMan/subscribe/subscribeForm"; import SubscribeForm from "../../components/stuMan/subscribe/subscribeForm";
// import QCalendar from "@quasar/quasar-ui-qcalendar"; import QCalendar from "@quasar/quasar-ui-qcalendar";
export default { export default {
data() { data() {
...@@ -305,6 +364,7 @@ export default { ...@@ -305,6 +364,7 @@ export default {
}, },
mounted() { mounted() {
// console.log(336, this.$refs.calendar); // console.log(336, this.$refs.calendar);
this.selectedDate = QCalendar.today();
this.getTeacherList(); this.getTeacherList();
this.getclassroom(); this.getclassroom();
this.msg.StartDate = this.$refs.calendar.lastStart; this.msg.StartDate = this.$refs.calendar.lastStart;
...@@ -492,4 +552,8 @@ export default { ...@@ -492,4 +552,8 @@ export default {
border-radius: 0; border-radius: 0;
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
} }
.detailLabel {
width: 40px;
white-space: nowrap;
}
</style> </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