Browse Source

fix():bug修改

master
xingjx 1 year ago
parent
commit
acf0729814
  1. 2
      src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx
  2. 6
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx
  3. 16
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx
  4. 8
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx
  5. 2
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx
  6. 2
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx

2
src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx

@ -673,7 +673,7 @@ function OutNvrMgm(props) {
name={"operator_id"} name={"operator_id"}
rules={[{ required: true, message: "所属商户不能为空" }]} rules={[{ required: true, message: "所属商户不能为空" }]}
> >
<Select placeholder="请选择" options={storeData} />
<Select placeholder="请选择" options={storeData.slice(1)} />
</Form.Item> </Form.Item>
</div> </div>
<div className="row-line"> <div className="row-line">

6
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/BlacklistManagement.jsx

@ -17,7 +17,7 @@ import moment from "moment";
import ajax from "@/services"; import ajax from "@/services";
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const { TextArea } = Input; const { TextArea } = Input;
function BlacklistManagement({id}) {
function BlacklistManagement({ id }) {
const [searchForm] = Form.useForm(); const [searchForm] = Form.useForm();
const [editForm] = Form.useForm(); const [editForm] = Form.useForm();
const columns = [ const columns = [
@ -156,7 +156,7 @@ function BlacklistManagement({id}) {
}; };
// //
const search = () => { const search = () => {
let params = { ...searchForm.getFieldsValue(), ...pageData };
let params = { ...searchForm.getFieldsValue(), ...pageData, road_id: id, };
ajax.getBlackList(params).then((res) => { ajax.getBlackList(params).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
setDataSource(res.data.list); setDataSource(res.data.list);
@ -209,7 +209,7 @@ function BlacklistManagement({id}) {
if (editModal.status === "add") { if (editModal.status === "add") {
ajax.addRoadBlackVehicle({ ajax.addRoadBlackVehicle({
...res, ...res,
road_id:id,
road_id: id,
effective_begin_date: moment(res.effective_date[0]).format("YY-MM-DD HH:mm:ss"), 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") effective_end_date: moment(res.effective_date[1]).format("YY-MM-DD HH:mm:ss")
}).then((res) => { }).then((res) => {

16
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarManagement.jsx

@ -21,6 +21,7 @@ function CarManagement({ id }) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [editForm] = Form.useForm(); const [editForm] = Form.useForm();
const [carGroup, setCarGroup] = useState([]); const [carGroup, setCarGroup] = useState([]);
const [deleteModal, setDeleteModal] = useState(false);
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
@ -116,7 +117,7 @@ function CarManagement({ id }) {
<div> <div>
<a <a
onClick={() => { onClick={() => {
deleteCar(record.id);
setDeleteModal(true)
}} }}
> >
删除 删除
@ -195,6 +196,7 @@ function CarManagement({ id }) {
ajax.deleteVehicle({ id }).then((res) => { ajax.deleteVehicle({ id }).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
message.success(res.message); message.success(res.message);
setDeleteModal(false)
} }
}); });
}; };
@ -423,6 +425,18 @@ function CarManagement({ id }) {
</Row> </Row>
</Form> </Form>
</Modal> </Modal>
<Modal
open={deleteModal}
onCancel={() => { setDeleteModal(false) }}
onOk={() => { deleteCar(record.id); }}
//footer={null}
className="applyCopyModal"
title='提示'
>
<div className="enableStatus">
确认是否删除该记录
</div>
</Modal>
</div> </div>
); );
} }

8
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/OffPeakVehicleManagement.jsx

@ -1,6 +1,6 @@
import React from "react"; import React from "react";
import { Form, Select, Row, Col, Table, Button, Input } from "antd"; import { Form, Select, Row, Col, Table, Button, Input } from "antd";
function OffPeakVehicleManagement() {
function OffPeakVehicleManagement({ id }) {
const columns = [ const columns = [
{ {
title: "序号", title: "序号",
@ -80,10 +80,10 @@ function OffPeakVehicleManagement() {
</Form> </Form>
</header> </header>
<main> <main>
<Table
columns={columns}
<Table
columns={columns}
// className="yisa-table" // className="yisa-table"
/>
/>
</main> </main>
</div> </div>
); );

2
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/WhitelistManagement.jsx

@ -156,7 +156,7 @@ function WhitelistManagement({ id }) {
}; };
// //
const search = () => { const search = () => {
let params = { ...searchForm.getFieldsValue(), ...pageData };
let params = { ...searchForm.getFieldsValue(), ...pageData, road_id: id, };
ajax.getWhiteList(params).then((res) => { ajax.getWhiteList(params).then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
setDataSource(res.data.list); setDataSource(res.data.list);

2
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/Detail.jsx

@ -124,7 +124,7 @@ function ParkingContent(props) {
<Descriptions.Item label="停车场物理类型"> <Descriptions.Item label="停车场物理类型">
{roadInfo.physics_type} {roadInfo.physics_type}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="独立车场泊位数">
<Descriptions.Item label={roadInfo.road_type + "泊位数"}>
{roadInfo.berth_number} {roadInfo.berth_number}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="区域">{roadInfo.area_name}</Descriptions.Item> <Descriptions.Item label="区域">{roadInfo.area_name}</Descriptions.Item>

Loading…
Cancel
Save