From 585f8f4e43ae7fe0c9c387cc41f629f4f279740a Mon Sep 17 00:00:00 2001
From: tk <fiyne1a@dingtalk.com>
Date: Tue, 20 May 2025 14:09:32 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20=E4=BD=9C=E4=B8=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Services/Sys/JobService.cs                           | 3 ++-
 src/frontend/admin/src/views/sys/job/all/index.vue       | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
index 47838163..862a1dac 100644
--- a/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
+++ b/src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
@@ -336,7 +336,8 @@ public sealed class JobService(BasicRepository<Sys_Job, long> rpo, IJobRecordSer
         ret = ret.WhereDynamicFilter(req.DynamicFilter)
                  .WhereDynamic(req.Filter)
                  .WhereIf( //
-                     req.Keywords?.Length > 0, a => a.Id == req.Keywords.Int64Try(0) || a.JobName.Contains(req.Keywords));
+                     req.Keywords?.Length > 0
+                   , a => a.Id == req.Keywords.Int64Try(0) || a.JobName.Contains(req.Keywords) || a.RequestUrl.Contains(req.Keywords));
 
         // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault
         switch (req.Order) {
diff --git a/src/frontend/admin/src/views/sys/job/all/index.vue b/src/frontend/admin/src/views/sys/job/all/index.vue
index 8a67148a..045f36b3 100644
--- a/src/frontend/admin/src/views/sys/job/all/index.vue
+++ b/src/frontend/admin/src/views/sys/job/all/index.vue
@@ -70,7 +70,7 @@
                         {
                             type: 'input',
                             field: ['root', 'keywords'],
-                            placeholder: $t('作业编号 / 作业名称'),
+                            placeholder: $t('作业编号 / 作业名称 / 请求地址'),
                             style: 'width:20rem',
                         },
                     ]"
@@ -144,7 +144,12 @@
                 stripe>
                 <el-table-column type="selection" width="50" />
                 <naColId :label="$t('作业编号')" prop="id" sortable="custom" width="170" />
-                <el-table-column :label="$t('作业名称')" min-width="150" prop="jobName" show-overflow-tooltip sortable="custom" />
+                <el-table-column :label="$t('作业名称')" min-width="150" prop="jobName" show-overflow-tooltip sortable="custom" >
+                    <template #default="{ row }">
+                        <p>{{ row.jobName }}</p>
+                        <p>{{ row.requestUrl.substring(row.requestUrl.lastIndexOf('/') + 1) }}</p>
+                    </template>
+                </el-table-column>
                 <el-table-column :label="$t('执行计划')" align="right" prop="executionCron" sortable="custom" width="150">
                     <template #default="{ row }">
                         <p>{{ row.cronDescription }}</p>