From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html | 462 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 382 insertions(+), 80 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
index e406831..edc8c85 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/storeIncome.html
@@ -40,10 +40,12 @@
</style>
<div class="ibox float-e-margins">
<div class="ibox-content">
+ <input id="objectId" value="${objectId}" hidden>
+ <input id="objectType" value="${objectType}" hidden>
<div class="form-horizontal">
<div class="row">
<br class="col-sm-10">
- @if(objectType==1){
+ @if(objectType!=3){
<div class="col-sm-3">
<div class="input-group">
<div class="input-group-btn open">
@@ -80,15 +82,15 @@
<div class="col-sm-10">
<h2>营收数据</h2>
</br>
- <div id = "money1" style="width: 1500px" >
- <span>总营收:</span>
- <span>本年度营收:</span>
- <span>本月度营收:</span>
- <span>本周营收:</span>
- <span>本日营收:</span>
- </br>
- </br>
- </div>
+ <div id = "money1" style="width: 1500px" >
+ <span id="totalIncome">总营收:</span>
+ <span id="yearIncome">本年度营收:</span>
+ <span id="monthIncome">本月度营收:</span>
+ <span id="weekIncome">本周营收:</span>
+ <span id="todayIncome">本日营收:</span>
+ </br>
+ </br>
+ </div>
<div id="income" style="width: 1280px;height:500px;"></div>
</div>
<div class="col-sm-10">
@@ -104,8 +106,6 @@
<div class="col-sm-10" style="width: 1500px" >
</br>
</br>
- <span>会员费收入:<label id="fee1">0.0</label></span>
- <span>玩湃币充值收入:<label id="fee2">0.0</label></span>
<span>课程收入:<label id="fee3">0.0</label></span>
<span>活动/赛事收入:<label id="fee4">0.0</label></span>
<span>订场收入:<label id="fee5">0.0</label></span>
@@ -188,7 +188,7 @@
<h2>运营数据</h2>
</br>
</br>
- <span>运营时长:0小时</span>
+ <span id = "allHours">运营时长:0小时</span>
</br>
</br>
<div style="height: 25px;box-sizing: border-box;background:#f3f3f4;line-height: 25px;border:1px solid;margin-bottom: 20px;width: 500px">
@@ -272,9 +272,12 @@
function search(){
+ ptStu()
+ ptCourse()
if(cutType==1){
srtj()
tuifei()
+ income()
}
if(cutType==2){
@@ -283,10 +286,136 @@
ptActivity()
}
if(cutType==3){
+ ptStu()
jxtj()
+
}
}
+ function income(){
+ // var id = $("#cCode").val()
+ // var beginTime = $("#beginTime").val()
+ // console.log(id)
+ // if(id==""){
+ // Feng.info("请先选择运营商");
+ // return;
+ // }
+ var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
+ yearX=resp.year
+ var list = resp.yearMount;
+ console.log(list);
+ var t1 = document.getElementById("totalIncome");
+ var t2 = document.getElementById("yearIncome");
+ var t3 = document.getElementById("monthIncome");
+ var t4 = document.getElementById("weekIncome");
+ var t5 = document.getElementById("todayIncome");
+ t1.innerText = "总营收:"+list[0]+" ";
+ t2.innerText = "年度营收:"+list[1]+" ";
+ t3.innerText = "月度营收:"+list[2]+" ";
+ t4.innerText = "周度营收:"+list[3]+" ";
+ t5.innerText = "日度营收:"+list[4]+" ";
+ var year = resp.yearIncome;
+ var month = resp.monthIncome;
+ var week = resp.weekIncome;
+ console.log("周度营收")
+ console.log(year)
+ console.log(week)
+ var days = week[0].length;
+ var day = resp.dayIncome;
+ option = {
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['年度营收', '月度营收','周度营收','日度营收'],
+ icon: 'stack',
+ selectedMode: 'single', // 单选
+ selected: {
+ 年度营收: true,
+ 月度营收: false,
+ 周度营收: false,
+ 日度营收: false
+ }
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: yearX
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: '年度营收',
+ type: 'line',
+ stack: 'Total',
+ data: [year[0],year[1],year[2],year[3],year[4],year[5],year[6],year[7],year[8],year[9],year[10]]
+ },
+ {
+ name: '月度营收',
+ type: 'line',
+ stack: 'Total',
+ data: [month[0][0],month[0][1], month[0][2], month[0][3], month[0][4],
+ month[0][5], month[0][6], month[0][7], month[0][8], month[0][9], month[0][10], month[0][11]]
+ },
+ {
+ name: '周度营收',
+ type: 'line',
+ stack: 'Total',
+ data: [
+ week[0][0], week[0][1], week[0][2], week[0][3], week[0][4]
+ ]
+ },
+ {
+ name: '日度营收',
+ type: 'line',
+ stack: 'Total',
+ data: [
+ day[0][0], day[0][1],day[0][2], day[0][3], day[0][4], day[0][5], day[0][6]
+ ]
+ }
+ ]
+ };
+
+ });
+ ajax.set("type",1);
+ if($("#objectType").val()==3){
+ ajax.set("id",$("#objectId").val())
+ }else {
+ ajax.set("storeId", $("#cCode").val())
+ }
+ ajax.start();
+ // 营收
+ var income = echarts.init(document.getElementById('income'));
+ income.on('legendselectchanged', obj => {
+ var options = income.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ if (obj.name == '年度营收') {
+ options.xAxis[0].data = yearX
+ } else if (obj.name == '月度营收') {
+ options.xAxis[0].data = monthX
+ } else if (obj.name == '周度营收') {
+ options.xAxis[0].data = weekX
+ } else if (obj.name == '日度营收') {
+ options.xAxis[0].data = dataX
+ }
+ income.setOption(options, true)
+ })
+ // 使用刚指定的配置项和数据显示图表。
+ income.setOption(option);
+ }
let cutType=1;
@@ -301,8 +430,6 @@
}
var ajax = new $ax(Feng.ctxPath + "/data/selectStore", function (data) {
- $("#fee1").text(data.fee1)
- $("#fee2").text(data.fee2)
$("#fee3").text(data.fee3)
$("#fee4").text(data.fee4)
$("#fee5").text(data.fee5)
@@ -423,7 +550,11 @@
}, function (data) {
});
- ajax.set("id",id);
+ if($("#objectType").val()==3){
+ ajax.set("id",$("#objectId").val())
+ }else {
+ ajax.set("id", id)
+ }
ajax.set("time",beginTime);
ajax.start();
@@ -544,7 +675,11 @@
}, function (data) {
});
- ajax.set("id",id);
+ if($("#objectType").val()==3){
+ ajax.set("id",$("#objectId").val())
+ }else {
+ ajax.set("id", id)
+ }
ajax.start();
}
@@ -661,7 +796,12 @@
}, function (data) {
});
- ajax.set("id",id);
+
+ if($("#objectType").val()==3){
+ ajax.set("id",$("#objectId").val())
+ }else {
+ ajax.set("id", id)
+ }
ajax.start();
}
@@ -742,7 +882,11 @@
};
});
- ajax3.set("id",id)
+ if($("#objectType").val()==3){
+ ajax3.set("id",$("#objectId").val())
+ }else {
+ ajax3.set("id", id)
+ }
ajax3.start();
myChart1.on('legendselectchanged', obj => {
@@ -762,7 +906,110 @@
myChart1.setOption(option1);
}
+ function ptStu() {
+ var myChart6 = echarts.init(document.getElementById('teach'));
+ myChart6.on('legendselectchanged', obj => {
+ var options = myChart6.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ if (obj.name == '年度学员数') {
+ options.xAxis[0].data = yearX
+ } else if (obj.name == '月度学员数') {
+ options.xAxis[0].data = monthX
+ }else if (obj.name == '周度学员数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度学员数') {
+ options.xAxis[0].data = dataX
+ }
+ myChart6.setOption(options, true)
+ });
+ if($("#objectType").val()==3){
+ }else {
+ let cCode = $("#cCode").val();
+ if(null == cCode || '' == cCode){
+ Feng.info("请选择门店");
+ return
+ }
+ }
+
+
+ var ajax2 = new $ax(Feng.ctxPath + "/data/stuStores", function(data){
+ console.log(data)
+
+ $("#allUser").text(data.allUser)
+
+ option6 = {
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['年度学员数', '月度学员数', '周度学员数', '日度学员数'],
+
+ icon: 'stack',
+ selectedMode: 'single', // 单选
+ selected: {
+ 年度学员数: true,
+ 月度学员数: false,
+ 周度学员数: false,
+ 日度学员数: false
+ },
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: yearX
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: '年度学员数',
+ type: 'line',
+ stack: 'Total',
+ data: data.yearData
+ },
+ {
+ name: '月度学员数',
+ type: 'line',
+ stack: 'Total',
+ data: data.monthData
+ },
+ {
+ name: '周度学员数',
+ type: 'line',
+ stack: 'Total',
+ data: [data.count,data.count1,data.count2,data.count3]
+ },
+ {
+ name: '日度学员数',
+ type: 'line',
+ stack: 'Total',
+ data: data.dayData
+ }
+ ]
+ };
+ });
+ if($("#objectType").val()==3){
+ ajax2.set("id",$("#objectId").val())
+ }else {
+ ajax2.set("id", $("#cCode").val())
+ }
+ ajax2.start()
+
+ myChart6.setOption(option6);
+ }
function ptUser() {
var myChart2 = echarts.init(document.getElementById('user'));
@@ -930,12 +1177,107 @@
]
};
});
- ajax2.set("id",id)
+ if($("#objectType").val()==3){
+ ajax2.set("id",$("#objectId").val())
+ }else {
+ ajax2.set("id", id)
+ }
ajax2.start()
myChart2.setOption(option2);
myChart3.setOption(option3);
}
+ function ptCourse() {
+ var myChart7 = echarts.init(document.getElementById('courseData'));
+ myChart7.on('legendselectchanged', obj => {
+ var options = myChart7.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ if (obj.name == '年度耗课数') {
+ options.xAxis[0].data = yearX
+ } else if (obj.name == '月度耗课数') {
+ options.xAxis[0].data = monthX
+ }else if (obj.name == '周度耗课数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度耗课数') {
+ options.xAxis[0].data = dataX
+ }
+ myChart7.setOption(options, true)
+ });
+
+ var ajax2 = new $ax(Feng.ctxPath + "/data/courseStore", function(data){
+ console.log(data)
+ $("#allCourse").text("现有课时总量："+data.allCourse+"小时")
+ option7 = {
+ tooltip: {
+ trigger: 'axis'
+ },
+ legend: {
+ data: ['年度耗课数', '月度耗课数', '周度耗课数', '日度耗课数'],
+
+ icon: 'stack',
+ selectedMode: 'single', // 单选
+ selected: {
+ 年度耗课数: true,
+ 月度耗课数: false,
+ 周度耗课数: false,
+ 日度耗课数: false
+ },
+ },
+ grid: {
+ left: '3%',
+ right: '4%',
+ bottom: '3%',
+ containLabel: true
+ },
+ toolbox: {
+ feature: {
+ saveAsImage: {}
+ }
+ },
+ xAxis: {
+ type: 'category',
+ boundaryGap: false,
+ data: yearX
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ name: '年度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.yearData
+ },
+ {
+ name: '月度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.monthData
+ },
+ {
+ name: '周度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.weekData
+ },
+ {
+ name: '日度耗课数',
+ type: 'line',
+ stack: 'Total',
+ data: data.dayData
+ }
+ ]
+ };
+ });
+ if($("#objectType").val()==3){
+ ajax2.set("id",$("#objectId").val())
+ }else {
+ ajax2.set("id", $("#cCode").val())
+ }
+ ajax2.start()
+ myChart7.setOption(option7);
+ }
function ptActivity() {
var myChart4 = echarts.init(document.getElementById('activity'));
var myChart5 = echarts.init(document.getElementById('prepare'));
@@ -967,9 +1309,7 @@
return;
}
var ajax2 = new $ax(Feng.ctxPath + "/data/actStore", function(data){
-
- $("#allHour").text(data.allHour)
-
+ $("#allHours").text(data.allHour)
option4 = {
tooltip: {
trigger: 'axis'
@@ -1069,7 +1409,12 @@
]
};
});
- ajax2.set("id",id)
+
+ if($("#objectType").val()==3){
+ ajax2.set("id",$("#objectId").val())
+ }else {
+ ajax2.set("id", id)
+ }
ajax2.start()
myChart4.setOption(option4);
myChart5.setOption(option5);
@@ -1089,8 +1434,7 @@
getContent(1);
getContent1(1);
getContent2(1);
- // 基于准备好的dom，初始化echarts实例
- var myChart = echarts.init(document.getElementById('income'));
+
var myChart2 = echarts.init(document.getElementById('user'));
var myChart3 = echarts.init(document.getElementById('vip'));
var myChart4 = echarts.init(document.getElementById('activity'));
@@ -1098,59 +1442,7 @@
var myChart6 = echarts.init(document.getElementById('teach'));
var myChart7 = echarts.init(document.getElementById('courseData'));
tuifei()
- option = {
- tooltip: {
- trigger: 'axis'
- },
- legend: {
- data: ['年度营收', '月度营收', '周度营收', '日度营收']
- },
- grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
- containLabel: true
- },
- toolbox: {
- feature: {
- saveAsImage: {}
- }
- },
- xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- name: '年度营收',
- type: 'line',
- stack: 'Total',
- data: [120, 132, 101, 134, 90, 230, 160, 190, 410, 330, 210, 330]
- },
- {
- name: '月度营收',
- type: 'line',
- stack: 'Total',
- data: [220, 182, 191, 234, 290, 330, 310, 190, 210, 330, 410, 160]
- },
- {
- name: '周度营收',
- type: 'line',
- stack: 'Total',
- data: [150, 232, 201, 154, 190, 330, 410, 160, 210, 195, 210, 188]
- },
- {
- name: '日度营收',
- type: 'line',
- stack: 'Total',
- data: [320, 332, 301, 334, 390, 330, 320, 10, 195, 145, 188, 160]
- }
- ]
- };
+
option2 = {
tooltip: {
trigger: 'axis'
@@ -1447,7 +1739,6 @@
]
};
// 使用刚指定的配置项和数据显示图表。
- myChart.setOption(option);
myChart2.setOption(option2);
myChart3.setOption(option3);
myChart4.setOption(option4);
@@ -1480,6 +1771,7 @@
if(type==1){
srtj()
tuifei()
+ income()
}
if(type==2){
@@ -1598,6 +1890,16 @@
myChart.setOption(option);
});
$(function(){
+ if($("#objectType").val()==3){
+ ptCourse()
+ ptActivity()
+ ptUser()
+ ptStu()
+ tuifei()
+ yytj()
+ srtj()
+ }
+
var chartDom = document.getElementById('cookieCourse');
var myChart = echarts.init(chartDom);
var option;
--
Gitblit v1.7.1