From f935e297274e5e75b5c16be62d14b000007ef832 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 15:08:48 +0800
Subject: [PATCH] Merge branch 'api' into hive2.0
---
zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
index f5a1f04..2cbe29c 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html
@@ -121,7 +121,7 @@
</div>
<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
-<script type="text/javascript" th:src="@{/plugin/echarts/echarts.all.js}"></script>
+<script type="text/javascript" th:src="@{/plugin/echarts/echarts.min.js}"></script>
<script type="text/javascript" th:src="@{/plugin/echarts/macarons.js}"></script>
<script type="text/javascript" th:src="@{/plugin/dateformat.js}"></script>
<script type="text/javascript" th:src="@{/plugin/StringUtil.js}"></script>
@@ -141,12 +141,12 @@
var myChart1 = echarts.init(document.getElementById('echarts-line-chart1'), 'macarons');
var myChart2 = echarts.init(document.getElementById('echarts-line-chart2'), 'macarons');
var myChart3 = echarts.init(document.getElementById('echarts-line-chart3'), 'macarons');
- /*
- 点击事件
- myChart1.on('click', function (params) {
- console.log(params);
- });
-*/
+ /*
+ 点击事件
+ myChart1.on('click', function (params) {
+ console.log(params);
+ });
+ */
// 指定图表的配置项和数据
function getption() {
return {
@@ -166,7 +166,10 @@
}
},
tooltip: {
- trigger: 'axis'
+ trigger: 'axis',
+ axisPointer: {
+ type: 'shadow'
+ }
},
xAxis: {
type: 'category',
--
Gitblit v1.9.1