|
@@ -1,35 +1,19 @@
|
|
|
<template>
|
|
|
<div class="arrangeWork">
|
|
|
<m-header v-if="headerStatus" />
|
|
|
- <van-cell
|
|
|
- :title="classGroupName"
|
|
|
- title-style="font-size: .18rem; color: #333333;"
|
|
|
- >
|
|
|
+ <van-cell :title="classGroupName" title-style="font-size: .18rem; color: #333333;">
|
|
|
<template #extra>
|
|
|
- <van-tag type="primary" plain style="background-color: #f1fcf9"
|
|
|
- >课后训练</van-tag
|
|
|
- >
|
|
|
+ <van-tag type="primary" plain style="background-color: #f1fcf9">课后训练</van-tag>
|
|
|
</template>
|
|
|
</van-cell>
|
|
|
- <van-cell
|
|
|
- class="endTime"
|
|
|
- readonly
|
|
|
- is-link
|
|
|
- title-style="font-size: .16rem; color: #333333;"
|
|
|
- @click="studentStatus = true"
|
|
|
- >
|
|
|
+ <van-cell class="endTime" readonly is-link title-style="font-size: .16rem; color: #333333;" @click="studentStatus = true">
|
|
|
<template #title>
|
|
|
<span style="padding-right: 0.3rem"
|
|
|
- >学员共<i style="font-style: normal; color: #01c1b5">{{
|
|
|
- params.studentCount
|
|
|
- }}</i
|
|
|
+ >学员共<i style="font-style: normal; color: #01c1b5">{{ params.studentCount }}</i
|
|
|
>人</span
|
|
|
>
|
|
|
<span
|
|
|
- >会员
|
|
|
- <i style="font-style: normal; color: #ff802c">{{
|
|
|
- params.studentMemberCount
|
|
|
- }}</i
|
|
|
+ >会员 <i style="font-style: normal; color: #ff802c">{{ params.studentMemberCount }}</i
|
|
|
>人</span
|
|
|
>
|
|
|
</template>
|
|
@@ -38,25 +22,12 @@
|
|
|
<div class="formGroup">
|
|
|
<div class="dot"></div>
|
|
|
<div class="formTitle">训练标题</div>
|
|
|
- <van-field
|
|
|
- v-model="title"
|
|
|
- type="text"
|
|
|
- maxlength="25"
|
|
|
- show-word-limit
|
|
|
- placeholder="请输入训练标题"
|
|
|
- />
|
|
|
+ <van-field v-model="title" type="text" maxlength="25" show-word-limit placeholder="请输入训练标题" />
|
|
|
</div>
|
|
|
<div class="formGroup">
|
|
|
<div class="dot"></div>
|
|
|
<div class="formTitle">训练内容</div>
|
|
|
- <van-field
|
|
|
- rows="4"
|
|
|
- v-model="content"
|
|
|
- maxlength="600"
|
|
|
- show-word-limit
|
|
|
- type="textarea"
|
|
|
- placeholder="请输入训练内容"
|
|
|
- />
|
|
|
+ <van-field rows="4" v-model="content" maxlength="600" show-word-limit type="textarea" placeholder="请输入训练内容" />
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- <van-cell
|
|
@@ -77,28 +48,10 @@
|
|
|
</template>
|
|
|
</van-cell> -->
|
|
|
|
|
|
- <div class="accompanyHeader">
|
|
|
- 云教练曲目选择<span>(若作业内容非云教练曲目则无需选择)</span>
|
|
|
- </div>
|
|
|
+ <div class="accompanyHeader">云练习曲目选择<span>(若作业内容非云练习曲目则无需选择)</span></div>
|
|
|
<van-tabs v-model="tabActive" color="#01C1B5">
|
|
|
- <van-tab
|
|
|
- v-for="(item, i) in params.subjectList"
|
|
|
- :title="item.subjectName"
|
|
|
- :name="item.id"
|
|
|
- :key="i"
|
|
|
- class="van-hairline--bottom"
|
|
|
- >
|
|
|
- <van-cell
|
|
|
- class="endTime"
|
|
|
- v-for="(music, index) in item.musicScoreIdList"
|
|
|
- :key="index"
|
|
|
- style="margin-top: 0; padding: 0.12rem 0.21rem"
|
|
|
- title="训练曲目"
|
|
|
- @click="onSelectAccompany(item, index)"
|
|
|
- readonly
|
|
|
- is-link
|
|
|
- placeholder="请选择训练曲目"
|
|
|
- >
|
|
|
+ <van-tab v-for="(item, i) in params.subjectList" :title="item.subjectName" :name="item.id" :key="i" class="van-hairline--bottom">
|
|
|
+ <van-cell class="endTime" v-for="(music, index) in item.musicScoreIdList" :key="index" style="margin-top: 0; padding: 0.12rem 0.21rem" title="训练曲目" @click="onSelectAccompany(item, index)" readonly is-link placeholder="请选择训练曲目">
|
|
|
<template #title>
|
|
|
<div class="dot"></div>
|
|
|
训练曲目
|
|
@@ -110,92 +63,43 @@
|
|
|
<span v-else style="color: #808080">请选择</span>
|
|
|
</template>
|
|
|
<template #right-icon>
|
|
|
- <span
|
|
|
- v-if="music.name"
|
|
|
- @click.stop="delAccompany(item.musicScoreIdList, index)"
|
|
|
- style="color: #999999; font-size: 0.12rem; padding-left: 0.12rem"
|
|
|
- ><van-icon size="14" name="delete-o" />删除</span
|
|
|
- >
|
|
|
+ <span v-if="music.name" @click.stop="delAccompany(item.musicScoreIdList, index)" style="color: #999999; font-size: 0.12rem; padding-left: 0.12rem"><van-icon size="14" name="delete-o" />删除</span>
|
|
|
</template>
|
|
|
<template #extra>
|
|
|
<!-- <span><van-icon name="delete-o" />删除</span> -->
|
|
|
- <span
|
|
|
- style="
|
|
|
- height: 24px;
|
|
|
- font-size: 16px;
|
|
|
- line-height: 24px;
|
|
|
- color: #dadada !important;
|
|
|
- "
|
|
|
- ><van-icon name="arrow"
|
|
|
- /></span>
|
|
|
+ <span style="height: 24px; font-size: 16px; line-height: 24px; color: #dadada !important"><van-icon name="arrow" /></span>
|
|
|
</template>
|
|
|
</van-cell>
|
|
|
- <div
|
|
|
- class="addAccompaniment"
|
|
|
- v-if="item.musicScoreIdList.length < 3"
|
|
|
- @click="addCloud(item)"
|
|
|
- >
|
|
|
- <van-icon name="plus" size="16px" />增加云教练训练曲目
|
|
|
- </div>
|
|
|
+ <div class="addAccompaniment" v-if="item.musicScoreIdList.length < 3" @click="addCloud(item)"><van-icon name="plus" size="16px" />增加云练习训练曲目</div>
|
|
|
</van-tab>
|
|
|
</van-tabs>
|
|
|
|
|
|
<div class="button-group">
|
|
|
- <van-button type="primary" round size="large" @click="onSubmit"
|
|
|
- >确定</van-button
|
|
|
- >
|
|
|
+ <van-button type="primary" round size="large" @click="onSubmit">确定</van-button>
|
|
|
</div>
|
|
|
|
|
|
<!-- 日期开始弹窗 -->
|
|
|
<van-popup position="bottom" v-model="dateSection.status">
|
|
|
- <van-datetime-picker
|
|
|
- v-model="dateSection.currentDate"
|
|
|
- type="date"
|
|
|
- :min-date="dateSection.minDate"
|
|
|
- :max-date="dateSection.maxDate"
|
|
|
- :formatter="formatter"
|
|
|
- @confirm="confirmStartTime()"
|
|
|
- @cancel="dateSection.status = false"
|
|
|
- />
|
|
|
+ <van-datetime-picker v-model="dateSection.currentDate" type="date" :min-date="dateSection.minDate" :max-date="dateSection.maxDate" :formatter="formatter" @confirm="confirmStartTime()" @cancel="dateSection.status = false" />
|
|
|
</van-popup>
|
|
|
|
|
|
- <van-popup
|
|
|
- position="bottom"
|
|
|
- v-model="accompanimentStatus"
|
|
|
- :style="{ height: '100%' }"
|
|
|
- style="border-radius: 0; overflow: inherit"
|
|
|
- >
|
|
|
+ <van-popup position="bottom" v-model="accompanimentStatus" :style="{ height: '100%' }" style="border-radius: 0; overflow: inherit">
|
|
|
<!-- <van-sticky>
|
|
|
<m-header name="作业曲目" :backUrl="backUrl" />
|
|
|
</van-sticky> -->
|
|
|
<!-- <accompaniment-modal @onSelectMusic="onSelectMusic" ref="accompaniment" style="margin-bottom: 0.8rem;" :searchSubjectId="tabActive" /> -->
|
|
|
<!-- style="margin-bottom: 0.8rem;" -->
|
|
|
- <workModel
|
|
|
- @onSelectMusic="onSelectMusic"
|
|
|
- @close="accompanimentStatus = false"
|
|
|
- ref="accompaniment"
|
|
|
- :searchSubjectId="tabActive"
|
|
|
- />
|
|
|
+ <workModel @onSelectMusic="onSelectMusic" @close="accompanimentStatus = false" ref="accompaniment" :searchSubjectId="tabActive" />
|
|
|
<!-- <div class="button-group-popup">
|
|
|
<span class="btn" @click="accompanimentStatus = false">关闭</span>
|
|
|
</div> -->
|
|
|
</van-popup>
|
|
|
|
|
|
- <van-popup
|
|
|
- v-model="studentStatus"
|
|
|
- :lock-scroll="true"
|
|
|
- position="bottom"
|
|
|
- :style="{ height: '180%' }"
|
|
|
- >
|
|
|
+ <van-popup v-model="studentStatus" :lock-scroll="true" position="bottom" :style="{ height: '180%' }">
|
|
|
<!-- <van-sticky>
|
|
|
<m-header name="学员列表" :backUrl="backUrlStudent" />
|
|
|
</van-sticky> -->
|
|
|
- <student-list-model
|
|
|
- :dataList="dataList"
|
|
|
- style="margin-bottom: 0.8rem"
|
|
|
- @close="studentStatus = false"
|
|
|
- :dataSubjectList="dataSubjectList"
|
|
|
- ></student-list-model>
|
|
|
+ <student-list-model :dataList="dataList" style="margin-bottom: 0.8rem" @close="studentStatus = false" :dataSubjectList="dataSubjectList"></student-list-model>
|
|
|
</van-popup>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -390,9 +294,7 @@ export default {
|
|
|
this.accompanimentStatus = false;
|
|
|
},
|
|
|
confirmStartTime() {
|
|
|
- this.dateSection.showStartDate = dayjs(
|
|
|
- this.dateSection.currentDate
|
|
|
- ).format("YYYY年MM月DD日");
|
|
|
+ this.dateSection.showStartDate = dayjs(this.dateSection.currentDate).format("YYYY年MM月DD日");
|
|
|
this.dateSection.status = false;
|
|
|
},
|
|
|
onEndTime() {
|
|
@@ -432,17 +334,11 @@ export default {
|
|
|
musicScoreHomeworkDtoList: scoreList,
|
|
|
});
|
|
|
});
|
|
|
- if (
|
|
|
- notAccompanySong.length - subjectLength <= 0 &&
|
|
|
- notAccompanySong != 0 &&
|
|
|
- type[0] != 1
|
|
|
- ) {
|
|
|
+ if (notAccompanySong.length - subjectLength <= 0 && notAccompanySong != 0 && type[0] != 1) {
|
|
|
// console.log('选择曲目')
|
|
|
this.$dialog
|
|
|
.confirm({
|
|
|
- message:
|
|
|
- notAccompanySong.join(",") +
|
|
|
- "声部未选择云教练训练曲目,是否继续布置作业?",
|
|
|
+ message: notAccompanySong.join(",") + "声部未选择云练习训练曲目,是否继续布置作业?",
|
|
|
confirmButtonColor: "#01C1B5",
|
|
|
})
|
|
|
.then(() => {
|
|
@@ -475,10 +371,7 @@ export default {
|
|
|
this.$toast("作业布置成功");
|
|
|
setTimeout(() => {
|
|
|
let query = this.$route.query;
|
|
|
- const path =
|
|
|
- query.isNewJoin == 1
|
|
|
- ? "/afterClassEvaluateDetail"
|
|
|
- : "/courseEvaluation";
|
|
|
+ const path = query.isNewJoin == 1 ? "/afterClassEvaluateDetail" : "/courseEvaluation";
|
|
|
this.$router.replace({
|
|
|
path,
|
|
|
query: {
|
|
@@ -516,8 +409,7 @@ export default {
|
|
|
margin-left: 0.1rem;
|
|
|
width: 0.1rem;
|
|
|
height: 0.07rem;
|
|
|
- background: url("../../assets/images/audition/arrow_down.png") no-repeat
|
|
|
- center center;
|
|
|
+ background: url("../../assets/images/audition/arrow_down.png") no-repeat center center;
|
|
|
background-size: 100%;
|
|
|
}
|
|
|
|