refactor:时间改为00:00:00-23:59:59

src/views/audit/gold/rechargeAudit.vue

@@ -195,6 +195,7 @@ import moment from 'moment'
 import {useAdminStore} from "@/store/index.js";
 import {storeToRefs} from "pinia";
 import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
+import dayjs from "dayjs";
 // 精网号去空格
 const trimJwCode = () => {
   if (rechargeAudit.value.jwcode) {
@@ -389,17 +390,10 @@ const resetSearch = function () {
 
 // 今天
 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
-  )
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
+
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -409,18 +403,11 @@ const getToday = function () {
 
 // 昨天
 const getYesterday = function () {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-  const startTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate()
-  )
-  const endTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate() + 1
-  )
+
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
@@ -430,17 +417,10 @@ const getYesterday = function () {
 
 // 近7天
 const get7Days = 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
-  )
+
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/audit/gold/refundAudit.vue

@@ -336,6 +336,7 @@ const get = async function (val) {
 import {useAdminStore} from "@/store/index.js";
 import {storeToRefs} from "pinia";
 import {findMenuById, permissionMapping} from "@/utils/menuTreePermission.js"
+import dayjs from "dayjs";
 
 const adminStore = useAdminStore();
 const {menuTree} = storeToRefs(adminStore);
@@ -450,9 +451,9 @@ const resetSearch = function () {
 
 // 今天
 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)
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -465,10 +466,9 @@ const getToday = function () {
 
 // 昨天
 const getYesterday = function () {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-  const startTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate())
-  const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1)
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
@@ -480,9 +480,9 @@ const getYesterday = function () {
 
 // 近7天
 const get7Days = 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)
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('dateRange', dateRange.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/consume/gold/coinConsumeDetail.vue

@@ -287,17 +287,9 @@ const reset = function () {
 }
 // 今天
 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
-  )
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -306,18 +298,9 @@ const getToday = function () {
 }
 // 昨天
 const getYesterday = function () {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-  const startTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate()
-  )
-  const endTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate() + 1
-  )
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
@@ -326,17 +309,9 @@ const getYesterday = function () {
 }
 // 近7天
 const get7Days = 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
-  )
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/permissions/permission.vue

@@ -1378,24 +1378,6 @@ onMounted(async function () {
               </div>
             </template>
           </el-table-column>
-          <!-- <el-table-column prop="operation" label="操作" width="200px">
-            <template #default="scope">
-              <el-popconfirm title="确定将此角色删除吗？" @confirm="delRoleConfirm">
-                <template #reference>
-                  <el-button type="danger" text @click="delRole(scope.row)"
-                    :disabled="scope.row.id === 1 || scope.row.id === 2">
-                    删除
-                  </el-button>
-                </template>
-                <template #actions="{ confirm, cancel }">
-                  <el-button size="small" @click="cancel">取消</el-button>
-                  <el-button type="primary" size="small" @click="confirm">
-                    确定
-                  </el-button>
-                </template>
-              </el-popconfirm>
-            </template>
-          </el-table-column> -->
           <el-table-column prop="operation" label="操作" width="200px">
             <template #default="scope">
               <el-button type="warning" text @click="permissionEditRoleInit(scope.row)" :disabled="scope.row.id === 2">

src/views/recharge/gold/coinRechargeDetail.vue

@@ -7,6 +7,7 @@ import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http.js'
 import {marketMapping, reverseMarketMapping} from '@/utils/marketMap.js';
+import dayjs from "dayjs";
 //这是获取用户信息的接口
 const adminData = ref({})
 const getAdminData = async function () {
@@ -344,17 +345,9 @@ const reset = function () {
 }
 // 今天
 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
-  )
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -370,18 +363,9 @@ const handleCurrentChange = function (val) {
 }
 // 昨天
 const getYesterday = function () {
-  const yesterday = new Date()
-  yesterday.setDate(yesterday.getDate() - 1)
-  const startTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate()
-  )
-  const endTime = new Date(
-      yesterday.getFullYear(),
-      yesterday.getMonth(),
-      yesterday.getDate() + 1
-  )
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
@@ -390,17 +374,9 @@ const getYesterday = function () {
 }
 // 近7天
 const get7Days = 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
-  )
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态

src/views/usergold/gold/clientCountDetail.vue

@@ -8,6 +8,7 @@ import API from '@/util/http.js'
 import {writeFile, utils} from 'xlsx'
 import request from "@/util/request.js";
 import {marketMapping, reverseMarketMapping} from "../../../utils/marketMap.js";
+import dayjs from "dayjs";
 
 // 标记当前激活的时间范围按钮
 const activeTimeRange = ref('')
@@ -223,9 +224,9 @@ const search = function () {
 
 // 今天
 const getToday = function () {
-  const today = moment()
-  const startTime = today.startOf('day').toDate()
-  const endTime = today.add(1, 'days').startOf('day').toDate()
+  const today = dayjs()
+  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime =today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   activeTimeRange.value = 'today' // 标记当前激活状态
 
@@ -234,10 +235,9 @@ const getToday = function () {
 
 // 昨天
 const getYesterday = function () {
-  const today = moment()
-  const yesterday = moment().subtract(1, 'day')
-  const startTime = yesterday.startOf('day').toDate()
-  const endTime = today.startOf('day').toDate()
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
 
@@ -246,8 +246,9 @@ const getYesterday = function () {
 
 // 近7天
 const get7Days = function () {
-  const startTime = moment().subtract(6, 'day').startOf('day').toDate()
-  const endTime = moment().add(1, 'days').startOf('day').toDate()
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.add(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   activeTimeRange.value = '7days' // 标记当前激活状态
 

src/views/workspace/index.vue

@@ -232,7 +232,6 @@ import {ArrowUpBold, ArrowDownBold, SemiSelect} from '@element-plus/icons-vue'
 import {marketMapping} from "@/utils/marketMap.js";
 
 
-
 // 地区数据
 const markets = ref([])
 // 图表相关
@@ -321,7 +320,8 @@ const formatDate = function (date) {
 const getToday = function () {
   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')
+  const endTime =today.endOf('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)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -332,7 +332,8 @@ const getToday = function () {
 const getWeek = function () {
   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')
+  const endTime = today.endOf('week').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)
   activeTimeRange.value = 'week' // 标记当前激活状态
@@ -343,7 +344,8 @@ const getWeek = function () {
 const getMonth = function () {
   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')
+  // const endTime = today.add(1, 'month').startOf('month').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.endOf('month').format('YYYY-MM-DD HH:mm:ss')
   dateRange.value = [startTime, endTime]
   console.log('看看dateRange', dateRange.value)
   activeTimeRange.value = 'month' // 标记当前激活状态
@@ -354,7 +356,8 @@ const getMonth = function () {
 const getYear = function () {
   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')
+  const endTime = today.endOf('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)
   activeTimeRange.value = 'year' // 标记当前激活状态
@@ -457,7 +460,8 @@ const getMarkets = async () => {
       }
     })
     if (Array.isArray(response.data)) {
-      markets.value = response.data.filter(data => data !== "1")
+      // markets.value = response.data.filter(data => data !== "1")
+      markets.value = response.data
       console.log('市场列表获取成功:', markets.value)
     } else {
       console.error('获取市场列表失败', response)
@@ -476,12 +480,10 @@ const getChartData = async () => {
     if (!markets.value || markets.value.length === 0) {
       await getMarkets()
     }
-
     // 本年
     if (!dateRange.value || dateRange.value.length === 0) {
       getYear()
     }
-
     const params = {
       markets: markets.value,
       startDate: dateRange.value[0],
@@ -495,6 +497,7 @@ const getChartData = async () => {
     })
     console.log('看看params', params)
     if (Array.isArray(response.marketGraphs)) {
+      // const filteredGraphs = response.marketGraphs.filter(data => data.market !== "1");
       // 处理图表数据
       processChartData(response.marketGraphs)
       // 处理排名数据