From 73389b875db1723fbc0e291cc3283d1a654bc2b2 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 13 Jun 2025 11:33:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[14420364717916?=
 =?UTF-8?q?16]=E4=BD=9C=E4=B8=9A=E8=AF=A6=E6=83=85=E9=A1=B5=E7=9A=84runner?=
 =?UTF-8?q?=E5=92=8Csql=E7=B1=BB=E5=9E=8B=E7=9A=84phase=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=84=E6=89=A7=E8=A1=8C=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/story-detail/9390509?=
 =?UTF-8?q?47543040/939050947543042/1442036471791616?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobDetail/phase/node/node-detail.vue      | 10 +++++++--
 .../jobDetail/phase/sqlfile-content.vue       | 21 ++++++++++++++++---
 .../autoexec/detail/logcomponents/sql-log.vue |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
index d44c9891..093f8faf 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/node-detail.vue
@@ -14,26 +14,32 @@
         :class="getTabDetailClass()"
         name="standardOutput"
       >
-        <div v-if="phaseData.execMode === 'runner'" class="pl-nm">
-          <div v-if="jobData.isCanExecute" class="action-group line">
+        <div v-if="phaseData.execMode === 'runner'" class="pl-nm pr-nm flex-between">
+          <div class="action-group line">
             <span
+              v-if="jobData.isCanExecute"
               class="action-item tsfont-restart"
               :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
               @click="runnerAction('reset')"
             >{{ $t('page.reset') }}</span>
             <span
+              v-if="jobData.isCanExecute"
               class="action-item tsfont-minus-o"
               :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
               @click="runnerAction('ignore')"
             >{{ $t('page.ignore') }}
             </span>
             <span
+              v-if="jobData.isCanExecute"
               class="action-item tsfont-run"
               :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
               @click="runnerAction('refire')"
             >{{ $t('page.execute') }}
             </span>
           </div>
+          <div>
+            <span v-if="phaseData.jobGroupVo && phaseData.jobGroupVo.policy" class="text-tip">{{ $t('term.deploy.executivestrategy') }}：{{ phaseData.jobGroupVo.policy }} </span>
+          </div>
         </div>
         <div style="display:grid;grid-template-columns:228px auto" class="padding">
           <div style="overflow-y: auto;" :style="{ height: 'calc(100vh - ' + (mode === 'page' ? (!$utils.isEmptyObj(jobData.extraInfo) ? '330px': '235px') : '190px') + ')' }">
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
index 4cbc23ba..0f172a07 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
@@ -20,9 +20,24 @@
     </span>
     <Tabs v-model="tabValue" class="tab-contain block-tabs2" :animated="false">
       <TabPane :label="$t('term.autoexec.standardoutput')" name="standardOutput">
-        <div v-if="jobData.isCanExecute" class="div-btn-contain action-group no-line pl-nm">
-          <span class="action-item tsfont-restart" :class="phaseData.status == 'running'?'disable':''" @click="resetAllNode()">{{ $t('page.resetall') }}</span>
-          <span class="action-item tsfont-run" :class="phaseData.status == 'running'?'disable':''" @click="refirePhase()">{{ $t('page.executeall') }}</span>
+        <div class="pl-nm pr-nm flex-between">
+          <div class="div-btn-contain action-group no-line">
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-restart"
+              :class="phaseData.status == 'running'?'disable':''"
+              @click="resetAllNode()"
+            >{{ $t('page.resetall') }}</span>
+            <span
+              v-if="jobData.isCanExecute"
+              class="action-item tsfont-run"
+              :class="phaseData.status == 'running'?'disable':''"
+              @click="refirePhase()"
+            >{{ $t('page.executeall') }}</span>
+          </div>
+          <div>
+            <span v-if="phaseData.jobGroupVo && phaseData.jobGroupVo.policy" class="text-tip">{{ $t('term.deploy.executivestrategy') }}：{{ phaseData.jobGroupVo.policy }} </span>
+          </div>
         </div>
         <div style="display:grid;grid-template-columns:186px auto;" class="padding">
           <div>
diff --git a/src/views/pages/autoexec/detail/logcomponents/sql-log.vue b/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
index 8b29bbab..10da762e 100644
--- a/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/sql-log.vue
@@ -129,7 +129,7 @@ export default {
       };
     },
     offsetHeight() {
-      return this.mode == 'page' ? this.isHasExtraInfo ? '310px' : '215px' : '180px';
+      return this.mode == 'page' ? this.isHasExtraInfo ? '330px' : '215px' : '180px';
     }
   },
   watch: {
-- 
Gitee


From d08f96789808968bb9513a7b043156fced20fd00 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 13 Jun 2025 13:07:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9AwaitInput=E6=97=B6=EF=BC=8C=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/logcomponents/node-log.vue         | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/src/views/pages/autoexec/detail/logcomponents/node-log.vue b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
index 688feea7..b0e0fade 100644
--- a/src/views/pages/autoexec/detail/logcomponents/node-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
@@ -189,30 +189,29 @@ export default {
             const isRefresh = res.Return.isRefresh;
             this.startPos = Math.min(this.logData.startPos, this.startPos);
             this.endPos = Math.max(this.logData.endPos, this.endPos);
-            if (!this.$utils.isEmpty(res.Return.lineList)) {
-              if (param.direction == 'down') {
-                for (let i = 0; i < res.Return.lineList.length; i++) {
-                  this.logContentList.push(res.Return.lineList[i]);
-                }
-              } else {
-              //记录第一行原来的位置，更新内容后重新定位到这个地方
-                firstIndex = res.Return.lineList.length;
-                for (let i = res.Return.lineList.length - 1; i >= 0; i--) {
-                  this.logContentList.unshift(res.Return.lineList[i]);
-                }
+       
+            if (param.direction == 'down') {
+              for (let i = 0; i < res.Return.lineList.length; i++) {
+                this.logContentList.push(res.Return.lineList[i]);
               }
-              if (isRefresh == 1) {
-                this.refreshTimes = 3;
-                this.timmer = setTimeout(() => {
-                  this.getContent('down', this.endPos);
-                }, this.calcIntervalTime(res.Return.lineList.length));
-              } else if (isRefresh == 0 && this.refreshTimes > 0) {
-                this.refreshTimes--;
-                this.timmer = setTimeout(() => {
-                  this.getContent('down', this.endPos);
-                }, 2000);
+            } else {
+              //记录第一行原来的位置，更新内容后重新定位到这个地方
+              firstIndex = res.Return.lineList.length;
+              for (let i = res.Return.lineList.length - 1; i >= 0; i--) {
+                this.logContentList.unshift(res.Return.lineList[i]);
               }
             }
+            if (isRefresh == 1) {
+              this.refreshTimes = 3;
+              this.timmer = setTimeout(() => {
+                this.getContent('down', this.endPos);
+              }, this.calcIntervalTime(res.Return.lineList.length));
+            } else if (isRefresh == 0 && this.refreshTimes > 0) {
+              this.refreshTimes--;
+              this.timmer = setTimeout(() => {
+                this.getContent('down', this.endPos);
+              }, 2000);
+            }
           })
           .finally(() => {
             this.isLoading = false;
-- 
Gitee