diff --git a/vue-fastapi-backend/module_admin/dao/vecset_dao.py b/vue-fastapi-backend/module_admin/dao/vecset_dao.py index 7c31591..0c6aa57 100644 --- a/vue-fastapi-backend/module_admin/dao/vecset_dao.py +++ b/vue-fastapi-backend/module_admin/dao/vecset_dao.py @@ -22,7 +22,8 @@ class VecsetDao: SysVecset.stab_name == vecset_query.stab_name if vecset_query.stab_name else True, SysVecset.squery == vecset_query.squery if vecset_query.squery else True, SysVecset.sanal_plan == vecset_query.sanal_plan if vecset_query.sanal_plan else True, - SysVecset.status == vecset_query.status if vecset_query.status else True + SysVecset.status == vecset_query.status if vecset_query.status else True, + SysVecset.data_domain == vecset_query.data_domain if vecset_query.data_domain else True, ).distinct() ) query_result = await PageUtil.paginate(db, query, vecset_query.page_num, vecset_query.page_size, True) diff --git a/vue-fastapi-backend/module_admin/entity/do/dataint_do.py b/vue-fastapi-backend/module_admin/entity/do/dataint_do.py index 90c35ee..9d1fc8e 100644 --- a/vue-fastapi-backend/module_admin/entity/do/dataint_do.py +++ b/vue-fastapi-backend/module_admin/entity/do/dataint_do.py @@ -108,6 +108,7 @@ class SysVecset(Base): onum = Column(String(60), primary_key=True, comment='序号') dasset_id = Column(String(500), comment='数据域名') + data_domain = Column(String(500), comment='数据域') squery = Column(String(500), comment='查询语句') sanal_plan = Column(String(500), comment='分析方法') sintnt_term = Column(String(500), comment='意图词') 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 3b53989..2d6aa12 100644 --- a/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py +++ b/vue-fastapi-backend/module_admin/entity/vo/dataint_vo.py @@ -98,6 +98,7 @@ class VecsetPageObject(BaseModel): model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) page_num: int page_size: int + data_domain: Optional[str] = None stab_name: Optional[str] = None squery: Optional[str] = None sanal_plan: Optional[str] = None @@ -109,6 +110,7 @@ class SaveVecsetModel(BaseModel): model_config = ConfigDict(alias_generator=to_camel, from_attributes=True) onum: Optional[str] = None dasset_id: Optional[str] = None + data_domain: Optional[str] = None stab_name: Optional[str] = None squery: Optional[str] = None sanal_plan: Optional[str] = None diff --git a/vue-fastapi-frontend/src/views/dataint/cypz/fccbd.vue b/vue-fastapi-frontend/src/views/dataint/cypz/fccbd.vue index b9f1944..42d2d21 100644 --- a/vue-fastapi-frontend/src/views/dataint/cypz/fccbd.vue +++ b/vue-fastapi-frontend/src/views/dataint/cypz/fccbd.vue @@ -81,14 +81,14 @@ 删除 - + - + + +