From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html | 157 ++++------------------------------------------------
1 files changed, 13 insertions(+), 144 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..d0cdc77 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
@@ -69,15 +69,15 @@
<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,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月"];
@@ -450,10 +324,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: {
@@ -510,11 +384,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]
]
},
{
@@ -1501,7 +1370,7 @@
}
]
};
- myChart.setOption(option);
+ myChart.setOption(option);
});
$(function(){
var courseData = "${data.courseData}"
--
Gitblit v1.7.1