zc

src/views/safetyEducationExaminationNew/safetyTest/mockExam/index.vue

@@ -56,7 +56,7 @@
             <div class="bottom-box">
               <p class="text-big-p">{{item.examName}}</p>
               <p class="text-p">{{parseTime(item.startTime,"{y}-{m}-{d} {h}:{i}")}} 至 {{parseTime(item.endTime,"{y}-{m}-{d} {h}:{i}")}}</p>
-              <p class="time-p">时长：{{item.answerDuration}}分钟 丨 总分：{{item.totalScore}}分 丨 及格分：{{item.passScore}}分 丨 可考试次数：{{item.attemptLimit==0?'无限':item.attemptLimit}}次</p>
+              <p class="time-p">时长：{{item.answerDuration}}分钟 丨 总分：{{item.totalScore}}分 丨 及格分：{{item.passScore}}分</p>
             </div>
             <p class="position-p-1" v-if="item.conditionType == 1" @click="tableButton(1,item)">完成学时要求后解锁</p>
             <p class="position-p-1" v-if="item.conditionType == 2" @click="tableButton(2,item)">完成考前课程学习后解锁</p>
@@ -277,31 +277,31 @@
       //提示与跳转
       confirmTitle(type,obj){
         let self = this;
-        this.$confirm(
-          '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
-          '进入考试页面',
-          {
-            confirmButtonText: '确定进入',
-            cancelButtonText: '取消',
-            type: 'warning',
-            closeOnClickModal: false,
-            closeOnPressEscape: false
-          }
-        ).then(() => {
-          if(type == 1){
+        if(type == 1){
+          this.$confirm(
+            '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
+            '进入考试页面',
+            {
+              confirmButtonText: '确定进入',
+              cancelButtonText: '取消',
+              type: 'warning',
+              closeOnClickModal: false,
+              closeOnPressEscape: false
+            }
+          ).then(() => {
             //在线考试
             this.$router.push({
               path: '/startTheExam',
               query: obj
             })
-          }else if(type == 2){
-            //模拟考试
-            self.$router.push({
-              path: '/mockExam',
-              query: obj
-            })
-          }
-        }).catch(() => {})
+          }).catch(() => {})
+        }else if(type == 2){
+          //模拟考试
+          self.$router.push({
+            path: '/mockExam',
+            query: obj
+          })
+        }
       },
       examUserExamTypeSelectExamType(){
         let self = this;

src/views/safetyEducationExaminationNew/safetyTest/onlineExam/index.vue

@@ -351,31 +351,31 @@
       //提示与跳转
       confirmTitle(type,obj){
         let self = this;
-        this.$confirm(
-          '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
-          '进入考试页面',
-          {
-            confirmButtonText: '确定进入',
-            cancelButtonText: '取消',
-            type: 'warning',
-            closeOnClickModal: false,
-            closeOnPressEscape: false
-          }
-        ).then(() => {
-          if(type == 1){
+        if(type == 1){
+          this.$confirm(
+            '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
+            '进入考试页面',
+            {
+              confirmButtonText: '确定进入',
+              cancelButtonText: '取消',
+              type: 'warning',
+              closeOnClickModal: false,
+              closeOnPressEscape: false
+            }
+          ).then(() => {
             //在线考试
             this.$router.push({
               path: '/startTheExam',
               query: obj
             })
-          }else if(type == 2){
-            //模拟考试
-            self.$router.push({
-              path: '/mockExam',
-              query: obj
-            })
-          }
-        }).catch(() => {})
+          }).catch(() => {})
+        }else if(type == 2){
+          //模拟考试
+          self.$router.push({
+            path: '/mockExam',
+            query: obj
+          })
+        }
       },
       examUserExamTypeSelectExamType(){
         let self = this;

src/views/safetyEducationExaminationNew/safetyTest/practiceQuestions/index.vue

@@ -64,6 +64,7 @@
           </div>
           <div class="page-content-box">
             <div class="for-max-big-box scrollbar-box">
+              <p class="for-null-p" v-if="!dataList[0]">暂无数据</p>
               <div class="for-big-box" v-for="(item,index) in dataList" :key="index" @click="tableButton(1,item)">
                 <p class="title-p">{{item.knowledgePointName}}</p>
                 <div class="text-box">
@@ -368,6 +369,12 @@
           }
           .for-max-big-box{
             flex:1;
+            .for-null-p{
+              text-align: center;
+              font-size:14px;
+              line-height:400px;
+              color:#999;
+            }
             .for-big-box{
               cursor: pointer;
               display: inline-block;

src/views/safetyEducationExaminationNew/workbench/TaskCard.vue

@@ -398,31 +398,31 @@ export default {
     //提示与跳转
     confirmTitle(type,obj){
       let self = this;
-      this.$confirm(
-        '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
-        '进入考试页面',
-        {
-          confirmButtonText: '确定进入',
-          cancelButtonText: '取消',
-          type: 'warning',
-          closeOnClickModal: false,
-          closeOnPressEscape: false
-        }
-      ).then(() => {
-        if(type == 1){
+      if(type == 1){
+        this.$confirm(
+          '考试期间未完成答题请勿离开页面，离开后倒计时仍会继续，超时将自动交卷并记录成绩，扣除 1 次考试机会。',
+          '进入考试页面',
+          {
+            confirmButtonText: '确定进入',
+            cancelButtonText: '取消',
+            type: 'warning',
+            closeOnClickModal: false,
+            closeOnPressEscape: false
+          }
+        ).then(() => {
           //在线考试
           this.$router.push({
             path: '/startTheExam',
             query: obj
           })
-        }else if(type == 2){
-          //模拟考试
-          self.$router.push({
-            path: '/mockExam',
-            query: obj
-          })
-        }
-      }).catch(() => {})
+        }).catch(() => {})
+      }else if(type == 2){
+        //模拟考试
+        self.$router.push({
+          path: '/mockExam',
+          query: obj
+        })
+      }
     },
     //查询学年进度列表
     examElLabEduRelationAcademicYearProgress(){