From 9089850f7d3cc1d697a66deeb6b5342ec8f87f68 Mon Sep 17 00:00:00 2001 From: xingjx Date: Fri, 5 Jan 2024 17:22:17 +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 --- 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"} />