Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/examwork/view/examStudent.vue

@@ -582,9 +582,18 @@
           style="width: 100%;text-align:center;"
           @selection-change="selectChange"
         >
-          <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column prop="id" label="ID" sortable></el-table-column>
-          <el-table-column label="考生">
+          <el-table-column
+            type="selection"
+            width="40"
+            fixed="left"
+          ></el-table-column>
+          <el-table-column
+            prop="id"
+            label="ID"
+            sortable
+            fixed="left"
+          ></el-table-column>
+          <el-table-column label="考生" fixed="left">
             <template slot-scope="scope">
               <el-popover trigger="hover" placement="left">
                 <div style="font-size: 18px;font-family: 新宋体">
@@ -676,13 +685,28 @@
           </el-table-column>
           <el-table-column prop="studentCode" label="学号" sortable>
           </el-table-column>
-          <el-table-column prop="identityNumber" label="身份证号" sortable>
+          <el-table-column
+            prop="identityNumber"
+            label="身份证号"
+            width="120"
+            sortable
+          >
           </el-table-column>
-          <el-table-column prop="orgName" label="学习中心" sortable>
+          <el-table-column prop="orgName" label="学习中心" width="120" sortable>
           </el-table-column>
-          <el-table-column prop="examName" label="考试名称" sortable>
+          <el-table-column
+            prop="examName"
+            label="考试名称"
+            width="120"
+            sortable
+          >
           </el-table-column>
-          <el-table-column prop="courseName" label="课程名称" sortable>
+          <el-table-column
+            prop="courseName"
+            label="课程名称"
+            width="120"
+            sortable
+          >
           </el-table-column>
           <el-table-column
             prop="updateTime"
@@ -715,7 +739,7 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column width="300" label="操作">
+          <el-table-column width="300" label="操作" fixed="right">
             <template slot-scope="scope">
               <div v-if="scope.row.locked">锁定中，请稍后操作</div>
               <div v-else>

src/modules/examwork/view/onlineExam.vue

@@ -810,16 +810,16 @@ export default {
         started: false,
         name: "",
         examType: "ONLINE",
-        examTimes: null,
+        examTimes: 1,
         beginTime: null,
         endTime: null,
-        duration: null,
+        duration: 120,
         enable: "true",
         examLimit: "false",
         properties: {
           IS_OBJ_SCORE_VIEW: "true",
-          EXAM_RECONNECT_TIME: null,
-          FREEZE_TIME: null,
+          EXAM_RECONNECT_TIME: 30,
+          FREEZE_TIME: 0,
           BEFORE_EXAM_REMARK: "",
           AFTER_EXAM_REMARK: "",
           SHOW_CHEATING_REMARK: "true",
@@ -834,8 +834,8 @@ export default {
           BOOL_ANSWER_REMARK: "",
           IS_FACE_ENABLE: "false",
           IS_FACE_CHECK: "false",
-          SNAPSHOT_INTERVAL: null,
-          WARN_THRESHOLD: null,
+          SNAPSHOT_INTERVAL: 30,
+          WARN_THRESHOLD: 50,
           MARKING_TYPE: "ALL",
           IP_LIMIT: "false",
           IP_ADDRESSES: null,

src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -31,7 +31,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item class="d-block">
+          <el-form-item>
             <el-button
               size="small"
               type="primary"

src/modules/oe/style/common.css

@@ -1,3 +1,6 @@
+.el-row {
+  position: static !important;
+}
 .form_search_width {
   width: 160px;
 }
@@ -17,3 +20,10 @@
 .margin-top-20 {
   margin-top: 20px;
 }
+.el-main-padding {
+  padding-top: 2px;
+  padding-left: 0;
+}
+.operateRow {
+  margin-top: 2px;
+}

src/modules/oe/views/absent.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue
         :form="form"
         :getExamCondition="getExamCondition"
@@ -170,11 +170,4 @@ export default {
   created() {}
 };
 </script>
-<style scoped>
-.header-title {
-  text-align: left;
-}
-.margin-top-10 {
-  margin-top: 10px;
-}
-</style>
+<style scoped src="../style/common.css"></style>

src/modules/oe/views/alreadyAudited.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-row v-show="showAllCondition">
           <el-col :span="6">
@@ -400,17 +400,4 @@ export default {
   }
 };
 </script>
-<style scoped>
-.el-row {
-  position: static !important;
-}
-.margin-top-10 {
-  margin-top: 10px;
-}
-.select-type {
-  font-size: 8px;
-  cursor: pointer;
-  color: #409eff;
-}
-</style>
 <style scoped src="../style/common.css"></style>

src/modules/oe/views/awaitingAudit.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-row v-show="showAllCondition">
           <el-col :span="6">
@@ -589,21 +589,4 @@ export default {
   }
 };
 </script>
-<style scoped>
-.el-row {
-  position: static !important;
-}
-
-.operateRow {
-  margin-top: 2px;
-}
-.margin-top-10 {
-  margin-top: 10px;
-}
-.select-type {
-  font-size: 8px;
-  cursor: pointer;
-  color: #409eff;
-}
-</style>
 <style scoped src="../style/common.css"></style>

src/modules/oe/views/captureDetail.vue

@@ -1,7 +1,9 @@
 <template>
   <el-container>
-    <el-header> <LinkTitlesCustom :currentPaths="currentPaths" /> </el-header>
-    <el-main style="overflow: unset;">
+    <el-header id="capture-detail-header">
+      <LinkTitlesCustom :currentPaths="currentPaths" />
+    </el-header>
+    <el-main style="overflow: unset;margin-left: 20px;" class="el-main-padding">
       <el-row>
         <el-col :span="6">
           <img :src="studentBasePhotoPath" alt width="180" />
@@ -335,8 +337,8 @@ export default {
 };
 </script>
 <style scoped>
-.margin-top-10 {
-  margin-top: 10px;
+#capture-detail-header {
+  height: 15px !important;
 }
 .capture-title {
   font-size: 20px;
@@ -391,3 +393,4 @@ export default {
   color: red;
 }
 </style>
+<style scoped src="../style/common.css"></style>

src/modules/oe/views/examDetail.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-row v-show="showAllCondition">
           <el-col :span="6">
@@ -609,20 +609,9 @@ export default {
 };
 </script>
 <style scope>
-.el-row {
-  position: static !important;
-}
 .el-date-editor.el-input,
 .el-date-editor.el-input__inner {
   width: auto !important;
 }
-.select-type {
-  font-size: 8px;
-  cursor: pointer;
-  color: #409eff;
-}
-.operateRow {
-  margin-top: 2px;
-}
 </style>
 <style scoped src="../style/common.css"></style>

src/modules/oe/views/examScheduling.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main v-loading="loading">
+    <el-main v-loading="loading" class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-row v-show="showAllCondition">
           <el-col :span="6">
@@ -216,6 +216,22 @@
                     </el-button>
                   </el-col>
                 </el-row>
+                <el-row class="operateRow">
+                  <el-col :span="24">
+                    <el-button
+                      plain
+                      type="primary"
+                      size="mini"
+                      icon="el-icon-download"
+                      @click="downloadAnswer(scope.row.offlineFileUrl)"
+                      v-if="
+                        scope.row.examType == 'OFFLINE' &&
+                          scope.row.offlineFileUrl
+                      "
+                      >下载作答
+                    </el-button>
+                  </el-col>
+                </el-row>
               </template>
             </el-table-column>
           </el-table>
@@ -594,23 +610,15 @@ export default {
     cleanOfflineFile() {
       this.$refs.offlineFileInput.value = "";
       this.offlineAnswerFile = "";
+    },
+    downloadAnswer(offlineFileUrl) {
+      window.open(offlineFileUrl);
     }
   },
   created() {}
 };
 </script>
 <style scoped>
-.el-row {
-  position: static !important;
-}
-.operateRow {
-  margin-top: 2px;
-}
-.select-type {
-  font-size: 8px;
-  cursor: pointer;
-  color: #409eff;
-}
 .offline_file {
   color: blue;
 }

src/modules/oe/views/examSummary.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <el-row>
         <el-col :span="24">
           <el-form>
@@ -507,3 +507,4 @@ export default {
   border-top-right-radius: 3px;
 }
 </style>
+<style scoped src="../style/common.css"></style>

src/modules/oe/views/illegalityNameList.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-col :span="6">
           <el-form-item label="违纪类型">
@@ -319,9 +319,4 @@ export default {
   }
 };
 </script>
-<style scoped>
-.el-row {
-  position: static !important;
-}
-</style>
 <style scoped src="../style/common.css"></style>

src/modules/oe/views/reexamine.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
       </commonFormVue>
       <el-col :span="6">
@@ -254,11 +254,4 @@ export default {
   created() {}
 };
 </script>
-<style scoped>
-.el-row {
-  position: static !important;
-}
-.margin-top-10 {
-  margin-top: 10px;
-}
-</style>
+<style scoped src="../style/common.css"></style>

src/modules/oe/views/scoreStatistics.vue

@@ -1,6 +1,6 @@
 <template>
   <el-container>
-    <el-main>
+    <el-main class="el-main-padding">
       <commonFormVue :form="form" :getExamCondition="getExamCondition">
         <el-col :span="6">
           <el-form-item label="是否缺考">
@@ -397,9 +397,4 @@ export default {
   created() {}
 };
 </script>
-<style scoped>
-.el-row {
-  position: static !important;
-}
-</style>
 <style scoped src="../style/common.css"></style>

src/modules/questions/views/BluePaperStructure.vue

@@ -199,12 +199,14 @@ export default {
     },
     //查询所有
     searchAll() {
+      var pageNo = Number(this.currentPage);
       this.loading = true;
       var url =
         QUESTION_API + "/paperStruct/" + this.currentPage + "/" + this.pageSize;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = pageNo;
       });
       this.loading = false;
     },

src/modules/questions/views/CourseProperty.vue

@@ -265,7 +265,6 @@ export default {
       this.searchCourProperty();
     },
     searchCourProperty() {
-      console.log("page:", this.currentPage);
       var pageNo = Number(this.currentPage);
       this.loading = true;
       var url =

src/modules/questions/views/ExtractPaperRule.vue

@@ -338,6 +338,7 @@ export default {
       }
       this.loading = true;
       let currentPage = this.currentPage;
+      this.currentPage = 1;
       this.$http
         .get(
           QUESTION_API +
@@ -353,6 +354,7 @@ export default {
         .then(response => {
           this.tableData = response.data.content;
           this.total = response.data.totalElements;
+          this.currentPage = Number(currentPage);
           this.loading = false;
         })
         .catch(error => {

src/modules/questions/views/GenPaper.vue

@@ -415,12 +415,14 @@ export default {
       this.searchGenPaper();
     },
     searchGenPaper() {
+      var pageNo = this.currentPage;
+      this.currentPage = 1;
       this.loading = true;
-      var url =
-        QUESTION_API + "/genPaper/" + this.currentPage + "/" + this.pageSize;
+      var url = QUESTION_API + "/genPaper/" + pageNo + "/" + this.pageSize;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = Number(pageNo);
       });
       this.loading = false;
     },

src/modules/questions/views/ImportPaper.vue

@@ -419,12 +419,14 @@ export default {
       this.searchImportPaper();
     },
     searchImportPaper() {
+      var pageNo = Number(this.currentPage);
+      this.currentPage = 1;
       this.loading = true;
-      var url =
-        QUESTION_API + "/importPaper/" + this.currentPage + "/" + this.pageSize;
+      var url = QUESTION_API + "/importPaper/" + pageNo + "/" + this.pageSize;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = pageNo;
         this.loading = false;
       });
     },
@@ -774,6 +776,7 @@ export default {
           level: "",
           name: ""
         };
+        this.currentPage = 1;
       } else {
         this.formSearch = JSON.parse(sessionStorage.getItem("import_paper"));
         this.currentPage =
@@ -784,7 +787,7 @@ export default {
       if (this.formSearch.courseName) {
         this.getCourses(this.formSearch.courseName);
       }
-      this.searchImportPaper();
+      this.handleCurrentChange(this.currentPage);
     }
   },
   computed: {

src/modules/questions/views/PaperStructure.vue

@@ -209,12 +209,14 @@ export default {
       this.searchPaperStructs();
     },
     searchPaperStructs() {
+      var pageNo = Number(this.currentPage);
       this.loading = true;
       var url =
         QUESTION_API + "/paperStruct/" + this.currentPage + "/" + this.pageSize;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = pageNo;
       });
       this.loading = false;
     },

src/modules/questions/views/Question.vue

@@ -409,13 +409,16 @@ export default {
       this.searchQues();
     },
     searchQues() {
+      var pageNo = Number(this.currentPage);
+      console.log("pageNo:", pageNo);
+      this.currentPage = 1;
       this.tableData = [];
-      var url =
-        QUESTION_API + "/question/" + this.currentPage + "/" + this.pageSize;
+      var url = QUESTION_API + "/question/" + pageNo + "/" + this.pageSize;
       this.loading = true;
       this.$http.get(url, { params: this.formSearch }).then(response => {
         this.tableData = response.data.content;
         this.total = response.data.totalElements;
+        this.currentPage = Number(pageNo);
         this.loading = false;
       });
     },
@@ -716,7 +719,6 @@ export default {
           firstPropertyId: "",
           secondPropertyId: ""
         };
-        this.currentPage = 1;
       }
       this.searchQues();
     }