diff --git a/vue-fastapi-backend/module_admin/dao/datastd_dao.py b/vue-fastapi-backend/module_admin/dao/datastd_dao.py index 3bac3a6..0ebc65a 100644 --- a/vue-fastapi-backend/module_admin/dao/datastd_dao.py +++ b/vue-fastapi-backend/module_admin/dao/datastd_dao.py @@ -265,7 +265,7 @@ class DataStdDao: c1.data_dict_cn_name.label("data_dict_cn_name"), # 字典中文名 c1.data_dict_eng_name.label("data_dict_eng_name"), # 字典英文名称 c2.mdl_name.label("mdl_name"), # 元数据模式 - c2.ssys_cd.label("ssys_cd"), # 元数据表名 + c2.ssys_id.label("ssys_id"), # 元数据表名 c2.tab_eng_name.label("tab_eng_name"), # 元数据表名 c2.fld_eng_name.label("fld_eng_name"), # 元数据字段 c2.fld_crrct_name.label("fld_crrct_name"), # 元数据字段中文名 diff --git a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py index a38065c..7544db7 100644 --- a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py +++ b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py @@ -200,6 +200,7 @@ class MetadataConfigDao: .outerjoin(subquery, SecuBizConfig.onum == subquery.c.biz_onum) .where( SecuBizConfig.risk_lvl.like(f"%{query_object.risk_lvl}%") if query_object.risk_lvl else True, + SecuBizConfig.biz_name.like(f"%{query_object.biz_name}%") if query_object.biz_name else True, SecuBizConfig.isStop == query_object.isStop if query_object.isStop is not None else True, SecuBizConfig.create_time.between( datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time.min), diff --git a/vue-fastapi-backend/module_admin/service/datastd_service.py b/vue-fastapi-backend/module_admin/service/datastd_service.py index 0c6441a..0bea0fd 100644 --- a/vue-fastapi-backend/module_admin/service/datastd_service.py +++ b/vue-fastapi-backend/module_admin/service/datastd_service.py @@ -139,7 +139,7 @@ class DataStdService: :param is_page: 是否开启分页 :return: 列配置列表信息对象 """ - col_list_result = await DataStdDao.get_std_main_map_list(query_db, query_object, is_page) + col_list_result = await DataStdDao.get_std_dict_map_list(query_db, query_object, is_page) return col_list_result @classmethod async def get_std_code_by_id_services(cls, query_db: AsyncSession, id: str): diff --git a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue index dd3f8b5..85f2bb1 100644 --- a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue +++ b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue @@ -177,7 +177,7 @@ diff --git a/vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue b/vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue index 114209c..bb47757 100644 --- a/vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue +++ b/vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue @@ -43,14 +43,22 @@ > - + - - - + + + + + - + E @@ -62,6 +70,7 @@ E import { ref, reactive, onMounted, toRefs } from 'vue'; import { listDictMap,getDictMap,getStdDict} from "@/api/datastd/std"; // 更新为新的接口 import treeNodeg6 from "../stdcode/treeNodeg6.vue"; +import { getNameById, getIdByName } from '@/utils/dsSysUtils'; const { proxy } = getCurrentInstance(); const { std_code_status } = proxy.useDict("std_code_status"); diff --git a/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue index f02bfc1..37f27d7 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/bizConfig/index.vue @@ -146,50 +146,77 @@ - - - - - - - - - - - 查询 - - - - - - - - - - - + + + + + + + + + + + + + + 查询 + + + + + + + + + + + - + style="position: absolute!important;right: 800px!important;margin-top: 20px;" + v-show="leftTotal > 0" + :total="leftTotal" + v-model:page="leftQueryForm.pageNum" + v-model:limit="leftQueryForm.pageSize" + @pagination="loadLeftTable" + /> + + + + @@ -252,10 +279,11 @@ const queryForm = reactive({ pageSize: 10 }) const leftQueryForm = reactive({ - ssysCd: '', + ssysId: '', tabName: '', + mdlName: '', pageNum: 1, - pageSize: 10 + pageSize: 10, }) const bizList = ref([]) @@ -424,17 +452,27 @@ function handleLeftSelect(rows) { } function handleRightSelect(rows) { rightSelected.value = rows + +} +function filterLeftTable() { + const rightKeys = new Set(rightTableData.value.map(buildKey)) + leftTableData.value = leftTableData.value.filter( + item => !rightKeys.has(buildKey(item)) + ) } + async function loadLeftTable() { const res = await getMetaDataList(leftQueryForm) leftTableData.value = res.data.rows || [] leftTotal.value = res.data.total || 0 + filterLeftTable() } async function loadRightTable(onum) { const res = await getBizRalaList(onum) rightTableData.value = res.data || [] + filterLeftTable() } // 用唯一键：ssysCd + mdlName + tabEngName 来判断是否重复 @@ -444,18 +482,30 @@ function buildKey(row) { function moveToRight() { const existingKeys = new Set(rightTableData.value.map(buildKey)) - leftSelected.value.forEach(item => { - if (!existingKeys.has(buildKey(item))) { - let additem=item - additem.onum=item.extractOnum - rightTableData.value.push(item) - } + const toMove = leftSelected.value.filter(item => !existingKeys.has(buildKey(item))) + toMove.forEach(item => { + let additem = { ...item, onum: item.extractOnum } + rightTableData.value.push(additem) }) + // 左边删除选中的 + leftTableData.value = leftTableData.value.filter( + item => !toMove.includes(item) + ) + leftSelected.value = [] } + function moveToLeft() { const removeKeys = new Set(rightSelected.value.map(buildKey)) + + // 把右边选中的去掉 + 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 = [] } onMounted(() => { diff --git a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue index 8854d49..7fc00da 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue @@ -554,7 +554,7 @@ function filterLeftTable() { } function buildKey(row) { - return `${row.ssysCd}||${row.mdlName}||${row.tabEngName}` + return `${row.ssysId}||${row.mdlName}||${row.tabEngName}` } function moveToRight() {