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 |  837 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 435 insertions(+), 402 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 411caab..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
@@ -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">
@@ -54,15 +67,15 @@
                                 <div class="col-sm-10">
                                     <h2>营收数据</h2>
                                     </br>
-                                        <div id = "money1" style="width: 1500px" >
-                                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="totalIncome">总营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="yearIncome">本年度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="monthIncome">本月度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="weekIncome">本周营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            <span id="todayIncome">本日营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                            </br>
-                                            </br>
-                                        </div>
+                                    <div id = "money1" style="width: 1500px" >
+                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span id="totalIncome">总营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <span id="yearIncome">本年度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <span id="monthIncome">本月度营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <span id="weekIncome">本周营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <span id="todayIncome">本日营收:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        </br>
+                                        </br>
+                                    </div>
                                     <div id="main" style="width: 1280px;height:500px;"></div>
                                 </div>
                                 <div class="col-sm-10">
@@ -71,21 +84,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>
-                                   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>会员费收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>玩湃币充值收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>课程收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>活动收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>订场收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>赛事收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>商品收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <span>其他收入:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span>会员费收入:<label id="fee1">${data.fee1}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>玩湃币充值收入:<label id="fee2">${data.fee2}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>课程收入:<label id="fee3">${data.fee3}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>活动/赛事收入:<label id="fee4">${data.fee4}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>订场收入:<label id="fee5">${data.fee5}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                    <span>商品收入:<label id="fee7">${data.fee7}</label></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                                     </br>
                                     </br>
                                     </br>
@@ -164,7 +175,7 @@
                                     <h2>运营数据</h2>
                                     </br>
                                     </br>
-                                    <span>运营时长:0小时</span>
+                                    <span>运营时长:<span id="allHour"></span>小时</span>
                                     </br>
                                     </br>
                                     <div style="height: 25px;box-sizing: border-box;background:#f3f3f4;line-height: 25px;border:1px solid;margin-bottom: 20px;width: 500px">
@@ -198,7 +209,7 @@
                                     <h2>学员数据</h2>
                                     </br>
                                     </br>
-                                    <span>累计学员数:0人</span>
+                                    <span>累计学员数:<span id="allUser"></span>人</span>
                                     </br>
                                     </br>
                                     <div id="teach" style="width: 1280px;height:500px;"></div>
@@ -239,12 +250,22 @@
             </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 ajax9 = new $ax(Feng.ctxPath + "/data/type1", function(data){
+
+        });
+        ajax9.set("time",time);
+        ajax9.start();
+    }
     var ans = [];
-    var weekX = ["1","2","上周","本周"];
+    var weekX = ["1周","2周","3周","4周"];
     var monthX = ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"];
     var yearX = [];
     var timeX = [];
@@ -272,15 +293,19 @@
     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
+        });
+        ajax2.start()
+    }
     $(function(){
         getContent(1);
         getContent1(1);
         getContent2(1);
+        ptCourse();
+
 
         var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
             yearX=resp.year
@@ -301,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: {
@@ -346,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: '月度营收',
@@ -361,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]
                         ]
                     },
                     {
@@ -386,18 +406,13 @@
         var myChart  = echarts.init(document.getElementById('main'));
         var myChart1 = echarts.init(document.getElementById('refund'));
 
-
-
-        var myChart6 = echarts.init(document.getElementById('teach'));
         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'
@@ -535,250 +550,6 @@
         ajax4.start();
 
 
-
-
-
-        option6  = {
-            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]
-                }
-            ]
-        };
-
-
-
-        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]
-                }
-            ]
-        };
-        option5 = {
-            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, 394, 980, 2380, 1680, 1190, 1410, 1330, 2110, 1330]
-                },
-                {
-                    name: '月度次数',
-                    type: 'line',
-                    stack: 'Total',
-                    data: [120, 182, 211, 324, 120, 130, 310, 290, 220, 130, 240, 150]
-                }
-            ]
-        };
-        option6  = {
-            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]
-                }
-            ]
-        };
-        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]
         myChart.on('legendselectchanged', obj => {
             var options = myChart.getOption()
             //这里是选择切换什么样的x轴,那么他会进行对Y值的切换
@@ -811,13 +582,11 @@
 
         // 使用刚指定的配置项和数据显示图表。
         myChart.setOption(option);
-        myChart1.setOption(option1);
+        myChart1.setOption(optionBack);
 
-        myChart6.setOption(option6);
         myChart7.setOption(option7);
     });
-
-    function ptUser() {
+    function ptUser()   {
         var myChart2 = echarts.init(document.getElementById('user'));
         var myChart3 = echarts.init(document.getElementById('vip'));
         myChart2.on('legendselectchanged', obj => {
@@ -987,16 +756,47 @@
     function ptActivity() {
         var myChart4 = echarts.init(document.getElementById('activity'));
         var myChart5 = echarts.init(document.getElementById('prepare'));
+        myChart4.on('legendselectchanged', obj => {
+            var options = myChart4.getOption()
+            //这里是选择切换什么样的x轴,那么他会进行对Y值的切换
+            if (obj.name == '年度次数') {
+                options.xAxis[0].data = yearX
+            } else if (obj.name == '月度次数') {
+                options.xAxis[0].data = monthX
+            }
+            myChart4.setOption(options, true)
+        });
+
+        myChart5.on('legendselectchanged', obj => {
+            var options = myChart5.getOption()
+            //这里是选择切换什么样的x轴,那么他会进行对Y值的切换
+            if (obj.name == '年度次数') {
+                options.xAxis[0].data = yearX
+            } else if (obj.name == '月度次数') {
+                options.xAxis[0].data = monthX
+            }
+            myChart5.setOption(options, true)
+        });
 
         var ajax2 = new $ax(Feng.ctxPath + "/data/actPt", function(data){
             console.log(data)
+
+            $("#allHour").text(data.allHour)
 
             option4 = {
                 tooltip: {
                     trigger: 'axis'
                 },
                 legend: {
-                    data: ['年度次数', '月度次数']
+                    data: ['年度次数', '月度次数'],
+                    icon: 'stack',
+                    selectedMode: 'single', // 单选
+                    selected: {
+                        年度次数: true,
+                        月度次数: false,
+                    },
+
+
                 },
                 grid: {
                     left: '3%',
@@ -1012,7 +812,7 @@
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+                    data: yearX
                 },
                 yAxis: {
                     type: 'value'
@@ -1022,13 +822,13 @@
                         name: '年度次数',
                         type: 'line',
                         stack: 'Total',
-                        data: [1220, 1532, 101, 1394, 980, 2380, 1680, 1190, 1410, 1330, 2110, 1330]
+                        data: data.yearData
                     },
                     {
                         name: '月度次数',
                         type: 'line',
                         stack: 'Total',
-                        data: [1220, 1182, 2191, 3234, 1290, 1330, 2310, 2190, 2210, 1330, 2410, 1650]
+                        data: data.monthData
                     }
 
                 ]
@@ -1038,7 +838,14 @@
                     trigger: 'axis'
                 },
                 legend: {
-                    data: ['年度次数', '月度次数']
+                    data: ['年度次数', '月度次数'],
+                    icon: 'stack',
+                    selectedMode: 'single', // 单选
+                    selected: {
+                        年度次数: true,
+                        月度次数: false,
+                    },
+
                 },
                 grid: {
                     left: '3%',
@@ -1054,7 +861,7 @@
                 xAxis: {
                     type: 'category',
                     boundaryGap: false,
-                    data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
+                    data: yearX
                 },
                 yAxis: {
                     type: 'value'
@@ -1064,13 +871,13 @@
                         name: '年度次数',
                         type: 'line',
                         stack: 'Total',
-                        data: [120, 132, 101, 394, 980, 2380, 1680, 1190, 1410, 1330, 2110, 1330]
+                        data: data.yearsUser
                     },
                     {
                         name: '月度次数',
                         type: 'line',
                         stack: 'Total',
-                        data: [120, 182, 211, 324, 120, 130, 310, 290, 220, 130, 240, 150]
+                        data: data.monthsUser
                     }
                 ]
             };
@@ -1079,6 +886,286 @@
         ajax2.start()
         myChart4.setOption(option4);
         myChart5.setOption(option5);
+    }
+
+
+    function ptStu() {
+        var myChart6 = echarts.init(document.getElementById('teach'));
+        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 == '月度学员数') {
+                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
+            }
+            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'
+                },
+                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.count,data.count1,data.count2,data.count3]
+                    },
+                    {
+                        name: '日度学员数',
+                        type: 'line',
+                        stack: 'Total',
+                        data: data.dayData
+                    }
+                ]
+            };
+        });
+        ajax2.start()
+        myChart6.setOption(option6);
+
+        var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
+            console.log(data)
+            $("#allHour").text(data.allHour)
+            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);
+    }
+
+    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);
     }
 
     function getContent(type){
@@ -1214,12 +1301,13 @@
 
             ptUser()
 
+            ptActivity()
+
         }
 
 
         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);
@@ -1245,8 +1333,7 @@
 
             });
             ajax.start();
-
-            ptActivity()
+            ptStu()
         }
 
 
@@ -1286,12 +1373,12 @@
         }
     }
 
-</script>
-<script>
     $(function(){
+
         var chartDom = document.getElementById('cookieTicket');
         var myChart = echarts.init(chartDom);
         var option;
+
         option = {
             title: {
                 text: '门票收入',
@@ -1308,8 +1395,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: {
@@ -1322,11 +1411,27 @@
                 }
             ]
         };
-    myChart.setOption(option);
+        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: {
@@ -1343,12 +1448,7 @@
                     name: 'Access From',
                     type: 'pie',
                     radius: '50%',
-                    data: [
-                        { value: 1048, name: '篮球课' },
-                        { value: 735, name: '羽毛课' },
-                        { value: 735, name: '足球课' },
-
-                    ],
+                    data: a,
                     emphasis: {
                         itemStyle: {
                             shadowBlur: 10,
@@ -1362,6 +1462,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;
@@ -1380,48 +1496,7 @@
                     name: 'Access From',
                     type: 'pie',
                     radius: '50%',
-                    data: [
-                        { value: 1048, name: '激战' },
-                        { value: 735, name: '篮球场' },
-                        { value: 735, name: '足球场' },
-
-                    ],
-                    emphasis: {
-                        itemStyle: {
-                            shadowBlur: 10,
-                            shadowOffsetX: 0,
-                            shadowColor: 'rgba(0, 0, 0, 0.5)'
-                        }
-                    }
-                }
-            ]
-        };
-        myChart.setOption(option);
-    });
-    $(function(){
-        var chartDom = document.getElementById('cookieAge');
-        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: 1048, name: '30-35' },
-                        { value: 735, name: '12-18' },
-
-                    ],
+                    data: a,
                     emphasis: {
                         itemStyle: {
                             shadowBlur: 10,
@@ -1454,8 +1529,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: {
@@ -1490,8 +1567,8 @@
                     type: 'pie',
                     radius: '50%',
                     data: [
-                        { value: 1048, name: '男' },
-                        { value: 735, name: '女' },
+                        { value: $("#boy").val(), name: '男' },
+                        { value: $("#girl").val(), name: '女' },
 
                     ],
                     emphasis: {
@@ -1501,50 +1578,6 @@
                             shadowColor: 'rgba(0, 0, 0, 0.5)'
                         }
                     }
-                }
-            ]
-        };
-        myChart.setOption(option);
-    });
-    $(function(){
-        var chartDom = document.getElementById('city');
-        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(){
-        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'
                 }
             ]
         };

--
Gitblit v1.7.1