Browse Source

fix():修改bug

tags/PMS_V1.0.0_Alpha7
guoxin 1 year ago
parent
commit
fac4060f29
  1. 3
      src/components/SelectGaodeLngLat/index.jsx
  2. 6
      src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx
  3. 1
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx
  4. 1
      src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx
  5. 11
      src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/index.scss
  6. 13
      src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx
  7. 20
      src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
  8. 2
      src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx
  9. 51
      src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx

3
src/components/SelectGaodeLngLat/index.jsx

@ -18,6 +18,7 @@ function SelectGaodeLngLat(props) {
onChange = () => { }, onChange = () => { },
isClickMarker = false // isClickMarker = false //
} = props; } = props;
console.log(lngLatVisible);
const [lnglat, setLnglat] = useState([]); const [lnglat, setLnglat] = useState([]);
const [marker, setMarker] = useState([]); const [marker, setMarker] = useState([]);
const [address, setAddress] = useState(""); const [address, setAddress] = useState("");
@ -95,7 +96,7 @@ function SelectGaodeLngLat(props) {
</Button> </Button>
<Modal <Modal
className="map-modal" className="map-modal"
visible={lngLatVisible}
open={lngLatVisible}
width={1000} width={1000}
footer={false} footer={false}
onCancel={close} onCancel={close}

6
src/pages/InRoadMgm/BusinessMgm/AbnormalParking/ExceptionParkReport/loadable.jsx

@ -484,13 +484,13 @@ function ExceptionParkReport(props) {
</div> </div>
<div className="operatorName"> <div className="operatorName">
<div className="top"> <div className="top">
<div className="name">车牌号:{getDetailId.plateNumber}</div>
<div className="name">车牌号{getDetailId.plateNumber}</div>
<div className="type">异常类型{getDetailId.exceptDictName}</div> <div className="type">异常类型{getDetailId.exceptDictName}</div>
<div className="time">上报时间:{getDetailId.reportTime}</div>
<div className="time">上报时间{getDetailId.reportTime}</div>
</div> </div>
<div className="middle"> <div className="middle">
<div className="type">停车场{getDetailId.parkName}</div> <div className="type">停车场{getDetailId.parkName}</div>
<div className="time">入场时间:{getDetailId.entryTime}</div>
<div className="time">入场时间{getDetailId.entryTime}</div>
</div> </div>
<div className="bottom"> <div className="bottom">
{ {

1
src/pages/InRoadMgm/BusinessMgm/ChargeRules/EditModal.jsx

@ -509,6 +509,7 @@ const FormModal = (props) => {
} }
const data = options; const data = options;
handleOptionsProcessing(i, z, data, type)// handleOptionsProcessing(i, z, data, type)//
form.setFieldsValue(currentFormValues)
console.log("表单数据", currentFormValues); console.log("表单数据", currentFormValues);
return true; return true;
} }

1
src/pages/InRoadMgm/BusinessMgm/ChargeRules/FormModal.jsx

@ -489,6 +489,7 @@ const FormModal = (props) => {
// 4. // 4.
const data = options; const data = options;
handleOptionsProcessing(i, z, data, type)// handleOptionsProcessing(i, z, data, type)//
form.setFieldsValue(currentFormValues)
console.log("表单数据", currentFormValues); console.log("表单数据", currentFormValues);
return true; return true;
} }

11
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 { .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 { // .yisa-table {
// width: 100%; // width: 100%;

13
src/pages/InRoadMgm/RoadMgm/AddRoad/loadable.jsx

@ -19,7 +19,7 @@ import {
import { PlusOutlined } from "@ant-design/icons"; import { PlusOutlined } from "@ant-design/icons";
import { useLocation, useNavigate } from "react-router-dom"; import { useLocation, useNavigate } from "react-router-dom";
import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat } from "@/components";
import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat2 } from "@/components";
import moment from "moment"; import moment from "moment";
import "./index.scss"; import "./index.scss";
import ajax from "@/services"; import ajax from "@/services";
@ -50,7 +50,8 @@ function AddRoad(props) {
]; ];
const { const {
getDetailList = {}, getDetailList = {},
setDetailModel=()=>{}
setDetailModel=()=>{},
setcheckModel=()=>{},
} = props } = props
const navigate = useNavigate(); const navigate = useNavigate();
const location = useLocation(); const location = useLocation();
@ -76,7 +77,7 @@ function AddRoad(props) {
// //
const [operatorId, setOperatorId] = useState(null); const [operatorId, setOperatorId] = useState(null);
// //
const [isEdit, setIsEdit] = useState(id !== null);
const [isEdit, setIsEdit] = useState(id !== undefined);
// //
const [tradingAreaList, setTradingAreaList] = useState({ const [tradingAreaList, setTradingAreaList] = useState({
left: [], left: [],
@ -154,6 +155,7 @@ function AddRoad(props) {
if (res.status === 20000) { if (res.status === 20000) {
message.success(res.message); message.success(res.message);
setDetailModel(false) setDetailModel(false)
setcheckModel(false)
} else { } else {
message.error(res.message); message.error(res.message);
} }
@ -550,7 +552,7 @@ function AddRoad(props) {
<Input value={lngLat} /> <Input value={lngLat} />
</Col> </Col>
<Col span={5}> <Col span={5}>
<SelectGaodeLngLat
<SelectGaodeLngLat2
open={() => setLngLatVisible(true)} open={() => setLngLatVisible(true)}
lngLatVisible={lngLatVisible} lngLatVisible={lngLatVisible}
getLntLat={(value) => { getLntLat={(value) => {
@ -603,7 +605,7 @@ function AddRoad(props) {
{isEdit ? ( {isEdit ? (
<> <>
<Col span={8}> <Col span={8}>
<Form.Item label="泊位总数" name="berth_num" rules={rules}>
<Form.Item label="泊位总数" name="berth_num" >
<Input disabled /> <Input disabled />
</Form.Item> </Form.Item>
</Col> </Col>
@ -859,6 +861,7 @@ function AddRoad(props) {
<Button <Button
onClick={() => { onClick={() => {
setDetailModel(false) setDetailModel(false)
setcheckModel(false)
}} }}
type="primary" type="primary"
> >

20
src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx

@ -24,6 +24,7 @@ import "./index.scss";
import ConfigRoad from "../ConfigRoad" import ConfigRoad from "../ConfigRoad"
import AddRoad from "../AddRoad" import AddRoad from "../AddRoad"
import RoadDetail from "../RoadDetail" import RoadDetail from "../RoadDetail"
// import AddRoad from "../AddRoad"
import AuditModifyModal from "./AuditModifyModal"; import AuditModifyModal from "./AuditModifyModal";
// import errorImg from "@/assets/images/layout/error.png" // import errorImg from "@/assets/images/layout/error.png"
// import { useLocation } from "react-router-dom"; // import { useLocation } from "react-router-dom";
@ -184,6 +185,7 @@ function RoadConf() {
const [handleDetail, setHandleDetail] = useState(false) const [handleDetail, setHandleDetail] = useState(false)
const [detailModel, setDetailModel] = useState(false) const [detailModel, setDetailModel] = useState(false)
const [checkDetailModel, setCheckDetailModel] = useState(false) const [checkDetailModel, setCheckDetailModel] = useState(false)
const [checkModel, setcheckModel] = useState(false)
const [getRecordList, setGetRecordList] = useState({}) const [getRecordList, setGetRecordList] = useState({})
const handleModal = (record) => { const handleModal = (record) => {
setGetRecordList(record) setGetRecordList(record)
@ -208,6 +210,9 @@ function RoadConf() {
const handleCheckDetails=()=>{ const handleCheckDetails=()=>{
setCheckDetailModel(false) setCheckDetailModel(false)
} }
const CheckDetails=()=>{
setcheckModel(false)
}
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [resultData, setReusltData] = useSetState({ const [resultData, setReusltData] = useSetState({
// //
@ -311,7 +316,7 @@ function RoadConf() {
}; };
// //
function addRoad(params) { function addRoad(params) {
navigate("/inRoad/addRoad");
setcheckModel(true)
} }
function cascaderChange(value, options) { function cascaderChange(value, options) {
@ -715,6 +720,19 @@ function RoadConf() {
> >
</RoadDetail> </RoadDetail>
</Modal> </Modal>
<Modal
visible={checkModel}
onCancel={CheckDetails}
footer={false}
className="handleCloseDetailModel"
destroyOnClose={true}
>
<AddRoad
getCheckDetailList={getCheckDetailList}
setcheckModel={setcheckModel}
>
</AddRoad>
</Modal>
</div> </div>
{/* <AuditModifyModal {/* <AuditModifyModal
open={auditModalData.visible} open={auditModalData.visible}

2
src/pages/InRoadMgm/Stuff/StuffMgm/loadable.jsx

@ -313,7 +313,7 @@ function StuffMgm(props) {
// //
const getResetData = () => { const getResetData = () => {
setGetOption(['0']) setGetOption(['0'])
getAssetData()
setFormData({ setFormData({
...parameter, ...parameter,
}) })

51
src/pages/OperationCenter/CustomerServieMgm/ErrorCorrection/loadable.jsx

@ -17,7 +17,7 @@ function ErrorCorrection(props) {
process_url: "" process_url: ""
}) })
const parameter = { const parameter = {
areId:['0'], //
areId: ['0'], //
parkName: '', // parkName: '', //
correctionType: 0,// correctionType: 0,//
pn: 1, pn: 1,
@ -48,6 +48,7 @@ function ErrorCorrection(props) {
} }
} }
console.log(res); console.log(res);
setFormData({ ...formData, areId:value })
setAreaSelectedList(res); setAreaSelectedList(res);
} }
const addChild = (child, res) => { const addChild = (child, res) => {
@ -121,11 +122,11 @@ function ErrorCorrection(props) {
setImgVisible(false) setImgVisible(false)
} }
// //
const getData = (data = formData) => {
const getData = (data = formData,reset='') => {
setAjaxLoading(true) setAjaxLoading(true)
let dataList = { let dataList = {
...data, ...data,
areId: areaSelectedList
areId:!reset ? areaSelectedList :[]
} }
ajax.getCarErrorList(dataList).then(res => { ajax.getCarErrorList(dataList).then(res => {
setAjaxLoading(false) setAjaxLoading(false)
@ -157,7 +158,7 @@ function ErrorCorrection(props) {
if (lastFormData.page_size === length) { if (lastFormData.page_size === length) {
setFormData(Object.assign({}, formData, { pn: pn, page_size: length })) setFormData(Object.assign({}, formData, { pn: pn, page_size: length }))
setLastFormData(Object.assign({}, lastFormData, { 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 })) getData(Object.assign({}, formData, { pn: pn, page_size: length }))
} }
} }
@ -172,7 +173,7 @@ function ErrorCorrection(props) {
const getSearchData = (data = formData) => { const getSearchData = (data = formData) => {
// getData(data) // getData(data)
setFormData({ ...formData, pn: 1 }) setFormData({ ...formData, pn: 1 })
setLastFormData({...formData, pn: 1})
setLastFormData({ ...formData, pn: 1 })
getData(Object.assign({}, formData, { pn: 1 })) getData(Object.assign({}, formData, { pn: 1 }))
} }
// //
@ -180,8 +181,8 @@ function ErrorCorrection(props) {
setFormData({ setFormData({
...parameter ...parameter
}) })
setAreaId([])
getData({...parameter,pn: 1} )
setAreaSelectedList([])
getData({ ...parameter, pn: 1 },'reset')
} }
const [getCanCaDer, setGetCanCaDer] = useState([]) const [getCanCaDer, setGetCanCaDer] = useState([])
@ -204,7 +205,7 @@ function ErrorCorrection(props) {
<div className="yisa-search"> <div className="yisa-search">
<label>区域</label> <label>区域</label>
<Cascader <Cascader
defaultValue={formData.areId}
value={formData.areId}
options={getCanCaDer} options={getCanCaDer}
allowClear={false} allowClear={false}
onChange={onChangeList} onChange={onChangeList}
@ -239,13 +240,13 @@ function ErrorCorrection(props) {
</div> </div>
<div className="timePicker "> <div className="timePicker ">
<div className="btnBox"> <div className="btnBox">
<Button className="yisa-btn" onClick={() => { getResetData() }}>
<Button className="yisa-btn" onClick={() => { getResetData() }}>
重置 重置
</Button> </Button>
<Button type="primary" className="yisa-btn" onClick={() => { getSearchData() }}>
查询
<Button type="primary" className="yisa-btn" onClick={() => { getSearchData() }}>
查询
</Button> </Button>
</div> </div>
</div> </div>
</div> </div>
@ -320,21 +321,21 @@ function ErrorCorrection(props) {
<div className="plate"> <div className="plate">
问题描述<span className="font">{getImg.description}</span> 问题描述<span className="font">{getImg.description}</span>
</div> </div>
<div className="plate" >
<div>图片</div>
<div className="plate-content">
<div className="plate" >
<div>图片</div>
<div className="plate-content">
{
getImgList?.map((res, index) => {
return (
<div className="img-item">
<Image src={res} />
{
getImgList?.map((res, index) => {
return (
<div className="img-item">
<Image src={res} />
</div>
)
})
}
</div>
</div>
)
})
}
</div>
</div> </div>

Loading…
Cancel
Save