Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 脚本执行下载日志主机参数错误 #2452 #2455

Merged
merged 1 commit into from
Sep 15, 2023
Merged

fix: 脚本执行下载日志主机参数错误 #2452 #2455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/frontend/src/domain/source/task-execute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,11 @@ class TaskExecute extends ModuleBase {

// 下载执行日志文件
getLogFile(payload) {
const params = {};
if (payload.ip) {
params.ip = payload.ip;
}
const params = {
...payload,
};
delete params.id;

return Request.download(`${this.path}/step-execution-result/${payload.id}/log-file/download`, {
params,
});
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/views/executive-history/step-detail/components/execution-info/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
handleDownload() {
TaskExecuteService.fetchStepExecutionLogFile({
id: this.stepInstanceId,
ip: this.host.hostId,
hostId: this.host.hostId,
}).then(() => {
this.$bkMessage({
theme: 'success',
Expand Down
13 changes: 0 additions & 13 deletions src/frontend/src/views/executive-history/step-detail/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,19 +551,6 @@
execCopy(fieldDataList.join('\n'), successMessage);
});
},
/**
* @desc 导出脚本执行日志
*/
handleExportExecutionLog() {
TaskExecuteService.fetchStepExecutionLogFile({
id: this.params.id,
}).then(() => {
this.$bkMessage({
theme: 'success',
message: I18n.t('history.导出日志操作成功'),
});
});
},
/**
* @desc 开始强制终止
*/
Expand Down
Loading