gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-08 01:20:07 +08:00
Code

fix: 修改计划任务脚本执行状态判断 (#2675)

Browse Source 
Refs #2652
This commit is contained in:
ssongliu 2023-10-25 15:28:36 +08:00 committed by GitHub
parent 084351a063
commit b0e8787f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/utils/cmd/cmd.go
View File

@ -91,9 +91,6 @@ func ExecCronjobWithTimeOut(cmdStr string, workdir string, timeout time.Duration
return "", buserr.New(constant.ErrCmdTimeout) return "", buserr.New(constant.ErrCmdTimeout)
} }
if len(stderr.String()) != 0 {
err = buserr.New(constant.ErrBashExecute)
}
return output.String(), err return output.String(), err
} }

31
frontend/src/views/cronjob/record/index.vue
View File

@ -131,8 +131,8 @@
<el-card <el-card
v-for="(item, index) in records" v-for="(item, index) in records"
:key="index" :key="index"
:class="item.id === currentRecord.id ? 'select-card' : 'primary-card'"
@click="forDetail(item)" @click="forDetail(item)"
class="infinite-list-item"
> >
<el-tag v-if="item.status === 'Success'" type="success"> <el-tag v-if="item.status === 'Success'" type="success">
{{ $t('commons.status.success') }} {{ $t('commons.status.success') }}
@ -143,13 +143,12 @@
<el-tag v-if="item.status === 'Failed'" type="danger"> <el-tag v-if="item.status === 'Failed'" type="danger">
{{ $t('commons.status.failed') }} {{ $t('commons.status.failed') }}
</el-tag> </el-tag>
<span v-if="item.id === currentRecord.id" class="select-card"> <span>
{{ dateFormat(0, 0, item.startTime) }} {{ dateFormat(0, 0, item.startTime) }}
</span> </span>
<span v-else>{{ dateFormat(0, 0, item.startTime) }}</span>
</el-card> </el-card>
</ul> </ul>
<div style="margin-top: 10px; font-size: 12px; float: right"> <div class="page-item">
<el-pagination <el-pagination
:page-size="searchInfo.pageSize" :page-size="searchInfo.pageSize"
:current-page="searchInfo.page" :current-page="searchInfo.page"
@ -723,28 +722,35 @@ defineExpose({
height: calc(100vh - 416px); height: calc(100vh - 416px);
padding: 0; padding: 0;
margin: 0; margin: 0;
.el-card { .el-card {
border: var(--panel-border) !important; border: var(--panel-border) !important;
&:hover { &:hover {
border: 1px solid var(--el-color-primary) !important;
box-shadow: 2px 2px 2px #888888; box-shadow: 2px 2px 2px #888888;
} }
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center;
height: 40px; height: 40px;
font-size: 14px; font-size: 14px;
margin: 5px; margin: 5px;
cursor: pointer; cursor: pointer;
} }
.select-card {
color: var(--el-color-primary);
border: 1px solid var(--el-color-primary) !important;
box-shadow: 2px 2px 2px #888888;
&::before {
position: absolute;
width: 3px;
height: 40px;
content: '';
background: $primary-color;
border-radius: 10px;
}
}
.el-tag { .el-tag {
margin-right: 15px; margin-right: 15px;
} }
} }
.select-card {
color: var(--el-color-primary);
}
.descriptionWide { .descriptionWide {
width: 40%; width: 40%;
@ -752,6 +758,11 @@ defineExpose({
.description { .description {
width: 30%; width: 30%;
} }
.page-item {
margin-top: 10px;
font-size: 12px;
float: right;
}
@media only screen and (max-width: 1000px) { @media only screen and (max-width: 1000px) {
.mainClass { .mainClass {