zc

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

@@ -2,11 +2,7 @@
 <template>
   <div class="app-container exam_my">
     <div class="pageOne" v-if="pageType==1">
-      <p class="reset-button-one"
-         v-if="tableType==2"
-         @click="tableSwitch(1)"
-      ><i class="el-icon-arrow-left"></i>返回</p>
-      <div class="el-table-box" v-if="tableType==1">
+      <div class="el-table-box">
         <el-table v-loading="loading" border class="table-box" :data="examList">
           <el-table-column label="考试名称" align="left" prop="title" show-overflow-tooltip/>
           <el-table-column label="描述" align="left" prop="content" show-overflow-tooltip/>
@@ -32,7 +28,7 @@
           </el-table-column>
         </el-table>
         <pagination :page-sizes="[20, 30, 40, 50]"
-          v-show="total > 0 && tableType == 1"
+          v-show="total > 0 "
           :total="total"
           layout="total, prev, pager, next, sizes, jumper"
           :page.sync="queryParams.page"
@@ -40,26 +36,6 @@
           @pagination="getList"
         />
       </div>
-      <div class="for-max-box for-max-box-one" v-if="tableType==2">
-        <el-table v-loading="loading" border :data="myListExam" @selection-change="handleSelectionChange">
-          <el-table-column label="考试名称" align="left" prop="title" />
-          <el-table-column label="考试得分" align="left" prop="userScore" />
-          <el-table-column label="是否合格" align="left" prop="passed" >
-            <template slot-scope="scope">
-              <span>{{scope.row.userScore >= scope.row.qualifyScore ?'是':'否'}}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="考试时间" align="left" prop="createTime" width="180"/>
-        </el-table>
-        <pagination :page-sizes="[20, 30, 40, 50]"
-          v-show="total>0"
-          :total="total"
-          layout="total, prev, pager, next, sizes, jumper"
-          :page.sync="infoParams.page"
-          :limit.sync="infoParams.pageSize"
-          @pagination="getMyListExam"
-        />
-      </div>
     </div>
     <exam-start v-if="pageType==2" :transferData="transferData" :violationId="violationId"></exam-start>
     <exam-info v-if="pageType==3"></exam-info>
@@ -106,8 +82,6 @@ export default {
           value: "已通过",
         },
       ],
-      //table状态
-      tableType: 1,
       //页面状态
       pageType: 1,
       //传参数据
@@ -124,7 +98,7 @@ export default {
       total: 0,
       queryParams: {
         page: 1,
-        pageSize:20,
+        pageSize:4,
       },
       infoParams: {
         page: 1,
@@ -139,26 +113,6 @@ export default {
     this.getList();
   },
   methods: {
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 查询我的考试记录列表 */
-    getMyListExam() {
-      this.loading = true;
-      examPaperListAll(this.infoParams).then(response => {
-        this.myListExam = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-      // myListExam({}).then(response => {
-      //   this.myListExam = response.rows;
-      //   // this.total = response.total;
-      //   this.loading = false;
-      // });
-    },
     pageSwitch(type,item){
       if(this.pageType!=type){
         if(type==1){
@@ -193,15 +147,6 @@ export default {
         }
       }
     },
-    tableSwitch(type){
-      if(this.tableType!=type){
-        this.tableType = type;
-        this.getList();
-      }
-      if(this.tableType == 2){
-        this.getMyListExam()
-      }
-    },
     /** 查询考试列表 */
     getList() {
       let prams = JSON.parse(JSON.stringify(this.queryParams))
@@ -212,7 +157,6 @@ export default {
       if(this.$route.query.scopeType){
         prams.scopeType = this.$route.query.scopeType
       }
-      // this.$router.push({query:{}})
       this.loading = true;
       prams.scopeType = 4;
       examExamOnlineExamList(prams).then(response => {

src/views/safetyEducationExam/securityExam/qu/addTopic.vue

@@ -46,6 +46,7 @@
         <el-form-item
           label="选项设置:"
           class="options-box"
+          prop="answerList"
           v-if="pageType == 1 || pageType == 2"
         >
           <el-form-item
@@ -70,6 +71,7 @@
           "
             v-for="(item, index) in form.answerList"
             :key="index"
+            :prop="'answerList.'+index+'.content'" :rules="rulesA.content"
             class="options-min-box"
           >
             <el-input
@@ -85,14 +87,14 @@
             <i class="el-icon-plus"></i>添加
           </p>
         </el-form-item>
-        <el-form-item label="正确答案:">
+        <el-form-item label="正确答案:"
+                      v-if="pageType == 1">
           <template>
             <el-radio
               v-model="radio"
               :label="index"
               v-for="(item, index) in form.answerList"
               :key="index"
-              v-if="pageType == 1"
             >{{
                 index == 0
                   ? "选项A"
@@ -113,12 +115,16 @@
                                 : ""
               }}</el-radio
             >
+          </template>
+        </el-form-item>
+        <el-form-item label="正确答案:"
+                      v-if="pageType == 2">
+          <template>
             <el-checkbox
               v-model="radioList"
               :label="index"
               v-for="(item, index) in form.answerList"
               :key="index"
-              v-if="pageType == 2"
             >{{
                 index == 0
                   ? "选项A"
@@ -139,9 +145,13 @@
                                 : ""
               }}</el-checkbox
             >
-            <el-radio v-model="radio" :label="index" v-if="pageType == 3" v-for="(item,index) in form.answerList" :key="index"
-            >{{item.content}}</el-radio
-            >
+          </template>
+        </el-form-item>
+        <el-form-item label="正确答案:"
+                      v-if="pageType == 3">
+          <template>
+            <el-radio v-model="radio" :label="index" v-for="(item,index) in form.answerList" :key="index"
+            >{{item.content}}</el-radio>
           </template>
         </el-form-item>
         <el-form-item label="答案解析:" prop="analysis">
@@ -236,11 +246,20 @@ export default {
         level: [
           { required: true, trigger: "blur", message: "请选择难度级别" },
         ],
+        answerList: [
+          { required: true, trigger: "blur", message: "请添加选项" },
+        ],
         content: [
           { required: true, trigger: "blur", message: "请输入题目名称" },
           { required: true, message: "请输入题目名称", validator: this.spaceJudgment, trigger: "blur" }
         ],
       },
+      rulesA:{
+        content: [
+          { required: true, trigger: "blur", message: "请输入选项内容" },
+          { required: true, message: "请输入选项内容", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+      },
       // 学科字典
       subClassOptions: [],
       // 归属题库

src/views/secureAccess/handle/addPage.vue

@@ -463,7 +463,6 @@
         this.$forceUpdate()
       },
       beforeAvatarUpload(file, item) {
-        let type = true
         let suffix = file.name.split('.')[file.name.split('.').length - 1]
         let suffixName = file.name.split('.')[file.name.split('.').length - 2]
         let fileTypeArr = item.fileType.split(',')
@@ -479,17 +478,17 @@
         })
         if (item.upList.length > 4) {
           this.msgError('已到达上传数量上限')
-          type = false
+          return false
         }
         //判断文件名中是否有逗号和分号
         if (suffixName.indexOf(',') == -1 && suffixName.indexOf(';') == -1) {
         } else {
           this.msgError('文件名里包含逗号或分号，请修改后重新上传！')
-          type = false
+          return false
         }
         if (strArr.indexOf(suffix) == -1) {
           this.msgError('请上传' + strArr.join(',') + '格式文件')
-          type = false
+          return false
         }
         //学生名称+文件名称
         if (file.type == 'image/png' || file.type == 'image/jpeg' || file.type == 'image/jpg' || file.type == 'image/gif' || file.type == 'application/pdf' || file.type == 'application/vnd.openxmlformats-officedocument.wordprocessingml.document') {
@@ -497,9 +496,9 @@
           // type = true
         } else {
           this.msgError('只能上传png/jpeg/jpg/gif/docx格式')
-          type = false
+          return false
         }
-        return type
+        return true
       },
       //实验室选择
       selectChange(e) {