From a6d3136487d53ee583754040077a40af998f5ef2 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Mon, 7 Jul 2025 15:28:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/extensions.json         |  5 ++++-
 src/views/audit/refundAudit.vue |  8 +++----
 src/views/workspace/index.vue   | 49 ++++++++++++++++++++++++++---------------
 3 files changed, 38 insertions(+), 24 deletions(-)

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 @@
       </el-table-column>
       <el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip /><!-- 当内容过长被隐藏时显示 tooltip -->
       <el-table-column prop="adminName" label="提交人" width="120" />
-      <el-table-column v-if="checkTab === 'reject'" prop="rejectReason" label="驳回理由" width="150"
-        show-overflow-tooltip />
+      <el-table-column v-if="checkTab === 'reject'" prop="rejectReason" label="驳回理由" width="150" show-overflow-tooltip />
       <el-table-column v-if="checkTab !== 'pending'" prop="auditName" label="审核人" width="120" />
       <el-table-column prop="createTime" label="提交时间" width="180" sortable="custom">
         <template #default="{ row }">
@@ -136,9 +135,8 @@
 
   <el-dialog v-model="rejectDialogVisible" title="驳回理由" width="500px">
     <el-form>
-      <el-form-item label="驳回理由">
-        <el-input v-model="rejectReason" type="textarea" :rows="4" placeholder="请输入驳回理由" maxlength="200"
-          show-word-limit />
+      <el-form-item label="驳回理由" required>
+        <el-input v-model="rejectReason" type="textarea" :rows="4" placeholder="请输入驳回理由" maxlength="200" show-word-limit/>
       </el-form-item>
     </el-form>
     <template #footer>
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 @@
                 <el-button @click="getMonth()" label="month">本月</el-button>
                 <el-button @click="getYear()" label="year">本年</el-button>
               </div>
-              <el-date-picker v-model="dateRange" type="datetimerange" range-separator="→" start-placeholder="开始时间"
-                end-placeholder="结束时间" style="margin-left:10px" />
+              <!-- 设置日期选择器的显示和绑定值格式 -->
+              <el-date-picker 
+                v-model="dateRange" 
+                type="datetimerange" 
+                range-separator="→" 
+                start-placeholder="开始时间"
+                end-placeholder="结束时间" 
+                style="margin-left:10px"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
               <el-button type="primary" style="margin-left: 5px" @click="getChartData">查询</el-button>
             </el-row>
           </el-col>
@@ -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月 + 免费 + 任务)