Browse Source

fix():修改路内bug

master
guoxin 1 year ago
parent
commit
9a45346907
  1. 17
      src/components/TableModule/index.jsx
  2. 21
      src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
  3. 21
      src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss
  4. 32
      src/pages/InRoadMgm/RoadMgm/RoadConf/loadable.jsx
  5. 2
      src/services/InroadMgm/InRoadOverview/index.js

17
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 = () => { },
} = params;
const [timeType, setTimeType] = useState(1);
const [timeGroup, setTimeGroup] = useState({
_timeGroup = {
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);
}
} = params;
const [timeType, setTimeType] = useState(1);
const [timeGroup, setTimeGroup] = useState(_timeGroup);
useEffect(() => {
setTimeGroup(_timeGroup)
console.log(_timeGroup);
}, [_timeGroup]);
useEffect(() => {
onChange(timeGroup, timeType);
}, [timeGroup, timeType]);

21
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(),
@ -1777,7 +1781,7 @@ function ConfigRoad() {
<div className="right-list">
<div className="total-row-wrapper">
<span className="number-wrapper">
<span>
{/* <span>
<Button
type="primary"
style={{ marginRight: "10px" }}
@ -1787,7 +1791,7 @@ function ConfigRoad() {
>
返回
</Button>
</span>
</span> */}
<span className="letter">共查询到</span>
<span className="total-number"> {resultData.total_records}</span>
<span className="letter">条结果</span>
@ -1947,7 +1951,8 @@ function ConfigRoad() {
</p>
<p>2.请选择上传文件并上传</p>
<Upload {...currentObj.importProps} beforeUpload={beforeUpload}>
<Button type="primary" icon={<UploadOutlined />}>
<Button type="primaryimport { pages } from '@/pages';
" icon={<UploadOutlined />}>
上传
</Button>
</Upload>

21
src/pages/InRoadMgm/RoadMgm/RoadConf/index.scss

@ -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;
}

32
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() {
>
编辑
</Link>
{record.road_level == 2 ? null : <Link
{record.road_level == 2 ? null :
<>
{/* <Link
to={{
pathname: "/inRoad/ConfigRoad",
search: `?id=${record.id}&operator_id=${record.operator_id}&region_id=${record.region_id}`,
}}
>
路段配置
</Link>}
</Link> */}
<a onClick={() => handleModal(record)}> 路段配置</a>
</>
}
<a
onClick={() => {
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({
//
@ -608,6 +623,17 @@ function RoadConf() {
>
高德的POI没有录入请先录入
</Modal>
<Modal
visible={handleDetail}
onCancel={handleClose}
footer={false}
className="handleCloseDetail"
>
<ConfigRoad
getRecordList={getRecordList}
>
</ConfigRoad>
</Modal>
</div>
{/* <AuditModifyModal
open={auditModalData.visible}

2
src/services/InroadMgm/InRoadOverview/index.js

@ -28,7 +28,7 @@ const getParkingRecordTop5 = (params) => {
};
const getParkingPayTop5 = (params) => {
return ajax({
url: "/api/bpm/home/parking_records_top5 ",
url: "/api/bpm/home/parking_fees_top5",
type: "get",
data: params,
});

Loading…
Cancel
Save