zhangjie 1 year ago
parent
commit
dcf28abf57

+ 3 - 0
src/modules/client/components/ScanTaskProcessDialog.vue

@@ -91,6 +91,7 @@
 import { mapState } from "vuex";
 import {
   getPreUploadFiles,
+  renamePreUploadJsonFile,
   saveOutputImage,
   clearDir,
   decodeImageCode,
@@ -201,11 +202,13 @@ export default {
         logger.error(`03扫描仪停止,故障:${res.errorMsg}`);
         this.$message.error(res.errorMsg);
         this.scanStatus = "FINISH";
+        renamePreUploadJsonFile(this.GLOBAL.input);
         return;
       }
       logger.info(`03扫描仪停止,扫描数:${res.data.length}`);
       await this.stageScanImage(res.data);
       this.scanStatus = "FINISH";
+      renamePreUploadJsonFile(this.GLOBAL.input);
       logger.info(`03-1完成条码解析`);
 
       if (this.task.isFormal && !this.scanStageList[0].studentCode) {

+ 10 - 1
src/modules/client/views/Scan.vue

@@ -19,6 +19,7 @@
           <el-button type="success" @click="toSetOrcArea"
             >设置条码识别区</el-button
           >
+          <el-button type="success" @click="toSetScan">设置扫描仪</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -83,7 +84,8 @@
             <h3>其他文件扫描</h3>
           </div>
           <div class="task-part-body"></div>
-          <div class="task-part-foot">
+          <div class="task-part-foot box-justify">
+            <div></div>
             <div class="task-btn" @click="toScan(false)">
               <span>开始扫描</span>
               <i class="icon icon-narrow-right"></i>
@@ -111,6 +113,7 @@ import { taskInfos } from "../api";
 import SecSelect from "@/components/SecSelect.vue";
 import OcrAreaSetDialog from "../components/OcrAreaSetDialog.vue";
 import ScanTaskProcessDialog from "../components/ScanTaskProcessDialog.vue";
+import { setScanner } from "../../../plugins/scanner";
 
 export default {
   name: "scan",
@@ -190,6 +193,12 @@ export default {
     toSetOrcArea() {
       this.$refs.OcrAreaSetDialog.open();
     },
+    async toSetScan() {
+      await setScanner().catch((error) => {
+        console.dir(error);
+        this.$message.error("连接扫描仪异常");
+      });
+    },
   },
 };
 </script>