From 74ca49871c6edbd47c2014de126fee0d6971f760 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Dec 2020 10:19:23 +0800
Subject: [PATCH] Merge branch 'hive2.0' of https://gitee.com/jyyforjava/zq-erp into hive2.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 | 7 +++
zq-erp/src/main/resources/config/lhx/application.properties | 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/java/com/matrix/config/RabbitMqConfig.java | 3 +
7 files changed, 78 insertions(+), 11 deletions(-)
diff --git a/zq-erp/pom.xml b/zq-erp/pom.xml
index cabffab..9534212 100644
--- a/zq-erp/pom.xml
+++ b/zq-erp/pom.xml
@@ -53,6 +53,12 @@
<env>xcx</env>
</properties>
</profile>
+ <profile>
+ <id>lhx</id>
+ <properties>
+ <env>lhx</env>
+ </properties>
+ </profile>
</profiles>
<dependencies>
@@ -367,6 +373,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/config/RabbitMqConfig.java b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
index 6ff44d6..c2fd404 100644
--- a/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
+++ b/zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java
@@ -4,6 +4,7 @@
import com.matrix.component.rabbitmq.MqTask;
import com.matrix.component.rabbitmq.RabiitMqTemplate;
import com.matrix.component.rabbitmq.RabiitMqTemplateFactory;
+import com.matrix.core.tools.LogUtil;
import com.matrix.system.shopXcx.mqTask.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -56,7 +57,7 @@
@Bean
public RabiitMqTemplate rabiitMqTemplate() throws IOException {
-
+ LogUtil.info("rabbitmq: {}, {}, {}, {}", host, port, username, password);
RabiitMqTemplate rabiitMqTemplate = RabiitMqTemplateFactory.buildTemplate(host, port, username, password);
//声明一个交换机
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/config/lhx/application.properties b/zq-erp/src/main/resources/config/lhx/application.properties
index cf6a730..95b0bd7 100644
--- a/zq-erp/src/main/resources/config/lhx/application.properties
+++ b/zq-erp/src/main/resources/config/lhx/application.properties
@@ -1,4 +1,4 @@
-evn=dev
+evn=lhx
server.port=8080
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/vipProjUse.xls b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
index 426d17d..46f3c7d 100644
--- a/zq-erp/src/main/resources/static/templates/vipProjUse.xls
+++ b/zq-erp/src/main/resources/static/templates/vipProjUse.xls
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 {
--
Gitblit v1.9.1