From 8f1e976c2f295613dafdc77c3c89f6d768a6b838 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Thu, 26 Dec 2024 14:03:47 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=A1=E4=BB=B6.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/exec/ExecJobQueryRequest.java | 3 +++ .../service/impl/ExecJobServiceImpl.java | 1 + orion-visor-ui/src/api/exec/exec-job.ts | 1 + .../components/exec-job-log-table.vue | 18 ++++++++++---- .../exec/exec-job-log/types/table.columns.ts | 1 - .../exec-job/components/exec-job-table.vue | 24 +++++++++++++++---- .../src/views/exec/exec-job/index.vue | 4 ++-- 7 files changed, 40 insertions(+), 12 deletions(-) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java index 7cffdb06..3bc690f7 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/exec/ExecJobQueryRequest.java @@ -56,6 +56,9 @@ public class ExecJobQueryRequest extends PageRequest { @Schema(description = "任务状态") private Integer status; + @Schema(description = "执行用户id") + private Long execUserId; + @Schema(description = "是否查询最近执行任务") private Boolean queryRecentLog; diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java index 08a124ad..cd8265d3 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java @@ -408,6 +408,7 @@ public class ExecJobServiceImpl implements ExecJobService { .like(ExecJobDO::getName, request.getName()) .like(ExecJobDO::getCommand, request.getCommand()) .eq(ExecJobDO::getStatus, request.getStatus()) + .eq(ExecJobDO::getExecUserId, request.getExecUserId()) .orderByDesc(ExecJobDO::getId); } diff --git a/orion-visor-ui/src/api/exec/exec-job.ts b/orion-visor-ui/src/api/exec/exec-job.ts index 8012285e..23bc1926 100644 --- a/orion-visor-ui/src/api/exec/exec-job.ts +++ b/orion-visor-ui/src/api/exec/exec-job.ts @@ -48,6 +48,7 @@ export interface ExecJobQueryRequest extends Pagination { name?: string; command?: string; status?: number; + execUserId?: number; queryRecentLog?: boolean; } diff --git a/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue b/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue index 51e2ad69..f9966691 100644 --- a/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue +++ b/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue @@ -3,7 +3,7 @@ @@ -33,6 +33,12 @@ allow-clear hide-button /> + + + + ([]); - const tableRenderData = ref([]); + const selectedKeys = ref>([]); + const tableRenderData = ref>([]); const formModel = reactive({ id: undefined, description: undefined, command: undefined, status: undefined, + userId: undefined, startTimeRange: undefined, }); diff --git a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts index 118053a1..69529340 100644 --- a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts +++ b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts @@ -20,7 +20,6 @@ const columns = [ dataIndex: 'command', slotName: 'command', align: 'left', - ellipsis: true, minWidth: 238, }, { title: '执行用户', diff --git a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue index 16af8c43..4cf5123f 100644 --- a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue +++ b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue @@ -32,6 +32,12 @@ placeholder="请选择状态" allow-clear /> + + + + @@ -209,26 +215,30 @@ import columns from '../types/table.columns'; import { ExecJobStatus, execJobStatusKey, execStatusKey } from '../types/const'; import { useTablePagination, useRowSelection } from '@/hooks/table'; - import { useDictStore } from '@/store'; + import { useDictStore, useUserStore } from '@/store'; + import { useRoute } from 'vue-router'; import { copy } from '@/hooks/copy'; import { dateFormat } from '@/utils'; + import UserSelector from '@/components/user/user/selector/index.vue'; const emits = defineEmits(['openAdd', 'openUpdate', 'openDetail', 'updateExecUser', 'testCron']); + const route = useRoute(); const pagination = useTablePagination(); const rowSelection = useRowSelection(); const { loading, setLoading } = useLoading(); const { hasPermission } = usePermission(); const { toOptions, getDictValue } = useDictStore(); - const selectedKeys = ref([]); - const tableRenderData = ref([]); + const selectedKeys = ref>([]); + const tableRenderData = ref>([]); const formModel = reactive({ id: undefined, name: undefined, command: undefined, status: undefined, - queryRecentLog: true + execUserId: undefined, + queryRecentLog: true, }); // 删除当前行 @@ -317,6 +327,12 @@ }; onMounted(() => { + // 当前用户 + const action = route.query.action as string; + if (action === 'self') { + formModel.execUserId = useUserStore().id; + } + // 查询 fetchTableData(); }); diff --git a/orion-visor-ui/src/views/exec/exec-job/index.vue b/orion-visor-ui/src/views/exec/exec-job/index.vue index e58f81a1..267af154 100644 --- a/orion-visor-ui/src/views/exec/exec-job/index.vue +++ b/orion-visor-ui/src/views/exec/exec-job/index.vue @@ -13,8 +13,8 @@ @updated="() => table.reload()" @open-host="(e) => hostModal.open(e)" @open-template="() => templateModal.open()" - @test-cron="openNextCron" - @gen-cron="(e) => genModal.open(e)" /> + @gen-cron="(e) => genModal.open(e)" + @test-cron="openNextCron" />