From 76fec6a0852d9a1cb5ca5507703b9c169a3276dc Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 15 Dec 2023 17:58:13 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A2=84=E6=B5=8Bbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingBusinessAly/CarTypeAly/index.scss | 6 +- .../ParkingBusinessAly/CarTypeAly/loadable.jsx | 45 ++++++--- .../ParkingBusinessAly/NightParkStat/index.scss | 5 + .../ParkingBusinessAly/NightParkStat/loadable.jsx | 16 +-- .../ParkingBusinessAly/ParkBerthAly/index.scss | 6 +- .../ParkingBusinessAly/ParkBerthAly/loadable.jsx | 19 ++-- .../ParkingBusinessAly/ParkTurnoverAly/index.scss | 5 + .../ParkTurnoverAly/loadable.jsx | 5 +- .../ParkingBusinessAly/ParkUsageAly/index.scss | 5 + .../ParkingBusinessAly/ParkUsageAly/loadable.jsx | 22 ++-- .../ParkingAlyDuration/index.scss | 5 + .../ParkingAlyDuration/loadable.jsx | 16 +-- .../ParkingAlyOverview/index.scss | 5 + .../ParkingAlyOverview/loadable.jsx | 26 +++-- .../ParkingBusinessAly/ParkingAlyPeriod/index.scss | 5 + .../ParkingAlyPeriod/loadable.jsx | 51 ++++++---- .../ParkingBusinessAly/ParkingLiveData/index.scss | 5 + .../ParkingLiveData/loadable.jsx | 112 +++++++++++++++------ .../TemporaryParkStat/index.scss | 7 +- .../TemporaryParkStat/loadable.jsx | 28 ++++-- .../ParkingBusinessAly/echarts.config.js | 2 +- src/pages/FinancialMgm/PayConf/AppConf/index.jsx | 5 +- src/pages/FinancialMgm/PayConf/AppConf/index.scss | 32 +++++- .../FinancialMgm/PayConf/PayMerchantConf/index.jsx | 1 + .../PayConf/PayMerchantConf/index.scss | 26 ++++- .../PayConf/PlatformMerchantConf/index.jsx | 1 + .../PayConf/PlatformMerchantConf/index.scss | 26 ++++- 27 files changed, 358 insertions(+), 129 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss index 386074d..6b8a639 100644 --- 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; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index aa3fbef..dc8db82 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -236,7 +236,7 @@ function CarTypeAly() { ` } } - 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() { > ? - + { + parkingData.series ? + : +
暂无数据
+ } +
车型分类
@@ -618,10 +623,14 @@ function CarTypeAly() { > ? - + { + carTypeData.series ? + : +
暂无数据
+ }
@@ -633,10 +642,14 @@ function CarTypeAly() { > ? - + { + revenueData.series ? + : +
暂无数据
+ }
新能源车排行
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss index 2803378..dce9a0e 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss @@ -263,4 +263,9 @@ $color-primary : var(--color-primary); margin-left: 20px; } } +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx index 744537a..8aaa6af 100644 --- 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() { > ? - + { + revenueData.series ? + : +
暂无数据
+ }
停车饱和度趋势分析
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/index.scss index 23b8da8..9ef8f74 100644 --- 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; +} diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx index 08205af..ea10914 100644 --- 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); @@ -421,7 +424,7 @@ function ParkBerthAly() { rowKey={'area_name'} rowClassName={(record, index) => { if (keyVal == index) { - setBaseData(record); + setBaseData(record); return "ben" } }} @@ -470,10 +473,14 @@ function ParkBerthAly() { > ? - + { + revenueData.series ? + : +
暂无数据
+ }
日均泊位时长利用率
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss index 4ecda2d..f052d59 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/index.scss @@ -283,4 +283,9 @@ $color-primary : var(--color-primary); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); background-color: #3b97ff; } +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index e8ed8d9..8e62996 100644 --- 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" }} /> : -
暂无数据
+
暂无数据
}
@@ -607,9 +607,8 @@ function ParkTurnoverAly() { option={revenueData} style={{ height: "300px", width: "100%", overflow: "hidden" }} /> : -
暂无数据
+
暂无数据
} -
{ - 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() { > ? - + { + revenueData.series ? + : +
暂无数据
+ }
? - + { + revenueData.series ? + : +
暂无数据
+ }
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss index d6c09b7..6b8a639 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss @@ -431,4 +431,9 @@ $color-primary : var(--color-primary); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); background-color: #3b97ff; } +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index 5bc688d..33c108d 100644 --- 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() {
停车趋势分析
- + { + revenueData.series ? + : +
暂无数据
+ }
停车资源利用情况分析
- + { + ringData.series ? + : +
暂无数据
+ }
停车资源利用率排行榜
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss index 9ae92e3..b04793d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss @@ -418,4 +418,9 @@ $color-primary : var(--color-primary); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3); background-color: #3b97ff; } +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx index 9f72c0c..e22ac57 100644 --- 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}
{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 `
+ ${params[0].axisValue}-${str}
+ 出场次数：${params[0].data}(次)
+ 入场次数：${params[1].data}(次) +
` + } + } + setRevenueData({ ...lineChartOption(areaNames, xAxisData, "车次数（个）", seriesData), ...tooltip }); }; //停车饱和趋势分析分析 折线图 const getParkOption = (data) => { @@ -657,21 +664,27 @@ function ParkingAlyPeriod() { />
{ - formData.paytype == 0 ? <> - - - : - <> + formData.paytype == 0 ? + (hourData.series ? - + /> : +
暂无数据
+ ) + : + ( + parkData.series ? + + : +
暂无数据
+ ) + } diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss index f14b7f8..9993d3b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/index.scss @@ -274,4 +274,9 @@ $color-primary : var(--color-primary); margin-left: 20px; } } +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; } \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx index 996dcec..705f701 100644 --- 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 `
+ ${params[0].axisValue}-${str}
+ 入场次数：${params[0].data}(次)
+ 出场次数：${params[1].data}(次) +
` + } + } + 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 `
+ 时间：${params[0].axisValue}
+ 占用率：${params[0].value}%
+
` + } + } + 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 `
+ ${params.name}
+ 数量：${params.data.num}(辆)
+ 占比：${params.data.value}% +
` + } + } + 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 `
+ ${params.name}
+ 数量：${params.data.num}(辆)
+ 占比：${params.data.value}% +
` + } + } + setCarData(ringChartOption(areaNames, todata, tooltip)); }; function getParkingIncome(data) { @@ -382,10 +422,14 @@ function ParkingLiveData() { > ? - + { + ringData.series ? + : +
暂无数据
+ }
在场会员车占比
@@ -395,10 +439,14 @@ function ParkingLiveData() { > ? - + { + carData.series ? + : +
暂无数据
+ }
@@ -409,17 +457,25 @@ function ParkingLiveData() { > ? - + { + revenueData.series ? + : +
暂无数据
+ }
泊位占用趋势
- + { + parkingData.series ? + : +
暂无数据
+ }
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss index 092ed07..268ad16 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss @@ -366,4 +366,9 @@ $color-primary : var(--color-primary); } } -} \ No newline at end of file +} +.no-data-box { + text-align: center; + height: 100px; + line-height: 100px; +} \ No newline at end of file diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx index 9230eff..be2d24c 100644 --- 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() { > ? - + { + ringData.series ? + : +
暂无数据
+ } +
总停车次数：{totalNum || '--'}
@@ -506,10 +511,13 @@ function TemporaryParkStat() { > ? - + { + revenueData.series ? + : +
暂无数据
}
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js index 929e79f..97db570 100644 --- 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', // 文字的颜色 diff --git a/src/pages/FinancialMgm/PayConf/AppConf/index.jsx b/src/pages/FinancialMgm/PayConf/AppConf/index.jsx index df3eb7f..6fa139c 100644 --- a/src/pages/FinancialMgm/PayConf/AppConf/index.jsx +++ b/src/pages/FinancialMgm/PayConf/AppConf/index.jsx @@ -38,8 +38,8 @@ function AppConfiguration(props) { }; // 分页数据 const [pageInfo, setPageInfo] = useState({ - pn: 1, - page_size: 15, + pn: 1, + page_size: 15, }); // 表单数据 const [formData, setFormData] = useState({ @@ -402,6 +402,7 @@ function AppConfiguration(props) { dataSource={resultData?.list || []} columns={tableColumns} pagination={false} + scroll={{ y: "calc(100vh - 310px)" }} loading={tabLoading} /> diff --git a/src/pages/FinancialMgm/PayConf/AppConf/index.scss b/src/pages/FinancialMgm/PayConf/AppConf/index.scss index a745ccc..abe1a87 100644 --- 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; } \ No newline at end of file diff --git a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.jsx index f2a42ab..b124ab5 100644 --- 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} /> diff --git a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss index ac59eed..a9f1888 100644 --- a/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss +++ b/src/pages/FinancialMgm/PayConf/PayMerchantConf/index.scss @@ -209,4 +209,28 @@ $color-primary : var(--color-primary); } } -} \ No newline at end of file +} + + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-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; + } diff --git a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx index 0a0c414..6a04cf1 100644 --- 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} /> diff --git a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss index 205109b..ea0ec95 100644 --- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss +++ b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.scss @@ -224,4 +224,28 @@ $color-primary : var(--color-primary); } } -} \ No newline at end of file +} + + /*定义滚动条高宽及背景 + 高宽分别对应横竖滚动条的尺寸*/ + ::-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; + } \ No newline at end of file