diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index a7cea0b..1313914 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,3 +1,6 @@
{
- "recommendations": ["Vue.volar"]
+ "recommendations": [
+ "Vue.volar",
+ "caixw.statistic"
+ ]
}
diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue
index eedf247..b65c382 100644
--- a/src/views/audit/refundAudit.vue
+++ b/src/views/audit/refundAudit.vue
@@ -98,8 +98,7 @@
-
+
@@ -136,9 +135,8 @@
-
-
+
+
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 6b44032..3ba9f5a 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -143,8 +143,17 @@
本月
本年
-
+
+
查询
@@ -244,35 +253,39 @@ const formatDate = function(date) {
}
// 今天
const getToday = function () {
- const today = new Date()
- const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate())
- const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
- dateRange.value = [formatDate(startTime), formatDate(endTime)]
+ const today = dayjs()
+ const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+ const endTime = today.add(1,'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+ dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
+ getChartData()
}
// 本周
const getWeek = function () {
- const today = new Date()
- const startTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() - 6)
- const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1)
- dateRange.value = [formatDate(startTime), formatDate(endTime)]
+ const today = dayjs()
+ const startTime = (today.startOf('week').add(1,'day')).format('YYYY-MM-DD HH:mm:ss')
+ const endTime = today.add(1,'week').startOf('week').add(1,'day').format('YYYY-MM-DD HH:mm:ss')
+ dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
+ getChartData()
}
// 本月
const getMonth = function () {
- const today = new Date()
- const startTime = new Date(today.getFullYear(), today.getMonth(), 1)
- const endTime = new Date(today.getFullYear(), today.getMonth() + 1, 1)
- dateRange.value = [formatDate(startTime), formatDate(endTime)]
+ const today = dayjs()
+ const startTime = today.startOf('month').format('YYYY-MM-DD HH:mm:ss')
+ const endTime = today.add(1,'month').startOf('month').format('YYYY-MM-DD HH:mm:ss')
+ dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
+ getChartData()
}
// 本年
const getYear = function () {
- const today = new Date()
- const startTime = new Date(today.getFullYear(), 0, 1)
- const endTime = new Date(today.getFullYear() + 1, 0, 1)
- dateRange.value = [formatDate(startTime), formatDate(endTime)]
+ const today = dayjs()
+ const startTime = today.startOf('year').format('YYYY-MM-DD HH:mm:ss')
+ const endTime = today.add(1,'year').startOf('year').format('YYYY-MM-DD HH:mm:ss')
+ dateRange.value = [startTime, endTime]
console.log('看看dateRange', dateRange.value)
+ getChartData()
}
// 要加上所有市场的,还有额外计算的(总数 = 永久 + 6月 + 12月 + 免费 + 任务)