chenglb
/
PMS_Frontend_v1.0.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix():修改数据分析预测页面检索条件

tags/PMS_Frontend_v1.0.6-develop
xingjx 1 year ago
parent
aa6d2c3000
commit
966475c170
14 changed files with 903 additions and 266 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/components/TableModule/index.jsx
  2. 8
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss
  3. 191
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
  4. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss
  5. 192
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
  6. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
  7. 184
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  8. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
  9. 160
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  10. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss
  11. 172
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
  12. 14
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss
  13. 187
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
  14. 32
      src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx

1
src/components/TableModule/index.jsx
View File

@ -177,7 +177,6 @@ const TableModule = forwardRef((props, ref) => {
return return
} }
} }
console.log(moment(form.end_time) - moment(form.start_time), 179 * 3600 * 24000)
search(form); search(form);
} }
//重置 //重置

8
src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {
@ -161,6 +164,7 @@ $color-primary : var(--color-primary);
.ant-table-thead { .ant-table-thead {
th { th {
background: #616b83 !important; background: #616b83 !important;
border: 1px solid #7a7070;
} }
} }

191
src/pages/DataAnalysisPrediction/ParkingBusinessAly/NightParkStat/loadable.jsx
View File

@ -64,7 +64,7 @@ function NightParkStat() {
{ {
title: '日期', title: '日期',
dataIndex: 'index', dataIndex: 'index',
key: 'index',
key: 'index',
width: 100, width: 100,
fixed: 'left', 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() { function getParkingIncome() {
ajax ajax
.getParkingIncome() .getParkingIncome()
@ -463,50 +503,109 @@ function NightParkStat() {
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={[
{
label: '日',
value: '0',
},
{
label: '周',
value: '1',
},
{
label: '月',
value: '2',
},
]}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">
@ -554,27 +653,27 @@ function NightParkStat() {
columns={columns} columns={columns}
dataSource={[ 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 bordered
size="middle" size="middle"

7
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {

192
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkUsageAly/loadable.jsx
View File

@ -112,6 +112,47 @@ function ParkUsageAly() {
// useEffect(() => { // useEffect(() => {
// getData(); // getData();
// }, [isAjax]); // }, [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) => { const getRevenueOption = (data) => {
// 获取所有地区名称 // 获取所有地区名称
@ -209,16 +250,16 @@ function ParkUsageAly() {
}, },
color: ["#4DC3FF", "#FFD767"], color: ["#4DC3FF", "#FFD767"],
//series: seriesData, //series: seriesData,
series:
{
"name": "西区",
"type": "line",
"data": [
12,
12,
24
]
},
series:
{
"name": "西区",
"type": "line",
"data": [
12,
12,
24
]
},
grid: { grid: {
x: 50, x: 50,
y: 55, y: 55,
@ -427,50 +468,109 @@ function ParkUsageAly() {
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={[
{
label: '日',
value: '0',
},
{
label: '周',
value: '1',
},
{
label: '月',
value: '2',
},
]}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">

7
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {

184
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
View File

@ -148,6 +148,47 @@ function ParkingAlyDuration() {
// useEffect(() => { // useEffect(() => {
// getData(); // getData();
// }, [isAjax]); // }, [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) => { const getRevenueOption = (data) => {
// 获取所有地区名称 // 获取所有地区名称
@ -531,50 +572,109 @@ function ParkingAlyDuration() {
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={[
{
label: '日',
value: '0',
},
{
label: '周',
value: '1',
},
{
label: '月',
value: '2',
},
]}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">
@ -617,16 +717,16 @@ function ParkingAlyDuration() {
columns={columns} columns={columns}
dataSource={[ 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 bordered

7
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {

160
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
View File

@ -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) => { const getData = (v) => {
let postData = { ...formData }; let postData = { ...formData };
@ -472,37 +512,109 @@ function ParkingAlyOverview() {
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={searchSelectList?.flow_type_list || []}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">

7
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {

172
src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
View File

@ -81,6 +81,47 @@ function ParkingAlyPeriod() {
// useEffect(() => { // useEffect(() => {
// getData(); // getData();
// }, [isAjax]); // }, [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) => { const getRevenueOption = (data) => {
// 获取所有地区名称 // 获取所有地区名称
@ -401,50 +442,109 @@ function ParkingAlyPeriod() {
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={[
{
label: '日',
value: '0',
},
{
label: '周',
value: '1',
},
{
label: '月',
value: '2',
},
]}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">

14
src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/index.scss
View File

@ -56,10 +56,13 @@ $color-primary : var(--color-primary);
label { label {
color: var(--color-search-list-item-text); color: var(--color-search-list-item-text);
flex: 0 0 25%;
max-width: 25%;
flex: 0 0 27%;
max-width: 27%;
text-align: right; text-align: right;
padding-right: 8px; padding-right: 8px;
.daf {
display: inline-block;
}
} }
.form-con { .form-con {
@ -126,6 +129,13 @@ $color-primary : var(--color-primary);
background: #3e4557; background: #3e4557;
border-radius: 4px; border-radius: 4px;
margin-bottom: 20px; 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 { .result-box-title {
height: 21px; height: 21px;
font-size: 16px; font-size: 16px;

187
src/pages/DataAnalysisPrediction/ParkingBusinessAly/TemporaryParkStat/loadable.jsx
View File

@ -87,6 +87,47 @@ function TemporaryParkStat() {
// useEffect(() => { // useEffect(() => {
// getData(); // getData();
// }, [isAjax]); // }, [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) => { const getRevenueOption = (data) => {
// 获取所有地区名称 // 获取所有地区名称
@ -232,7 +273,7 @@ function TemporaryParkStat() {
}); });
console.log(data); console.log(data);
const areaNames = [...new Set(data.map((item) => item.area_name))]; const areaNames = [...new Set(data.map((item) => item.area_name))];
setRingData({ setRingData({
title: { title: {
text: "", text: "",
@ -245,9 +286,10 @@ function TemporaryParkStat() {
}, },
legend: { legend: {
type: "scroll", type: "scroll",
right: "5%",
//right: "5%",
left: '42.5%',
//data: areaNames, //data: areaNames,
data: ["常时停车", "临时停车"],
data: ["长时停车", "临时停车"],
itemWidth: 18, itemWidth: 18,
itemHeight: 12, itemHeight: 12,
textStyle: { textStyle: {
@ -256,7 +298,7 @@ function TemporaryParkStat() {
}, },
}, },
color: ["#4DC3FF", "#FFD767"],
color: ["#3AA9FF", "#F997DF"],
//series: seriesData, //series: seriesData,
series: [ series: [
{ {
@ -279,7 +321,7 @@ function TemporaryParkStat() {
show: false show: false
}, },
data: [ data: [
{ value: 1048, name: '常时停车' },
{ value: 1048, name: '长时停车' },
{ value: 735, name: '临时停车' }, { value: 735, name: '临时停车' },
] ]
} }
@ -465,50 +507,109 @@ function TemporaryParkStat() {
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期搜索</label>
<Select
className="form-con"
placeholder="请选择"
options={[
{
label: '日',
value: '0',
},
{
label: '周',
value: '1',
},
{
label: '月',
value: '2',
},
]}
value={formData.pay_merchant_id}
onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
}
/>
</div>
<div className="yisa-search">
<label>时间选择</label>
<label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
{
value: "4",
label: "年",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_start_time ? moment(formData.confirm_start_time) : undefined}
onChange={(date, dateString) => 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)}
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>至</label> <label>至</label>
<DatePicker <DatePicker
className="form-con"
showTime
style={{ width: "100%" }}
// showTime
format={TimeChange().mat}
picker={TimeChange().str}
allowClear={false} allowClear={false}
value={formData.confirm_end_time ? moment(formData.confirm_end_time) : undefined}
onChange={(date, dateString) => 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)
}
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">
@ -530,7 +631,7 @@ function TemporaryParkStat() {
</div> </div>
</div> </div>
<div className="paid-result soll-result"> <div className="paid-result soll-result">
<div className="result">
<div className="result">
<div className="result-box"> <div className="result-box">
<div className="result-box-title">临时停车次数占比</div> <div className="result-box-title">临时停车次数占比</div>
<Tooltip <Tooltip
@ -543,7 +644,7 @@ function TemporaryParkStat() {
option={ringData} option={ringData}
style={{ height: "300px", width: "100%", overflow: "hidden" }} style={{ height: "300px", width: "100%", overflow: "hidden" }}
/> />
<div>总停车次数：</div>
<div className="lstc-text">总停车次数：</div>
</div> </div>
<div className="result-box"> <div className="result-box">
<div className="result-box-title">临时停车趋势分析</div> <div className="result-box-title">临时停车趋势分析</div>

32
src/pages/FinancialMgm/PayConf/PlatformMerchantConf/index.jsx
View File

@ -137,22 +137,22 @@ function PlatformConfiguration(props) {
const getPaymentScenarioList = (payment_merchant_id) => { const getPaymentScenarioList = (payment_merchant_id) => {
ajax.getAppInfoPaymentScenarioList({ payment_merchant_id }).then( ajax.getAppInfoPaymentScenarioList({ payment_merchant_id }).then(
(res) => { (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) { if (parseInt(res?.status) === 20000) {
let scenario_list = res.data?.scenario_list || [] let scenario_list = res.data?.scenario_list || []
setAppInfoPaymentScenarioList(scenario_list); setAppInfoPaymentScenarioList(scenario_list);

Write Preview
Loading…
Cancel
Save