Browse Source

修改判断

lex-xin 4 years ago
parent
commit
693ecc3f19

File diff suppressed because it is too large
+ 0 - 0
dist/app.c560ae800c33bb7d555a.js


File diff suppressed because it is too large
+ 0 - 0
dist/css/CourseEvaluation.1e7db8e0.css


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseEvaluation.b6ecafdc.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/CourseEvaluation.fe61b314.js


+ 24 - 0
src/common/vueFilters.js

@@ -12,6 +12,30 @@ Vue.filter('bandStatus', value => {
     return templateStatus[value]
 })
 
+// 课程类型
+Vue.filter('coursesType', (value) => {
+    let template = {
+      NORMAL: '单技课',
+      SINGLE: '单技课',
+      MIX: "合奏课",
+      HIGH: "基础技能课",
+      VIP: "VIP课",
+      DEMO: "试听课",
+      COMPREHENSIVE: '综合课',
+      ENLIGHTENMENT: '启蒙课',
+      TRAINING: '集训课',
+      TRAINING_SINGLE: '集训单技课',
+      TRAINING_MIX: '集训合奏课',
+      CLASSROOM: '课堂课',
+      PRACTICE: '网管课',
+      COMM: '对外课',
+      MUSIC: '乐团课',
+      HIGH_ONLINE: '线上基础技能课',
+      MUSIC_NETWORK: '乐团网管课'
+    }
+    return template[value]
+  })
+
 // 合并数组
 Vue.filter('joinArray', (value, type) => {
     if (!type) {

+ 14 - 3
src/views/audition/CourseEvaluation.vue

@@ -5,6 +5,13 @@
       <van-cell title="课程班名称" :value="classGroupName" />
     </van-cell-group>
     <van-cell-group>
+      <van-cell title="课程类型" >
+        <template #default>
+          {{ classType | coursesType }}
+        </template>
+      </van-cell>
+    </van-cell-group>
+    <van-cell-group>
       <van-cell title="上课时间" :value="classTimer" />
     </van-cell-group>
     <van-cell-group>
@@ -70,7 +77,7 @@
         placeholder="请输入(1-255字)"
       />
     </van-cell-group> -->
-    <van-cell-group>
+    <van-cell-group v-if="classType != 'VIP'">
       <van-cell title="是否完成双向沟通" value-class="twoConnect">
         <template slot="default">
           <van-radio-group required v-model="hasLiaison" direction="horizontal">
@@ -80,7 +87,7 @@
         </template>
       </van-cell>
     </van-cell-group>
-<!-- 
+<!--
     <van-cell-group v-if="isReset">
       <van-cell title="是否完成作业" value-class="twoConnect">
         <template slot="default">
@@ -134,6 +141,7 @@ export default {
       reviewId: null,
       classTimer: null,
       classGroupName: null,
+      classType: null, // 课程类型
       teachingMaterial: null, //教材
       song: null, // 曲目
       pronunciation: null, // 发音
@@ -191,6 +199,7 @@ export default {
             teacherClassHeadInfo.endClassTime;
           this.subjectNames = teacherClassHeadInfo.subjectNames;
           this.classGroupName = teacherClassHeadInfo.classGroupName;
+          this.classType = teacherClassHeadInfo.courseScheduleType
 
           // 评价内容
           let courseScheduleReview = result.courseScheduleReview
@@ -216,6 +225,7 @@ export default {
             result.endClassTime;
           this.subjectNames = result.subjectNames;
           this.classGroupName = result.classGroupName;
+          this.classType = result.courseScheduleType
         }
       });
     }
@@ -234,7 +244,8 @@ export default {
         this.$toast("请输入备注");
         return;
       }
-      if (!this.hasLiaison) {
+      // VIP课程是没有双向沟通的
+      if (!this.hasLiaison && this.classType != 'VIP') {
         this.$toast("请勾选双向沟通");
         return;
       }

+ 2 - 2
vue.config.js

@@ -1,7 +1,7 @@
 // let targetUrl = 'http://mteadev.dayaedu.com'
-let targetUrl = 'http://192.168.3.139:8000' // 箭河
+// let targetUrl = 'http://192.168.3.139:8000' // 箭河
 // let targetUrl = 'https://online.dayaedu.com'
-// let targetUrl = 'http://testadm.dayaedu.com/'
+let targetUrl = 'http://admin.dayaedu.com/'
 // let targetUrl = 'http://192.168.3.48:8080'
 module.exports = {
   chainWebpack: config => {

Some files were not shown because too many files changed in this diff