fix():修改数据分析预测bug

1 year ago · 76fec6a085
27 changed files with 358 additions and 129 deletions
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss
@ -432,6 +432,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
-.tooltip-box {
-  //background-color: #3B97FF;
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
 }
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
@ -236,7 +236,7 @@ function CarTypeAly() {
                </div>`
            }
        }
-        setRevenueData({...lineChartOption(areaNames, xAxisData, "车辆数（辆）", seriesData,),...tooltip});
+        setRevenueData({ ...lineChartOption(areaNames, xAxisData, "车辆数（辆）", seriesData,), ...tooltip });
    };
    //新能源车占比 环形图
    const getParkingOption = (data) => {
@ -267,9 +267,9 @@ function CarTypeAly() {
        }
        const areaNames = ["大型车", "中型车", "小型车"];
        let todata = [
-            { value: parseFloat(data.big_car_rato), name: "大型车" ,num:data.big_car},
-            { value: parseFloat(data.mid_car_rato), name: "中型车"  ,num:data.mid_car},
-            { value: parseFloat(data.little_car_rato), name: "小型车"  ,num:data.little_car},
+            { value: parseFloat(data.big_car_rato), name: "大型车", num: data.big_car },
+            { value: parseFloat(data.mid_car_rato), name: "中型车", num: data.mid_car },
+            { value: parseFloat(data.little_car_rato), name: "小型车", num: data.little_car },
        ]
        let tooltip = {
            formatter: (params) => {
@ -605,10 +605,15 @@ function CarTypeAly() {
                                >
                                    <i>?</i>
                                </Tooltip>
+                                {
+                                    parkingData.series ?
                                        <ReactEcharts
                                            option={parkingData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
+
                            </div>
                            <div className="result-box parkinglive-right">
                                <div className="result-box-title">车型分类</div>
@ -618,10 +623,14 @@ function CarTypeAly() {
                                >
                                    <i>?</i>
                                </Tooltip>
+                                {
+                                    carTypeData.series ?
                                        <ReactEcharts
                                            option={carTypeData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
                            </div>
                        </div>
                        <div className="parkinglive-box">
@ -633,10 +642,14 @@ function CarTypeAly() {
                                >
                                    <i>?</i>
                                </Tooltip>
+                                {
+                                    revenueData.series ?
                                        <ReactEcharts
                                            option={revenueData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
                            </div>
                            <div className="result-box  parkinglive-right">
                                <div className="result-box-title">新能源车排行</div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss
@ -264,3 +264,8 @@ $color-primary : var(--color-primary);
    }
  }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
@ -25,8 +25,8 @@ function NightParkStat() {
    const defaultData = {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
-        car_parking_type:'3',
-        operator_id:'0',
+        car_parking_type: '3',
+        operator_id: '0',
        date_type: '1',
    };
    // 分页数据
@ -551,10 +551,14 @@ function NightParkStat() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                        <div className="result-box">
                            <div className="result-box-title">停车饱和度趋势分析</div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/index.scss
@ -478,4 +478,8 @@ $color-primary : var(--color-primary);
  }

 }
-
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
@ -160,7 +160,10 @@ function ParkBerthAly() {
        //         "turnover": 8.75,
        //     },
        // ]
-        if (!data || data.length <= 0) return
+        if (!data || data.length <= 0) {
+            setRevenueData({})
+            return
+        }
        // 获取所有地区名称
        data.sort((a, b) => {
            return new Date(a.date) - new Date(b.date);
@ -470,10 +473,14 @@ function ParkBerthAly() {
                                    >
                                        <i>?</i>
                                    </Tooltip>
+                                    {
+                                        revenueData.series ?
                                            <ReactEcharts
                                                option={revenueData}
                                                style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                    />
+                                            /> :
+                                            <div className="no-data-box">暂无数据</div>
+                                    }
                                </div>
                                <div className="parkBerth-content">
                                    <div className="result-box-title">日均泊位时长利用率</div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss
@ -284,3 +284,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
@ -590,7 +590,7 @@ function ParkTurnoverAly() {
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
                                    />
                                    :
-                                    <div className="">暂无数据</div>
+                                    <div className="no-data-box">暂无数据</div>
                            }
                        </div>
                        <div className="result-box">
@ -607,9 +607,8 @@ function ParkTurnoverAly() {
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
                                    /> :
-                                    <div className="">暂无数据</div>
+                                    <div className="no-data-box">暂无数据</div>
                            }
-
                        </div>
                        <div className="result-box">
                            <Table
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss
@ -284,3 +284,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
@ -27,7 +27,7 @@ function ParkUsageAly() {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
        car_parking_type: '3',
-        operator_id:'0',
+        operator_id: '0',
        date_type: '1', //
    };
    // 分页数据
@ -213,14 +213,6 @@ function ParkUsageAly() {
        ajax
            .getParkUsageAlyLine(data)
            .then((res) => {
-                res = {
-                    "status": 20000,
-                    "message": "success",
-                    "data": {
-                        "list": [],
-                        "total_records": 0
-                    }
-                }
                if (res.status === 20000) {
                    console.log(res)
                    getRevenueOption(res.data.list);
@ -545,10 +537,14 @@ function ParkUsageAly() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                        <div className="result-box">
                            <Table
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
@ -304,3 +304,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@ -26,7 +26,7 @@ function ParkingAlyDuration() {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
        car_parking_type: '3',
-        operator_id:'0',
+        operator_id: '0',
        date_type: '1',
        //date_type: 1,
    };
@ -420,7 +420,7 @@ function ParkingAlyDuration() {
            },
            xAxis: {
                //data: xAxisData,
-                data: ['0-1小时','1-2小时','2-3小时','3-4小时','4-5小时','5-6小时','6-7小时','7-8小时','8-9小时','9-10小时','10-11小时','11-12小时','12-13小时','13-14小时','14-15小时','15-16小时','16-17小时','17-18小时','18-19小时','19-20小时','20-21小时','21-22小时','22-23小时','23-24小时','24小时以上'],
+                data: ['0-1小时', '1-2小时', '2-3小时', '3-4小时', '4-5小时', '5-6小时', '6-7小时', '7-8小时', '8-9小时', '9-10小时', '10-11小时', '11-12小时', '12-13小时', '13-14小时', '14-15小时', '15-16小时', '16-17小时', '17-18小时', '18-19小时', '19-20小时', '20-21小时', '21-22小时', '22-23小时', '23-24小时', '24小时以上'],
                type: 'category',
                axisLine: {
                    lineStyle: {
@ -910,10 +910,14 @@ function ParkingAlyDuration() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                        <div className="duration-box">
                            <div className="result-box duration-left">
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
@ -432,3 +432,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
@ -26,7 +26,7 @@ function ParkingAlyOverview() {
    const defaultData = {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
-        operator_id:'0',
+        operator_id: '0',
        date_type: '1',
        car_parking_type: '3',
    };
@ -684,18 +684,26 @@ function ParkingAlyOverview() {
                    <div className="result">
                        <div className="result-box">
                            <div className="result-box-title">停车趋势分析</div>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                        <div className="parkinglive-box">
                            <div className="result-box overview-left">
                                <div className="result-box-title">停车资源利用情况分析</div>
+                                {
+                                    ringData.series ?
                                        <ReactEcharts
                                            option={ringData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
                            </div>
                            <div className="result-box overview-right">
                                <div className="result-box-title">停车资源利用率排行榜</div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss
@ -419,3 +419,8 @@ $color-primary : var(--color-primary);
  background-color: #3b97ff;
 }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
@ -173,12 +173,19 @@ function ParkingAlyPeriod() {

            };
        });
-        setRevenueData({...lineChartOption(areaNames, xAxisData, "车次数（个）", seriesData),
-                tooltip: {
-                trigger: "axis",
-                //formatter: "{a}<br/>{b}：{c}",
-            },
-        });
+        let tooltip = {
+            formatter: (params) => {
+                var str = "";
+                str = params[0].axisValue.match(/(\S*):/) ? params[0].axisValue.match(/(\S*):/) : params[0].axisValue
+                str = str[1] ? str[1] + ':59时' : str
+                return `<div class="tooltip-box">
+                ${params[0].axisValue}-${str}<br/>
+                出场次数：${params[0].data}(次)<br/>
+                入场次数：${params[1].data}(次)
+                </div>`
+            }
+        }
+        setRevenueData({ ...lineChartOption(areaNames, xAxisData, "车次数（个）", seriesData), ...tooltip });
    };
    //停车饱和趋势分析分析 折线图
    const getParkOption = (data) => {
@ -657,21 +664,27 @@ function ParkingAlyPeriod() {
                                />
                            </div>
                            {
-                                formData.paytype == 0 ? <>
+                                formData.paytype == 0 ?
+                                    (hourData.series ?
                                        <ReactEcharts
                                            key={keyVal}
                                            option={hourData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                    />
-                                </>
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                    )
                                    :
-                                    <>
+                                    (
+                                        parkData.series ?
                                            <ReactEcharts
                                                key="9999"
                                                option={parkData}
                                                style={{ height: "300px", width: "100%", overflow: "hidden" }}
                                            />
-                                    </>
+                                            :
+                                            <div className="no-data-box">暂无数据</div>
+                                    )
+

                            }

--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss
@ -275,3 +275,8 @@ $color-primary : var(--color-primary);
    }
  }
 }
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
@ -26,7 +26,7 @@ function ParkingLiveData() {
    const defaultData = {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
-        operator_id:'0',
+        operator_id: '0',
    };
    // 分页数据
    const [pageInfo, setPageInfo] = useState({
@ -90,7 +90,10 @@ function ParkingLiveData() {
    // }, [isAjax]);
    //出入场趋势
    const getRevenueOption = (data) => {
-        if (!data.entry_list) return
+        if (!data.entry_list || data.entry_list.length <= 0) {
+            setRevenueData({})
+            return
+        }
        data.entry_list.sort((a, b) => {
            return new Date(a.hour) - new Date(b.hour);
        });
@ -139,7 +142,19 @@ function ParkingLiveData() {

            };
        });
-        setRevenueData(lineChartOption(areaNames, xAxisData, "数量（次）", seriesData));
+        let tooltip = {
+            formatter: (params) => {
+                var str = "";
+                str = params[0].axisValue.match(/(\S*):/) ? params[0].axisValue.match(/(\S*):/) : params[0].axisValue
+                str = str[1] ? str[1] + ':59' : str
+                return `<div class="tooltip-box">
+                ${params[0].axisValue}-${str}<br/>
+                入场次数：${params[0].data}(次)<br/>
+                出场次数：${params[1].data}(次)
+                </div>`
+            }
+        }
+        setRevenueData({ ...lineChartOption(areaNames, xAxisData, "数量（次）", seriesData), ...tooltip });
    };
    //泊位占用趋势
    const getLineOption = (data) => {
@ -147,7 +162,6 @@ function ParkingLiveData() {
            setParkingData({})
            return
        }
-        if (!data || data.length <= 0) return
        // 获取所有地区名称
        data.sort((a, b) => {
            return new Date(a.hour) - new Date(b.hour);
@ -194,7 +208,15 @@ function ParkingLiveData() {

            };
        });
-        setParkingData(lineChartOption(areaNames, xAxisData, "泊位占用率", seriesData));
+        let tooltip = {
+            formatter: (params) => {
+                return `<div class="tooltip-box">
+                时间：${params[0].axisValue}<br/>
+                占用率：${params[0].value}%<br/>
+                </div>`
+            }
+        }
+        setParkingData({ ...lineChartOption(areaNames, xAxisData, "泊位占用率", seriesData), ...tooltip });
    };
    //泊位占用率 环形图
    const getParkingOption = (data) => {
@ -202,12 +224,21 @@ function ParkingLiveData() {
            setRingData({})
            return
        }
-        const areaNames = [data.vacant_name, data.occupied_name];
+        const areaNames = [data.occupied_name, data.vacant_name];
        let todata = [
-            { value: parseFloat(data.vacancy_rate), name: data.vacant_name },
-            { value: parseFloat(data.occupancy_rate), name: data.occupied_name },
+            { value: parseFloat(data.vacancy_rate), name: data.vacant_name, num: data.vacant_berths },
+            { value: parseFloat(data.occupancy_rate), name: data.occupied_name, num: data.occupied_berths },
        ]
-        setRingData(ringChartOption(areaNames, todata));
+        let tooltip = {
+            formatter: (params) => {
+                return `<div class="tooltip-box">
+                ${params.name}<br/>
+                数量：${params.data.num}(辆)<br/>
+                占比：${params.data.value}%
+                </div>`
+            }
+        }
+        setRingData(ringChartOption(areaNames, todata, tooltip));
    };
    //会员车占比 环形图
    const getRingOption = (data) => {
@ -217,10 +248,19 @@ function ParkingLiveData() {
        }
        const areaNames = [data.member_name, data.no_member_name];
        let todata = [
-            { value: parseFloat(data.member_car_percentage), name: data.member_name },
-            { value: parseFloat(data.non_member_car_percentage), name: data.no_member_name },
+            { value: parseFloat(data.member_car_percentage), name: data.member_name, num: data.member_car_count },
+            { value: parseFloat(data.non_member_car_percentage), name: data.no_member_name, num: data.non_member_car_count },
        ]
-        setCarData(ringChartOption(areaNames, todata));
+        let tooltip = {
+            formatter: (params) => {
+                return `<div class="tooltip-box">
+                ${params.name}<br/>
+                数量：${params.data.num}(辆)<br/>
+                占比：${params.data.value}%
+                </div>`
+            }
+        }
+        setCarData(ringChartOption(areaNames, todata, tooltip));
    };

    function getParkingIncome(data) {
@ -382,10 +422,14 @@ function ParkingLiveData() {
                                >
                                    <i>?</i>
                                </Tooltip>
+                                {
+                                    ringData.series ?
                                        <ReactEcharts
                                            option={ringData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
                            </div>
                            <div className="result-box parkinglive-right">
                                <div className="result-box-title">在场会员车占比</div>
@ -395,10 +439,14 @@ function ParkingLiveData() {
                                >
                                    <i>?</i>
                                </Tooltip>
+                                {
+                                    carData.series ?
                                        <ReactEcharts
                                            option={carData}
                                            style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                                />
+                                        /> :
+                                        <div className="no-data-box">暂无数据</div>
+                                }
                            </div>
                        </div>
                        <div className="result-box">
@ -409,17 +457,25 @@ function ParkingLiveData() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                        <div className="result-box">
                            <div className="result-box-title">泊位占用趋势</div>
+                            {
+                                parkingData.series ?
                                    <ReactEcharts
                                        option={parkingData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
                        </div>
                    </div>
                </div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss
@ -367,3 +367,8 @@ $color-primary : var(--color-primary);
      
  }
 } 
+.no-data-box {
+  text-align: center;
+  height: 100px;
+  line-height: 100px;
+}
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
@ -25,8 +25,8 @@ function TemporaryParkStat() {
    const defaultData = {
        start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
        end_time: moment().endOf("day").format("YYYY-MM-DD"),
-        car_parking_type:'3',
-        operator_id:'0',
+        car_parking_type: '3',
+        operator_id: '0',
        date_type: '1',
    }
    // 分页数据
@ -492,10 +492,15 @@ function TemporaryParkStat() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                ringData.series ?
                                    <ReactEcharts
                                        option={ringData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>
+                            }
+
                            <div className="lstc-text">总停车次数：{totalNum || '--'}</div>
                        </div>
                        <div className="result-box">
@ -506,10 +511,13 @@ function TemporaryParkStat() {
                            >
                                <i>?</i>
                            </Tooltip>
+                            {
+                                revenueData.series ?
                                    <ReactEcharts
                                        option={revenueData}
                                        style={{ height: "300px", width: "100%", overflow: "hidden" }}
-                            />
+                                    /> :
+                                    <div className="no-data-box">暂无数据</div>}
                        </div>

                    </div>
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
@ -88,7 +88,7 @@ const ringChartOption = (areaNames, ringData, tooltip) => {
            },
        },
        tooltip: tooltip ? tooltip : {
-            formatter: formatter ? formatter : '{b}：{d}%',
+            formatter: '{b}：{d}%',
            //trigger: "axis",
            // textStyle: {                                                // 提示框浮层的文本样式
            //     color: '#fff',                                          // 文字的颜色
--- a/src/pages/FinancialMgm/PayConf/AppConf/index.jsx
+++ b/src/pages/FinancialMgm/PayConf/AppConf/index.jsx
@ -402,6 +402,7 @@ function AppConfiguration(props) {
                dataSource={resultData?.list || []}
                columns={tableColumns}
                pagination={false}
+                scroll={{ y: "calc(100vh - 310px)" }}
                loading={tabLoading}
              />
              <Pagination {...paginationProps} className="pagination-common" />
--- a/src/pages/FinancialMgm/PayConf/AppConf/index.scss
+++ b/src/pages/FinancialMgm/PayConf/AppConf/index.scss
@ -208,13 +208,37 @@ $color-primary : var(--color-primary);
      margin-left: 20px;
    }
  }
-  .form-container{
-    .ant-form-item{
-      .ant-form-item-label{
-        label{
+
+  .form-container {
+    .ant-form-item {
+      .ant-form-item-label {
+        label {
          line-height: 32px;
        }
      }
    }
  }
 }
+/*定义滚动条高宽及背景
+ 高宽分别对应横竖滚动条的尺寸*/
+::-webkit-scrollbar {
+  width: 6px;
+  height: 16px;
+  background-color: #5c5c5c;
+}
+
+/*定义滚动条轨道
+  内阴影+圆角*/
+::-webkit-scrollbar-track {
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+  border-radius: 10px;
+  background-color: #9da2ab;
+}
+
+/*定义滑块
+  内阴影+圆角*/
+::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+  background-color: #3b97ff;
+}
--- a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx
+++ b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx
@ -708,6 +708,7 @@ function MerchantConfiguration(props) {
                dataSource={resultData?.list || []}
                columns={tableColumns}
                pagination={false}
+                scroll={{ y: "calc(100vh - 310px)" }}
                loading={tabLoading}
              />
              <Pagination {...paginationProps} className="pagination-common" />
--- a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss
+++ b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss
@ -210,3 +210,27 @@ $color-primary : var(--color-primary);
  }

 }
+
+  /*定义滚动条高宽及背景
+ 高宽分别对应横竖滚动条的尺寸*/
+  ::-webkit-scrollbar {
+    width: 6px;
+    height: 16px;
+    background-color: #5c5c5c;
+  }
+
+  /*定义滚动条轨道
+  内阴影+圆角*/
+  ::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: 10px;
+    background-color: #9da2ab;
+  }
+
+  /*定义滑块
+  内阴影+圆角*/
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+    background-color: #3b97ff;
+  }
--- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx
+++ b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx
@ -566,6 +566,7 @@ function PlatformConfiguration(props) {
                dataSource={resultData?.list || []}
                columns={tableColumns}
                pagination={false}
+                scroll={{ y: "calc(100vh - 310px)" }}
                loading={tabLoading}
              />
              <Pagination {...paginationProps} className="pagination-common" />
--- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss
+++ b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss
@ -225,3 +225,27 @@ $color-primary : var(--color-primary);
  }

 }
+
+  /*定义滚动条高宽及背景
+ 高宽分别对应横竖滚动条的尺寸*/
+  ::-webkit-scrollbar {
+    width: 6px;
+    height: 16px;
+    background-color: #5c5c5c;
+  }
+
+  /*定义滚动条轨道
+  内阴影+圆角*/
+  ::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    border-radius: 10px;
+    background-color: #9da2ab;
+  }
+
+  /*定义滑块
+  内阴影+圆角*/
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
+    background-color: #3b97ff;
+  }