From 5ac0f8ac2fbdab0b6977665f998431c7c80c21a6 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Wed, 8 Jun 2022 15:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/report/activity.js | 9 + src/api/report/parking.js | 9 + src/api/report/visit.js | 44 ++++- src/views/active/activity.vue | 100 ++++++----- src/views/dashboard/components/PanelGroup.vue | 44 +++-- src/views/dashboard/index.vue | 129 ++++++++------ src/views/report/activeRpt.vue | 128 +++++++++++++- src/views/report/components/LineChart.vue | 3 +- src/views/report/parkRpt.vue | 126 +++++++++++++- src/views/report/visit/ageRpt.vue | 110 +++++++++++- src/views/report/visit/infoRpt.vue | 129 +++++++++++++- src/views/report/visit/monthRpt.vue | 129 +++++++++++++- src/views/report/visit/seasonRpt.vue | 153 ++++++++++++++++- src/views/report/visit/sexRpt.vue | 18 +- src/views/report/visit/timeRpt.vue | 157 +++++++++++++++++- 15 files changed, 1119 insertions(+), 169 deletions(-) create mode 100644 src/api/report/activity.js create mode 100644 src/api/report/parking.js diff --git a/src/api/report/activity.js b/src/api/report/activity.js new file mode 100644 index 0000000..2b9679b --- /dev/null +++ b/src/api/report/activity.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function activityRpt(params) { + return request({ + url: '/api/admin/chart/activity', + method: 'get', + params: params + }) +} diff --git a/src/api/report/parking.js b/src/api/report/parking.js new file mode 100644 index 0000000..e2b56ec --- /dev/null +++ b/src/api/report/parking.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function carparkRpt(params) { + return request({ + url: '/api/admin/chart/carpark', + method: 'get', + params: params + }) +} diff --git a/src/api/report/visit.js b/src/api/report/visit.js index 22cdae0..b3db355 100644 --- a/src/api/report/visit.js +++ b/src/api/report/visit.js @@ -6,4 +6,46 @@ export function sexRpt(params) { method: 'get', params: params }) -} +} + +export function ageRpt(params) { + return request({ + url: '/api/admin/chart/visit_age', + method: 'get', + params: params + }) +} + +export function visitdetailRpt(params) { + return request({ + url: '/api/admin/chart/visit_detail', + method: 'get', + params: params + }) +} + +export function duringRpt(params) { + return request({ + url: '/api/admin/chart/visit_during', + method: 'get', + params: params + }) +} + +export function quarterRpt(params) { + return request({ + url: '/api/admin/chart/visit_quarter', + method: 'get', + params: params + }) +} + +export function monthRpt(params) { + return request({ + url: '/api/admin/chart/visit_month', + method: 'get', + params: params + }) +} + + diff --git a/src/views/active/activity.vue b/src/views/active/activity.vue index 2df5d2b..90428db 100644 --- a/src/views/active/activity.vue +++ b/src/views/active/activity.vue @@ -31,14 +31,12 @@ style="margin-left: 10px;">下架 - -
- {{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}} +
+ {{dateRange}} +
-
上架中 @@ -116,8 +114,10 @@
-
- + + + + @@ -161,6 +154,25 @@ + + + + + + + + + + + + @@ -216,18 +228,11 @@ - - -
- -
-
diff --git a/src/views/report/activeRpt.vue b/src/views/report/activeRpt.vue index 02409e3..3ad81b5 100644 --- a/src/views/report/activeRpt.vue +++ b/src/views/report/activeRpt.vue @@ -1,8 +1,124 @@ - + + - - \ No newline at end of file diff --git a/src/views/report/components/LineChart.vue b/src/views/report/components/LineChart.vue index 73ffc34..1cc468a 100644 --- a/src/views/report/components/LineChart.vue +++ b/src/views/report/components/LineChart.vue @@ -127,7 +127,8 @@ containLabel: true }, xAxis: [{ - type: 'category', + type: 'category', + axisLabel: {rotate: chartdata.rotate}, data: chartdata.xArr, }], yAxis: [{ diff --git a/src/views/report/parkRpt.vue b/src/views/report/parkRpt.vue index 02409e3..abcfaad 100644 --- a/src/views/report/parkRpt.vue +++ b/src/views/report/parkRpt.vue @@ -1,8 +1,122 @@ - + + - - \ No newline at end of file diff --git a/src/views/report/visit/ageRpt.vue b/src/views/report/visit/ageRpt.vue index 02409e3..fdea308 100644 --- a/src/views/report/visit/ageRpt.vue +++ b/src/views/report/visit/ageRpt.vue @@ -1,8 +1,104 @@ - - - - - \ No newline at end of file diff --git a/src/views/report/visit/infoRpt.vue b/src/views/report/visit/infoRpt.vue index 02409e3..d1b2b77 100644 --- a/src/views/report/visit/infoRpt.vue +++ b/src/views/report/visit/infoRpt.vue @@ -1,8 +1,125 @@ - + + - - \ No newline at end of file diff --git a/src/views/report/visit/monthRpt.vue b/src/views/report/visit/monthRpt.vue index 02409e3..4ddbbdf 100644 --- a/src/views/report/visit/monthRpt.vue +++ b/src/views/report/visit/monthRpt.vue @@ -1,8 +1,125 @@ - + + - - \ No newline at end of file diff --git a/src/views/report/visit/seasonRpt.vue b/src/views/report/visit/seasonRpt.vue index 02409e3..39504a7 100644 --- a/src/views/report/visit/seasonRpt.vue +++ b/src/views/report/visit/seasonRpt.vue @@ -1,8 +1,147 @@ - - - - - \ No newline at end of file diff --git a/src/views/report/visit/sexRpt.vue b/src/views/report/visit/sexRpt.vue index b2050fb..bbd8439 100644 --- a/src/views/report/visit/sexRpt.vue +++ b/src/views/report/visit/sexRpt.vue @@ -11,7 +11,7 @@ style="width: 200px"> - +
@@ -31,7 +31,7 @@
- +
@@ -39,7 +39,7 @@ - - \ No newline at end of file