Merge pull request '更新流程' (#3) from dev into master

Reviewed-on: #3
pull/7/head^2
Yueng 2024-08-31 02:03:50 +08:00
parent 3023ef2b5e
commit 90fd958bbe
4 changed files with 357 additions and 99 deletions

View File

@ -6,3 +6,10 @@ export function getExtractDataTableNameList() {
method: 'post', method: 'post',
}) })
} }
export function findTableValue(id,dataName) {
return request({
url: '/property/dataRunName/findTableValue?basicId='+id +"&dataName="+dataName,
method: 'post',
})
}

View File

@ -1,62 +1,150 @@
<template> <template>
<div> <div>
<h1>数据资产结构</h1>
<el-container> <el-container>
<el-aside width="200px">Aside</el-aside> <el-aside width="400px">
<el-container>
<el-header>Header</el-header>
<el-main>Main</el-main>
<el-footer>Footer</el-footer>
</el-container>
</el-container>
<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</el-aside>
<el-main>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-size: xx-large"></span>
<template>
<el-descriptions class="margin-top" title="资产模型基本信息" :column="2" border>
<el-descriptions-item>
<template slot="label">表名称</template>
{{ tableBasic.name }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">表备注</template>
{{ tableBasic.tableRemark }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">数据量</template>
{{ dataNum }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">是否核心</template>
<dict-tag :options="dict.type.sys_no" :value="tableBasic.isCenter"/>
</el-descriptions-item>
</el-descriptions>
</template>
</div>
</el-card>
<el-card class="box-card" title="资产模型基本信息" :column="2" >
<div slot="header" class="clearfix">
<span>资产模型详细信息</span>
</div>
<el-table
:data="tableStructure" style="width: 100%">
<el-table-column label="名称" prop="field"></el-table-column>
<el-table-column label="注释" prop="annotation"></el-table-column>
<el-table-column label="是否主键" prop="primarys">
<template slot-scope="scope">
<span v-if="scope.row.primarys==='PRI'">
<el-tag type="success">{{scope.row.primarys }}</el-tag>
</span>
<span v-if="scope.row.primarys===''">
<el-tag type="danger">NO</el-tag>
</span>
</template>
</el-table-column>
<el-table-column label="类型" prop="type"></el-table-column>
<el-table-column label="映射类型" prop="javaType">{{this.javaType.type}}</el-table-column>
<el-table-column label="是否为空" prop="nullable"></el-table-column>
<el-table-column label="是否字典" prop="isDictionary"></el-table-column>
<el-table-column label="映射字典" prop="dictionaryTable"></el-table-column>
</el-table>
</el-card>
</el-main>
</el-container>
</div> </div>
</template> </template>
<style> <style>
.el-header, .el-footer {
background-color: #a1a1a1;
color: #a1a1a1;
text-align: center;
line-height: 680px;
}
.el-aside {
background-color: #ffffff;
color: #606060;
text-align: center;
line-height: 500px;
}
.el-main { .el-main {
background-color: #a1a1a1; background-color: #ececec;
color: #a1a1a1; color: #000000;
text-align: center; line-height: 147px;
line-height: 680px;
} }
</style> </style>
<script> <script>
//jsjsjson, //jsjsjson,
//import from ', //import from ',
import { findTableValue, getExtractDataTableNameList } from '@/api/property/astr'
export default { export default {
//import使" //import使"
components: {}, components: {},
dicts: ['sys_no'],
props: {}, props: {},
data() { data() {
//" //"
return {} return {
data:[],
defaultProps: {
children: 'tableNames',
label: 'name'
},
dataNum:0,
tableBasic:{
},
tableStructure:[],
javaType:[],
};
}, },
// data", // data",
computed: {}, computed: {},
//data", //data",
watch: {}, watch: {},
//", //",
methods: {}, methods: {
getSelectList(){
getExtractDataTableNameList().then((res)=>{
this.data = res.data
})
},
handleNodeClick(data){
console.log(data)
this.tableBasic=data
this.dataNum=data.tableFie.length
this.tableStructure=data.tableFie
var id = 0;
data.tableFie.forEach(res => {
id=res.tableId
})
console.log(id)
findTableValue(id,data.name).then(res=>{
// console.log(res)
this.javaType=res.data
})
},
},
// - 访this", // - 访this",
created() { created() {
this.getSelectList();
}, },
// - 访DOM", // - 访DOM",
mounted() { mounted() {
@ -75,8 +163,10 @@ export default {
}, // - ", }, // - ",
activated() { activated() {
} //keep-alive", } //keep-alive",
} };
</script> </script>
<style scoped> <style scoped>
</style> </style>

View File

@ -1,62 +1,150 @@
<template> <template>
<div> <div>
<h1>数据资产结构</h1>
<el-container> <el-container>
<el-aside width="200px">Aside</el-aside> <el-aside width="400px">
<el-container>
<el-header>Header</el-header>
<el-main>Main</el-main>
<el-footer>Footer</el-footer>
</el-container>
</el-container>
<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</el-aside>
<el-main>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-size: xx-large"></span>
<template>
<el-descriptions class="margin-top" title="资产模型基本信息" :column="2" border>
<el-descriptions-item>
<template slot="label">表名称</template>
{{ tableBasic.name }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">表备注</template>
{{ tableBasic.tableRemark }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">数据量</template>
{{ dataNum }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">是否核心</template>
<dict-tag :options="dict.type.sys_no" :value="tableBasic.isCenter"/>
</el-descriptions-item>
</el-descriptions>
</template>
</div>
</el-card>
<el-card class="box-card" title="资产模型基本信息" :column="2" >
<div slot="header" class="clearfix">
<span>资产模型详细信息</span>
</div>
<el-table
:data="tableStructure" style="width: 100%">
<el-table-column label="名称" prop="field"></el-table-column>
<el-table-column label="注释" prop="annotation"></el-table-column>
<el-table-column label="是否主键" prop="primarys">
<template slot-scope="scope">
<span v-if="scope.row.primarys==='PRI'">
<el-tag type="success">{{scope.row.primarys }}</el-tag>
</span>
<span v-if="scope.row.primarys===''">
<el-tag type="danger">NO</el-tag>
</span>
</template>
</el-table-column>
<el-table-column label="类型" prop="type"></el-table-column>
<el-table-column label="映射类型" prop="javaType">{{this.javaType.type}}</el-table-column>
<el-table-column label="是否为空" prop="nullable"></el-table-column>
<el-table-column label="是否字典" prop="isDictionary"></el-table-column>
<el-table-column label="映射字典" prop="dictionaryTable"></el-table-column>
</el-table>
</el-card>
</el-main>
</el-container>
</div> </div>
</template> </template>
<style> <style>
.el-header, .el-footer {
background-color: #a1a1a1;
color: #a1a1a1;
text-align: center;
line-height: 680px;
}
.el-aside {
background-color: #ffffff;
color: #606060;
text-align: center;
line-height: 500px;
}
.el-main { .el-main {
background-color: #a1a1a1; background-color: #ececec;
color: #a1a1a1; color: #000000;
text-align: center; line-height: 147px;
line-height: 680px;
} }
</style> </style>
<script> <script>
//jsjsjson, //jsjsjson,
//import from ', //import from ',
import { findTableValue, getExtractDataTableNameList } from '@/api/property/astr'
export default { export default {
//import使" //import使"
components: {}, components: {},
dicts: ['sys_no'],
props: {}, props: {},
data() { data() {
//" //"
return {} return {
data:[],
defaultProps: {
children: 'tableNames',
label: 'name'
},
dataNum:0,
tableBasic:{
},
tableStructure:[],
javaType:[],
};
}, },
// data", // data",
computed: {}, computed: {},
//data", //data",
watch: {}, watch: {},
//", //",
methods: {}, methods: {
getSelectList(){
getExtractDataTableNameList().then((res)=>{
this.data = res.data
})
},
handleNodeClick(data){
console.log(data)
this.tableBasic=data
this.dataNum=data.tableFie.length
this.tableStructure=data.tableFie
var id = 0;
data.tableFie.forEach(res => {
id=res.tableId
})
console.log(id)
findTableValue(id,data.name).then(res=>{
// console.log(res)
this.javaType=res.data
})
},
},
// - 访this", // - 访this",
created() { created() {
this.getSelectList();
}, },
// - 访DOM", // - 访DOM",
mounted() { mounted() {
@ -75,8 +163,10 @@ export default {
}, // - ", }, // - ",
activated() { activated() {
} //keep-alive", } //keep-alive",
} };
</script> </script>
<style scoped> <style scoped>
</style> </style>

View File

@ -1,82 +1,151 @@
<template> <template>
<div> <div>
<h1>数据资产结构</h1>
<el-container> <el-container>
<el-aside width="300px"> <el-aside width="400px">
<el-tree :data="dataName" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
<el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
</el-aside> </el-aside>
<el-container>
<el-header>Header</el-header> <el-main>
<el-main>Main</el-main>
<el-footer>Footer</el-footer> <el-card class="box-card">
</el-container> <div slot="header" class="clearfix">
<span style="font-size: xx-large"></span>
<template>
<el-descriptions class="margin-top" title="资产模型基本信息" :column="2" border>
<el-descriptions-item>
<template slot="label">表名称</template>
{{ tableBasic.name }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">表备注</template>
{{ tableBasic.tableRemark }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">数据量</template>
{{ dataNum }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">是否核心</template>
<dict-tag :options="dict.type.sys_no" :value="tableBasic.isCenter"/>
</el-descriptions-item>
</el-descriptions>
</template>
</div>
</el-card>
<el-card class="box-card" title="资产模型基本信息" :column="2" >
<div slot="header" class="clearfix">
<span>资产模型详细信息</span>
</div>
<el-table
:data="tableStructure" style="width: 100%">
<el-table-column label="名称" prop="field"></el-table-column>
<el-table-column label="注释" prop="annotation"></el-table-column>
<el-table-column label="是否主键" prop="primarys">
<template slot-scope="scope">
<span v-if="scope.row.primarys==='PRI'">
<el-tag type="success">{{scope.row.primarys }}</el-tag>
</span>
<span v-if="scope.row.primarys===''">
<el-tag type="danger">NO</el-tag>
</span>
</template>
</el-table-column>
<el-table-column label="类型" prop="type"></el-table-column>
<el-table-column label="映射类型" prop="javaType">{{this.javaType.type}}</el-table-column>
<el-table-column label="是否为空" prop="nullable"></el-table-column>
<el-table-column label="是否字典" prop="isDictionary"></el-table-column>
<el-table-column label="映射字典" prop="dictionaryTable"></el-table-column>
</el-table>
</el-card>
</el-main>
</el-container> </el-container>
</div> </div>
</template> </template>
<style> <style>
.el-header, .el-footer {
background-color: #a1a1a1;
color: #a1a1a1;
text-align: center;
line-height: 680px;
}
.el-aside {
background-color: #ffffff;
color: #606060;
text-align: center;
line-height: 500px;
}
.el-main { .el-main {
background-color: #a1a1a1; background-color: #ececec;
color: #a1a1a1; color: #000000;
text-align: center; line-height: 147px;
line-height: 680px;
} }
</style> </style>
<script> <script>
//jsjsjson, //jsjsjson,
//import from ', //import from ',
import { getExtractDataTableNameList } from '@/api/property/astr'
import { findTableValue, getExtractDataTableNameList } from '@/api/property/astr'
export default { export default {
//import使" //import使"
components: {}, components: {},
dicts: ['sys_no'],
props: {}, props: {},
data() { data() {
//" //"
return { return {
dataName:[], data:[],
defaultProps: { defaultProps: {
children: 'children', children: 'tableNames',
label: 'label' label: 'name'
} },
} dataNum:0,
tableBasic:{
},
tableStructure:[],
javaType:[],
};
}, },
// data", // data",
computed: {}, computed: {},
//data", //data",
watch: { watch: {},
},
//", //",
methods: { methods: {
getSelectList(){ getSelectList(){
getExtractDataTableNameList().then(res=>{ getExtractDataTableNameList().then((res)=>{
console.log(res.data) this.data = res.data
this.dataName=res.data
}) })
}, },
handleNodeClick(data){
sessionStorage.setItem("key",data.name)
console.log(data)
this.tableBasic=data
this.dataNum=data.tableFie.length
this.tableStructure=data.tableFie
var id = 0;
data.tableFie.forEach(res => {
id=res.tableId
})
console.log(id)
findTableValue(id,data.name).then(res=>{
// console.log(res)
this.javaType=res.data
})
},
}, },
// - 访this", // - 访this",
created() { created() {
this.getSelectList() this.getSelectList();
}, },
// - 访DOM", // - 访DOM",
mounted() { mounted() {
@ -95,8 +164,10 @@ export default {
}, // - ", }, // - ",
activated() { activated() {
} //keep-alive", } //keep-alive",
} };
</script> </script>
<style scoped> <style scoped>
</style> </style>