From f1a0101904c2cdd57b6b9d8202b6e577e7e58a86 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 5 Jul 2024 16:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=20?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=86=E5=88=AB=E5=A4=B1=E8=B4=A5=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dangan/pictureRecard/index.vue    |  4 ++--
 dangan-ui/src/views/dangan/task/index.vue       | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 7442ee5..50d42ee 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -118,9 +118,9 @@
             v-hasPermi="['dangan:pictureRecard:export']"
           >导出图片</el-button>
         </el-col>
-        <el-col :span="1.5">
+<!--        <el-col :span="1.5">
           <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="OCRRecognition">OCR识别</el-button>
-        </el-col>
+        </el-col>-->
       </el-row>
 
       <el-table v-loading="loading" :data="pictureRecardList" @selection-change="handleSelectionChange" border>
diff --git a/dangan-ui/src/views/dangan/task/index.vue b/dangan-ui/src/views/dangan/task/index.vue
index 6bd0365..b7d6067 100644
--- a/dangan-ui/src/views/dangan/task/index.vue
+++ b/dangan-ui/src/views/dangan/task/index.vue
@@ -64,6 +64,12 @@
             type="text"
             @click="onReRecongnize(scope.row)"
           >重新提交任务</el-button>
+          <el-button
+            v-if="scope.row.status==='2'&& (scope.row.failNum>0 || scope.row.failNum===null) "
+            size="mini"
+            type="text"
+            @click="onReRecongnize(scope.row)"
+          >重新识别失败图片</el-button>
           <el-button
             v-if="scope.row.status==='2'"
             size="mini"
@@ -92,21 +98,21 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body class="rwjd">
 
       <div class="rw_con">
+
         <div class="num">
           <span style="color:#409EFF;">总数量：{{ form.num }}</span>
+          <el-link type="primary" @click="getFailPicture(form.picIds)">查看所有图片</el-link>
         </div>
         <div class="num" v-if="form.status==='1'">
           <span style="color:#67C23A;">已识别：10</span>
         </div>
         <div class="num" v-if="form.status==='2'">
           <span style="color:#67C23A;">成功：{{ form.successNum }}</span>
-          <el-link :underline="false" type="primary" style="font-size:16px"
-                   v-if="form.successNum && form.successNum>0" @click="getSuccessPicture(form.successIds)">成功图片</el-link>
+          <el-link type="success" v-if="form.successNum && form.successNum>0" @click="getSuccessPicture(form.successIds)">查看成功图片</el-link>
         </div>
         <div class="num" v-if="form.status==='2'">
           <span style="color:#F56C6C;">失败：{{ form.failNum }}</span>
-          <el-link :underline="false" type="primary" style="font-size:16px"
-                   v-if="form.failNum && form.failNum>0" @click="getFailPicture(form.failIds)">失败图片</el-link>
+          <el-link type="danger" v-if="form.failNum && form.failNum>0" @click="getFailPicture(form.failIds)">查看失败图片</el-link>
         </div>
       </div>
 
@@ -260,7 +266,8 @@
     padding: 20px 20px;
 
     .rw_con{
-      padding-bottom: 40px;
+      padding: 0 20px;
+      padding-bottom: 30px;
       font-size: 16px;
 
       .num{