Browse Source

fix():bug修改

tags/PMS_V1.0.0_Alpha6
xingjx 1 year ago
parent
commit
3c390e7c6e
  1. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
  2. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
  3. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
  4. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
  5. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  6. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  7. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
  8. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx
  9. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx
  10. 16
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
  11. 2
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
  12. 27
      src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
  13. 22
      src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx
  14. 4
      src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
  15. 3
      src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
  16. 22
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx

@ -625,7 +625,7 @@ function CarTypeAly() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx

@ -588,7 +588,7 @@ function NightParkStat() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx

@ -616,7 +616,7 @@ function ParkTurnoverAly() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx

@ -565,7 +565,7 @@ function ParkUsageAly() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@ -882,7 +882,7 @@ function ParkingAlyDuration() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx

@ -674,7 +674,7 @@ function ParkingAlyOverview() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => {setFormData({...defaultData});setShow([])}}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx

@ -668,7 +668,7 @@ function ParkingAlyPeriod() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx

@ -512,7 +512,7 @@ function ParkingAlyReport() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingFalseAlarms/loadable.jsx

@ -523,7 +523,7 @@ function ParkingFalseAlarms() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

16
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() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

2
src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx

@ -564,7 +564,7 @@ function TemporaryParkStat() {
<div className="form-btn">
<Button
className="reset"
onClick={() => setFormData(defaultData)}
onClick={() => { setFormData({ ...defaultData }); setShow([]) }}
>
重置
</Button>

27
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() {
<div className="ltc-box-title"><div className="text">入场照片</div><div className="line"></div></div>
<div className="ltc-content">
<div className="ltc-item ltc-item-img ">
<img src={params.in_veh_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
<img src={params.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
</div>
<div className="ltc-item ltc-item-img ">
<img src={params.in_plate_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
<img src={params.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
</div>
</div>
</div>
@ -912,7 +913,7 @@ function CarInfo() {
}
//
function renderTable(columns, arr, dataSource, exportUrl ) {
function renderTable(columns, arr, dataSource, exportUrl) {
return (
<TableModule
columns={columns}
@ -922,7 +923,7 @@ function CarInfo() {
search={searchOther}
isExport={exportUrl ? true : false}
exportUrl={exportUrl}
export_other={{carId:carId}}
export_other={{ carId: carId }}
rowKey={(record) => 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}
</Tabs.TabPane>
@ -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}
>
<Tabs activeKey={stopCarTab} onChange={(e)=>{
<Tabs activeKey={stopCarTab} onChange={(e) => {
setStopCarTop(e)
}}>
<Tabs.TabPane tab="停车记录信息" key="1">
@ -1266,7 +1267,7 @@ function CarInfo() {
>
<div>
<div className="eae-modal-item">
<img src={bigPic} width={1550} onError={handleImgError}/>
<img src={bigPic || require("../../../../../src/assets/images/error-img-new.png")} width={1550} onError={handleImgError} />
</div>
</div>
</Modal>
@ -1302,11 +1303,11 @@ function CarInfo() {
<div className="eae-modal-title"><div className="ltc-icon"></div>入场图片</div>
<div className="eae-modal-item">
<div>车辆照片</div>
<img src={ycddData.in_veh_pic} width={750} onError={handleImgError}/>
<img src={ycddData.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} width={750} onError={handleImgError} />
</div>
<div className="eae-modal-item">
<div>车牌照片</div>
<img src={ycddData.in_plate_pic} width={750} onError={handleImgError}/>
<img src={ycddData.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} width={750} onError={handleImgError} />
</div>
</div>
</Modal>

22
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() {
</Descriptions> */}
<div className="ltc-content">
<div className="ltc-item ltc-item-img ">
<img src={params.in_veh_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
<img src={params.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} />
</div>
<div className="ltc-item ltc-item-img ">
<img src={params.in_plate_pic} onError={handleImgError} onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
<img src={params.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
</div>
</div>
</div>
@ -1048,7 +1048,7 @@ function UserInfo() {
<div style={{ padding: '18px', background: '#505A6F' }}>
<div className="base-ltc">
<div className="ltc-img-acr">
<img src={baseData?.img || require("./error.png")} width={140} height={140} />
<img src={baseData?.img || require("../../../../../src/assets/images/error-img-new.png")} width={140} height={140} />
<div className="ltc-item">
<div className="new-value">用户头像</div>
</div>
@ -1144,10 +1144,10 @@ function UserInfo() {
</div>
<div className="ltc-content">
<div className="ltc-item ltc-item-img ">
<img src={baseData.authImg1 || require("../../../../../src/assets/images/error-img-new.png")} onClick={() => { setBigPic(baseData.authImg1); setBigpicVisible(true) }} />
<img src={baseData.authImg1 || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(baseData.authImg1); setBigpicVisible(true) }} />
</div>
<div className="ltc-item ltc-item-img ">
<img src={baseData.authImg2 || require("../../../../../src/assets/images/error-img-new.png")} onClick={() => { setBigPic(baseData.authImg2); setBigpicVisible(true) }} />
<img src={baseData.authImg2 || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} onClick={() => { setBigPic(baseData.authImg2); setBigpicVisible(true) }} />
</div>
</div>
</div>
@ -1482,7 +1482,7 @@ function UserInfo() {
>
<div>
<div className="eae-modal-item">
<img src={bigPic} onError={handleImgError} width={1500} />
<img src={bigPic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} width={1500} />
</div>
</div>
</Modal>
@ -1518,11 +1518,11 @@ function UserInfo() {
<div className="eae-modal-title"><div className="ltc-icon"></div>入场图片</div>
<div className="eae-modal-item">
<div>车辆照片</div>
<img src={ycddData.in_veh_pic} onError={handleImgError} width={750} />
<img src={ycddData.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} width={750} />
</div>
<div className="eae-modal-item">
<div>车牌照片</div>
<img src={ycddData.in_plate_pic} onError={handleImgError} width={750} />
<img src={ycddData.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} onError={handleImgError} width={750} />
</div>
</div>
</Modal>
@ -1847,11 +1847,11 @@ function UserInfo() {
</div>
<div className="eae-modal-item">
<div>车辆照片</div>
<img src={historyDataDetail.in_veh_pic} width={750} onError={handleImgError} />
<img src={historyDataDetail.in_veh_pic || require("../../../../../src/assets/images/error-img-new.png")} width={750} onError={handleImgError} />
</div>
<div className="eae-modal-item">
<div>车牌照片</div>
<img src={historyDataDetail.in_plate_pic} width={750} onError={handleImgError} />
<img src={historyDataDetail.in_plate_pic || require("../../../../../src/assets/images/error-img-new.png")} width={750} onError={handleImgError} />
</div>
</div>
</Modal>

4
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]);

3
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);

22
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx

@ -169,21 +169,21 @@ function TimePartDetail(props) {
</Descriptions.Item>
<Descriptions.Item span={2}>
{/* <div>{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}</div> */}
{item.sub ? <div>{`满:${record.items && record.item.segment} 分钟后,${record.items[0].sub[0].unit}元/${record.items[0].sub[0]?.period}分钟`}</div> : null}
</Descriptions.Item>
</>
)
}
{
item.type === 2 && index == 1 && (
<>
<Descriptions.Item span={2}>
{/* <div>{`满:${record.time_before} 分钟后,${record.time_after_money}元/${record.time_after_minute}分钟`}</div> */}
{<div>{`满:${item.segment} 分钟后,${item.unit}元/${item.period}分钟`}</div>}
<div>{`满:${record.items && record.items[1].segment} 分钟后,${record.items[1].unit}元/${record.items[1]?.period}分钟`}</div>
</Descriptions.Item>
</>
)
}
// {
// item.type === 2 && index == 1 && (
// <>
// <Descriptions.Item span={2}>
// {/* <div>{`${record.time_before} ${record.time_after_money}/${record.time_after_minute}`}</div> */}
// {<div>{`${item.segment} ${item.unit}/${item.period}`}</div>}
// </Descriptions.Item>
// </>
// )
// }
{
record.type === 2 && (
<Descriptions.Item span={2}>

Loading…
Cancel
Save