From de3c1aef6eae19b849a956a96315cf639cc033a7 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 19 Jun 2024 15:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dangan-ui/src/views/dangan/collection/index.vue    | 12 +++++++++---
 dangan-ui/src/views/dangan/pictureRecard/index.vue | 10 ++++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index af560ab..f544b6a 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -212,7 +212,6 @@ import { listBookshelf } from "@/api/dangan/bookshelf";
 import { collectSaves, collectRecongnize } from "@/api/dangan/collection";
 import '@/utils/WebScan';
 import axios from 'axios'
-import qs from 'qs'
 
 export default {
   name: "Collection",
@@ -588,12 +587,19 @@ export default {
         }
       })
       if(arr.length>0){
+        this.percentage = 0;
         this.openProgress = true;
         collectRecongnize(arr).then(response => {
-          this.pictureRecard = [];
+          console.log(3232,response);
+          if(response.fails&&response.fails.length>0){
+            this.pictureRecard = response.fails
+          }else {
+            this.pictureRecard = [];
+          }
+          this.checkAll = false;
           clearInterval(this.Interval);
           this.openProgress = false;
-          this.$modal.msgSuccess("操作成功");
+          this.$modal.msgSuccess(response.msg);
         }).catch(()=>{
           clearInterval(this.Interval);
           this.openProgress = false;
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index d51d279..8f5cc6c 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -110,16 +110,16 @@
 
       <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
         <el-table-column type="selection" width="50" align="center" fixed/>
-        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="80"/>
+        <el-table-column label="档案目录ID" align="center" prop="muId" fixed min-width="90"/>
         <el-table-column label="业务类型" align="center" prop="ywType" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.yw_type" :value="scope.row.ywType"/>
           </template>
         </el-table-column>
         <el-table-column label="档案目录路径" align="center" prop="muPath" min-width="120" show-overflow-tooltip/>
-        <el-table-column label="物理书架ID" align="center" prop="wlsjId" min-width="80"/>
+        <el-table-column label="物理书架ID" align="center" prop="wlsjId" min-width="90"/>
         <el-table-column label="物理书架路径" align="center" prop="wlsjPath" min-width="100" show-overflow-tooltip/>
-        <el-table-column label="是否已经识别" align="center" prop="recognize" >
+        <el-table-column label="是否已经识别" align="center" prop="recognize" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <dict-tag :options="dict.type.recognize" :value="scope.row.recognize"/>
           </template>
@@ -268,6 +268,8 @@ export default {
         arr.push(item);
       })
       if(arr.length>0){
+        this.percentage = 0;
+        this.openProgress = true;
         collectRecongnize(arr).then(response => {
           this.selectionList = [];
           clearInterval(this.Interval);
@@ -313,7 +315,7 @@ export default {
         headers: {
           'Content-Type': 'application/x-www-form-urlencoded'
         }
-      }).then(function (response) {
+      }).then((response)=>{
           this.percentage = Math.round((response.data.file_counts/this.selectionList.length)*100)
         }).catch(function (error) {
         // 处理错误情况