Browse Source

标准模块功能修复

master
si@aidatagov.com 4 weeks ago
parent
commit
c0d93fb105
  1. 34
      vue-fastapi-backend/module_admin/dao/datastd_dao.py
  2. 19
      vue-fastapi-frontend/src/views/datastd/stddict/index.vue
  3. 10
      vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue

34
vue-fastapi-backend/module_admin/dao/datastd_dao.py

@ -246,6 +246,40 @@ class DataStdDao:
db, query, query_object.page_num, query_object.page_size, is_page db, query, query_object.page_num, query_object.page_size, is_page
) )
return col_list return col_list
@classmethod
async def get_std_dict_map_list(cls, db: AsyncSession, query_object: DataStdDictModel, is_page: bool = False):
# 构建查询条件
filters = []
# 系统级代码
c1 = aliased(DataStdDict) #
c2 = aliased(MetadataFldSuppInfo) #
filters.append(c1.onum == query_object.onum)
# 3. 构建基础查询,使用连接和别名
query = (
select(
c1.data_dict_no.label("data_dict_no"), # 字典编号
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.tab_eng_name.label("tab_eng_name"), # 元数据表名
c2.fld_eng_name.label("fld_eng_name"), # 元数据字段
c2.fld_crrct_name.label("fld_crrct_name"), # 元数据字段中文名
)
.select_from(c1) # 从 c1 开始查询
.join(c2, c1.onum == c2.data_dict_id, isouter=True) # 连接 c2
.where(*filters) # 使用所有过滤条件
.order_by(desc(c1.create_time)) # 按照创建时间降序排列
)
# 4. 分页逻辑
col_list = await PageUtil.paginate(
db, query, query_object.page_num, query_object.page_size, is_page
)
return col_list
@classmethod @classmethod
async def get_data_code_list_by_info(cls, db: AsyncSession, query_object: DataStdCodeModel): async def get_data_code_list_by_info(cls, db: AsyncSession, query_object: DataStdCodeModel):

19
vue-fastapi-frontend/src/views/datastd/stddict/index.vue

@ -155,12 +155,19 @@
align="center" align="center"
prop="dataDictCnName" prop="dataDictCnName"
/> />
<el-table-column <el-table-column label="字典业务定义" prop="dataDictBusiMean" width="150">
label="字典业务定义" <template #default="{ row }">
width="120"
align="center" <!-- 设置 title 属性便于右键复制全文 -->
prop="dataDictBusiMean" <span :title="row.dataDictBusiMean" style="cursor: text; user-select: text;">
/> {{ row.dataDictBusiMean?.length > 20
? row.dataDictBusiMean.slice(0, 20) + '...'
: row.dataDictBusiMean }}
</span>
</template>
</el-table-column>
<el-table-column label="数据类型" align="center" prop="dataDictDataType" /> <el-table-column label="数据类型" align="center" prop="dataDictDataType" />
<el-table-column label="数据标准" align="center" prop="dataStdNo" > <el-table-column label="数据标准" align="center" prop="dataStdNo" >
<template #default="{ row }"> <template #default="{ row }">

10
vue-fastapi-frontend/src/views/datastd/stddict/stdMap.vue

@ -46,11 +46,13 @@
<el-table-column label="字典编号" prop="dataStdNo" align="center" /> <el-table-column label="字典编号" prop="dataStdNo" align="center" />
<el-table-column label="字典英文名称" prop="dataDictEngName" align="center" /> <el-table-column label="字典英文名称" prop="dataDictEngName" align="center" />
<el-table-column label="字典中文名称" prop="dataDictCnName" align="center" /> <el-table-column label="字典中文名称" prop="dataDictCnName" align="center" />
<el-table-column label="字典编号" prop="dataDictNo" align="center" /> <el-table-column label="系统" prop="ssysCd" align="center" />
<el-table-column label="字典英文名称" prop="dataDictEngName" align="center" /> <el-table-column label="模式" prop="mdNlNCame" alignE="center" />
<el-table-column label="字典中文名称" prop="dataDictCnName" align="center" /> <el-table-column label="表" prop="tabENngName" align="center" />
<el-table-column label="字段" prop="fldEngName" align="center" />
<el-table-column label="字段注释" prop="fldCCNrrctName" align="center" />
E
</el-table> </el-table>
</el-tab-pane> </el-tab-pane>

Loading…
Cancel
Save