From 0c13f8f8adcc5d268871a17dab78c6920c347820 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 5 Jun 2025 18:18:24 +0800
Subject: [PATCH 1/4] =?UTF-8?q?-[=E5=85=B3=E8=81=94]=20#[1436868049076224]?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE&?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1436868049076224?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobDetail/phase/node/node-detail.vue      | 31 +++++++-
 .../detail/jobDetail/phase/runner-content.vue | 33 ++++-----
 .../jobDetail/phase/sqlfile-content.vue       | 72 +++++++++++++++++--
 .../detail/logcomponents/node-log.vue         |  2 +-
 4 files changed, 109 insertions(+), 29 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 50c6e5ae..e54ed5f7 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
@@ -11,12 +11,34 @@
       <TabPane
         v-if="phaseData.execMode != 'sqlfile'"
         :label="$t('term.autoexec.standardoutput')"
-        class="padding"
         :class="getTabDetailClass()"
         name="standardOutput"
       >
-        <div style="display:grid;grid-template-columns:228px auto">
-          <div style="overflow-y: auto;" :style="{ height: 'calc(100vh - ' + (mode === 'page' ? !$utils.isEmptyObj(jobData.extraInfo) ? '310px': '215px' : '190px') + ')' }">
+        <div v-if="phaseData.execMode === 'runner'" class="pl-nm">
+          <div class="action-group line">
+            <span v-if="phaseData.warnCount > 0" class="block-item">
+              <span>{{ $t('page.warningmessage') }}</span>
+              <span class="text-warning pl-icon">{{ phaseData.warnCount }}</span>
+            </span>
+            <span 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>
+        <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') + ')' }">
             <div v-if="operationList && operationList.length">
               <div
                 v-for="(step, sindex) in operationList"
@@ -492,6 +514,9 @@ export default {
       } else if (this.mode === 'dialog') {
         return 'tab-detail-dialog';
       }
+    },
+    runnerAction(type) {
+      this.$emit('runnerAction', type);
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
index e0a95bde..af58e8f7 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
@@ -2,25 +2,6 @@
   <div v-if="jobData && phaseData" class="runner-content">
     <div v-if="runnerData" class="pl-nm pr-nm pt-nm text-right runner-action">
       <div class="action-group line">
-        <span v-if="phaseData.warnCount > 0" class="action-item">
-          <span>{{ $t('page.warningmessage') }}</span>
-          <span class="text-warning pl-icon">{{ phaseData.warnCount }}</span>
-        </span>
-        <span class="action-item tsfont-restart" :class="phaseData.status == 'running' ? 'disable' : 'text-action'" @click="resetAllNode()">{{ $t('page.reset') }}</span>
-        <span
-          v-if="jobData.isCanExecute"
-          class="action-item tsfont-minus-o"
-          :class="phaseData.status != 'failed' ? 'disable' : 'text-action'"
-          @click="ignorePhase()"
-        >{{ $t('page.ignore') }}
-        </span>
-        <span
-          v-if="jobData.isCanExecute"
-          class="action-item tsfont-run"
-          :class="phaseData.status == 'running' ? 'disable' : 'text-action'"
-          @click="refirePhase()"
-        >{{ $t('page.execute') }}
-        </span>
         <span class="action-item">
           <Poptip transfer placement="bottom">
             <span class="text-action">
@@ -50,6 +31,7 @@
       :phaseData="phaseData"
       :runnerData="runnerData"
       :nodeData="nodeData"
+      @runnerAction="runnerAction"
     ></NodeDetail>
     <RefirePhaseDialog
       v-if="isRefireDialogShow"
@@ -179,6 +161,19 @@ export default {
         return false;
       }
       this.isIgnorePhseeDialogShow = true;
+    },
+    runnerAction(action) {
+      switch (action) {
+        case 'refire':
+          this.refirePhase();
+          break;
+        case 'reset':
+          this.resetAllNode();
+          break;
+        case 'ignore':
+          this.ignorePhase();
+          break;
+      }
     }
   },
   computed: {},
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 1f7eab2a..4cbc23ba 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/sqlfile-content.vue
@@ -19,8 +19,12 @@
       </Poptip>
     </span>
     <Tabs v-model="tabValue" class="tab-contain block-tabs2" :animated="false">
-      <TabPane :label="$t('term.autoexec.standardoutput')" class="padding" name="standardOutput">
-        <div style="display:grid;grid-template-columns:186px auto">
+      <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>
+        <div style="display:grid;grid-template-columns:186px auto;" class="padding">
           <div>
             <div v-if="operationList && operationList.length">
               <div
@@ -63,10 +67,34 @@
           @refresh="refresh"
         ></SqlFileList>
       </TabPane>
-      <TabPane :label="$t('term.autoexec.runrecord')" class="padding" name="record">
-        <Record v-if="tabValue == 'record'" :nodeData="nodeData" :phaseData="phaseData"></Record>
+      <TabPane :label="$t('term.autoexec.runrecord')" name="record">
+        <div v-if="jobData.isCanExecute && phaseData" 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>
+        <Record
+          v-if="tabValue == 'record'"
+          :nodeData="nodeData"
+          :phaseData="phaseData"
+          class="padding"
+        ></Record>
       </TabPane>
     </Tabs>
+    <ResetDialog
+      v-if="actionParam && isResetDialogShow"
+      :jobId="actionParam.jobId"
+      :phaseId="actionParam.phaseId"
+      :nodeList="actionParam.nodeList"
+      :isAll="actionParam.isAll"
+      @close="closeResetDialog"
+    ></ResetDialog>
+    <RefirePhaseDialog
+      v-if="isRefireDialogShow"
+      :phaseId="phaseData.id"
+      :phaseName="phaseData.name"
+      :execMode="phaseData.execMode"
+      @close="closeRefireDialog"
+    ></RefirePhaseDialog>
   </div>
 </template>
 <script>
@@ -75,7 +103,9 @@ export default {
   components: {
     SqlLog: () => import('@/views/pages/autoexec/detail/logcomponents/sql-log.vue'),
     Record: () => import('./node/record.vue'),
-    SqlFileList: () => import('./sqlfile-list.vue')
+    SqlFileList: () => import('./sqlfile-list.vue'),
+    ResetDialog: () => import('../reset-dialog.vue'),
+    RefirePhaseDialog: () => import('../refire-phase-dialog.vue')
   },
   filters: {},
   directives: {},
@@ -92,7 +122,9 @@ export default {
       timmer: null,
       runnerData: {},
       nodeData: {},
-      locationId: null //日志定位行id
+      locationId: null, //日志定位行id
+      isResetDialogShow: false,
+      actionParam: {}
     };
   },
   beforeCreate() {},
@@ -158,6 +190,34 @@ export default {
     },
     refresh() {
       this.$emit('refresh');
+    },
+    resetAllNode() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
+      this.actionParam = {};
+      this.actionParam.jobId = this.jobData.id;
+      this.actionParam.phaseId = this.phaseData.id;
+      this.actionParam.isAll = 1;
+      this.isResetDialogShow = true;
+    },
+    closeResetDialog(needRefresh) {
+      this.isResetDialogShow = false;
+      if (needRefresh) {
+        this.refresh();
+      }
+    },
+    refirePhase() {
+      if (this.phaseData.status == 'running') { //阶段状态判断:运行中状态：不可点击;其他状态，可以点击
+        return false;
+      }
+      this.isRefireDialogShow = true;
+    },
+    closeRefireDialog(needRefresh) {
+      this.isRefireDialogShow = false;
+      if (needRefresh) {
+        this.refresh();
+      }
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/logcomponents/node-log.vue b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
index a128bcb7..64ed82bc 100644
--- a/src/views/pages/autoexec/detail/logcomponents/node-log.vue
+++ b/src/views/pages/autoexec/detail/logcomponents/node-log.vue
@@ -262,7 +262,7 @@ export default {
   },
   computed: {
     offsetHeight() {
-      return this.mode == 'page' ? this.isHasExtraInfo ? '310px' : '215px' : '190px';
+      return this.mode == 'page' ? (this.isHasExtraInfo ? '330px' : '235px') : '190px';
     },
     getContentClass() {
       return type => {
-- 
Gitee


From 817e2983760e4fa8fa4041b573b9a16b4c50bce1 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 9 Jun 2025 10:12:54 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[=E5=85=B3=E8=81=94]=20#[1436868049076224]?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96-=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE&?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1436868049076224?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobDetail/phase/node/node-detail.vue      | 41 +++++++++++++++----
 .../detail/jobDetail/phase/node/param.vue     | 33 ++++++++++++---
 .../detail/jobDetail/phase/runner-content.vue |  4 ++
 3 files changed, 64 insertions(+), 14 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 aa1590d2..86d3afa5 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
@@ -16,10 +16,6 @@
       >
         <div v-if="phaseData.execMode === 'runner'" class="pl-nm">
           <div class="action-group line">
-            <span v-if="phaseData.warnCount > 0" class="block-item">
-              <span>{{ $t('page.warningmessage') }}</span>
-              <span class="text-warning pl-icon">{{ phaseData.warnCount }}</span>
-            </span>
             <span class="action-item tsfont-restart" :class="phaseData.status == 'running' ? 'disable' : 'text-action'" @click="runnerAction('reset')">{{ $t('page.reset') }}</span>
             <span
               v-if="jobData.isCanExecute"
@@ -270,7 +266,7 @@
       </TabPane>
       <TabPane
         :label="$t('page.inputparam')"
-        class="padding"
+        class="pl-nm pr-nm"
         :class="getTabDetailClass()"
         name="inputParameters"
         style="paddint-top:0px"
@@ -283,11 +279,14 @@
           :sqlName="nodeData.sqlFile"
           :jobId="jobData.id"
           :type="'input'"
+          :jobData="jobData"
+          :phaseData="phaseData"
+          @runnerAction="runnerAction"
         ></NodeParam>
       </TabPane>
       <TabPane
         :label="$t('page.outputparam')"
-        class="padding"
+        class="pl-nm pr-nm"
         :class="getTabDetailClass()"
         name="outputParameters"
         style="paddint-top:0px"
@@ -300,15 +299,41 @@
           :sqlName="nodeData.sqlFile"
           :jobId="jobData.id"
           :type="'output'"
+          :jobData="jobData"
+          :phaseData="phaseData"
+          @runnerAction="runnerAction"
         ></NodeParam>
       </TabPane>
       <TabPane
         :label="$t('term.autoexec.runrecord')"
-        class="padding"
         :class="getTabDetailClass()"
         name="record"
       >
-        <Record v-if="tabValue == 'record'" :nodeData="nodeData" :phaseData="phaseData"></Record>
+        <div v-if="phaseData.execMode === 'runner'" class="pl-nm">
+          <div class="action-group line">
+            <span 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>
+        <Record
+          v-if="tabValue == 'record'"
+          :nodeData="nodeData"
+          :phaseData="phaseData"
+          class="padding"
+        ></Record>
       </TabPane>
       <template v-if="customTemplateList.length">
         <TabPane
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue b/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
index e9a2e740..0b3f587c 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node/param.vue
@@ -1,12 +1,28 @@
 <template>
   <div>
-    <div>
-      <Button
+    <div class="action-group line">
+      <template v-if="phaseData && phaseData.execMode === 'runner'">
+        <span 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>
+      </template>
+      <span
         v-if="!downLoading && paramList.length > 0"
         v-download="getDownurl()"
-        type="primary"
-        ghost
-      >{{ $t('term.autoexec.paramdownload') }}</Button>
+        class="action-item tsfont-download"
+      >{{ $t('term.autoexec.paramdownload') }}</span>
       <span v-if="downLoading" class="action-item disable" :title="$t('page.downloadloadingtip')">
         <Icon type="ios-loading" size="18" class="loading"></Icon>
         {{ $t('page.downloading') }}
@@ -97,7 +113,9 @@ export default {
     resourceId: [Number, String], //资源id
     sqlName: [String, String], //作业文件名
     jobId: [Number, String], // 作业id
-    type: [String, String] //输入|输出 参数
+    type: [String, String], //输入|输出 参数
+    phaseData: { type: Object },
+    jobData: { type: Object }
   },
   data() {
     let _this = this;
@@ -184,6 +202,9 @@ export default {
         isJson = false;
       }
       return isJson;
+    },
+    runnerAction(action) {
+      this.$emit('runnerAction', action);
     }
   },
   computed: {
diff --git a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
index 09df4939..ad0c22a4 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/runner-content.vue
@@ -2,6 +2,10 @@
   <div v-if="jobData && phaseData" class="runner-content">
     <div v-if="runnerData" class="pl-nm pr-nm pt-nm text-right runner-action">
       <div class="action-group line">
+        <span v-if="phaseData.warnCount > 0" class="action-item">
+          <span>{{ $t('page.warningmessage') }}</span>
+          <span class="text-warning pl-icon">{{ phaseData.warnCount }}</span>
+        </span>
         <span class="action-item">
           <Poptip transfer placement="bottom">
             <span class="text-action">
-- 
Gitee


From 2443c3df7fcccac1310995abece3f8be2c915e59 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 9 Jun 2025 10:53:46 +0800
Subject: [PATCH 3/4] =?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=9A=E9=98=B6=E6=AE=B5=EF=BC=9A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=88=A4=E6=96=AD=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../autoexec/detail/jobDetail/phase/node-list.vue  | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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 f86d9be3..833218b6 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -26,19 +26,17 @@
               </div>
             </Poptip>
           </span>
-          <span class="action-item">
+          <span v-if="canExportNode" class="action-item">
             <Dropdown trigger="hover" placement="bottom">
               <span class="tsfont-option-horizontal"></span>
               <DropdownMenu slot="list">
                 <DropdownItem>
                   <div>
-                    <template v-if="canExportNode">
-                      <span v-if="!downloadLoadingNode" v-download="downloadNodeUrl" class="action-item tsfont-download">{{ $t('term.autoexec.exportnode') }}</span>
-                      <span v-if="downloadLoadingNode" class="action-item disable" :title="$t('page.downloadloadingtip')">
-                        <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
-                        {{ $t('term.autoexec.exportnode') }}
-                      </span>
-                    </template>
+                    <span v-if="!downloadLoadingNode" v-download="downloadNodeUrl" class="action-item tsfont-download">{{ $t('term.autoexec.exportnode') }}</span>
+                    <span v-if="downloadLoadingNode" class="action-item disable" :title="$t('page.downloadloadingtip')">
+                      <Icon type="ios-loading" size="18" class="loading icon-right"></Icon>
+                      {{ $t('term.autoexec.exportnode') }}
+                    </span>
                   </div>
                 </DropdownItem>
               </DropdownMenu>
-- 
Gitee


From 6295754a28400e3e1232a7f2e12d1341c3e2f63d Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 9 Jun 2025 11:11:09 +0800
Subject: [PATCH 4/4] commit

---
 src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue | 1 -
 1 file changed, 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 833218b6..e904283a 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -260,7 +260,6 @@
 <script>
 import {store, mutations} from '../../jobDetailState.js';
 import download from '@/resources/directives/download.js';
-import TsTable from '../../../../../../resources/components/TsTable/TsTable.vue';
 export default {
   name: '',
   components: {
-- 
Gitee