From e5ad45ddd1685720d7dabf5b91aa02bad4bf8459 Mon Sep 17 00:00:00 2001 From: wanghx Date: Fri, 5 Jan 2024 15:58:18 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix():=20=E5=85=A8=E5=B1=80pageInfo?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx | 1 + src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx | 3 ++- src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx | 4 +++- .../OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx | 1 + .../OperationSales/CouponMgm/CouponDistribute/loadable.jsx | 4 +++- .../OperationSales/CouponMgm/WriteOffStat/loadable.jsx | 4 +++- .../OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx | 4 +++- .../OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx | 4 +++- .../OtherBusiness/Staggered/StaggeredStat/loadable.jsx | 1 + src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx | 4 +++- .../OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx | 4 +++- 11 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx index c2a4869..1850ff8 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx @@ -278,6 +278,7 @@ function Fence(props) { const handleAdd = () => { setEditStatus(false) form.resetFields() + setBerthData([]) setBerthSelectData([]) setEditModalVisible(true) } diff --git a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx index 08df90d..feed76c 100644 --- a/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx +++ b/src/pages/InRoadMgm/Stuff/ModelConf/loadable.jsx @@ -222,7 +222,8 @@ function ModelConf(props) { //检索数据 const getSearchData = (data = formData) => { setFormData({ - ...parameter + ...formData, + pn: 1 }) getData(Object.assign({}, formData, { pn: 1 })) } diff --git a/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx index 35d72b5..6c168c3 100644 --- a/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx +++ b/src/pages/OperationCenter/CustomerServieMgm/ComplaintMgm/loadable.jsx @@ -246,7 +246,9 @@ function ComplaintMgm(props) { } //检索数据 const getSearchData = (data = formData) => { - getData(data) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...data, pn: 1}) } //重置数据 const getResetData = () => { diff --git a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx index 85cd92d..42090ca 100644 --- a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx +++ b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx @@ -164,6 +164,7 @@ function ErrorCorrection(props) { const getSearchData = (data = formData) => { // getData(data) setFormData({ ...formData, pn: 1 }) + setLastFormData({...formData, pn: 1}) getData(Object.assign({}, formData, { pn: 1 })) } //重置数据 diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx index b6e5f8f..07180c7 100644 --- a/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CouponMgm/CouponDistribute/loadable.jsx @@ -144,7 +144,9 @@ function CouponDistribute(props) { } //检索数据 const getSearchData = (data = formData) => { - getData(data) + setFormData(Object.assign({}, formData, { pn: 1})) + setLastFormData(Object.assign({}, lastFormData, { pn: 1 })) + getData({...formData, pn: 1}) } //重置数据 const getResetData = () => { diff --git a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx index c2daefa..17bd5d7 100644 --- a/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx +++ b/src/pages/OperationCenter/OperationSales/CouponMgm/WriteOffStat/loadable.jsx @@ -128,7 +128,9 @@ function WriteOffStat(props) { } //检索数据 const getSearchData = (data = formData) => { - getData(data) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...formData, pn: 1}) } //重置数据 const getResetData = () => { diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx index 1503d1a..9918b73 100644 --- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx @@ -376,7 +376,9 @@ function ParkingCardMgm(props) { message.error("输入不能包含特殊字符，请重新输入") return } - getData({...data,pn:1,page_size:15}) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...data,pn:1}) } const [getOperationName, setGetOperationName] = useState([]) const operatorid = () => { diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx index 1408578..0d1dc0b 100644 --- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx @@ -218,7 +218,9 @@ function ParkingCardOrder() { message.error("输入不能包含特殊字符，请重新输入") return } - getData({...data,pn:1,page_size:15}) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...data,pn:1}) } // 获取列表数据 diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx index 0a05cf7..0bf3e80 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredStat/loadable.jsx @@ -146,6 +146,7 @@ function StaggeredStat(props) { //检索数据 const getSearchData = (data = formData) => { setFormData({ ...formData, pn: 1 }) + setLastFormData({...formData, pn: 1}) getData(Object.assign({}, formData, { pn: 1 })) } const [sessionTabList, setSessionTabList] = useSessionStorageState('StaggeredStat', { diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx index 760ee14..f20e2d5 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx @@ -185,7 +185,9 @@ function LiftUpPoleRecord(props) { } //检索数据 const getSearchData = (data = formData) => { - getData(data) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...data, pn: 1}) } //导出 const salesData = () => { diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx index 32c0c6d..601c04f 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx @@ -362,7 +362,9 @@ function ZombieCarCleanRecord(props) { } //检索数据 const getSearchData = (data = formData) => { - getData(data) + setFormData({...formData, pn: 1}) + setLastFormData({...formData, pn: 1}) + getData({...data, pn: 1}) } //重置数据 const getResetData = () => { From 9089850f7d3cc1d697a66deeb6b5342ec8f87f68 Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 5 Jan 2024 17:22:17 +0800 Subject: [PATCH 2/7] =?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 --- src/components/SelectGaodeLngLat/blue-point.png | Bin 0 -> 2377 bytes src/components/SelectGaodeLngLat/index.jsx | 39 ++++++++++++++++++--- .../ParkingBusinessAly/CarTypeAly/loadable.jsx | 2 ++ .../OrderInquiry/OrderChangeInquiry/index.jsx | 4 +-- .../OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx | 8 ++++- .../OutSegmentMgm/ChargeRulesMgm/TimePart.jsx | 2 +- .../OutSegmentMgm/OutSegment/AddParking.jsx | 17 +++++++-- .../OutSegment/ConfigParking/BillingRules.jsx | 20 +++++++---- .../ConfigParking/CarMgm/BlacklistManagement.jsx | 8 ++--- .../ConfigParking/CarMgm/WhitelistManagement.jsx | 17 +++++---- .../OutSegment/ConfigParking/LEDConfiguration.jsx | 2 +- 11 files changed, 91 insertions(+), 28 deletions(-) create mode 100644 src/components/SelectGaodeLngLat/blue-point.png diff --git a/src/components/SelectGaodeLngLat/blue-point.png b/src/components/SelectGaodeLngLat/blue-point.png new file mode 100644 index 0000000000000000000000000000000000000000..ee86a7675844e0d704cfa4d04ad85e96c9334ada GIT binary patch literal 2377 zcmV-P3AXl$P)%}!xj;~^fe2odoLY)Pz-ZK6OID2s8)bu8i-?I)vJx!T7-OQrHKHb!O9=5o z#np|)itDi>A$7cq{3N%9>Ykz%$$)-g>&$I zT@m!!y6L=3J_8&d29ERPfPrKI0k{uAs1OAGIYF;Kb^V(SCs6VCwvI>QpqI@cJpo`X z&H2RVxDD_QSOm_sD=d+IC#L+m5^&Iuzb%s}l_E z+nTB`rB`J{X-zcvF^b^D zpQQyn=dg6coB>cN4ah9eqM-7zRe2dPxE~frxIx#(w;H8T(J6R6Y_4f z9x2)N_Ci$UJYgUtSG5L!%;^vh@WJbD?U?A_?~Qe{obky|b+~+AXO-2>O&a6vfYnpf zSfBe4|0!?TRkFc1(Fj02VG%+Kpo{o`_pZbS4|CtMJJyx^@OTZb)evLZe~s``V&e=i zEZnEXt;)LCvd=^QWi5my0QyX{ygGV|df=E>F71nRRUa>Vi0@0Ri+5}B=8SN{G=FC- z+TT$3;PSVlYY)AxVIYjv`03T80BGpQ1J_s2f$ii);~C||KRy4*N?sB?vZx30T-)!Cv;2^pC6<| z;sjUB-C3`>mLBZ~?fDh}dLu-)Ua$nvX?_29{u?!Z?vrrQIc)b-;8j=6CID#A8WUl zeLQj%0MZ+%7oG~-?f}@zBL|=i{;>Si-Z+o&%=3?MshX_UcUOqF0*gYOu;iQi!jg^t zkpM`%n#~0%0Hp|!eB=6wM77uQe>dR%Ly}W{cMa^%BQ?qeGq-7KN>coSi~wevn>m2a z@ByG2k$hA0%ex+!y;qAT#F>3~DP=(J8*Ui?xdzu#hI;@YoziR=NdXWKIE+ZXQJcTg z1ApAtfR?_EAUG<3Zx^{@!WRU<&l5na(F@(?fhho6KE?Pa0Kv&OYVzN4$LrY-aj&VD z8-R&72Myqm5$%lMr`799Hu?`?0B9a`DW}~5&?F`RDgqF+=K94W@gCl(d95g_>f0C! z^N}H8yb7;o)|Z!V4w?vn^a7g5^aH5Visk@l4u}8&tBVhQ_9yj}sz<=?!oH26CE*IF z9R#dBR+n4$X~<%u2S^?e4_FOAz&b<7FDY+T?C*xIdO1XeB}eSreM;s3?r0UV3R`hF zuRQtI*2tYb2_fRVo;4dp>U@Fn=_UxcyD- zxAL=QYL0(&g-KuvV0wzt?a|^>TM6og;Rz>`#*Z4dV)GnltT|!8ou=0~tNgfS6GRL=5JzJ+B4X1=DKzR zWSaAQm(NOLU!eIwAe0>tJ2U2wa}Q0J>QTl}1q0-(=XPY?hys5g`f?=V;2*o=&*v2I~2r#gY>ECUz>4(UHP<8Yz2 zsNz6;d|P!d+JEnu#aXB zfQ%DFPmm#6f#bxX7dZSaw+W}OHW2Y7VH=HNiEuhd(z07;yAHNkFNx*-0*)zR$%4VNB?wg03_*@_n>c)4I+Iw@Z9a0nFtD0bmCKq#h%QNJ4`MW(WBl9b{dbKQyc< zqt-M!Q*Y3pO#vtbE8M1-Hx*+KfT<_ghGz+Yil<)bk>z`u#NBy=8i4|^ch&<`FnhO4 zygfN!&Xcrj(>ptlJyEdfFOinYq`e{3U7uhL!+OBf+BPSwCHLFX3#8^s8KqZ*_ht@A v0rlx~DQorV%X?$--vD~UiuSDW%zNN}eT9!?+Za@A00000NkvXXu0mjfmThsW literal 0 HcmV?d00001 diff --git a/src/components/SelectGaodeLngLat/index.jsx b/src/components/SelectGaodeLngLat/index.jsx index 7f1b24b..bf894e1 100644 --- a/src/components/SelectGaodeLngLat/index.jsx +++ b/src/components/SelectGaodeLngLat/index.jsx @@ -6,7 +6,8 @@ import "leaflet/dist/leaflet.css"; import "leaflet.chinatmsproviders"; import ajax from "@/services"; import "./index.scss"; - +import { compileString } from "sass"; +import Rerm from "./blue-point.png"; let timer = null; function SelectGaodeLngLat(props) { const { @@ -17,6 +18,7 @@ function SelectGaodeLngLat(props) { onChange = () => { }, } = props; const [lnglat, setLnglat] = useState([]); + const [marker, setMarker] = useState([]); const [address, setAddress] = useState(""); const [searchLnglatValue, setSearchLnglatValue] = useState([]); const [getLngLabel, setGetLngLabel] = useState([]) @@ -59,6 +61,7 @@ function SelectGaodeLngLat(props) { let add = getLngLabel.filter((ele) => ele.value == data)[0] || []; console.log(add); // setSearchLnglatValue([ add.lng,add.lat]) + setMarker([add.lng, add.lat]) setLnglat([add.lng, add.lat]); getLntLat([add.lng, add.lat]); }; @@ -103,7 +106,9 @@ function SelectGaodeLngLat(props) { setLnglat={setLnglat} getLntLat={getLntLat} searchLnglatValue={searchLnglatValue} - /> + markerPoint={marker} + > +
@@ -142,6 +147,7 @@ function ModalMap(props) { setLnglat = () => { }, getLntLat = () => { }, searchLnglatValue = [], + markerPoint = [] } = props; const mapConfig = { center: sysConfig.map.center, @@ -154,6 +160,7 @@ function ModalMap(props) { mapTileType: sysConfig.map.mapTileType, }; const [map, setMap] = useState(null); + const [Marker, setMarker] = useState(null); const mapRef = useRef(null); const initMap = () => { // console.log(mapConfig); @@ -195,6 +202,30 @@ function ModalMap(props) { }) mapRef.current = map }; + useEffect(() => { + if (map) { + addMarker(markerPoint); // 添加点位 + } + }, [markerPoint]); + const markerContent = `
+ +
`; + const addMarker = (data) => { + if(data.length==0) return + if (Marker) { + map.remove(Marker); + } + let marker = new AMap.Marker({ + position: new AMap.LngLat(parseFloat(data[0]), parseFloat(data[1])), + content: markerContent, + offset: new AMap.Pixel(-24, -45), + }); + map.add(marker); + setMarker(marker); + setTimeout(() => { + map.setCenter(new AMap.LngLat(parseFloat(data[0]), parseFloat(data[1]))); + }, 800); + }; function clearMarkers(map) { map.eachLayer(function (layer) { if (layer instanceof L.Marker) { @@ -211,10 +242,10 @@ function ModalMap(props) { }; }, []); useEffect(() => { - setTimeout(()=>{ + setTimeout(() => { if (searchLnglatValue.length === 0) return; mapRef.current.setView(searchLnglatValue, 13); - },800) + }, 800) }, [searchLnglatValue]); return ( diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx index 0dd664f..f89e284 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx @@ -77,6 +77,7 @@ function CarTypeAly() { } }, [isAjax]) useEffect(() => { + console.log(formData) if (show.length > 0 || show == 1) { setSessionTabList({ ...formData, @@ -85,6 +86,7 @@ function CarTypeAly() { } else { setSessionTabList({ ...formData, + //show: show.length > 0 ? show : [] }) } }, [formData, show]) diff --git a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx index a261324..9f2dbaf 100644 --- a/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/OrderChangeInquiry/index.jsx @@ -294,7 +294,7 @@ function EditOrderInquiry(props) { align: "center", width: 160, render: (text, data) => { - console.log(text); + //console.log(text); if (data.arrearsAmount_new) { return
{data.arrearsAmount} @@ -888,7 +888,7 @@ function EditOrderInquiry(props) {
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx index 89a0f23..21ce667 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx @@ -76,6 +76,7 @@ function EffectiveDate(props) { "minutes" ) ); + total += 1; } else { total += Math.abs( moment(timePartList[i].end, "HH:mm:ss").diff( @@ -83,11 +84,16 @@ function EffectiveDate(props) { "minutes" ) ); + console.log(Math.abs( + moment(timePartList[i].end, "HH:mm:ss").diff( + moment(timePartList[i].start, "HH:mm:ss"), + "minutes" + ) + )) } arr.push(timePartList[i].end) arr.push(timePartList[i].start) } - total += 1; if (total === 1440) { if ([...new Set(arr)].length != timePartList.length) { message.error('时段范围不能重叠！') diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx index ecfdabd..e1be6cb 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx @@ -192,7 +192,7 @@ function TimePart(props) { -
*时段结束时间00:00:00相当于23:59:59
+
*时段结束时间设置00:00:00相当于23:59:59
{index === 1 ? null : ( diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx index 1cb79f6..0e8a611 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx @@ -273,7 +273,20 @@ function AddParking(props) { }) .catch((err) => console.error(err)); } - + const valueChange = (value, all) => { + if (value.road_type) { + form.setFieldsValue({ + pid: '', + area_id: '', + operator_id: '', + address: '', + is_business: '', + cooperate_type: '', + access_type:'', + }) + setLngLat([]) + } + }; useEffect(() => { getAreaList(); operationName(); @@ -295,6 +308,7 @@ function AddParking(props) { form={form} labelCol={{ span: 8 }} colon={false} + onValuesChange={valueChange} initialValues={ status === "edit" ? { @@ -348,7 +362,6 @@ function AddParking(props) { > {({ getFieldValue }) => { const type = getFieldValue("road_type"); - console.log(type); if (type !== 0 && type !== 1) { return ( diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx index ee446d4..6ff2779 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/BillingRules.jsx @@ -72,7 +72,7 @@ function BillingRules(props) {
{ - setModalData({ ...modalData, visible: true }); + setModalData({ ...modalData, visible: true, stutus: 'edit' }); console.log(record.group_ids); editform.setFieldsValue({ rule_id: record.rule_id, @@ -125,7 +125,7 @@ function BillingRules(props) { id: "", }); const addRule = () => { - setModalData({ ...modalData, visible: true }); + setModalData({ ...modalData, visible: true, status: 'add' }); }; //搜索方法 @@ -150,8 +150,8 @@ function BillingRules(props) { }); }; //获取临时车辆组 - const getTempGroup = () => { - ajax.getRoadTemporaryGroup({ road_id: id }).then((res) => { + const getTempGroup = (type) => { + ajax.getRoadTemporaryGroup({ road_id: id, vehicle_type: type }).then((res) => { if (res.status === 20000) { setTempGroup(res.data); } @@ -216,8 +216,14 @@ function BillingRules(props) { useEffect(() => { getChargeRuleList(); - getTempGroup(); }, []); + const valueChange = (value, all) => { + console.log(value, all) + if (value.vehicle_type) { + getTempGroup(value.vehicle_type); + editform.setFieldsValue({ group_ids: '' }) + } + }; useEffect(() => { search(); }, [pageData]); @@ -266,7 +272,7 @@ function BillingRules(props) { > { setModalData({ ...modalData, visible: false }); @@ -274,7 +280,7 @@ function BillingRules(props) { }} onOk={submit} > -
+ - @@ -398,7 +398,7 @@ function BlacklistManagement({ id }) { > + - e.parentNode} options={(modalData.status === "add"?modalBusinessList:businessList)|| []} disabled={modalData.status === "edit"} /> Date: Fri, 5 Jan 2024 18:20:59 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix():=20=E5=85=A8=E5=B1=80=E7=BB=9F?= =?UTF-8?q?=E4=B8=80image=E5=9B=BE=E7=89=87=E5=8A=A0=E8=BD=BD=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/error-img-new.png | Bin 0 -> 4340 bytes .../ParkingRecordModal/RecordReviewModal.jsx | 2 +- .../ExceptionParkReport/loadable.jsx | 9 ++++++- .../BusinessMgm/SpecialRecord/loadable.jsx | 8 +++++++ .../DisabledCarParkRecordTotal/loadable.jsx | 16 +++++++++---- .../RecordInquiry/ParkRecordTotal/loadable.jsx | 18 ++++++++++---- .../OperationCenter/CarMgm/CarAuth/loadable.jsx | 18 ++++++++++---- .../OperationCenter/CarMgm/CarInfo/loadable.jsx | 21 ++++++++++++----- .../GeoSignalIgnoreAudit/loadable.jsx | 10 +++++++- .../GeoSignalIgnoreInquiry/loadable.jsx | 10 +++++++- .../OperationCenter/UserMgm/UserAuth/loadable.jsx | 14 ++++++++--- .../OperationCenter/UserMgm/UserInfo/loadable.jsx | 26 ++++++++++++++------- .../OperationCenter/UserMgm/UserTag/loadable.jsx | 12 ++++++++-- .../OutParkingRecordInquiry/Detail/StopList.jsx | 16 +++++++++---- .../OutExceptionMgm/LiftUpPoleRecord/loadable.jsx | 16 +++++++++---- .../ZombieCarCleanRecord/loadable.jsx | 13 +++++++++-- .../OutSegmentMgm/ZombieCarMgm/Detail/StopList.jsx | 11 +++++++-- 17 files changed, 169 insertions(+), 51 deletions(-) create mode 100644 src/assets/images/error-img-new.png diff --git a/src/assets/images/error-img-new.png b/src/assets/images/error-img-new.png new file mode 100644 index 0000000000000000000000000000000000000000..b00cb93a9eb4a9e0999b2f3cd14bd436c94bff2e GIT binary patch literal 4340 zcmeHKYdBQ>7T+@_1}`SL#VbQ8=|WM8m|4Yw@=wx%Sfq8 z0RSL#?5O1#0DzFd_a3-7cxMI}CW8-Hi1{%GICw?C&&L7)BIlUpVTUkx4g(YG){U2# z*@yf5IPGQfr?#VSuN6Ld_V|UbnvRUFA;exvh8$)7G<94P_Bf{UyCzlPE^A&B zp(A-;$;RvQCfys-p?TNN1{a;jsP?|iEgawKn>YPt^v^x2Efa4-+8#xAtpwwYyLoO+*t*uSp?BMK|;nv3JYVYcq z&LDbA3lSeUEv~gDq=O!wNq()r-%R)w{L3ru?cL#=be)AocRx5v0?0!|`P75>b8Pum zljxdhUv4r-9{YlX za;4$Gj;C*-+idAksFex(lV7>Z8basNNPeh2U*!bV0RlO7iFKViokC&s9 zYP@OX{3vB#anc8vjUobg8CuP}W@o1%ts(lBRBYI!u{w;$N|kK!&TNOl(7x*23fIo96Uh**$E}Kx&%b1!q1&#|8~3bWRU$cLL^Z^Xcz!V4iRnce5W!liu{_l*Yl~ zq&UM`!)Zko4Gn4Hm64XTi+^*&NVk|S)xBCO5+lol^0(c%$&XRXDay4La;6;}{`szD zss!O3?Ee4oPGT}}(U!`a7BN36ugX#-!u{ep5eT4j;^yC`G+QV3Ao_9FXJ1lovAc)P z9V4Nik$|I7d;LW)rrwPfifASSB~@{a?Zj!oN=x728y)lB+IkZTrAnkZG4IESOVr)| zyMgCqn2Ia62?G@7_W$HHQiWVk2!0w$UYdH1&rmDY}LR_L{9OXuxp)-WxR;Q19k+ndi@+ zdxnGsCx$y-+j|E89H}S@=T{vyQz`WZ(ZW zrHusM$Ut|&>2!M3X6sj>jJdDupg=eI^1<5E9CK;~xSNW>=7;2(%}Iyk6V=nIgS3qT z2eKkn3)W}7B>`E%IC^d{bk>a+u|#>xs9X*#4IZ(9q_ z3-~K5_gE$G-YM+HR#z%Q(?0W6j#4q80Ze=Iw{K7{FRzip23w;ACRXo&S&q)Fnopm? z?bK2u2p~;q8QEEN&=^^DsZ2YHq(C6prGdY2LEE)_-o~Xr{Csf&+7ZOl(b#j7x^k>u z&#Z7Y^nG%2^5yA)QBMyK>XW*TMK?D$nf&VTg9BwDnH;Z!0NEDA$5zMKY7Ay&B^&kn z^=o|;(V(6^lj~nsS2r@%8{+BXll6dsV|aUcJy(J@H8rW5yb@dQ3Y+?NYx+T zFNccYO)sqAhMxEt!^BHAq13UfquWTfL4+Z4)bD4SmF*IjGE ztz=A2FK%vqNCJHBv@|;+Vwc7mGTD8(2ZPo$|51Pk32cpH`$0!BL0S_Hj$(_&>Oc#w0H~Iy%?dhBoe8mkaI7_XYhme59U@L~xrQJvQ#^N-CPv zy!-QVNnmFLyXz;HxUaG;*WTFf0~p@n@uf>YX3r8U$A{ed-?94vqzG0UaA%*k&QqFqB$>Us_F~n5dim z?1-sb5-p&(ycuhtPQ;!;pl zC9x4+%qy;B66fYQpmL?J^Q=mJq1_?ExR@T(BuNw4+3c>20ICK*n2&1=2{aB}Mh;Ym zWG;$W88nxi2-Y?d&wBy4(C<6R?_TQv>?B9xu__{iU0l!Rt*c)|tOufZR>wCf02_^r zGTWIK9wd)k7jcGpk{soHyT8Xd;Fr*j)}GjEIr90ObWL>CZNU>o>>C zw#$$&q9FAc%Mxr{?=E0+NXC$FQLr*b;m{6esliEsZ^T&>VD3&tJ@dMH1i7#QE!a(E z5abHxLfcm=RyjkE7p~B3tWzB7PrvbC2WM(})UT!@9&7~4B;lk1rC5&LW#!8%G9W9!#Wip*IB=+?cwo^_-3M)-bwlSxvs9M*aH>sN>w7{ zb*OxsEokadGOw9<)qiKaT|8~?0mI;@db;%p7mVAo4e{6PA9w$>A$SVyRqpBONo5QS ktPZx$G { diff --git a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx index 9877b1f..e53ea14 100644 --- a/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx @@ -6,6 +6,7 @@ import { } from '@/config/character.config.js' import "./index.scss"; import { SearchOutlined } from '@ant-design/icons'; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' import moment from "moment"; import { useSessionStorageState } from "ahooks" @@ -62,6 +63,12 @@ function ExceptionParkReport(props) { } return result; } + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //列表 const deployListColumns = [ { @@ -486,7 +493,7 @@ function ExceptionParkReport(props) { getDetailPic.map((item, index) => { return (
- +
) }) diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx index dc744a5..bdb9011 100644 --- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx @@ -8,6 +8,7 @@ import "./index.scss"; import { SearchOutlined, DeleteOutlined, PlusOutlined, CloseCircleFilled } from '@ant-design/icons'; import ajax from '@/services' import { useSessionStorageState } from "ahooks" +import errorImg from '@/assets/images/error-img-new.png' import { dictionary, utils } from "@/config/common"; const { TabPane } = Tabs; const { TextArea } = Input; @@ -173,6 +174,13 @@ function CollectorWorkStat(props) { key: 'review_comments', } ] + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //列表 const deployListColumns = [ { diff --git a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx index 9586410..a1740e7 100644 --- a/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/DisabledCarParkRecordTotal/loadable.jsx @@ -19,6 +19,7 @@ import ajax from '@/config/ajax.js' // import { dictionary, utils } from "@/config/common"; // import moment from 'moment' // import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; +import errorImg from '@/assets/images/error-img-new.png' import { TableModule } from "@/components"; import "./index.scss"; import { @@ -527,6 +528,13 @@ function DisabledCarParkRecordTotal() { function changeKey(key) { setTabKey(key); } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + function searchOperation(e) { ajax({ //支付记录 url: "/api/bpm/record/get_payment_record", @@ -674,8 +682,8 @@ function DisabledCarParkRecordTotal() { {params.out_person} - { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} /> - { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_veh_pic); setBigpicVisible(true) }} /> + { setBigPic(params.in_plate_pic); setBigpicVisible(true) }} />
); @@ -742,7 +750,7 @@ function DisabledCarParkRecordTotal() { }} >
- +
- +
diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx index 3cea881..e8761db 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx @@ -19,6 +19,7 @@ import { // import moment from 'moment' // import { useSessionStorageState, useUpdateEffect, useSize, useUpdate } from 'ahooks'; import ajax from "@/services"; +import errorImg from '@/assets/images/error-img-new.png' import { QuestionCircleOutlined } from '@ant-design/icons'; import { TableModule } from "@/components"; import "./index.scss"; @@ -580,6 +581,13 @@ function ParkRecordTotal() { setHistoryDataDetail(record) setRecordIndex(index); } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + function changeKey(key) { setTabKey(key); switch (key) { @@ -650,17 +658,17 @@ function ParkRecordTotal() {
- +
- +
- +
@@ -1100,11 +1108,11 @@ function ParkRecordTotal() {
车辆照片
- +
车牌照片
- +
diff --git a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx index 5693c10..00c363d 100644 --- a/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarAuth/loadable.jsx @@ -12,6 +12,7 @@ import { Select, } from "antd"; const { TextArea } = Input; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/config/ajax.js' import { TableModule, ResultFlow, QuickMenu } from "@/components"; import { dictionary, utils } from "@/config/common"; @@ -169,6 +170,13 @@ function CarAuth() { const handleOpinion = (v) => { setToText(v.target.value) } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + useEffect(() => { search() }, [formData, pageData]); @@ -233,11 +241,11 @@ function CarAuth() {
- { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> {/* { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> */}
- { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> {/* { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> */}
@@ -253,10 +261,10 @@ function CarAuth() {
- { setBigPic(resultData[indexby].driving_licence_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].driving_licence_img1); setBigpicVisible(true) }} />
- { setBigPic(resultData[indexby].driving_licence_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].driving_licence_img2); setBigpicVisible(true) }} />
@@ -378,7 +386,7 @@ function CarAuth() { >
- +
diff --git a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx index ec1bcbb..86d28c0 100644 --- a/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx +++ b/src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx @@ -14,6 +14,7 @@ import { } from "antd"; const { TextArea } = Input; import moment from "moment"; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/config/ajax.js' import { TableModule, QuickMenu } from "@/components"; import { @@ -791,10 +792,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) }} />
@@ -806,7 +807,7 @@ function CarInfo() {
- +
车辆归属信息
@@ -925,6 +926,14 @@ function CarInfo() { /> ); } + + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //退款订单详情 const tkddModal =
退款订单:{ycddData?.refund_id}
@@ -1256,7 +1265,7 @@ function CarInfo() { >
- +
@@ -1292,11 +1301,11 @@ function CarInfo() {
入场图片
车辆照片
- +
车牌照片
- +
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx index ecb5b0a..2f405c0 100644 --- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx +++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreAudit/loadable.jsx @@ -6,6 +6,7 @@ import { } from '@/config/character.config.js' import "./index.scss"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' const { TextArea } = Input; function GeoSignalIgnoreAudit(props) { @@ -217,6 +218,13 @@ function GeoSignalIgnoreAudit(props) { setRejectVisible(false) } } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + const reBtn = () => { let data = { id: getRejectId, @@ -449,7 +457,7 @@ function GeoSignalIgnoreAudit(props) { title='查看图片' >
- +
diff --git a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx index d2dcfc7..34208fe 100644 --- a/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx +++ b/src/pages/OperationCenter/GeoSignalIgnore/GeoSignalIgnoreInquiry/loadable.jsx @@ -6,6 +6,7 @@ import { } from '@/config/character.config.js' import "./index.scss"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' const { TextArea } = Input; function GeoSignalIgnoreInquiry(props) { @@ -79,6 +80,13 @@ function GeoSignalIgnoreInquiry(props) { } return result; } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //列表 const deployListColumns = [ { @@ -371,7 +379,7 @@ function GeoSignalIgnoreInquiry(props) { title='查看图片' >
- +
diff --git a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx index f300075..cb52cc6 100644 --- a/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserAuth/loadable.jsx @@ -15,6 +15,7 @@ const { TextArea } = Input; import ajax from '@/config/ajax.js' import { TableModule, ResultFlow, QuickMenu } from "@/components"; import { dictionary, utils } from "@/config/common"; +import errorImg from '@/assets/images/error-img-new.png' import "./index.scss"; function UserAuth() { const columns = [ @@ -157,6 +158,13 @@ function UserAuth() { } }) } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + useEffect(() => { search() }, [formData, pageData]); @@ -208,10 +216,10 @@ function UserAuth() {
- { resultData[indexby]?.authImg1 ? setBigPic(resultData[indexby].authImg1) : null; setBigpicVisible(true) }} /> + { resultData[indexby]?.authImg1 ? setBigPic(resultData[indexby].authImg1) : null; setBigpicVisible(true) }} />
- { resultData[indexby]?.authImg2 ? setBigPic(resultData[indexby].authImg2) : null; setBigpicVisible(true) }} /> + { resultData[indexby]?.authImg2 ? setBigPic(resultData[indexby].authImg2) : null; setBigpicVisible(true) }} />
@@ -294,7 +302,7 @@ function UserAuth() { >
- +
diff --git a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx index 26c77ea..c5fccaa 100644 --- a/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserInfo/loadable.jsx @@ -18,6 +18,7 @@ import moment from "moment"; import ajax from '@/config/ajax.js' import { TableModule } from "@/components"; import { dictionary } from "@/config/common.js"; +import errorImg from '@/assets/images/error-img-new.png' import "./index.scss"; function UserInfo() { const [carId, setCarId] = useState() @@ -941,6 +942,13 @@ function UserInfo() { } }) } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //停车记录信息渲染 function renderParkRecord(params) { return ( @@ -1024,10 +1032,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) }} />
@@ -1135,10 +1143,10 @@ function UserInfo() {
- { setBigPic(baseData.authImg1); setBigpicVisible(true) }} /> + { setBigPic(baseData.authImg1); setBigpicVisible(true) }} />
- { setBigPic(baseData.authImg2); setBigpicVisible(true) }} /> + { setBigPic(baseData.authImg2); setBigpicVisible(true) }} />
@@ -1473,7 +1481,7 @@ function UserInfo() { >
- +
@@ -1509,11 +1517,11 @@ function UserInfo() {
入场图片
车辆照片
- +
车牌照片
- +
@@ -1838,11 +1846,11 @@ function UserInfo() {
车辆照片
- +
车牌照片
- +
diff --git a/src/pages/OperationCenter/UserMgm/UserTag/loadable.jsx b/src/pages/OperationCenter/UserMgm/UserTag/loadable.jsx index 8eba955..9cc6f56 100644 --- a/src/pages/OperationCenter/UserMgm/UserTag/loadable.jsx +++ b/src/pages/OperationCenter/UserMgm/UserTag/loadable.jsx @@ -13,6 +13,7 @@ import { Popover } from "antd"; import moment from "moment"; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' import { TableModule, ResultFlow } from "@/components"; import { dictionary } from "@/config/common.js"; @@ -263,6 +264,13 @@ function UserTag() { } }) } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //详情 const tkddModal =
@@ -293,10 +301,10 @@ function UserTag() {
- { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].vehicle_travel_license_img1); setBigpicVisible(true) }} />
- { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} /> + { setBigPic(resultData[indexby].vehicle_travel_license_img2); setBigpicVisible(true) }} />
diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/Detail/StopList.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/Detail/StopList.jsx index 00d80ac..ed92637 100644 --- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/Detail/StopList.jsx +++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/Detail/StopList.jsx @@ -1,10 +1,16 @@ import React, { useState, useEffect } from "react"; import ajax from "@/services"; import { message, Descriptions, Image } from "antd"; +import errorImg from '@/assets/images/error-img-new.png' + function StopList({ id, record }) { //获取停车记录 const [recordData, setRecordData] = useState(record); - + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } return (
@@ -45,18 +51,18 @@ function StopList({ id, record }) { - + - + - + - +
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx index f20e2d5..bde8fc4 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/LiftUpPoleRecord/loadable.jsx @@ -6,6 +6,7 @@ import { } from '@/config/character.config.js' import "./index.scss"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' import moment from 'moment' import { useSessionStorageState } from "ahooks"; @@ -76,6 +77,13 @@ function LiftUpPoleRecord(props) { res.push(child.id); } }; + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + //列表 const handleColumns = (tab) => { let result = [...deployListColumns]; @@ -343,18 +351,18 @@ function LiftUpPoleRecord(props) {
- 身份证（正面）： + 身份证（正面）：
- 身份证（反面）： + 身份证（反面）：
- 行驶证（正面）： + 行驶证（正面）：
- 行驶证（反面）： + 行驶证（反面）：
diff --git a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx index 601c04f..cd7d8fe 100644 --- a/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx +++ b/src/pages/OutRoadMgm/OutExceptionMgm/ZombieCarCleanRecord/loadable.jsx @@ -6,6 +6,7 @@ import { } from '@/config/character.config.js' import "./index.scss"; import { SearchOutlined, DeleteOutlined } from '@ant-design/icons'; +import errorImg from '@/assets/images/error-img-new.png' import ajax from '@/services' import moment from 'moment' import { useSessionStorageState } from "ahooks"; @@ -437,6 +438,14 @@ function ZombieCarCleanRecord(props) { }) } } + + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + + // useEffect(() => { // getData() // }, []) @@ -647,11 +656,11 @@ function ZombieCarCleanRecord(props) {
- 车辆照片： + 车辆照片：
- 车牌照片： + 车牌照片：
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/Detail/StopList.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/Detail/StopList.jsx index 6e6b39e..85898a8 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/Detail/StopList.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ZombieCarMgm/Detail/StopList.jsx @@ -1,6 +1,7 @@ import React, { useState, useEffect } from "react"; import ajax from "@/services"; import { message, Descriptions, Image } from "antd"; +import errorImg from '@/assets/images/error-img-new.png' function StopList({ id }) { //获取停车记录 const [recordData, setRecordData] = useState({}); @@ -15,6 +16,12 @@ function StopList({ id }) { }); } + const handleImgError = (e) => { + let evn = e || event + let img = evn.srcElement ? evn.srcElement : evn.target + img.src = errorImg + } + useEffect(() => { getRecord(); }, []); @@ -62,10 +69,10 @@ function StopList({ id }) { - + - + From 98413a8764eae63db8fdec131c848249d22f43c4 Mon Sep 17 00:00:00 2001 From: guoxin Date: Fri, 5 Jan 2024 18:26:06 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Performance/CollectorWorkStat/loadable.jsx | 16 ++- .../Performance/InspectorWorkStat/loadable.jsx | 35 +++-- .../ArrearsRecover/ArrearsTask/loadable.jsx | 158 +++++++++++++++++---- src/pages/SystemMgm/RoleMgm/loadable.jsx | 37 ++--- 4 files changed, 177 insertions(+), 69 deletions(-) diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx index 4870697..9ea381b 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/CollectorWorkStat/loadable.jsx @@ -26,7 +26,9 @@ function CollectorWorkStat(props) { job_status: '0',//在职状态 start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') , end_time: moment().format('YYYY-MM-DD'), + pn:1, page_size: Number(pageSizeOptions[0]), // 每页条数 + type: typeTime } let dataTime={ start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM') , @@ -144,22 +146,22 @@ function CollectorWorkStat(props) { getData({...data, pn: 1}) } - const setType = (v) => { setTypeTime(v) if (v === 'day') { - setFormData(parameter) + setFormData({ + ...parameter, + type: v + }) } else { setFormData({ ...parameter, - ...dataTime + ...dataTime, + type: v }) } } - useEffect(()=>{ - console.log(formData); - },[formData]) - console.log(typeTime); + const [getOperationName, setGetOperationName] = useState([]) const operationName = () => { ajax.getAllOperator().then(res => { diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx index c3158be..1ca171e 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/InspectorWorkStat/loadable.jsx @@ -24,13 +24,14 @@ function InspectorWorkStat(props) { name: '',//登录名 operator_id: '0',//所属运营商 job_status: '0',//在职状态 - start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD') , + start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM-DD'), end_time: moment().format('YYYY-MM-DD'), pn: 1, page_size: Number(pageSizeOptions[0]), // 每页条数 + type: typeTime } - let dataTime={ - start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM') , + let dataTime = { + start_time: moment().subtract(30, 'days').startOf('day').format('YYYY-MM'), end_time: moment().format('YYYY-MM'), } const [formData, setFormData] = useState(parameter) @@ -120,8 +121,8 @@ function InspectorWorkStat(props) { if (lastFormData.page_size === length) { setFormData(Object.assign({}, formData, { pn: pn, page_size: length })) setLastFormData(Object.assign({}, lastFormData, { pn: pn, page_size: length })) - lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length}) - getData(Object.assign({}, formData, { pn: pn , page_size: length})) + lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length }) + getData(Object.assign({}, formData, { pn: pn, page_size: length })) } } //切换每页条数 @@ -133,18 +134,22 @@ function InspectorWorkStat(props) { } //检索数据 const getSearchData = (data = formData) => { - setFormData(Object.assign({}, formData, { pn: 1})) + setFormData(Object.assign({}, formData, { pn: 1 })) setLastFormData(Object.assign({}, lastFormData, { pn: 1 })) - getData({...data, pn: 1}) + getData({ ...data, pn: 1 }) } const setType = (v) => { setTypeTime(v) if (v === 'day') { - setFormData(parameter) + setFormData({ + ...parameter, + type: v + }) } else { setFormData({ ...parameter, - ...dataTime + ...dataTime, + type: v }) } } @@ -220,8 +225,8 @@ function InspectorWorkStat(props) { end_time: dateString[1], type: typeTime }) - }} - value={[moment(formData.start_time), moment(formData.end_time)]} + }} + value={[moment(formData.start_time), moment(formData.end_time)]} /> : { // let first =dateString[0].substr(0,7); @@ -237,14 +242,14 @@ function InspectorWorkStat(props) { end_time: dateString[1], type: typeTime }) - }} - value={[moment(formData.start_time), moment(formData.end_time)]} + }} + value={[moment(formData.start_time), moment(formData.end_time)]} /> }
-
diff --git a/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx b/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx index f1442dd..2cd0050 100644 --- a/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx +++ b/src/pages/OperationCenter/ArrearsRecover/ArrearsTask/loadable.jsx @@ -68,17 +68,14 @@ function arrearsTask(props) { let result = [...deployListColumns]; return result; } - //欠费详情列表 - const handleDetailColumns = (tab) => { - let result = [...deployDetailColumns]; - return result; - } + + //重置数据 const getResetData = () => { setFormData({ ...parameter }) - getData({...parameter,pn: 1} ) + getData({ ...parameter, pn: 1 }) } //列表 const deployListColumns = [ @@ -158,6 +155,16 @@ function arrearsTask(props) { }, }] + + const handleDetailColumns = () => { + let result = [...deployDetailColumns]; + return result; + } + const handleColumns2 = () => { + + let result = [...columns2]; + return result; + } const [getDetailList, setGetDetailList] = useState({}) const [getDetail, setGetDetail] = useState([]) const [getDetailData, seteGetDetailData] = useState({ @@ -202,10 +209,13 @@ function arrearsTask(props) { }) } const [getStatus, setGetStatus] = useState(0) + const [getRecordList, setGetRecordList] = useState({}) + console.log(getRecordList); //查看详情 const checkDetail = (record) => { console.log(record); amountDetail(record) + setGetRecordList(record) if (record.audit_status == 0) { setGetStatus(1) setDetailVisible(true) @@ -270,9 +280,72 @@ function arrearsTask(props) { title: '欠费金额', dataIndex: 'arrears_mount', key: 'arrears_mount', - }] + }, + { + title: '缴费时间', + dataIndex: 'pay_time', + key: 'pay_time', + }, + { + title: '追缴金额', + dataIndex: 'recovery_mount', + key: 'recovery_mount', + } + ] + //审核查看 + const columns2 = [ + { + title: "序号", + render: (text, record, index) => index + 1, + }, + { + title: '订单ID', + dataIndex: 'park_id', + render: (text, record, index) => ( +
{record.park_id}
+ ) + }, + { + title: '车牌号', + render: (text, record, index) => ( +
{record.plate}
+ ) + }, + { + title: '欠费路段', + render: (text, record, index) => ( +
{record.road_name}
+ ) + }, + { + title: '入场时间', + dataIndex: 'in_time', + render: (text, record, index) => ( +
{record.in_time}
+ ) + }, + { + title: '出场时间', + dataIndex: 'out_time', + render: (text, record, index) => ( +
{record.out_time}
+ ) + }, + { + title: '停车时长', + dataIndex: 'parking_duration', + render: (text, record, index) => ( +
{record.parking_duration}
+ ) + }, + { + title: '欠费金额', + dataIndex: 'arrears_mount', + key: 'arrears_mount', + } + ] // 获取列表数据 const getData = (data = formData) => { setAjaxLoading(true) @@ -316,7 +389,7 @@ function arrearsTask(props) { let data = { id: getRecord, audit_status: type, - remark:[] + remark: [] } ajax.getDeployTask(data).then(res => { if (res.status === 20000) { @@ -564,13 +637,13 @@ function arrearsTask(props) {
- - +
@@ -618,15 +691,29 @@ function arrearsTask(props) { title='审核详情' > - + + { + getRecordList.audit_status === 1 ? +
: +
+ } + `共 ${getDetail.total_records} 条`} @@ -671,15 +758,28 @@ function arrearsTask(props) { title='欠费详情' > -
+ { + getRecordList.audit_status === 1 ? +
: +
+ } + `共 ${getDetail.total_records} 条`} diff --git a/src/pages/SystemMgm/RoleMgm/loadable.jsx b/src/pages/SystemMgm/RoleMgm/loadable.jsx index 8a13fae..b503e8a 100644 --- a/src/pages/SystemMgm/RoleMgm/loadable.jsx +++ b/src/pages/SystemMgm/RoleMgm/loadable.jsx @@ -135,7 +135,7 @@ function RoleMgm(props) { console.log(arr); setGetCheckVlue(true) // getCheckValue - setGetImg({ ...getImg, auth: string }) + setGetAdminId({ ...getAdminId, auth: string }) } else { setCheckedKeys([]) } @@ -277,13 +277,13 @@ function RoleMgm(props) { } }] //图片 - const [getImg, setGetImg] = useState({ + + const [getAdminId, setGetAdminId] = useState({ remark: '', name: '', depart_id: '', auth: '' }) - const [getAdminId, setGetAdminId] = useState({}) const [getAuthId, setGetAuthId] = useState({}) const [getDepart, setGetDepart] = useState([]) //编辑 @@ -309,7 +309,7 @@ function RoleMgm(props) { let num = strArr.map(Number) setCheckedKeys(num) let newArr = record.depart_arr.split(',') - // setGetImg(Object.assign({}, getImg, { + // setGetAdminId(Object.assign({}, getAdminId, { // name: record.name, // remark: record.remark, // depart_id: newArr @@ -319,7 +319,7 @@ function RoleMgm(props) { } } - console.log(getImg); + console.log(getAdminId); //所属类型 const [getPlateColor, setGetPlateColor] = useState([]) const plateColor = () => { @@ -455,20 +455,20 @@ function RoleMgm(props) { const placeEditBtn = () => { let arr = checkedKeys let str = arr.toString() - let arrStr = getImg.depart_id + let arrStr = getAdminId.depart_id let lastElement = arrStr[arrStr.length - 1]; let data = { - ...getImg, + ...getAdminId, auth: str, id: getAdminId.id, depart_id: lastElement, depart_arr: arrStr.toString() } - if (getImg.name == "") { + if (getAdminId.name == "") { message.error('角色名称不能为空') return - } else if (getImg.depart_id == "") { + } else if (getAdminId.depart_id == "") { message.error('请选择所属部门') return } @@ -479,7 +479,7 @@ function RoleMgm(props) { getData(formData) setGetGovernment(0) setGetAuthId({}) - setGetImg({ + setGetAdminId({ remark: '', name: '', depart_id: '', @@ -727,8 +727,8 @@ function RoleMgm(props) { value={getAdminId.name} style={{ width: 260, marginLeft: 50 }} onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { name: v.target.value }) + setGetAdminId( + Object.assign({}, getAdminId, { name: v.target.value }) ); }} /> @@ -740,8 +740,8 @@ function RoleMgm(props) { value={getAdminId.remark} style={{ width: 260, marginLeft: 78 }} onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { remark: v.target.value }) + setGetAdminId( + Object.assign({}, getAdminId, { remark: v.target.value }) ); }} /> @@ -756,13 +756,14 @@ function RoleMgm(props) { options={getPlateColor} changeOnSelect onChange={(v) => { - setGetImg( - Object.assign({}, getImg, { depart_id: v }) + setGetAdminId( + Object.assign({}, getAdminId, { depart_id: v }) ); setGetAuthId({}) let arrStr = v let lastElement = arrStr[arrStr.length - 1]; setGetGovernment(lastElement) + setGetDepart(v) }} fieldNames={{ label: 'name', @@ -779,8 +780,8 @@ function RoleMgm(props) { style={{ width: 260, marginLeft: 14 }} defaultSelectedKeys={checkedKeys} onCheck={(checkedKeysValue, info) => { - setGetImg( - Object.assign({}, getImg, { auth: checkedKeysValue }) + setGetAdminId( + Object.assign({}, getAdminId, { auth: checkedKeysValue }) ); setCheckedKeys(checkedKeysValue) }} From 40c0a918a75d86c5a7936c46ae79caf384602136 Mon Sep 17 00:00:00 2001 From: guoxin Date: Fri, 5 Jan 2024 18:43:05 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ParkingRecordModal/RecordReviewModal.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ParkingRecordModal/RecordReviewModal.jsx b/src/components/ParkingRecordModal/RecordReviewModal.jsx index f8acb97..4abf20f 100644 --- a/src/components/ParkingRecordModal/RecordReviewModal.jsx +++ b/src/components/ParkingRecordModal/RecordReviewModal.jsx @@ -3,7 +3,7 @@ import { Modal, Table, message, Button, Input, Select, Timeline, DatePicker } fr import { RightOutlined, DownOutlined } from "@ant-design/icons"; import VehicleInformation from "./VehicleInformation"; import ajax from "@/services"; -import moment from "moment";z +import moment from "moment"; import "./index.scss"; const { TextArea } = Input; const RecordReviewModal = (props) => { From 6e2c1017b1897df9438d9d145a998fba5ead621f Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 5 Jan 2024 20:15:37 +0800 Subject: [PATCH 6/7] =?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 --- src/components/SelectGaodeLngLat/index.jsx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/SelectGaodeLngLat/index.jsx b/src/components/SelectGaodeLngLat/index.jsx index bf894e1..69eaa1e 100644 --- a/src/components/SelectGaodeLngLat/index.jsx +++ b/src/components/SelectGaodeLngLat/index.jsx @@ -8,6 +8,7 @@ import ajax from "@/services"; import "./index.scss"; import { compileString } from "sass"; import Rerm from "./blue-point.png"; +import { constant } from "lodash"; let timer = null; function SelectGaodeLngLat(props) { const { @@ -65,9 +66,9 @@ function SelectGaodeLngLat(props) { setLnglat([add.lng, add.lat]); getLntLat([add.lng, add.lat]); }; - function getLocationMessage() { + function getLocationMessage(v) { // const lat_lng = lnglat.reverse().join(","); - const lat_lng = lnglat.join(","); + const lat_lng = v ? v.join(",") : lnglat.join(","); ajax.getLocationNameByLngLat({ lat_lng }).then((res) => { if (res.status === 20000) { setAddress(res.data.address); @@ -79,7 +80,9 @@ function SelectGaodeLngLat(props) { useEffect(() => { onChange(address); }, [address]); - + useEffect(() => { + getLocationMessage(lnglat) + }, [lnglat]); return (
`; const addMarker = (data) => { - if(data.length==0) return + if (data.length == 0) return if (Marker) { map.remove(Marker); } From dd66b2240ab5aa9616847c61ccee713a8d730222 Mon Sep 17 00:00:00 2001 From: guoxin Date: Sat, 6 Jan 2024 01:04:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PersonMgm/Performance/SalesStat/index.scss | 2 +- .../PersonMgm/Performance/SalesStat/loadable.jsx | 2 +- .../Staggered/StaggeredMgm/loadable.jsx | 34 ++++++++++++++++------ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/index.scss b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/index.scss index 4fd73a6..b638f3e 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/index.scss +++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/index.scss @@ -127,7 +127,7 @@ $color-primary : var(--color-primary); } } -.revenue{ +.revenueModal{ .tab-title{ text-align: center; font-size: 18px; diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx index 161d425..57ae28d 100644 --- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx @@ -395,7 +395,7 @@ function SalesStat(props) { visible={revenueVisible} onCancel={revenueModal} footer={null} - className="revenue" + className="revenueModal" >
{getTabTitle.date}营收情况
diff --git a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx index 4af513f..5245c44 100644 --- a/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx +++ b/src/pages/OperationCenter/OtherBusiness/Staggered/StaggeredMgm/loadable.jsx @@ -358,9 +358,18 @@ function StaggeredMgm(props) { } //错峰时间 const handleChangeTime = (time, timeString, index) => { - let times = getSaleMsg[index] - times.start_time = timeString[0] - times.end_time = timeString[1] + let arr = [...getSaleMsg] + arr.forEach((value, key) => { + if (key == index) { + value.start_time = timeString[0] + value.end_time = timeString[1] + } + }) + console.log(arr); + setGetSaleMsg([...arr]) + // let times = getSaleMsg[index] + // times.start_time = timeString[0] + // times.end_time = timeString[1] } useEffect(() => { @@ -431,7 +440,7 @@ function StaggeredMgm(props) { message.error('请选择星期配置') return } - infoArr[result].week = infoArr[result].week.join(',') + infoArr[result].week = infoArr[result]?.week?.join(',') } let data = { ...getCarMsg, @@ -490,12 +499,17 @@ function StaggeredMgm(props) { message.error('请选择星期配置') return } - infoArr[result].week = infoArr[result].week.join(',') + console.log(infoArr[result].week); + + let str = Array.isArray(infoArr[result].week) ? infoArr[result]?.week?.join(',') : infoArr[result]?.week + infoArr[result].week = str + console.log(infoArr[result]); } ajax.getEditStaggered(data).then(res => { if (res.status === 20000) { message.success(res.message) setEditVisible(false) + getData(formData) } else { message.error(res.message) } @@ -718,7 +732,7 @@ function StaggeredMgm(props) { handleChangeDate(index, date, dateString,)} /> @@ -728,7 +742,7 @@ function StaggeredMgm(props) { handleChangeTime(time, timeString, index)} @@ -902,8 +916,10 @@ function StaggeredMgm(props) {
*
+ {console.log("渲染")} + {console.log(getSaleMsg)} handleChangeTime(