lingyun/NetAdmin
lingyun/NetAdmin
Template
7
0
Fork 0
mirror of https://github.com/nsnail/NetAdmin.git synced 2025-06-17 01:13:22 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

feat: ✨ 作业增加请求地址显示查询

Browse Source
This commit is contained in:
tk 2025-05-20 14:09:32 +08:00 committed by nsnail
parent 35efc11e56
commit 585f8f4e43
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/NetAdmin/NetAdmin.SysComponent.Application/Services/Sys/JobService.cs
View File

@ -336,7 +336,8 @@ public sealed class JobService(BasicRepository<Sys_Job, long> rpo, IJobRecordSer
ret = ret.WhereDynamicFilter(req.DynamicFilter) ret = ret.WhereDynamicFilter(req.DynamicFilter)
.WhereDynamic(req.Filter) .WhereDynamic(req.Filter)
.WhereIf( // .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 // ReSharper disable once SwitchStatementMissingSomeEnumCasesNoDefault
switch (req.Order) { switch (req.Order) {

9
src/frontend/admin/src/views/sys/job/all/index.vue
View File

@ -70,7 +70,7 @@
{ {
type: 'input', type: 'input',
field: ['root', 'keywords'], field: ['root', 'keywords'],
placeholder: $t('作业编号 / 作业名称'), placeholder: $t('作业编号 / 作业名称 / 请求地址'),
style: 'width:20rem', style: 'width:20rem',
}, },
]" ]"
@ -144,7 +144,12 @@
stripe> stripe>
<el-table-column type="selection" width="50" /> <el-table-column type="selection" width="50" />
<naColId :label="$t('作业编号')" prop="id" sortable="custom" width="170" /> <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"> <el-table-column :label="$t('执行计划')" align="right" prop="executionCron" sortable="custom" width="150">
<template #default="{ row }"> <template #default="{ row }">
<p>{{ row.cronDescription }}</p> <p>{{ row.cronDescription }}</p>