From bb19de346ca04207a736a638ab796b00ee4f6256 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 13 Apr 2021 23:42:17 +0800
Subject: [PATCH] 表格导出类别接口名称修改，包裹新增导出报表

---
 src/api/report/report.js    |   34 ++++++++--------
 src/api/parcel/parcel.js    |   12 ++++++
 src/views/parcel/parcel.vue |   27 +++++++++++++
 3 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/src/api/parcel/parcel.js b/src/api/parcel/parcel.js
index ac672c8..3a5376a 100644
--- a/src/api/parcel/parcel.js
+++ b/src/api/parcel/parcel.js
@@ -32,4 +32,16 @@
             imgUrl
         }
     })
+}
+
+export const exportParcelStatis = (current, size, params) => {
+    return request({
+        url: '/api/blade-jfpts/parcel/parcel/export-parcelStatis',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
 }
\ No newline at end of file
diff --git a/src/api/report/report.js b/src/api/report/report.js
index 19705ff..16b8d6c 100644
--- a/src/api/report/report.js
+++ b/src/api/report/report.js
@@ -1,22 +1,22 @@
 import request from '@/router/axios';
 
 export const getList = (current, size, params) => {
-  return request({
-    url: '/api/blade-report/report/rest/list',
-    method: 'get',
-    params: {
-      ...params,
-      current,
-      size,
-    }
-  })
+    return request({
+        url: '/api/blade-report/report/rest/page',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        }
+    })
 }
 export const remove = (ids) => {
-  return request({
-    url: '/api/blade-report/report/rest/remove',
-    method: 'post',
-    params: {
-      ids,
-    }
-  })
-}
+    return request({
+        url: '/api/blade-report/report/rest/remove',
+        method: 'post',
+        params: {
+            ids,
+        }
+    })
+}
\ No newline at end of file
diff --git a/src/views/parcel/parcel.vue b/src/views/parcel/parcel.vue
index 50df040..95907ea 100644
--- a/src/views/parcel/parcel.vue
+++ b/src/views/parcel/parcel.vue
@@ -40,6 +40,13 @@
                       icon="el-icon-download"
                       @click="handleExport">导出
           </el-button>
+          
+          <el-button type="warning"
+                      size="small"
+                      plain
+                      icon="el-icon-download"
+                      @click="handleExportStatis">导出报表
+          </el-button>
         </template>
 
     </avue-crud>
@@ -57,7 +64,7 @@
 </template>
 
 <script>
-  import {getList, getDetail, getParcelPic} from "@/api/parcel/parcel";
+  import {getList,exportParcelStatis, getParcelPic} from "@/api/parcel/parcel";
   import {mapGetters} from "vuex";
   import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 
@@ -296,6 +303,24 @@
           window.open(`/api/blade-jfpts/parcel/parcel/export-parcel?startTime=${this.$route.query.startTime}&endTime=${this.$route.query.endTime}&decisioDiagramResult=${this.$route.query.decisioDiagramResult}`);
         });
       },
+      //数据报表导出
+      handleExportStatis() {
+        this.$confirm("是否导出用户数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          const data = {
+              begTime:this.$route.query.startTime,
+              endTime:this.$route.query.endTime,
+              type:this.$route.query.type,
+              timeDesc:this.$route.query.timeDesc
+          }
+          exportParcelStatis(data)(res=>{
+            
+          })
+        });
+      },
       onLoad(page, params = {}) {
         const { dateTime } = this.query;
         let values = {

--
Gitblit v1.9.3