From b58adf14617cd852296bec9e1ca57978741c9f0a Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Tue, 20 Apr 2021 01:12:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop --- zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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 : [], -- Gitblit v1.9.1