diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx index a00373c..6efda83 100644 --- a/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx +++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx @@ -673,7 +673,7 @@ function OutNvrMgm(props) { name={"operator_id"} rules={[{ required: true, message: "所属商户不能为空" }]} > -
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx index f63a670..f0d3ec9 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx @@ -17,7 +17,7 @@ import moment from "moment"; import ajax from "@/services"; const { RangePicker } = DatePicker; const { TextArea } = Input; -function BlacklistManagement({id}) { +function BlacklistManagement({ id }) { const [searchForm] = Form.useForm(); const [editForm] = Form.useForm(); const columns = [ @@ -156,7 +156,7 @@ function BlacklistManagement({id}) { }; //搜索接口 const search = () => { - let params = { ...searchForm.getFieldsValue(), ...pageData }; + let params = { ...searchForm.getFieldsValue(), ...pageData, road_id: id, }; ajax.getBlackList(params).then((res) => { if (res.status === 20000) { setDataSource(res.data.list); @@ -209,7 +209,7 @@ function BlacklistManagement({id}) { if (editModal.status === "add") { ajax.addRoadBlackVehicle({ ...res, - road_id:id, + road_id: id, effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"), effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss") }).then((res) => { diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx index e54f9e6..e6ca9a1 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx @@ -21,6 +21,7 @@ function CarManagement({ id }) { const [form] = Form.useForm(); const [editForm] = Form.useForm(); const [carGroup, setCarGroup] = useState([]); + const [deleteModal, setDeleteModal] = useState(false); const columns = [ { title: "序号", @@ -116,7 +117,7 @@ function CarManagement({ id }) {
{ - deleteCar(record.id); + setDeleteModal(true) }} > 删除 @@ -195,6 +196,7 @@ function CarManagement({ id }) { ajax.deleteVehicle({ id }).then((res) => { if (res.status === 20000) { message.success(res.message); + setDeleteModal(false) } }); }; @@ -423,6 +425,18 @@ function CarManagement({ id }) { + { setDeleteModal(false) }} + onOk={() => { deleteCar(record.id); }} + //footer={null} + className="applyCopyModal" + title='提示' + > +
+ 确认是否删除该记录! +
+
); } diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx index 091de8f..f48c016 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx @@ -1,6 +1,6 @@ import React from "react"; import { Form, Select, Row, Col, Table, Button, Input } from "antd"; -function OffPeakVehicleManagement() { +function OffPeakVehicleManagement({ id }) { const columns = [ { title: "序号", @@ -80,10 +80,10 @@ function OffPeakVehicleManagement() {
- + /> ); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx index 3763dc5..e8ef2c2 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx @@ -156,7 +156,7 @@ function WhitelistManagement({ id }) { }; //搜索接口 const search = () => { - let params = { ...searchForm.getFieldsValue(), ...pageData }; + let params = { ...searchForm.getFieldsValue(), ...pageData, road_id: id, }; ajax.getWhiteList(params).then((res) => { if (res.status === 20000) { setDataSource(res.data.list); diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx index b21a2a8..4952d2d 100644 --- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx +++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx @@ -124,7 +124,7 @@ function ParkingContent(props) { {roadInfo.physics_type} - + {roadInfo.berth_number} {roadInfo.area_name}