From 966475c170724dd59b2c7e9c7bb0eccc9319b335 Mon Sep 17 00:00:00 2001 From: xingjx Date: Tue, 14 Nov 2023 18:15:49 +0800 Subject: [PATCH] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=88=86=E6=9E=90=E9=A2=84=E6=B5=8B=E9=A1=B5=E9=9D=A2=E6=A3=80?= =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableModule/index.jsx | 1 - .../ParkingBusinessAly/NightParkStat/index.scss | 8 +- .../ParkingBusinessAly/NightParkStat/loadable.jsx | 191 +++++++++++++++----- .../ParkingBusinessAly/ParkUsageAly/index.scss | 7 +- .../ParkingBusinessAly/ParkUsageAly/loadable.jsx | 192 ++++++++++++++++----- .../ParkingAlyDuration/index.scss | 7 +- .../ParkingAlyDuration/loadable.jsx | 184 +++++++++++++++----- .../ParkingAlyOverview/index.scss | 7 +- .../ParkingAlyOverview/loadable.jsx | 160 ++++++++++++++--- .../ParkingBusinessAly/ParkingAlyPeriod/index.scss | 7 +- .../ParkingAlyPeriod/loadable.jsx | 172 ++++++++++++++---- .../TemporaryParkStat/index.scss | 14 +- .../TemporaryParkStat/loadable.jsx | 187 +++++++++++++++----- .../PayConf/PlatformMerchantConf/index.jsx | 32 ++-- 14 files changed, 903 insertions(+), 266 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index dde7e27..bc255bc 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -177,7 +177,6 @@ const TableModule = forwardRef((props, ref) => { return } } - console.log(moment(form.end_time) - moment(form.start_time), 179 * 3600 * 24000) search(form); } //重置 diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss index 878f862..d7035f1 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { @@ -161,6 +164,7 @@ $color-primary : var(--color-primary); .ant-table-thead { th { background: #616b83 !important; + border: 1px solid #7a7070; } } diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx index aa41da6..34ac3af 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx @@ -64,7 +64,7 @@ function NightParkStat() { { title: '日期', dataIndex: 'index', - key: 'index', + key: 'index', width: 100, fixed: 'left', }, @@ -263,7 +263,47 @@ function NightParkStat() { }, }); }; - + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; function getParkingIncome() { ajax .getParkingIncome() @@ -463,50 +503,109 @@ function NightParkStat() { />
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
@@ -554,27 +653,27 @@ function NightParkStat() { columns={columns} dataSource={[ { - index:1, + index: 1, }, { - index:1, + index: 1, }, { - index:1, + index: 1, }, { - index:1, + index: 1, }, { - index:1, + index: 1, }, { - index:1, + index: 1, }, { - index:1, + index: 1, }, - + ]} bordered size="middle" diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss index 0c9523a..1e37574 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx index fae1c9d..ee6b5ab 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx @@ -112,6 +112,47 @@ function ParkUsageAly() { // useEffect(() => { // getData(); // }, [isAjax]); + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; // const getRevenueOption = (data) => { // 获取所有地区名称 @@ -209,16 +250,16 @@ function ParkUsageAly() { }, color: ["#4DC3FF", "#FFD767"], //series: seriesData, - series: - { - "name": "西区", - "type": "line", - "data": [ - 12, - 12, - 24 - ] - }, + series: + { + "name": "西区", + "type": "line", + "data": [ + 12, + 12, + 24 + ] + }, grid: { x: 50, y: 55, @@ -427,50 +468,109 @@ function ParkUsageAly() { />
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss index 611c282..884b88d 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx index 0970398..bf1bc27 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx @@ -148,6 +148,47 @@ function ParkingAlyDuration() { // useEffect(() => { // getData(); // }, [isAjax]); + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; //停车场收入概览 const getRevenueOption = (data) => { // 获取所有地区名称 @@ -531,50 +572,109 @@ function ParkingAlyDuration() {
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
@@ -617,16 +717,16 @@ function ParkingAlyDuration() { columns={columns} dataSource={[ { - area:'123123', - area_id:1, + area: '123123', + area_id: 1, }, { - area:'123dfcds3', - area_id:1, + area: '123dfcds3', + area_id: 1, }, { - area:'1dsfsdfsf23', - area_id:2, + area: '1dsfsdfsf23', + area_id: 2, }, ]} bordered diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss index afdc22d..3454906 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx index 46ec2d3..81dceac 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx @@ -104,7 +104,47 @@ function ParkingAlyOverview() { } ); }; - + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; // 获取列表数据 const getData = (v) => { let postData = { ...formData }; @@ -472,37 +512,109 @@ function ParkingAlyOverview() {
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss index 698e063..649c146 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx index 5ccf4a8..c6dfe38 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx @@ -81,6 +81,47 @@ function ParkingAlyPeriod() { // useEffect(() => { // getData(); // }, [isAjax]); + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; //停车场收入概览 const getRevenueOption = (data) => { // 获取所有地区名称 @@ -401,50 +442,109 @@ function ParkingAlyPeriod() {
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss index 7dc245e..092ed07 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss @@ -56,10 +56,13 @@ $color-primary : var(--color-primary); label { color: var(--color-search-list-item-text); - flex: 0 0 25%; - max-width: 25%; + flex: 0 0 27%; + max-width: 27%; text-align: right; padding-right: 8px; + .daf { + display: inline-block; + } } .form-con { @@ -126,6 +129,13 @@ $color-primary : var(--color-primary); background: #3e4557; border-radius: 4px; margin-bottom: 20px; + .lstc-text { + text-align: center; + padding-bottom: 24px; + font-size: 14px; + font-family: Microsoft YaHei, Microsoft YaHei-Regular; + font-weight: 400; + } .result-box-title { height: 21px; font-size: 16px; diff --git a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx index 4eef7bb..738a857 100644 --- a/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx @@ -87,6 +87,47 @@ function TemporaryParkStat() { // useEffect(() => { // getData(); // }, [isAjax]); + //时间状态切换 + const TimeChange = () => { + let e = formData.date_type; + let str = "day"; + let mat = "YYYY-MM-DD"; + if (e == 4) { + str = "year"; + mat = "YYYY"; + } else if (e == 3) { + str = "month"; + mat = "YYYY-MM"; + } else if (e == 2) { + str = "week"; + mat = "YYYY-MM-DD"; + } + return { str, mat }; + }; + //切换时间变化 + const SetTimeNow = (e) => { + let start = ""; + let end = ""; + if (e == 4) { + start = moment().format("YYYY"); + end = moment().format("YYYY"); + } else if (e == 3) { + start = moment().format("YYYY-MM"); + end = moment().format("YYYY-MM"); + } else if (e == 2) { + start = moment().day(1).format("YYYY-MM-DD"); + end = moment().day(7).format("YYYY-MM-DD"); + } else { + start = moment().startOf("day").format("YYYY-MM-DD"); + end = moment().endOf("day").format("YYYY-MM-DD"); + } + setFormData({ + ...formData, + date_type: e, + start_time: start, + end_time: end, + }); + }; //临时停车次数趋势 const getRevenueOption = (data) => { // 获取所有地区名称 @@ -232,7 +273,7 @@ function TemporaryParkStat() { }); console.log(data); const areaNames = [...new Set(data.map((item) => item.area_name))]; - + setRingData({ title: { text: "", @@ -245,9 +286,10 @@ function TemporaryParkStat() { }, legend: { type: "scroll", - right: "5%", + //right: "5%", + left: '42.5%', //data: areaNames, - data: ["常时停车", "临时停车"], + data: ["长时停车", "临时停车"], itemWidth: 18, itemHeight: 12, textStyle: { @@ -256,7 +298,7 @@ function TemporaryParkStat() { }, }, - color: ["#4DC3FF", "#FFD767"], + color: ["#3AA9FF", "#F997DF"], //series: seriesData, series: [ { @@ -279,7 +321,7 @@ function TemporaryParkStat() { show: false }, data: [ - { value: 1048, name: '常时停车' }, + { value: 1048, name: '长时停车' }, { value: 735, name: '临时停车' }, ] } @@ -465,50 +507,109 @@ function TemporaryParkStat() {
- - SetTimeNow(e)} + /> +
+ setFormData({ ...formData, confirm_start_time: dateString })} - disabledDate={(current) => current > moment(formData.confirm_end_time)} + value={formData.start_time ? moment(formData.start_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + start_time: date + ? moment(date).day(1).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date > moment(formData.end_time)) { + setFormData({ + ...formData, + end_time: dateString, + start_time: formData.end_time, + }); + } else { + setFormData({ + ...formData, + start_time: dateString, + }); + } + } else { + setFormData({ ...formData, start_time: dateString }); + } + }} + disabledDate={(current) => current > moment(formData.end_time)} /> +
setFormData({ ...formData, confirm_end_time: dateString })} - disabledDate={(current) => current < moment(formData.confirm_start_time)} + value={formData.end_time ? moment(formData.end_time) : null} + onChange={(date, dateString) => { + if (TimeChange().str == "week") { + setFormData({ + ...formData, + end_time: date + ? moment(date).day(7).format("YYYY-MM-DD") + : null, + }); + } else if (TimeChange().str == "day") { + if (date < moment(formData.start_time)) { + setFormData({ + ...formData, + start_time: dateString, + end_time: formData.start_time, + }); + } else { + setFormData({ + ...formData, + end_time: dateString, + }); + } + } else { + setFormData({ ...formData, end_time: dateString }); + } + }} + disabledDate={(current) => + current < moment(formData.start_time) + } />
@@ -530,7 +631,7 @@ function TemporaryParkStat() {
-
+
临时停车次数占比
-
总停车次数：
+
总停车次数：
临时停车趋势分析
diff --git a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx index 1f4e78a..f0fbc9d 100644 --- a/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx +++ b/src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx @@ -137,22 +137,22 @@ function PlatformConfiguration(props) { const getPaymentScenarioList = (payment_merchant_id) => { ajax.getAppInfoPaymentScenarioList({ payment_merchant_id }).then( (res) => { - res = { - "status": 20000, - "message": "success", - "data": { - "scenario_list": [ - { - "id": "120", - "text": "微信小程序支付" - }, - { - "id": "132", - "text": "微信用户被扫/付款码支付" - } - ] - } - } + // res = { + // "status": 20000, + // "message": "success", + // "data": { + // "scenario_list": [ + // { + // "id": "120", + // "text": "微信小程序支付" + // }, + // { + // "id": "132", + // "text": "微信用户被扫/付款码支付" + // } + // ] + // } + // } if (parseInt(res?.status) === 20000) { let scenario_list = res.data?.scenario_list || [] setAppInfoPaymentScenarioList(scenario_list);