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

Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0.git into develop

tags/PMS_Frontend_v1.0.6-develop
chenglb 1 year ago
parent
6d65bc7101 13504d2c2b
commit
62af8865f3
11 changed files with 100 additions and 203 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. 2
      src/assets/css/ant-modification.scss
  2. 9
      src/components/TableModule/index.jsx
  3. 13
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/index.scss
  4. 48
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyDuration/loadable.jsx
  5. 7
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyOverview/loadable.jsx
  6. 193
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/ParkingAlyPeriod/loadable.jsx
  7. 8
      src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
  8. 6
      src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
  9. 4
      src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
  10. 7
      src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js
  11. 6
      src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js

2
src/assets/css/ant-modification.scss
View File

@ -268,7 +268,7 @@
.ant-table-fixed-header { .ant-table-fixed-header {
.ant-table-tbody { .ant-table-tbody {
tr:nth-child(2n + 1) > td { tr:nth-child(2n + 1) > td {
background: var(--table-bg);
//background: var(--table-bg);
} }
tr:nth-child(2n) > td { tr:nth-child(2n) > td {

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

@ -145,9 +145,10 @@ const TableModule = forwardRef((props, ref) => {
}, [formData]) }, [formData])
//查询函数 //查询函数
function fetch() {
function fetch(pn) {
// setLoading(true); // setLoading(true);
let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData };
let pnno = pn ? { pn: 1 } : {}
let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno };
if (timeFlag) { if (timeFlag) {
form = { form = {
...form, ...form,
@ -481,7 +482,7 @@ const TableModule = forwardRef((props, ref) => {
(item.defaultValue && item.defaultValue[1]) || moment() (item.defaultValue && item.defaultValue[1]) || moment()
} }
> >
<DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} allowClear={false}/>
<DatePicker showTime format={"YYYY-MM-DD HH:mm:ss"} allowClear={false} />
</Form.Item> </Form.Item>
<div style={{ margin: "-20px 0 10px 0" }}> <div style={{ margin: "-20px 0 10px 0" }}>
<QuickMenu <QuickMenu
@ -643,7 +644,7 @@ const TableModule = forwardRef((props, ref) => {
<Button className="reset" onClick={reset}> <Button className="reset" onClick={reset}>
重置 重置
</Button> </Button>
<Button type="primary" className="submit" onClick={fetch}>
<Button type="primary" className="submit" onClick={() => { pageData.pn == 1 ? fetch(1) : setPageData({ ...pageData, pn: 1 }) }}>
查询 查询
</Button> </Button>
</div> </div>

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

@ -142,6 +142,19 @@ $color-primary : var(--color-primary);
display: inline-block; display: inline-block;
} }
.export-btn {
display: inline-block;
text-align: center;
float: right;
width: 68px;
height: 34px;
line-height: 34px;
background: linear-gradient(180deg,#3aa9ff, #59b7ff);
border-radius: 4px;
margin-right: 15px;
margin-top: 10px;
cursor: pointer;
}
i { i {
border: 1px solid; border: 1px solid;
border-radius: 22px; border-radius: 22px;

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

@ -25,7 +25,7 @@ function ParkingAlyDuration() {
const defaultData = { const defaultData = {
start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD HH:mm:ss"), start_time: moment().subtract('days').startOf('day').format("YYYY-MM-DD HH:mm:ss"),
end_time: moment().endOf("day").format("YYYY-MM-DD HH:mm:ss"), end_time: moment().endOf("day").format("YYYY-MM-DD HH:mm:ss"),
date_type: 1,
//date_type: 1,
}; };
// 分页数据 // 分页数据
const [pageInfo, setPageInfo] = useState({ const [pageInfo, setPageInfo] = useState({
@ -149,14 +149,14 @@ function ParkingAlyDuration() {
...pageInfo, ...pageInfo,
...{ pn: current, length: size } ...{ pn: current, length: size }
}); });
//setIsAjax(!isAjax)
setIsAjax(!isAjax)
//getListData({}) //getListData({})
}, },
} }
useEffect(() => {
getData()
}, [pageInfo])
// useEffect(() => {
// getData()
// }, [pageInfo])
useEffect(() => { useEffect(() => {
setSessionTabList({ setSessionTabList({
...formData ...formData
@ -212,7 +212,7 @@ function ParkingAlyDuration() {
end_time: end, end_time: end,
}); });
}; };
//停车场收入概览
//停车场收入概览 柱状图
const getRevenueOption = (data) => { const getRevenueOption = (data) => {
console.log(data) console.log(data)
// data = [ // data = [
@ -652,9 +652,9 @@ function ParkingAlyDuration() {
}); });
}; };
//获取柱状图数据
function getParkingIncome() { function getParkingIncome() {
ajax ajax
//.getParkingIncome()
.getParkingAlyDurationBar() .getParkingAlyDurationBar()
.then((res) => { .then((res) => {
if (res.status === 20000) { if (res.status === 20000) {
@ -712,22 +712,22 @@ function ParkingAlyDuration() {
} }
setDefaultParams({ ...postData, ...pageInfo }); setDefaultParams({ ...postData, ...pageInfo });
setTabLoading(true); setTabLoading(true);
// ajax.getAppList({ ...postData, ...v, ...pageInfo }).then(
// (res) => {
// if (parseInt(res?.status) === 20000) {
// setResultData(res?.data || {});
// } else {
// message.error(res?.message);
// }
// setLoading(false);
// setTabLoading(false);
// },
// (err) => {
// console.log(err);
// setLoading(false);
// setTabLoading(false);
// }
// );
ajax.getParkingAlyDurationParkingList({ ...postData, ...v, ...pageInfo }).then(
(res) => {
if (parseInt(res?.status) === 20000) {
setResultData(res?.data || {});
} else {
message.error(res?.message);
}
setLoading(false);
setTabLoading(false);
},
(err) => {
console.log(err);
setLoading(false);
setTabLoading(false);
}
);
}; };
// 检索数据 // 检索数据
@ -963,6 +963,7 @@ function ParkingAlyDuration() {
<div className="duration-box"> <div className="duration-box">
<div className="result-box duration-left"> <div className="result-box duration-left">
<div className="result-box-title">日均泊位周转次数排行榜</div> <div className="result-box-title">日均泊位周转次数排行榜</div>
<div className="export-btn" onClick={()=>{window.open('/api/ana/dataanalysis/get_turn_times_export')}}>导出</div>
<Tabs <Tabs
defaultActiveKey="2" defaultActiveKey="2"
activeKey={tabKey} activeKey={tabKey}
@ -1035,6 +1036,7 @@ function ParkingAlyDuration() {
</div> </div>
<div className="result-box duration-right"> <div className="result-box duration-right">
<div className="result-box-title">平均停车时长排行榜</div> <div className="result-box-title">平均停车时长排行榜</div>
<div className="export-btn" onClick={()=>{window.open('/get_parking_duration_export')}}>导出</div>
<Table <Table
columns={parkColumns} columns={parkColumns}
dataSource={[]} dataSource={[]}

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

@ -277,7 +277,7 @@ function ParkingAlyOverview() {
}; };
}); });
setRevenueData(lineChartOption(areaNames, xAxisData, seriesData));
setRevenueData(lineChartOption(areaNames, xAxisData,"停车记录数（个）", seriesData));
}; };
//临时停车次数占比,环形图 //临时停车次数占比,环形图
@ -506,6 +506,7 @@ function ParkingAlyOverview() {
} }
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期 <label>日期
{/* <div className="daf"> {/* <div className="daf">
@ -608,6 +609,7 @@ function ParkingAlyOverview() {
} }
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">
<Button <Button
className="reset" className="reset"
@ -723,6 +725,7 @@ function ParkingAlyOverview() {
bordered bordered
pagination={false} pagination={false}
size="middle" size="middle"
scroll={{ y: 305 }}
/> />
<Pagination {...paginationProps} className="pagination-common" total={tableData?.area_total_records} /> <Pagination {...paginationProps} className="pagination-common" total={tableData?.area_total_records} />
</>, </>,
@ -744,7 +747,7 @@ function ParkingAlyOverview() {
bordered bordered
pagination={false} pagination={false}
size="middle" size="middle"
//scroll={{ y: 305 }}
scroll={{ y: 305 }}
// scroll={{ // scroll={{
// x: 'calc(700px + 50%)', // x: 'calc(700px + 50%)',
// y: 240, // y: 240,

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

@ -3,6 +3,7 @@ import { ResultFlowResult } from "@/components";
import { Select, Input, Button, Table, message, Pagination, DatePicker, Modal, Cascader, Tooltip } from "antd"; import { Select, Input, Button, Table, message, Pagination, DatePicker, Modal, Cascader, Tooltip } from "antd";
import { Icon } from "@/components" import { Icon } from "@/components"
import { useSessionStorageState } from "ahooks"; import { useSessionStorageState } from "ahooks";
import { lineChartOption, ringChartOption } from "../echarts.config";
import moment from "moment"; import moment from "moment";
import ReactEcharts from "echarts-for-react"; import ReactEcharts from "echarts-for-react";
import "./index.scss"; import "./index.scss";
@ -83,7 +84,8 @@ function ParkingAlyPeriod() {
const TimeChange = () => { const TimeChange = () => {
let e = formData.date_type; let e = formData.date_type;
let str = "day"; let str = "day";
let mat = "YYYY-MM-DD";
//let mat = "YYYY-MM-DD";
let mat = "YYYY-MM-DD HH:mm:ss";
if (e == 4) { if (e == 4) {
str = "year"; str = "year";
mat = "YYYY"; mat = "YYYY";
@ -121,152 +123,53 @@ function ParkingAlyPeriod() {
}); });
}; };
//停车场收入概览 //停车场收入概览
const getRevenueOption = (data) => {
const getRevenueOption = (data) =>{
// 获取所有地区名称 // 获取所有地区名称
data.sort((a, b) => { data.sort((a, b) => {
return new Date(a.pay_date) - new Date(b.pay_date);
return new Date(a.date) - new Date(b.date);
}); });
console.log(data);
const areaNames = [...new Set(data.map((item) => item.area_name))];
const areaNames = data[0].name ? [...new Set(data.map((item) => item.name))] : [''];
// 获取所有日期 // 获取所有日期
const dates = [...new Set(data.map((item) => item.pay_date))].sort(
(a, b) => a.pay_date - b.pay_date
const dates = [...new Set(data.map((item) => item.date))].sort(
(a, b) => a.date - b.date
); );
// 构建数据对象 // 构建数据对象
const seriesData = areaNames.map((areaName, index) => { const seriesData = areaNames.map((areaName, index) => {
// 获取该地区的数据 // 获取该地区的数据
const areaData = data.filter((item) => item.area_name === areaName);
const areaData = data[0].name ? data.filter((item) => item.name === areaName) : data
// 构建该地区的数据对象 // 构建该地区的数据对象
return { return {
name: areaName,
name: areaNames.length > 1 ? areaName : '',
type: "line", type: "line",
itemStyle: { itemStyle: {
normal: {
label: {
show: true, //开启显示
position: 'top', //在上方显示
textStyle: { //数值样式
color: 'white',//字体颜色
fontSize: 10//字体大小
}
},
label: {
show: true, //开启显示
position: 'top', //在上方显示
color: 'white',//字体颜色
fontSize: 10//字体大小
}, },
}, },
data: dates.map((item) => { data: dates.map((item) => {
for (const { pay_date, income } of areaData) {
console.log(pay_date, income);
if (pay_date === item) return income;
for (const { date, record_count } of areaData) {
if (date === item) return record_count;
} }
return 0; return 0;
}), }),
yAxisIndex: index == 1 ? 1 : null,
}; };
}); });
console.log(21, areaNames, seriesData)
// 构建X轴数据 // 构建X轴数据
const xAxisData = dates.map((date) => { const xAxisData = dates.map((date) => {
return { return {
value: date, value: date,
textStyle: {
align: "center",
lineStyle: {
color: "#3AA9FF", // 设置线的颜色为天蓝色
shadowBlur: 6,
},
align: "center",
lineStyle: {
color: "skyblue", // 设置线的颜色为天蓝色
shadowBlur: 6,
}, },
};
});
setRevenueData({
title: {
text: "",
textStyle: {
color: "#fff",
},
},
tooltip: {
trigger: "axis",
},
legend: {
type: "scroll",
top: 0,
left: 'center',
data: areaNames,
itemWidth: 18,
itemHeight: 12,
width: '40%',
textStyle: {
fontSize: 14,
color: 'white',
},
},
xAxis: {
data: xAxisData,
type: 'category',
boundaryGap: false, // 不留白，从原点开始
axisLine: {
lineStyle: {
color: "#bbb",
},
},
axisLabel: {
textStyle: {
color: "#bbb",
},
},
},
yAxis: {
type: "value",
name: '车次数（次）',
min: 0,
// /max: 50,
interval: 10,
splitNumber: 6, //设置坐标轴的分割段数
axisLabel: {
//formatter: "{value}元",
textStyle: {
color: "#bbb",
},
},
splitLine: {
show: true, // 是否显示分隔线。默认数值轴显示，类目轴不显示
interval: '0', // 坐标轴刻度标签的显示间隔，在类目轴中有效.0显示所有
lineStyle: {
color: ['#cccccc42'], // 分隔线颜色，可以设置成单个颜色，也可以设置成颜色数组，分隔线会按数组中颜色的顺序依次循环设置颜色
width: 1.3, // 分隔线线宽
type: 'dashed', // 坐标轴线线的类型（'solid'，实线类型；'dashed'，虚线类型；'dotted',点状类型）
},
},
},
color: ["#3AA9FF", "#F997DF"],
//series: seriesData,
series: [
{
"name": "西区",
"type": "line",
"data": [
12,
12,
24
]
},
{
"name": "西海岸新区",
"type": "line",
"data": [
9,
4,
4
]
},
],
grid: {
x: 50,
y: 55,
x2: 70,
y2: 20,
},
};
}); });
setRevenueData(lineChartOption(areaNames, xAxisData,"停车记录数（个）", seriesData));
}; };
function getParkingIncome() { function getParkingIncome() {
@ -384,9 +287,9 @@ function ParkingAlyPeriod() {
value: "id", value: "id",
children: "children", children: "children",
}} }}
value={formData.region}
value={formData.area_id}
onChange={(v, option) => { onChange={(v, option) => {
setFormData({ ...formData, region: v ? v : null });
setFormData({ ...formData, area_id: v ? v : null });
}} }}
/> />
</div> </div>
@ -396,9 +299,9 @@ function ParkingAlyPeriod() {
className="form-con" className="form-con"
placeholder="请选择" placeholder="请选择"
options={searchSelectList?.flow_type_list || []} options={searchSelectList?.flow_type_list || []}
value={formData.pay_merchant_id}
value={formData.operator_id}
onChange={(v) => onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
setFormData({ ...formData, operator_id: v })
} }
/> />
</div> </div>
@ -421,9 +324,9 @@ function ParkingAlyPeriod() {
value: '2', value: '2',
}, },
]} ]}
value={formData.pay_merchant_id}
value={formData.car_parking_type}
onChange={(v) => onChange={(v) =>
setFormData({ ...formData, pay_merchant_id: v })
setFormData({ ...formData, car_parking_type: v })
} }
/> />
</div> </div>
@ -432,43 +335,19 @@ function ParkingAlyPeriod() {
<Input <Input
className="form-con" className="form-con"
placeholder="请输入" placeholder="请输入"
value={formData?.park}
value={formData?.road_name}
onChange={(e) => onChange={(e) =>
setFormData({ ...formData, park: e.target.value })
setFormData({ ...formData, road_name: e.target.value })
} }
/> />
</div> </div>
<div className="yisa-search"> <div className="yisa-search">
<label>日期 <label>日期
<div className="daf">
<Select
value={formData.date_type}
// style={{
// width: "100%",
// }}
placeholder="请选择"
options={[
{
value: "1",
label: "日",
},
{
value: "2",
label: "周",
},
{
value: "3",
label: "月",
},
]}
onChange={(e) => SetTimeNow(e)}
/>
</div>
</label> </label>
<DatePicker <DatePicker
style={{ width: "100%" }} style={{ width: "100%" }}
// showTime
showTime
format={TimeChange().mat} format={TimeChange().mat}
picker={TimeChange().str} picker={TimeChange().str}
allowClear={false} allowClear={false}
@ -541,6 +420,7 @@ function ParkingAlyPeriod() {
} }
/> />
</div> </div>
<div className="form-btn"> <div className="form-btn">
<Button <Button
className="reset" className="reset"
@ -609,19 +489,16 @@ function ParkingAlyPeriod() {
<Select <Select
className="form-con" className="form-con"
placeholder="请选择" placeholder="请选择"
defaultValue={'0'}
options={[ options={[
{ {
label: '按时间对比', label: '按时间对比',
value: '0', value: '0',
}, },
{ {
label: '周',
label: '按计费类型对比',
value: '1', value: '1',
}, },
{
label: '月',
value: '2',
},
]} ]}
value={formData.pay_me} value={formData.pay_me}
onChange={(v) => onChange={(v) =>

8
src/pages/DataAnalysisPrediction/ParkingBusinessAly/echarts.config.js
View File

@ -1,5 +1,5 @@
const lineChartOption = (areaNames, xAxisData, seriesData) => {
const lineChartOption = (areaNames, xAxisData, yAxisName, seriesData) => {
return { return {
title: { title: {
text: "", text: "",
@ -36,7 +36,7 @@ const lineChartOption = (areaNames, xAxisData, seriesData) => {
}, },
yAxis: { yAxis: {
type: "value", type: "value",
name: '停车记录数（次）',
name: yAxisName ? yAxisName : '',
min: 0, min: 0,
// /max: 50, // /max: 50,
interval: 10, interval: 10,
@ -119,6 +119,6 @@ const ringChartOption = (areaNames, ringData) => {
} }
}; };
export { export {
lineChartOption,
ringChartOption,
lineChartOption,
ringChartOption,
} }

6
src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
View File

@ -39,7 +39,7 @@ import {
SystemSearch, SystemSearch,
ResultPanel, ResultPanel,
FormSliderPicker, FormSliderPicker,
SelectLntLat,
SelectGaodeLngLat,
ResultFlow, ResultFlow,
AreaCascader, AreaCascader,
ImgResize, ImgResize,
@ -1900,7 +1900,7 @@ function ConfigRoad() {
<Input <Input
value={lngLat} value={lngLat}
addonAfter={ addonAfter={
<SelectLntLat
<SelectGaodeLngLat
open={() => setLngLatVisible(true)} open={() => setLngLatVisible(true)}
lngLatVisible={lngLatVisible} lngLatVisible={lngLatVisible}
getLntLat={(value) => { getLntLat={(value) => {
@ -2124,7 +2124,7 @@ function ConfigRoad() {
<Input value={lngLatModal.value} /> <Input value={lngLatModal.value} />
</Col> </Col>
<Col span={5}> <Col span={5}>
<SelectLntLat
<SelectGaodeLngLat
open={() => open={() =>
setLngLatModal({ ...lngLatModal, visible: true }) setLngLatModal({ ...lngLatModal, visible: true })
} }

4
src/pages/OutRoadMgm/OutSegmentMgm/OutSegment/AddParking.jsx
View File

@ -18,7 +18,7 @@ import {
import ajax from "@/services"; import ajax from "@/services";
import moment from "moment"; import moment from "moment";
import { PlusOutlined } from "@ant-design/icons"; import { PlusOutlined } from "@ant-design/icons";
import { ImgUpload, TreeSelectGroup, SelectLntLat } from "@/components";
import { ImgUpload, TreeSelectGroup, SelectGaodeLngLat } from "@/components";
function AddParking(props) { function AddParking(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { const {
@ -482,7 +482,7 @@ function AddParking(props) {
<Input value={lngLat} disabled={disabled} /> <Input value={lngLat} disabled={disabled} />
</Col> </Col>
<Col span={5}> <Col span={5}>
<SelectLntLat
<SelectGaodeLngLat
open={() => setLngLatVisible(true)} open={() => setLngLatVisible(true)}
lngLatVisible={lngLatVisible} lngLatVisible={lngLatVisible}
getLntLat={(value) => { getLntLat={(value) => {

7
src/services/DataAnalysisPrediction/ParkingBusinessAly/index.js
View File

@ -57,10 +57,10 @@ const getParkingAlyDurationBerthList = (params) => {
data: params, data: params,
}); });
}; };
//停车业务分析-停车时长分析-停车时长
//停车业务分析-停车时长分析-平均停车时长排行榜
const getParkingAlyDurationParkingList = (params) => { const getParkingAlyDurationParkingList = (params) => {
return ajax({ return ajax({
url: "",
url: "/api/ana/dataanalysis/show_average_parking_duration",
type: "post", type: "post",
data: params, data: params,
}); });
@ -75,5 +75,6 @@ export default {
getParkingAlyDurationBar, getParkingAlyDurationBar,
getParkingAlyDurationBerthList, getParkingAlyDurationBerthList,
getParkingAlyDurationParkingList,
} }

6
src/services/DataAnalysisPrediction/ParkingIncomeAly/index.js
View File

@ -66,21 +66,21 @@ export default {
}, },
getArrearPriceData: function(data) { getArrearPriceData: function(data) {
return ajax({ return ajax({
url: '/api/dataAnalysis/priceAnalysis',
url: '/api/ana/arrearage/price_analysis',
type: 'post', type: 'post',
data data
}) })
}, },
getCityRevenueData: function(data) { getCityRevenueData: function(data) {
return ajax({ return ajax({
url: '/api/dataAnalysis/cityRevenue',
url: '/api/ana/arrearage/city_revenue',
type: 'post', type: 'post',
data data
}) })
}, },
getCityRevenueAlyData: function(data) { getCityRevenueAlyData: function(data) {
return ajax({ return ajax({
url: '/api/dataAnalysis/cityRevenueAnalysis',
url: '/api/ana/arrearage/city_revenue_analysis',
type: 'post', type: 'post',
data data
}) })

Write Preview
Loading…
Cancel
Save