Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/lessoncheck-form.vue

@@ -20,7 +20,7 @@
       </el-table>
       <q-card-actions align="right" class="bg-white">
         <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeCourseForm" />
-        <q-btn label="立即提交" color="accent q-px-md" style="font-weight:400 !important" :loading="saveCourseLoading"
+        <q-btn label="选择" color="accent q-px-md" style="font-weight:400 !important" :loading="saveCourseLoading"
           @click="saveCourse" />
       </q-card-actions>
     </q-card>

src/components/questiontype/reading-comprehensio.vue

@@ -55,10 +55,10 @@
             </td>
           </tr>
           <!--选择题-->
-          <template v-if="item.QuestionKey=='single' ||item.QuestionKey=='multiple'">
+          <template v-if="item.QuestionKey=='single' ||item.QuestionKey=='multiple'|| item.QuestionKey=='single-number'">
             <tr v-for="(subItem,subIndex) in item.SubAnwser">
               <td style="width:40px;text-align:center;">
-                <template v-if="item.QuestionKey=='single'">
+                <template v-if="item.QuestionKey=='single'||item.QuestionKey=='multiple'|| item.QuestionKey=='single-number'">
                   <div class="Answer_List" @click="ChangeItem(item,subItem)" :class="{'Is_Answer':subItem.IsAnswer}">
                     {{subItem.Name}}
                   </div>

src/pages/course/lessonPreparation.vue

@@ -181,7 +181,7 @@
 
       <div style="margin-top:30px;">
         <span class="beikeModule" @click="saveInfo(1)">存为模板</span>
-        <q-btn label="提交" size="md" color="accent q-px-md" @click="saveInfo()" />
+        <q-btn label="提交" size="md" color="accent q-px-md" @click="saveInfo(0)" />
       </div>
       <lessoncheck-form v-if="IsShowLessForm" @close="closeTeachSaveForm"
         @success="refreshPage">
@@ -326,7 +326,27 @@
       //获取选择模板数据
       refreshPage(val){
         console.log(val,'val');
-        this.addMsg.LessonPlanList =val.LessonPlanList;
+        this.addMsg.LessonPlanList[0].CourseName = val.LessonPlanList[0].CourseName;
+        this.addMsg.LessonPlanList[1].CourseName = val.LessonPlanList[1].CourseName;
+        this.addMsg.LessonPlanList[0].CourseTitle = val.LessonPlanList[0].CourseTitle;
+        this.addMsg.LessonPlanList[1].CourseTitle = val.LessonPlanList[1].CourseTitle;
+        val.LessonPlanList[0].LessonPlanDetailsList.forEach(x=>{
+          let obj={
+            ProjectContent:x.ProjectContent,
+            Duration:x.Duration
+          }
+          this.addMsg.LessonPlanList[0].LessonPlanDetailsList.push(obj);
+        })
+        val.LessonPlanList[1].LessonPlanDetailsList.forEach(x=>{
+          let obj={
+            ProjectContent:x.ProjectContent,
+            Duration:x.Duration
+          }
+          this.addMsg.LessonPlanList[1].LessonPlanDetailsList.push(obj);
+        })
+        
+        this.addMsg.LessonPlan[0].LessonPlanProjectsList[0].ProjectContent = val.LessonPlanList[0].LessonPlanProjectsList[0].ProjectContent
+        this.addMsg.LessonPlan[1].LessonPlanProjectsList[1].ProjectContent = val.LessonPlanList[1].LessonPlanProjectsList[1].ProjectContent
       },
       //提交
       saveInfo(num) {