From ec8505e42bbef9c45b2ce3586e296d6f174f39a3 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 26 Jun 2024 09:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=BF=9B=E5=BA=A6=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dangan/collection/index.vue     | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index fe80736..7340351 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -77,7 +77,7 @@
 
     <el-dialog title="档案文件上传" :visible.sync="upload.open" width="700px" append-to-body>
       <div style="margin-bottom: 30px;display: flex;min-height: 300px;" v-loading="upload.loading">
-        <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 500px;overflow-y: auto">
+        <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
           <div style="margin-bottom: 5px;">档案室密集柜：</div>
           <el-tree
             :data="shuJiaOptions"
@@ -97,6 +97,7 @@
           <el-upload :show-file-list="false" :fileSize="200"
                      ref="upload"
                      action="#"
+                     accept="image/*"
                      drag
                      :before-upload="beforeUpload"
                      :http-request="httpRequest"
@@ -104,7 +105,7 @@
           >
             <i class="el-icon-upload"></i>
             <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-            <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
+            <div class="el-upload__tip" slot="tip">只能上传图片，且不超过200MB</div>
           </el-upload>
 
           <ul class="el-upload-list el-upload-list--text" style="max-height:200px;overflow-y:scroll;padding: 15px;">
@@ -132,7 +133,7 @@
 
     <el-dialog title="扫描文件上传" :visible.sync="smwj.open" width="1000px" append-to-body>
       <div style="margin-bottom: 30px;display: flex;align-items:start;min-height: 300px;" v-loading="smwj.loading">
-        <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 500px;overflow-y: auto">
+        <div style="width:250px;border: 1px solid #eee; padding: 10px;max-height: 400px;overflow-y: auto">
           <div style="margin-bottom: 5px;">档案室密集柜：</div>
           <el-tree
             :data="shuJiaOptions"
@@ -206,10 +207,9 @@
     </el-dialog>
 
     <div class="myProgress" v-show="openProgress">
-<!--      <el-progress type="circle" :percentage="percentage"></el-progress>-->
       <div style="font-size: 50px">
         <span style="color: #409EFF">{{ percentage }}</span> /
-        <span style="color: #67C23A">{{ pictureRecard.length }} </span>
+        <span style="color: #67C23A">{{ checkLength }} </span>
       </div>
       <div style="margin-top:20px;">拼命识别中...</div>
     </div>
@@ -218,7 +218,6 @@
 </template>
 
 <script>
-import { catalogTreeselect } from "@/api/system/user";
 import { listCatalog } from "@/api/dangan/catalog";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -260,6 +259,7 @@ export default {
       // 书架树选项
       shuJiaOptions: [],
       pictureRecard: [],
+      checkLength: 0,
       // 是否全选
       checkAll: false,
       // 扫描文件上传
@@ -586,6 +586,7 @@ export default {
     },
     // OCR识别
     OCRRecognition(){
+      this.checkLength = 0;
       let arr = [];
       let singeOrDouble = 0
       if(!this.single){
@@ -597,6 +598,9 @@ export default {
           arr.push(item)
         }
       })
+
+      this.checkLength = arr.length;
+
       if(arr.length>0){
         this.percentage = 0;
         this.openProgress = true;
@@ -621,7 +625,7 @@ export default {
         });
 
         this.Interval = setInterval(()=> {
-          if(this.percentage===this.pictureRecard.length||this.percentage>this.pictureRecard.length){
+          if(this.percentage===this.checkLength || this.percentage>this.checkLength){
             clearInterval(this.Interval);
             this.Interval = null;
           }else {
@@ -667,11 +671,10 @@ export default {
         }
       })
         .then( (response)=> {
-          // this.percentage = Math.round((response.data.file_counts/this.pictureRecard.length)*100);
 
-          this.percentage = response.data.file_counts
+          this.percentage = response.data.file_counts;
 
-          if(this.percentage===this.pictureRecard.length||this.percentage>this.pictureRecard.length){
+          if(this.percentage===this.checkLength||this.percentage>this.checkLength){
             clearInterval(this.Interval);
             this.Interval = null;
           }