dedsudiyu 12 hours ago
parent
commit
bfa236194e

+ 25 - 5
src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue

@@ -172,11 +172,31 @@
       tableButton(type, item) {
         let self = this
         if (type == 1) {
-          //学时要求
-          self.$router.push({
-            path: '/safetyEducationExaminationNew/safetyEducation/knowledgeLearning',
-            query: {}
-          })
+          if(item.examStudy&&item.courseId){
+            //学习课程
+            this.$router.push({
+              path: '/learningCourse',
+              query: {
+                courseId: item.courseId,
+                examId: item.examId,
+              }
+            })
+          }else{
+            //学时要求
+            let obj = {
+              examName:item.examName,
+              knowledgePointIds:item.knowledgePointIds,
+              completedStudyHours:item.completedStudyHours,
+              studyHoursRequirement:item.studyHoursRequirement,
+            }
+            let text = Encrypt(JSON.stringify(obj))
+            self.$router.push({
+              path: '/safetyEducationExaminationNew/safetyEducation/knowledgeLearning',
+              query: {
+                text : text
+              }
+            })
+          }
         }else if(type == 2){
           //学习课程
           this.$router.push({

+ 10 - 1
src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -286,9 +286,18 @@
             })
           }else{
             //学时要求
+            let obj = {
+              examName:item.examName,
+              knowledgePointIds:item.knowledgePointIds,
+              completedStudyHours:item.completedStudyHours,
+              studyHoursRequirement:item.studyHoursRequirement,
+            }
+            let text = Encrypt(JSON.stringify(obj))
             self.$router.push({
               path: '/safetyEducationExaminationNew/safetyEducation/knowledgeLearning',
-              query: {}
+              query: {
+                text : text
+              }
             })
           }
         }else if(type == 2){

+ 24 - 13
src/views/safetyEducationExaminationNew/workbench/TaskCard.vue

@@ -340,20 +340,31 @@ export default {
     tableButton(type,item){
       let self = this;
       if(type == 1){
-        //学时要求
-        let obj = {
-          examName:item.examName,
-          knowledgePointIds:item.knowledgePointIds,
-          completedStudyHours:item.completedStudyHours,
-          studyHoursRequirement:item.studyHoursRequirement,
-        }
-        let text = Encrypt(JSON.stringify(obj))
-        self.$router.push({
-          path: '/safetyEducationExaminationNew/safetyEducation/knowledgeLearning',
-          query: {
-            text : text
+        if(item.examStudy&&item.courseId){
+          //学习课程
+          this.$router.push({
+            path: '/learningCourse',
+            query: {
+              courseId: item.courseId,
+              examId: item.examId,
+            }
+          })
+        }else{
+          //学时要求
+          let obj = {
+            examName:item.examName,
+            knowledgePointIds:item.knowledgePointIds,
+            completedStudyHours:item.completedStudyHours,
+            studyHoursRequirement:item.studyHoursRequirement,
           }
-        })
+          let text = Encrypt(JSON.stringify(obj))
+          self.$router.push({
+            path: '/safetyEducationExaminationNew/safetyEducation/knowledgeLearning',
+            query: {
+              text : text
+            }
+          })
+        }
       }else if(type == 2){
         //学习课程
         this.$router.push({