diff --git a/src/views/data/dataCleansing.vue b/src/views/data/dataCleansing.vue index 9bf961c..f7de376 100644 --- a/src/views/data/dataCleansing.vue +++ b/src/views/data/dataCleansing.vue @@ -67,7 +67,9 @@ percent:0, websock:{}, queryParam: { - datatype:"" + datatype:"", + pageNum :1, + pageSize:9999999, }, dataTypedataSources: [], dataSource:[ diff --git a/src/views/data/dataManage.vue b/src/views/data/dataManage.vue index a2400a4..3f94e74 100644 --- a/src/views/data/dataManage.vue +++ b/src/views/data/dataManage.vue @@ -73,7 +73,9 @@ percent:0, websock:{}, queryParam: { - datatype:"" + datatype:"", + pageNum :1, + pageSize:9999999, }, dataTypedataSources: [], dataSource:[ diff --git a/src/views/data/statistics.vue b/src/views/data/statistics.vue index 3f93d1a..d843752 100644 --- a/src/views/data/statistics.vue +++ b/src/views/data/statistics.vue @@ -30,10 +30,14 @@ data () { return { description: '数据统计', + cleaningVarianceData:[], + totalNumberCataloguesData:[], + catalogingStorageData:[], + typeStorage:[] } }, mounted() { - this.getTables() + this.getTables() }, computed: { }, @@ -44,15 +48,44 @@ }, methods: { dataAdd(){ - }, - getselect(){ - }, getTables(){ - this.getcleaningVariance(); - this.gettotalNumberCatalogues(); - this.getcatalogingStorage(); - this.gettypeStorage(); + this.cleaningVarianceData =[['product', '原始库', '标准库']]; + getAction("/dataAnalysis/getClnDiffStats",{}).then((res)=>{ + if(res.success){ + res.result.schemaNames.forEach(row => { + this.cleaningVarianceData.push([row, parseInt(res.result.numRowOriMap[row]),parseInt(res.result.numRowStaMap[row]) ]) + }) + this.getcleaningVariance(); + } + }); + this.totalNumberCataloguesData =[]; + getAction("/dataAnalysis/getTagStats",{}).then((res)=>{ + if(res.success){ + res.result.tagNames.forEach(row => { + this.totalNumberCataloguesData.push([row, parseInt(res.result.tagNumRow[row]) ]) + }) + this.gettotalNumberCatalogues(); + } + }); + this.catalogingStorageData =[]; + getAction("/dataAnalysis/getDataTypeAnalysis",{}).then((res)=>{ + if(res.success){ + res.result.typeName.forEach(row => { + this.catalogingStorageData.push({ value: parseInt(res.result.numRowMap[row]), name: row }) + }) + this.getcatalogingStorage(); + } + }); + this.typeStorage =[] + getAction("/dataAnalysis/getTagNumRowStats",{}).then((res)=>{ + if(res.success){ + res.result.tagNames.forEach(row => { + this.typeStorage.push({ value: parseInt(res.result.tagNumRow[row]), name: row }) + }) + this.gettypeStorage(); + } + }); }, getcleaningVariance(){ var myChart = this.$echarts.init(this.$refs.cleaningVariance); @@ -66,16 +99,7 @@ }, tooltip: {}, dataset: { - source: [ - ['product', '原始库', '标准库'], - ['平台', 43.3, 85.8], - ['编队', 83.1, 73.4], - ['航空兵', 86.4, 65.2], - ['陆战队', 72.4, 53.9], - ['作战', 72.4, 53.9], - ['反潜', 72.4, 53.9], - ['舰炮', 72.4, 53.9] - ] + source: this.cleaningVarianceData }, xAxis: { type: 'category' }, yAxis: {}, @@ -97,15 +121,7 @@ left: 'center'}, tooltip: {}, dataset: { - source: [ - ['product', ''], - ['侦察预警', 43.3], - ['指挥控制', 83.1], - ['火力打击', 86.4], - ['支援保障', 72.4], - ['装备运行状态', 72.4], - ['作战环境', 72.4] - ] + source: this.totalNumberCataloguesData }, xAxis: { type: 'category' }, yAxis: {}, @@ -135,12 +151,7 @@ name: '占比', type: 'pie', radius: '50%', - data: [ - { value: 1048, name: '文档' }, - { value: 735, name: '视频' }, - { value: 580, name: '音频' }, - { value: 484, name: '结构化数据' }, - ], + data: this.catalogingStorageData, emphasis: { itemStyle: { shadowBlur: 10, @@ -173,14 +184,7 @@ name: '占比', type: 'pie', radius: '50%', - data: [ - { value: 1048, name: '侦察预警' }, - { value: 735, name: '指挥控制' }, - { value: 580, name: '火力打击' }, - { value: 484, name: '支援保障' }, - { value: 300, name: '装备运行状态' }, - { value: 300, name: '作战环境' } - ], + data: this.typeStorage, emphasis: { itemStyle: { shadowBlur: 10, diff --git a/src/views/task/statistics.vue b/src/views/task/statistics.vue index 3b2ce12..8b8f1ae 100644 --- a/src/views/task/statistics.vue +++ b/src/views/task/statistics.vue @@ -215,13 +215,13 @@ taskPageList(this.queryParam).then((res) => { if (res.success) { this.dataSource = res.result.rows||res.result; + this.handleEdit(res.result.rows[0]); } else { this.$message.warning(res.message); } }); }, getTables(){ - this.gettotalNumberCatalogues(); }, getcleaningVariance(){