From fdffb4ac507504b14687f692cecf4d69b4c43f3d Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 19 Jun 2024 18:11:39 +0800 Subject: [PATCH 1/2] add --- src/views/workbench/earnings/index.vue | 8 ++++---- src/views/workbench/index.vue | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/views/workbench/earnings/index.vue b/src/views/workbench/earnings/index.vue index 2534647..e887ab0 100644 --- a/src/views/workbench/earnings/index.vue +++ b/src/views/workbench/earnings/index.vue @@ -7,8 +7,8 @@
-
{{ item.title }}
-
{{ item.value() }}
+
{{ item.title }}
+
{{ item.value() }}
@@ -27,8 +27,8 @@
-
{{ item.title }}
-
{{ item.value() }}
+
{{ item.title }}
+
{{ item.value() }}
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 26f89ef..0462c41 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -16,8 +16,8 @@
-
{{ item.title }}
-
{{ item.value() }}
+
{{ item.title }}
+
{{ item.value() }}
@@ -27,8 +27,8 @@
-
{{ item.title }}
-
{{ item.value() }}
+
{{ item.title }}
+
{{ item.value() }}
@@ -88,10 +88,8 @@ const deteToQuery = () => { function getFirstAndLastDayOfCurrentMonth() { var today = new Date(); - var firstDay = new Date(today.getFullYear(), today.getMonth(), 1); - var lastDay = new Date(today.getFullYear(), today.getMonth() + 1, 0); - var firstDayFormatted = formatDate(firstDay); - var lastDayFormatted = formatDate(lastDay); + var firstDayFormatted = formatDate(today); + var lastDayFormatted = formatDate(today); return { firstDay: firstDayFormatted, lastDay: lastDayFormatted }; } From f341b32bf9c0e0f114cee94f99afd5defcabad69 Mon Sep 17 00:00:00 2001 From: zmj <1493694146@qq.com> Date: Wed, 19 Jun 2024 18:18:18 +0800 Subject: [PATCH 2/2] add --- src/views/workbench/index.vue | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue index 0462c41..132b1a7 100644 --- a/src/views/workbench/index.vue +++ b/src/views/workbench/index.vue @@ -33,7 +33,7 @@ - + @@ -107,7 +107,15 @@ date.value[1] = getFirstAndLastDayOfCurrentMonth().lastDay; const formData = ref({ - order_amount: 0 + order_amount: 0, + receipt_amount: 0, + income_amount: 0, + verify_amount: 0, + cashier_amount: 0, + balance_amount: 0, + user_number: 0, + cash_amount: 0, + }) @@ -184,20 +192,20 @@ const visitorOption = reactive({ }, xAxis: { type: 'category', - data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + data: [] }, yAxis: { type: 'value' }, series: [ { - data: [820, 932, 901, 934, 1290, 1330, 1320], + data: [], type: 'line', smooth: true, name: "门店收款" }, { - data: [15, 12, 14, 78, 96, 54, 85], + data: [], type: 'line', smooth: true, name: '新增用户'