bug md

config.sample.json

@@ -0,0 +1,4 @@
+{
+  "domain": "http://localhost:9000",
+  "input": ""
+}

src/modules/client/views/CheckInfo.vue

@@ -84,7 +84,7 @@ export default {
     };
   },
   computed: {
-    ...mapState("client", ["curSubject", "curLevel"]),
+    ...mapState("client", ["curSubject", "curLevel", "clientConfig"]),
     user() {
       return this.$store.state.user;
     }
@@ -105,8 +105,8 @@ export default {
     },
     confirm() {
       this.modalIsShow = false;
-      this.setCurLevel(this.modalFsorm.level);
-      const scanName = this.config.packageScan ? "GroupScan" : "LineScan";
+      this.setCurLevel(this.modalForm.level);
+      const scanName = this.clientConfig.packageScan ? "GroupScan" : "LineScan";
       this.$router.push({ name: scanName });
     }
   }

src/modules/client/views/GroupScan.vue

@@ -93,7 +93,6 @@
 
 <script>
 const fs = require("fs");
-import db from "../../../plugins/db";
 import { getStudentGroupByExamNumber } from "../api";
 import {
   decodeImageCode,
@@ -103,7 +102,7 @@ import {
 import { deepCopy } from "../../../plugins/utils";
 import ScanAreaDialog from "../components/ScanAreaDialog";
 import ScanExceptionDialog from "../components/ScanExceptionDialog";
-import { mapState, mapMutations, mapActions } from "vuex";
+import { mapState } from "vuex";
 
 export default {
   name: "group-scan",
@@ -118,6 +117,7 @@ export default {
         showAction: true,
         message: ""
       },
+      scanList: [],
       historyLimit: 30,
       historyList: [],
       setT: "",
@@ -130,7 +130,6 @@ export default {
   },
   computed: {
     ...mapState("client", [
-      "scanNo",
       "unuploadNo",
       "curSubject",
       "clientConfig",
@@ -160,6 +159,9 @@ export default {
     },
     curSubjectStartCountTime() {
       return this.startCountTime[this.curSubject.id];
+    },
+    scanNo() {
+      return this.scanList.length;
     }
   },
   mounted() {
@@ -170,8 +172,6 @@ export default {
     this.getInitFile();
   },
   methods: {
-    ...mapMutations("client", ["setScanNo", "setStartCountTime"]),
-    ...mapActions("client", ["updateStartCountTime"]),
     async test() {
       this.curImage = getEarliestFile();
       const codeAreas = {
@@ -348,6 +348,9 @@ export default {
           isManual: type === "MANUAL"
         });
         this.updateHistory(this.curStudent);
+
+        // 更新采集数
+        this.updateScanList(this.curStudent.examNumber);
       }
       // 删除扫描文件，继续开始下一个任务
       fs.unlinkSync(this.curImage.url);
@@ -389,15 +392,16 @@ export default {
         });
       }
 
-      // 更新采集数
-      this.updateScanNo();
-
-      this.allReScan();
+      this.scanList = [];
+      this.students = [];
+      this.historyList = [];
+      this.restartInitFile();
     },
     allReScan() {
       this.$Modal.confirm({
         content: "确定要整包重扫吗？",
         onOk: () => {
+          this.scanList = [];
           this.students = [];
           this.historyList = [];
           this.restartInitFile();
@@ -413,18 +417,13 @@ export default {
         (this.curTaskScanCount - 6) * 71;
     },
     // count
-    async updateScanNo() {
-      const scanNo = await db.getScanCount(
-        this.curSubjectStartCountTime,
-        this.curSubject.id
-      );
-      this.setScanNo(scanNo);
+    updateScanList(examNumber) {
+      if (this.scanList.indexOf(examNumber) === -1) {
+        this.scanList.push(examNumber);
+      }
     },
-    async resetStartCountTime() {
-      await this.updateStartCountTime({
-        [this.curSubject.id]: Math.floor(Date.now() / 1000)
-      });
-      await this.updateScanNo();
+    resetStartCountTime() {
+      this.scanList = [];
       this.historyList = [];
     },
     // history

src/plugins/imageUpload.js

@@ -91,7 +91,7 @@ class UploadTask {
     this.taskRunning = true;
     setTimeout(() => {
       this.runUploadTask();
-    });
+    }, 100);
   }
 
   async runUploadTask() {

vue.config.js

@@ -16,7 +16,12 @@ var config = {
   pluginOptions: {
     electronBuilder: {
       builderOptions: {
-        extraFiles: ["extra/**"]
+        extraFiles: [
+          "extra/imagemagick/**",
+          "extra/zxing/**",
+          "extra/database/org.rdb",
+          "config.sample.json"
+        ]
       }
     }
   }