From 3c12858927ce26f277ba758e520c81be599d8df1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 15:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 228 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 132 insertions(+), 96 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 ccde8d9..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,13 +61,11 @@
<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>营收数据1</h2>
+ <h2>营收数据</h2>
</br>
<div id = "money1" style="width: 1500px" >
<span id="totalIncome">总营收:</span>
@@ -258,6 +256,14 @@
<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 ajax9 = new $ax(Feng.ctxPath + "/data/type1", function(data){
+
+ });
+ ajax9.set("time",time);
+ ajax9.start();
+ }
var ans = [];
var weekX = ["1周","2周","3周","4周"];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -401,8 +407,6 @@
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);
@@ -546,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值的切换
@@ -960,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'
@@ -1032,39 +975,10 @@
});
ajax2.start()
myChart6.setOption(option6);
- }
-
- function ptCourse() {
- 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)
- });
var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
console.log(data)
-
$("#allHour").text(data.allHour)
-
option7 = {
tooltip: {
trigger: 'axis'
@@ -1117,7 +1031,7 @@
name: '周度耗课数',
type: 'line',
stack: 'Total',
- data: [data.count,data.count1,data.count2,data.count3]
+ data: data.weekData
},
{
name: '日度耗课数',
@@ -1128,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);
}
--
Gitblit v1.7.1