From 07499be2fb45426b8fc44622ccfd057cff6adc18 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Wed, 19 Jun 2024 16:34:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86=E6=A0=B7?=
 =?UTF-8?q?=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   | 15 +++++++++++++--
 .../src/views/dangan/pictureRecard/index.vue      |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index f544b6a..50c4fd2 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -37,11 +37,16 @@
           <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="OCRRecognition">OCR识别</el-button>
         </div>
 
-        <div style="margin-top: 50px;">
+        <div style="margin-top: 40px;">
 
           <el-empty :image-size="240" v-if="pictureRecard.length===0"></el-empty>
 
           <div v-if="pictureRecard.length>0">
+
+            <div v-show="isFails" style="margin-bottom: 10px;width:80%;min-width:400px">
+              <el-alert title="未识别图片，请重新识别" type="warning" effect="dark" :closable="false"></el-alert>
+            </div>
+
             <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
             <div style="margin: 15px 0;"></div>
             <el-checkbox v-for="item in pictureRecard" :label="item.picName" :key="item.id" v-model="item.checked" @change="handleCheckChange(item)">
@@ -218,6 +223,7 @@ export default {
   components: {Treeselect},
   data() {
     return {
+      isFails: false,
       // 颜色模式，0：黑白 1：灰色 2：彩色
       pixel: 1,
       // 是否单面
@@ -593,13 +599,18 @@ export default {
           console.log(3232,response);
           if(response.fails&&response.fails.length>0){
             this.pictureRecard = response.fails
+            this.isFails = true;
+            this.$alert(`${response.msg},请重新识别失败档案！`, `提示`, {
+              type: 'warning'
+            });
           }else {
+            this.isFails = false;
             this.pictureRecard = [];
+            this.$modal.msgSuccess(response.msg);
           }
           this.checkAll = false;
           clearInterval(this.Interval);
           this.openProgress = false;
-          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 8f5cc6c..4b8c247 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -103,8 +103,8 @@
             v-hasPermi="['dangan:pictureRecard:export']"
           >导出图片</el-button>
         </el-col>
-        <el-col :span="22" style="display: flex; align-items: center; justify-content: end">
-          <el-button icon="el-icon-full-screen" type="primary" @click="OCRRecognition">OCR识别</el-button>
+        <el-col :span="1.5">
+          <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="OCRRecognition">OCR识别</el-button>
         </el-col>
       </el-row>