Parcourir la source

配合后端修改问题

SunZehao il y a 10 mois
Parent
commit
736adb8395

+ 40 - 26
src/views/generatingCapacity/dataAnalysis/posAnalysis/index.vue

@@ -726,19 +726,26 @@
                                 },
                             },
                             isRadar: false,
-                            series: chart.roses.length ?
-                                chart.roses.map((o, index) => {
-                                    return {
-                                        type: "bar",
-                                        data: o,
-                                        coordinateSystem: "polar",
-                                        name: funText(index),
-                                        stack: "a",
-                                        emphasis: {
-                                            focus: "series",
-                                        },
-                                    };
-                                }) : [],
+                            series:
+                            // chart.roses.length ?
+                            //     chart.roses.map((o, index) => {
+                            //         return {
+                            //             type: "bar",
+                            //             data: o,
+                            //             coordinateSystem: "polar",
+                            //             name: funText(index),
+                            //             stack: "a",
+                            //             emphasis: {
+                            //                 focus: "series",
+                            //             },
+                            //         };
+                            //     }) : [],
+                            {
+                                type: 'bar',
+                                data: chart.roses,
+                                coordinateSystem: 'polar',
+                                name: '方位风速',
+                            }
                         });
                         chartId++;
                         chartData.value.push({
@@ -1010,19 +1017,26 @@
                                     },
                                 },
                                 isRadar: false,
-                                series: chart.roses.length ?
-                                    chart.roses.map((o, index) => {
-                                        return {
-                                            type: "bar",
-                                            data: o,
-                                            coordinateSystem: "polar",
-                                            name: funText(index),
-                                            stack: "a",
-                                            emphasis: {
-                                                focus: "series",
-                                            },
-                                        };
-                                    }) : [],
+                                series:
+                                // chart.roses.length ?
+                                //     chart.roses.map((o, index) => {
+                                //         return {
+                                //             type: "bar",
+                                //             data: o,
+                                //             coordinateSystem: "polar",
+                                //             name: funText(index),
+                                //             stack: "a",
+                                //             emphasis: {
+                                //                 focus: "series",
+                                //             },
+                                //         };
+                                //     }) : [],
+                                {
+                                    type: 'bar',
+                                    data: chart.roses,
+                                    coordinateSystem: 'polar',
+                                    name: '方位风速',
+                                }
                             });
                             chartId++;
                         }

+ 4 - 2
src/views/generatingCapacity/dataAnalysis/rateAnalysis/components/chart.vue

@@ -97,14 +97,16 @@
                 radiusAxis: {},
                 polar: {
                     radius: '70%',
-                    center: ['60%', '50%']
+                    center: props.subtext !== '风速风向玫瑰图' ? ['60%', '50%'] : ['50%', '50%']
                 },
                 radar: radar,
                 tooltip: {
                     formatter: (params) => {
                         return params.componentSubType === 'radar' ?
                             `${params.marker}${params.seriesName}` :
-                            `${params.marker}${params.seriesName}m<br/>${params.value>1? '频次:'+ params.value: ''}`
+                            props.subtext !== '风速风向玫瑰图' ?
+                            `${params.marker}${params.seriesName}m<br/>${params.value>1? '频次:'+ params.value: ''}` :
+                            `${params.marker}${params.seriesName}<br/>${'最大风速:'+ params.value}m/s`
                     },
                     confine: true
                 },

+ 39 - 27
src/views/generatingCapacity/dataAnalysis/rateAnalysis/index.vue

@@ -353,26 +353,31 @@
                         xAxis: {
                             type: 'category',
                             boundaryGap: false,
-                            data: ['N', '', 'N-E', '', 'E', '', 'S-E', '', 'S', '', 'S-W', '', 'W', '',
-                                'W-N', ''
-                            ],
+                            data: ['N', 'N-E', 'E', 'S-E', 'S', 'S-W', 'W', 'W-N'],
                             splitLine: {
                                 show: true
                             },
                         },
                         isRadar: false,
-                        series: chart.roses.length ? chart.roses.map((o, index) => {
-                            return {
-                                type: 'bar',
-                                data: o,
-                                coordinateSystem: 'polar',
-                                name: funText(index),
-                                stack: 'a',
-                                emphasis: {
-                                    focus: 'series'
-                                }
-                            }
-                        }) : []
+                        series:
+                        // chart.roses.length ? chart.roses.map((o, index) => {
+                        //     return {
+                        //         type: 'bar',
+                        //         data: o,
+                        //         coordinateSystem: 'polar',
+                        //         name: funText(index),
+                        //         stack: 'a',
+                        //         emphasis: {
+                        //             focus: 'series'
+                        //         }
+                        //     }
+                        // }) : 
+                        {
+                            type: 'bar',
+                            data: chart.roses,
+                            coordinateSystem: 'polar',
+                            name: '方位风速',
+                        }
                     })
                     chartId++
                     chartData.value.push({
@@ -726,18 +731,25 @@
                                     },
                                 },
                                 isRadar: false,
-                                series: chart.roses.length ? chart.roses.map((o, index) => {
-                                    return {
-                                        type: 'bar',
-                                        data: o,
-                                        coordinateSystem: 'polar',
-                                        name: funText(index),
-                                        stack: 'a',
-                                        emphasis: {
-                                            focus: 'series'
-                                        }
-                                    }
-                                }) : []
+                                series:
+                                // chart.roses.length ? chart.roses.map((o, index) => {
+                                //     return {
+                                //         type: 'bar',
+                                //         data: o,
+                                //         coordinateSystem: 'polar',
+                                //         name: funText(index),
+                                //         stack: 'a',
+                                //         emphasis: {
+                                //             focus: 'series'
+                                //         }
+                                //     }
+                                // }) : []
+                                {
+                                    type: 'bar',
+                                    data: chart.roses,
+                                    coordinateSystem: 'polar',
+                                    name: '方位风速',
+                                }
                             })
                             chartId++
                         }