src/views/data/statistics.vue

@@ -40,10 +40,6 @@
       data () {
         return {
           description: '数据统计',
-          cleaningVarianceData:[],
-          totalNumberCataloguesData:[],
-          catalogingStorageData:[],
-          typeStorage:[]
         }
       },
       mounted() { 
@@ -63,42 +59,10 @@
 
         },
         getTables(){
-            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);
@@ -144,7 +108,16 @@
                     },
                 },
                 dataset: {
-                    source: this.cleaningVarianceData
+                    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]
+                    ]
                 },
                 // Declare several bar series, each will be mapped
                 // to a column of dataset.source by default.
@@ -158,7 +131,15 @@
           var option = {
                 tooltip: {},
                 dataset: {
-                    source: this.totalNumberCataloguesData
+                    source: [
+                        ['product', ''],
+                        ['侦察预警', 43.3],
+                        ['指挥控制', 83.1],
+                        ['火力打击', 86.4],
+                        ['支援保障', 72.4],
+                        ['装备运行状态', 72.4],
+                        ['作战环境', 72.4]
+                    ]
                 },
                 grid:{
                     left:'40px',
@@ -217,7 +198,15 @@
                 name: '占比',
                 type: 'pie',
                 radius: '80%',
-                data: this.catalogingStorageData,
+                data: [
+                    { value: 1048, name: '平台' },
+                    { value: 735, name: '编队' },
+                    { value: 580, name: '航空兵' },
+                    { value: 484, name: '陆战队' },
+                    { value: 300, name: '作战' },
+                    { value: 735, name: '反潜' },
+                    { value: 580, name: '舰炮' }
+                ],
                 emphasis: {
                     itemStyle: {
                     shadowBlur: 10,
@@ -242,7 +231,14 @@
                 name: '占比',
                 type: 'pie',
                 radius: '80%',
-                data: this.typeStorage,
+                data: [
+                    { value: 1048, name: '侦察预警' },
+                    { value: 735, name: '指挥控制' },
+                    { value: 580, name: '火力打击' },
+                    { value: 484, name: '支援保障' },
+                    { value: 300, name: '装备运行状态' },
+                    { value: 300, name: '作战环境' }
+                ],
                 emphasis: {
                     itemStyle: {
                     shadowBlur: 10,

src/views/task/statistics.vue

@@ -14,7 +14,7 @@
                         </a-col>
                         <a-col :md="6" :sm="10" >
                             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                                <a-button @click="loadData" type="primary" v-has="'cont:btn'" icon="search">查询</a-button>
+                                <a-button @click="handleAdd" type="primary" v-has="'cont:btn'" icon="search">查询</a-button>
                             </span>
                         </a-col>
                     </a-row>
@@ -27,11 +27,7 @@
                     bordered
                     rowKey="id"
                     :columns="columns"
-                    :dataSource="dataSource"
+                    :dataSource="dataSource">
-                    @change="handleTableChange">
-                    <span slot="action" slot-scope="text, record">
-                        <a @click="handleEdit(record)">选中</a>
-                    </span>
                 </a-table>
                 
             <div class="linese"></div>
@@ -47,7 +43,7 @@
                                     <img src="~@/assets/img/icon-结构化数据条数.png" />
                                 </a-col>
                                 <a-col :span="16">
-                                    <div class="datanum">{{fileNum.totalNumRow}}</div>
+                                    <div class="datanum">9694</div>
                                     <div>结构化数据条数</div>
                                 </a-col>
                         </a-col>
@@ -56,7 +52,7 @@
                                     <img src="~@/assets/img/icon非结构化文件大小.png" />
                                 </a-col>
                                 <a-col :span="16">
-                                    <div class="datanum">{{fileNum.totalFileSize}}GB</div>
+                                    <div class="datanum">10.92GB</div>
                                     <div>非结构化文件(大小)</div>
                                 </a-col>
                         </a-col>
@@ -65,7 +61,7 @@
                                     <img src="~@/assets/img/icon-表数量.png" />
                                 </a-col>
                                 <a-col :span="14">
-                                    <div class="datanum">{{fileNum.tableCount}}</div>
+                                    <div class="datanum">22</div>
                                     <div>表数量</div>
                                 </a-col>
                         </a-col>
@@ -74,7 +70,7 @@
                                     <img src="~@/assets/img/icon-文件接引数量.png" />
                                 </a-col>
                                 <a-col :span="14">
-                                    <div class="datanum">{{ fileNum.fileLinkCount }}</div>
+                                    <div class="datanum">7</div>
                                     <div>文件接引数量</div>
                                 </a-col>
                         </a-col>
@@ -83,7 +79,7 @@
                                     <img src="~@/assets/img/icon-文档数量.png" />
                                 </a-col>
                                 <a-col :span="14">
-                                    <div class="datanum">{{ fileNum.docFileCount }}</div>
+                                    <div class="datanum">5</div>
                                     <div>文档数量</div>
                                 </a-col>
                         </a-col>
@@ -93,7 +89,7 @@
                 <div class="linese"></div>
                 <div class="linese"></div>
                 <a-row :gutter="20">
-                    <a-col :md="12" :sm="1" style="height:calc(100vh - 420px);">
+                    <a-col :md="12" :sm="2" style="height:calc(100vh - 420px);">
                         <div class="echartsTitle"><div class="ecicon"></div>数据清洗差异统计</div>
                         <div id="cleaningVariance" ref="cleaningVariance" style="width: 100%; height: calc(100% - 36px);background:rgb(8,34,52);"></div>
                     </a-col>
@@ -111,11 +107,13 @@
   <script>
     import { shipModelPageList,
         shipModeldeleteById } from '@/api/ship'
-    import { getDataAnalysis,
+    import { taskCreate,
+        taskUpdateById,
+        taskQueryById,
         taskPageList,
-        getTaskDataTypeAnalysis } from '@/api/task'
+        taskDistributeTask,
+        taskDeleteById } from '@/api/task'
    import { getAction } from '@/api/manage'
-
    import JEllipsis from "@/components/jeecg/JEllipsis";
    export default {
       name: "statistics",
@@ -125,11 +123,10 @@
       data () {
         return {
           description: '任务统计',
-          dataSource: [],
+          dataSources: [],
           queryParam: {
             pageNum :1,
-            pageSize:20,
+            pageSize:20
-            name:""
           },
           columns: [
             {
@@ -159,19 +156,11 @@
                 width:180,
                 scopedSlots: { customRender: 'action' },
             }
-          ],
+          ]
-          fileNum:{
-            totalNumRow:0,
-            tableCount:0,
-            docFileCount:0,
-            totalFileSize:0,
-            fileLinkCount:0
-          },
-          cleaningVariancesource:[],
-          totalNumberCataloguesData:[]
         }
       },
       mounted() { 
+         this.getTables()
          this.loadData();
       },
       computed: {
@@ -183,53 +172,28 @@
   
       },
       methods: {
-        handleTableChange(pagination, filters, sorter) {
+        dataAdd(){
-            if (Object.keys(sorter).length > 0) {
-            this.isorter.column = sorter.field;
-            this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
-            }
-            this.ipagination = pagination;
-            this.loadData();
         },
-        handleEdit(value){
+        getselect(){
-            this.cleaningVariancesource =[];
+
-            getDataAnalysis({taskId:value.id,startDate:value.startTime,endDate:value.endTime}).then((res) => {
-                if (res.success) {
-                   res.result.schemaNames.forEach(row => {
-                    this.cleaningVariancesource.push([row, parseInt(res.result.numRowMap[row]) ])
-                   })
-                   this.fileNum.totalNumRow = res.result.totalNumRow
-                   this.fileNum.tableCount = res.result.tableCount
-                   this.fileNum.docFileCount = res.result.docFileCount
-                   this.fileNum.totalFileSize = res.result.totalFileSize
-                   this.fileNum.fileLinkCount = res.result.fileLinkCount
-                   this.getcleaningVariance();
-                } else {
-                    this.$message.warning(res.message);
-                }
-            });
-            this.totalNumberCataloguesData =[]
-            getTaskDataTypeAnalysis({taskId:value.id,startDate:value.startTime,endDate:value.endTime}).then((res) => {
-                if (res.success) {
-                   res.result.typeName.forEach(row => {
-                    this.totalNumberCataloguesData.push({ value: parseFloat(res.result.numRowMap[row]), name: row })
-                   })
-                   this.gettotalNumberCatalogues();
-                } else {
-                    this.$message.warning(res.message);
-                }
-            });
         },
         loadData() {
             taskPageList(this.queryParam).then((res) => {
                 if (res.success) {
                     this.dataSource = res.result.rows||res.result;
-                    this.handleEdit(res.result.rows[0]);
+                    if(res.result.total)
+                    {
+                    this.ipagination.total = res.result.total;
+                    }
                 } else {
                     this.$message.warning(res.message);
                 }
             });
         },
+        getTables(){
+            this.getcleaningVariance();
+            this.gettotalNumberCatalogues();
+        },
         getcleaningVariance(){
           var myChart = this.$echarts.init(this.$refs.cleaningVariance);
           var option = {
@@ -242,7 +206,16 @@
                     bottom:'20px'
                 },
                 dataset: {
-                    source: this.cleaningVariancesource
+                    source: [
+                        ['product', '', ],
+                        ['平台', 43.3],
+                        ['编队', 83.1],
+                        ['航空兵', 86.4],
+                        ['陆战队', 72.4],
+                        ['作战', 72.4],
+                        ['反潜', 72.4],
+                        ['舰炮', 72.4]
+                    ]
                 },
                 xAxis: { 
                     type: 'category', 
@@ -293,7 +266,15 @@
                 name: '占比',
                 type: 'pie',
                 radius: '80%',
-                data: this.totalNumberCataloguesData,
+                data: [
+                    { value: 1048, name: '平台' },
+                    { value: 735, name: '编队' },
+                    { value: 580, name: '航空兵' },
+                    { value: 484, name: '陆战队' },
+                    { value: 300, name: '作战' },
+                    { value: 735, name: '反潜' },
+                    { value: 580, name: '舰炮' }
+                ],
                 emphasis: {
                     itemStyle: {
                     shadowBlur: 10,