From c64fb4cbb39a891f874c7bbd0fc407df2f436147 Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Fri, 11 Apr 2025 17:16:21 +0800
Subject: [PATCH 1/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/jobDetail/job-phase-list.vue       | 75 ++++++++++++++++++-
 1 file changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index 8e8ff68a..dea57f67 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -21,7 +21,33 @@
                 <div class="overflow">
                   <span :class="{ 'text-primary': activePhaseId && phase.id == activePhaseId }" :title="phase.name || '-'">{{ phase.name || '-' }}</span>
                 </div>
-                <div><Status :statusValue="phase.statusVo.name" :statusName="phase.statusVo.text" class="step-status"></Status></div>
+                <div>
+                  <Tooltip
+                    v-if="!$utils.isEmpty(phase.statusVo)"
+                    theme="light"
+                    max-width="400"
+                    placement="right"
+                    transfer
+                    @on-popper-show="handlePhaseStatus(phase)"
+                    @on-popper-hide="()=> {
+                      tableConfig.tbodyList = [];
+                    }"
+                  >
+                    <Status
+                      :statusValue="phase.statusVo.name"
+                      :statusName="phase.statusVo.text"
+                      class="step-status"
+                    ></Status>
+                    <template slot="content">
+                      <TsTable
+                        v-bind="tableConfig"
+                        :loading="isLoading"
+                        :theadList="theadList"
+                      >
+                      </TsTable>
+                    </template>
+                  </Tooltip>
+                </div>
               </div>
               <div class="stepProcess">
                 <Liquid :size="7" :percent="phase.completionRate" :config="{ status: phase.status }"></Liquid>
@@ -69,7 +95,8 @@
 export default {
   components: {
     Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue'),
-    Status: () => import('@/resources/components/Status/CommonStatus.vue')
+    Status: () => import('@/resources/components/Status/CommonStatus.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
   },
   filters: {},
   model: {
@@ -82,7 +109,28 @@ export default {
   data() {
     return {
       fixedPhaseId: null,
-      activePhaseId: null
+      activePhaseId: null,
+      currentPhaseConfig: null,
+      isLoading: false,
+      theadList: [
+        {
+          title: '节点名称',
+          key: 'nodeName'
+        },
+        {
+          title: '主机',
+          key: 'runnerHost'
+        },
+        {
+          title: '端口',
+          key: 'runnerPort'
+        }
+      ],
+      tableConfig: {
+        tbodyList: [],
+        currentPage: 1,
+        pageSize: 10
+      }
     };
   },
   beforeCreate() {},
@@ -111,6 +159,27 @@ export default {
           this.$el.scrollTop = $select.offsetTop - config.height / 2 + 130;
         }
       }
+    },
+    async handlePhaseStatus(phase) {
+      const { groupId, jobId, id } = phase || {};
+      if (!jobId || !id) {
+        this.$Message.error('作业ID或阶段ID为空');
+        return; 
+      }
+      this.isLoading = true;
+      await this.$api.autoexec.job.searchPhaseNode({
+        groupId: groupId,
+        jobId: jobId,
+        jobPhaseId: id,
+        currentPage: 1,
+        pageSize: 100
+      }).then(res => {
+        if (res && res.Status == 'OK') {
+          this.tableConfig = res.Return;
+        }
+      }).finally(() => {
+        this.isLoading = false;
+      });
     }
   },
   computed: {
-- 
Gitee


From 576ed5e716455a0bd9f90c5320213f1e27677043 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Fri, 11 Apr 2025 21:57:46 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=94=AF=E6=8C=81=E6=AD=A3=E5=9C=A8=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=EF=BC=8C=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6=E5=88=99=E6=8E=92=E9=98=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/api/autoexec/job/job.js         |  3 +
 src/resources/components/Status/status.less   |  3 +
 .../pages/autoexec/detail/job-detail.vue      | 75 +++++++++++++++++--
 .../detail/jobDetail/job-phase-list.vue       | 29 +++----
 4 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/src/resources/api/autoexec/job/job.js b/src/resources/api/autoexec/job/job.js
index ba8c4540..7671e017 100644
--- a/src/resources/api/autoexec/job/job.js
+++ b/src/resources/api/autoexec/job/job.js
@@ -24,6 +24,9 @@ const job = {
   searchPhaseNode(params) {
     return axios.post('/api/rest/autoexec/job/phase/node/search', params);
   },
+  getJobQueueStatus(params) {
+    return axios.post('/api/rest/autoexec/job/queue/status/get', params);
+  },
   //获取runner节点，通过作业对应的阶段
   getRunnerByPhase(params) {
     return axios.post('/api/rest/autoexec/job/phase/runner/get', params);
diff --git a/src/resources/components/Status/status.less b/src/resources/components/Status/status.less
index 0d820b4d..cc45d553 100644
--- a/src/resources/components/Status/status.less
+++ b/src/resources/components/Status/status.less
@@ -76,6 +76,7 @@
     .progress-pausing .ivu-progress-bg {
       background-color: @warning-bg-color;
     }
+    .bg-queue,
     .bg-paused,
     .progress-paused .ivu-progress-bg {
       background-color: @warning-bg-color;
@@ -189,6 +190,8 @@
     .text-pausing {
       color: @pausing;
     }
+    &.text-queue,
+    .text-queue,
     &.text-paused,
     .text-paused {
       color: @paused;
diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index 83be6b9d..aa6eaf1b 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -24,12 +24,40 @@
             <UserCard :uuid="jobData.execUser"></UserCard>
           </div>
           <div class="action-item" style="padding: 0px"><Divider type="vertical" style="margin: 0px" /></div>
-          <div ref="statusRef" class="action-item"><Status
-            v-if="jobData.status"
-            :statusName="jobData.statusName"
-            :statusValue="jobData.status"
-            class="job-status"
-          ></Status></div>
+          <div v-if="jobData.status" ref="statusRef" class="action-item">
+            <Tooltip
+              v-if="jobData.status === 'queue' "
+              theme="light"
+              max-width="400"
+              placement="right"
+              transfer
+              @on-popper-show="handlejobStatus()"
+              @on-popper-hide="()=> {
+                tableConfig.tbodyList = [];
+              }"
+            >
+              <Status
+                v-if="jobData.status"
+                :statusName="jobData.statusName"
+                :statusValue="jobData.status"
+                class="job-status"
+              ></Status>
+              <template slot="content">
+                <TsTable
+                  v-bind="tableConfig"
+                  :loading="isLoading"
+                  :theadList="theadList"
+                >
+                </TsTable>
+              </template>
+            </Tooltip>
+            <Status
+              v-else
+              :statusName="jobData.statusName"
+              :statusValue="jobData.status"
+              class="job-status"
+            ></Status>
+          </div>
         </div>
       </template>
       <template v-slot:topRight>
@@ -137,6 +165,7 @@ export default {
     UserCard: () => import('@/resources/components/UserCard/UserCard.vue'),
     ...ContentItem,
     Status: () => import('@/resources/components/Status/CommonStatus.vue'),
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
     ExtrainfoDetail: () => import('./jobDetail/extrainfo-detail.vue'),
     JobPhaseFlow: () => import('@/views/pages/autoexec/detail/jobDetail/job-phase-flow.vue'),
     ProjectDirectoryDialog: () => import('@/views/pages/deploy/version/project-directory-dialog'), // 工程目录
@@ -164,6 +193,26 @@ export default {
       selectStepId: null,
       isShowJobParam: false, //显示参数弹框
       phaseEndingStatusList: ['completed', 'aborted', 'failed', 'paused'], //终点状态节点列表，非终点状态列表的需要定时刷新。
+      isLoading: false,
+      theadList: [
+        {
+          title: '排队号',
+          key: 'sort'
+        },
+        {
+          title: '执行器',
+          key: 'runner'
+        },
+        {
+          title: '排队时间',
+          key: 'fcd'
+        }
+      ],
+      tableConfig: {
+        tbodyList: [],
+        currentPage: 1,
+        pageSize: 10
+      },
       statusActionMapping: {
         pending: ['abort'], //未开始：
         running: ['pause', 'abort'], //运行中： 暂停  终止
@@ -250,6 +299,20 @@ export default {
     mutations.setSearchParam({});
   },
   methods: {
+    async handlejobStatus() {
+      this.isLoading = true;
+      await this.$api.autoexec.job.getJobQueueStatus({
+        jobId: this.jobData.id,
+        currentPage: 1,
+        pageSize: 100
+      }).then(res => {
+        if (res && res.Status == 'OK') {
+          this.tableConfig = res.Return;
+        }
+      }).finally(() => {
+        this.isLoading = false;
+      });
+    },
     toggleSiderHide() {
       this.calculateJobNameMaxWidth();
     },
diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index dea57f67..f2f7fe3d 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -21,9 +21,9 @@
                 <div class="overflow">
                   <span :class="{ 'text-primary': activePhaseId && phase.id == activePhaseId }" :title="phase.name || '-'">{{ phase.name || '-' }}</span>
                 </div>
-                <div>
+                <div v-if="!$utils.isEmpty(phase.statusVo) ">
                   <Tooltip
-                    v-if="!$utils.isEmpty(phase.statusVo)"
+                    v-if="tableConfig.tbodyList.length > 0"
                     theme="light"
                     max-width="400"
                     placement="right"
@@ -47,6 +47,13 @@
                       </TsTable>
                     </template>
                   </Tooltip>
+                  <Status
+                    v-else
+                    :statusValue="phase.statusVo.name"
+                    :statusName="phase.statusVo.text"
+                    class="step-status"
+                    @click="() => handlePhaseStatus(phase)"
+                  ></Status>
                 </div>
               </div>
               <div class="stepProcess">
@@ -114,16 +121,12 @@ export default {
       isLoading: false,
       theadList: [
         {
-          title: '节点名称',
-          key: 'nodeName'
+          title: '排队号',
+          key: 'sort'
         },
         {
-          title: '主机',
-          key: 'runnerHost'
-        },
-        {
-          title: '端口',
-          key: 'runnerPort'
+          title: '执行器',
+          key: 'runner'
         }
       ],
       tableConfig: {
@@ -161,14 +164,14 @@ export default {
       }
     },
     async handlePhaseStatus(phase) {
-      const { groupId, jobId, id } = phase || {};
+      const {jobId, id } = phase || {};
       if (!jobId || !id) {
         this.$Message.error('作业ID或阶段ID为空');
         return; 
       }
       this.isLoading = true;
-      await this.$api.autoexec.job.searchPhaseNode({
-        groupId: groupId,
+      await this.$api.autoexec.job.getJobQueueStatus({
+        groupSort: phase.jobGroupVo.sort,
         jobId: jobId,
         jobPhaseId: id,
         currentPage: 1,
-- 
Gitee


From 7d719a25685981c2e66d391d8b1ce906fa949821 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Mon, 14 Apr 2025 19:14:05 +0800
Subject: [PATCH 3/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/api/autoexec/job/job.js                      | 4 ++--
 src/resources/components/Status/status.less                | 6 +++---
 src/views/pages/autoexec/detail/job-detail.vue             | 7 ++++---
 .../pages/autoexec/detail/jobDetail/job-phase-list.vue     | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/resources/api/autoexec/job/job.js b/src/resources/api/autoexec/job/job.js
index 7671e017..a90c6cad 100644
--- a/src/resources/api/autoexec/job/job.js
+++ b/src/resources/api/autoexec/job/job.js
@@ -24,8 +24,8 @@ const job = {
   searchPhaseNode(params) {
     return axios.post('/api/rest/autoexec/job/phase/node/search', params);
   },
-  getJobQueueStatus(params) {
-    return axios.post('/api/rest/autoexec/job/queue/status/get', params);
+  getJobWaitingDetail(params) {
+    return axios.post('/api/rest/autoexec/job/waiting/detail/get', params);
   },
   //获取runner节点，通过作业对应的阶段
   getRunnerByPhase(params) {
diff --git a/src/resources/components/Status/status.less b/src/resources/components/Status/status.less
index cc45d553..5a839b38 100644
--- a/src/resources/components/Status/status.less
+++ b/src/resources/components/Status/status.less
@@ -76,7 +76,7 @@
     .progress-pausing .ivu-progress-bg {
       background-color: @warning-bg-color;
     }
-    .bg-queue,
+    .bg-waiting,
     .bg-paused,
     .progress-paused .ivu-progress-bg {
       background-color: @warning-bg-color;
@@ -190,8 +190,8 @@
     .text-pausing {
       color: @pausing;
     }
-    &.text-queue,
-    .text-queue,
+    &.text-waiting,
+    .text-waiting,
     &.text-paused,
     .text-paused {
       color: @paused;
diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index aa6eaf1b..d7a1b5a5 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -26,7 +26,7 @@
           <div class="action-item" style="padding: 0px"><Divider type="vertical" style="margin: 0px" /></div>
           <div v-if="jobData.status" ref="statusRef" class="action-item">
             <Tooltip
-              v-if="jobData.status === 'queue' "
+              v-if="jobData.status === 'waiting' "
               theme="light"
               max-width="400"
               placement="right"
@@ -223,7 +223,8 @@ export default {
         completed: ['refire', 'valid'], //已成功：重跑
         failed: ['refire'], //已失败：继续
         ready: ['execute', 'revoke'], //已就绪 撤销 执行
-        waitInput: ['abort']
+        waitInput: ['abort'],
+        waiting: ['abort']
       },
       actionMap: {
         valid: {
@@ -301,7 +302,7 @@ export default {
   methods: {
     async handlejobStatus() {
       this.isLoading = true;
-      await this.$api.autoexec.job.getJobQueueStatus({
+      await this.$api.autoexec.job.getJobWaitingDetail({
         jobId: this.jobData.id,
         currentPage: 1,
         pageSize: 100
diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index f2f7fe3d..be958316 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -170,7 +170,7 @@ export default {
         return; 
       }
       this.isLoading = true;
-      await this.$api.autoexec.job.getJobQueueStatus({
+      await this.$api.autoexec.job.getJobWaitingDetail({
         groupSort: phase.jobGroupVo.sort,
         jobId: jobId,
         jobPhaseId: id,
-- 
Gitee


From 7fab5555a7f80072c8a5fb2fcc88df2a01fd161e Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Tue, 15 Apr 2025 10:44:10 +0800
Subject: [PATCH 4/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue | 2 +-
 1 file changed, 1 insertion(+), 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 e1c8191b..d8c4347f 100644
--- a/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/phase/node-list.vue
@@ -98,7 +98,7 @@
             'text-success': row.status == 'succeed',
             'text-error': row.status == 'failed',
             'text-grey': row.status == 'pending',
-            'text-warning': row.status == 'ignored' || row.status == 'aborted' || row.status == 'aborting' || row.status == 'waitInput' || row.status == 'paused' || row.status == 'invalid'
+            'text-warning': row.status == 'waiting' || row.status == 'ignored' || row.status == 'aborted' || row.status == 'aborting' || row.status == 'waitInput' || row.status == 'paused' || row.status == 'invalid'
           }"
         >
           <Tooltip
-- 
Gitee


From 6997aed6246ea7a9c5a8f1ce64ba0a716de47e4c Mon Sep 17 00:00:00 2001
From: yaojn <yaojn@techsure.com.cn>
Date: Tue, 15 Apr 2025 14:22:22 +0800
Subject: [PATCH 5/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Status/CommonStatus.vue        | 24 ++++-
 .../components/loading/CircleLoading.vue      | 24 ++++-
 .../detail/jobDetail/job-phase-list.vue       | 99 +++++++++++++------
 3 files changed, 110 insertions(+), 37 deletions(-)

diff --git a/src/resources/components/Status/CommonStatus.vue b/src/resources/components/Status/CommonStatus.vue
index 45c656c9..2cb36a5f 100644
--- a/src/resources/components/Status/CommonStatus.vue
+++ b/src/resources/components/Status/CommonStatus.vue
@@ -1,15 +1,29 @@
 <template>
   <div v-if="statusName && type == 'block'" class="com-status tips">
-    <div class="fz10 bg status-text" :class="className(statusValue)" @click="handleClick">{{ statusName }}</div>
+    <div
+      class="fz10 bg status-text"
+      :class="className(statusValue)"
+      @click="handleClick"
+      @mouseenter="handleMouseEnter"
+      @mouseleave="handleMouseLeave"
+    >{{ statusName }}</div>
   </div>
   <div v-else-if="statusName && type == 'tag'" class="com-status tag-status">
-    <div class="fz10 bg status-text" :class="className(statusValue)" @click="handleClick">{{ statusName }}</div>
+    <div
+      class="fz10 bg status-text"
+      :class="className(statusValue)"
+      @click="handleClick"
+      @mouseenter="handleMouseEnter"
+      @mouseleave="handleMouseLeave"
+    >{{ statusName }}</div>
   </div>
   <span
     v-else-if="statusName && type == 'text'"
     class="com-status "
     :class="'text-' + statusValue"
     @click="handleClick"
+    @mouseenter="handleMouseEnter"
+    @mouseleave="handleMouseLeave"
   >{{ statusName }}</span>
 </template>
 <script>
@@ -51,6 +65,12 @@ export default {
   methods: {
     handleClick() {
       this.$emit('click');
+    },
+    handleMouseEnter() {
+      this.$emit('mouseenter');
+    },
+    handleMouseLeave() {
+      this.$emit('mouseleave');
     }
   },
   computed: {
diff --git a/src/resources/components/loading/CircleLoading.vue b/src/resources/components/loading/CircleLoading.vue
index 748c4ddc..6601d33b 100644
--- a/src/resources/components/loading/CircleLoading.vue
+++ b/src/resources/components/loading/CircleLoading.vue
@@ -1,7 +1,12 @@
 <template>
-  <div :style="{ width: size + 'px', height: size + 'px' }" style="display:inline-block">
+  <div
+    :style="{ width: size + 'px', height: size + 'px' }"
+    style="display:inline-block"
+    @mouseenter="handleMouseEnter"
+    @mouseleave="handleMouseLeave"
+  >
     <div class="loading">
-      <div class="loading-circle" :style="{ width: size + 'px', height: size + 'px' }"></div>
+      <div class="loading-circle" :style="{ width: size + 'px', height: size + 'px', borderRightColor: color, borderTopColor: color}"></div>
     </div>
   </div>
 </template>
@@ -13,7 +18,19 @@ export default {
     size: {
       type: Number,
       default: 20
+    },
+    color: {
+      type: String,
+      default: ''
     }
+  },
+  methods: {
+    handleMouseEnter() {
+      this.$emit('mouseenter');
+    },
+    handleMouseLeave() {
+      this.$emit('mouseleave');
+    } 
   }
 };
 </script>
@@ -38,9 +55,8 @@ export default {
     border: 2px solid @border-color;
     border-top: 2px solid @primary-color;
     border-right: 2px solid @primary-color;
-    //border-bottom: 2px solid @primary-color;
     border-radius: 50%;
-    animation: spin 3s linear infinite;
+    animation: spin 10s linear infinite;
   }
 
   @keyframes spin {
diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index be958316..0636ecd2 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -15,22 +15,21 @@
               style="position: relative"
               @click="selectPhase(phase)"
             >
-              <!-- 进度百分比 -->
               <div v-if="fixedPhaseId && fixedPhaseId === phase.id" class="fz10 text-info fixed-icon tsfont-location-o"></div>
               <div class="name-grid">
                 <div class="overflow">
                   <span :class="{ 'text-primary': activePhaseId && phase.id == activePhaseId }" :title="phase.name || '-'">{{ phase.name || '-' }}</span>
                 </div>
-                <div v-if="!$utils.isEmpty(phase.statusVo) ">
+                <div v-if="!$utils.isEmpty(phase.statusVo)">
                   <Tooltip
-                    v-if="tableConfig.tbodyList.length > 0"
+                    v-if="waitingTableConfig.tbodyList.length > 0"
                     theme="light"
                     max-width="400"
                     placement="right"
                     transfer
                     @on-popper-show="handlePhaseStatus(phase)"
                     @on-popper-hide="()=> {
-                      tableConfig.tbodyList = [];
+                      waitingTableConfig.tbodyList = [];
                     }"
                   >
                     <Status
@@ -40,7 +39,7 @@
                     ></Status>
                     <template slot="content">
                       <TsTable
-                        v-bind="tableConfig"
+                        v-bind="waitingTableConfig"
                         :loading="isLoading"
                         :theadList="theadList"
                       >
@@ -52,26 +51,55 @@
                     :statusValue="phase.statusVo.name"
                     :statusName="phase.statusVo.text"
                     class="step-status"
-                    @click="() => handlePhaseStatus(phase)"
+                    @mouseenter="() => handlePhaseStatus(phase)"
                   ></Status>
                 </div>
               </div>
               <div class="stepProcess">
                 <Liquid :size="7" :percent="phase.completionRate" :config="{ status: phase.status }"></Liquid>
-                <Tooltip
-                  v-if="getExceptionTips(phase)"
-                  transfer
-                  class="stepStatues com-status"
-                  placement="bottom"
-                  theme="light"
-                >
-                  <span class="tsfont-warning-o" :class="getExceptionTips(phase).class"></span>
-                  <template v-slot:content>
-                    <div>
-                      <div v-for="title in getExceptionTips(phase).titles" :key="title">{{ title }}</div>
-                    </div>
+                <div class="notice-box">
+                  <template v-if="hasWaitingNumber(phase)">
+                    <Tooltip
+                      transfer
+                      placement="right"
+                      theme="light"
+                      @on-popper-show="handleWaitingNumber(phase)"
+                      @on-popper-hide="()=> {
+                        waitingTableConfig.tbodyList = [];
+                      }"
+                    >
+                      <CircleLoading
+                        :size="14"
+                        class="mr-xs"
+                        style="margin-top: -2px;"
+                        color="#ffba5a"
+                      ></CircleLoading>
+                      <template v-slot:content>
+                        <div>
+                          <TsTable
+                            v-bind="waitingTableConfig"
+                            :theadList="theadList"
+                          >
+                          </TsTable>
+                        </div>
+                      </template>
+                    </Tooltip>
                   </template>
-                </Tooltip>
+                  <Tooltip
+                    v-if="getExceptionTips(phase)"
+                    transfer
+                    class="com-status"
+                    placement="bottom"
+                    theme="light"
+                  >
+                    <span class="tsfont-warning-o" :class="getExceptionTips(phase).class"></span>
+                    <template v-slot:content>
+                      <div>
+                        <div v-for="title in getExceptionTips(phase).titles" :key="title">{{ title }}</div>
+                      </div>
+                    </template>
+                  </Tooltip>
+                </div>
               </div>
               <div>
                 <Tooltip
@@ -103,7 +131,8 @@ export default {
   components: {
     Liquid: () => import('@/resources/components/SimpleGraph/Liquid.vue'),
     Status: () => import('@/resources/components/Status/CommonStatus.vue'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    CircleLoading: () => import('@/resources/components/loading/CircleLoading.vue')
   },
   filters: {},
   model: {
@@ -129,10 +158,10 @@ export default {
           key: 'runner'
         }
       ],
-      tableConfig: {
+      waitingTableConfig: {
         tbodyList: [],
         currentPage: 1,
-        pageSize: 10
+        pageSize: 100
       }
     };
   },
@@ -178,11 +207,14 @@ export default {
         pageSize: 100
       }).then(res => {
         if (res && res.Status == 'OK') {
-          this.tableConfig = res.Return;
+          this.waitingTableConfig = res.Return;
         }
       }).finally(() => {
         this.isLoading = false;
       });
+    },
+    handleWaitingNumber(phase) {
+      console.log('handleWaitingNumber', phase);
     }
   },
   computed: {
@@ -226,6 +258,12 @@ export default {
         }
         return null;
       };
+    },
+    hasWaitingNumber() {
+      // 排队进程数量
+      return (phase) => {
+        return phase?.waitingPhaseCount > 0;
+      };
     }
   },
   watch: {
@@ -377,16 +415,15 @@ export default {
         }
       }
       .stepProcess {
+        display: grid;
+        grid-template-columns: calc(100% - 70px) 70px;
+        justify-content: space-between;
         padding-top: 6px;
+        padding-right: 6px;
         line-height: @iconWidth;
-        position: relative;
-        display: block;
-        padding-right: 80px;
-        ::v-deep .stepStatues {
-          padding: 0px 4px;
-          position: absolute;
-          right: 0px;
-          top: 4px;
+        .notice-box {
+          display: flex;
+          justify-content: end;
         }
       }
     }
-- 
Gitee


From efe4107a44b411299e990ea7dbb7a0df5baa58c4 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Wed, 16 Apr 2025 14:19:58 +0800
Subject: [PATCH 6/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/autoexec/detail/job-detail.vue      | 33 ++++++--------
 .../detail/jobDetail/job-phase-list.vue       | 45 +++++--------------
 2 files changed, 26 insertions(+), 52 deletions(-)

diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index d7a1b5a5..654c9211 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -26,14 +26,14 @@
           <div class="action-item" style="padding: 0px"><Divider type="vertical" style="margin: 0px" /></div>
           <div v-if="jobData.status" ref="statusRef" class="action-item">
             <Tooltip
-              v-if="jobData.status === 'waiting' "
+              v-if="hasWaiting()"
               theme="light"
               max-width="400"
               placement="right"
               transfer
-              @on-popper-show="handlejobStatus()"
+              @on-popper-show="handleWaitingData()"
               @on-popper-hide="()=> {
-                tableConfig.tbodyList = [];
+                waitingTableConfig.tbodyList = [];
               }"
             >
               <Status
@@ -44,7 +44,7 @@
               ></Status>
               <template slot="content">
                 <TsTable
-                  v-bind="tableConfig"
+                  v-bind="waitingTableConfig"
                   :loading="isLoading"
                   :theadList="theadList"
                 >
@@ -110,7 +110,7 @@
         </div>
       </template>
       <template v-slot:sider>
-        <PhaseList :phaseList="jobData.phaseList" @change="changePhase"></PhaseList>
+        <PhaseList :phaseList="jobData.phaseList" :waitingDetail="jobData.waitingDetail" @change="changePhase"></PhaseList>
       </template>
       <template v-slot:content>
         <div>
@@ -208,7 +208,7 @@ export default {
           key: 'fcd'
         }
       ],
-      tableConfig: {
+      waitingTableConfig: {
         tbodyList: [],
         currentPage: 1,
         pageSize: 10
@@ -300,19 +300,8 @@ export default {
     mutations.setSearchParam({});
   },
   methods: {
-    async handlejobStatus() {
-      this.isLoading = true;
-      await this.$api.autoexec.job.getJobWaitingDetail({
-        jobId: this.jobData.id,
-        currentPage: 1,
-        pageSize: 100
-      }).then(res => {
-        if (res && res.Status == 'OK') {
-          this.tableConfig = res.Return;
-        }
-      }).finally(() => {
-        this.isLoading = false;
-      });
+    handleWaitingData() {
+      this.$set(this.waitingTableConfig, 'tbodyList', this.jobData.waitingDetail);
     },
     toggleSiderHide() {
       this.calculateJobNameMaxWidth();
@@ -452,6 +441,7 @@ export default {
           this.$set(this.jobData, 'phaseList', res.Return['phaseList']);
           this.$set(this.jobData, 'status', res.Return['status']);
           this.$set(this.jobData, 'statusName', res.Return['statusName']);
+          this.$set(this.jobData, 'waitingDetail', res.Return['waitingDetail']);
           if (this.jobData && this.jobData.extraInfo) {
             this.$set(this.jobData, 'extraInfo', res.Return['extraInfo']);
           }
@@ -604,6 +594,11 @@ export default {
           }
         }
       };
+    },
+    hasWaiting() {
+      return () => {
+        return this.jobData.waitingDetail && this.jobData.waitingDetail.length > 0;
+      };
     }
   },
   watch: {}
diff --git a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
index 0636ecd2..352817b5 100644
--- a/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
+++ b/src/views/pages/autoexec/detail/jobDetail/job-phase-list.vue
@@ -27,7 +27,7 @@
                     max-width="400"
                     placement="right"
                     transfer
-                    @on-popper-show="handlePhaseStatus(phase)"
+                    @on-popper-show="handleWaitingData(group)"
                     @on-popper-hide="()=> {
                       waitingTableConfig.tbodyList = [];
                     }"
@@ -51,19 +51,19 @@
                     :statusValue="phase.statusVo.name"
                     :statusName="phase.statusVo.text"
                     class="step-status"
-                    @mouseenter="() => handlePhaseStatus(phase)"
+                    @mouseenter="() => handleWaitingData(group)"
                   ></Status>
                 </div>
               </div>
               <div class="stepProcess">
                 <Liquid :size="7" :percent="phase.completionRate" :config="{ status: phase.status }"></Liquid>
                 <div class="notice-box">
-                  <template v-if="hasWaitingNumber(phase)">
+                  <template v-if="hasWaiting(group)">
                     <Tooltip
                       transfer
                       placement="right"
                       theme="light"
-                      @on-popper-show="handleWaitingNumber(phase)"
+                      @on-popper-show="handleWaitingData(group)"
                       @on-popper-hide="()=> {
                         waitingTableConfig.tbodyList = [];
                       }"
@@ -140,7 +140,8 @@ export default {
     event: 'change'
   },
   props: {
-    phaseList: { type: Array }
+    phaseList: { type: Array },
+    waitingDetail: { type: Array }
   },
   data() {
     return {
@@ -192,29 +193,8 @@ export default {
         }
       }
     },
-    async handlePhaseStatus(phase) {
-      const {jobId, id } = phase || {};
-      if (!jobId || !id) {
-        this.$Message.error('作业ID或阶段ID为空');
-        return; 
-      }
-      this.isLoading = true;
-      await this.$api.autoexec.job.getJobWaitingDetail({
-        groupSort: phase.jobGroupVo.sort,
-        jobId: jobId,
-        jobPhaseId: id,
-        currentPage: 1,
-        pageSize: 100
-      }).then(res => {
-        if (res && res.Status == 'OK') {
-          this.waitingTableConfig = res.Return;
-        }
-      }).finally(() => {
-        this.isLoading = false;
-      });
-    },
-    handleWaitingNumber(phase) {
-      console.log('handleWaitingNumber', phase);
+    handleWaitingData(group) {
+      this.$set(this.waitingTableConfig, 'tbodyList', this.waitingDetail.filter(t => t.groupSortList.includes(group.groupSort)));
     }
   },
   computed: {
@@ -224,7 +204,7 @@ export default {
         this.phaseList.forEach(phase => {
           let group = groupList.find(d => d.groupId == phase.groupId);
           if (!group) {
-            group = { groupId: phase.groupId, phaseList: [] };
+            group = { groupId: phase.groupId, phaseList: [], groupSort: phase.jobGroupVo.sort };
             groupList.push(group);
           }
           group['phaseList'].push(phase);
@@ -259,10 +239,9 @@ export default {
         return null;
       };
     },
-    hasWaitingNumber() {
-      // 排队进程数量
-      return (phase) => {
-        return phase?.waitingPhaseCount > 0;
+    hasWaiting() {
+      return (group) => {
+        return this.waitingDetail.some(t => t.groupSortList.includes(group.groupSort));
       };
     }
   },
-- 
Gitee


From 1570e1698c492a597f4a999dd6cb139e425dcc67 Mon Sep 17 00:00:00 2001
From: lvzk <897706680@qq.com>
Date: Thu, 17 Apr 2025 12:48:28 +0800
Subject: [PATCH 7/7] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=AF=8F=E4=B8=AArunner=E7=9A=84=E6=8E=92=E9=98=9F=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=20=20=20=20-=20[=E5=85=B3=E8=81=94]#[1396992951943168?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BD=9C=E4=B8=9A=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8F=90=E7=A4=BA=E6=AF=8F=E4=B8=AArunner=E7=9A=84?=
 =?UTF-8?q?=E6=8E=92=E9=98=9F=E6=83=85=E5=86=B5=20http://192.168.0.96:8090?=
 =?UTF-8?q?/demo/rdm.html#/task-detail/939050947543040/939050947543050/139?=
 =?UTF-8?q?6992951943168?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/autoexec/detail/job-detail.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/pages/autoexec/detail/job-detail.vue b/src/views/pages/autoexec/detail/job-detail.vue
index 654c9211..70475df5 100644
--- a/src/views/pages/autoexec/detail/job-detail.vue
+++ b/src/views/pages/autoexec/detail/job-detail.vue
@@ -484,6 +484,7 @@ export default {
           }
           this.$set(this.jobData, 'status', res.Return['status']);
           this.$set(this.jobData, 'statusName', res.Return['statusName']);
+          this.$set(this.jobData, 'waitingDetail', res.Return['waitingDetail']);
           const phaseIdList = [];
           this.jobData.phaseList.forEach(phase => {
             if (!this.phaseEndingStatusList.includes(phase.status)) {
-- 
Gitee