Browse Source

标签问题修复

master
si@aidatagov.com 2 weeks ago
parent
commit
d5bd7dfdbf
  1. 5
      vue-fastapi-backend/module_admin/service/metadata_config_service.py
  2. 45
      vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue

5
vue-fastapi-backend/module_admin/service/metadata_config_service.py

@ -602,7 +602,8 @@ class MetadataConfigService:
else: else:
if message: if message:
message += ", " message += ", "
message += page_object.biz_name + "-批次标签修改失败" message += page_object.biz_name + "-批次标签修改失败:"+responsPutJson['msg']
return message return message
@classmethod @classmethod
async def delete_task_biz_config_services( async def delete_task_biz_config_services(
@ -776,7 +777,7 @@ class MetadataConfigService:
if delresponsJson['msg'] == 'success': if delresponsJson['msg'] == 'success':
metatask_info = await cls.get_task_biz_config_detail_services(query_db, process.metaTaskId) metatask_info = await cls.get_task_biz_config_detail_services(query_db, process.metaTaskId)
metatask_info2 = metatask_info.model_dump(exclude_unset=True) metatask_info2 = metatask_info.model_dump(exclude_unset=True)
metatask_info2.schId="" metatask_info2['schId']=""
await MetadataConfigDao.edit_task_biz_config(query_db,metatask_info.onum, metatask_info2) await MetadataConfigDao.edit_task_biz_config(query_db,metatask_info.onum, metatask_info2)
await query_db.commit() await query_db.commit()
return "调度删除成功!" return "调度删除成功!"

45
vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue

@ -508,33 +508,54 @@ async function loadRightTable(onum) {
try { try {
const res = await getTaskBizRelaList(onum) const res = await getTaskBizRelaList(onum)
rightTableData.value = res.data || [] rightTableData.value = res.data || []
//
filterLeftTable()
} catch { } catch {
ElMessage.error('加载右侧表数据失败') ElMessage.error('加载右侧表数据失败')
} }
} }
function filterLeftTable() {
const rightKeys = new Set(rightTableData.value.map(buildKey))
leftTableData.value = leftTableData.value.filter(
item => !rightKeys.has(buildKey(item))
)
}
function buildKey(row) { function buildKey(row) {
return `${row.ssysCd}||${row.mdlName}||${row.tabEngName}` return `${row.ssysCd}||${row.mdlName}||${row.tabEngName}`
} }
function moveToRight() { function moveToRight() {
const existingKeys = new Set(rightTableData.value.map(buildKey)) const existingKeys = new Set(rightTableData.value.map(buildKey))
leftSelected.value.forEach(item => { const toMove = leftSelected.value.filter(item => !existingKeys.has(buildKey(item)))
if (!existingKeys.has(buildKey(item))) { toMove.forEach(item => {
let additem=item let additem = { ...item, onum: item.extractOnum }
additem.onum=item.extractOnum rightTableData.value.push(additem)
rightTableData.value.push(item)
}
}) })
//
leftTableData.value = leftTableData.value.filter(
item => !toMove.includes(item)
)
leftSelected.value = []
} }
function moveToLeft() { function moveToLeft() {
const removeKeys = new Set(rightSelected.value.map(buildKey)) const removeKeys = new Set(rightSelected.value.map(buildKey))
rightTableData.value = rightTableData.value.filter(
item => !removeKeys.has(buildKey(item)) //
) const toRemove = rightTableData.value.filter(item => removeKeys.has(buildKey(item)))
rightTableData.value = rightTableData.value.filter(item => !removeKeys.has(buildKey(item)))
//
leftTableData.value.push(...toRemove)
rightSelected.value = []
} }
function resetQuery() { function resetQuery() {
queryForm.bizName = '' queryForm.bizName = ''
queryForm.pageNum = 1 queryForm.pageNum = 1
@ -560,6 +581,10 @@ function openEditDialog(row) {
if (!row) { if (!row) {
ElMessage.warning('请选择一条记录进行编辑') ElMessage.warning('请选择一条记录进行编辑')
return return
}
if (row.status !== 'OFFLINE') {
ElMessage.warning('仅支持下线状态的任务进行修改')
return
} }
title.value = '编辑标签任务' title.value = '编辑标签任务'
Object.assign(form, row) Object.assign(form, row)
@ -709,7 +734,7 @@ function handleDeleteSche() {
try { try {
console.log(onums.value,"ssssssss") console.log(onums.value,"ssssssss")
await dsmetataskdelete({processDefinitionCode:dsIds.value.toString(),onum:onums.value.toString()}) await dsmetataskdelete({processDefinitionCode:dsIds.value.toString(),metaTaskId:onums.value.toString()})
ElMessage.success('删除调度成功') ElMessage.success('删除调度成功')
getList() getList()

Loading…
Cancel
Save