Merge branch 'refs/heads/main' into dev_20260130_RemoveRedis

This commit is contained in:
longguancheng 2026-02-08 23:58:14 +08:00
commit d3ab2f2278
2 changed files with 6 additions and 6 deletions

View File

@ -134,7 +134,7 @@ export default {
}
})
} else if (type === 2) {
const bool = await this.$confirm(`确认要关机吗?`, '提示', {
const bool = await this.$confirm(`确认要结束所有任务吗?`, '提示', {
customClass: 'confirm-light',
confirmButtonText: '确定',
cancelButtonText: '取消',

View File

@ -114,12 +114,11 @@
<el-tooltip
class="item"
effect="light"
content="开机"
content="手动开机"
placement="top"
>
<el-button
type="success"
icon="el-icon-video-play"
icon="el-icon-switch-button"
size="mini"
circle
@click="handleRadar(scope.row, 1)"
@ -129,11 +128,12 @@
<el-tooltip
class="item"
effect="light"
content="关机"
content="结束所有任务"
placement="top"
>
<el-button
icon="el-icon-switch-button"
type="danger"
icon="el-icon-close"
size="mini"
circle
@click="handleRadar(scope.row, 2)"