From 090b22295c18ffe2507d348c4cef8d1ee4608be1 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sat, 16 Nov 2024 00:34:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E8=AF=B7=E6=B1=82uri=20=E8=B0=83=E6=95=B4=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/processDefinition/design.vue | 6 ++----
 src/views/workflow/task/allTaskWaiting.vue      | 6 +++++-
 src/views/workflow/task/taskWaiting.vue         | 6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/workflow/processDefinition/design.vue b/src/views/workflow/processDefinition/design.vue
index cb636c6..a3f522d 100644
--- a/src/views/workflow/processDefinition/design.vue
+++ b/src/views/workflow/processDefinition/design.vue
@@ -7,11 +7,10 @@
 <script setup name="WarmFlow">
 const { proxy } = getCurrentInstance();
 import { onMounted } from 'vue';
-
 // definitionId为需要查询的流程定义id，
 // disabled为是否可编辑, 例如：查看的时候不可编辑，不可保存
 const iframeUrl = ref('');
-const disabled = ref(false);
+const baseUrl = import.meta.env.VITE_APP_BASE_API;
 const iframeLoaded = () => {
   // iframe监听组件内设计器保存事件
   window.onmessage = (event) => {
@@ -23,8 +22,7 @@ const iframeLoaded = () => {
   };
 };
 const open = async (definitionId) => {
-  iframeUrl.value = `http://localhost:8080/warm-flow-ui/${definitionId}`;
-  console.log(iframeUrl.value);
+  iframeUrl.value = baseUrl + `/warm-flow-ui/index.html?id=${definitionId}&disabled=false`;
 };
 /** 关闭按钮 */
 function close() {
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 89c5207..6c8b6af 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -62,7 +62,11 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70"> </el-table-column>
+        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70">
+          <template #default="scope">
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" :width="tab === 'finish' ? '80' : '151'">
           <template #default="scope">
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 7f8198a..ddd99ce 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -46,7 +46,11 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70"> </el-table-column>
+        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70">
+          <template #default="scope">
+            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
         <el-table-column label="操作" align="center" width="200">
           <template #default="scope">