From 15c5d7fbd3f94c5655a3a964c98e73f9f3aeadf2 Mon Sep 17 00:00:00 2001
From: wanglei <wl2666675>
Date: Fri, 12 Jul 2024 15:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E3=80=81=E6=A1=A3=E6=A1=88=E9=87=87=E9=9B=86=E3=80=81?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=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    | 6 +++---
 dangan-ui/src/views/dangan/pictureRecard/index.vue | 6 +++---
 dangan-ui/src/views/dangan/task/index.vue          | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dangan-ui/src/views/dangan/collection/index.vue b/dangan-ui/src/views/dangan/collection/index.vue
index 70031c4..987f30b 100644
--- a/dangan-ui/src/views/dangan/collection/index.vue
+++ b/dangan-ui/src/views/dangan/collection/index.vue
@@ -37,7 +37,7 @@
             <el-button icon="el-icon-upload2" type="primary" @click="handleUpload">点击上传</el-button>
             <el-button icon="el-icon-upload2" type="primary" @click="handleScan">扫描上传</el-button>
           </div>
-          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="OCRRecognition">OCR识别</el-button>
+          <el-button icon="el-icon-full-screen" type="primary" v-if="pictureRecard.length>0" @click="OCRRecognition">创建识别任务</el-button>
         </div>
 
         <div style="margin-top: 40px;">
@@ -208,7 +208,7 @@
       :visible.sync="tsVisible"
       width="500px">
       <div style="padding: 0 30px; line-height: 30px">
-        OCR识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
+        创建识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" plain @click="onZbqljxcj">暂不处理继续采集</el-button>
@@ -618,7 +618,7 @@ export default {
       this.pictureRecard = [...this.pictureRecard]
       this.checkAll = checkAll
     },
-    // OCR识别
+    // 创建识别任务
     async OCRRecognition(){
 
       let tatal_task_pic = this.dict.type.tatal_task_pic;
diff --git a/dangan-ui/src/views/dangan/pictureRecard/index.vue b/dangan-ui/src/views/dangan/pictureRecard/index.vue
index 7ac117d..de3b845 100644
--- a/dangan-ui/src/views/dangan/pictureRecard/index.vue
+++ b/dangan-ui/src/views/dangan/pictureRecard/index.vue
@@ -127,7 +127,7 @@
           >导出图片</el-button>
         </el-col>
         <el-col :span="1.5">
-          <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="OCRRecognition">OCR识别</el-button>
+          <el-button icon="el-icon-full-screen" size="mini" type="primary" @click="OCRRecognition">创建识别任务</el-button>
         </el-col>
       </el-row>
 
@@ -189,7 +189,7 @@
       :visible.sync="tsVisible"
       width="500px">
       <div style="padding: 0 30px; line-height: 30px">
-        OCR识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
+        创建识别任务提交失败，请选择【暂不处理继续采集】或【重新提交任务】或【去任务记录】查看!
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" plain @click="onZbqljxcj">暂不处理继续采集</el-button>
@@ -298,7 +298,7 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    // OCR识别
+    // 创建识别任务
     async OCRRecognition(){
 
       let tatal_task_pic = this.dict.type.tatal_task_pic;
diff --git a/dangan-ui/src/views/dangan/task/index.vue b/dangan-ui/src/views/dangan/task/index.vue
index 9280684..f831181 100644
--- a/dangan-ui/src/views/dangan/task/index.vue
+++ b/dangan-ui/src/views/dangan/task/index.vue
@@ -124,9 +124,10 @@
 
           <el-link type="danger" v-if="form.failNum && form.failNum>0" @click="getFailPicture(form.failIds)">查看失败图片</el-link>
 
-          <div style="color:#F56C6C;" v-if="form.failNum && form.failNum>0">失败原因：{{ form.remark }}</div>
-
         </div>
+
+        <div class="num" style="color:#F56C6C;" v-if="(form.status==='2'||form.status==='-1')&&form.failNum && form.failNum>0">失败原因：{{ form.remark }}</div>
+
       </div>
 
     </el-dialog>