From 62aa7268c26686d5cf389a1eea102d12c0fe3602 Mon Sep 17 00:00:00 2001 From: lion <120344285@qq.com> Date: Mon, 27 Mar 2023 17:27:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 4 +- src/api/report/index.js | 10 +- .../morecharts}/BarChart.vue | 0 .../morecharts}/LineChart.vue | 0 .../morecharts}/PanelGroup.vue | 0 .../morecharts}/PieChart.vue | 0 .../morecharts}/mixins/resize.js | 0 src/views/dashboard/components/PanelGroup.vue | 127 ++++++---- src/views/dashboard/index.vue | 66 +++++- src/views/report/components/BarChart.vue | 146 ------------ src/views/report/components/mixins/resize.js | 55 ----- src/views/report/month.vue | 221 +++++++++-------- src/views/report/park.vue | 221 +++++++++-------- src/views/report/time.vue | 224 ++++++++++-------- 15 files changed, 497 insertions(+), 581 deletions(-) rename src/{views/dashboard/components => components/morecharts}/BarChart.vue (100%) rename src/{views/report/components => components/morecharts}/LineChart.vue (100%) rename src/{views/report/components => components/morecharts}/PanelGroup.vue (100%) rename src/{views/report/components => components/morecharts}/PieChart.vue (100%) rename src/{views/dashboard/components => components/morecharts}/mixins/resize.js (100%) delete mode 100644 src/views/report/components/BarChart.vue delete mode 100644 src/views/report/components/mixins/resize.js diff --git a/.env.development b/.env.development index 6c00342..5a5271d 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ ENV = 'development' # base api -VUE_APP_BASE_API = http://bd-fangke.ali251.langye.net -VUE_APP_UPLOAD_API = http://bd-fangke.ali251.langye.net/api/admin/upload-file +VUE_APP_BASE_API = https://bd-fangke.ali251.langye.net +VUE_APP_UPLOAD_API = https://bd-fangke.ali251.langye.net/api/admin/upload-file diff --git a/.env.production b/.env.production index f837c50..80bba44 100644 --- a/.env.production +++ b/.env.production @@ -2,5 +2,5 @@ ENV = 'production' # base api -VUE_APP_BASE_API = http://starter.ali251.langye.net -VUE_APP_UPLOAD_API =http://starter.ali251.langye.net/api/admin/upload-file \ No newline at end of file +VUE_APP_BASE_API = https://starter.ali251.langye.net +VUE_APP_UPLOAD_API =https://starter.ali251.langye.net/api/admin/upload-file \ No newline at end of file diff --git a/src/api/report/index.js b/src/api/report/index.js index 7571f63..db8a51c 100644 --- a/src/api/report/index.js +++ b/src/api/report/index.js @@ -1,8 +1,8 @@ import request from "@/utils/request"; -export function carList(params){ +export function monthList(params){ return request({ - url:'/api/admin/study/index', + url:'/api/admin/chart/month', method:'get', params }) @@ -10,15 +10,15 @@ export function carList(params){ export function timeList(params){ return request({ - url:'/api/admin/study/index', + url:'/api/admin/chart/time', method:'get', params }) } -export function monthList(params){ +export function carList(params){ return request({ - url:'/api/admin/study/index', + url:'/api/admin/chart/car', method:'get', params }) diff --git a/src/views/dashboard/components/BarChart.vue b/src/components/morecharts/BarChart.vue similarity index 100% rename from src/views/dashboard/components/BarChart.vue rename to src/components/morecharts/BarChart.vue diff --git a/src/views/report/components/LineChart.vue b/src/components/morecharts/LineChart.vue similarity index 100% rename from src/views/report/components/LineChart.vue rename to src/components/morecharts/LineChart.vue diff --git a/src/views/report/components/PanelGroup.vue b/src/components/morecharts/PanelGroup.vue similarity index 100% rename from src/views/report/components/PanelGroup.vue rename to src/components/morecharts/PanelGroup.vue diff --git a/src/views/report/components/PieChart.vue b/src/components/morecharts/PieChart.vue similarity index 100% rename from src/views/report/components/PieChart.vue rename to src/components/morecharts/PieChart.vue diff --git a/src/views/dashboard/components/mixins/resize.js b/src/components/morecharts/mixins/resize.js similarity index 100% rename from src/views/dashboard/components/mixins/resize.js rename to src/components/morecharts/mixins/resize.js diff --git a/src/views/dashboard/components/PanelGroup.vue b/src/views/dashboard/components/PanelGroup.vue index ffc9509..a866905 100644 --- a/src/views/dashboard/components/PanelGroup.vue +++ b/src/views/dashboard/components/PanelGroup.vue @@ -3,26 +3,29 @@
- 营业统计 + 普通访客
-
服务金额
+
总人数/总入厂人数
- {{totaldata.business.server_money_total}} + 3000 + 1500
-
-
- {{totaldata.business.nurse_money_total}} - 护工金额 -
-
- {{totaldata.business.remain_money_total}} - 留存金额 -
+
核销比：50%
+
+
+
+
今日人数/今日入厂人数
+
+
+
+ 80 + 40
+
核销比：50%
@@ -30,33 +33,34 @@
- 人效统计 + 施工访客
-
总服务时长
-
-
-
- {{totaldata.person_efficiency.server_time_total}} - 分钟 -
-
-
- - {{totaldata.person_efficiency.expect}} - 照护人员数 -
-
- {{totaldata.person_efficiency.act}} - 天数 -
-
-
+
总人数/总核销人数
+
+
+
+ 3000 + 1500 +
+
核销比：50%
+
+
+
+
今日人数/今日核销人数
+
+
+
+ 80 + 40 +
+
核销比：50%
+
-
+
- 订单统计 + 物流车辆
-
服务订单
-
-
-
{{totaldata.order.server_total}}单 -
-
-
- {{totaldata.order.cycle_total}} - 周期性订单 -
-
- {{totaldata.order.unit_total}} - 单次订单 -
-
-
+
总预约数/总核销人数
+
+
+
+ 3000 + 1500 +
+
核销比：50%
+
+
+
+
今日预约数/今日核销人数
+
+
+
+ 80 + 40 +
+
核销比：50%
+
+ +
@@ -196,7 +206,7 @@ width: 33%; margin-left: 0.5%; margin-right: 0.5%; - margin-bottom: 2.375rem; + // margin-bottom: 2.375rem; box-shadow: 0px 8px 15px 0px rgba(212, 84, 32, 0.3100); border-radius: 8px; box-sizing: border-box; @@ -263,6 +273,12 @@ font-family: Arial; font-weight: 400; color: #FFFFFF; + display: flex; + justify-content: space-around; + } + + .per { + // padding: } } @@ -289,6 +305,13 @@ margin-top: 1.25rem; } + .blinefull { + height: 0.2rem; + background: rgba(255, 255, 255, .3); + width: 100%; + margin-top: 1.25rem; + } + .box2 { background: linear-gradient(134deg, #9193BC, #B7B9D4); diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue index 6f5c554..7f58d0e 100644 --- a/src/views/dashboard/index.vue +++ b/src/views/dashboard/index.vue @@ -1,20 +1,28 @@ diff --git a/src/views/report/components/mixins/resize.js b/src/views/report/components/mixins/resize.js deleted file mode 100644 index 234953b..0000000 --- a/src/views/report/components/mixins/resize.js +++ /dev/null @@ -1,55 +0,0 @@ -import { debounce } from '@/utils' - -export default { - data() { - return { - $_sidebarElm: null, - $_resizeHandler: null - } - }, - mounted() { - this.$_resizeHandler = debounce(() => { - if (this.chart) { - this.chart.resize() - } - }, 100) - this.$_initResizeEvent() - this.$_initSidebarResizeEvent() - }, - beforeDestroy() { - this.$_destroyResizeEvent() - this.$_destroySidebarResizeEvent() - }, - // to fixed bug when cached by keep-alive - // https://github.com/PanJiaChen/vue-element-admin/issues/2116 - activated() { - this.$_initResizeEvent() - this.$_initSidebarResizeEvent() - }, - deactivated() { - this.$_destroyResizeEvent() - this.$_destroySidebarResizeEvent() - }, - methods: { - // use $_ for mixins properties - // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential - $_initResizeEvent() { - window.addEventListener('resize', this.$_resizeHandler) - }, - $_destroyResizeEvent() { - window.removeEventListener('resize', this.$_resizeHandler) - }, - $_sidebarResizeHandler(e) { - if (e.propertyName === 'width') { - this.$_resizeHandler() - } - }, - $_initSidebarResizeEvent() { - this.$_sidebarElm = document.getElementsByClassName('sidebar-container')[0] - this.$_sidebarElm && this.$_sidebarElm.addEventListener('transitionend', this.$_sidebarResizeHandler) - }, - $_destroySidebarResizeEvent() { - this.$_sidebarElm && this.$_sidebarElm.removeEventListener('transitionend', this.$_sidebarResizeHandler) - } - } -} diff --git a/src/views/report/month.vue b/src/views/report/month.vue index a700f17..ef20da6 100644 --- a/src/views/report/month.vue +++ b/src/views/report/month.vue @@ -1,145 +1,158 @@