Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 cloud-server-management/src/main/webapp/WEB-INF/view/system/dataStatistics/operatorIncome.html

@@ -296,6 +296,7 @@
    function search(){
        income();
        ptCourse()

        ptStu()
        if(cutType==1){
            srtj()
@@ -447,7 +448,7 @@
        , range: true
    });
    $(function(){

        ptCourse();
        var ajax2 = new $ax(Feng.ctxPath + "/data/getYears", function(data){
            yearX=data
        });
@@ -1083,6 +1084,7 @@

    }
    function ptCourse() {
        console.log("调用耗课")
        var myChart7 = echarts.init(document.getElementById('courseData'));
        myChart7.on('legendselectchanged', obj => {
            var options = myChart7.getOption()
@@ -1099,6 +1101,14 @@
            myChart7.setOption(options, true)
        });

        if($("#objectType").val()==2){
        }else {
            let cCode = $("#cCode").val();
            if(null == cCode || '' == cCode){
                Feng.info("请选择运营商");
                return
            }
        }

        var ajax2 = new $ax(Feng.ctxPath + "/data/courseYys", function(data){
            console.log(data)
@@ -1109,7 +1119,6 @@
                },
                legend: {
                    data: ['年度耗课数', '月度耗课数', '周度耗课数', '日度耗课数'],

                    icon: 'stack',
                    selectedMode: 'single', // 单选
                    selected: {