Merge branch 'online' of http://git.dayaedu.com/lex/mteacher into online

dist/css/CourseEvaluation.65b5c304.css

@@ -1 +0,0 @@
-[data-v-00fbc00b] .van-cell-group{margin-top:.15rem}[data-v-00fbc00b] .van-cell-group /deep/ .van-cell{padding:.14rem .16rem}.title-item[data-v-00fbc00b]{display:-webkit-box;display:-ms-flexbox;display:flex;padding:.05rem 0}.title-item .text[data-v-00fbc00b]{margin-right:.15rem;font-size:.17rem;color:#1a1a1a}.title-item[data-v-00fbc00b] .van-rate{line-height:0}[data-v-00fbc00b] .van-cell__title{font-size:.17rem;color:#1a1a1a;-webkit-box-flex:1;-ms-flex:auto 1;flex:auto 1}[data-v-00fbc00b] .van-cell__value,[data-v-00fbc00b] .van-field__control{font-size:.17rem;color:#666;width:70%;-webkit-box-flex:1;-ms-flex:auto;flex:auto}.textarea[data-v-00fbc00b]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.textarea[data-v-00fbc00b] .van-cell__value{margin-top:.1rem;width:100%}.twoConnect[data-v-00fbc00b]{width:55%}[data-v-00fbc00b] .van-radio-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-00fbc00b] .van-radio-group /deep/ .van-radio{margin-left:.18rem}[data-v-00fbc00b] .van-radio__icon .van-icon{border-color:#aaa}[data-v-00fbc00b] .van-radio__icon--checked .van-icon{border-color:#14928a;background:#14928a}.button-group[data-v-00fbc00b]{margin:.3rem .26rem .2rem}.button-group .van-button--primary[data-v-00fbc00b]{background:#14928a;border:1px solid #14928a;font-size:.18rem}

dist/css/CourseEvaluation.ca907b48.css

@@ -0,0 +1 @@
+[data-v-9da5925e] .van-cell-group{margin-top:.15rem}[data-v-9da5925e] .van-cell-group /deep/ .van-cell{padding:.14rem .16rem}.title-item[data-v-9da5925e]{display:-webkit-box;display:-ms-flexbox;display:flex;padding:.05rem 0}.title-item .text[data-v-9da5925e]{margin-right:.15rem;font-size:.17rem;color:#1a1a1a}.title-item[data-v-9da5925e] .van-rate{line-height:0}[data-v-9da5925e] .van-cell__title{font-size:.17rem;color:#1a1a1a;-webkit-box-flex:1;-ms-flex:auto 1;flex:auto 1}[data-v-9da5925e] .van-cell__value,[data-v-9da5925e] .van-field__control{font-size:.17rem;color:#666;width:70%;-webkit-box-flex:1;-ms-flex:auto;flex:auto}.textarea[data-v-9da5925e]{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.textarea[data-v-9da5925e] .van-cell__value{margin-top:.1rem;width:100%}.twoConnect[data-v-9da5925e]{width:55%}[data-v-9da5925e] .van-radio-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}[data-v-9da5925e] .van-radio-group /deep/ .van-radio{margin-left:.18rem}[data-v-9da5925e] .van-radio__icon .van-icon{border-color:#aaa}[data-v-9da5925e] .van-radio__icon--checked .van-icon{border-color:#14928a;background:#14928a}.button-group[data-v-9da5925e]{margin:.3rem .26rem .2rem}.button-group .van-button--primary[data-v-9da5925e]{background:#14928a;border:1px solid #14928a;font-size:.18rem}

src/api/teacher.js

@@ -41,6 +41,15 @@ const findSubSubjects = (data) => {
   })
 }
 
+// 所有声部
+const subjectFindSubSubjects = (data) => {
+  return axios({
+    url: api + '/subject/findSubSubjects',
+    method: 'get',
+    params: data
+  })
+}
+
 // vip课类别
 const vipGroupCategory = (data) => {
   return axios({
@@ -351,6 +360,7 @@ export {
   queryMyCreatedList,
   queryWaitList,
   queryProcessedList,
+  subjectFindSubSubjects,
   findSubSubjects,
   vipGroupCategory,
   findByVipGroupCategory,

src/views/app/CourseApply.vue

@@ -89,7 +89,7 @@
 /* eslint-disable */
 import MHeader from '@/components/MHeader'
 import { browser, calcMinute }  from '@/common/common'
-import { findSubSubjects } from '@/api/teacher'
+import { subjectFindSubSubjects } from '@/api/teacher'
 import { createCourseGroup, sysTenantAccountGet } from '@/api/app'
 let minutes = []  // 分钟数
 for(let i = 0; i < 60; i++) {
@@ -215,7 +215,7 @@ export default {
         onLoadingData() { // 加载数据
             let sheetForm = this.sheetForm
             if(sheetForm.currentType == 'subjectList') { // 声部列表
-                findSubSubjects().then(res => {
+                subjectFindSubSubjects().then(res => {
                     let result = res.data
                     if(result.code == 200 && result.data.length > 0) {
                         let tempArr = []

src/views/app/CourseDetail.vue

@@ -15,7 +15,7 @@
             <van-cell title="班级学员" :value="teacherClassHeadInfo.studentNames" />
         </van-cell-group>
         <van-cell-group>
-            <van-field class="textarea" maxlength="255" autosize label="教学内容" type="textarea" v-model="teachingMaterial" readonly />
+            <van-field class="textarea" maxlength="255" autosize label="教学内容" type="textarea" v-model="teachingMaterial" :readonly="teachingMaterialStatus" placeholder="请输入1-255字" />
         </van-cell-group>
         
         <div v-if="courseScheduleComplaints.length > 0">
@@ -47,12 +47,12 @@
         </div>
         <div v-else>
             <van-cell center title="是否对所有学生评价">
-                <van-switch v-model="checked" slot="right-icon" size="24" />
+                <van-switch v-model="checked" slot="right-icon" />
             </van-cell>
 
             <van-panel title="评论给所有学生" class="evaluation-panel" v-if="checked">
                 <div slot="default">
-                    <van-field rows="3" v-model="contentall" autosize type="textarea" placeholder="请输入1-255字" />
+                    <van-field rows="3" maxlength="255" v-model="contentall" autosize type="textarea" placeholder="请输入1-255字" />
                 </div>
             </van-panel>
 
@@ -92,6 +92,7 @@ export default {
             checked: true,
             courseId: query.courseId,
             teachingMaterial: null,
+            teachingMaterialStatus: false,
             teacherClassHeadInfo: {},
             courseScheduleReview: [], // 学生评价
             courseScheduleComplaints: [], // 老师评价
@@ -131,6 +132,7 @@ export default {
                     let tempResult = result.data
                     if(tempResult) {
                         this.teachingMaterial = tempResult.teachingMaterial
+                        this.teachingMaterialStatus = tempResult.teachingMaterial ? true : false
                         this.teacherClassHeadInfo = tempResult.teacherClassHeadInfo ? tempResult.teacherClassHeadInfo : {}
                         if(this.teacherClassHeadInfo.classDate) {
                             this.teacherClassHeadInfo.classTime = this.teacherClassHeadInfo.classDate + ' ' + this.teacherClassHeadInfo.startClassTime + '-' + this.teacherClassHeadInfo.endClassTime
@@ -160,9 +162,10 @@ export default {
                 this.$toast('请输入学生评价')
                 return
             }
+            let tempStatus = false
             students.forEach(item => {
                 if(!this.checked && !item.content) {
-                    this.$toast('请输入学生评价')
+                    tempStatus = true
                     return
                 }
                 params.push({
@@ -172,6 +175,10 @@ export default {
                     "teachingMaterial": this.teachingMaterial
                 })
             })
+            if(tempStatus) {
+                this.$toast('请输入学生评价')
+                return
+            }
             this.$toast.loading({
                 duration: 0,
                 message: '加载中...',

src/views/audition/CourseEvaluation.vue

@@ -192,18 +192,18 @@ export default {
         this.$toast("请填写曲目");
         return;
       }
-      if (!this.pronunciation) {
-        this.$toast("请给发音打分");
-        return;
-      }
-      if (!this.tempo) {
-        this.$toast("请给节奏打分");
-        return;
-      }
-      if (!this.musicTheory) {
-        this.$toast("请给乐理打分");
-        return;
-      }
+      // if (!this.pronunciation) {
+      //   this.$toast("请给发音打分");
+      //   return;
+      // }
+      // if (!this.tempo) {
+      //   this.$toast("请给节奏打分");
+      //   return;
+      // }
+      // if (!this.musicTheory) {
+      //   this.$toast("请给乐理打分");
+      //   return;
+      // }
       if (!this.memo) {
         this.$toast("请输入备注");
         return;