From e9e73c402beeb8ac566ab8907e70e46ed883066c Mon Sep 17 00:00:00 2001
From: Roland <763506525@qq.com>
Date: Fri, 5 Nov 2021 20:54:26 +0800
Subject: [PATCH] =?UTF-8?q?#=E8=BF=94=E6=98=BE=E9=AB=98=E4=BA=AE=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/service/workflow/impl/TaskServiceImpl.java  | 1 -
 yudao-admin-ui/src/api/oa/todo.js                        | 8 ++++++++
 yudao-admin-ui/src/views/oa/leave/index.vue              | 9 +++++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java
index f1dda75ec..c4e8823e8 100644
--- a/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java
+++ b/yudao-admin-server/src/main/java/cn/iocoder/yudao/adminserver/modules/activiti/service/workflow/impl/TaskServiceImpl.java
@@ -267,7 +267,6 @@ public class TaskServiceImpl implements TaskService {
     }
 
     private void responseImage(HttpServletResponse response, InputStream inputStream, String picName) throws IOException {
-        BufferedImage src = ImageIO.read(inputStream);
         response.setContentType("application/octet-stream;charset=UTF-8");
         response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(picName, "UTF-8"));
         byte[] b = new byte[1024];
diff --git a/yudao-admin-ui/src/api/oa/todo.js b/yudao-admin-ui/src/api/oa/todo.js
index 1aed4b058..cb98c466d 100644
--- a/yudao-admin-ui/src/api/oa/todo.js
+++ b/yudao-admin-ui/src/api/oa/todo.js
@@ -81,3 +81,11 @@ export function processHistorySteps(id) {
     method: 'get'
   })
 }
+
+
+export function getHighlightImg(id) {
+  return request({
+    url: '/workflow/task/process/highlight-img/'+id,
+    method: 'get'
+  })
+}
diff --git a/yudao-admin-ui/src/views/oa/leave/index.vue b/yudao-admin-ui/src/views/oa/leave/index.vue
index 04a0eb6d0..ef9db1bc6 100644
--- a/yudao-admin-ui/src/views/oa/leave/index.vue
+++ b/yudao-admin-ui/src/views/oa/leave/index.vue
@@ -137,11 +137,12 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="dialogStepsVisible" width="600px" append-to-body>
+    <el-dialog :title="title" :visible.sync="dialogStepsVisible" width="750px" append-to-body>
       <el-steps :active="stepActive" finish-status="success" >
         <el-step :title="stepTitle(item)" :description="stepAssignee(item.assignee)" icon="el-icon-edit"  v-for="(item) in handleTask.historyTask"></el-step>
       </el-steps>
       <br/>
+      <div v-html="svgUrl"></div>
       <el-steps direction="vertical" :active="stepActive">
         <el-step :title="stepTitle(item)" :description="stepDes(item)" v-for="(item) in handleTask.historyTask"></el-step>
       </el-steps>
@@ -156,7 +157,7 @@
 <script>
 import { createLeave, updateLeave, deleteLeave, getLeave, getLeavePage, exportLeaveExcel } from "@/api/oa/leave"
 import { getDictDataLabel, getDictDatas, DICT_TYPE } from '@/utils/dict'
-import { processHistorySteps } from '@/api/oa/todo'
+import { processHistorySteps,getHighlightImg } from '@/api/oa/todo'
 export default {
   name: "Leave",
   components: {
@@ -194,6 +195,7 @@ export default {
       },
       // 表单参数
       form: {},
+      svgUrl: "",
       handleTask: {
         historyTask:[],
         taskVariable: "",
@@ -361,6 +363,9 @@ export default {
         this.handleTask.historyTask = response.data;
         this.dialogStepsVisible = true
         this.title = "审批进度";
+        getHighlightImg(row.processInstanceId).then(response => {
+          that.svgUrl = response
+        })
       });
     },
     /** 导出按钮操作 */