fix 更新element-plus致2.9.0,定时任务详情报错修复
This commit is contained in:
parent
68648f2a86
commit
012025080d
@ -21,7 +21,7 @@
|
|||||||
"echarts": "^5.5.0",
|
"echarts": "^5.5.0",
|
||||||
"echarts-gl": "^2.0.9",
|
"echarts-gl": "^2.0.9",
|
||||||
"echarts-wordcloud": "^2.1.0",
|
"echarts-wordcloud": "^2.1.0",
|
||||||
"element-plus": "^2.8.7",
|
"element-plus": "^2.9.0",
|
||||||
"js-cookie": "^3.0.5",
|
"js-cookie": "^3.0.5",
|
||||||
"jsplumb": "^2.15.6",
|
"jsplumb": "^2.15.6",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
|
@ -88,12 +88,12 @@ export function getJobLogs(req:object){
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 删除定时任务日志
|
// 删除定时任务日志
|
||||||
export function delSysJobLog(logIds:number[]) {
|
export function delSysJobLog(targetName:string) {
|
||||||
return request({
|
return request({
|
||||||
url: '/api/v1/system/sysJob/deleteLogs',
|
url: '/api/v1/system/sysJob/deleteLogs',
|
||||||
method: 'delete',
|
method: 'delete',
|
||||||
data:{
|
data:{
|
||||||
logIds:logIds
|
targetName
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -32,10 +32,10 @@
|
|||||||
<el-form-item label="状态">{{ proxy.getOptionValue(formData.status, statusOptions,'value','label') }}</el-form-item>
|
<el-form-item label="状态">{{ proxy.getOptionValue(formData.status, statusOptions,'value','label') }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="创建者">{{ formData.createdUser.userNickname }}</el-form-item>
|
<el-form-item label="创建者">{{ formData.createdUser?.userNickname }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="更新者">{{ formData.updatedUser.userNickname }}</el-form-item>
|
<el-form-item label="更新者">{{ formData.updatedUser?.userNickname }}</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="12">
|
<el-col :span="12">
|
||||||
<el-form-item label="备注信息">{{ formData.remark }}</el-form-item>
|
<el-form-item label="备注信息">{{ formData.remark }}</el-form-item>
|
||||||
@ -51,9 +51,8 @@
|
|||||||
class="btn-del"
|
class="btn-del"
|
||||||
type="danger"
|
type="danger"
|
||||||
size="small"
|
size="small"
|
||||||
:disabled="multiple"
|
@click="handleDelete"
|
||||||
@click="handleDelete(null)"
|
><el-icon><ele-Delete /></el-icon>清空日志</el-button>
|
||||||
><el-icon><ele-Delete /></el-icon>删除</el-button>
|
|
||||||
<el-divider />
|
<el-divider />
|
||||||
<el-table v-loading="logList.loading" :data="logList.data" @selection-change="handleSelectionChange">
|
<el-table v-loading="logList.loading" :data="logList.data" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
@ -203,31 +202,16 @@ const handleSelectionChange = (selection:Array<SysJobLogData>) => {
|
|||||||
logList.logIds = selection.map(item => item.id)
|
logList.logIds = selection.map(item => item.id)
|
||||||
multiple.value = !selection.length
|
multiple.value = !selection.length
|
||||||
};
|
};
|
||||||
const handleDelete = (row: SysJobLogData) => {
|
const handleDelete = () => {
|
||||||
let msg = '你确定要删除所选数据?';
|
ElMessageBox.confirm('你确定要清空日志?', '提示', {
|
||||||
let logId:number[] = [] ;
|
|
||||||
let targetName:string='';
|
|
||||||
if(row){
|
|
||||||
msg = `此操作将永久删除数据,是否继续?`
|
|
||||||
logId = [row.id]
|
|
||||||
targetName = row.targetName
|
|
||||||
}else{
|
|
||||||
logId = logList.logIds
|
|
||||||
targetName=state.formData.invokeTarget!
|
|
||||||
}
|
|
||||||
if(logId.length===0){
|
|
||||||
ElMessage.error('请选择要删除的数据。');
|
|
||||||
return
|
|
||||||
}
|
|
||||||
ElMessageBox.confirm(msg, '提示', {
|
|
||||||
confirmButtonText: '确认',
|
confirmButtonText: '确认',
|
||||||
cancelButtonText: '取消',
|
cancelButtonText: '取消',
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
delSysJobLog(logId).then(()=>{
|
delSysJobLog(logList.param.targetName!).then(()=>{
|
||||||
ElMessage.success('删除成功');
|
ElMessage.success('删除成功');
|
||||||
getLogList(targetName);
|
getLogList(logList.param.targetName!);
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
.catch(() => {});
|
.catch(() => {});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user