Browse Source

fix():路外bug修改

master
xingjx 1 year ago
parent
commit
da3eba62b8
  1. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx
  2. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
  3. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx
  4. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx
  5. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
  6. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  7. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  8. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
  9. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx
  10. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx
  11. 4
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
  12. 4
      src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx
  13. 2
      src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx
  14. 3
      src/pages/OperationCenter/UserMgm/UserInfo/index.scss
  15. 4
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx
  16. 13
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx
  17. 121
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx
  18. 5
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss
  19. 110
      src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/CarTypeAly/loadable.jsx

@ -23,8 +23,8 @@ function CarTypeAly() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
date_type: '1',
type: 'region',
operator_id: '0',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx

@ -23,8 +23,8 @@ function NightParkStat() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
car_parking_type: '3',
operator_id: '0',
area_id: '0',

7
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkBerthAly/loadable.jsx

@ -184,6 +184,10 @@ function ParkBerthAly() {
acr.push(item.date)
acc.push(acr)
})
console.log(data, acc)
// acc.map((item)=>{
// })
// X
const xAxisData = dates.map((date) => {
return {
@ -270,6 +274,7 @@ function ParkBerthAly() {
trigger: 'item',
//formatter: '{b0}: {c0} '
formatter: (params) => {
//console.log(params)
return `<div class="tooltip-box">
${moment(params.data[2]).format('YYYY年MM月DD日')}(${getWeek(params.data[2])})<br/>
全市日均泊位周转次数${totalData.all_turnover + '(次)'}<br/>
@ -536,7 +541,7 @@ function ParkBerthAly() {
<div style={{ height: "300px", width: "100%", zoom: 1 / document.body.style.zoom }}>
<ReactEcharts
option={revenueData}
style={{ height: "300px", width: "100%", overflow: "hidden" }}
style={{ height: "300px", width: "100%" }}
/>
</div>
</>

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkTurnoverAly/loadable.jsx

@ -23,8 +23,8 @@ function ParkTurnoverAly() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
date_type: '1', //
operator_id: '0',
area_id: '0',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx

@ -24,8 +24,8 @@ function ParkUsageAly() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
car_parking_type: '3',
operator_id: '0',
area_id: '0',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx

@ -23,8 +23,8 @@ function ParkingAlyDuration() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
car_parking_type: '3',
operator_id: '0',
area_id: '0',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx

@ -24,8 +24,8 @@ function ParkingAlyOverview() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
operator_id: '0',
area_id: '0',
date_type: '1',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx

@ -19,8 +19,8 @@ function ParkingAlyPeriod() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
operator_id: '0',
area_id: '0',
car_parking_type: '3',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyReport/loadable.jsx

@ -23,8 +23,8 @@ function ParkingAlyReport() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
date_type: '1',
car_parking_type: '3',
operator_id: '0',

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingLiveData/loadable.jsx

@ -24,8 +24,8 @@ function ParkingLiveData() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
operator_id: '0',
area_id: '0',
};

4
src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx

@ -23,8 +23,8 @@ function TemporaryParkStat() {
const [areaList, setAreaList] = useState([]);
//
const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().endOf("day").format("YYYY-MM-DD"),
start_time: moment().subtract(1, 'days').startOf('day').format("YYYY-MM-DD"),
end_time: moment().subtract(1, 'days').endOf("day").format("YYYY-MM-DD"),
car_parking_type: '3',
operator_id: '0',
area_id: '0',

4
src/pages/OperationCenter/ArrearsRecover/ArrearsCar/loadable.jsx

@ -203,8 +203,8 @@ function ArrearsCar() {
];
const formSearch = [
{
name: "plate",
type: "Input",
name: "carId",
type: "PlateSelect",
label: "车牌号",
placeholder: "请输入车牌号",
},

2
src/pages/OperationCenter/CarMgm/CarInfo/loadable.jsx

@ -247,7 +247,7 @@ function CarInfo() {
name: "timePeriod",
type: "RangePicker",
label: "时间段",
defaultValue: [moment().subtract(90, "day"), moment()],
defaultValue: [moment().subtract(89, "day"), moment()],
},
];
//退

3
src/pages/OperationCenter/UserMgm/UserInfo/index.scss

@ -5,6 +5,7 @@ $color-text: var(--color-text);
$color-primary: var(--color-primary);
.userinfo-box {
position: relative;
.ant-tabs-tabpane-hidden {
display: none;
}
@ -419,5 +420,5 @@ $color-primary: var(--color-primary);
background: #ffffff;
color: #000;
cursor: pointer;
z-index: 9999;
z-index: 99;
}

4
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/AddModal.jsx

@ -98,12 +98,14 @@ function AddModal(props) {
}
//
function submit() {
console.log(effectiveDateList)
return
form
.validateFields()
.then((res) => {
const params = {
...res,
property: effectiveDateList,// effectiveDateList[0]
property: effectiveDateList,// property: {rules:effectiveDateList},
};
fetch(params);
})

13
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/EffectiveDate.jsx

@ -103,6 +103,7 @@ function EffectiveDate(props) {
return false;
}
function submit() {
console.log(106,form.getFieldsValue())
form
.validateFields()
.then((values) => {
@ -119,12 +120,12 @@ function EffectiveDate(props) {
}
return (
<div>
<div className="effectivedate-box">
<Form
form={form}
initialValues={{
...record,
effective_date: moment(record.effective_date),
date: moment(record.date),
}}
disabled={disable}
>
@ -132,7 +133,7 @@ function EffectiveDate(props) {
<Col span={12}>
<Form.Item
label="生效日期"
name="effective_date"
name="date"
rules={[{ required: true }]}
>
<DatePicker />
@ -202,10 +203,10 @@ function EffectiveDate(props) {
});
const obj = {
...form.getFieldsValue(),
time_part_arr: _timePartList,
details: _timePartList,
};
if (obj.effective_date !== void 0) {
obj.effective_date = obj.effective_date.format("YYYY-MM-DD");
if (obj.date !== void 0) {
obj.date = obj.date.format("YYYY-MM-DD");
}
onChange(obj, itemKey);
setTimePartList(_timePartList);

121
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/TimePart.jsx

@ -23,7 +23,7 @@ function TimePart(props) {
} = props;
const record1 = {
"start": "00:00:00",
"end": "00:00:00",
"end": "13:00:00",
"limit": 0,
"items": [
{
@ -40,12 +40,97 @@ function TimePart(props) {
console.log(disable);
const valueChange = (value, all) => {
all.key = itemKey;
if (all.time_part) {
all.start = moment(all.time_part[0]).format('HH:mm:ss')
all.end = moment(all.time_part[1]).format('HH:mm:ss')
delete all.time_part
}
if (all.type == 0) {
all.items = [
{
"type": all.type,
"threshold": 0,
"period": all.time_before_minute,
"unit": all.time_before_money,
"segment": all.time_before,
},
{
"type": 2,
"threshold": 0,
"period": all.time_after_minute,
"unit": all.time_after_money,
"segment": all.time_before,
},
]
delete all.type
delete all.time_before_minute
delete all.time_before_money
delete all.time_before
delete all.time_after_minute
delete all.time_after_money
} else if (all.type == 1) {
all.items = [
{
"type": all.type,
"threshold": 0,
"unit": all.unit,
},
]
delete all.type
delete all.unit
} else {
all.items = [
{
"type": all.type,
"threshold": 0,
"period": all.period,
"unit": all.unit,
"segment": all.segment
},
]
delete all.type
delete all.period
delete all.unit
delete all.segment
}
console.log(66, all)
onChange(all);
};
useEffect(() => {
if (!record.items) return
if (record.items[0]?.type == 0) {
form.setFieldsValue({
...record,
type: record.items[0].type,
"time_before": record.items[0].segment,
"time_before_money": record.items[0].unit,
"time_before_minute": record.items[0].period,
"time_after_money": record.items[1].unit,
"time_after_minute": record.items[1].period,
"limit": record.limit,
time_part: [
moment(record.start, "HH:mm:ss"),
moment(record.end, "HH:mm:ss"),
],
})
} else {
form.setFieldsValue({
...record,
type: record.items[0]?.type,
"unit": record.items[0]?.unit,
"period": record.items[0]?.period,
//segment:record.items[0].segment,
"limit": record.limit,
time_part: [
moment(record.start, "HH:mm:ss"),
moment(record.end, "HH:mm:ss"),
],
})
}
}, [])
console.log(30, record)
return (
<div>
<div className="timepart-box">
<Form
form={form}
onValuesChange={valueChange}
@ -65,7 +150,7 @@ function TimePart(props) {
<Row gutter={[30]}>
<Col span={16}>
<Form.Item label={`时段${index}`} name="time_part">
<TimePicker.RangePicker style={{ width: "50%" }} order={false} />
<TimePicker.RangePicker style={{ width: "50%" }} order={false} secondStep={60} />
</Form.Item>
</Col>
<Col span={8}>
@ -77,13 +162,13 @@ function TimePart(props) {
</Col>
<Col span={24}>
<Form.Item label={`区间${index}`} name="interval" initialValue={1}>
<Form.Item label={`区间${index}`} name="type" initialValue={1}>
<Select
style={{ width: "20%" }}
options={[
{
label: "基础时段",
value: 1,
value: 0,
},
{
label: "周期计价",
@ -91,7 +176,7 @@ function TimePart(props) {
},
{
label: "按次计价",
value: 3,
value: 1,
},
]}
/>
@ -99,12 +184,12 @@ function TimePart(props) {
</Col>
<Col span={24}>
<Form.Item
shouldUpdate={(prev, next) => prev.interval !== next.interval}
shouldUpdate={(prev, next) => prev.type !== next.type}
>
{({ getFieldValue }) => {
const type = getFieldValue("interval");
const type = getFieldValue("type");
switch (type) {
case 1:
case 0:
return (
<>
<Input.Group compact>
@ -150,18 +235,18 @@ function TimePart(props) {
case 2:
return (
<Input.Group compact>
<Form.Item name="time_money" noStyle>
<Form.Item name="unit" noStyle>
<Input addonAfter={"元"} style={{ width: "20%" }} />
</Form.Item>
<div className="wenzi">/</div>
<Form.Item name="time_minute" noStyle>
<Form.Item name="period" noStyle>
<Input addonAfter={"分钟"} style={{ width: "20%" }} />
</Form.Item>
</Input.Group>
);
case 3:
case 1:
return (
<Form.Item name="money_per_time">
<Form.Item name="unit">
<Input addonAfter={"元/次"} style={{ width: "20%" }} />
</Form.Item>
);
@ -170,16 +255,16 @@ function TimePart(props) {
</Form.Item>
</Col>
<Form.Item
shouldUpdate={(prev, next) => prev.interval !== next.interval}
shouldUpdate={(prev, next) => prev.type !== next.type}
>
{({ getFieldValue }) => {
return (
(getFieldValue("interval") === 1 ||
getFieldValue("interval") === 2) && (
(getFieldValue("type") === 0 ||
getFieldValue("type") === 2) && (
<Col span={24}>
<Form.Item
label="时段最高收费金额"
name="time_max_money"
name="limit"
rules={[{ required: true }]}
>
<Input />

5
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/index.scss

@ -89,3 +89,8 @@ $color-primary: var(--color-primary);
margin: -5px 13px 0 5px !important;
font-size: 25px;
}
.effectivedate-box {
border: 1px solid #8d8d8d;
padding: 12px;
margin-bottom: 24px;
}

110
src/pages/OutRoadMgm/OutSegmentMgm/ChargeRulesMgm/loadable.jsx

@ -71,61 +71,77 @@ function ChargeRulesMgm() {
<a
onClick={() => {
ajax.getChargeRuleInfo({ id: record.id }).then((res) => {
// res = {
// "status": 20000,
// "message": "success",
// "data": {
// "feeName": "",
// "creatorName": "",
// "createdTime": "2022-12-13 11:51:23",
// "feeCode": "202212131150",
// "operationId": "1777347430730653926",
// "operationName": "",
// "description": "15420-1010 \n5/8/10/\n",
// "limit24hour": 0,
// "freeTime": 15,
// "freeTimeAbleF": [
// 1
// ],
// "freeTimeAbleFName": "",
// "typeF": 0,
// "typeFName": "",
// "evFreeTime": 0,
// "evFreeTimeAble": 0,
// "evFreeTimeAbleName": "",
// "property": {
// "id": 120,
// "freeTime": 15,
// "freeTimeAble": 1,
// "evFreeTime": 0,
// "evFreeTimeAble": 0,
// "limit24hour": "",
// "rules": [
// {
// "unitDelay": 1,
// "unitUp": 1,
// "date": "2022-12-13",
// "details": [
// {
// "start": "00:00:00",
// "end": "00:00:00",
// "limit": 0,
res = {
"status": 20000,
"message": "success",
"data": {
"feeName": "凤凰山公园停车场旺季中型车",
"creatorName": "耿亮",
"createdTime": "2022-12-13 11:51:23",
"feeCode": "202212131150",
"operationId": "1777347430730653926",
"operationName": "公用事业集团",
"description": "免费15分钟4月20日-10月10日, \n小型车5元/小时,中型车8元/小时,大型车10元/小时\n",
"limit24hour": 0,
"freeTime": 15,
"freeTimeAbleF": [
1
],
"freeTimeAbleFName": "是",
"typeF": 0,
"typeFName": "否",
"evFreeTime": 0,
"evFreeTimeAble": 0,
"evFreeTimeAbleName": "否",
"property": {
"id": 120,
"freeTime": 15,
"freeTimeAble": 1,
"evFreeTime": 0,
"evFreeTimeAble": 0,
"limit24hour": "",
"rules": [
{
"unitDelay": 1,
"unitUp": 1,
"date": "2022-12-13",
"details": [
{
"start": "07:00:00",
"end": "13:00:00",
"limit": 0,
// "items": [
// {
// "type": 2,
// "type": 1,
// "threshold": 0,
// "period": 60,
// "unit": 8,
// "segment": 1440
// },
// {
// "type": 1,
// "threshold": 0,
// "period": 60,
// "unit": 8,
// "segment": 1440
// }
// ]
// }
// ]
// }
// ]
// }
// }
// }
"items": [
{
"type": 1,
"threshold": 0,
"period": 60,
"unit": 2,
"segment": 120
},
]
}
]
}
]
}
}
}
if (res.status === 20000) {
console.log(res.data);
setAddModal({

Loading…
Cancel
Save