~jiangyouyao/beauty-erp.git

			@@ -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<>();

			@@ -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',
			}

			};

	zq-erp/src/main/java/com/matrix/system/hiveErp/action/DataAnalysisCustomer.java	9 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/static/js/systools/ChartsUtils.js	56 ●●●●● patch \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/analysis/customerFlow.html	patch \| view \| raw \| blame \| history