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

package.json

@@ -2,7 +2,7 @@
   "name": "confucius",
   "version": "0.0.1",
   "description": "jiahe japen school system",
-  "productName": "羚羊教育系统",
+  "productName": "甲鹤日语教育系统",
   "author": "alex",
   "private": true,
   "scripts": {

src/pages/course/lessonPreparation.vue

@@ -326,27 +326,50 @@
       //获取选择模板数据
       refreshPage(val){
         console.log(val,'val');
-        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
+        if(val && val.LessonPlanList.length>0){
+          let data = val.LessonPlanList;
+          data.forEach((x,i)=>{
+            if(i==0){
+              x.LessonPlanId=this.addMsg.LessonPlanList[0].LessonPlanId;
+
+            }else if(i==1){
+              x.LessonPlanId=this.addMsg.LessonPlanList[1].LessonPlanId;
+
+            }else {
+              x.LessonPlanId=0;
+
             }
-          this.addMsg.LessonPlanList[0].LessonPlanDetailsList.push(obj);
+            x.LessonPlanDetailsList.forEach(j=>{
+              j.LessonPlanDetailsId = 0
+            })
+             x.LessonPlanDetailsList.forEach(j=>{
+              j.LessonPlanProjectsId = 0
             })
-        val.LessonPlanList[1].LessonPlanDetailsList.forEach(x=>{
-          let obj={
-            ProjectContent:x.ProjectContent,
-            Duration:x.Duration
-          }
-          this.addMsg.LessonPlanList[1].LessonPlanDetailsList.push(obj);
           })
+          this.addMsg.LessonPlanList = data
+        }
 
-        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
+        // 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/user/login.vue

@@ -26,7 +26,7 @@
             </q-carousel>
         </div>
         <div class="right-card">
-            <div class="company">羚羊教育系统后台登录</div>
+            <div class="company">甲鹤日语管理系统后台登录</div>
             <div class="t">登录</div>
             <div class="field_wrap">
                 <div class="pwd_box">