update

src/components/case/index.vue

@@ -5,7 +5,7 @@
         <div class="flex a-center j-between">
           <div class="flex a-center" style="width: 28%">
             <p>实训项目</p>
-            <el-select v-model="projectId" placeholder="请选择" class="select" :disabled="projectPermissions != 0" @change="selectProject">
+            <el-select v-model="projectName" placeholder="请选择" class="select" :disabled="projectPermissions != 0" @change="selectProject">
               <el-option
                 v-for="item in topicList"
                 :key="item.projectId"
@@ -220,12 +220,7 @@ export default {
             if(status !== 1) {
               this.popContainer = true
               clearInterval(this.intervalJudge)
-              this.Submit(false)
+              this.sureSubmit(false)
-              this.$message({
-                showClose: true,
-                message: '考试已结束，试卷已自动提交',
-                type: 'success'
-              });
             }else {
             }
           })
@@ -242,12 +237,7 @@ export default {
               this.popContainer = true
               clearInterval(this.intervalJudge)
               // 提交
-              this.Submit(false)
+              this.sureSubmit(false)
-              this.$message({
-                showClose: true,
-                message: '考试已结束，试卷已自动提交',
-                type: 'success'
-              });
             }else {
             }
           })
@@ -394,6 +384,7 @@ export default {
                 this.selectProjects({
                   projectId: this.topicList[0].projectId
                 })
+                
                 this.gotuQueryVariable()
                  // 加的
             }
@@ -542,26 +533,22 @@ export default {
     },
     //提交
     Submit(judge=true) {
-      if(judge) {
+      this.$confirm("此操作将视为结束考试, 是否继续?", "提示", {
-        this.$confirm("此操作将视为结束考试, 是否继续?", "提示", {
+        confirmButtonText: "确定",
-          confirmButtonText: "确定",
+        cancelButtonText: "取消",
-          cancelButtonText: "取消",
+        type: "warning",
-          type: "warning",
+        center: true
-          center: true
+      }).then(() => {
-        }).then(() => {
-          this.sureSubmit()
-        }).catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消提交"
-          });
-        });
-      }else {
         this.sureSubmit()
-      }
+      }).catch(() => {
+        this.$message({
+          type: "info",
+          message: "已取消提交"
+        });
+      });
       
     },
-      sureSubmit(){
+      sureSubmit(judge=true){
         this.actEndTime = new Date().getTime();
         let ruleReqs = sessionStorage.getItem('ruleReqs')
         let startTime = sessionStorage.getItem('startTime')
@@ -607,10 +594,19 @@ export default {
                 }
                 this.sss = 0;
                 this.popContainer = true;
-                this.$message({
+                if(judge) {
-                    type: 'success',
+                  this.$message({
-                    message: '提交成功'
+                      type: 'success',
-                });
+                      message: '提交成功'
+                  });
+                }else {
+                  this.$confirm('考试已结束，已自动提交。', '提示', {
+                    confirmButtonText: '确定',
+                    type: 'info',
+                    center: true
+                  })
+                }
+                
                 this.requires = list
             }
             this.loading = false