From add2d28c3aeccfe57338c439967abbb83117b20e Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 09:56:55 +0800
Subject: [PATCH] 修改bug

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/platformIncome.html |  145 ++---------------------------------------------
 1 files changed, 8 insertions(+), 137 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 138820b..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" >
                                         &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;
@@ -240,7 +240,7 @@
                                     <h2>课时数据</h2>
                                     </br>
                                     </br>
-                                    <span id="allCourse">现有课时总量:0小时</span>
+                                    <span>现有课时总量:0小时</span>
                                     </br>
                                     </br>
                                     <div id="courseData" style="width: 1280px;height:500px;"></div>
@@ -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
@@ -428,6 +298,7 @@
         getContent(1);
         getContent1(1);
         getContent2(1);
+
 
 
         var ajax = new $ax(Feng.ctxPath + "/data/getIncomeData", function(resp){
@@ -1182,7 +1053,9 @@
 
         var ajax2 = new $ax(Feng.ctxPath + "/data/coursePt", function(data){
             console.log(data)
-            $("#allCourse").text("现有课时总量:"+data.allCourse+"小时")
+
+            $("#allHour").text(data.allHour)
+
             option7  = {
                 tooltip: {
                     trigger: 'axis'
@@ -1235,7 +1108,7 @@
                         name: '周度耗课数',
                         type: 'line',
                         stack: 'Total',
-                        data: data.weekData
+                        data: [data.count,data.count1,data.count2,data.count3]
                     },
                     {
                         name: '日度耗课数',
@@ -1416,8 +1289,6 @@
             });
             ajax.start();
             ptStu()
-            ptCourse();
-
         }
 
 

--
Gitblit v1.7.1