From 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期日, 08 十月 2023 16:19:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 298 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 246 insertions(+), 52 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 69f573c..8ccd20e 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
@@ -41,6 +41,19 @@
<div class="ibox float-e-margins">
<div class="ibox-content">
<div class="form-horizontal">
+
+ <input hidden id="day" value="${data.dayone}">
+ <input hidden id="month" value="${data.monthone}">
+ <input hidden id="quarter" value="${data.quarterone}">
+ <input hidden id="year" value="${data.yearone}">
+ <input hidden id="age1" value="${stuData.age1}">
+ <input hidden id="age2" value="${stuData.age2}">
+ <input hidden id="age3" value="${stuData.age3}">
+ <input hidden id="age4" value="${stuData.age4}">
+ <input hidden id="boy" value="${stuData.boy}">
+ <input hidden id="girl" value="${stuData.girl}">
+
+
<div class="row">
<div class="col-sm-10">
<div style="height: 50px;box-sizing: border-box;background:#f3f3f4;line-height: 50px;border:1px solid;margin-bottom: 20px;width: auto">
@@ -48,6 +61,8 @@
<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">
@@ -71,21 +86,19 @@
</br>
<div class="col-sm-3" style="width: 400px;display: flex">
<#TimeCon id="beginTime" name="时间段:" isTime="false"/>
- <#button name="搜索" icon="fa-search" clickFun="TCompetition.search()"/>
+ <#button name="搜索" icon="fa-search" clickFun="search1()"/>
</div>
</div>
<div class="col-sm-10" style="width: 1500px" >
</br>
</br>
- <span>会员费收入:</span>
- <span>玩湃币充值收入:</span>
- <span>课程收入:</span>
- <span>活动收入:</span>
- <span>订场收入:</span>
- <span>赛事收入:</span>
- <span>商品收入:</span>
- <span>其他收入:</span>
+ <span>会员费收入:<label id="fee1">${data.fee1}</label></span>
+ <span>玩湃币充值收入:<label id="fee2">${data.fee2}</label></span>
+ <span>课程收入:<label id="fee3">${data.fee3}</label></span>
+ <span>活动/赛事收入:<label id="fee4">${data.fee4}</label></span>
+ <span>订场收入:<label id="fee5">${data.fee5}</label></span>
+ <span>商品收入:<label id="fee7">${data.fee7}</label></span>
</br>
</br>
</br>
@@ -239,10 +252,138 @@
</div>
</div>
</div>
+
+
</div>
<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) {
+
+ });
+ ajax.set("time",time);
+ ajax.start();
+ }
var ans = [];
var weekX = [];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -661,6 +802,8 @@
}
]
};
+
+
option6 = {
tooltip: {
trigger: 'axis'
@@ -714,6 +857,9 @@
}
]
};
+
+
+
option7 = {
tooltip: {
trigger: 'axis'
@@ -839,6 +985,41 @@
$("#ensure").show();
$("#nextB").hide();
}
+
+
+ if(type==3){
+ var ajax = new $ax(Feng.ctxPath + "/data/stuCourseData", function (data) {
+
+ console.log(data.data1)
+ var chartDom = document.getElementById('cookieTeachCourse');
+ var myChart = echarts.init(chartDom);
+ var option;
+
+ option = {
+ xAxis: {
+ type: 'category',
+ data: data.data1,
+ },
+ yAxis: {
+ type: 'value'
+ },
+ series: [
+ {
+ data: data.data2,
+ type: 'bar'
+ }
+ ]
+ };
+ myChart.setOption(option);
+ }, function (data) {
+
+ });
+ ajax.start();
+ }
+
+
+
+
}
function getContent1(type){
//设置点击字体颜色效果
@@ -873,12 +1054,12 @@
}
}
-</script>
-<script>
$(function(){
+
var chartDom = document.getElementById('cookieTicket');
var myChart = echarts.init(chartDom);
var option;
+
option = {
title: {
text: '门票收入',
@@ -895,8 +1076,10 @@
type: 'pie',
radius: '50%',
data: [
- { value: 1048, name: '年票' },
- { value: 735, name: '亲子票' },
+ { value: $("#day").val(), name: '日卡' },
+ { value: $("#month").val(), name: '月卡' },
+ { value: $("#quarter").val(), name: '季卡' },
+ { value: $("#year").val(), name: '年卡' },
],
emphasis: {
@@ -912,8 +1095,24 @@
myChart.setOption(option);
});
$(function(){
+ var courseData = "${data.courseData}"
+ courseData =courseData.replace("[","").replace("]","")
+ courseData = courseData.split('},')
+
+ var a=[];
+ for (let j = 0; j <courseData.length; j++) {
+ if(j<courseData.length-1){
+ var d = courseData[j].replace("{","").replace("}","").split(",")
+ let obj ={
+ name:d[0].split("=")[1],
+ value:d[1].split("=")[1]
+ }
+ a.push(obj)
+ }
+ }
var chartDom = document.getElementById('cookieCourse');
- var myChart = echarts.init(chartDom);
+ var myChart = echarts.init(chartDom)
+
var option;
option = {
title: {
@@ -930,12 +1129,7 @@
name: 'Access From',
type: 'pie',
radius: '50%',
- data: [
- { value: 1048, name: '篮球课' },
- { value: 735, name: '羽毛课' },
- { value: 735, name: '足球课' },
-
- ],
+ data: a,
emphasis: {
itemStyle: {
shadowBlur: 10,
@@ -949,6 +1143,22 @@
myChart.setOption(option);
});
$(function(){
+ var courseData = "${data.siteData}"
+
+ courseData =courseData.replace("[","").replace("]","")
+ courseData = courseData.split('},')
+
+ var a=[];
+ for (let j = 0; j <courseData.length; j++) {
+ if(j<courseData.length-1){
+ var d = courseData[j].replace("{","").replace("}","").split(",")
+ let obj ={
+ name:d[0].split("=")[1],
+ value:d[1].split("=")[1]
+ }
+ a.push(obj)
+ }
+ }
var chartDom = document.getElementById('cookieBooking');
var myChart = echarts.init(chartDom);
var option;
@@ -967,12 +1177,7 @@
name: 'Access From',
type: 'pie',
radius: '50%',
- data: [
- { value: 1048, name: '激战' },
- { value: 735, name: '篮球场' },
- { value: 735, name: '足球场' },
-
- ],
+ data: a,
emphasis: {
itemStyle: {
shadowBlur: 10,
@@ -1005,8 +1210,10 @@
type: 'pie',
radius: '50%',
data: [
- { value: 1048, name: '30-35' },
- { value: 735, name: '12-18' },
+ { value: 1048, name: '0-7岁' },
+ { value: 735, name: '8-10岁' },
+ { value: 735, name: '11-12岁' },
+ { value: 735, name: '13岁以上' },
],
emphasis: {
@@ -1041,8 +1248,10 @@
type: 'pie',
radius: '50%',
data: [
- { value: 1048, name: '30-35' },
- { value: 735, name: '12-18' },
+ { value: $("#age1").val(), name: '0-7岁' },
+ { value: $("#age2").val(), name: '8-10岁' },
+ { value:$("#age3").val(), name: '11-12岁' },
+ { value: $("#age4").val(), name: '13岁以上' },
],
emphasis: {
@@ -1113,8 +1322,8 @@
type: 'pie',
radius: '50%',
data: [
- { value: 1048, name: '男' },
- { value: 735, name: '女' },
+ { value: $("#boy").val(), name: '男' },
+ { value: $("#girl").val(), name: '女' },
],
emphasis: {
@@ -1151,27 +1360,12 @@
};
myChart.setOption(option);
});
- $(function(){
- var chartDom = document.getElementById('cookieTeachCourse');
- var myChart = echarts.init(chartDom);
- var option;
- option = {
- xAxis: {
- type: 'category',
- data: ['足球课', '篮球课', '羽毛球课', '网球课', '排球课']
- },
- yAxis: {
- type: 'value'
- },
- series: [
- {
- data: [120, 200, 150, 80, 70, 110, 130],
- type: 'bar'
- }
- ]
- };
- myChart.setOption(option);
+ function stuCourseData(){
+
+ }
+ $(function(){
+
});
</script>
@}
--
Gitblit v1.7.1