fix(广告列表): 修复广告列表中查询时间错误的BUG

src/components/common/WithIconSelect.vue

@@ -2,7 +2,7 @@
 import type { DropdownInstance } from 'element-plus'
 import type { IconDropdownItem } from '@/types/dataAnalysis'
 
-import { onMounted, ref, reactive, watch } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { initLoadResource } from '@/utils/resource'
 import { useCommonStore } from '@/stores/useCommon'
 

src/components/dataAnalysis/TemporalTrend.vue

@@ -15,8 +15,8 @@
 -->
 
 <script setup lang="ts">
-import type { TemporalTrendProps, OptionsProps, StaticField, ReqConfig } from '@/types/dataAnalysis'
-import type { TablePaginationSetting, TableFieldInfo } from '@/types/table'
+import type { OptionsProps, ReqConfig, StaticField, TemporalTrendProps } from '@/types/dataAnalysis'
+import type { TableFieldInfo, TablePaginationSetting } from '@/types/table'
 
 import { nextTick, onMounted, reactive, ref, watch } from 'vue'
 

src/components/echarts/TimeLineChart.vue

@@ -1,8 +1,7 @@
 <script setup lang="ts">
 import type { OptionsProps } from '@/types/dataAnalysis'
 
-import { onMounted, ref, shallowRef, watch, useAttrs } from 'vue'
-import { nextTick } from 'vue'
+import { nextTick, onMounted, ref, shallowRef, useAttrs, watch } from 'vue'
 import { debounceFunc } from '@/utils/common'
 
 import echarts from '.'

src/components/echarts/index.ts

@@ -2,19 +2,19 @@
 import * as echarts from 'echarts/core'
 
 // 引入柱状图和饼状图图表，图表后缀都为 Chart，具体为 图标名称+Chart （注意图标名称为首字母大写）
-import { BarChart, PieChart, LineChart } from 'echarts/charts'
+import { BarChart, LineChart, PieChart } from 'echarts/charts'
 
 // 引入提示框，标题，直角坐标系，数据集，内置数据转换器组件，组件后缀都为 Component
 import {
-  TitleComponent,
-  TooltipComponent,
-  GridComponent,
-  ToolboxComponent,
-  LegendComponent,
   DatasetComponent,
-  TransformComponent,
+  DataZoomInsideComponent,
   DataZoomSliderComponent,
-  DataZoomInsideComponent
+  GridComponent,
+  LegendComponent,
+  TitleComponent,
+  ToolboxComponent,
+  TooltipComponent,
+  TransformComponent
 } from 'echarts/components'
 // 标签自动布局，全局过渡动画等特性
 import { LabelLayout, UniversalTransition } from 'echarts/features'

src/components/form/CustomForm.vue

@@ -9,7 +9,6 @@
 <script setup lang="ts">
 import type { FormInstance } from 'element-plus'
 import type { FormConfig } from '@/types/form'
-
 import { FormFieldType } from '@/types/form'
 import { reactive, ref } from 'vue'
 import { useForm } from '@/hooks/useForm'

src/components/form/FileUpload.vue

@@ -8,9 +8,9 @@
 -->
 <script setup lang="ts">
 import type { UploadInstance, UploadRawFile, UploadUserFile } from 'element-plus'
+import { ElMessage, genFileId } from 'element-plus'
 
 import { reactive, ref } from 'vue'
-import { ElMessage, genFileId } from 'element-plus'
 
 interface UploadProps {
   title: string
@@ -83,7 +83,8 @@ const confirmUpload = () => {
 
 /**
  * @description:处理超出文件数量限制后的方法，这里是直接覆盖掉
- * @param {*} files 上传的文件
+ * @param  files 上传的文件
+ * @param  _uploadFiles 上传的文件
  */
 const handleExceed = (files: File[], _uploadFiles: UploadUserFile[]) => {
   uploadRef.value!.clearFiles()

src/components/table/TableFilterForm/TableFilterForm.vue

@@ -8,6 +8,7 @@ import { Filter } from '@element-plus/icons-vue'
 import { useCustomFilter } from '@/hooks/useCustomFilter.ts'
 import CustomFilter from '../../form/CustomFilter.vue'
 import { throttleFunc } from '@/utils/common'
+
 type CustomFilterRef = InstanceType<typeof CustomFilter>
 
 interface TableFilterFormData {

src/components/table/TableTools.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
-import type { TableFieldInfo } from '@/types/table'
-import type { TableToolsConfig } from '@/types/table'
+import type { TableFieldInfo, TableToolsConfig } from '@/types/table'
 
 interface TableToolsProps {
   // 工具栏配置

src/hooks/useCustomFilter.ts

@@ -1,4 +1,5 @@
 import type { Reactive, Ref } from 'vue'
+import { nextTick, reactive, ref } from 'vue'
 import type {
   CustomFilter as CustomFilterInfo,
   DatePickerCustomFilter,
@@ -6,10 +7,8 @@ import type {
   InputCustomFilter,
   SelectCustomFilter
 } from '@/types/customFilter.ts'
-import type { QueryInfo } from '@/types/table.ts'
-
-import { nextTick, reactive, ref } from 'vue'
 import { CustomFilterValueType } from '@/types/customFilter.ts'
+import type { QueryInfo } from '@/types/table.ts'
 
 import CustomFilter from '@/components/form/CustomFilter.vue'
 

src/hooks/useForm.ts

@@ -8,7 +8,6 @@
  *
  */
 import type { FormInstance } from 'element-plus'
-
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { nextTick } from 'vue'
 import { useRequest } from './useRequest'

src/hooks/useRequest.ts

@@ -9,9 +9,9 @@
 
 import type { AxiosResponse } from 'axios'
 import type { ResponseInfo } from '@/types/res'
+import { MessageType } from '@/types/res'
 
 import { ElMessage } from 'element-plus'
-import { MessageType } from '@/types/res'
 import BASE_URL from '../../config/api'
 
 import 'element-plus/theme-chalk/el-message.css'

src/hooks/useTableChart.ts

@@ -74,11 +74,8 @@ export function useTableChart(
       const params = {} as any
       Object.assign(params, queryFormData.value)
       if (queryFormData.value.createTime) {
-        params.createTime = queryFormData.value.createTime
-          .map((item: any) => {
-            return new Date(item).getTime().toString()
-          })
-          .join(',')
+        console.log(queryFormData.value.createTime)
+        params.createTime = queryFormData.value.createTime.join(',')
       }
 
       const res = (await axiosInstance.post(url, params)) as ResponseInfo

src/hooks/useUserBehaviorChart.ts

@@ -5,7 +5,9 @@ import type { ResponseInfo } from '@/types/res.ts'
 import type { QueryInfo } from '@/types/table.ts'
 import { generateUniqueColors } from '@/utils/common'
 import PieBorderRadius from '@/components/echarts/PieBorderRadius.vue'
+
 type MChartType = InstanceType<typeof PieBorderRadius>
+
 interface UserBehaviorChartItem {
   name: string
   value: number
@@ -62,13 +64,13 @@ export function useUserBehaviorChart(
 
       const params = {} as any
       Object.assign(params, queryFormData.value)
-      if (queryFormData.value.createTime) {
-        params.createTime = queryFormData.value.createTime
-          .map((item: any) => {
-            return new Date(item).getTime().toString()
-          })
-          .join(',')
-      }
+      // if (queryFormData.value.createTime) {
+      //   params.createTime = queryFormData.value.createTime
+      //     .map((item: any) => {
+      //       return new Date(item).getTime().toString()
+      //     })
+      //     .join(',')
+      // }
 
       const res = (await axiosInstance.post(url, params)) as ResponseInfo
       if (res.code !== 0) {

src/router/appManage.ts

@@ -7,7 +7,8 @@
  * @Description:
  *
  */
-import type { RouteLocationNormalized, NavigationGuardNext } from 'vue-router'
+import type {NavigationGuardNext, RouteLocationNormalized} from 'vue-router'
+
 export default [
   {
     path: '/appManage',

src/router/home.ts

@@ -6,7 +6,8 @@
  * @Description:
  *
  */
-import type { RouteLocationNormalized, NavigationGuardNext } from 'vue-router'
+import type { NavigationGuardNext, RouteLocationNormalized } from 'vue-router'
+
 export default [
   {
     path: '/home',

src/router/login.ts

@@ -7,9 +7,10 @@
  * @Description:
  *
  */
-import type { RouteLocationNormalized, NavigationGuardNext } from 'vue-router'
+import type {NavigationGuardNext, RouteLocationNormalized} from 'vue-router'
+
+import {getLoginState} from '@/utils/localStorage/localStorage'
 
-import { getLoginState } from '@/utils/localStorage/localStorage'
 export default [
   {
     path: '/login',

src/types/dialog.ts

@@ -7,9 +7,9 @@
  * @Description:
  *
  */
-import type { FormRules } from 'element-plus'
-import type { ReqConfig } from './dataAnalysis'
-import type { FormField } from './form'
+import type {FormRules} from 'element-plus'
+import type {ReqConfig} from './dataAnalysis'
+import type {FormField} from './form'
 
 export interface DialogConfig {
   title: string

src/utils/axios/auth.ts

@@ -8,9 +8,9 @@
  *
  */
 
-import { ElMessage } from 'element-plus'
-import { MessageType } from '@/types/res'
-import { getLoginState } from '../localStorage/localStorage'
+import {ElMessage} from 'element-plus'
+import {MessageType} from '@/types/res'
+import {getLoginState} from '../localStorage/localStorage'
 
 export const authLogin = (): boolean => {
   const state = getLoginState()

src/utils/axios/axiosInstance.ts

@@ -12,7 +12,7 @@
 import { ElMessage } from 'element-plus'
 import { useRequest } from '@/hooks/useRequest'
 import { MessageType } from '@/types/res'
-import { getToken, refreshToken, setToken, removeAllToken } from '../token/token'
+import { getToken, refreshToken, removeAllToken, setToken } from '../token/token'
 import { setLoginState } from '../localStorage/localStorage'
 
 import axios from 'axios'

src/utils/common/index.ts

@@ -148,6 +148,30 @@ export const formatTimestamp = (timestamp: number, isMilliseconds: boolean = fal
 }
 
 /**
+ * 获取时间戳范围，时间戳从0:00开始，到23:59结束
+ * @param dateRange 日期范围
+ */
+export function getRangeTimestamps(dateRange: Date[]): [number, number] {
+  const [startDate, endDate] = dateRange
+
+  // 确保日期有效
+  if (isNaN(startDate.getTime()) || isNaN(endDate.getTime())) {
+    throw new Error('Invalid date')
+  }
+
+  // 设置开始日期为当天 UTC 00:00:00
+  const rangeStart = new Date(startDate)
+  rangeStart.setHours(0, 0, 0, 0)
+
+  // 设置结束日期为当天 UTC 23:59:59.999
+  const rangeEnd = new Date(endDate)
+  rangeEnd.setHours(23, 59, 59, 999)
+
+  // 返回时间戳
+  return [rangeStart.getTime(), rangeEnd.getTime()]
+}
+
+/**
  * 复制文字到剪贴板
  *
  * @param {string} text

src/views/AppManage/BaseInfoView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive, onMounted, ref, watch } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { initLoadResource } from '@/utils/resource'
 import { copyText } from '@/utils/common'
 import { useRequest } from '@/hooks/useRequest'

src/views/AppManage/EventDetailsView.vue

@@ -8,15 +8,14 @@
 -->
 <script setup lang="ts">
 import type { ReqConfig } from '@/types/dataAnalysis'
-import type { FormField, FormConfig } from '@/types/form'
-import type { FormRules } from 'element-plus'
-import type { DialogConfig } from '@/types/dialog'
-import type { TablePaginationSetting, TableFieldInfo, TableToolsConfig } from '@/types/table'
-
+import type { FormConfig, FormField } from '@/types/form'
 import { FormFieldType } from '@/types/form'
+import type { FormRules } from 'element-plus'
 import { ElMessageBox } from 'element-plus'
+import type { DialogConfig } from '@/types/dialog'
+import type { TableFieldInfo, TablePaginationSetting, TableToolsConfig } from '@/types/table'
 import { FieldSpecialEffectType, TextType } from '@/types/tableText'
-import { watch, onUnmounted, reactive, ref } from 'vue'
+import { onUnmounted, reactive, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useRequest } from '@/hooks/useRequest'
 import { useCommonStore } from '@/stores/useCommon'

src/views/AppManage/EventMangeTable.vue

@@ -11,19 +11,19 @@ import type { ReqConfig } from '@/types/dataAnalysis'
 import type { FormRules } from 'element-plus'
 import type { DialogConfig } from '@/types/dialog'
 import type {
-  TablePaginationSetting,
-  TableFieldInfo,
   QueryInfo,
   SelectInfo,
+  TableFieldInfo,
+  TablePaginationSetting,
   TableToolsConfig
 } from '@/types/table'
+import { FilterType } from '@/types/table'
 import type { FormField } from '@/types/form'
+import { FormFieldType } from '@/types/form'
 
 import { useRequest } from '@/hooks/useRequest'
 import { useCommonStore } from '@/stores/useCommon'
-import { FilterType } from '@/types/table'
 import { FieldSpecialEffectType, TextType } from '@/types/tableText'
-import { FormFieldType } from '@/types/form'
 import { reactive, ref, watch } from 'vue'
 
 import Table from '@/components/table/CustomTable.vue'

src/views/AppManage/UserConversionDetail.vue

@@ -7,8 +7,8 @@
  * 
 -->
 <script setup lang="ts">
-import { FormFieldType } from '@/types/form'
 import type { FormField, ValueTypes } from '@/types/form'
+import { FormFieldType } from '@/types/form'
 
 import { useRequest } from '@/hooks/useRequest'
 import { reactive, ref } from 'vue'

src/views/Home/AdvertisingData/AdvertisingList.vue

@@ -2,14 +2,6 @@
  * @Author: fxs bjnsfxs@163.com
  * @Date: 2024-11-29
  * @LastEditors: fxs bjnsfxs@163.com
- * @LastEditTime: 2024-12-07
- * @Description: 
- * 
--->
-<!--
- * @Author: fxs bjnsfxs@163.com
- * @Date: 2024-11-29
- * @LastEditors: fxs bjnsfxs@163.com
  * @LastEditTime: 2024-12-03
  * @Description: 
  * 
@@ -34,7 +26,12 @@ import TableFilterForm from '@/components/table/TableFilterForm/TableFilterForm.
 import { useTableChart } from '@/hooks/useTableChart.ts'
 import { usePage } from '@/hooks/usePage.ts'
 import PieBorderRadius from '@/components/echarts/PieBorderRadius.vue'
-import { createDateRange, formatDate } from '@/utils/common'
+import {
+  createDateRange,
+  formatDate,
+  getRangeTimestamps,
+  resetTimeToMidnight
+} from '@/utils/common'
 import { FieldSpecialEffectType, TextType } from '@/types/tableText.ts'
 import { useAnalysis } from '@/hooks/useAnalysis.ts'
 
@@ -236,22 +233,22 @@ const filterInfo = reactive<Array<QueryInfo>>([
     otherOption: adTypeOptions,
     default: '',
     clearable: true
-  },
-  {
-    name: 'createTime',
-    label: '创建时间',
-    type: FilterType.DATE,
-    placeholder: '选择日期',
-    otherOption: {
-      dataRange: true
-    }
   }
+  // {
+  //   name: 'createTime',
+  //   label: '创建时间',
+  //   type: FilterType.DATE,
+  //   placeholder: '选择日期',
+  //   otherOption: {
+  //     dataRange: true
+  //   }
+  // }
 ])
 
 const headerCardInfo: HeaderCardProps = {
   // title: '广告数据(正式服数据)',
   title: '广告数据',
-  openDateSelect: false
+  openDateSelect: true
 }
 
 interface ChartQuery {
@@ -304,6 +301,20 @@ const updateAllReq = (pf: string[], gid: string) => {
   // updateReqConfig(keepDataTableInfo.requestConfig, { pf, gid })
 }
 
+/**
+ * 更新请求配置
+ * @param {*} date 新的日期
+ */
+const changeDate = (date: Array<Date>) => {
+  updateReqConfig(requestConfig, {
+    startTime: resetTimeToMidnight(date[0]),
+    endTime: resetTimeToMidnight(date[1])
+  })
+  const timeRange = getRangeTimestamps(date).map((item) => item.toString())
+  queryFormData.value.createTime = [timeRange[0], timeRange[1]]
+  updateChartData()
+}
+
 const { watchPageChange } = usePage()
 
 const backupSelect = reactive([])
@@ -331,6 +342,7 @@ const { updateChartData, chartOptions } = useTableChart(
         :title="headerCardInfo.title"
         :open-date-select="headerCardInfo.openDateSelect"
         :is-radio="isRadioPf"
+        @change-date="changeDate"
       ></HeaderCard>
     </div>
     <div class="adTableContent">

src/views/Home/Analysis/EventAnalysisDetail.vue

@@ -8,7 +8,7 @@
  * 
 -->
 <script setup lang="ts">
-import type { TablePaginationSetting, TableFieldInfo } from '@/types/table'
+import type { TableFieldInfo, TablePaginationSetting } from '@/types/table'
 import type {
   ReqConfig,
   ResDataFieldInfo,

src/views/Home/Analysis/EventAnalysisTable.vue

@@ -9,12 +9,11 @@
 <script setup lang="ts">
 import type { ReqConfig } from '@/types/dataAnalysis'
 import type {
-  TablePaginationSetting,
-  TableFieldInfo,
   QueryInfo,
+  TableFieldInfo,
+  TablePaginationSetting,
   TableToolsConfig
 } from '@/types/table'
-
 import { FilterType } from '@/types/table'
 import { reactive, ref } from 'vue'
 import { useRequest } from '@/hooks/useRequest'

src/views/Home/Analysis/KeepView.vue

@@ -7,8 +7,8 @@
  * 
 -->
 <script setup lang="ts">
-import type { TablePaginationSetting, TableFieldInfo } from '@/types/table'
-import type { ReqConfig, HeaderCardProps } from '@/types/dataAnalysis'
+import type { TableFieldInfo, TablePaginationSetting } from '@/types/table'
+import type { HeaderCardProps, ReqConfig } from '@/types/dataAnalysis'
 
 import { reactive, ref, toRaw } from 'vue'
 import { resetTimeToMidnight } from '@/utils/common'

src/views/Home/Analysis/UserTrendView.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { StaticField, ReqConfig, TemporalTrendInfo } from '@/types/dataAnalysis'
-import type { TablePaginationSetting, TableFieldInfo } from '@/types/table'
+import type { ReqConfig, StaticField, TemporalTrendInfo } from '@/types/dataAnalysis'
+import type { TableFieldInfo, TablePaginationSetting } from '@/types/table'
 
 import { reactive, ref, toRaw } from 'vue'
 import { useCommonStore } from '@/stores/useCommon'

src/views/Home/InfoManage/GameManageView.vue

@@ -7,16 +7,20 @@
  * 
 -->
 <script setup lang="ts">
-import type { TablePaginationSetting, TableFieldInfo, QueryInfo } from '@/types/table'
+import type {
+  QueryInfo,
+  TableFieldInfo,
+  TablePaginationSetting,
+  TableToolsConfig
+} from '@/types/table'
+import { FilterType } from '@/types/table'
 import type { FormRules } from 'element-plus'
 import type { DialogConfig } from '@/types/dialog'
 import type { FormField } from '@/types/form'
-import type { TableToolsConfig } from '@/types/table'
+import { FormFieldType } from '@/types/form'
 import type { ResponseInfo } from '@/types/res.ts'
 
 import { FieldSpecialEffectType } from '@/types/tableText.ts'
-import { FormFieldType } from '@/types/form'
-import { FilterType } from '@/types/table'
 import { onMounted, reactive, ref } from 'vue'
 import { useRequest } from '@/hooks/useRequest'
 import { useCommonStore } from '@/stores/useCommon'

src/views/Home/InfoManage/PlayerManageView.vue

@@ -7,15 +7,15 @@
  * 
 -->
 <script setup lang="ts">
-import type { TablePaginationSetting, TableFieldInfo, TableToolsConfig } from '@/types/table'
+import type { TableFieldInfo, TablePaginationSetting, TableToolsConfig } from '@/types/table'
 import type { FormRules } from 'element-plus'
+import { ElMessageBox } from 'element-plus'
 import type { FormField } from '@/types/form'
+import { FormFieldType } from '@/types/form'
 import type { DialogConfig } from '@/types/dialog'
 
 import { FieldSpecialEffectType, TagType, TextType } from '@/types/tableText'
 import { reactive, ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
-import { FormFieldType } from '@/types/form'
 import { useRequest } from '@/hooks/useRequest'
 import { useCommonStore } from '@/stores/useCommon'
 import { useAnalysis } from '@/hooks/useAnalysis'

src/views/Home/Overview/OverView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { StaticField, ReqConfig, TemporalTrendInfo } from '@/types/dataAnalysis'
+import type { ReqConfig, StaticField, TemporalTrendInfo } from '@/types/dataAnalysis'
 
 import { reactive, ref, toRaw } from 'vue'
 import { useCommonStore } from '@/stores/useCommon'

src/views/IndexView.vue

@@ -10,9 +10,8 @@
 import type { DropDownInfo } from '@/types/dataAnalysis'
 
 import { zhCn } from 'element-plus/es/locales.mjs'
-import { RouterView } from 'vue-router'
-import { onMounted, reactive, ref, computed, watch } from 'vue'
-import { useRoute } from 'vue-router'
+import { RouterView, useRoute } from 'vue-router'
+import { computed, onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import { getAllGameInfo } from '@/utils/table/table'
 

src/views/Login/LoginView.vue

@@ -12,7 +12,7 @@ import type { RuleInfo } from '@/types/input'
 import { onMounted, reactive, ref } from 'vue'
 import { useRequest } from '@/hooks/useRequest'
 import { initLoadResource } from '@/utils/resource'
-import { setToken, setRefreshToken } from '@/utils/token/token'
+import { setRefreshToken, setToken } from '@/utils/token/token'
 import { setLoginState } from '@/utils/localStorage/localStorage'
 
 import router from '@/router'