From 3c390e7c6e3151ebdbaddf8482ca3b60cf7b9e6c Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 26 Jan 2024 18:00:36 +0800 Subject: [PATCH] =?UTF-8?q?fix():bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingBusinessAly/CarTypeAly/loadable.jsx | 2 +- .../ParkingBusinessAly/NightParkStat/loadable.jsx | 2 +- .../ParkTurnoverAly/loadable.jsx | 2 +- .../ParkingBusinessAly/ParkUsageAly/loadable.jsx | 2 +- .../ParkingAlyDuration/loadable.jsx | 2 +- .../ParkingAlyOverview/loadable.jsx | 2 +- .../ParkingAlyPeriod/loadable.jsx | 2 +- .../ParkingAlyReport/loadable.jsx | 2 +- .../ParkingFalseAlarms/loadable.jsx | 2 +- .../ParkingLiveData/loadable.jsx | 16 ++++++------- .../TemporaryParkStat/loadable.jsx | 2 +- .../OperationCenter/CarMgm/CarInfo/loadable.jsx | 27 +++++++++++----------- .../OperationCenter/UserMgm/UserInfo/loadable.jsx | 22 +++++++++--------- .../OutDeviceMgm/OutMonitorMgm/loadable.jsx | 4 ++-- .../OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx | 3 ++- .../OutSegmentMgm/ChargeRulesMgm/Detail.jsx | 22 +++++++++--------- 16 files changed, 58 insertions(+), 56 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 599a61c..05f0b93 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -625,7 +625,7 @@ function CarTypeAly() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx index a4f6957..3fa66d3 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx @@ -588,7 +588,7 @@ function NightParkStat() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx index cb72583..d80c73e 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx @@ -616,7 +616,7 @@ function ParkTurnoverAly() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index e1c12a7..04e8d8f 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -565,7 +565,7 @@ function ParkUsageAly() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index d0f1868..84ab737 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -882,7 +882,7 @@ function ParkingAlyDuration() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index bb17d5f..3d8d00b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx @@ -674,7 +674,7 @@ function ParkingAlyOverview() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx index c44a093..5a04ff0 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx @@ -668,7 +668,7 @@ function ParkingAlyPeriod() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx index ced41f2..e7a7780 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx @@ -512,7 +512,7 @@ function ParkingAlyReport() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx index 3072f15..240c5b9 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx @@ -523,7 +523,7 @@ function ParkingFalseAlarms() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx index 8312907..dbd421e 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx @@ -274,7 +274,7 @@ function ParkingLiveData() { function getParkingIncome(data) { ajax - .getParkingLiveDataPark({...data, area_id: sessionTabList?.show }) + .getParkingLiveDataPark({ ...data, area_id: sessionTabList?.show }) .then((res) => { if (res.status === 20000) { console.log(res) @@ -283,7 +283,7 @@ function ParkingLiveData() { }) .catch((err) => console.error(err)); ajax - .getParkingLiveDataVip({...data, area_id: sessionTabList?.show }) + .getParkingLiveDataVip({ ...data, area_id: sessionTabList?.show }) .then((res) => { if (res.status === 20000) { console.log(res) @@ -293,7 +293,7 @@ function ParkingLiveData() { .catch((err) => console.error(err)); ajax - .getParkingLiveDataLine({...data, area_id: sessionTabList?.show }) + .getParkingLiveDataLine({ ...data, area_id: sessionTabList?.show }) .then((res) => { if (res.status === 20000) { console.log(res) @@ -303,7 +303,7 @@ function ParkingLiveData() { .catch((err) => console.error(err)); ajax - .getParkingLiveDataParkLine({...data, area_id: sessionTabList?.show }) + .getParkingLiveDataParkLine({ ...data, area_id: sessionTabList?.show }) .then((res) => { if (res.status === 20000) { console.log(res) @@ -381,9 +381,9 @@ function ParkingLiveData() { res.push(child.id); } }; - useEffect(() => { - getParkingIncome(); - }, []); + // useEffect(() => { + // getParkingIncome(); + // }, []); //区域下拉框数据 useEffect(() => { ajax @@ -435,7 +435,7 @@ function ParkingLiveData() {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx index 177e1fa..76a2272 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx @@ -564,7 +564,7 @@ function TemporaryParkStat() {
diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx index 5fae3c6..b74904a 100644 --- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx @@ -343,7 +343,7 @@ function CarInfo() { name: "region", type: "TreeSelect", label: "区域", - areaName:1 + areaName: 1 }, {//2 name: "operator", @@ -471,7 +471,8 @@ function CarInfo() { type: "Select", label: "支付设备", placeholder: "请选择支付设备", - options: dictionary.PayDevice + test: 1, + options: sysConfig.Equipment }, {//12 name: "pay_type", @@ -552,7 +553,7 @@ function CarInfo() { const [bigPic, setBigPic] = useState(); const [total, setTotal] = useState(0); const [tabKey, setTabKey] = useState("1"); - const [stopCarTab,setStopCarTop]=useState("1") + const [stopCarTab, setStopCarTop] = useState("1") function openModal(params) { setDetailVisible(true); } @@ -793,10 +794,10 @@ function CarInfo() {
入场照片
- { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
- { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
@@ -912,7 +913,7 @@ function CarInfo() { } //其他页面渲染 - function renderTable(columns, arr, dataSource, exportUrl ) { + function renderTable(columns, arr, dataSource, exportUrl) { return ( record.id} /> ); @@ -1176,7 +1177,7 @@ function CarInfo() { createCol(['订单ID', '停车场名称', '车牌号', '泊位号', '入场时间', '计费时间', '停车时长', '应收金额', '优惠金额', '实收金额', '支付渠道', '支付设备', '操作人', '付款车场', '支付时间', '第三方流水ID'], ['order_id', 'road', 'plate', 'berth_id', 'admission_time', 'charging_time', 'parking_duration', 'receivable_amount', 'discount_amount', 'paid_in_money', 'payment_channels', 'payment_equipment', 'dealer', 'pay_road', 'pay_time', 'third_party_flow_id'], 4), [ash[2], ash[9], ash[10], ash[15]], - resultData, + resultData, '/api/bpm/record/get_payment_export' ) : null} @@ -1213,7 +1214,7 @@ function CarInfo() { { renderTable( createCol(['序号', '车牌号', '手机号', '停车场名称', '实付金额', '支付方式', '下单时间', '订单状态', '第三方流水号'], - ['index', 'plate', 'phone', 'road', 'actual_amount', '', '', '',''], 8), + ['index', 'plate', 'phone', 'road', 'actual_amount', '', '', '', ''], 8), [ash[4], ash[2], ash[17], ash[11], ash[14], ash[15], ash[8]], resultData )} @@ -1242,7 +1243,7 @@ function CarInfo() { }} footer={null} > - { + { setStopCarTop(e) }}> @@ -1266,7 +1267,7 @@ function CarInfo() { >
- +
@@ -1302,11 +1303,11 @@ function CarInfo() {
入场图片
车辆照片
- +
车牌照片
- +
diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx index e07db4f..394fa2d 100644 --- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx @@ -486,7 +486,7 @@ function UserInfo() { name: "region", type: "TreeSelect", label: "区域", - areaName:1 + areaName: 1 }, {//2 name: "operator", @@ -1033,10 +1033,10 @@ function UserInfo() { */}
- { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
- { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
@@ -1048,7 +1048,7 @@ function UserInfo() {
- +
用户头像
@@ -1144,10 +1144,10 @@ function UserInfo() {
- { setBigPic(baseData.authImg1); setBigpicVisible(true) }} /> + { setBigPic(baseData.authImg1); setBigpicVisible(true) }} />
- { setBigPic(baseData.authImg2); setBigpicVisible(true) }} /> + { setBigPic(baseData.authImg2); setBigpicVisible(true) }} />
@@ -1482,7 +1482,7 @@ function UserInfo() { >
- +
@@ -1518,11 +1518,11 @@ function UserInfo() {
入场图片
车辆照片
- +
车牌照片
- +
@@ -1847,11 +1847,11 @@ function UserInfo() {
车辆照片
- +
车牌照片
- +
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx index 7b788d4..4396d65 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx @@ -357,7 +357,7 @@ function OutMonitorMgm(props) { form.setFieldsValue(item); getChannelByNvr(item.nvr_id); setBerthSelectData( - item?.berth_ids ? item.berth_ids.split(",").map((v) => Number(v)) : [] + item?.channel_ids ? item.channel_ids.split(",").map((v) => Number(v)) : [] ); setVisible(true); }; @@ -367,7 +367,7 @@ function OutMonitorMgm(props) { }; const onTransferChange = (nextTargetKeys, direction, moveKeys) => { setBerthSelectData(nextTargetKeys); - setRowData({ ...rowData, berth_ids: nextTargetKeys.join(",") }); + setRowData({ ...rowData, channel_ids: nextTargetKeys.join(",") }); }; const onTransferSelectChange = (sourceSelectedKeys, targetSelectedKeys) => { setSelectedKeys([...sourceSelectedKeys, ...targetSelectedKeys]); diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx index 192eb3f..a5e6a8a 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx @@ -306,7 +306,7 @@ function OutNvrMgm(props) { title: "国际编号", dataIndex: "standard_code", align: "center", - width: 250, + width: 280, ellipsis: true }, { @@ -471,6 +471,7 @@ function OutNvrMgm(props) { // 添加按钮 const handleAdd = () => { setRowData(defRowData); + form.setFieldsValue(defRowData) form.setFieldsValue(defRowData); // form.resetFields(); setVisible(true); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx index 4de277a..c0b8ceb 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx @@ -169,21 +169,21 @@ function TimePartDetail(props) { {/*
{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}
*/} - {item.sub ?
{`满：${record.items && record.item.segment} 分钟后，${record.items[0].sub[0].unit}元/${record.items[0].sub[0]?.period}分钟`}
: null} - - - ) - } - { - item.type === 2 && index == 1 && ( - <> - - {/*
{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}
*/} - {
{`满：${item.segment} 分钟后，${item.unit}元/${item.period}分钟`}
} +
{`满：${record.items && record.items[1].segment} 分钟后，${record.items[1].unit}元/${record.items[1]?.period}分钟`}
 ) } + // { + // item.type === 2 && index == 1 && ( + // <> + // + // {/*
{`满：${record.time_before} 分钟后，${record.time_after_money}元/${record.time_after_minute}分钟`}
*/} + // {
{`满：${item.segment} 分钟后，${item.unit}元/${item.period}分钟`}
} + // + // + // ) + // } { record.type === 2 && (