功率预测问题修改

src/views/powerPrediction/component/statisticalSummary.json

@@ -89,114 +89,168 @@
     },
     "monthlyPowerGenerationReportData": {
         "dataFormatList": [
-            {
-                "name": "计划发电",
-                "xAxisData": null,
-                "data": [
-                    655.4272143343635,
-                    631.9772587842104,
-                    393.2130772338839,
-                    214.51094605668155,
-                    436.06115848579213,
-                    416.6042996534019,
-                    226.02820972697342,
-                    314.9898799795777,
-                    354.963050645641,
-                    53.38773954351188,
-                    323.7378451035347,
-                    466.3745094050813,
-                    515.2775475951131,
-                    475.91079133021077,
-                    159.3552651225098,
-                    569.7847341416248,
-                    557.764372769475,
-                    420.8448218703213,
-                    361.63915412709525,
-                    833.9552745957776,
-                    359.7766684417222,
-                    679.5994221436101,
-                    455.49015960402664,
-                    186.73232541832436,
-                    260.92281105712783,
-                    583.7756199781089,
-                    346.5250507703825,
-                    285.58242392845887,
-                    240.70469721252076,
-                    124.08941761573715,
-                    137.46863451013087
-                ]
-            },
-            {
-                "name": "实际发电",
-                "xAxisData": null,
-                "data": [
-                    943.5465853759765,
-                    881.7822935400391,
-                    620.3793248156738,
-                    310.50329836486816,
-                    321.03446943237304,
-                    460.9857621428223,
-                    340.7591409921875,
-                    322.7985429716797,
-                    351.8570800793457,
-                    266.4707186595459,
-                    268.68920917822265,
-                    455.14478177612307,
-                    620.1992219482422,
-                    692.1134234814454,
-                    293.8751442519531,
-                    375.6453613366699,
-                    636.6001706801758,
-                    535.1059837768555,
-                    266.38904732177735,
-                    619.2797693071288,
-                    564.1080971044921,
-                    429.39609815063477,
-                    619.5286955737305,
-                    263.66159691711425,
-                    193.99697123876953,
-                    399.0864174707031,
-                    529.5217597668457,
-                    386.3341692456055,
-                    233.5554613522949,
-                    166.7521723807373,
-                    165.45233699108888
-                ]
-            }
-        ],
-        "dateList": [
-            "2024-08-01 00:00:00",
-            "2024-08-02 00:00:00",
-            "2024-08-03 00:00:00",
-            "2024-08-04 00:00:00",
-            "2024-08-05 00:00:00",
-            "2024-08-06 00:00:00",
-            "2024-08-07 00:00:00",
-            "2024-08-08 00:00:00",
-            "2024-08-09 00:00:00",
-            "2024-08-10 00:00:00",
-            "2024-08-11 00:00:00",
-            "2024-08-12 00:00:00",
-            "2024-08-13 00:00:00",
-            "2024-08-14 00:00:00",
-            "2024-08-15 00:00:00",
-            "2024-08-16 00:00:00",
-            "2024-08-17 00:00:00",
-            "2024-08-18 00:00:00",
-            "2024-08-19 00:00:00",
-            "2024-08-20 00:00:00",
-            "2024-08-21 00:00:00",
-            "2024-08-22 00:00:00",
-            "2024-08-23 00:00:00",
-            "2024-08-24 00:00:00",
-            "2024-08-25 00:00:00",
-            "2024-08-26 00:00:00",
-            "2024-08-27 00:00:00",
-            "2024-08-28 00:00:00",
-            "2024-08-29 00:00:00",
-            "2024-08-30 00:00:00",
-            "2024-08-31 00:00:00"
-        ]
+                {
+                    "name": "计划发电",
+                    "data": [
+                        362.029,
+                        407.219,
+                        217.092,
+                        215.831,
+                        636.793,
+                        282.108,
+                        540.012,
+                        571.624,
+                        228.196,
+                        218.67,
+                        143.923,
+                        60.75,
+                        181.963,
+                        14.646,
+                        468.063,
+                        389.57,
+                        254.932,
+                        458.385,
+                        184.279,
+                        300.648,
+                        438.308,
+                        785.872,
+                        184.762,
+                        803.287,
+                        596.952,
+                        821.002,
+                        552.641,
+                        645.104,
+                        123.408,
+                        101.929
+                    ],
+                    "xaxisData": null
+                },
+                {
+                    "name": "实际发电",
+                    "data": [
+                        124.691,
+                        709.926,
+                        246.883,
+                        123.641,
+                        99.736,
+                        557.389,
+                        687.547,
+                        950.166,
+                        484.435,
+                        255.318,
+                        296.191,
+                        160.244,
+                        29.617,
+                        109.816,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0,
+                        0.0
+                    ],
+                    "xaxisData": null
+                },
+                {
+                    "name": "预测发电",
+                    "data": [
+                        54.7011287,
+                        21.701690799999998,
+                        46.1463443,
+                        36.0457871,
+                        53.7316106,
+                        62.8919706,
+                        55.629322900000005,
+                        73.8878534,
+                        55.638417700000005,
+                        23.2145853,
+                        58.535786,
+                        27.227917200000004,
+                        42.0330117,
+                        129.4327527,
+                        53.26558370000001,
+                        14.201090299999999,
+                        70.2178689,
+                        37.095855900000004,
+                        26.480847999999998,
+                        41.4487252,
+                        49.9613777,
+                        46.4039065,
+                        28.679575,
+                        31.323933299999997,
+                        58.3601228,
+                        45.3836115,
+                        57.303730200000004,
+                        35.598393300000005,
+                        85.2515444,
+                        65.78634989999999,
+                        15.1291571,
+                        94.5504121,
+                        47.2028392,
+                        20.9245716,
+                        58.5688368,
+                        71.8108558,
+                        25.5342465,
+                        51.602448700000004,
+                        44.8351019,
+                        56.0877657,
+                        23.827605900000002,
+                        95.3380591,
+                        46.7097785,
+                        45.7332946,
+                        57.72791480000001,
+                        29.3799962,
+                        48.0399204,
+                        56.568685699999996,
+                        36.3545407,
+                        60.3334919,
+                        61.3843884
+                    ],
+                    "xaxisData": null
+                }
+            ],
+            "dateList": [
+                "2024-11-01 00:00:00",
+                "2024-11-02 00:00:00",
+                "2024-11-03 00:00:00",
+                "2024-11-04 00:00:00",
+                "2024-11-05 00:00:00",
+                "2024-11-06 00:00:00",
+                "2024-11-07 00:00:00",
+                "2024-11-08 00:00:00",
+                "2024-11-09 00:00:00",
+                "2024-11-10 00:00:00",
+                "2024-11-11 00:00:00",
+                "2024-11-12 00:00:00",
+                "2024-11-13 00:00:00",
+                "2024-11-14 00:00:00",
+                "2024-11-15 00:00:00",
+                "2024-11-16 00:00:00",
+                "2024-11-17 00:00:00",
+                "2024-11-18 00:00:00",
+                "2024-11-19 00:00:00",
+                "2024-11-20 00:00:00",
+                "2024-11-21 00:00:00",
+                "2024-11-22 00:00:00",
+                "2024-11-23 00:00:00",
+                "2024-11-24 00:00:00",
+                "2024-11-25 00:00:00",
+                "2024-11-26 00:00:00",
+                "2024-11-27 00:00:00",
+                "2024-11-28 00:00:00",
+                "2024-11-29 00:00:00",
+                "2024-11-30 00:00:00"
+            ]
     },
     "annualPowerGenerationReportData": {
         "list2": [
@@ -554,6 +608,337 @@
                 "november": 79.65,
                 "december": null
             }
-        ]
+        ],
+        "list3": [
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 11768.4445931,
+                        "february": 9283.6945749,
+                        "march": 13494.5210368,
+                        "april": 12573.629187100001,
+                        "may": 14128.3236315,
+                        "june": 11744.0217581,
+                        "july": 8977.8317891,
+                        "august": 11324.239848000001,
+                        "september": 15167.0654421,
+                        "october": 12701.6587304,
+                        "november": 11474.9269013,
+                        "december": null,
+                        "hj": 132638.36,
+                        "monthList": [
+                            11768.4445931,
+                            9283.6945749,
+                            13494.5210368,
+                            12573.629187100001,
+                            14128.3236315,
+                            11744.0217581,
+                            8977.8317891,
+                            11324.239848000001,
+                            15167.0654421,
+                            12701.6587304,
+                            11474.9269013,
+                            null
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 11245.374,
+                        "february": 8624.14,
+                        "march": 13214.845,
+                        "april": 12157.593,
+                        "may": 13949.593,
+                        "june": 11469.241,
+                        "july": 8449.203,
+                        "august": 11261.299,
+                        "september": 14929.166,
+                        "october": 12245.856,
+                        "november": 4832.877,
+                        "december": 0.0,
+                        "hj": 122379.19,
+                        "monthList": [
+                            11245.374,
+                            8624.14,
+                            13214.845,
+                            12157.593,
+                            13949.593,
+                            11469.241,
+                            8449.203,
+                            11261.299,
+                            14929.166,
+                            12245.856,
+                            4832.877,
+                            0.0
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 9472.26,
+                        "february": 10492.0,
+                        "march": 11190.0,
+                        "april": 10808.0,
+                        "may": 7301.58,
+                        "june": 9750.0,
+                        "july": 11155.0,
+                        "august": 11325.0,
+                        "september": 9557.0,
+                        "october": 10304.0,
+                        "november": 10225.0,
+                        "december": 10703.0,
+                        "hj": 122282.84,
+                        "monthList": [
+                            9472.26,
+                            10492.0,
+                            11190.0,
+                            10808.0,
+                            7301.58,
+                            9750.0,
+                            11155.0,
+                            11325.0,
+                            9557.0,
+                            10304.0,
+                            10225.0,
+                            10703.0
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 1.1871901742561966,
+                        "february": 0.8219729317575295,
+                        "march": 1.1809512957998212,
+                        "april": 1.1248698186528499,
+                        "may": 1.9104896474461692,
+                        "june": 1.1763324102564103,
+                        "july": 0.7574363962348722,
+                        "august": 0.9943751876379692,
+                        "september": 1.562118447211468,
+                        "october": 1.1884565217391305,
+                        "november": 0.47265300733496335,
+                        "december": 0.0,
+                        "hj": 1.0,
+                        "monthList": [
+                            1.1871901742561966,
+                            0.8219729317575295,
+                            1.1809512957998212,
+                            1.1248698186528499,
+                            1.9104896474461692,
+                            1.1763324102564103,
+                            0.7574363962348722,
+                            0.9943751876379692,
+                            1.562118447211468,
+                            1.1884565217391305,
+                            0.47265300733496335,
+                            0.0
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 0.09196199564877623,
+                        "february": 0.07052616704028136,
+                        "march": 0.10806786136141425,
+                        "april": 0.09942190580460841,
+                        "may": 0.11407645586249061,
+                        "june": 0.0937927267636244,
+                        "july": 0.06909557383521678,
+                        "august": 0.09209222651354844,
+                        "september": 0.12208717102088895,
+                        "october": 0.10014369963929526,
+                        "november": 0.03952211937504887,
+                        "december": 0.0,
+                        "hj": 1.0,
+                        "monthList": [
+                            0.09196199564877623,
+                            0.07052616704028136,
+                            0.10806786136141425,
+                            0.09942190580460841,
+                            0.11407645586249061,
+                            0.0937927267636244,
+                            0.06909557383521678,
+                            0.09209222651354844,
+                            0.12208717102088895,
+                            0.10014369963929526,
+                            0.03952211937504887,
+                            0.0
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 91.0,
+                        "february": 91.0,
+                        "march": 91.0,
+                        "april": 91.0,
+                        "may": 91.0,
+                        "june": 91.0,
+                        "july": 91.0,
+                        "august": 91.0,
+                        "september": 91.0,
+                        "october": 81.2,
+                        "november": 75.4,
+                        "december": null,
+                        "hj": 88.69,
+                        "monthList": [
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            81.2,
+                            75.4,
+                            null
+                        ]
+                    },
+                    {
+                        "dataTime": null,
+                        "theoreticalPower": null,
+                        "availablePower": null,
+                        "actualPowerDq": null,
+                        "veryShortTermForecastDq": null,
+                        "shortTermForecastDq": null,
+                        "actualPowerTq": null,
+                        "veryShortTermForecastTq": null,
+                        "shortTermForecastTq": null,
+                        "actualPowerSy": null,
+                        "veryShortTermForecastSy": null,
+                        "shortTermForecastSy": null,
+                        "actualWindSpeedDq": null,
+                        "forecastWindSpeedDq": null,
+                        "actualWindSpeedTq": null,
+                        "forecastWindSpeedTq": null,
+                        "actualWindSpeedSy": null,
+                        "forecastWindSpeedSy": null,
+                        "january": 91.0,
+                        "february": 91.0,
+                        "march": 91.0,
+                        "april": 91.0,
+                        "may": 91.0,
+                        "june": 91.0,
+                        "july": 91.0,
+                        "august": 91.0,
+                        "september": 91.0,
+                        "october": 88.27,
+                        "november": 81.48,
+                        "december": null,
+                        "hj": 89.89,
+                        "monthList": [
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            91.0,
+                            88.27,
+                            81.48,
+                            null
+                        ]
+                    }
+                ]
     }
 }

src/views/powerPrediction/homePageNoMap.vue

@@ -730,8 +730,8 @@
             },
         },
         mounted() {
-            this.initPageData();
-            // this.initPageFn()
+            // this.initPageData();
+            this.initPageFn()
         },
         beforeRouteLeave(to, from, next) {
             next();

src/views/powerPrediction/panoramicPower.vue

@@ -331,11 +331,11 @@
         },
         mounted() {
             let that = this;
-            that.initPageData();
+            // that.initPageData();
             // that.getChartData();
             that.getWindStatus();
             that.planFiveMin = setInterval(function () {
-                // that.getChartData();
+                that.getChartData();
             }, 300000);
         },
         computed: {

src/views/powerPrediction/powerPredictionPage.vue

@@ -477,9 +477,9 @@
         },
         mounted() {
             let that = this;
-            that.initPageData();
+            // that.initPageData();
             that.planFiveMin = setInterval(function () {
-                // that.seachData();
+                that.seachData();
             }, 300000);
         },
         beforeRouteLeave(to, from, next) {

src/views/powerPrediction/statisticalSummaryPage.vue

@@ -43,28 +43,31 @@
                             <div style="display: flex; margin: 10px 0">
                                 <!-- <el-button type="primary" disabled>年发电量报告</el-button> -->
                             </div>
-                            <div class="tablestyle warn-table" style="margin-top: 20px">
+                            <div class=" warn-table tablestyle">
                                 <el-table :data="tableData" border style="width: 100%"
                                     element-loading-background="rgba(0,0,0,.5)" :header-cell-style="{
                                         padding: '4px',
-                                        fontSize: '11px',
+                                        fontSize: '10px',
                                         fontWeight: bold,
                                         border: '0.5px solid rgba(0,0,0,.5) !important',
                                         }" :cell-style="{
                                         height: '40px',
                                         padding: '3px',
-                                        fontSize: '11px',
+                                        fontSize: '10px',
                                         'border-top': '0px solid rgba(0,0,0,.5)',
                                         'border-bottom': '1px solid rgba(0,0,0,.5)',
                                         'border-right': '1px solid  rgba(0,0,0,.5)',
                                         }">
                                     <el-table-column prop="name" label="月份" width="54" align="center">
-                                    </el-table-column>
-                                    <el-table-column prop="statistic" width="60" label="合计">
+                                        <template #default="scope">
+                                            <span>{{scope.row.name.substring(0,2)}}</span><br>
+                                            <span>{{scope.row.name.substring(2,scope.row.name.length)}}</span>
+                                        </template>
                                     </el-table-column>
                                     <el-table-column :prop="item.value" width="60" :label="item.name"
                                         v-for="(item, index) in tableColumn" :key="index">
                                     </el-table-column>
+                                    <el-table-column prop="statistic" width="60" label="合计" />
                                 </el-table>
                             </div>
                         </div>
@@ -246,6 +249,7 @@
         methods: {
             initPageData() {
                 const that = this;
+                that.stationData = []
                 that.$nextTick(() => {
                     that.stationData = jsonData.dlStationsAllData.list;
                     let obj = {
@@ -305,15 +309,15 @@
                     let monthLen = 0;
                     monthLen = new Date().getMonth() + 1;
                     // 表格数据处理
-                    that.getTableData2(jsonData.annualPowerGenerationReportData.list);
+                    that.getTableData2(jsonData.annualPowerGenerationReportData.list3);
                     // 柱状图数据处理
                     that.getBarData(
-                        jsonData.annualPowerGenerationReportData.list,
+                        jsonData.annualPowerGenerationReportData.list3,
                         monthLen
                     );
                     //饼状图数据处理
                     that.getPieData(
-                        jsonData.annualPowerGenerationReportData.list,
+                        jsonData.annualPowerGenerationReportData.list3,
                         monthLen
                     );
                     that.loading = false;
@@ -539,17 +543,29 @@
                 datas.forEach((it, idx) => {
                     let statisticNum = 0
                     it.name = nameArr[idx]
-                    monthName.forEach(o => {
-                        if (it[o] !== null) {
-                            // it[o] = Number(it[o].toFixed(2))
-                            it[o] = Math.ceil(it[o])
-                            statisticNum = statisticNum + it[o]
-                        } else {
-                            statisticNum = statisticNum + 0
-                        }
-                    })
-                    // it.statistic = statisticNum.toFixed(2)
-                    it.statistic = Math.ceil(statisticNum)
+                    if (it.name === "预测发电" || it.name === "实际发电" || it.name === "计划发电") {
+                        monthName.forEach(o => {
+                            if (it[o] !== null) {
+                                // it[o] = Number(it[o].toFixed(2))
+                                it[o] = Math.ceil(it[o])
+                                statisticNum = statisticNum + it[o]
+                            } else {
+                                statisticNum = statisticNum + 0
+                            }
+                        })
+                        it.statistic = Math.ceil(statisticNum)
+                    } else if (it.name === "当月占比" || it.name === "全年占比") {
+                        monthName.forEach(o => {
+                            if (it[o] !== null) {
+                                it[o] = Number(it[o].toFixed(2))
+                                statisticNum = statisticNum + it[o]
+                            } else {
+                                statisticNum = statisticNum + 0
+                            }
+                        })
+                        it.statistic = statisticNum.toFixed(2)
+                    }
+                    // it.statistic = Math.ceil(statisticNum)
                 })
                 this.tableData = datas;
             },
@@ -581,6 +597,7 @@
                         emphasis: {
                             focus: "series",
                         },
+                        data: []
                     },
                     {
                         name: "实际发电",
@@ -589,6 +606,7 @@
                         emphasis: {
                             focus: "series",
                         },
+                        data: []
                     },
                     {
                         name: "计划发电",
@@ -597,6 +615,7 @@
                         emphasis: {
                             focus: "series",
                         },
+                        data: []
                     },
                 ];
                 datas.forEach((itn) => {
@@ -615,9 +634,9 @@
                         itn.december,
                     ];
                     if (itn.name === "计划发电") {
-                        series[1].data = data;
-                    } else if (itn.name === "实际发电") {
                         series[2].data = data;
+                    } else if (itn.name === "实际发电") {
+                        series[1].data = data;
                     } else if (itn.name === "预测发电") {
                         series[0].data = data;
                     }

src/viewsCss/statisticalSummaryPageLess.less

@@ -105,6 +105,10 @@
                         }
                     }
                 }
+
+                .el-table .cell {
+                    line-height: 20px !important;
+                }
             }
         }
     }