From 0502e9dc62cdf2453d37d4e74665b7436195fc02 Mon Sep 17 00:00:00 2001 From: chenqiang Date: Tue, 2 Jan 2024 11:09:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E9=A5=BC=E5=9B=BE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 6ac7196..570c554 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -789,7 +789,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { viewControl: { //3d效果可以放大、旋转等，请自己去查看官方配置 alpha: 30, //角度 - distance: 250, //调整视角到主体的距离，类似调整zoom + distance: 300, //调整视角到主体的距离，类似调整zoom rotateSensitivity: 0, //设置为0无法旋转 zoomSensitivity: 0, //设置为0无法缩放 panSensitivity: 0, //设置为0无法平移 From f6d036a5b889516e8bbe9609c40a20db18b358ce Mon Sep 17 00:00:00 2001 From: guoxin Date: Tue, 2 Jan 2024 13:25:17 +0800 Subject: [PATCH 2/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 --- .../BusinessMgm/ChargeRules/EditModal.jsx | 4 +-- .../PersonMgm/Performance/SalesStat/loadable.jsx | 35 +++++++++++++++------- .../InRoadMgm/Stuff/CategroyConf/loadable.jsx | 2 ++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx index 64262b5..6644ef1 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx @@ -32,7 +32,7 @@ const FormModal = (props) => { const defaultData = { feeName: '', freeTimeAble: 0, - operator_name: '', + operationId: '', feeCode: '', freeTime: '', extend_time: '', @@ -564,7 +564,7 @@ const FormModal = (props) => { { @@ -177,13 +184,18 @@ function SalesStat(props) { dataIndex: 'persent', key: 'persent', }] - + const [getDetailId, setDetailId] = useState({}) const getDetailData = (record) => { + setDetailId(record) + setTabData(Object.assign({}, tabData, { uid: record.id })) + getDetailList(record) + } + const getDetailList = (record) => { let data = { - ...lastTotalData, - uid: record.id, - start: getTime.startDateTime, - end: getTime.endDateTime + ...tabData, + pn: record.pn == null ? tabData.pn : record.pn, + length: record.length == null ? tabData.length : record.length, + uid: record.id || tabData.id, } ajax.revenueData(data).then(res => { if (res.status === 20000) { @@ -236,9 +248,10 @@ function SalesStat(props) { setTabData(Object.assign({}, tabData, { pn: pn, length: length })) setLastTotalData(Object.assign({}, lastTotalData, { pn: pn, length: length })) lastTabDataRef.current = Object.assign({}, lastTotalData, { pn: pn, length: length }) - getDetailData(Object.assign({}, lastTotalData, { pn: pn, length: length })) + getDetailData(Object.assign({}, tabData, { pn: pn, length: length, ...getDetailId })) } } + console.log(tabData); //切换每页条数 const changeLength = (pn, length) => { setFormData(Object.assign({}, formData, { pn: 1, length: length })) @@ -299,7 +312,7 @@ function SalesStat(props) { setCheckData(item.children) setGetTotal(item.total_records) } - console.log(getTotal); + // console.log(getTotal); return <>
diff --git a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx index 5bb77d2..6d18162 100644 --- a/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx +++ b/src/pages/InRoadMgm/Stuff/CategroyConf/loadable.jsx @@ -108,6 +108,8 @@ function CategroyConf(props) { message.success('删除成功') setDeleteVisible(false) getData(formData) + }else{ + message.error(res.message) } }) } From 1706d854d6f22ce54303af60acd4f6876f9477fc Mon Sep 17 00:00:00 2001 From: wanghx Date: Tue, 2 Jan 2024 16:45:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix():=20=E8=B7=AF=E5=86=85=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx | 5 +++-- .../ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss | 1 + .../ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx | 8 +++----- .../ParkingIncomeAly/ArrearageAly/PlateArrear/index.scss | 5 +++++ .../ParkingIncomeAly/ArrearageAly/index.scss | 1 + .../ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx | 7 ++++--- .../ParkingIncomeAly/CityArrearageAly/loadable.jsx | 1 + .../ParkingIncomeAly/CityIncomeStat/loadable.jsx | 1 + .../ParkingIncomeAly/OrderArrearageAly/loadable.jsx | 1 + .../DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx | 1 + src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx | 4 +++- src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx | 3 ++- src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx | 3 ++- src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx | 3 ++- src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx | 1 + src/pages/SystemMgm/OrgnizationMgm/loadable.jsx | 7 +++++-- src/pages/SystemMgm/RoleMgm/loadable.jsx | 3 ++- 17 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx index c0a1da9..9fdca26 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.jsx @@ -78,7 +78,8 @@ const ParkArrear = forwardRef((props, ref) => { total: resultData?.totalRecords, pageSize: pageInfo.length, pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + // new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + [...dictionary?.pageSizeOptions] ), onChange: (current, size) => { setPageInfo({ @@ -159,7 +160,7 @@ const ParkArrear = forwardRef((props, ref) => { dataSource={resultData?.list || []} columns={tableColumns} pagination={false} - scroll={{y: 585}} + scroll={{y: 'calc(100% - 200px)'}} loading={tableLoading} /> diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss index 26bef27..493e9be 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/ParkArrear/index.scss @@ -22,6 +22,7 @@ height: 25px; } .park-table-content { + min-height: 0; flex: 1; .park-table { flex: 1; diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx index 237874a..d98c04b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/PlateArrear/index.jsx @@ -75,9 +75,7 @@ const PlateArrear = forwardRef((props, ref) => { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) - ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, @@ -286,14 +284,14 @@ const ModalDetail = (props) => { return (
-
欠费总分析详情
+
共查询到{ resultData.totalRecords || 0 }条结果
tr>th { background-color: #616b83; diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss index e4bd7df..7424481 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/index.scss @@ -36,6 +36,7 @@ $color-primary : var(--color-primary); margin-bottom: 10px; } .parking-wrapper { + min-height: 0; flex: 1; } } diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx index 410b3ec..ff0096d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx @@ -70,9 +70,10 @@ function ArrearageRecoverAly(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: Array.from( - new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) - ), + // pageSizeOptions: Array.from( + // new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) + // ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx index b182fc6..0d54e82 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx @@ -73,6 +73,7 @@ function CityArrearageAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx index 039a42f..9fa51c2 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx @@ -78,6 +78,7 @@ function CityIncomeStat(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx index 11e173d..80fe9b9 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx @@ -81,6 +81,7 @@ function OrderArrearageAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx index b4edd2b..003ab6d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx @@ -80,6 +80,7 @@ function PriceAly(props) { pageSizeOptions: Array.from( new Set([...[15], ...(dictionary?.pageSizeOptions || [])]) ), + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx index eb96e6f..ea70708 100644 --- a/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx +++ b/src/pages/InRoadMgm/EquipmentMgm/MonitorEquipment/loadable.jsx @@ -112,7 +112,9 @@ function Fence(props) { }) setEditId(item.id) getBerthDataByNvr(item.nvr_id).then(() => { - setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + setTimeout(() => { + setBerthSelectData(item.berth_ids ? item.berth_ids.split(',').map((v) => v) : []) + }, 500) }) setEditModalVisible(true) } diff --git a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx index 8f34565..c248df9 100644 --- a/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/ConfMes/loadable.jsx @@ -128,7 +128,8 @@ function ConfMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx index 209af94..27ce50e 100644 --- a/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/DeviceAlarmMes/loadable.jsx @@ -100,7 +100,8 @@ function NotificationMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx index 6ec9611..ca5cea0 100644 --- a/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/MonitorCarAlarmMes/loadable.jsx @@ -99,7 +99,8 @@ function MonitorCarAlarmMes(props) { current: pageInfo.pn, total: resultData?.totalRecords, pageSize: pageInfo.length, - pageSizeOptions: [8, 10 ,20], + // pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx index f67c3f4..ca8d388 100644 --- a/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx +++ b/src/pages/SystemMgm/MessageMgm/NotificationMes/loadable.jsx @@ -142,6 +142,7 @@ function NotificationMes(props) { total: resultData?.totalRecords, pageSize: pageInfo.length, pageSizeOptions: [8, 10 ,20], + pageSizeOptions: dictionary.pageSizeOptions, onChange: (current, size) => { setPageInfo({ ...pageInfo, diff --git a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx index be3a3b1..69bc6ba 100644 --- a/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx +++ b/src/pages/SystemMgm/OrgnizationMgm/loadable.jsx @@ -136,7 +136,8 @@ function OrgnizationMgm() { orgForm.setFieldsValue({ id: id, 'depart_id': recursionFindIdPath([...departTree], id, undefined, false), - 'name': name + 'name': name, + pid: pid }) setActiveOrgTree({ isTop: isTop }) setOrgModalVisible(true) @@ -374,12 +375,13 @@ function OrgnizationMgm() { const handleOrgConfirm = () => { orgForm.validateFields().then((data) => { + // console.log(data) let arr =data.depart_id if (data.id) { ajaxAreaEdit(Object.assign({}, { id: data.id, name: data.name, - pid: arr ? arr.at(-1) : '' + pid: data.pid })).then((msg) => { message.success(msg) setOrgModalVisible(false) @@ -642,6 +644,7 @@ function OrgnizationMgm() { > + Date: Tue, 2 Jan 2024 16:58:21 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=91=A8=E8=BD=AC=E7=8E=87=E9=94=99=E8=AF=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParkingOverview/index.scss | 4 +- .../ParkingOverview/loadable.jsx | 70 +++++++++++++--------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss index 6931230..1a59baa 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/index.scss @@ -531,7 +531,7 @@ $color-primary : var(--color-primary); .tfff { display: flex; flex-direction: column; - justify-content: space-between; + // justify-content: space-between; } .fsagsxf { @@ -543,7 +543,7 @@ $color-primary : var(--color-primary); .topcarlv { display: flex; - justify-content: space-between; + justify-content: space-around; padding: 0 20px; .tpph { diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 570c554..764b4de 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -1743,7 +1743,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { GetRevenueAnalysis(RoadSelect, "1"); if (CarRoad[CarShow]?.type == 2) { setRoadturn(true); - GetrateRank("1"); + GetrateRank(RoadSelect, "1"); GetincomeType(RoadSelect, "1"); GetOverviewData(RoadSelect); } else { @@ -2135,7 +2135,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { ? "实时收入占比" : RoadSelect == "2" ? "路段收费率排行榜" - : "路段周转TOP3"} + : "车场周转率TOP3"}
{CarRoad[CarShow]?.type != 2 ? ( @@ -2160,33 +2160,45 @@ const ParkingOverview = connect(function mapStateToProps(state) { {CarRoad[CarShow]?.type == 1 ? (
-
- {/* */} - TOP2 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[1]?.rate || 0} -

-
{Cartop[1]?.name || ""}
-
-
- {/* */} - TOP1 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[0]?.rate || 0} -

-
{Cartop[0]?.name || ""}
-
-
- {/* */} - TOP3 -

- {RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[2]?.rate || 0} -

-
{Cartop[2]?.name || ""}
-
+ {Cartop[1]?.name && ( +
+ {/* */} + TOP2 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[1]?.rate || 0} +

+
+ {Cartop[1]?.name || ""} +
+
+ )} + {Cartop[0]?.name && ( +
+ {/* */} + TOP1 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[0]?.rate || 0} +

+
+ {Cartop[0]?.name || ""} +
+
+ )} + {Cartop[2]?.name && ( +
+ {/* */} + TOP3 +

+ {RoadSelect == 3 ? "周转率" : "收费率"} + {Cartop[2]?.rate || 0} +

+
+ {Cartop[2]?.name || ""} +
+
+ )}
) : ( Date: Tue, 2 Jan 2024 17:08:25 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=91=A8=E8=BD=AC=E7=8E=87=E5=8D=95=E4=BD=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx index 764b4de..4a49baa 100644 --- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx @@ -2166,7 +2166,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { TOP2

{RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[1]?.rate || 0} + {Cartop[1]?.rate || 0}%

{Cartop[1]?.name || ""} @@ -2179,7 +2179,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { TOP1

{RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[0]?.rate || 0} + {Cartop[0]?.rate || 0}%

{Cartop[0]?.name || ""} @@ -2192,7 +2192,7 @@ const ParkingOverview = connect(function mapStateToProps(state) { TOP3

{RoadSelect == 3 ? "周转率" : "收费率"} - {Cartop[2]?.rate || 0} + {Cartop[2]?.rate || 0}%

{Cartop[2]?.name || ""} From 9a453469078e55ba6ea11410508e69a818477782 Mon Sep 17 00:00:00 2001 From: guoxin Date: Tue, 2 Jan 2024 18:02:02 +0800 Subject: [PATCH 6/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/TableModule/index.jsx | 17 ++++-- .../InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx | 33 ++++++----- src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss | 23 ++++++-- src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx | 68 +++++++++++++++------- src/services/InroadMgm/InRoadOverview/index.js | 2 +- 5 files changed, 96 insertions(+), 47 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index 573253a..cc00d01 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -272,7 +272,7 @@ const TableModule = forwardRef((props, ref) => { setFormData({ ...searchForm.getFieldsValue(), plateValue: '' }) //search({ ...searchForm.getFieldsValue() }) setTimeGroup({ - timeType: timeGroup.timeType, + timeType: '', timeRanges: { start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'), end_time: moment().format("YYYY-MM-DD 23:59:59"), @@ -744,6 +744,7 @@ const TableModule = forwardRef((props, ref) => { console.log(range, type) setTimeGroup({ timeType: type, timeRanges: range }); }} + _timeGroup={timeGroup.timeRanges} /> @@ -1020,13 +1021,17 @@ function InputSelectGroup(params) { const { onChange = () => { }, getValue = () => { }, + _timeGroup = { + start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'), + end_time: moment().format("YYYY-MM-DD 23:59:59"), + } } = params; const [timeType, setTimeType] = useState(1); - const [timeGroup, setTimeGroup] = useState({ - start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'), - end_time: moment().format("YYYY-MM-DD 23:59:59"), - }); - console.log(timeGroup); + const [timeGroup, setTimeGroup] = useState(_timeGroup); + useEffect(() => { + setTimeGroup(_timeGroup) + console.log(_timeGroup); + }, [_timeGroup]); useEffect(() => { onChange(timeGroup, timeType); }, [timeGroup, timeType]); diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx index 899f9f8..4aea851 100644 --- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx +++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx @@ -51,13 +51,17 @@ import { getToken } from "@/config/cookie"; import { useSetState, useSessionStorageState, useUpdateEffect } from "ahooks"; const { TextArea } = Input; -function ConfigRoad() { +const ConfigRoad = (props) => { + const { + getRecordList = {} + } = props + console.log(getRecordList); const navigate = useNavigate(); //编辑泊位提交的编辑泊位 const location = useLocation(); - const parking_id = location.search.split("=")[1].split("&")[0]; - const operator_id = location.search.split("&")[1].split("=")[1]; - const region_id = location.search.split("&")[2].split("=")[1]; + const parking_id = getRecordList.id; + const operator_id = getRecordList.operator_id; + // const region_id = location.search.split("&")[2].split("=")[1]; const [modalBtnLoading, setModalBtnLoading] = useState(false) //泊位管理Form const [berthForm] = Form.useForm(); @@ -633,7 +637,7 @@ function ConfigRoad() { downloadUrl: "/api/bpm/device/road_set_pole_position_import_template", importProps: { name: "file", - action: "/api/bpm/device/road_set_import_pole_position", + action: "/PMS/api/bpm/device/road_set_import_pole_position", data: { road_id: parking_id }, headers: { Authorization: getToken(), @@ -1522,9 +1526,9 @@ function ConfigRoad() { } }); } - const [getEditTarket,setGetEditTarket]=useState([]) - const [getLeftEditTarket,setGetLeftEditTarket]=useState([]) - const [getSelectedKeys,setGetSelectedKeyst]=useState([]) + const [getEditTarket, setGetEditTarket] = useState([]) + const [getLeftEditTarket, setGetLeftEditTarket] = useState([]) + const [getSelectedKeys, setGetSelectedKeyst] = useState([]) function getEditRoadDevice(record) { let data = { road_id: parking_id, @@ -1564,9 +1568,9 @@ function ConfigRoad() { } }); } - const [getDeviceTarket,setGetDeviceTarket]=useState([]) - const [getLeftDeviceTarket,setGetLeftDeviceTarket]=useState([]) - const [getLeftDevicetargetKey,setGetLeftDevicetargetKey]=useState([]) + const [getDeviceTarket, setGetDeviceTarket] = useState([]) + const [getLeftDeviceTarket, setGetLeftDeviceTarket] = useState([]) + const [getLeftDevicetargetKey, setGetLeftDevicetargetKey] = useState([]) function getDevice(record) { let data = { road_id: parking_id, @@ -1777,7 +1781,7 @@ function ConfigRoad() {
- + {/* - + */} 共查询到 {resultData.total_records} 条结果 @@ -1947,7 +1951,8 @@ function ConfigRoad() {

2.请选择上传文件，并上传。

- diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss index 07f5ad8..6593e72 100644 --- a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss +++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss @@ -70,7 +70,7 @@ $color-primary: var(--color-primary); } } } - + input { width: 100%; border-color: var(--color-border); @@ -98,16 +98,14 @@ $color-primary: var(--color-primary); .ant-select-selection-placeholder { color: var(--color-placeholder); } - .ant-select-disabled.ant-select-single:not(.ant-select-customize-input) - .ant-select-selector { + .ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector { background: var(--color-input-disabled-bg); color: var(--color-placeholder); } .ant-select-disabled .ant-select-arrow { color: var(--color-placeholder); } - .ant-select-disabled.ant-select:not(.ant-select-customize-input) - .ant-select-selector { + .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector { background-color: var(--color-input-disabled-bg); color: var(--color-input-disabled-color); cursor: not-allowed; @@ -161,3 +159,18 @@ $color-primary: var(--color-primary); // border-color:var(--checkable-tag-border); } } +.handleCloseDetail { + width: 1750px !important; + position: absolute; + top: 30px; + left: 100px; + max-height: 850px; + overflow: auto; +} +.handleCloseDetail::-webkit-scrollbar { + width: 5px; +} +.handleCloseDetail::-webkit-scrollbar-thumb { + background-color: #9da2ab; + border-radius: 10px; +} \ No newline at end of file diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx index 2fd2adc..4c488be 100644 --- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx +++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx @@ -21,6 +21,7 @@ import { useSetState, useSessionStorageState, useUpdateEffect } from "ahooks"; import ajax from "@/services"; import { ResultFlow } from "@/components"; import "./index.scss"; +import ConfigRoad from "../ConfigRoad" import AuditModifyModal from "./AuditModifyModal"; // import errorImg from "@/assets/images/layout/error.png" // import { useLocation } from "react-router-dom"; @@ -129,14 +130,20 @@ function RoadConf() { > 编辑 - {record.road_level == 2 ? null : - 路段配置 - } + {record.road_level == 2 ? null : + <> + {/* + 路段配置 + */} + handleModal(record)}> 路段配置 + + + } { const type = record.no_pwd_pay === 1 ? 2 : 1; @@ -170,7 +177,15 @@ function RoadConf() { road_level: 0, no_pwd_pay: 0, }; - + const [handleDetail, setHandleDetail] = useState(false) + const [getRecordList, setGetRecordList] = useState({}) + const handleModal = (record) => { + setGetRecordList(record) + setHandleDetail(true) + } + const handleClose = () => { + setHandleDetail(false) + } const [loading, setLoading] = useState(false); const [resultData, setReusltData] = useSetState({ // 请求结果 @@ -249,7 +264,7 @@ function RoadConf() { }); } - function search(params,area1) { + function search(params, area1) { if (params) { setPageData({ pn: 1, @@ -257,7 +272,7 @@ function RoadConf() { }) } else { let result = searchForm.getFieldsValue(); - result.area = area1 ? [] :area; + result.area = area1 ? [] : area; getProgressData(result); } } @@ -282,7 +297,7 @@ function RoadConf() { let res = []; if (last.children) { addChild(last, res); - }else{ + } else { res = [last.id] } // res.push(last.id); @@ -440,12 +455,12 @@ function RoadConf() { const reastBtn = () => { searchForm.resetFields(); setArea([]) - search({},1); + search({}, 1); } - const [getAppraiseList,setAppraiseList]=useState({}) - const appraise =() => { - ajax.getAppraiseData().then(res=>{ - if(res.status===20000){ + const [getAppraiseList, setAppraiseList] = useState({}) + const appraise = () => { + ajax.getAppraiseData().then(res => { + if (res.status === 20000) { setAppraiseModal(true); setAppraiseList(res.data) } @@ -454,9 +469,9 @@ function RoadConf() { useEffect(() => { search(); }, [pageData]); - useEffect(()=>{ + useEffect(() => { getAreaTree(); - },[]) + }, []) return ( <>
@@ -487,11 +502,11 @@ function RoadConf() { 导出
{/* { }; const getParkingPayTop5 = (params) => { return ajax({ - url: "/api/bpm/home/parking_records_top5 ", + url: "/api/bpm/home/parking_fees_top5", type: "get", data: params, }); From 4598e26d12ef46676e87b66ab224002be30453cb Mon Sep 17 00:00:00 2001 From: xingjx Date: Tue, 2 Jan 2024 18:12:02 +0800 Subject: [PATCH 7/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/TableModule/index.jsx | 5 +- .../OutSegmentMgm/ChargeRulesMgm/AddModal.jsx | 25 ++++++-- .../OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx | 4 +- .../OutSegmentMgm/ChargeRulesMgm/TimePart.jsx | 73 ++++++++++++++++------ 4 files changed, 78 insertions(+), 29 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index cc00d01..7af6dcc 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -280,7 +280,10 @@ const TableModule = forwardRef((props, ref) => { }); } useEffect(() => { - !areaSelectedList.length && setTimeout( fetch,1000) + if (pageName == 'productOrderInquiryCar' || pageName == 'productOrderInquiry') { + return + } + !areaSelectedList.length && setTimeout(fetch, 1000) }, [areaSelectedList]) function cascaderChange(value, options) { let res = []; diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx index 9f86088..57d701c 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx @@ -28,6 +28,7 @@ function AddModal(props) { const isEdit = status === "edit"; const [getOperationName, setGetOperationName] = useState([]) const [getNewOperationName, setNewGetOperationName] = useState([]) + const [timestatus, setTimestatus] = useState(true) const operationName = () => { ajax.getAllOperator().then(res => { let arr = res.data @@ -57,6 +58,7 @@ function AddModal(props) { }); function addEctiveDate() { + setTimestatus(false) const randomNum = Math.floor(Math.random() * 1000); const item = { key: randomNum.toString() + Date.now().toString().substring(0, 6), @@ -78,15 +80,23 @@ function AddModal(props) { } //提交接口 function fetch(params) { - console.log(81, params, timePart) + //timePart() + console.log(81, params) // if(params?.property?.rules){ // params.property.rules.map((item)=>{ - // item.details.map((e)=>{ - // e.items.map(() - // }) + // if(!item.details){ + // message.error("请填写完整！") + // return + // } + // // item.details.map((e)=>{ + // // e.items.map(() + // // }) // }) // } - //return + if(!timestatus){ + message.error("请填写完整！") + return + } if (status === "add") { ajax.addChargeRule(params).then((res) => { if (res.status === 20000) { @@ -301,7 +311,10 @@ function AddModal(props) { index={index + 1} itemKey={item.key} remove={removeEffectiveDate} - timePart={timePart} + timePart={(e) => { console.log(78787,e);setTimestatus(e) }} + validate={() => { + + }} onChange={(value, key) => { const _effectiveDateList = effectiveDateList.map((item) => { if (item.key === key) { diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx index 32901b3..0e82db6 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx @@ -18,12 +18,12 @@ function EffectiveDate(props) { remove = () => { }, itemKey, onChange = () => { }, + validate= () => { }, timePart = () => { }, index, disable = false, record = {}, } = props; - console.log(25, record) let ac = { "unitDelay": 1, "unitUp": 1, @@ -179,7 +179,7 @@ function EffectiveDate(props) { )} {timePartList.map((item, index) => { - console.log(180, timePartList); + //console.log(180, timePartList); return ( { + console.log(43, form.getFieldsValue()) + if (form.getFieldsValue().time_part == undefined) { + timePart(false) + } + }, [form]) + const countDown = (time) => { + var s = 0; + var hour = time.split(':')[0]; + var min = time.split(':')[1]; + var sec = time.split(':')[2]; + s = Number(hour * 3600) + Number(min * 60) + Number(sec); + return s; + } const valueChange = (value, all) => { - timePart(value) + //timePart(value) console.log(value) - if(value.limit){ - form.validateFields(Object.keys(value)) - } + // if (value.limit) { + // console.log(46) + // //form.validateFields(Object.keys(value)) + // form.validateFields() + // .then(values => { console.log(values) }) + // .catch(e => console.log(e)) + // } + form.validateFields().then((data) => { + console.log(data) + }).catch(err => { + if (err.errorFields.length > 0) { + console.log('不完整') + timePart(false) + } else { + console.log('完整了',all, countDown(all.end) - countDown(all.start) { @@ -134,7 +168,6 @@ function TimePart(props) { }) } }, []) - console.log(30, record) return (
- + @@ -199,11 +232,11 @@ function TimePart(props) { return ( <> - +
,
- +
/
- + - +
,
- +
/
- + - +
/
- + @@ -259,7 +292,7 @@ function TimePart(props) { case 1: return ( - + ); } @@ -277,7 +310,7 @@ function TimePart(props) {