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/platformIncome.html | 386 +++++++++++++++++++++----------------------------------
1 files changed, 148 insertions(+), 238 deletions(-)
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
index 8dc7afb..a6007b2 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html
@@ -61,23 +61,21 @@
<div id="div2" class='table1' onclick="getContent(2)" style="border-right: 1px solid #333;">运营统计</div>
<div id="div3" class='table1' onclick="getContent(3)" style="border-right: 1px solid #333;">教学统计</div>
</div>
-
-
<div class="row" id="content1" style="margin-left: 100px;">
<div class="col-sm-11">
<div class="form-group">
<div class="col-sm-10">
<h2>营收数据</h2>
</br>
- <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 = "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="main" style="width: 1280px;height:500px;"></div>
</div>
<div class="col-sm-10">
@@ -258,131 +256,13 @@
<script src="${ctxPath}/modular/system/dataStatistics/echarts.min.js"></script>
<script src="${ctxPath}/static/js/plugins/switchery/switchery.js"></script>
<script>
- function search1(){
- var time = $("#beginTime").val()
- var ajax = new $ax(Feng.ctxPath + "/data/type1", function (data) {
-
- $("#fee1").text(data.fee1)
- $("#fee2").text(data.fee2)
- $("#fee3").text(data.fee3)
- $("#fee4").text(data.fee4)
- $("#fee5").text(data.fee5)
- $("#fee7").text(data.fee7)
- $("#day").val(data.dayone)
- $("#month").val(data.monthone)
- $("#quarter").val(data.quarterone)
- $("#year").val(data.yearone)
-
-
-
-
-
- var chartDom = document.getElementById('cookieTicket');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '门票收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: [
- { value: data.dayone, name: '日卡' },
- { value: data.monthone, name: '月卡' },
- { value: data.quarterone, name: '季卡' },
- { value: data.yearone, name: '年卡' },
-
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
- var chartDom = document.getElementById('cookieCourse');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '课程收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.courseData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- var chartDom = document.getElementById('cookieBooking');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- title: {
- text: '订场收入',
- subtext: '',
- left: 'center'
- },
- tooltip: {
- trigger: 'item'
- },
-
- series: [
- {
- name: 'Access From',
- type: 'pie',
- radius: '50%',
- data: data.siteData,
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ]
- };
- myChart.setOption(option);
-
-
- }, function (data) {
+ function search1() {
+ var time = $("#beginTime").val();
+ var ajax9 = new $ax(Feng.ctxPath + "/data/type1", function(data){
});
- ajax.set("time",time);
- ajax.start();
+ ajax9.set("time",time);
+ ajax9.start();
}
var ans = [];
var weekX = ["1周","2周","3周","4周"];
@@ -413,11 +293,7 @@
for (var i = 1; i <= daysInMonth; i++) {
timeX.push(String(i));
}
- laydate.render({
- elem: '#beginTime'
- , trigger: 'click'
- , range: true
- });
+
function getYears() {
var ajax2 = new $ax(Feng.ctxPath + "/data/getYears", function(data){
yearX=data
@@ -428,7 +304,7 @@
getContent(1);
getContent1(1);
getContent2(1);
-
+ ptCourse();
var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
@@ -450,10 +326,10 @@
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;
- for (let i = 1; i <= days; i++) {
- weekX.push(i);
- }
var day = resp.dayIncome;
option = {
tooltip: {
@@ -495,7 +371,7 @@
name: '年度营收',
type: 'line',
stack: 'Total',
- data: [year[0].amount,year[1].amount,year[2].amount,year[3].amount,year[4].amount,year[5].amount]
+ data: [year[0],year[1],year[2],year[3],year[4],year[5],year[6],year[7],year[8],year[9],year[10]]
},
{
name: '月度营收',
@@ -510,11 +386,6 @@
stack: 'Total',
data: [
week[0][0], week[0][1], week[0][2], week[0][3], week[0][4]
- , week[0][5], week[0][6], week[0][7], week[0][8], week[0][9]
- , week[0][10], week[0][11], week[0][12], week[0][13], week[0][14]
- , week[0][15], week[0][16], week[0][17], week[0][18], week[0][19], week[0][20]
- , week[0][21], week[0][22], week[0][23], week[0][24], week[0][25], week[0][26]
- , week[0][27], week[0][28], week[0][29], week[0][30], week[0][31]
]
},
{
@@ -536,14 +407,12 @@
var myChart1 = echarts.init(document.getElementById('refund'));
var myChart7 = echarts.init(document.getElementById('courseData'));
-
-
var ajax3 = new $ax(Feng.ctxPath + "/data/backPt", function(data){
$("#back1").text(data.thisYear);
$("#back2").text(data.thisMonth);
$("#back3").text(data.thisWeek);
$("#back4").text(data.thisDay);
- option1 = {
+ optionBack = {
tooltip: {
trigger: 'axis'
@@ -681,63 +550,6 @@
ajax4.start();
-
-
-
-
- option7 = {
- 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]
- }
- ]
- };
myChart.on('legendselectchanged', obj => {
var options = myChart.getOption()
//这里是选择切换什么样的x轴，那么他会进行对Y值的切换
@@ -770,7 +582,7 @@
// 使用刚指定的配置项和数据显示图表。
myChart.setOption(option);
- myChart1.setOption(option1);
+ myChart1.setOption(optionBack);
myChart7.setOption(option7);
});
@@ -1082,6 +894,8 @@
myChart6.on('legendselectchanged', obj => {
var options = myChart6.getOption()
//这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ console.log("看学员")
+ console.log(obj.name)
if (obj.name == '年度学员数') {
options.xAxis[0].data = yearX
} else if (obj.name == '月度学员数') {
@@ -1093,13 +907,9 @@
}
myChart6.setOption(options, true)
});
-
-
var ajax2 = new $ax(Feng.ctxPath + "/data/stuPt", function(data){
console.log(data)
-
$("#allUser").text(data.allUser)
-
option6 = {
tooltip: {
trigger: 'axis'
@@ -1165,32 +975,10 @@
});
ajax2.start()
myChart6.setOption(option6);
- }
-
-
- 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/coursePt", function(data){
console.log(data)
-
$("#allHour").text(data.allHour)
-
option7 = {
tooltip: {
trigger: 'axis'
@@ -1243,7 +1031,7 @@
name: '周度耗课数',
type: 'line',
stack: 'Total',
- data: [data.count,data.count1,data.count2,data.count3]
+ data: data.weekData
},
{
name: '日度耗课数',
@@ -1254,6 +1042,128 @@
]
};
});
+ console.log("调用")
+ var myChart7 = echarts.init(document.getElementById('courseData'));
+ myChart7.on('legendselectchanged', obj => {
+ var options = myChart7.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ console.log("看看选择")
+ console.log(obj.name)
+ if (obj.name == '年度耗课数') {
+ console.log("看看年度轴")
+ options.xAxis[0].data = yearX
+ console.log(yearX)
+ } else if (obj.name == '月度耗课数') {
+ console.log("看看月度轴")
+ options.xAxis[0].data = monthX
+ console.log(monthX)
+ }else if (obj.name == '周度耗课数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度耗课数') {
+ console.log("看看日度轴")
+ options.xAxis[0].data = dataX
+ console.log(dataX)
+ }
+ myChart7.setOption(options, true)
+ });
+ ajax2.start()
+ myChart7.setOption(option7);
+ }
+
+ function ptCourse() {
+ var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
+
+ $("#allHour").text(data.allHour)
+ console.log("周度")
+ console.log(data.weekData)
+ 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
+ }
+ ]
+ };
+ });
+ console.log("调用")
+ var myChart7 = echarts.init(document.getElementById('courseData'));
+ myChart7.on('legendselectchanged', obj => {
+ var options = myChart7.getOption()
+ //这里是选择切换什么样的x轴，那么他会进行对Y值的切换
+ console.log("看看选择")
+ console.log(obj.name)
+ if (obj.name == '年度耗课数') {
+ console.log("看看年度轴")
+ options.xAxis[0].data = yearX
+ console.log(yearX)
+ } else if (obj.name == '月度耗课数') {
+ console.log("看看月度轴")
+ options.xAxis[0].data = monthX
+ console.log(monthX)
+ }else if (obj.name == '周度耗课数') {
+ options.xAxis[0].data = ["1周","2周","3周","4周"]
+ }else if (obj.name == '日度耗课数') {
+ console.log("看看日度轴")
+ options.xAxis[0].data = dataX
+ console.log(dataX)
+ }
+ myChart7.setOption(options, true)
+ });
+
+
ajax2.start()
myChart7.setOption(option7);
}
@@ -1501,7 +1411,7 @@
}
]
};
- myChart.setOption(option);
+ myChart.setOption(option);
});
$(function(){
var courseData = "${data.courseData}"
--
Gitblit v1.7.1