From fd4948ce4d936ca72baad4a076a9661f2a4b4fb9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Dec 2020 14:07:11 +0800
Subject: [PATCH] Merge branch 'master' into test

---
 zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html        |    2 
 /dev/null                                                                           |    0 
 zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html |   12 +++---
 zq-erp/src/main/resources/static/js/systools/ChartsUtils.js                         |   56 +++++++++++++++++++++++++++
 zq-erp/pom.xml                                                                      |    1 
 zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html |    2 
 zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html    |    2 
 zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java     |    9 +++-
 zq-erp/src/main/resources/static/templates/vipProjUse.xls                           |    0 
 zq-erp/src/main/resources/static/templates/vipInfoImport.xls                        |    0 
 10 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index baa6aa5..1898a84 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -374,6 +374,7 @@
                     <include>**/*.woff</include>
                     <include>**/*.woff2</include>
                     <include>**/*.ttf</include>
+                    <include>**/*.xls</include>
                 </includes>
             </resource>
             <resource>
diff --git a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
index c25461f..69a4dc0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
+++ b/zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java
@@ -4,6 +4,7 @@
 import com.matrix.core.pojo.AjaxResult;
 import com.matrix.core.tools.WebUtil;
 import com.matrix.system.common.bean.SysUsers;
+import com.matrix.system.common.tools.DataAuthUtil;
 import com.matrix.system.hive.bean.SysShopInfo;
 import com.matrix.system.hive.dao.SysShopInfoDao;
 import com.matrix.system.hiveErp.analysUtil.*;
@@ -112,8 +113,12 @@
 
         //获取所有门店
         SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);
-        List<SysShopInfo> shops= shopInfoDao.selectShopInfo(user.getCompanyId());
-
+        List<SysShopInfo> shops=null;
+        if(DataAuthUtil.hasAllShopAuth()){
+            shops= shopInfoDao.selectShopInfo(user.getCompanyId());
+        }else{
+            shops=Arrays.asList(shopInfoDao.selectById(user.getShopId()));
+        }
         //定义数据项内容
         List<SeriesVo> series=new ArrayList<>();
 
diff --git a/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js b/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
index 93a7553..cb5a624 100644
--- a/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
+++ b/zq-erp/src/main/resources/static/js/systools/ChartsUtils.js
@@ -11,7 +11,6 @@
     this.$unitSelect = $("#unitSelect");
     //记录当前视图的格式化字符串
     this.dateFmt = "";
-
     //绑定搜索事件
     $('#serach').on("click",{charts:this},this.updateChartsDate);
     //时间单位选择变化
@@ -119,3 +118,58 @@
         event.data.charts.loadChartData();
     }
 }
+
+/**
+ *指定图表的配置项和数据
+  */
+ChartsUtils.prototype.getption=function(title) {
+    return {
+        title: {
+            text: title,
+            padding: 20
+        },
+        legend: {},
+        toolbox: {
+            show: true,
+            feature: {
+                mark: {show: true},
+                dataView: {show: true, readOnly: false},
+                magicType: {show: true, type: ['line', 'bar']},
+                restore: {show: true},
+                saveAsImage: {show: true}
+            }
+        },
+        tooltip: {
+            trigger: 'axis'
+        },
+        xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            axisLabel: {
+                rotate: 30
+            },
+            splitLine: {
+                show: false,
+            },
+            data: []
+        },
+        yAxis: {
+            type: 'value'
+        },
+        dataZoom: [
+            {
+                id: 'dataZoomX',
+                type: 'slider',
+                xAxisIndex: [0],
+                filterMode: 'filter'
+            }
+        ],
+        animation: true,
+        animationDuration: 1000,
+        animationDurationUpdate: 1000,
+        animationEasing: 'linear',
+        animationEasingUpdate: 'linear',
+    }
+
+};
+
diff --git a/zq-erp/src/main/resources/static/templates/vipInfoImport.xls b/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
new file mode 100644
index 0000000..1f0f4c4
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipInfoImport.xls
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipInfoImport.zip b/zq-erp/src/main/resources/static/templates/vipInfoImport.zip
deleted file mode 100644
index 9ec34e2..0000000
--- a/zq-erp/src/main/resources/static/templates/vipInfoImport.zip
+++ /dev/null
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipProjUse.xls b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
new file mode 100644
index 0000000..46f3c7d
--- /dev/null
+++ b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
Binary files differ
diff --git a/zq-erp/src/main/resources/static/templates/vipProjUse.zip b/zq-erp/src/main/resources/static/templates/vipProjUse.zip
deleted file mode 100644
index ed6d3b7..0000000
--- a/zq-erp/src/main/resources/static/templates/vipProjUse.zip
+++ /dev/null
Binary files differ
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 53c9190..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
@@ -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 {
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 3f879e8..cb72dd9 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
@@ -208,7 +208,7 @@
 		};
 		
 		
-		function exportExcelexportExcel(){
+		function exportExcel(){
 
 			var param=MForm.toUrlParam("#serchform");
 
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
index 4e81bf8..b81c8ec 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/projUseImport-form.html
@@ -121,7 +121,7 @@
 
 
 	function download() {
-		window.location.href=basePath + "/templates/vipProjUse.zip";
+		window.location.href=basePath + "/templates/vipProjUse.xls";
 	}
 </script>
 </body>
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
index 464bbaa..54e6eb3 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/vip/vipImport-form.html
@@ -121,7 +121,7 @@
 
 
 	function download() {
-		window.location.href=  "https://filehive2.jyymatrix.cc/uploadeFile/vipInfoImport.zip";
+		window.location.href=  "https://filehive2.jyymatrix.cc/uploadeFile/vipInfoImport.xls";
 	}
 </script>
 </body>

--
Gitblit v1.9.1