developers
/
vue-fastapi-admin
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

数据资产发布,审批

master
xueyinfei 1 month ago
parent
2c3b615a24
commit
581830202e
8 changed files with 473 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      vue-fastapi-backend/module_admin/controller/data_asset_controller.py
  2. 279
      vue-fastapi-backend/module_admin/dao/dataast_dao.py
  3. 2
      vue-fastapi-backend/module_admin/entity/do/dataast_do.py
  4. 3
      vue-fastapi-backend/module_admin/entity/vo/dataast_vo.py
  5. 4
      vue-fastapi-backend/module_admin/service/dataast_service.py
  6. 46
      vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
  7. 198
      vue-fastapi-frontend/src/views/meta/metaInfo/index.vue
  8. 46
      vue-fastapi-frontend/src/views/system/flow/dataAssetMainAppr.vue

4
vue-fastapi-backend/module_admin/controller/data_asset_controller.py
View File

@ -193,9 +193,9 @@ async def add_dataast_appr(
) )
async def get_ast_main_appr_list( async def get_ast_main_appr_list(
request: Request, request: Request,
main_page_query: DataAstApprModel= Depends(DataAstApprModel), flowId: str,
query_db: AsyncSession = Depends(get_db), query_db: AsyncSession = Depends(get_db),
): ):
main_page_query_result = await DataAstService.get_ast_main_appr_list(query_db, main_page_query, is_page=True) main_page_query_result = await DataAstService.get_ast_main_appr_list(query_db, flowId, is_page=True)
logger.info('获取数据标准列表成功') logger.info('获取数据标准列表成功')
return ResponseUtil.success(data=main_page_query_result) return ResponseUtil.success(data=main_page_query_result)

279
vue-fastapi-backend/module_admin/dao/dataast_dao.py
View File

@ -1,4 +1,4 @@
from sqlalchemy import delete, select, update, desc,or_,not_,insert,and_,func from sqlalchemy import delete, select, update, desc,or_,not_,insert,and_,text
from sqlalchemy.ext.asyncio import AsyncSession from sqlalchemy.ext.asyncio import AsyncSession
from module_admin.entity.do.dataast_do import DataAssetInfoAppr from module_admin.entity.do.dataast_do import DataAssetInfoAppr
from module_admin.entity.do.data_ast_content_do import DataAssetInfo from module_admin.entity.do.data_ast_content_do import DataAssetInfo
@ -55,87 +55,208 @@ class DataAstDao:
@classmethod @classmethod
async def add_dataast_data(cls, db: AsyncSession, model: DataAstInfoModel): async def add_dataast_data(cls, db: AsyncSession, model: DataAstInfoModel):
# 子查询：获取每个 ast_no 对应的最新已成功审批版本 try:
subquery = ( # 构建 SQL 语句
select( upsert_sql = text("""
DataAssetInfoAppr.ast_no, INSERT INTO t_data_ast_info (
func.max(DataAssetInfoAppr.version_no).label("max_version") data_ast_eng_name,
) data_ast_cn_name,
.filter( data_ast_type,
DataAssetInfoAppr.approStatus == "succeed" data_ast_stat,
) data_ast_desc,
.group_by(DataAssetInfoAppr.ast_no) data_ast_screen,
.subquery() data_ast_scren_clas,
) data_ast_cont,
data_ast_faq,
# 主查询：筛选符合条件的记录并映射到目标模型 data_ast_estb_time,
query = ( data_ast_upd_time,
select(DataAssetInfoAppr) data_ast_src,
.join( ast_no,
subquery, data_ast_clas
and_( ) VALUES (
DataAssetInfoAppr.ast_no == subquery.c.ast_no, :data_ast_eng_name,
DataAssetInfoAppr.version_no == subquery.c.max_version :data_ast_cn_name,
:data_ast_type,
:data_ast_stat,
:data_ast_desc,
:data_ast_screen,
:data_ast_scren_clas,
:data_ast_cont,
:data_ast_faq,
:data_ast_estb_time,
:data_ast_upd_time,
:data_ast_src,
:ast_no,
:data_ast_clas
) )
) ON DUPLICATE KEY UPDATE
.filter( data_ast_eng_name = VALUES(data_ast_eng_name),
DataAssetInfoAppr.data_ast_stat == "1", data_ast_cn_name = VALUES(data_ast_cn_name),
DataAssetInfoAppr.changeType == "add", data_ast_type = VALUES(data_ast_type),
DataAssetInfoAppr.approStatus == "succeed" data_ast_stat = VALUES(data_ast_stat),
) data_ast_desc = VALUES(data_ast_desc),
) data_ast_screen = VALUES(data_ast_screen),
data_ast_scren_clas = VALUES(data_ast_scren_clas),
# 执行查询获取符合条件的记录 data_ast_cont = VALUES(data_ast_cont),
approved_records = await db.scalars(query) data_ast_faq = VALUES(data_ast_faq),
data_ast_estb_time = VALUES(data_ast_estb_time),
# 收集需要处理的记录数据 data_ast_upd_time = VALUES(data_ast_upd_time),
records_to_upsert = [] data_ast_src = VALUES(data_ast_src),
for record in approved_records: data_ast_clas = VALUES(data_ast_clas);
# 从源记录中提取需要的字段 """)
asset_data = {
"data_ast_eng_name": record.data_ast_eng_name, model_dict = model.model_dump()
"data_ast_cn_name": record.data_ast_cn_name, model_dict['data_ast_upd_time'] = datetime.now()
"data_ast_type": record.data_ast_type,
"data_ast_stat": record.data_ast_stat, # 执行 UPSERT 操作
"data_ast_desc": record.data_ast_desc, await db.execute(upsert_sql, model_dict)
"data_ast_screen": record.data_ast_screen,
"data_ast_scren_clas": record.data_ast_scren_clas, # 提交事务
"data_ast_cont": record.data_ast_cont, await db.commit()
"data_ast_faq": record.data_ast_faq,
"data_ast_estb_time": record.data_ast_estb_time, return "元数据成功发布到数据资产！"
"data_ast_upd_time": datetime.now(), # 使用当前时间
"data_ast_src": record.data_ast_src, except Exception as e:
"ast_no": record.ast_no, # 出现异常时回滚事务
"data_ast_clas": record.data_ast_clas await db.rollback()
} raise e
records_to_upsert.append(asset_data) # async def add_dataast_data(cls, db: AsyncSession, model: DataAstInfoModel):
# try:
# 使用 bulk_insert_mappings 执行批量插入/更新 # # 动态SQL：更新目标表中已存在的记录
if records_to_upsert: # update_sql = text("""
from sqlalchemy.dialects.mysql import insert # UPDATE t_data_ast_info target
# JOIN (
insert_stmt = insert(DataAssetInfo).values(records_to_upsert) # SELECT
# appr.data_ast_eng_name,
# 定义 ON DUPLICATE KEY UPDATE 子句 # appr.data_ast_cn_name,
update_dict = { # appr.data_ast_type,
c.name: insert_stmt.inserted[c.name] # appr.data_ast_stat,
for c in DataAssetInfo.__table__.columns # appr.data_ast_desc,
if c.name != 'data_ast_no' and c.name != 'ast_no' # 排除主键和业务主键 # appr.data_ast_screen,
} # appr.data_ast_scren_clas,
# 手动设置 upd_time 为当前时间 # appr.data_ast_cont,
update_dict['data_ast_upd_time'] = datetime.now() # appr.data_ast_faq,
# appr.data_ast_estb_time,
upsert_stmt = insert_stmt.on_duplicate_key_update(update_dict) # NOW() AS data_ast_upd_time,
# appr.data_ast_src,
# 执行插入/更新语句 # appr.ast_no,
await db.execute(upsert_stmt) # appr.data_ast_clas
# FROM t_data_ast_info_appr appr
# 提交会话使更改生效 # INNER JOIN (
await db.commit() # SELECT
# ast_no,
return "元数据成功发布到数据资产！" # MAX(version_no) AS max_version
# FROM t_data_ast_info_appr
# WHERE approStatus = 'succeed'
# GROUP BY ast_no
# ) latest ON appr.ast_no = latest.ast_no AND appr.version_no = latest.max_version
# WHERE
# appr.data_ast_stat = '1'
# AND appr.changeType = 'add'
# AND appr.approStatus = 'succeed'
# ) source ON target.ast_no = source.ast_no
# SET
# target.data_ast_eng_name = source.data_ast_eng_name,
# target.data_ast_cn_name = source.data_ast_cn_name,
# target.data_ast_type = source.data_ast_type,
# target.data_ast_stat = source.data_ast_stat,
# target.data_ast_desc = source.data_ast_desc,
# target.data_ast_screen = source.data_ast_screen,
# target.data_ast_scren_clas = source.data_ast_scren_clas,
# target.data_ast_cont = source.data_ast_cont,
# target.data_ast_faq = source.data_ast_faq,
# target.data_ast_estb_time = source.data_ast_estb_time,
# target.data_ast_upd_time = source.data_ast_upd_time,
# target.data_ast_src = source.data_ast_src,
# target.data_ast_clas = source.data_ast_clas;
# """)
# # 动态SQL：插入目标表中不存在的新记录
# insert_sql = text("""
# INSERT INTO t_data_ast_info (
# data_ast_eng_name,
# data_ast_cn_name,
# data_ast_type,
# data_ast_stat,
# data_ast_desc,
# data_ast_screen,
# data_ast_scren_clas,
# data_ast_cont,
# data_ast_faq,
# data_ast_estb_time,
# data_ast_upd_time,
# data_ast_src,
# ast_no,
# data_ast_clas
# )
# SELECT
# source.data_ast_eng_name,
# source.data_ast_cn_name,
# source.data_ast_type,
# source.data_ast_stat,
# source.data_ast_desc,
# source.data_ast_screen,
# source.data_ast_scren_clas,
# source.data_ast_cont,
# source.data_ast_faq,
# source.data_ast_estb_time,
# source.data_ast_upd_time,
# source.data_ast_src,
# source.ast_no,
# source.data_ast_clas
# FROM (
# SELECT
# appr.data_ast_eng_name,
# appr.data_ast_cn_name,
# appr.data_ast_type,
# appr.data_ast_stat,
# appr.data_ast_desc,
# appr.data_ast_screen,
# appr.data_ast_scren_clas,
# appr.data_ast_cont,
# appr.data_ast_faq,
# appr.data_ast_estb_time,
# NOW() AS data_ast_upd_time,
# appr.data_ast_src,
# appr.ast_no,
# appr.data_ast_clas
# FROM t_data_ast_info_appr appr
# INNER JOIN (
# SELECT
# ast_no,
# MAX(version_no) AS max_version
# FROM t_data_ast_info_appr
# WHERE approStatus = 'succeed'
# GROUP BY ast_no
# ) latest ON appr.ast_no = latest.ast_no AND appr.version_no = latest.max_version
# WHERE
# appr.data_ast_stat = '1'
# AND appr.changeType = 'add'
# AND appr.approStatus = 'succeed'
# ) source
# LEFT JOIN t_data_ast_info target ON source.ast_no = target.ast_no
# WHERE target.ast_no IS NULL;
# """)
# # 执行更新SQL
# await db.execute(update_sql)
# # 执行插入SQL
# await db.execute(insert_sql)
# # 提交事务
# await db.commit()
# return "元数据成功发布到数据资产！"
# except Exception as e:
# # 回滚事务
# await db.rollback()
# raise e

2
vue-fastapi-backend/module_admin/entity/do/dataast_do.py
View File

@ -20,7 +20,7 @@ class DataAssetInfoAppr(Base):
data_ast_upd_time = Column(DateTime, nullable=True, server_default=func.now(), onupdate=func.now(), comment='数据资产更新时间') data_ast_upd_time = Column(DateTime, nullable=True, server_default=func.now(), onupdate=func.now(), comment='数据资产更新时间')
data_ast_src = Column(String(255), nullable=True, comment='数据资产来源') data_ast_src = Column(String(255), nullable=True, comment='数据资产来源')
ast_no = Column(Integer, nullable=True, comment='数据资产编号') ast_no = Column(Integer, nullable=True, comment='数据资产编号')
data_ast_clas = Column(String(255), nullable=True, comment='数据资产标签') data_ast_clas = Column(String(3000), nullable=True, comment='数据资产标签')
version_no = Column(String(50), nullable=True, comment='版本号') version_no = Column(String(50), nullable=True, comment='版本号')
changeType = Column(String(10), default=None, comment='变更类型') changeType = Column(String(10), default=None, comment='变更类型')
flowId = Column(String(50), default=None, comment='审批Id') flowId = Column(String(50), default=None, comment='审批Id')

3
vue-fastapi-backend/module_admin/entity/vo/dataast_vo.py
View File

@ -31,7 +31,8 @@ class DataAstInfoModel(BaseModel):
data_ast_estb_time: Optional[datetime] = Field(default=None, description='数据资产建立时间', alias='dataAstEstbTime') data_ast_estb_time: Optional[datetime] = Field(default=None, description='数据资产建立时间', alias='dataAstEstbTime')
data_ast_upd_time: Optional[datetime] = Field(default=None, description='数据资产更新时间', alias='dataAstUpdTime') data_ast_upd_time: Optional[datetime] = Field(default=None, description='数据资产更新时间', alias='dataAstUpdTime')
data_ast_src: Optional[str] = Field(default=None, description='数据资产来源', alias='dataAstSrc') data_ast_src: Optional[str] = Field(default=None, description='数据资产来源', alias='dataAstSrc')
ast_no: Optional[int] = Field(default=None, description='数据资产编号', alias='astNo') #ast_no: Optional[int] = Field(default=None, description='数据资产编号', alias='astNo')
ast_no: int
data_ast_clas: Optional[str] = Field(default=None, description='数据资产标签', alias='dataAstClas') data_ast_clas: Optional[str] = Field(default=None, description='数据资产标签', alias='dataAstClas')
version_no: Optional[str] = Field(default=None, description='版本号', alias='versionNo') version_no: Optional[str] = Field(default=None, description='版本号', alias='versionNo')
create_by: Optional[str] = Field(default=None, description='创建人', alias='createBy') create_by: Optional[str] = Field(default=None, description='创建人', alias='createBy')

4
vue-fastapi-backend/module_admin/service/dataast_service.py
View File

@ -66,5 +66,5 @@ class DataAstService:
@classmethod @classmethod
async def get_ast_main_appr_list(cls, query_db: AsyncSession, query_object: DataAstInfoModel, is_page: bool = False): async def get_ast_main_appr_list(cls, query_db: AsyncSession, flowId: str, is_page: bool = False):
return await DataAstDao.get_ast_main_appr_list(query_object.flowId, query_db) return await DataAstDao.get_ast_main_appr_list(flowId, query_db)

46
vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue
View File

@ -85,7 +85,18 @@
<el-table-column label="表英文名称" align="center" width="200" key="" prop="dataAstEngName" v-if="columns[2].visible" /> <el-table-column label="表英文名称" align="center" width="200" key="" prop="dataAstEngName" v-if="columns[2].visible" />
<el-table-column label="表中文名称" align="center" width="200" key="" prop="dataAstCnName" v-if="columns[3].visible" /> <el-table-column label="表中文名称" align="center" width="200" key="" prop="dataAstCnName" v-if="columns[3].visible" />
<el-table-column label="表类型" align="center" width="100" key="" prop="dataAstType" v-if="columns[4].visible" /> <el-table-column label="表类型" align="center" width="100" key="" prop="dataAstType" v-if="columns[4].visible" />
<el-table-column label="资产标签" align="center" width="150" key="" prop="dataAstClas" v-if="columns[5].visible" /> <el-table-column label="资产标签" align="center" width="150" key="" prop="dataAstClas" v-if="columns[5].visible">
<template #default="scope">
<el-popover v-for="item in scope.row.tempTabClas" placement="right" width="auto" trigger="hover">
<template #reference>
<el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag>
</template>
<div>
<div style="margin: 5px" v-for="item in scope.row.showTabClas"><el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag></div>
</div>
</el-popover>
</template>
</el-table-column>
<el-table-column label="资产描述" align="center" width="150" key="" prop="dataAstDesc" v-if="columns[6].visible" /> <el-table-column label="资产描述" align="center" width="150" key="" prop="dataAstDesc" v-if="columns[6].visible" />
<el-table-column label="资产应用场景" align="center" width="150" key="" prop="dataAstScreen" v-if="columns[7].visible" /> <el-table-column label="资产应用场景" align="center" width="150" key="" prop="dataAstScreen" v-if="columns[7].visible" />
<el-table-column label="应用场景分类" align="center" width="150" key="" prop="dataAstScrenClas" v-if="columns[8].visible" /> <el-table-column label="应用场景分类" align="center" width="150" key="" prop="dataAstScrenClas" v-if="columns[8].visible" />
@ -260,6 +271,39 @@ const getList = () => {
loading.value = false; loading.value = false;
list.value = res.rows; list.value = res.rows;
total.value = res.total; total.value = res.total;
if (list.value.length>0){
for (let i = 0; i < list.value.length; i++) {
let array = JSON.parse(list.value[i].dataAstClas)
if (array && array.length >0){
let tempTabClas = []
for (let j = 0; j < array.length; j++) {
if (tempTabClas.length > 0){
let hasClas = false
for (let k = 0; k < tempTabClas.length; k++) {
if (tempTabClas[k].clasPriClas === array[j].clasPriClas
&& tempTabClas[k].clasScdClas === array[j].clasScdClas
&& tempTabClas[k].clasThreClas === array[j].clasThreClas){
hasClas = true
}
}
if (hasClas){
break
}else {
if (array[j].clasEffFlag === '1'){
tempTabClas.push(array[j])
}
}
}else {
if (array[j].clasEffFlag === '1') {
tempTabClas.push(array[j])
}
}
}
list.value[i].showTabClas = array
list.value[i].tempTabClas = tempTabClas
}
}
}
}); });
} }
const handleQuery = () => { const handleQuery = () => {

198
vue-fastapi-frontend/src/views/meta/metaInfo/index.vue
View File

@ -583,10 +583,12 @@
<el-dialog <el-dialog
v-model="astPublish" v-model="astPublish"
title="数据资产发布" title="数据资产发布"
width="1100" width="1400"
> >
<el-table v-loading="loading" :data="dataAstList"> <el-table v-loading="loading" :data="dataAstList">
<el-table-column label="数据资产编号" align="center" prop="astNo"></el-table-column>
<el-table-column label="数据资产来源" align="center" prop="dataAstSrc"></el-table-column>
<el-table-column label="数据资产英文名称" align="center" prop="dataAstEngName"></el-table-column> <el-table-column label="数据资产英文名称" align="center" prop="dataAstEngName"></el-table-column>
<el-table-column label="数据资产中文名称" align="center" prop="dataAstCnName"></el-table-column> <el-table-column label="数据资产中文名称" align="center" prop="dataAstCnName"></el-table-column>
<el-table-column label="数据资产类型" align="center" prop="dataAstType"></el-table-column> <el-table-column label="数据资产类型" align="center" prop="dataAstType"></el-table-column>
@ -595,22 +597,21 @@
<el-input v-model="scope.row.dataAstDesc" ></el-input> <el-input v-model="scope.row.dataAstDesc" ></el-input>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column label="数据资产标签" align="center" prop="dataAstClas">--> <el-table-column label="数据资产标签" align="center" prop="dataAstClas">
<!-- <template #default="scope">--> <template #default="scope">
<!-- <el-popover v-for="item in JSON.parse(scope.row.dataAstClas)" placement="right" width="auto" trigger="hover">--> <el-popover v-for="item in scope.row.tempTabClas" placement="right" width="auto" trigger="hover">
<!-- <template #reference>--> <template #reference>
<!-- <el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag>--> <el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag>
<!-- </template>--> </template>
<!-- <div>--> <div>
<!-- <div style="margin: 5px" v-for="item in scope.row.showTabClas"><el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag></div>--> <div style="margin: 5px" v-for="item in scope.row.showTabClas"><el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag></div>
<!-- </div>--> </div>
<!-- </el-popover>--> </el-popover>
<!-- </template>--> </template>
<!-- </el-table-column>--> </el-table-column>
<el-table-column label="数据资产来源" align="center" prop="dataAstSrc"></el-table-column> <el-table-column label="操作" align="center" width="180">
<el-table-column label="数据资产编号" align="center" prop="astNo"></el-table-column>
<el-table-column label="操作" align="center" width="80">
<template #default="scope"> <template #default="scope">
<el-button link type="primary" icon="Edit" @click.prevent="editAstTab(scope.$index,scope.row)">编辑标签</el-button>
<el-button link type="danger" icon="Delete" @click.prevent="deleteAstData(scope.row)">删除</el-button> <el-button link type="danger" icon="Delete" @click.prevent="deleteAstData(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -625,6 +626,90 @@
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
<el-dialog
v-model="astTagDialog"
title="配置标签分类"
width="1100"
>
<el-form :model="currentAstTag" :inline="true" label-width="75px">
<el-form-item label="一级分类:" prop="userName">
<el-input
v-model="currentAstTag.clasPriClas"
disabled
style="width: 240px"
/>
</el-form-item>
<el-form-item label="二级分类:">
<el-input
v-model="currentAstTag.clasScdClas"
disabled
style="width: 240px"
/>
</el-form-item>
<el-form-item label="三级分类:">
<el-input
v-model="currentAstTag.clasThreClas"
disabled
style="width: 240px"
></el-input>
</el-form-item>
<el-form-item label="选择标签:">
<el-select
v-model="currentAstTag.clasOnum"
filterable
style="width: 240px"
@change="changeAstTag"
>
<el-option v-for="item in metaClasList" :key="item.clasOnum" :value="item.clasOnum" :label="item.clasOnum+' - '+item.clasName"/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Plus" @click="addAstTag">新增</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="astTags">
<el-table-column label="标签编号" width="80" align="center" prop="onum"></el-table-column>
<el-table-column label="标签名称" width="120" align="center" prop="clasName"></el-table-column>
<el-table-column label="标签值" width="170" align="center" prop="clasValue" >
<template #default="scope">
<el-input @input="changeTagValue(scope.row)" v-model="scope.row.clasValue" :disabled="scope.row.clasEffFlag !== '1'"></el-input>
</template>
</el-table-column>
<el-table-column label="标签值说明" width="170" align="center" prop="tagRemark">
<template #default="scope">
<el-input @input="changeTagValue(scope.row)" v-model="scope.row.tagRemark" :disabled="scope.row.clasEffFlag !== '1'"></el-input>
</template>
</el-table-column>
<el-table-column label="标签状态" align="center" prop="clasEffFlag">
<template #default="scope">
<span v-if="scope.row.clasEffFlag === '1'" style="color:#67C23A;">{{'有效'}}</span>
<span v-else style="color: #F56C6C">{{'已删除'}}</span>
</template>
</el-table-column>
<el-table-column label="设置方式" width="80" align="center" prop="tagSource">
<template #default="scope">
<span>{{scope.row.tagSource ? scope.row.tagSource:'自动'}}</span>
</template>
</el-table-column>
<el-table-column label="设置对象" width="80" align="center" prop="setUser"></el-table-column>
<el-table-column label="设置时间" width="150" align="center" prop="setTime"></el-table-column>
<el-table-column label="操作" align="center" width="80">
<template #default="scope">
<el-button v-if="scope.row.clasEffFlag === '1'" link type="danger" icon="Delete" @click.prevent="deleteTag(scope.row)">删除</el-button>
<el-button v-if="scope.row.clasEffFlag === '0'" link type="success" icon="RefreshLeft" @click.prevent="revertTag(scope.row)">恢复</el-button>
</template>
</el-table-column>
</el-table>
<template #footer>
<div class="dialog-footer">
<el-button @click="astTagDialog = false">取消</el-button>
<el-button type="primary" @click="confirmAstTags">
确定
</el-button>
</div>
</template>
</el-dialog>
</div> </div>
</template> </template>
@ -709,6 +794,17 @@
const selectedRows = ref([]) const selectedRows = ref([])
const dataAstList= ref([]) const dataAstList= ref([])
const astPublish = ref(false) const astPublish = ref(false)
const astTagDialog = ref(false)
const astTags = ref([])
const currentAstTag = ref({
"index":-1,
"clasThreClas": "",
"clasOnum": null,
"clasName": "",
"recSubmPrsn": "",
"clasPriClas": "",
"clasScdClas": ""
});
function changeColumnTab(){ function changeColumnTab(){
if (activeColumnTab.value === 'businessRelation'){ if (activeColumnTab.value === 'businessRelation'){
@ -762,6 +858,39 @@
currentMetaData.value.tags = JSON.parse(JSON.stringify(tableTags.value)) currentMetaData.value.tags = JSON.parse(JSON.stringify(tableTags.value))
tableTagDialog.value = false tableTagDialog.value = false
} }
function confirmAstTags(){
dataAstList.value[currentAstTag.value.index].dataAstClas = JSON.parse(JSON.stringify(astTags.value))
let tempTabClas = []
if (astTags.value.length>0){
for (let j = 0; j < astTags.value.length; j++) {
if (tempTabClas.length > 0){
let hasClas = false
for (let k = 0; k < tempTabClas.length; k++) {
if (tempTabClas[k].clasPriClas === astTags.value[j].clasPriClas
&& tempTabClas[k].clasScdClas === astTags.value[j].clasScdClas
&& tempTabClas[k].clasThreClas === astTags.value[j].clasThreClas){
hasClas = true
}
}
if (hasClas){
break
}else {
if (astTags.value[j].clasEffFlag === '1'){
tempTabClas.push(astTags.value[j])
}
}
}else {
if (astTags.value[j].clasEffFlag === '1') {
tempTabClas.push(astTags.value[j])
}
}
}
}
dataAstList.value[currentAstTag.value.index].showTabClas = astTags.value
dataAstList.value[currentAstTag.value.index].tempTabClas = tempTabClas
dataAstList.value[currentAstTag.value.index].dataAstClas = JSON.stringify(astTags.value)
astTagDialog.value = false
}
function confirmColumn(){ function confirmColumn(){
let changed = false let changed = false
for (let i = 0; i < columnList.value.length; i++) { for (let i = 0; i < columnList.value.length; i++) {
@ -881,6 +1010,24 @@
proxy.$modal.msgWarning("请选择一个标签"); proxy.$modal.msgWarning("请选择一个标签");
} }
}
function addAstTag(){
let json = JSON.parse(JSON.stringify(currentTableTag.value))
if (json.clasOnum !== null){
tableTags.value.push({
onum: json.clasOnum,
clasName: json.clasName,
clasValue: '',
tagRemark:'',
clasEffFlag:'1',
tagSource:'手工',
setUser: cache.local.get("username"),
setTime: getNowDateTime()
})
} else {
proxy.$modal.msgWarning("请选择一个标签");
}
} }
function addColumnTag(){ function addColumnTag(){
let json = JSON.parse(JSON.stringify(currentColumnTag.value)) let json = JSON.parse(JSON.stringify(currentColumnTag.value))
@ -933,6 +1080,16 @@
} }
} }
} }
function changeAstTag(){
if (typeof currentAstTag.value.clasOnum !== null){
for (let i = 0; i <metaClasList.value.length; i++) {
let item = metaClasList.value[i]
if (item.clasOnum === currentAstTag.value.clasOnum){
currentAstTag.value = item
}
}
}
}
function changeColumnTag(){ function changeColumnTag(){
if (typeof currentColumnTag.value.clasOnum !== null){ if (typeof currentColumnTag.value.clasOnum !== null){
for (let i = 0; i <metaClasList.value.length; i++) { for (let i = 0; i <metaClasList.value.length; i++) {
@ -1218,6 +1375,11 @@
const index = dataAstList.value.findIndex(item => item.astNo === row.astNo); const index = dataAstList.value.findIndex(item => item.astNo === row.astNo);
dataAstList.value.splice(index,1) dataAstList.value.splice(index,1)
} }
function editAstTab(index,row) {
astTagDialog.value = true
astTags.value = JSON.parse(JSON.stringify(row.showTabClas))
currentAstTag.value.index = index
}
function applyDataAst(){ function applyDataAst(){
if(selectedRows.value.length === 0){ if(selectedRows.value.length === 0){
proxy.$modal.msgWarning("请至少选择一条元数据进行发布") proxy.$modal.msgWarning("请至少选择一条元数据进行发布")
@ -1232,7 +1394,9 @@
dataAstDesc:'', dataAstDesc:'',
dataAstSrc: row.ssysCd, dataAstSrc: row.ssysCd,
astNo: row.extractOnum, astNo: row.extractOnum,
dataAstClas: JSON.stringify(row.batchTabClas) // dataAstClas: JSON.stringify(row.batchTabClas)
showTabClas: row.showTabClas,
tempTabClas: row.tempTabClas
}) })
}) })

46
vue-fastapi-frontend/src/views/system/flow/dataAssetMainAppr.vue
View File

@ -13,9 +13,14 @@
<el-table-column label="表类型" align="center" prop="dataAstType"></el-table-column> <el-table-column label="表类型" align="center" prop="dataAstType"></el-table-column>
<el-table-column label="资产标签" align="center" prop="dataAstClas"> <el-table-column label="资产标签" align="center" prop="dataAstClas">
<template #default="scope"> <template #default="scope">
<template v-for="item in JSON.parse(scope.row.dataAstClas)"> <el-popover v-for="item in scope.row.tempTabClas" placement="right" width="auto" trigger="hover">
<el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag> <template #reference>
</template> <el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName}}</el-tag>
</template>
<div>
<div style="margin: 5px" v-for="item in scope.row.showTabClas"><el-tag v-if="item.clasEffFlag && item.clasEffFlag === '1'">{{item.clasName + ":" + item.clasValue}}</el-tag></div>
</div>
</el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="资产描述" align="center" prop="dataAstDesc"></el-table-column> <el-table-column label="资产描述" align="center" prop="dataAstDesc"></el-table-column>
@ -96,6 +101,41 @@ const getList = async () => {
const params = { flowId: props.flowId }; const params = { flowId: props.flowId };
const res = await listAssetMainAppr(params); const res = await listAssetMainAppr(params);
tableData.value = res.data || []; tableData.value = res.data || [];
if (tableData.value.length>0){
for (let i = 0; i < tableData.value.length; i++) {
let array = JSON.parse(tableData.value[i].dataAstClas)
if (array && array.length >0){
let tempTabClas = []
for (let j = 0; j < array.length; j++) {
if (tempTabClas.length > 0){
let hasClas = false
for (let k = 0; k < tempTabClas.length; k++) {
if (tempTabClas[k].clasPriClas === array[j].clasPriClas
&& tempTabClas[k].clasScdClas === array[j].clasScdClas
&& tempTabClas[k].clasThreClas === array[j].clasThreClas){
hasClas = true
}
}
if (hasClas){
break
}else {
if (array[j].clasEffFlag === '1'){
tempTabClas.push(array[j])
}
}
}else {
if (array[j].clasEffFlag === '1') {
tempTabClas.push(array[j])
}
}
}
tableData.value[i].showTabClas = array
tableData.value[i].tempTabClas = tempTabClas
}
}
}
} catch (e) { } catch (e) {
console.error('加载失败', e); console.error('加载失败', e);
} finally { } finally {

Write Preview
Loading…
Cancel
Save