From efa1afff461ff442ce91a5719f837ef74417e975 Mon Sep 17 00:00:00 2001 From: chenglb Date: Wed, 31 Jan 2024 16:06:28 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx index 45d85af..9ac1efc 100644 --- a/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx +++ b/src/pages/InRoadMgm/PersonMgm/PersonInfo/loadable.jsx @@ -299,7 +299,7 @@ function PersonInfo() { } const changeEditOperator = (e) => { - setCurrentPersonInfo({ ...currentPersonInfo, operator: e }) + setCurrentPersonInfo({ ...currentPersonInfo, operator: e , depart_id: ''}) getDeparts(e) getAssets(e) setGetPersonId(e) From fac4060f29cd93657410df198879d30db50c23fc Mon Sep 17 00:00:00 2001 From: guoxin Date: Wed, 31 Jan 2024 16:11:37 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/SelectGaodeLngLat/index.jsx | 3 +- .../ExceptionParkReport/loadable.jsx | 6 +-- .../BusinessMgm/ChargeRules/EditModal.jsx | 1 + .../BusinessMgm/ChargeRules/FormModal.jsx | 1 + .../RecordInquiry/ParkRecordTotal/index.scss | 11 ++--- src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx | 13 +++--- src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx | 20 ++++++++- src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx | 2 +- .../CustomerServieMgm/ErrorCorrection/loadable.jsx | 51 +++++++++++----------- 9 files changed, 67 insertions(+), 41 deletions(-) diff --git a/src/components/SelectGaodeLngLat/index.jsx b/src/components/SelectGaodeLngLat/index.jsx index e79f2a9..a9149cd 100644 --- a/src/components/SelectGaodeLngLat/index.jsx +++ b/src/components/SelectGaodeLngLat/index.jsx @@ -18,6 +18,7 @@ function SelectGaodeLngLat(props) { onChange = () => { }, isClickMarker = false // 点击地图添加标记 } = props; + console.log(lngLatVisible); const [lnglat, setLnglat] = useState([]); const [marker, setMarker] = useState([]); const [address, setAddress] = useState(""); @@ -95,7 +96,7 @@ function SelectGaodeLngLat(props) {
-
车牌号:{getDetailId.plateNumber}
+
车牌号：{getDetailId.plateNumber}
异常类型：{getDetailId.exceptDictName}
-
上报时间:{getDetailId.reportTime}
+
上报时间：{getDetailId.reportTime}
停车场：{getDetailId.parkName}
-
入场时间:{getDetailId.entryTime}
+
入场时间：{getDetailId.entryTime}
{ diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx index 855d0ce..4445df1 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx @@ -509,6 +509,7 @@ const FormModal = (props) => { } const data = options; handleOptionsProcessing(i, z, data, type)//统一区间类型下拉数据更新 + form.setFieldsValue(currentFormValues) console.log("表单数据", currentFormValues); return true; } diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx index b7e124e..3b15d20 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx @@ -489,6 +489,7 @@ const FormModal = (props) => { // 校验4.增加时段最高收费金额，当选择按次计费时时段最高收费金额输入框影藏 const data = options; handleOptionsProcessing(i, z, data, type)//统一区间类型下拉数据更新 + form.setFieldsValue(currentFormValues) console.log("表单数据", currentFormValues); return true; } diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss index 8b5165e..5aebacb 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss @@ -48,6 +48,11 @@ $color-primary: var(--color-primary); } } } + .ant-picker { + width: 100%; + background-color: var(--color-search-list-item-bg); + border-color: var(--color-border); + } } .ant-input::-webkit-input-placeholder { @@ -165,11 +170,7 @@ $color-primary: var(--color-primary); } } -.ant-picker { - width: 100%; - background-color: var(--color-search-list-item-bg); - border-color: var(--color-border); -} + // .yisa-table { // width: 100%; diff --git a/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx index bc6adae..029d617 100644 --- a/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx +++ b/src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx @@ -19,7 +19,7 @@ import { import { PlusOutlined } from "@ant-design/icons"; import { useLocation, useNavigate } from "react-router-dom"; -import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat } from "@/components"; +import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat2 } from "@/components"; import moment from "moment"; import "./index.scss"; import ajax from "@/services"; @@ -50,7 +50,8 @@ function AddRoad(props) { ]; const { getDetailList = {}, - setDetailModel=()=>{} + setDetailModel=()=>{}, + setcheckModel=()=>{}, } = props const navigate = useNavigate(); const location = useLocation(); @@ -76,7 +77,7 @@ function AddRoad(props) { //所属商户 const [operatorId, setOperatorId] = useState(null); //编辑还是新增 - const [isEdit, setIsEdit] = useState(id !== null); + const [isEdit, setIsEdit] = useState(id !== undefined); //所属热门商圈 const [tradingAreaList, setTradingAreaList] = useState({ left: [], @@ -154,6 +155,7 @@ function AddRoad(props) { if (res.status === 20000) { message.success(res.message); setDetailModel(false) + setcheckModel(false) } else { message.error(res.message); } @@ -550,7 +552,7 @@ function AddRoad(props) { - setLngLatVisible(true)} lngLatVisible={lngLatVisible} getLntLat={(value) => { @@ -603,7 +605,7 @@ function AddRoad(props) { {isEdit ? ( <> - + @@ -859,6 +861,7 @@ function AddRoad(props) {
{/* { setGetOption(['0']) - + getAssetData() setFormData({ ...parameter, }) diff --git a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx index 0da3cbe..2530e38 100644 --- a/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx +++ b/src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx @@ -17,7 +17,7 @@ function ErrorCorrection(props) { process_url: "" }) const parameter = { - areId:['0'], //区域 + areId: ['0'], //区域 parkName: '', //车场名称 correctionType: 0,//报错类型 pn: 1, @@ -48,6 +48,7 @@ function ErrorCorrection(props) { } } console.log(res); + setFormData({ ...formData, areId:value }) setAreaSelectedList(res); } const addChild = (child, res) => { @@ -121,11 +122,11 @@ function ErrorCorrection(props) { setImgVisible(false) } // 获取列表数据 - const getData = (data = formData) => { + const getData = (data = formData,reset='') => { setAjaxLoading(true) let dataList = { ...data, - areId: areaSelectedList + areId:!reset ? areaSelectedList :[] } ajax.getCarErrorList(dataList).then(res => { setAjaxLoading(false) @@ -157,7 +158,7 @@ function ErrorCorrection(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}) + lastFormDataRef.current = Object.assign({}, lastFormData, { pn: pn, page_size: length }) getData(Object.assign({}, formData, { pn: pn, page_size: length })) } } @@ -172,7 +173,7 @@ function ErrorCorrection(props) { const getSearchData = (data = formData) => { // getData(data) setFormData({ ...formData, pn: 1 }) - setLastFormData({...formData, pn: 1}) + setLastFormData({ ...formData, pn: 1 }) getData(Object.assign({}, formData, { pn: 1 })) } //重置数据 @@ -180,8 +181,8 @@ function ErrorCorrection(props) { setFormData({ ...parameter }) - setAreaId([]) - getData({...parameter,pn: 1} ) + setAreaSelectedList([]) + getData({ ...parameter, pn: 1 },'reset') } const [getCanCaDer, setGetCanCaDer] = useState([]) @@ -204,7 +205,7 @@ function ErrorCorrection(props) {
- - - +
@@ -320,21 +321,21 @@ function ErrorCorrection(props) {
问题描述：{getImg.description}
-
-
图片：
-
+
+
图片：
+
- { - getImgList?.map((res, index) => { - return ( -
- + { + getImgList?.map((res, index) => { + return ( +
+ -
- ) - }) - } -
+
+ ) + }) + } +
From 9c4bf058a6309902c76ddc729539dda867075b65 Mon Sep 17 00:00:00 2001 From: xingjx Date: Wed, 31 Jan 2024 16:13:01 +0800 Subject: [PATCH 3/8] =?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/ParkUsageAly/loadable.jsx | 6 +++--- .../OrderInquiry/ParkingOrderInquiry/index.jsx | 14 ++++++++------ .../FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx | 2 +- src/pages/OperationCenter/CarMgm/CarInfo/index.scss | 2 +- src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index 04e8d8f..9fe9ce6 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -53,7 +53,7 @@ function ParkUsageAly() { const [tabLoading, setTabLoading] = useState(false); // 表格返回数据 const [resultData, setResultData] = useState({ - total: 0, + total_records: 0, list: [], }); //停车场收入概览数据 @@ -239,7 +239,7 @@ function ParkUsageAly() { } else { getRevenueOption([]); setResultData({ - total: 0, + total_records: 0, list: [], }) } @@ -586,7 +586,7 @@ function ParkUsageAly() { 导出} modalType="noImg" - totalRecords={resultData.total} + totalRecords={resultData.total_records} exportUrl="/api/ana/dataanalysis/get_parking_berth_rate_export" //pageName="parkingOverview" postdata={{ diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx index 480e748..f43a450 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx @@ -216,15 +216,15 @@ function ParkingOrderInquiry(props) { align: "center", render: (text, data) => { if (data.arrearsAmount_new) { - return
- {data.arrearsAmount} - {data.arrearsAmount_new} -
+ return
+ {data.arrearsAmount} + {data.arrearsAmount_new} +
} else { - return
{text}
+ return
{text}
} - } + } }, { title: '订单修改时间', @@ -664,6 +664,7 @@ function ParkingOrderInquiry(props) { } } else { setResultData([]) + setTotal(0) message.error(res.message) } }) @@ -687,6 +688,7 @@ function ParkingOrderInquiry(props) { } } else { setArrearsData([]) + setTotal(0) message.error(res.message) } }) diff --git a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx index 28324eb..d030862 100644 --- a/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx +++ b/src/pages/FinancialMgm/OrderInquiry/ReturnOrderInquiry/index.jsx @@ -366,7 +366,7 @@ function ReturnOrderInquiry() { } //页面渲染 function renderTable(columns, arr, dataSource, exportUrl) { - let initFormData = { flow_id: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().format("YYYY-MM-DD HH:mm:ss")) } + let initFormData = { flow_id: getUrlSearch("third_party_flow_id") || '', start_time: getUrlSearch("pay_time") ? moment(getUrlSearch("pay_time")) : moment(moment().startOf("day").format("YYYY-MM-DD HH:mm:ss")) } return (
- +
车辆归属信息
From f45114db7cccd468914632387e7ed0367c728ee3 Mon Sep 17 00:00:00 2001 From: He Huan Date: Wed, 31 Jan 2024 17:55:11 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E7=89=A9=E7=90=86?= =?UTF-8?q?=E6=A1=A9=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx index 7cd0045..47b1cd2 100644 --- a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx +++ b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx @@ -111,18 +111,17 @@ function PhysicalPileManagement() { message.destroy(); message.warning(`硬件编码不可为空`); return - } - else if(!reg.test(rowData?.code)){ + }else if(!reg.test(rowData?.code)){ message.destroy(); message.warning(`硬件编码不能包含汉字`); return - } - else if(!rowData.model||rowData.model.match(/^\s+$/)){ + }else if(!rowData.model||rowData.model.match(/^\s+$/)){ message.destroy(); message.warning(`设备型号不可为空`); return } - else if(!reg.test(rowData?.model)){ + let regs = /^[0-9a-zA-Z]*$/g; + if(!regs.test(rowData?.model)){ message.destroy(); message.warning(`设备型号不能包含汉字`); return From ae4b6055decc225986d43b8b9d29c24118c1b0db Mon Sep 17 00:00:00 2001 From: zhugy Date: Wed, 31 Jan 2024 18:11:41 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix():=E4=BF=AE=E5=A4=8D=E5=85=85=E7=94=B5?= =?UTF-8?q?=E7=AB=99=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/NewEnergy/ChargeStationMgm/loadable.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx index c0e8ffa..1d55229 100644 --- a/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx +++ b/src/pages/NewEnergy/ChargeStationMgm/loadable.jsx @@ -241,7 +241,7 @@ function Appointment() { setDetailVisible(true) } const handelOk = () => { - console.log(addFormData); + // console.log(addFormData); if (!addFormData.name) { message.warn("请输入充电站名称") return @@ -250,11 +250,11 @@ function Appointment() { message.warn("请输入充电站编码") return } - if (!addFormData.count) { + if (!addFormData.count && addFormData.count != 0) { message.warn("请输入车位数量") return } - if (!pattern.test(addFormData.count)) { + if (!pattern.test(addFormData.count) || addFormData.count == 0) { message.warn("请输入正整数的车位数量") return } From a7930c054c2d6e820ba454b6e68be5d52559d879 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Thu, 1 Feb 2024 08:48:52 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentAly/EquipmentRunningStat/loadable.jsx | 4 +++- src/pages/DataAnalysisPrediction/MemberStat/ParkingAly/loadable.jsx | 4 +++- src/pages/DataAnalysisPrediction/MemberStat/PayAly/loadable.jsx | 4 ++-- src/pages/DataAnalysisPrediction/MemberStat/RegisterAly/loadable.jsx | 4 ++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx index 7f16a7d..dc674c9 100644 --- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx @@ -712,7 +712,7 @@ function ExceptionParkReport() {

共查询到 {Data?.total || 0}条数据

- {Data?.total && ( + {Data?.total ? ( @@ -732,6 +732,8 @@ function ExceptionParkReport() { }} imgno={false} /> + ) : ( + "" )}
共查询到 {Data?.total || 0}条数据

- {Data?.total && ( + {Data?.total ? ( @@ -623,6 +623,8 @@ function ParkingAly() { }} imgno={false} /> + ) : ( + "" )}
共查询到 {Data?.total || 0}条数据

- {Data?.total && ( + {Data?.total ? ( @@ -1003,7 +1003,7 @@ function PayAly() { isTableModule={true} onOk={ReportPaySummaryReport} /> - )} + ):""}
共查询到 {Data?.total || 0}条数据

- {Data?.total && ( + {Data?.total ? ( @@ -826,7 +826,7 @@ function RegisterAly() { isTableModule={true} onOk={ReportPaySummaryReport} /> - )} + ):""}
Date: Thu, 1 Feb 2024 14:56:16 +0800 Subject: [PATCH 7/8] =?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/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx index d20e92e..f699344 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/Detail.jsx @@ -109,7 +109,7 @@ function EffectiveDetail(props) { Date: Thu, 1 Feb 2024 14:58:45 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx | 4 ++-- src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx index 4445df1..3fc8dbc 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx @@ -663,7 +663,7 @@ const FormModal = (props) => {
{
{
{