diff --git a/vue-fastapi-backend/module_admin/dao/cdplb_dao.py b/vue-fastapi-backend/module_admin/dao/cdplb_dao.py index 3741a05..bea50de 100644 --- a/vue-fastapi-backend/module_admin/dao/cdplb_dao.py +++ b/vue-fastapi-backend/module_admin/dao/cdplb_dao.py @@ -18,9 +18,9 @@ class CdplbDao: async def get_cdplb_list(cls, db: AsyncSession, cdplb_query: CdplbPageObject): query = ( select(SysCdplb).where( - SysCdplb.bath_obj_tabName == cdplb_query.bath_obj_tabName if cdplb_query.bath_obj_tabName else True, - SysCdplb.bath_obj_fldName == cdplb_query.bath_obj_fldName if cdplb_query.bath_obj_fldName else True, - SysCdplb.pos_name == cdplb_query.pos_name if cdplb_query.pos_name else True, + SysCdplb.bath_obj_tab_name.like(f'%{cdplb_query.bathObjTabName}%') if cdplb_query.bathObjTabName else True, + SysCdplb.bath_obj_fld_name.like(f'%{cdplb_query.bathObjFldName}%') if cdplb_query.bathObjFldName else True, + SysCdplb.pos_name.like(f'%{cdplb_query.pos_name}%') if cdplb_query.pos_name else True, SysCdplb.status == cdplb_query.status if cdplb_query.status else True ).distinct() ) diff --git a/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py b/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py index 2d6aa12..fcc6f2a 100644 --- a/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py +++ b/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py @@ -53,8 +53,8 @@ class CdplbPageObject(BaseModel): model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) page_num: int page_size: int - bath_obj_tabName: Optional[str] = None - bath_obj_fldName: Optional[str] = None + bathObjTabName: Optional[str] = None + bathObjFldName: Optional[str] = None pos_name: Optional[str] = None status: Optional[str] = None diff --git a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue index 7f7b6ae..e493bda 100644 --- a/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue +++ b/vue-fastapi-frontend/src/views/meta/metaInfo/index.vue @@ -346,7 +346,16 @@
@@ -837,6 +846,7 @@ import {listMetadataSecOptions} from "@/api/metadataConfig/metadataConfig.js"; import {getToken} from "@/utils/auth.js"; import {getDirectoryTree} from "@/api/metadataConfig/directory.js"; + import {EditPen} from "@element-plus/icons-vue"; const data = reactive({ queryParams:{ diff --git a/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue index 8259d33..da0034f 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/metaclas/index.vue @@ -101,7 +101,7 @@ > - + @@ -131,7 +131,7 @@ > - + @@ -164,7 +164,7 @@ > - + diff --git a/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue index f1d8a60..fa4bb06 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/relconf/index.vue @@ -64,7 +64,7 @@ > - + @@ -72,7 +72,7 @@ - +