修改问题

src/pages/index.tsx

@@ -126,14 +126,20 @@ const Admin: React.FC = () => {
         getChartData()
         const interval = setInterval(()=>{
             getChartData()
+           
+        },10000)
+        const interval2 = setInterval(()=>{
             if(barIndexRef.current == 0){
                 setBarIndex(1)
             }else{
                 setBarIndex(0)
             }
-        },30000)
+        },22200)
 
-        return () => clearInterval(interval)
+        return () => {
+            clearInterval(interval)
+            clearInterval(interval2)
+        }
     }, [])
 
     useEffect(() => {
@@ -146,52 +152,24 @@ const Admin: React.FC = () => {
 
     useEffect(() => {
         barIndexRef.current = barIndex;
+        let list = !barIndexRef.current ? chart3Data?.nameList : chart3Data?.nameListAbroad;
+        let list2 = !barIndexRef.current ? chart3Data?.data : chart3Data?.dataAbroad;
         setChartOptions3({
             yAxis: {
-                type: 'category',
-                data: !barIndex ? chart3Data?.nameList : chart3Data?.nameListAbroad,
-                axisTick: {
-                    show: false
-                },
-                nameTextStyle: {
-                    color: '#606060'
-                }
+                data: list,
             },
             series: [
-                {
-                    name: '航司销售额统计',
-                    type: 'bar',
-                    data: !barIndex ? chart3Data.data : chart3Data.dataAbroad,
-                    itemStyle: {
-                        // 设置柱状渐变色  
-                        color: new echarts.graphic.LinearGradient(
-                            0, 0, 1, 0, // 横向渐变，从左到右（x0, y0, x2, y2）  
-                            [
-                                { offset: 0, color: '#2667EC' }, // 起始颜色  
-                                { offset: 1, color: '#13C7FC' }  // 结束颜色  
-                            ]
-                        ),
-                    },
-                    label: {
-                        show: true, // 显示标签  
-                        position: 'right', // 标签显示在柱子顶部  
-                        formatter: '{c}', // 格式化标签内容，{c}表示当前柱子的数值  
-                        color: 'black', // 标签颜色，可以根据需要设置  
-                        fontSize: 12, // 标签字体大小，可以根据需要设置  
-                        // 其他label配置，如rich、backgroundColor、padding等，根据需要设置  
-                    },
-                    barWidth: '50%'
-                },
+                {data: list2},
             ]
         })
         if(isModalOpen && chartIndex == 3){
             setOptions({
                 yAxis: {
-                    data: !barIndex ? chart3Data.nameList : chart3Data.nameListAbroad,
+                    data: list,
                 },
                 series: [
                     {
-                        data: !barIndex ? chart3Data.data : chart3Data.dataAbroad,
+                        data: list2,
                     },
                 ]
             })
@@ -252,6 +230,7 @@ const Admin: React.FC = () => {
             res.nameList = res.nameList.reverse()
             res.nameListAbroad = res.nameListAbroad.reverse()
             setChart3Data(res)
+            setBarIndex(0)
             setChartOptions3({
                 yAxis: {
                     data: res.nameList,  
@@ -470,7 +449,7 @@ const Admin: React.FC = () => {
                     </div>
                 </div>
                 <div className={`${styles.leftLi} ${styles.displayFlex}`}>
-                    <div className={styles.chartBox2} style={{ width: '155px' }} onClick={() => openChart(2)}>
+                    <div className={styles.chartBox2} style={{ width: '180px' }} onClick={() => openChart(2)}>
                         <div className={styles.chartTitle}>国际销售额占比</div>
                         <ReactEcharts option={chartOptions2} style={{ height: '178px', width: '100%' }} />
                         <div className={`${styles.magnifier2}`}><img src={`${magnifierImg}`} alt="" /></div>

src/services/chartOption.ts

@@ -537,7 +537,7 @@ const chartDefaultOptions8 = {
             data: [].sort(function (a, b) {
                 return b.value - a.value;
             }),
-            roseType: 'radius',
+            // roseType: 'radius',
             label: {
                 show: false
             },
@@ -810,7 +810,7 @@ function chartPopDefaultOptions3Fun(data:any) {
         },
         yAxis: {
             type: 'category',
-            data: data.nameList.reverse(),
+            data: data.nameList,
             axisTick: {
                 show: false
             },
@@ -833,7 +833,7 @@ function chartPopDefaultOptions3Fun(data:any) {
             {
                 name: '航司销售额统计',
                 type: 'bar',
-                data: data.data.reverse(),
+                data: data.data,
                 itemStyle: {
                     // 设置柱状渐变色  
                     color: new echarts.graphic.LinearGradient(
@@ -1168,7 +1168,7 @@ function chartPopDefaultOptions8Fun(data:any) {
                 data: data.sort(function (a, b) {
                     return b.value - a.value;
                 }),
-                roseType: 'radius',
+                // roseType: 'radius',
                 label: {
                     show: false
                 },