From 7c9b0746bc6ebdfb129251bacce842f0608e7da9 Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Wed, 25 Sep 2024 16:51:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E9=9B=86=E6=88=90=E5=89=8D?=
 =?UTF-8?q?=E5=8F=B0=E4=BB=BB=E5=8A=A1=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/newIntegrationTask/foregroundTask/configData.js   | 4 ++++
 src/views/newIntegrationTask/foregroundTask/rightDialog.vue | 3 +++
 vue.config.js                                               | 4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/views/newIntegrationTask/foregroundTask/configData.js b/src/views/newIntegrationTask/foregroundTask/configData.js
index 1297b10..4fc896e 100644
--- a/src/views/newIntegrationTask/foregroundTask/configData.js
+++ b/src/views/newIntegrationTask/foregroundTask/configData.js
@@ -119,6 +119,10 @@ const operationTableColumn= [
     label: '推送人名称',
     prop: 'create_user_id',
   },
+  {
+    label: '任务状态',
+    prop: 'status',
+  },
 ]
 export default {
   tableColumnData,
diff --git a/src/views/newIntegrationTask/foregroundTask/rightDialog.vue b/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
index f21c18a..d799aa5 100644
--- a/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
+++ b/src/views/newIntegrationTask/foregroundTask/rightDialog.vue
@@ -160,6 +160,9 @@
           :tableData="tableData"
           :funWidth="80"
         >
+          <template #status="{row}">
+            {{ row.status == 1 ? '执行中' : '执行完成' }}
+          </template>
         </base-table>
       </template>
 
diff --git a/vue.config.js b/vue.config.js
index a44ecdb..5505811 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -45,8 +45,8 @@ module.exports = {
         // target: `http://192.168.2.78:9999`,
         // target: `http://192.168.2.85:9999`,
         // target: `http://192.168.2.78:8080`,
-        // target: `http://192.168.2.78:10086`,
-        target: `http://192.168.2.185:10086`,
+        target: `http://192.168.2.78:10086`,
+        // target: `http://192.168.2.185:10086`,
         // target: `http://192.168.2.83:9999`,
         // target:'http://127.0.0.1:9999/',
         changeOrigin: true,