zhangjie пре 2 година
родитељ
комит
227325124b

+ 6 - 0
src/assets/styles/icons.scss

@@ -17,5 +17,11 @@
     width: 14px;
     width: 14px;
     height: 14px;
     height: 14px;
   }
   }
+  &-rotate-right {
+    background-image: url(../images/icon-rotate-right.png);
+  }
+  &-rotate-right-act {
+    background-image: url(../images/icon-rotate-right-act.png);
+  }
 
 
 }
 }

+ 12 - 1
src/modules/client/components/OcrAreaSetDialog.vue

@@ -47,7 +47,11 @@
 <script>
 <script>
 import Cropper from "cropperjs";
 import Cropper from "cropperjs";
 import db from "@/plugins/db";
 import db from "@/plugins/db";
-import { getPreUploadFiles } from "../../../plugins/imageOcr";
+import {
+  getPreUploadFiles,
+  renamePreUploadJsonFile
+} from "../../../plugins/imageOcr";
+import { evokeScanner } from "../../../plugins/scanner";
 
 
 export default {
 export default {
   name: "ocr-area-set",
   name: "ocr-area-set",
@@ -69,8 +73,15 @@ export default {
       this.modalIsShow = true;
       this.modalIsShow = true;
     },
     },
     async dialogOpened() {
     async dialogOpened() {
+      await this.evokeScanExe();
       await this.initData();
       await this.initData();
       this.initCropper();
       this.initCropper();
+      renamePreUploadJsonFile(this.GLOBAL.input);
+    },
+    async evokeScanExe() {
+      await evokeScanner(this.GLOBAL.input).catch(error => {
+        console.error(error);
+      });
     },
     },
     async initData() {
     async initData() {
       const ocrArea = await db.getDict("ocrArea", "").catch(() => {});
       const ocrArea = await db.getDict("ocrArea", "").catch(() => {});

+ 5 - 0
src/modules/client/views/TaskManage.vue

@@ -49,6 +49,11 @@
           label="任务名称"
           label="任务名称"
           min-width="160"
           min-width="160"
         ></el-table-column>
         ></el-table-column>
+        <el-table-column
+          prop="archivesName"
+          label="档案名称"
+          min-width="160"
+        ></el-table-column>
         <el-table-column prop="courseName" label="课程" min-width="200">
         <el-table-column prop="courseName" label="课程" min-width="200">
           <span slot-scope="scope">
           <span slot-scope="scope">
             {{ scope.row.courseName }}({{ scope.row.courseCode }})
             {{ scope.row.courseName }}({{ scope.row.courseCode }})