From 470880f73d1783a833605dfa2799158ef13aa60b Mon Sep 17 00:00:00 2001 From: guoxin Date: Thu, 2 Nov 2023 14:28:50 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E5=A2=9E=E5=8A=A0=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E5=8D=A1=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Search/OptionPanel/index.scss | 6 +- src/components/Search/ResultPanel/index.scss | 11 +-- .../BusinessMgm/ChargeRules/EditModal.jsx | 105 +++++++++++---------- .../InRoadMgm/BusinessMgm/ChargeRules/index.scss | 2 +- .../InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx | 2 +- .../RecordInquiry/ParkRecordTotal/loadable.jsx | 6 +- 6 files changed, 66 insertions(+), 66 deletions(-) diff --git a/src/components/Search/OptionPanel/index.scss b/src/components/Search/OptionPanel/index.scss index 200d101..2d2e602 100644 --- a/src/components/Search/OptionPanel/index.scss +++ b/src/components/Search/OptionPanel/index.scss @@ -115,9 +115,7 @@ $color-primary: var(--color-primary); height: 4px; } .searchWrap::-webkit-scrollbar-thumb { - background-color: var(--color-scrollbar-thumb); - background-clip: padding-box; - border-radius: 4px; - min-height: 28px; + background-color: #9da2ab; + border-radius: 10px; } } diff --git a/src/components/Search/ResultPanel/index.scss b/src/components/Search/ResultPanel/index.scss index f3f3c55..f13c39b 100644 --- a/src/components/Search/ResultPanel/index.scss +++ b/src/components/Search/ResultPanel/index.scss @@ -406,15 +406,14 @@ $color-primary : var(--color-primary); } .table-wrap::-webkit-scrollbar { - width: 4px; - height: 4px; + width: 5px; + height: 5px; + cursor: pointer; } .table-wrap::-webkit-scrollbar-thumb { - background-color: var(--color-scrollbar-thumb); - background-clip: padding-box; - border-radius: 4px; - min-height: 28px; + background-color: #9da2ab; + border-radius: 10px; } } diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx index 627cf68..56122c0 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx @@ -21,7 +21,7 @@ const FormModal = (props) => { yisaData = {}, editVisible, editModal = () => { }, - getEditData={} + getEditData = {} } = props // 表单信息 console.log(getEditData); @@ -100,12 +100,12 @@ const FormModal = (props) => { // 表单改变事件 const handleForm = (changedValues, allValues) => { - let obj = {}; + let obj = {}; let key = Object.keys(changedValues)[0]; let val = Object.values(changedValues)[0]; console.log('val', val); console.log('key', key); - if(key == 'newCarStatus'){ + if (key == 'newCarStatus') { getNewCarRef.current = val } switch (key) { @@ -163,7 +163,7 @@ const FormModal = (props) => { form.setFieldsValue(newObj); changeGetNewCar() }; - const changeGetNewCar = ()=>{ + const changeGetNewCar = () => { setGetNewCar(getNewCarRef.current) } @@ -221,7 +221,10 @@ const FormModal = (props) => { if (JSON.stringify(yisaData) != "{}") { newObj = handelDate(yisaData, 2) } - // console.log(newObj); + console.log(newObj); + newObj.rules = newObj?.source?.rules + delete newObj.source + console.log(newObj); form.setFieldsValue(newObj); }, [yisaData]); @@ -315,7 +318,7 @@ const FormModal = (props) => { 新能源车 { - getNewCar? + getNewCar ?
{ // console.log(fields); return (
-
+
{ {fields.map(({ key, name, ...restField }, i) => { // console.log(fields); return ( -
+
{ > - + { <> {fields.map(({ key, name, ...restField }, z) => { return ( -
+
{ - { - form?.getFieldValue('rules')[j].details[i].items[z].type == '3' ? -
- - - - -
- : -
- - - + { + form?.getFieldValue('rules')[j].details[i].items[z].type == '3' ? +
+ + + + +
+ : +
+ + + - - - - - - - - - -
- } - + + + + + + + + + +
+ } + diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss index 4ed9c72..c3c1afa 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/index.scss @@ -188,7 +188,7 @@ $color-primary: var(--color-primary); } } .addRuleModal { - width: 700px !important; + width: 1000px !important; .addRule::-webkit-scrollbar-track { background: white; } diff --git a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx index a59c292..c5db24b 100644 --- a/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx +++ b/src/pages/InRoadMgm/BusinessMgm/ChargeRules/loadable.jsx @@ -353,7 +353,7 @@ function ChargeRules(props) { } const deleteSubmit = () => { let data = { - user_id: getDeleteData.id + id: getDeleteData.id } ajax.changeEditRule(data).then(res => { if (res.status === 20000) { diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx index 7e5f2ef..40997f5 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx @@ -85,8 +85,8 @@ function ParkRecordTotal() { }, { title: "泊位号", - dataIndex: "road", - key: "road", + dataIndex: "berth_id", + key: "berth_id", width: 100, align: "center", }, @@ -491,7 +491,7 @@ function ParkRecordTotal() {
- Zhou Maomao + {item.road} {item.berth_id} {item.region}