Compare commits

..

No commits in common. "fdc2ebb67e50fe951036ccda2f10ef7810c70d12" and "9c8d8ec5e28415128a968ace1811d79bd56b5fb7" have entirely different histories.

4 changed files with 171 additions and 216 deletions

View File

@ -347,9 +347,6 @@ export default {
] ]
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
getFillMemoryInfo() { getFillMemoryInfo() {
fillMemoryInfo().then(res => { fillMemoryInfo().then(res => {
@ -419,10 +416,6 @@ export default {
] ]
}; };
myChart.setOption(option); myChart.setOption(option);
//
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
getFillJvmInfo() { getFillJvmInfo() {
fillJvmInfo().then(res => { fillJvmInfo().then(res => {
@ -491,9 +484,6 @@ export default {
] ]
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
} }
}, },
} }

View File

@ -175,14 +175,13 @@ export default {
}) })
}, },
handleTaskChange(value) { handleTaskChange(value) {
var curTask = this.allTask.filter(item => item.id == value)[0] var curTask = this.allTask.filter(item => item.id == value)
if (curTask) {
const start = moment(curTask.startTime) const start = moment(curTask.startTime)
const end = moment(curTask.endTime) const end = moment(curTask.endTime)
this.defaultTime.push(start, end) this.defaultTime.push(start, end)
this.tableParams.startTime = start.format(this.dateFormat); this.tableParams.startTime = start.format(this.dateFormat);
this.tableParams.endTime = end.format(this.dateFormat) this.tableParams.endTime = end.format(this.dateFormat)
}
}, },
calculateScrollY() { calculateScrollY() {
// //

View File

@ -3,59 +3,47 @@
<a-row :gutter="20"> <a-row :gutter="20">
<a-col :md="12" :sm="1" style="height:calc(50vh - 125px);"> <a-col :md="12" :sm="1" style="height:calc(50vh - 125px);">
<div class="linese"></div> <div class="linese"></div>
<div class="echartsTitle"> <div class="echartsTitle"><div class="ecicon"></div>数据清洗差异统计</div>
<div class="ecicon"></div>数据清洗差异统计 <div id="cleaningVariance" class="cleaningVariance" ref="cleaningVariance" style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
</div>
<div id="cleaningVariance" class="cleaningVariance" ref="cleaningVariance"
style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
<div class="linese"></div> <div class="linese"></div>
</a-col> </a-col>
<a-col :md="12" :sm="2" style="height:calc(50vh - 125px);"> <a-col :md="12" :sm="2" style="height:calc(50vh - 125px);">
<div class="linese"></div> <div class="linese"></div>
<div class="echartsTitle"> <div class="echartsTitle"><div class="ecicon"></div>数据编目总量统计</div>
<div class="ecicon"></div>数据编目总量统计 <div id="totalNumberCatalogues" class="totalNumberCatalogues" ref="totalNumberCatalogues" style="width: 100%;background:#e6e9f1; height: calc(100% - 70px); "></div>
</div>
<div id="totalNumberCatalogues" class="totalNumberCatalogues" ref="totalNumberCatalogues"
style="width: 100%;background:#e6e9f1; height: calc(100% - 70px); "></div>
<div class="linese"></div> <div class="linese"></div>
</a-col> </a-col>
<a-col :md="12" :sm="3" style="height:calc(50vh - 125px);"> <a-col :md="12" :sm="3" style="height:calc(50vh - 125px);">
<div class="linese"></div> <div class="linese"></div>
<div class="echartsTitle"> <div class="echartsTitle"><div class="ecicon"></div>数据类型存储占比统计</div>
<div class="ecicon"></div>数据类型存储占比统计 <div id="catalogingStorage" class="catalogingStorage" ref="catalogingStorage" style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
</div>
<div id="catalogingStorage" class="catalogingStorage" ref="catalogingStorage"
style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
<div class="linese"></div> <div class="linese"></div>
</a-col> </a-col>
<a-col :md="12" :sm="4" style="height:calc(50vh - 125px);"> <a-col :md="12" :sm="4" style="height:calc(50vh - 125px);">
<div class="linese"></div> <div class="linese"></div>
<div class="echartsTitle"> <div class="echartsTitle"><div class="ecicon"></div>数据编目存储占比统计</div>
<div class="ecicon"></div>数据编目存储占比统计 <div id="typeStorage" class="typeStorage" ref="typeStorage" style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
</div>
<div id="typeStorage" class="typeStorage" ref="typeStorage"
style="width: 100%;background:#e6e9f1; height: calc(100% - 70px);"></div>
<div class="linese"></div> <div class="linese"></div>
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
</template> </template>
<script> <script>
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import JEllipsis from "@/components/jeecg/JEllipsis"; import JEllipsis from "@/components/jeecg/JEllipsis";
export default { export default {
name: "statistics", name: "statistics",
components: { components: {
JEllipsis JEllipsis
}, },
data() { data () {
return { return {
description: '数据统计', description: '数据统计',
cleaningVarianceData: [], cleaningVarianceData:[],
totalNumberCataloguesData: [], totalNumberCataloguesData:[],
catalogingStorageData: [], catalogingStorageData:[],
typeStorage: [] typeStorage:[]
} }
}, },
mounted() { mounted() {
@ -65,46 +53,46 @@ export default {
}, },
destroyed: function () { destroyed: function () {
}, },
created() { created () {
}, },
methods: { methods: {
dataAdd() { dataAdd(){
}, },
getselect() { getselect(){
}, },
getTables() { getTables(){
this.cleaningVarianceData = [['product', '贴源库', '集成库']]; this.cleaningVarianceData =[['product', '贴源库', '集成库']];
getAction("/dataAnalysis/getClnDiffStats", {}).then((res) => { getAction("/dataAnalysis/getClnDiffStats",{}).then((res)=>{
if (res.success) { if(res.success){
res.result.schemaNames.forEach(row => { res.result.schemaNames.forEach(row => {
this.cleaningVarianceData.push([row, parseInt(res.result.numRowOriMap[row]), parseInt(res.result.numRowStaMap[row])]) this.cleaningVarianceData.push([row, parseInt(res.result.numRowOriMap[row]),parseInt(res.result.numRowStaMap[row]) ])
}) })
this.getcleaningVariance(); this.getcleaningVariance();
} }
}); });
this.totalNumberCataloguesData = []; this.totalNumberCataloguesData =[];
getAction("/dataAnalysis/getTagStats", {}).then((res) => { getAction("/dataAnalysis/getTagStats",{}).then((res)=>{
if (res.success) { if(res.success){
res.result.tagNames.forEach(row => { res.result.tagNames.forEach(row => {
this.totalNumberCataloguesData.push([row, parseInt(res.result.tagNumRow[row])]) this.totalNumberCataloguesData.push([row, parseInt(res.result.tagNumRow[row]) ])
}) })
this.gettotalNumberCatalogues(); this.gettotalNumberCatalogues();
} }
}); });
this.catalogingStorageData = []; this.catalogingStorageData =[];
getAction("/dataAnalysis/getDataTypeAnalysis", {}).then((res) => { getAction("/dataAnalysis/getDataTypeAnalysis",{}).then((res)=>{
if (res.success) { if(res.success){
res.result.typeName.forEach(row => { res.result.typeName.forEach(row => {
this.catalogingStorageData.push({ value: parseInt(res.result.numRowMap[row]), name: row }) this.catalogingStorageData.push({ value: parseInt(res.result.numRowMap[row]), name: row })
}) })
this.getcatalogingStorage(); this.getcatalogingStorage();
} }
}); });
this.typeStorage = [] this.typeStorage =[]
getAction("/dataAnalysis/getTagNumRowStats", {}).then((res) => { getAction("/dataAnalysis/getTagNumRowStats",{}).then((res)=>{
if (res.success) { if(res.success){
res.result.tagNames.forEach(row => { res.result.tagNames.forEach(row => {
this.typeStorage.push({ value: parseInt(res.result.tagNumRow[row]), name: row }) this.typeStorage.push({ value: parseInt(res.result.tagNumRow[row]), name: row })
}) })
@ -112,45 +100,45 @@ export default {
} }
}); });
}, },
getcleaningVariance() { getcleaningVariance(){
var myChart = this.$echarts.init(this.$refs.cleaningVariance); var myChart = this.$echarts.init(this.$refs.cleaningVariance);
var option = { var option = {
tooltip: {}, tooltip: {},
grid: { grid:{
left: '80px', left:'80px',
right: '20px', right:'20px',
top: '20px', top:'20px',
bottom: '30px' bottom:'30px'
}, },
xAxis: { xAxis: {
type: 'category', type: 'category' ,
axisLabel: { axisLabel:{
color: '#6C758B' color: '#6C758B'
}, },
splitLine: { splitLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
axisLine: { axisLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
}, },
yAxis: { yAxis: {
axisLabel: { axisLabel:{
color: '#6C758B' color: '#6C758B'
}, },
splitLine: { splitLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
axisLine: { axisLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
@ -160,71 +148,65 @@ export default {
}, },
// Declare several bar series, each will be mapped // Declare several bar series, each will be mapped
// to a column of dataset.source by default. // to a column of dataset.source by default.
series: [{ type: 'bar', barMaxWidth: 20, }, { type: 'bar', barMaxWidth: 20, }], series: [{ type: 'bar',barMaxWidth: 20, }, { type: 'bar',barMaxWidth: 20, }],
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color:['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
gettotalNumberCatalogues() { gettotalNumberCatalogues(){
var myChart = this.$echarts.init(this.$refs.totalNumberCatalogues); var myChart = this.$echarts.init(this.$refs.totalNumberCatalogues);
var option = { var option = {
tooltip: {}, tooltip: {},
dataset: { dataset: {
source: this.totalNumberCataloguesData source: this.totalNumberCataloguesData
}, },
grid: { grid:{
left: '40px', left:'40px',
right: '20px', right:'20px',
top: '20px', top:'20px',
bottom: '30px' bottom:'30px'
}, },
xAxis: { xAxis: {
type: 'category', type: 'category' ,
axisLabel: { axisLabel:{
color: '#6C758B' color: '#6C758B'
}, },
splitLine: { splitLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
axisLine: { axisLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
}, },
yAxis: { yAxis: {
axisLabel: { axisLabel:{
color: '#6C758B' color: '#6C758B'
}, },
splitLine: { splitLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
axisLine: { axisLine:{
lineStyle: { lineStyle:{
color: '#6C758B' color: '#6C758B'
} }
}, },
}, },
// Declare several bar series, each will be mapped // Declare several bar series, each will be mapped
// to a column of dataset.source by default. // to a column of dataset.source by default.
series: [{ type: 'bar', barMaxWidth: 30, }], series: [{ type: 'bar',barMaxWidth: 30, }],
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color:['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
getcatalogingStorage() { getcatalogingStorage(){
var myChart = this.$echarts.init(this.$refs.catalogingStorage); var myChart = this.$echarts.init(this.$refs.catalogingStorage);
var option = { var option = {
tooltip: { tooltip: {
@ -245,14 +227,11 @@ export default {
} }
} }
], ],
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color:['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
gettypeStorage() { gettypeStorage(){
var myChart = this.$echarts.init(this.$refs.typeStorage); var myChart = this.$echarts.init(this.$refs.typeStorage);
var option = { var option = {
tooltip: { tooltip: {
@ -273,16 +252,13 @@ export default {
} }
} }
], ],
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color:['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
} }
} }
</script> </script>
<style scoped> <style scoped>
@import '~@assets/less/common.less'; @import '~@assets/less/common.less';
</style> </style>

View File

@ -19,9 +19,9 @@
</a-row> </a-row>
</a-form> </a-form>
</div> </div>
<a-table ref="table" size="middle" style="height:calc(100vh - 343px);background:#e6e9f1;padding: 10px;" <a-table ref="table" size="middle" style="height:calc(100vh - 343px);background:#e6e9f1;padding: 10px;" bordered rowKey="id"
bordered rowKey="id" :custom-row="handleCustomRow" :columns="columns" :dataSource="dataSource" :custom-row="handleCustomRow"
@change="handleTableChange"> :columns="columns" :dataSource="dataSource" @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handleEdit(record)">选中</a> <a @click="handleEdit(record)">选中</a>
</span> </span>
@ -83,20 +83,18 @@
<div class="linese"></div> <div class="linese"></div>
<div class="linese"></div> <div class="linese"></div>
<a-row :gutter="20"> <a-row :gutter="20" >
<a-col :md="12" :sm="1" style="height:calc(100vh - 422px);"> <a-col :md="12" :sm="1" style="height:calc(100vh - 422px);">
<div class="echartsTitle"> <div class="echartsTitle">
<div class="ecicon"></div>数据总量统计 <div class="ecicon"></div>数据总量统计
</div> </div>
<div id="cleaningVariance" ref="cleaningVariance" <div id="cleaningVariance" ref="cleaningVariance" style="width: 100%; height: calc(100% - 31px);background:#e6e9f1;"></div>
style="width: 100%; height: calc(100% - 31px);background:#e6e9f1;"></div>
</a-col> </a-col>
<a-col :md="12" :sm="2" style="height:calc(100vh - 422px);padding-right:20px;"> <a-col :md="12" :sm="2" style="height:calc(100vh - 422px);padding-right:20px;">
<div class="echartsTitle"> <div class="echartsTitle">
<div class="ecicon"></div>数据类型存储占比统计 <div class="ecicon"></div>数据类型存储占比统计
</div> </div>
<div id="totalNumberCatalogues" ref="totalNumberCatalogues" <div id="totalNumberCatalogues" ref="totalNumberCatalogues" style="width: 100%; height: calc(100% - 31px);background:#e6e9f1;"></div>
style="width: 100%; height: calc(100% - 31px);background:#e6e9f1;"></div>
</a-col> </a-col>
</a-row> </a-row>
<div class="linese"></div> <div class="linese"></div>
@ -169,7 +167,7 @@ export default {
}, },
cleaningVariancesource: [], cleaningVariancesource: [],
totalNumberCataloguesData: [], totalNumberCataloguesData: [],
selectedRowId: null selectedRowId :null
} }
}, },
mounted() { mounted() {
@ -264,7 +262,7 @@ export default {
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#6C758B' color:'#6C758B'
} }
}, },
axisLine: { axisLine: {
@ -294,9 +292,6 @@ export default {
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
gettotalNumberCatalogues() { gettotalNumberCatalogues() {
var myChart = this.$echarts.init(this.$refs.totalNumberCatalogues); var myChart = this.$echarts.init(this.$refs.totalNumberCatalogues);
@ -322,9 +317,6 @@ export default {
color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'] color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc']
}; };
myChart.setOption(option); myChart.setOption(option);
window.addEventListener('resize', function () {
myChart.resize();
});
}, },
} }
} }
@ -349,12 +341,10 @@ export default {
.quarter-div .datanum { .quarter-div .datanum {
font-size: 26px; font-size: 26px;
} }
/* 高亮样式 */ /* 高亮样式 */
/deep/.row-highlight { /deep/.row-highlight {
background-color: #ffffff !important; background-color: #ffffff !important;
} }
.quarter-div .ant-col-8, .quarter-div .ant-col-8,
.quarter-div .ant-col-10 { .quarter-div .ant-col-10 {
text-align: center; text-align: center;