From 77175105d07b8da9d745e0cf35ef05eeef600510 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 16 Apr 2021 09:51:12 +0800
Subject: [PATCH] 优化页面
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html | 2 --
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 5 ++++-
zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html | 2 --
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
index 83c8a58..010a1a8 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html
@@ -93,8 +93,6 @@
url : basePath+"/admin/sysBusinessData/findDailySaleData",
showExport : true,
showFooter : false,
- height:'auto',
- width:'auto',
exportDataType : "basic", //basic', 'all', 'selected'.
exportTypes : [ 'excel', 'xlsx' ], //导出类型
exportOptions : {
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
index f19c967..611e200 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
@@ -100,7 +100,9 @@
</el-row>
<el-row class="table-style">
- <el-table :data="tableData" style="width: 100%">
+ <el-table :data="tableData"
+ :height="height"
+ style="width: 100%">
<el-table-column type="index" width="30"></el-table-column>
<el-table-column prop="datatime" width="150" label="时间"></el-table-column>
<el-table-column prop="orderNo" width="180" label="订单编号">
@@ -158,6 +160,7 @@
customColumns : [],
shopList : [],
achieveUsers : [],
+ height:'calc(100vh - 240px)',
years : [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021],
months : ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
days : [],
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html
index 33f01ce..7541632 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html
@@ -93,8 +93,6 @@
url : basePath+"/admin/sysBusinessData/findDailySaleData",
showExport : true,
showFooter : false,
- height:'auto',
- width:'auto',
exportDataType : "basic", //basic', 'all', 'selected'.
exportTypes : [ 'excel', 'xlsx' ], //导出类型
exportOptions : {
--
Gitblit v1.9.1