Merge branch 'master' of http://192.168.1.43:3000/v3/v3-lab-web

src/views/safetyEducationExam/safeLearning/safeLearning/index.vue

@@ -198,7 +198,7 @@
       getList() {
         let self = this;
         this.loading = true;
-        this.queryParams.status = 2;
+        this.queryParams.status = true;
         examElCourseCourseList(this.queryParams).then( response => {
           this.el_courseList =  response.data.records;
           for(let i=0;i<self.el_courseList.length;i++){

src/views/safetyEducationExam/securityExam/exam/addExamPage.vue

@@ -271,9 +271,9 @@
     <el-dialog class="add-manual-dialog" :title="manualTitle"  :close-on-click-modal="false"
                :visible.sync="addManualType" v-if="addManualType" width="1200px" append-to-body>
       <el-form :model="manualQueryParams" ref="manualQueryForm" :inline="true" label-width="80px">
-        <el-form-item label="题目分类" prop="cIds">
+        <el-form-item label="题目分类" prop="classifyIds">
           <el-select
-            v-model="manualQueryParams.cIds"
+            v-model="manualQueryParams.classifyIds"
             ref="manualRef"
             :disabled="manualClassType"
             placeholder="请选择分类">
@@ -702,16 +702,16 @@ export default {
     //列表查询
     manualQueryHandleQuery(){
       let self = this;
-      if(!this.manualQueryParams.cIds){
+      if(!this.manualQueryParams.classifyIds){
         this.msgError("请先选择分类");
         return
       }
 
       this.manualClassType = true;
       if(!self.manualData.classifyId){
-        this.manualData.classifyId = this.manualQueryParams.cIds;
+        this.manualData.classifyId = this.manualQueryParams.classifyIds;
         for(let i=0;i<self.repoOption.length;i++){
-          if(self.manualQueryParams.cIds == self.repoOption[i].id){
+          if(self.manualQueryParams.classifyIds == self.repoOption[i].id){
             self.manualData.classifyName = self.repoOption[i].title;
           }
         }
@@ -722,7 +722,7 @@ export default {
     //列表重置
     manualQueryResetQuery(){
       this.resetForm("manualQueryForm");
-      this.manualQueryParams.cIds = "";
+      this.manualQueryParams.classifyIds = "";
       this.manualQueryParams.classifyId = "";
       this.manualQueryList = [];
       this.manualData.classifyId = "";

src/views/safetyEducationExam/securityExam/exam_my/index.vue

@@ -180,6 +180,7 @@ export default {
         if(type==1){
           this.pageType = type;
         }else if(type==2){  //立即参加
+          console.log(item.id)
           // 组卷
           examPaperCreatePaper({examId:item.id}).then(response => {
             if(response.code == 303){

src/views/safetyEducationExam/securityExam/myResultInquiry/infoList.vue

@@ -551,3 +551,8 @@
     }
   }
 </style>
+<style>
+.el-check-box .el-radio__input.is-disabled.is-checked .el-radio__inner{
+  background: #00b7ee;
+}
+</style>