2024-05-01报表提交

.env.dev

@@ -5,7 +5,8 @@ NODE_ENV = 'production'
 VUE_APP_TITLE = 捷道管理系统 - 测试版
 
 # 捷道管理系统/开发环境
-VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
+ VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+# VUE_APP_BASE_API = 'http://110.41.143.128:48080'
 # VUE_APP_BASE_API = '/api'
 
 # 路由懒加载

.env.development

@@ -6,7 +6,9 @@ VUE_APP_TITLE = 捷道管理系统-测试站
 
 # 捷道管理系统/开发环境
 
-VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+# VUE_APP_BASE_API = 'https://apitest.groupage.cn'
+# VUE_APP_BASE_API = 'http://110.41.143.128:48080'
+ VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/report/salesreport.js

@@ -27,6 +27,17 @@ export function SalesReportList(data) {
   })
 }
 
+//获取销售分析图表数据
+export function getEChartData(query) {
+  return request({
+    url: '/Report/SalesReport/getEChartData',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
 // 导出测试 Excel 2024-04-27
 export function exportTestExcel(query) {
   return request({

src/views/ecw/box/queryAir.vue

@@ -252,7 +252,7 @@ import cancelClear from "./cancelClear.vue";
 import { listUser } from "@/api/system/user";
 
 export default {
-  name: "boxDetail",
+  name: "EcwBoxBoxQueryAir",
   props: {
     shipmentId: String,
   },

src/views/report/customer_analysis/index.vue

@@ -256,6 +256,18 @@
         <el-button type="primary" size="mini" @click="test" v-show="false">
           测试
         </el-button>
+
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport2"
+          :loading="exportLoading"
+          v-show="false"
+        >
+          {{ $t("导出测试") }}</el-button
+        >
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="list">
@@ -663,13 +675,28 @@ export default {
           return exportExcel(this.queryParams);
         })
         .then((response) => {
-          //放入后台队列需要注释此行代码
           this.$download.excel(response, "客户分析报表.xls");
           this.exportLoading = false;
-          /*
+        })
+        .catch(() => {
+          this.exportLoading = false;
+        });
+    },
+    handleExport2() {
+      if (this.isRightPar() == false) return;
+      this.$modal
+        .confirm("是否确认导出所有数据项?")
+        .then(() => {
+          this.exportLoading = true;
+          return exportExcel(this.queryParams);
+        })
+        .then((response) => {
+          //放入后台队列需要注释此行代码
+          //this.$download.excel(response, "客户分析报表.xls");
+          this.exportLoading = false;
           this.$message.success(
             this.$t("已加入导出队列，请稍后在下载日志中下载")
-          );*/
+          );
         })
         .catch(() => {
           this.exportLoading = false;