From 8e77f111fd7351226992ad1072f2ec319c58de7b Mon Sep 17 00:00:00 2001
From: xingjx <xingjx@yisa.com>
Date: Tue, 26 Dec 2023 18:17:34 +0800
Subject: [PATCH] =?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 | 15 +++
.../ParkingBusinessAly/CarTypeAly/index.scss | 7 +-
.../ParkingBusinessAly/CarTypeAly/loadable.jsx | 2 +-
.../ParkingAlyDuration/loadable.jsx | 8 +-
.../TemporaryParkStat/loadable.jsx | 2 +-
.../OrderInquiry/ParkingOrderInquiry/index.jsx | 10 +-
.../OutParkingArrearsOrders/loadable.jsx | 2 +
.../OutParkingRecordInquiry/loadable.jsx | 2 +
.../OutBusinessRecord/OutPayOrders/loadable.jsx | 5 +-
.../OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx | 8 +-
.../OutDeviceMgm/OutMonitorMgm/loadable.jsx | 1 +
.../OutSegmentMgm/OutSegment/AddParking.jsx | 12 +--
.../ConfigParking/CarMgm/CarGroupMgm.jsx | 101 +++++++++++----------
.../OutSegmentMgm/OutSegment/loadable.jsx | 3 +-
14 files changed, 107 insertions(+), 71 deletions(-)
diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 29c27b0..2d63ae3 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -20,6 +20,7 @@ import {
Cascader,
message,
Modal,
+ InputNumber,
} from "antd";
import { dictionary } from "@/config/common";
import ajax from "@/services";
@@ -543,6 +544,20 @@ const TableModule = forwardRef((props, ref) => {
</Form.Item>
);
break;
+ case "InputNumber":
+ children = (
+ <Form.Item
+ label={item.label}
+ name={item.name}
+ key={item.name}
+ >
+ {item.point == 0 ?
+ <InputNumber min={item.min} max={item.max} precision={0} style={{ width: '100%' }} /> :
+ <InputNumber min={item.min} max={item.max} precision={item.point} style={{ width: '100%' }} />
+ }
+ </Form.Item>
+ );
+ break;
case "Select":
item.options?.map((item) => {
if (item.value == undefined) {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss
index 6b8a639..67efe78 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/index.scss
@@ -5,7 +5,7 @@ $color-user-list-bg : var(--color-user-list-bg);
$color-text : var(--color-text);
$color-primary : var(--color-primary);
-.edit-order-inquiry {
+.cartypealy-box {
display: flex;
padding-top: 10px;
width: 100%;
@@ -289,6 +289,9 @@ $color-primary : var(--color-primary);
.parkinglive-right {
width: 50%;
+ .ant-tabs .ant-tabs-nav-wrap .ant-tabs-nav-list {
+ width: 100% !important;
+ }
}
}
@@ -407,7 +410,7 @@ $color-primary : var(--color-primary);
}
}
-.edit-order-inquiry {
+.cartypealy-box {
/*定义滚动条高宽及背景
高宽分别对应横竖滚动条的尺寸*/
::-webkit-scrollbar {
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
index 4144c4c..19df23c 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
@@ -426,7 +426,7 @@ function CarTypeAly() {
}, []);
return (
<>
- <div className="edit-order-inquiry">
+ <div className="cartypealy-box">
<div className="paid-search">
<div className="title">查询条件</div>
<div className="form-Wrap">
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
index 5d3c35a..a7ff752 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
@@ -918,7 +918,7 @@ function ParkingAlyDuration() {
showHeader={false}
columns={columns}
dataSource={tableData?.list?.area_list || []}
- rowKey={'area_name'}
+ rowKey={(record) => record.area_name + Math.random() * 10000}
bordered
//pagination={false}
size="middle"
@@ -947,7 +947,7 @@ function ParkingAlyDuration() {
showHeader={false}
columns={parkColumns}
dataSource={tableData?.list?.road_list}
- rowKey={'area_name'}
+ rowKey={(record) => record.area_name + Math.random() * 10000}
bordered
//pagination={false}
size="middle"
@@ -1011,7 +1011,7 @@ function ParkingAlyDuration() {
showHeader={false}
columns={columns1}
dataSource={tableCarData?.list?.area_list || []}
- rowKey={'area_name'}
+ rowKey={(record) => record.area_name + Math.random() * 10000}
bordered
//pagination={false}
size="middle"
@@ -1040,7 +1040,7 @@ function ParkingAlyDuration() {
showHeader={false}
columns={parkColumns1}
dataSource={tableCarData?.list?.road_list}
- rowKey={'area_name'}
+ rowKey={(record) => record.road_name + Math.random() * 10000}
bordered
//pagination={false}
size="middle"
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
index 3b5aa74..b42f55c 100644
--- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
@@ -186,7 +186,7 @@ function TemporaryParkStat() {
formatter: (params) => {
return `<div class="tooltip-box">
${params[0].axisValue}<br/>
- ${params[0]?.data.value && params[1]?.data.value ? "总停车次数：" + (parseFloat(params[0].data.value) + parseFloat(params[1].data.value)) + '次<br/>' : ""}
+ ${params[0]?.data.value && params[1]?.data.value ? "总停车次数：" + (parseFloat(params[0].data.value) + parseFloat(params[1].data.value)) + '次<br/>' : params[0]?.data.value ? "总停车次数：" + parseFloat(params[0].data.value) + '次<br/>' : ""}
${params[0]?.data ? params[0]?.seriesName + ":" + params[0]?.data.value + "次，占比" + params[0]?.data.num + "%" : ""}<br/>
${params[1]?.data ? params[1]?.seriesName + ":" + params[1]?.data.value + "次，占比" + params[1]?.data.num + "%" : ""}
</div>`
diff --git a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
index c01d2e6..eb71a6f 100644
--- a/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
+++ b/src/pages/FinancialMgm/OrderInquiry/ParkingOrderInquiry/index.jsx
@@ -525,9 +525,10 @@ function ParkingOrderInquiry(props) {
},
{//27
name: "order_mount_down",
- type: "Input",
+ type: "InputNumber",
label: "欠费区间",
- placeholder: "",
+ min:'0',
+ point:'0',
},
{//28
name: "timePeriod",
@@ -567,9 +568,10 @@ function ParkingOrderInquiry(props) {
},
{//30
name: "order_mount_up",
- type: "Input",
+ type: "InputNumber",
label: "至",
- placeholder: "",
+ min:'0',
+ point:'0',
},
];
const [resultData, setResultData] = useState([])
diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx
index befeb34..b388288 100644
--- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingArrearsOrders/loadable.jsx
@@ -164,6 +164,8 @@ function OutParkingArrearsOrders() {
//搜索参数初始化
const initFormData = {
type: 2,
+ region:'0',
+ operator:'0',
};
//搜索的结果
diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
index 207d4c1..323da4f 100644
--- a/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutParkingRecordInquiry/loadable.jsx
@@ -179,6 +179,8 @@ function OutParkingRecordInquiry() {
//搜索参数初始化
const initFormData = {
type: 2,
+ region:'0',
+ operator:'0',
};
//搜索的结果
diff --git a/src/pages/OutRoadMgm/OutBusinessRecord/OutPayOrders/loadable.jsx b/src/pages/OutRoadMgm/OutBusinessRecord/OutPayOrders/loadable.jsx
index 76f90f8..de33cb6 100644
--- a/src/pages/OutRoadMgm/OutBusinessRecord/OutPayOrders/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutBusinessRecord/OutPayOrders/loadable.jsx
@@ -164,7 +164,10 @@ function OutPayOrders() {
},
];
//搜索参数初始化
- const initFormData = {};
+ const initFormData = {
+ payment_channels: 0,
+ payment_equipment: 0,
+ };
//搜索的结果
const [tableData, setTableData] = useState([]);
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx
index afa98dd..82bb167 100644
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutDevice/loadable.jsx
@@ -26,11 +26,11 @@ function OutDevice() {
);
// 默认数据
const defaultData = {
- area_id: "", // 区域
- operator: "", // 商户名称
+ area_id: "0", // 区域
+ operator: "0", // 商户名称
road_id: "", // 停车场名称
physics_type: "0", // 停车场类型
- is_fail: "", // 是否有故障
+ is_fail: "0", // 是否有故障
};
// 分页数据
const [pageInfo, setPageInfo] = useState({
@@ -38,7 +38,7 @@ function OutDevice() {
page_size: defaultParams ? defaultParams?.page_size : 15,
});
// 表单数据
- const [formData, setFormData] = useState(defaultParams);
+ const [formData, setFormData] = useState({...defaultData,...defaultParams});
// 搜索提交数据-存储
const [holdData, setHoldData] = useState(formData);
// 访问接口，isAjax改变时执行
diff --git a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
index 4b075ee..0ea8d3f 100644
--- a/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
@@ -251,6 +251,7 @@ function OutMonitorMgm(props) {
(res) => {
if (res.status == 20000) {
message.success(res.message || "删除成功");
+ handleSearch()
} else {
message.error(res.message);
}
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
index 5f38a80..a639a24 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
@@ -480,7 +480,7 @@ function AddParking(props) {
<Cascader
// onChange={cascaderChange}
getPopupContainer={(e) => e.parentNode}
- options={areaList}
+ options={areaList.slice(1)}
placeholder="请选择区域"
expandTrigger="hover"
changeOnSelect
@@ -519,7 +519,7 @@ function AddParking(props) {
>
<Select
getPopupContainer={(e) => e.parentNode}
- options={getOperationName}
+ options={getOperationName.slice(1)}
//disabled={status === "edit" || disabled}
/>
</Form.Item>
@@ -567,7 +567,7 @@ function AddParking(props) {
rules={[{ required: true }]}
name="is_business"
>
- <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.businessRoad} disabled={disabled} />
+ <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.businessRoad.slice(1)} disabled={disabled} />
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "33%" }}>
@@ -598,7 +598,7 @@ function AddParking(props) {
>
<Select
getPopupContainer={(e) => e.parentNode}
- options={sysConfig.cooperationModel}
+ options={sysConfig.cooperationModel.slice(1)}
disabled={disabled}
/>
</Form.Item>
@@ -618,7 +618,7 @@ function AddParking(props) {
rules={[{ required: true }]}
name="operator_status"
>
- <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.operatorStatus} />
+ <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.operatorStatus.slice(1)} />
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "33%" }}>
@@ -676,7 +676,7 @@ function AddParking(props) {
rules={[{ required: true }]}
name="access_type"
>
- <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.accessType} disabled={disabled} />
+ <Select getPopupContainer={(e) => e.parentNode} options={sysConfig.accessType.slice(1)} disabled={disabled} />
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "33%" }} name="billing_rules">
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
index cc8c233..853deb8 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/ConfigParking/CarMgm/CarGroupMgm.jsx
@@ -127,51 +127,58 @@ function CarGroupMgm({ id }) {
}, []);
const toCarGroup = (type) => {
- let data = editForm.getFieldsValue()
- type == 1 ?
- ajax
- .getAddCarGroup(data)
- .then((res) => {
- if (res.status === 20000) {
- message.success(res.message)
- setEditModal({
- visible: false,
- data: {},
- add: 0,
+ editForm
+ .validateFields()
+ .then((data) => {
+ type == 1 ?
+ ajax
+ .getAddCarGroup({ ...data, road_id: id })
+ .then((res) => {
+ if (res.status === 20000) {
+ message.success(res.message)
+ setEditModal({
+ visible: false,
+ data: {},
+ add: 0,
+ });
+ setPageData({
+ pn: 1,
+ page_size: 15,
+ });
+ } else {
+ message.error(res.message);
+ }
+ })
+ .catch((err) => {
+ console.log(err);
+ })
+ :
+ ajax
+ .getEditCarGroup({ ...data, road_id: id })
+ .then((res) => {
+ if (res.status === 20000) {
+ message.success(res.message)
+ setEditModal({
+ visible: false,
+ data: {},
+ add: 0,
+ });
+ setPageData({
+ pn: 1,
+ page_size: 15,
+ });
+ } else {
+ message.error(res.message);
+ }
+ })
+ .catch((err) => {
+ console.log(err);
});
- setPageData({
- pn: 1,
- page_size: 15,
- });
- } else {
- message.error(res.message);
- }
- })
- .catch((err) => {
- console.log(err);
- })
- :
- ajax
- .getEditCarGroup(data)
- .then((res) => {
- if (res.status === 20000) {
- message.success(res.message)
- setEditModal({
- visible: false,
- data: {},
- add: 0,
- });
- setPageData({
- pn: 1,
- page_size: 15,
- });
- } else {
- message.error(res.message);
- }
- })
- .catch((err) => {
- console.log(err);
- });
+ })
+ .catch((err) => {
+ console.log(err);
+ return
+ });
}
useEffect(() => {
getVehicleGroup();
@@ -282,12 +289,12 @@ function CarGroupMgm({ id }) {
<Form colon={false} labelCol={{ span: 6 }} form={editForm}>
<Row>
<Col span="4_8" style={{ width: "30%" }}>
- <Form.Item label="车辆组名称" name="name">
+ <Form.Item label="车辆组名称" name="name" rules={[{ required: true }]}>
<Input maxLength={15} showCount={true} />
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "30%" }}>
- <Form.Item label="车辆类型" name="vehicle_type">
+ <Form.Item label="车辆类型" name="vehicle_type" rules={[{ required: true }]}>
<Select
options={[
{ label: "免费车", value: 1 },
@@ -299,7 +306,7 @@ function CarGroupMgm({ id }) {
</Form.Item>
</Col>
<Col span="4_8" style={{ width: "30%" }}>
- <Form.Item label="状态" name="status">
+ <Form.Item label="状态" name="status" rules={[{ required: true }]}>
<Select
options={[
{ label: "启用", value: 2 },
diff --git a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
index 5c68e20..8f684c8 100644
--- a/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
+++ b/src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/loadable.jsx
@@ -481,7 +481,8 @@ function OutSegment() {
operator_status: 0,
name: "",
code: "",
- operator: "",
+ area:'0',
+ operator: "0",
is_no_pwd_pay: 0,
}}
>