From ab17f44cc4aa2b15c36d6f523fa3844a338101ce Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 21:31:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 134 --------------------------------------------
1 files changed, 2 insertions(+), 132 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 3945fd3..a22080e 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
@@ -67,7 +67,7 @@
<div class="col-sm-11">
<div class="form-group">
<div class="col-sm-10">
- <h2>营收数据</h2>
+ <h2>营收数据1</h2>
</br>
<div id = "money1" style="width: 1500px" >
<span id="totalIncome">总营收:</span>
@@ -258,132 +258,6 @@
<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 = ["1周","2周","3周","4周"];
var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
@@ -413,11 +287,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
--
Gitblit v1.7.1