diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index 573253a..cc00d01 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -272,7 +272,7 @@ const TableModule = forwardRef((props, ref) => {
setFormData({ ...searchForm.getFieldsValue(), plateValue: '' })
//search({ ...searchForm.getFieldsValue() })
setTimeGroup({
- timeType: timeGroup.timeType,
+ timeType: '',
timeRanges: {
start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
@@ -744,6 +744,7 @@ const TableModule = forwardRef((props, ref) => {
console.log(range, type)
setTimeGroup({ timeType: type, timeRanges: range });
}}
+ _timeGroup={timeGroup.timeRanges}
/>
>
@@ -1020,13 +1021,17 @@ function InputSelectGroup(params) {
const {
onChange = () => { },
getValue = () => { },
+ _timeGroup = {
+ start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
+ end_time: moment().format("YYYY-MM-DD 23:59:59"),
+ }
} = params;
const [timeType, setTimeType] = useState(1);
- const [timeGroup, setTimeGroup] = useState({
- start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
- end_time: moment().format("YYYY-MM-DD 23:59:59"),
- });
- console.log(timeGroup);
+ const [timeGroup, setTimeGroup] = useState(_timeGroup);
+ useEffect(() => {
+ setTimeGroup(_timeGroup)
+ console.log(_timeGroup);
+ }, [_timeGroup]);
useEffect(() => {
onChange(timeGroup, timeType);
}, [timeGroup, timeType]);
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 899f9f8..4aea851 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -51,13 +51,17 @@ import { getToken } from "@/config/cookie";
import { useSetState, useSessionStorageState, useUpdateEffect } from "ahooks";
const { TextArea } = Input;
-function ConfigRoad() {
+const ConfigRoad = (props) => {
+ const {
+ getRecordList = {}
+ } = props
+ console.log(getRecordList);
const navigate = useNavigate();
//编辑泊位提交的编辑泊位
const location = useLocation();
- const parking_id = location.search.split("=")[1].split("&")[0];
- const operator_id = location.search.split("&")[1].split("=")[1];
- const region_id = location.search.split("&")[2].split("=")[1];
+ const parking_id = getRecordList.id;
+ const operator_id = getRecordList.operator_id;
+ // const region_id = location.search.split("&")[2].split("=")[1];
const [modalBtnLoading, setModalBtnLoading] = useState(false)
//泊位管理Form
const [berthForm] = Form.useForm();
@@ -633,7 +637,7 @@ function ConfigRoad() {
downloadUrl: "/api/bpm/device/road_set_pole_position_import_template",
importProps: {
name: "file",
- action: "/api/bpm/device/road_set_import_pole_position",
+ action: "/PMS/api/bpm/device/road_set_import_pole_position",
data: { road_id: parking_id },
headers: {
Authorization: getToken(),
@@ -1522,9 +1526,9 @@ function ConfigRoad() {
}
});
}
- const [getEditTarket,setGetEditTarket]=useState([])
- const [getLeftEditTarket,setGetLeftEditTarket]=useState([])
- const [getSelectedKeys,setGetSelectedKeyst]=useState([])
+ const [getEditTarket, setGetEditTarket] = useState([])
+ const [getLeftEditTarket, setGetLeftEditTarket] = useState([])
+ const [getSelectedKeys, setGetSelectedKeyst] = useState([])
function getEditRoadDevice(record) {
let data = {
road_id: parking_id,
@@ -1564,9 +1568,9 @@ function ConfigRoad() {
}
});
}
- const [getDeviceTarket,setGetDeviceTarket]=useState([])
- const [getLeftDeviceTarket,setGetLeftDeviceTarket]=useState([])
- const [getLeftDevicetargetKey,setGetLeftDevicetargetKey]=useState([])
+ const [getDeviceTarket, setGetDeviceTarket] = useState([])
+ const [getLeftDeviceTarket, setGetLeftDeviceTarket] = useState([])
+ const [getLeftDevicetargetKey, setGetLeftDevicetargetKey] = useState([])
function getDevice(record) {
let data = {
road_id: parking_id,
@@ -1777,7 +1781,7 @@ function ConfigRoad() {
-
+ {/*
-
+ */}
共查询到
{resultData.total_records}
条结果
@@ -1947,7 +1951,8 @@ function ConfigRoad() {
2.请选择上传文件,并上传。
- }>
+ }>
上传
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
index 07f5ad8..6593e72 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
@@ -70,7 +70,7 @@ $color-primary: var(--color-primary);
}
}
}
-
+
input {
width: 100%;
border-color: var(--color-border);
@@ -98,16 +98,14 @@ $color-primary: var(--color-primary);
.ant-select-selection-placeholder {
color: var(--color-placeholder);
}
- .ant-select-disabled.ant-select-single:not(.ant-select-customize-input)
- .ant-select-selector {
+ .ant-select-disabled.ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
background: var(--color-input-disabled-bg);
color: var(--color-placeholder);
}
.ant-select-disabled .ant-select-arrow {
color: var(--color-placeholder);
}
- .ant-select-disabled.ant-select:not(.ant-select-customize-input)
- .ant-select-selector {
+ .ant-select-disabled.ant-select:not(.ant-select-customize-input) .ant-select-selector {
background-color: var(--color-input-disabled-bg);
color: var(--color-input-disabled-color);
cursor: not-allowed;
@@ -161,3 +159,18 @@ $color-primary: var(--color-primary);
// border-color:var(--checkable-tag-border);
}
}
+.handleCloseDetail {
+ width: 1750px !important;
+ position: absolute;
+ top: 30px;
+ left: 100px;
+ max-height: 850px;
+ overflow: auto;
+}
+.handleCloseDetail::-webkit-scrollbar {
+ width: 5px;
+}
+.handleCloseDetail::-webkit-scrollbar-thumb {
+ background-color: #9da2ab;
+ border-radius: 10px;
+}
\ No newline at end of file
diff --git a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
index 2fd2adc..4c488be 100644
--- a/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
@@ -21,6 +21,7 @@ import { useSetState, useSessionStorageState, useUpdateEffect } from "ahooks";
import ajax from "@/services";
import { ResultFlow } from "@/components";
import "./index.scss";
+import ConfigRoad from "../ConfigRoad"
import AuditModifyModal from "./AuditModifyModal";
// import errorImg from "@/assets/images/layout/error.png"
// import { useLocation } from "react-router-dom";
@@ -129,14 +130,20 @@ function RoadConf() {
>
编辑
- {record.road_level == 2 ? null :
- 路段配置
- }
+ {record.road_level == 2 ? null :
+ <>
+ {/*
+ 路段配置
+ */}
+ handleModal(record)}> 路段配置
+ >
+
+ }
{
const type = record.no_pwd_pay === 1 ? 2 : 1;
@@ -170,7 +177,15 @@ function RoadConf() {
road_level: 0,
no_pwd_pay: 0,
};
-
+ const [handleDetail, setHandleDetail] = useState(false)
+ const [getRecordList, setGetRecordList] = useState({})
+ const handleModal = (record) => {
+ setGetRecordList(record)
+ setHandleDetail(true)
+ }
+ const handleClose = () => {
+ setHandleDetail(false)
+ }
const [loading, setLoading] = useState(false);
const [resultData, setReusltData] = useSetState({
// 请求结果
@@ -249,7 +264,7 @@ function RoadConf() {
});
}
- function search(params,area1) {
+ function search(params, area1) {
if (params) {
setPageData({
pn: 1,
@@ -257,7 +272,7 @@ function RoadConf() {
})
} else {
let result = searchForm.getFieldsValue();
- result.area = area1 ? [] :area;
+ result.area = area1 ? [] : area;
getProgressData(result);
}
}
@@ -282,7 +297,7 @@ function RoadConf() {
let res = [];
if (last.children) {
addChild(last, res);
- }else{
+ } else {
res = [last.id]
}
// res.push(last.id);
@@ -440,12 +455,12 @@ function RoadConf() {
const reastBtn = () => {
searchForm.resetFields();
setArea([])
- search({},1);
+ search({}, 1);
}
- const [getAppraiseList,setAppraiseList]=useState({})
- const appraise =() => {
- ajax.getAppraiseData().then(res=>{
- if(res.status===20000){
+ const [getAppraiseList, setAppraiseList] = useState({})
+ const appraise = () => {
+ ajax.getAppraiseData().then(res => {
+ if (res.status === 20000) {
setAppraiseModal(true);
setAppraiseList(res.data)
}
@@ -454,9 +469,9 @@ function RoadConf() {
useEffect(() => {
search();
}, [pageData]);
- useEffect(()=>{
+ useEffect(() => {
getAreaTree();
- },[])
+ }, [])
return (
<>
@@ -487,11 +502,11 @@ function RoadConf() {
导出
{/* {
};
const getParkingPayTop5 = (params) => {
return ajax({
- url: "/api/bpm/home/parking_records_top5 ",
+ url: "/api/bpm/home/parking_fees_top5",
type: "get",
data: params,
});