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

src/components/question/question-form.vue

@@ -105,7 +105,7 @@
   <q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale">
     <q-card style="width: 1400px;max-width:900px;">
       <q-card-section>
-        <div class="text-h6">{{objOption.CourseId==0?'新增问题信息':'修改问题信息'}}</div>
+        <div class="text-h6">{{objOption.QuestionId==0?'新增问题信息':'修改问题信息'}}</div>
       </q-card-section>
       <q-card-section class="q-pt-none scroll" style="max-height: 70vh">
         <div class="row wrap">

src/pages/course/lessonPreparation.vue

@@ -243,7 +243,6 @@
     methods: {
       getList() {
         GetClassLessPlan(this.msg).then(res => {
-          console.log(res, '数据来了');
           if (res.Code == 1) {
             let data = res.Data;
             this.addMsg.CourseNum = data.CourseNum;
@@ -305,7 +304,6 @@
           Duration: ''
         }
         this.addMsg.LessonPlanList[index].LessonPlanDetailsList.push(obj);
-        console.log(this.addMsg.LessonPlanList)
       },
       //删除教案详情
       delLessInfo(index,subIndex){
@@ -325,7 +323,6 @@
       },
       //获取选择模板数据
       refreshPage(val){
-        console.log(val,'val');
         if(val && val.LessonPlanList.length>0){
           let data = val.LessonPlanList;
           data.forEach((x,i)=>{
@@ -342,34 +339,12 @@
             x.LessonPlanDetailsList.forEach(j=>{
               j.LessonPlanDetailsId = 0
             })
-             x.LessonPlanDetailsList.forEach(j=>{
+             x.LessonPlanProjectsList.forEach(j=>{
               j.LessonPlanProjectsId = 0
             })
           })
           this.addMsg.LessonPlanList = data
         }
-
-        // 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) {

src/pages/course/teacherLesson.vue

@@ -305,7 +305,7 @@
       this.msg.StartTime = this.tYear+'-'+this.tMonth+'-'+'01';
       this.msg.EndTime = this.tYear+'-'+this.tMonth+'-'+this.dataNum;
       let userInfo = this.getLocalStorage();
-      // this.AccountType = userInfo.AccountType==2?true:false; //是否是教师
+      this.AccountType = userInfo.AccountType==2?true:false; //是否是教师
       this.getList();
     },
     methods: {
@@ -342,7 +342,6 @@
       //获取数据
       getList() {
         GetTeacherPlan(this.msg).then(res => {
-          console.log(res, '数据来了');
           if (res.Code == 1) {
             this.dataList = res.Data;
             var month = this.tMonth;
@@ -395,13 +394,15 @@
             if(x.IsLessonStatus==2){
               Str='已备课'
             }
+            if(x.IsLessonStatus==-1){
+              Str=''
+            }
           }
         })
         return Str;
       },
       //跳转至备课
       goBeike(item){
-        console.log(item,'item');
         var tempStr = '/course/lessonPreparation?ClassId=' + item.ClassId+'&School_Id='+item.School_Id+'&ClassPlanId='+item.ClassPlanId;
         this.$router.push({
           path: tempStr