Merge remote-tracking branch 'origin/1.0' into 1.0

# Conflicts:
#	src/views/courseInformation/courseManagement/index.vue

src/views/courseInformation/courseManagement/index.vue

@@ -1222,7 +1222,7 @@ export default {
       this.$router.push({
         path: '/courseInformation/examinationManagement/index',
         query: {
-          bussinessId: data.businessId,
+          businessId: data.businessId,
           courseId: data.businessId,
           name: data.lessonName,
           passingGrade: data.passingGrade

src/views/courseInformation/examinationManagement/examinationPaper.vue

@@ -475,6 +475,7 @@ export default {
   watch: {
     bussinessId: {
       handler: function(val) {
+        console.log('val', val)
         this.form.courseId = val
       },
       immediate: true

src/views/courseInformation/examinationManagement/index.vue

@@ -3,9 +3,9 @@
   <div class="app-container">
     <!--    标题-->
     <div class="examinationTitle">{{ name }}
-    <span v-if="activeName==='ExaminationPaper'" class="score">及格分数:
-    <el-input v-model="passingGrade" type="text" maxlength="3" @blur="handleGradeChange(passingGrade)" ></el-input>
-    </span>
+      <span v-if="activeName==='ExaminationPaper'" class="score">及格分数:
+        <el-input v-model="passingGrade" type="text" maxlength="3" @blur="handleGradeChange(passingGrade)" />
+      </span>
     </div>
     <el-tabs v-model="activeName" @tab-click="tabClick">
       <el-tab-pane label="试题管理" name="ExaminationPaper">
@@ -21,7 +21,7 @@
 
 import ExaminationPaper from '@/views/courseInformation/examinationManagement/examinationPaper.vue'
 import QuestionManagement from '@/views/courseInformation/examinationManagement/questionManagement.vue'
-import {updateBLesson} from "@/api/courseManagement/indexApi";
+import { updateBLesson } from '@/api/courseManagement/indexApi'
 
 export default {
   name: 'ExaminationManagement',
@@ -35,8 +35,8 @@ export default {
       activeName: 'ExaminationPaper',
       courseId: null,
       bussinessId: '', // 业务id
-      name: '' ,// 课程名称
-      passingGrade:'',//及格分数
+      name: '', // 课程名称
+      passingGrade: '', // 及格分数
       id: null
     }
   },
@@ -47,11 +47,12 @@ export default {
   // },
   created() {
     // 接受路由传递的参数
-    this.courseId = this.$route.query.bussinessId
+    this.courseId = this.$route.query.businessId
+    console.log('this.courseId', this.courseId)
     this.id = this.$route.query.courseId
     this.name = this.$route.query.name
     this.passingGrade = this.$route.query.passingGrade
-    console.log(this.id, this.name,this.passingGrade)
+    console.log(this.id, this.name, this.passingGrade)
   },
   methods: {
     tabClick() {