diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xingcheng.svg b/src/assets/icons/icon-xingcheng.svg new file mode 100644 index 0000000..87ee123 --- /dev/null +++ b/src/assets/icons/icon-xingcheng.svg @@ -0,0 +1 @@ + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xingcheng.svg b/src/assets/icons/icon-xingcheng.svg new file mode 100644 index 0000000..87ee123 --- /dev/null +++ b/src/assets/icons/icon-xingcheng.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xunjian.svg b/src/assets/icons/icon-xunjian.svg new file mode 100644 index 0000000..e60365e --- /dev/null +++ b/src/assets/icons/icon-xunjian.svg @@ -0,0 +1 @@ + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xingcheng.svg b/src/assets/icons/icon-xingcheng.svg new file mode 100644 index 0000000..87ee123 --- /dev/null +++ b/src/assets/icons/icon-xingcheng.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xunjian.svg b/src/assets/icons/icon-xunjian.svg new file mode 100644 index 0000000..e60365e --- /dev/null +++ b/src/assets/icons/icon-xunjian.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 2daf124..3ae77f2 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -95,7 +95,6 @@ // 加工标记点数据 const pointArr = arr.map((item: any) => ([Number(item.lng), Number(item.lat)])) - console.log(pointArr, 'pointArr') // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xingcheng.svg b/src/assets/icons/icon-xingcheng.svg new file mode 100644 index 0000000..87ee123 --- /dev/null +++ b/src/assets/icons/icon-xingcheng.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xunjian.svg b/src/assets/icons/icon-xunjian.svg new file mode 100644 index 0000000..e60365e --- /dev/null +++ b/src/assets/icons/icon-xunjian.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 2daf124..3ae77f2 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -95,7 +95,6 @@ // 加工标记点数据 const pointArr = arr.map((item: any) => ([Number(item.lng), Number(item.lat)])) - console.log(pointArr, 'pointArr') // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 5c56bd8..b6cc0ba 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,15 +1,110 @@ + + diff --git a/src/api/page/page.ts b/src/api/page/page.ts index 91d0fab..f99890a 100644 --- a/src/api/page/page.ts +++ b/src/api/page/page.ts @@ -32,5 +32,19 @@ data: params, }) } -// 统计面板 - +// 统计面板-巡检车信息 +export function getDashboardCar(params: any) { + return request({ + url: '/system/busOverView/carList', + method: 'post', + data: params, + }) +} +// 统计面板-巡检任务和公里数 +export function getDashboardInspection(params: any) { + return request({ + url: '/system/busOverView/taskCount', + method: 'post', + data: params, + }) +} diff --git a/src/assets/icons/icon-car.svg b/src/assets/icons/icon-car.svg new file mode 100644 index 0000000..a7319fa --- /dev/null +++ b/src/assets/icons/icon-car.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-roate.svg b/src/assets/icons/icon-roate.svg new file mode 100644 index 0000000..577c30c --- /dev/null +++ b/src/assets/icons/icon-roate.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xingcheng.svg b/src/assets/icons/icon-xingcheng.svg new file mode 100644 index 0000000..87ee123 --- /dev/null +++ b/src/assets/icons/icon-xingcheng.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/icon-xunjian.svg b/src/assets/icons/icon-xunjian.svg new file mode 100644 index 0000000..e60365e --- /dev/null +++ b/src/assets/icons/icon-xunjian.svg @@ -0,0 +1 @@ + diff --git a/src/components/map/Map.vue b/src/components/map/Map.vue index 2daf124..3ae77f2 100644 --- a/src/components/map/Map.vue +++ b/src/components/map/Map.vue @@ -95,7 +95,6 @@ // 加工标记点数据 const pointArr = arr.map((item: any) => ([Number(item.lng), Number(item.lat)])) - console.log(pointArr, 'pointArr') // if (pointArr.length) { // map.value.setCenter(pointArr[0]) // } diff --git a/src/views/home/components/statistics.vue b/src/views/home/components/statistics.vue index 5c56bd8..b6cc0ba 100644 --- a/src/views/home/components/statistics.vue +++ b/src/views/home/components/statistics.vue @@ -1,15 +1,110 @@ + + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index cb09fab..4f30eef 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -387,7 +387,7 @@ - +