diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java index e04c9523..bbe3c8c4 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/controller/OperatorLogController.java @@ -59,7 +59,7 @@ public class OperatorLogController { @PostMapping("/query-count") @Operation(summary = "查询操作日志数量") - @PreAuthorize("@ss.hasPermission('infra:operator-log:clear')") + @PreAuthorize("@ss.hasPermission('infra:operator-log:management:clear')") public Long getOperatorLogCount(@RequestBody OperatorLogQueryRequest request) { return operatorLogService.getOperatorLogCount(request); } @@ -67,7 +67,7 @@ public class OperatorLogController { @OperatorLog(OperatorLogOperatorType.CLEAR) @PostMapping("/clear") @Operation(summary = "清空操作日志") - @PreAuthorize("@ss.hasPermission('infra:operator-log:clear')") + @PreAuthorize("@ss.hasPermission('infra:operator-log:management:clear')") public Integer clearOperatorLog(@RequestBody OperatorLogQueryRequest request) { return operatorLogService.clearOperatorLog(request); } diff --git a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue index 4f27e684..d427e01d 100644 --- a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue +++ b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue @@ -69,7 +69,7 @@ position="left" type="warning" @ok="interruptedHost(record)"> - - @@ -119,7 +119,7 @@ row: ExecCommandLogQueryResponse; }>(); - const emits = defineEmits(['viewCommand', 'viewParams']); + const emits = defineEmits(['viewCommand', 'viewParams', 'refreshHost']); const expandable = useExpandable({ width: 90 }); const { loading, setLoading } = useLoading(); @@ -148,14 +148,16 @@ }; // 删除当前行 - const deleteRow = async ({ id }: { - id: number + const deleteRow = async ({ id, logId }: { + id: number, + logId: number }) => { try { setLoading(true); // 调用删除接口 await deleteExecCommandHostLog(id); Message.success('删除成功'); + emits('refreshHost', logId); } catch (e) { } finally { setLoading(false); diff --git a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue index 0a59c084..309f7d8f 100644 --- a/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue +++ b/orion-ops-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue @@ -62,7 +62,7 @@
- 执行命令 @@ -71,7 +71,7 @@ - 清空 @@ -84,7 +84,7 @@ position="br" type="warning" @ok="deleteSelectRows"> - @@ -110,12 +110,13 @@ :bordered="false" @page-change="(page) => fetchTableData(page, pagination.pageSize)" @page-size-change="(size) => fetchTableData(1, size)" - @expand="loadHostExecData"> + @expand="loadExecHost">