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

package.json

@@ -19,29 +19,29 @@
     "randomcolor": "^0.5.3",
     "rasterizehtml": "^1.3.0",
     "register-service-worker": "^1.5.2",
-    "vue": "^2.5.21",
+    "vue": "^2.5.22",
     "vue-awesome": "^3.2.0",
     "vue-echarts": "^3.1.3",
     "vue-router": "^3.0.2",
     "vuex": "^3.0.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.2.0",
-    "@vue/cli-plugin-eslint": "^3.2.0",
-    "@vue/cli-plugin-pwa": "^3.2.0",
-    "@vue/cli-plugin-unit-jest": "^3.2.0",
-    "@vue/cli-service": "^3.2.0",
-    "@vue/eslint-config-prettier": "^4.0.0",
+    "@vue/cli-plugin-babel": "^3.3.0",
+    "@vue/cli-plugin-eslint": "^3.3.0",
+    "@vue/cli-plugin-pwa": "^3.3.0",
+    "@vue/cli-plugin-unit-jest": "^3.3.0",
+    "@vue/cli-service": "^3.3.0",
+    "@vue/eslint-config-prettier": "^4.0.1",
     "@vue/test-utils": "^1.0.0-beta.20",
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^23.6.0",
     "eslint": "^5.8.0",
-    "eslint-plugin-vue": "^5.0.0-0",
+    "eslint-plugin-vue": "^5.0.0",
     "node-sass": "^4.9.0",
     "sass-loader": "^7.0.1",
     "vue-cli-plugin-axios": "0.0.4",
     "vue-cli-plugin-element": "^1.0.0",
-    "vue-template-compiler": "^2.5.21"
+    "vue-template-compiler": "^2.5.22"
   }
 }

src/modules/examwork/view/examInfo.vue

@@ -206,6 +206,7 @@
         </el-table>
         <div class="page pull-right">
           <el-pagination
+            v-if="paginationShow"
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
@@ -243,6 +244,7 @@ export default {
       loading: false,
       examTypeList: EXAM_TYPE,
       tableData: [],
+      paginationShow: false,
       currentPage: 1,
       pageSize: 10,
       total: 10,
@@ -340,6 +342,7 @@ export default {
         this.tableData = response.data.list;
         this.total = response.data.total;
         this.loading = false;
+        this.paginationShow = true;
       });
     },
     addExamInfoDialog() {

src/modules/examwork/view/onlineExam.vue

@@ -734,7 +734,7 @@ let validateFaceVerifyStartMinute = (rule, value, callback) => {
         _this.toActiveName = "tab4";
         _this.activeName = "tab4";
       }
-    } else if (freezeTime != "" && parseInt(v) > parseInt(freezeTime)) {
+    } else if (freezeTime !== "" && parseInt(v) > parseInt(freezeTime)) {
       callback(new Error("活体检测开始分钟数不能大于交卷冻结时长"));
       if (!_this.toActiveName) {
         _this.toActiveName = "tab4";
@@ -766,13 +766,13 @@ let validateFaceVerifyEndMinute = (rule, value, callback) => {
         _this.toActiveName = "tab4";
         _this.activeName = "tab4";
       }
-    } else if (start != "" && parseInt(v) < parseInt(start)) {
+    } else if (start !== "" && parseInt(v) < parseInt(start)) {
       callback(new Error("活体检测结束分钟数不能小于活体检测开始分钟数"));
       if (!_this.toActiveName) {
         _this.toActiveName = "tab4";
         _this.activeName = "tab4";
       }
-    } else if (freezeTime != "" && parseInt(v) > parseInt(freezeTime)) {
+    } else if (freezeTime !== "" && parseInt(v) > parseInt(freezeTime)) {
       callback(new Error("活体检测结束分钟数不能大于交卷冻结时长"));
       if (!_this.toActiveName) {
         _this.toActiveName = "tab4";