From 11421587ff7122ee9d5953b1e7d2121f36e8e783 Mon Sep 17 00:00:00 2001
From: chenjg <17688741996@163.com>
Date: Mon, 22 Jul 2024 10:48:30 +0800
Subject: [PATCH] =?UTF-8?q?#[1199127977754624]=E5=8F=91=E5=B8=83=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E9=87=8C?=
 =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=AD=97=E6=AE=B5=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/11991279777?=
 =?UTF-8?q?54624?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoexec/detail/jobDetail/phase/node-list.vue     | 11 +++++++++++
 .../config/env/env-instance-list.vue                  |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
index 55be78ed..df7ff47f 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -60,6 +60,10 @@
         <span v-else :class="{ 'text-grey through': row.isDelete === 1 }">{{ row.host }}{{ row.port ? ':' + row.port : '' }}</span>
         <span v-if="row.warnCount" class="ml-xs tsfont-warning-o text-warning">{{ row.warnCount }}</span>
       </template>
+      <template v-slot:version="{ row }">
+        <span v-if="row && row.version">{{ row.version }}</span>
+        <span v-else>-</span>
+      </template>
       <template v-slot:nodeName="{ row }">
         <span :class="{ 'text-grey': row.isDelete === 1 }">{{ row.nodeName }}</span>
       </template>
@@ -282,6 +286,13 @@ export default {
   },
   beforeCreate() {},
   created() {
+    if (this.jobData.source == 'deploy' || this.jobData.source == 'deployschedulegeneral') {
+      // 添加发布版本字段
+      this.theadList.splice(1, 0, {
+        title: this.$t('page.versions'),
+        key: 'version'
+      });
+    }
     if (this.jobData.isCanExecute) {
       this.theadList.unshift({ key: 'selection' });
       this.theadList.push({ key: 'action' });
diff --git a/src/views/pages/deploy/application-config/config/env/env-instance-list.vue b/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
index f2a8c4bd..ac28c9b1 100644
--- a/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
+++ b/src/views/pages/deploy/application-config/config/env/env-instance-list.vue
@@ -41,12 +41,15 @@
         :tbodyList="tbodyList"
         :theadList="theadList"
       >
+        <template slot="version" slot-scope="{ row }">
+          <span v-if="row && row.version">{{ row.version }}</span>
+          <span v-else>-</span>
+        </template>
         <template slot="maintenanceWindow" slot-scope="{ row }">
           <span v-if="row.maintenanceWindow">{{ handleTimerange(row.maintenanceWindow) }}</span>
         </template>
       </TsTable>
     </div>
-  
     <EnvInstanceEdit v-if="isShowEnInstanceEdit" :params="params" @close="closeEnvInstanceEdit"></EnvInstanceEdit>
   </div>
 </template>
@@ -85,6 +88,10 @@ export default {
           title: this.$t('page.name'),
           key: 'name'
         },
+        {
+          title: this.$t('page.versions'),
+          key: 'version'
+        },
         {
           title: this.$t('page.ip'),
           key: 'ip'
-- 
Gitee