dusenyao há 3 anos atrás
pai
commit
7421c1fc98
2 ficheiros alterados com 59 adições e 49 exclusões
  1. 7 17
      src/views/main/TaskList.vue
  2. 52 32
      src/views/task_details/teacher/index.vue

+ 7 - 17
src/views/main/TaskList.vue

@@ -35,7 +35,7 @@
           <div class="tasks-group-list">
             <div v-for="list in item.task_list" :key="list.id" class="tasks-group-list-info">
               <div class="tasks-group-list-info-name">
-                <span @click="taskLink_outside(list.teaching_type, list.id)">
+                <span @click="taskLink_outside(list.id)">
                   {{ timeType(list.time_type) }}任务:{{ list.name }}
                 </span>
                 <el-link
@@ -125,22 +125,12 @@ export default {
       }
     },
 
-    taskLink_outside(type, task_id) {
-      let userType = this.$store.state.user.user_type;
-      if (type === 10 && userType === 'TEACHER') {
-        CreateEnterLiveRoomSession({
-          task_id
-        }).then(({ live_room_sys_user_id, room_id, session_id, room_user_id }) => {
-          this.$router.push({
-            path: `/live/teacher`,
-            query: { live_room_sys_user_id, room_id, session_id, task_id, room_user_id }
-          });
-        });
-      } else {
-        this.$router.push(
-          `/task_detail/${userType === 'STUDENT' ? 'student' : 'teacher'}/${task_id}`
-        );
-      }
+    taskLink_outside(task_id) {
+      this.$router.push(
+        `/task_detail/${
+          this.$store.state.user.user_type === 'STUDENT' ? 'student' : 'teacher'
+        }/${task_id}`
+      );
     },
 
     dateSkip(num) {

+ 52 - 32
src/views/task_details/teacher/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="teacher-task-detail">
+  <div v-loading="loading" class="teacher-task-detail">
     <task-top :item-info="itemInfo" />
 
     <div class="teacher-task-detail-main">
@@ -65,6 +65,14 @@
           </div>
           <div class="title">学生留言</div>
           <div>{{ curFinishDetail.student_message }}</div>
+          <template v-if="teaching_type === 10">
+            <div class="title">学员课后评价</div>
+            <div>{{ student_remark }}</div>
+            <div class="title">
+              <span>学员课后评分</span>
+              <el-rate v-model="student_score" disabled />
+            </div>
+          </template>
           <div class="title">
             <span>教师点评</span>
             <el-rate v-model="teacher_score"></el-rate>
@@ -133,46 +141,54 @@ export default {
       },
       teacher_remark: '',
       teacher_score: 0,
+      student_remark: '',
+      student_score: 0,
       dialogVisible: false,
-      curCoursewareId: ''
+      curCoursewareId: '',
+      loading: false
     };
   },
   created() {
+    this.loading = true;
     GetTaskInfo({
       id: this.id,
       is_contain_cs_item_learning_material: true,
       is_contain_student: true
-    }).then(
-      ({
-        name,
-        teaching_type,
-        time_type,
-        course_name,
-        courseware_list,
-        cs_item_name,
-        accessory_list,
-        cs_item_learning_material_list,
-        task_mode,
-        time_space_view_txt,
-        student_list
-      }) => {
-        this.itemInfo = {
-          time_space_view_txt,
+    })
+      .then(
+        ({
+          name,
+          teaching_type,
+          time_type,
           course_name,
+          courseware_list,
           cs_item_name,
-          cs_item_learning_material_list
-        };
-        this.name = name;
-        this.teaching_type = teaching_type;
-        this.time_type = time_type;
-        this.courseware_list = courseware_list;
-        this.accessory_list = accessory_list;
-        this.task_mode = task_mode;
-        this.time_space_view_txt = time_space_view_txt;
-        this.student_list = student_list;
-        if (student_list.length > 0) this.getTaskStudentExecuteInfo(student_list[0].student_id);
-      }
-    );
+          accessory_list,
+          cs_item_learning_material_list,
+          task_mode,
+          time_space_view_txt,
+          student_list
+        }) => {
+          this.itemInfo = {
+            time_space_view_txt,
+            course_name,
+            cs_item_name,
+            cs_item_learning_material_list
+          };
+          this.name = name;
+          this.teaching_type = teaching_type;
+          this.time_type = time_type;
+          this.courseware_list = courseware_list;
+          this.accessory_list = accessory_list;
+          this.task_mode = task_mode;
+          this.time_space_view_txt = time_space_view_txt;
+          this.student_list = student_list;
+          if (student_list.length > 0) this.getTaskStudentExecuteInfo(student_list[0].student_id);
+        }
+      )
+      .finally(() => {
+        this.loading = false;
+      });
   },
   methods: {
     getTaskStudentExecuteInfo(student_id) {
@@ -188,11 +204,15 @@ export default {
           student_image_url,
           finish_time_view_txt,
           teacher_remark,
-          teacher_score
+          teacher_score,
+          student_remark,
+          student_score
         }) => {
           this.curStudentId = student_id;
           this.teacher_remark = teacher_remark;
           this.teacher_score = teacher_score;
+          this.student_remark = student_remark;
+          this.student_score = student_score;
           this.curFinishDetail = {
             courseware_list,
             homework_list,