Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev

# Conflicts: # src/views/crm/statistics/performance/components/ContractCountPerformance.vue # src/views/crm/statistics/performance/components/ContractPricePerformance.vue # src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue # src/views/crm/statistics/performance/index.vue
2024-05-11 22:22:27 +08:00 · 2024-05-11 22:22:27 +08:00 · 8ba6095b1b
commit 8ba6095b1b
parent 43dcefdcf0 f01dc0a539
4 changed files with 140 additions and 187 deletions
--- a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
@ -1,5 +1,4 @@
 <!-- 员工业绩统计 -->
-<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
  <!-- Echarts图 -->
  <el-card shadow="never">
@ -11,15 +10,9 @@
  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
-      <el-table-column
-        v-for="item in columnsData"
-        :key="item.prop"
-        :label="item.label"
-        :prop="item.prop"
-        align="center"
-      >
+      <el-table-column v-for="item in columnsData" :key="item.prop" :label="item.label" :prop="item.prop" align="center">
        <template #default="scope">
-          {{ scope.row[item.prop] }}
+          {{scope.row[item.prop]}}
        </template>
      </el-table-column>
    </el-table>
@ -30,7 +23,7 @@ import { EChartsOption } from 'echarts'
 import {
  StatisticsPerformanceApi,
  StatisticsPerformanceRespVO
-} from '@/api/crm/statistics/performance'
+} from "@/api/crm/statistics/performance"

 defineOptions({ name: 'ContractCountPerformance' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
@ -64,13 +57,13 @@ const echartsOption = reactive<EChartsOption>({
      data: []
    },
    {
-      name: '同比增长率（%）',
+      name: '环比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
    },
    {
-      name: '环比增长率（%）',
+      name: '同比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
@ -93,30 +86,29 @@ const echartsOption = reactive<EChartsOption>({
      type: 'shadow'
    }
  },
-  yAxis: [
-    {
-      type: 'value',
-      name: '数量（个）',
-      axisTick: {
-        show: false
-      },
-      axisLabel: {
-        color: '#BDBDBD',
-        formatter: '{value}'
-      },
-      /** 坐标轴轴线相关设置 */
-      axisLine: {
-        lineStyle: {
-          color: '#BDBDBD'
-        }
-      },
-      splitLine: {
-        show: true,
-        lineStyle: {
-          color: '#e6e6e6'
-        }
+  yAxis: [{
+    type: 'value',
+    name: '数量（个）',
+    axisTick: {
+      show: false
+    },
+    axisLabel: {
+      color: '#BDBDBD',
+      formatter: '{value}'
+    },
+    /** 坐标轴轴线相关设置 */
+    axisLine: {
+      lineStyle: {
+        color: '#BDBDBD'
      }
    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: '#e6e6e6'
+      }
+    }
+  },
    {
      type: 'value',
      name: '',
@ -142,8 +134,7 @@ const echartsOption = reactive<EChartsOption>({
          color: '#e6e6e6'
        }
      }
-    }
-  ],
+    }],
  xAxis: {
    type: 'category',
    name: '日期',
@ -161,7 +152,9 @@ const loadData = async () => {

  // 2.1 更新 Echarts 数据
  if (echartsOption.xAxis && echartsOption.xAxis['data']) {
-    echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time)
+    echartsOption.xAxis['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.time
+    )
  }
  if (echartsOption.series && echartsOption.series[0] && echartsOption.series[0]['data']) {
    echartsOption.series[0]['data'] = performanceList.map(
@ -172,16 +165,16 @@ const loadData = async () => {
    echartsOption.series[1]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastMonthCount
    )
-    echartsOption.series[3]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastMonthCount !== 0 ? ((s.currentMonthCount / s.lastMonthCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[3]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastMonthCount !== 0 ? ((s.currentMonthCount - s.lastMonthCount) / s.lastMonthCount*100).toFixed(2) : 'NULL'
    )
  }
  if (echartsOption.series && echartsOption.series[2] && echartsOption.series[2]['data']) {
    echartsOption.series[2]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastYearCount
    )
-    echartsOption.series[4]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastYearCount !== 0 ? ((s.currentMonthCount / s.lastYearCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[4]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastYearCount !== 0 ? ((s.currentMonthCount - s.lastYearCount) / s.lastYearCount*100).toFixed(2) : 'NULL'
    )
  }

@ -189,34 +182,28 @@ const loadData = async () => {
  list.value = performanceList
  convertListData()
  loading.value = false
+
 }

 // 初始化数据
-const columnsData = reactive([])
-const tableData = reactive([
-  { title: '当月合同数量统计（个）' },
-  { title: '上月合同数量统计（个）' },
-  { title: '去年当月合同数量统计（个）' },
-  { title: '同比增长率（%）' },
-  { title: '环比增长率（%）' }
-])
+const columnsData = reactive([]);
+const tableData = reactive([{title: '当月合同数量统计（个）'}, {title: '上月合同数量统计（个）'},
+  {title: '去年当月合同数量统计（个）'}, {title: '环比增长率（%）'}, {title: '同比增长率（%）'}])

 // 定义 convertListData 方法，数据行列转置，展示每月数据
 const convertListData = () => {
-  const columnObj = { label: '日期', prop: 'title' }
-  columnsData.splice(0, columnsData.length) //清空数组
+  const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length);//清空数组
  columnsData.push(columnObj)

  list.value.forEach((item, index) => {
-    const columnObj = { label: item.time, prop: 'prop' + index }
+    const columnObj = {label: item.time, prop: 'prop' + index}
    columnsData.push(columnObj)
    tableData[0]['prop' + index] = item.currentMonthCount
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
-    tableData[3]['prop' + index] =
-      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
+    tableData[3]['prop' + index] = item.lastMonthCount !== 0 ? ((item.currentMonthCount - item.lastMonthCount) / item.lastMonthCount * 100).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] = item.lastYearCount !== 0 ? ((item.currentMonthCount - item.lastYearCount) / item.lastYearCount * 100).toFixed(2) : 'NULL'
  })
 }

--- a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
@ -1,5 +1,4 @@
 <!-- 员工业绩统计 -->
-<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
  <!-- Echarts图 -->
  <el-card shadow="never">
@ -11,15 +10,9 @@
  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
-      <el-table-column
-        v-for="item in columnsData"
-        :key="item.prop"
-        :label="item.label"
-        :prop="item.prop"
-        align="center"
-      >
+      <el-table-column v-for="item in columnsData" :key="item.prop" :label="item.label" :prop="item.prop" align="center">
        <template #default="scope">
-          {{ scope.row[item.prop] }}
+          {{scope.row[item.prop]}}
        </template>
      </el-table-column>
    </el-table>
@ -30,7 +23,7 @@ import { EChartsOption } from 'echarts'
 import {
  StatisticsPerformanceApi,
  StatisticsPerformanceRespVO
-} from '@/api/crm/statistics/performance'
+} from "@/api/crm/statistics/performance"

 defineOptions({ name: 'ContractPricePerformance' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
@ -64,13 +57,13 @@ const echartsOption = reactive<EChartsOption>({
      data: []
    },
    {
-      name: '同比增长率（%）',
+      name: '环比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
    },
    {
-      name: '环比增长率（%）',
+      name: '同比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
@ -93,30 +86,29 @@ const echartsOption = reactive<EChartsOption>({
      type: 'shadow'
    }
  },
-  yAxis: [
-    {
-      type: 'value',
-      name: '金额（元）',
-      axisTick: {
-        show: false
-      },
-      axisLabel: {
-        color: '#BDBDBD',
-        formatter: '{value}'
-      },
-      /** 坐标轴轴线相关设置 */
-      axisLine: {
-        lineStyle: {
-          color: '#BDBDBD'
-        }
-      },
-      splitLine: {
-        show: true,
-        lineStyle: {
-          color: '#e6e6e6'
-        }
+  yAxis: [{
+    type: 'value',
+    name: '金额（元）',
+    axisTick: {
+      show: false
+    },
+    axisLabel: {
+      color: '#BDBDBD',
+      formatter: '{value}'
+    },
+    /** 坐标轴轴线相关设置 */
+    axisLine: {
+      lineStyle: {
+        color: '#BDBDBD'
      }
    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: '#e6e6e6'
+      }
+    }
+  },
    {
      type: 'value',
      name: '',
@ -142,8 +134,7 @@ const echartsOption = reactive<EChartsOption>({
          color: '#e6e6e6'
        }
      }
-    }
-  ],
+    }],
  xAxis: {
    type: 'category',
    name: '日期',
@ -161,7 +152,9 @@ const loadData = async () => {

  // 2.1 更新 Echarts 数据
  if (echartsOption.xAxis && echartsOption.xAxis['data']) {
-    echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time)
+    echartsOption.xAxis['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.time
+    )
  }
  if (echartsOption.series && echartsOption.series[0] && echartsOption.series[0]['data']) {
    echartsOption.series[0]['data'] = performanceList.map(
@ -172,16 +165,16 @@ const loadData = async () => {
    echartsOption.series[1]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastMonthCount
    )
-    echartsOption.series[3]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastMonthCount !== 0 ? ((s.currentMonthCount / s.lastMonthCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[3]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastMonthCount !== 0 ? ((s.currentMonthCount - s.lastMonthCount) / s.lastMonthCount*100).toFixed(2) : 'NULL'
    )
  }
  if (echartsOption.series && echartsOption.series[2] && echartsOption.series[2]['data']) {
    echartsOption.series[2]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastYearCount
    )
-    echartsOption.series[4]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastYearCount !== 0 ? ((s.currentMonthCount / s.lastYearCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[4]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastYearCount !== 0 ? ((s.currentMonthCount - s.lastYearCount) / s.lastYearCount*100).toFixed(2) : 'NULL'
    )
  }

@ -189,34 +182,28 @@ const loadData = async () => {
  list.value = performanceList
  convertListData()
  loading.value = false
+
 }

 // 初始化数据
-const columnsData = reactive([])
-const tableData = reactive([
-  { title: '当月合同金额统计（元）' },
-  { title: '上月合同金额统计（元）' },
-  { title: '去年当月合同金额统计（元）' },
-  { title: '同比增长率（%）' },
-  { title: '环比增长率（%）' }
-])
+const columnsData = reactive([]);
+const tableData = reactive([{title: '当月合同金额统计（元）'}, {title: '上月合同金额统计（元）'}, {title: '去年当月合同金额统计（元）'},
+  {title: '环比增长率（%）'}, {title: '同比增长率（%）'}])

 // 定义 init 方法
 const convertListData = () => {
-  const columnObj = { label: '日期', prop: 'title' }
-  columnsData.splice(0, columnsData.length) //清空数组
+  const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length)//清空数组
  columnsData.push(columnObj)

  list.value.forEach((item, index) => {
-    const columnObj = { label: item.time, prop: 'prop' + index }
+    const columnObj = {label: item.time, prop: 'prop' + index}
    columnsData.push(columnObj)
    tableData[0]['prop' + index] = item.currentMonthCount
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
-    tableData[3]['prop' + index] =
-      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
+    tableData[3]['prop' + index] = item.lastMonthCount !== 0 ? ((item.currentMonthCount - item.lastMonthCount) / item.lastMonthCount*100).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] = item.lastYearCount !== 0 ? ((item.currentMonthCount - item.lastYearCount) / item.lastYearCount*100).toFixed(2) : 'NULL'
  })
 }

--- a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
@ -10,16 +10,9 @@
  <!-- 统计列表 -->
  <el-card shadow="never" class="mt-16px">
    <el-table v-loading="loading" :data="tableData">
-      <el-table-column
-        v-for="item in columnsData"
-        :key="item.prop"
-        :label="item.label"
-        :prop="item.prop"
-        align="center"
-      >
-        <!-- TODO @scholar：IDEA 爆红的处理 -->
+      <el-table-column v-for="item in columnsData" :key="item.prop" :label="item.label" :prop="item.prop" align="center">
        <template #default="scope">
-          {{ scope.row[item.prop] }}
+          {{scope.row[item.prop]}}
        </template>
      </el-table-column>
    </el-table>
@ -30,7 +23,7 @@ import { EChartsOption } from 'echarts'
 import {
  StatisticsPerformanceApi,
  StatisticsPerformanceRespVO
-} from '@/api/crm/statistics/performance'
+} from "@/api/crm/statistics/performance"

 defineOptions({ name: 'ContractPricePerformance' })
 const props = defineProps<{ queryParams: any }>() // 搜索参数
@ -64,13 +57,13 @@ const echartsOption = reactive<EChartsOption>({
      data: []
    },
    {
-      name: '同比增长率（%）',
+      name: '环比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
    },
    {
-      name: '环比增长率（%）',
+      name: '同比增长率（%）',
      type: 'line',
      yAxisIndex: 1,
      data: []
@ -93,35 +86,33 @@ const echartsOption = reactive<EChartsOption>({
      type: 'shadow'
    }
  },
-  yAxis: [
-    {
-      type: 'value',
-      name: '金额（元）',
-      axisTick: {
-        show: false
-      },
-      axisLabel: {
-        color: '#BDBDBD',
-        formatter: '{value}'
-      },
-      /** 坐标轴轴线相关设置 */
-      axisLine: {
-        lineStyle: {
-          color: '#BDBDBD'
-        }
-      },
-      splitLine: {
-        show: true,
-        lineStyle: {
-          color: '#e6e6e6'
-        }
+  yAxis: [{
+    type: 'value',
+    name: '金额（元）',
+    axisTick: {
+      show: false
+    },
+    axisLabel: {
+      color: '#BDBDBD',
+      formatter: '{value}'
+    },
+    /** 坐标轴轴线相关设置 */
+    axisLine: {
+      lineStyle: {
+        color: '#BDBDBD'
      }
    },
+    splitLine: {
+      show: true,
+      lineStyle: {
+        color: '#e6e6e6'
+      }
+    }
+  },
    {
      type: 'value',
      name: '',
      axisTick: {
-        // TODO @scholar：IDEA 爆红的处理
        alignWithLabel: true,
        lineStyle: {
          width: 0
@ -143,8 +134,7 @@ const echartsOption = reactive<EChartsOption>({
          color: '#e6e6e6'
        }
      }
-    }
-  ],
+    }],
  xAxis: {
    type: 'category',
    name: '日期',
@ -162,7 +152,9 @@ const loadData = async () => {

  // 2.1 更新 Echarts 数据
  if (echartsOption.xAxis && echartsOption.xAxis['data']) {
-    echartsOption.xAxis['data'] = performanceList.map((s: StatisticsPerformanceRespVO) => s.time)
+    echartsOption.xAxis['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.time
+    )
  }
  if (echartsOption.series && echartsOption.series[0] && echartsOption.series[0]['data']) {
    echartsOption.series[0]['data'] = performanceList.map(
@ -173,16 +165,16 @@ const loadData = async () => {
    echartsOption.series[1]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastMonthCount
    )
-    echartsOption.series[3]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastMonthCount !== 0 ? ((s.currentMonthCount / s.lastMonthCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[3]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastMonthCount !== 0 ? ((s.currentMonthCount - s.lastMonthCount) / s.lastMonthCount*100).toFixed(2) : 'NULL'
    )
  }
  if (echartsOption.series && echartsOption.series[2] && echartsOption.series[1]['data']) {
    echartsOption.series[2]['data'] = performanceList.map(
      (s: StatisticsPerformanceRespVO) => s.lastYearCount
    )
-    echartsOption.series[4]['data'] = performanceList.map((s: StatisticsPerformanceRespVO) =>
-      s.lastYearCount !== 0 ? ((s.currentMonthCount / s.lastYearCount) * 100).toFixed(2) : 'NULL'
+    echartsOption.series[4]['data'] = performanceList.map(
+      (s: StatisticsPerformanceRespVO) => s.lastYearCount !== 0 ? ((s.currentMonthCount - s.lastYearCount) / s.lastYearCount*100).toFixed(2) : 'NULL'
    )
  }

@ -190,36 +182,28 @@ const loadData = async () => {
  list.value = performanceList
  convertListData()
  loading.value = false
+
 }

 // 初始化数据
-// TODO @scholar：加个 as any[]，避免 idea 爆红
-const columnsData = reactive([] as any[])
-const tableData = reactive([
-  { title: '当月回款金额统计（元）' },
-  { title: '上月回款金额统计（元）' },
-  { title: '去年当月回款金额统计（元）' },
-  { title: '同比增长率（%）' },
-  { title: '环比增长率（%）' }
-])
+const columnsData = reactive([]);
+const tableData = reactive([{title: '当月回款金额统计（元）'}, {title: '上月回款金额统计（元）'},
+  {title: '去年当月回款金额统计（元）'}, {title: '环比增长率（%）'}, {title: '同比增长率（%）'}]);

 // 定义 init 方法
 const convertListData = () => {
-  const columnObj = { label: '日期', prop: 'title' }
-  columnsData.splice(0, columnsData.length) //清空数组
+  const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length)//清空数组
  columnsData.push(columnObj)

  list.value.forEach((item, index) => {
-    const columnObj = { label: item.time, prop: 'prop' + index }
+    const columnObj = {label: item.time, prop: 'prop' + index}
    columnsData.push(columnObj)
    tableData[0]['prop' + index] = item.currentMonthCount
    tableData[1]['prop' + index] = item.lastMonthCount
    tableData[2]['prop' + index] = item.lastYearCount
-    // TODO @scholar：百分比，使用 erpCalculatePercentage 直接计算；如果是 0，则返回 0，统一就好哈；
-    tableData[3]['prop' + index] =
-      item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] =
-      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
+    tableData[3]['prop' + index] = item.lastMonthCount !== 0 ? ((item.currentMonthCount - item.lastMonthCount) / item.lastMonthCount*100).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] = item.lastYearCount !== 0 ? ((item.currentMonthCount - item.lastYearCount) / item.lastYearCount*100).toFixed(2) : 'NULL'
  })
 }

--- a/src/views/crm/statistics/performance/index.vue
+++ b/src/views/crm/statistics/performance/index.vue
@ -60,10 +60,7 @@
      </el-tab-pane>
      <!-- 员工回款金额统计 -->
      <el-tab-pane label="员工回款金额统计" name="ReceivablePricePerformance" lazy>
-        <ReceivablePricePerformance
-          :query-params="queryParams"
-          ref="ReceivablePricePerformanceRef"
-        />
+        <ReceivablePricePerformance :query-params="queryParams" ref="ReceivablePricePerformanceRef" />
      </el-tab-pane>
    </el-tabs>
  </el-col>
@ -73,11 +70,12 @@
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
-import { beginOfDay, formatDate } from '@/utils/formatTime'
+import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
 import { defaultProps, handleTree } from '@/utils/tree'
 import ContractCountPerformance from './components/ContractCountPerformance.vue'
 import ContractPricePerformance from './components/ContractPricePerformance.vue'
 import ReceivablePricePerformance from './components/ReceivablePricePerformance.vue'
+import dayjs from "dayjs"

 defineOptions({ name: 'CrmStatisticsCustomer' })

@ -85,8 +83,8 @@ const queryParams = reactive({
  deptId: useUserStore().getUser.deptId,
  userId: undefined,
  times: [
-    // 默认显示当年的数据
-    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)))
+    formatDate(beginOfDay(new Date(new Date().getFullYear(),0, 1, 0, 0, 0))), // 默认查询当年的数据，比如2024年，起始时间2024-01-01 00:00:00
+    formatDate(beginOfDay(new Date(new Date().getFullYear()+1,0, 1, 0, 0, 0))) //查询时间范围结束时间，2025-01-01 00:00:00
  ]
 })

@ -100,7 +98,6 @@ const userListByDeptId = computed(() =>
    : []
 )

-// TODO @scholar：改成尾注释，保证 vue 内容短一点；变量名小写
 // 活跃标签
 const activeTab = ref('ContractCountPerformance')
 // 1.员工合同数量统计
@ -111,19 +108,17 @@ const ContractPricePerformanceRef = ref()
 const ReceivablePricePerformanceRef = ref()

 /** 搜索按钮操作 */
-const handleQuery = () => {
+const handleQuery =  () => {
  // 从 queryParams.times[0] 中获取到了年份
  const selectYear = parseInt(queryParams.times[0])

-  // 创建一个新的 Date 对象，设置为指定的年份的第一天
-  const fullDate = new Date(selectYear, 0, 1, 0, 0, 0)
+  // 创建一个新的 Date 对象，设置为指定的年份的第一天，以及第二年的第一天，以时间段的方式，将查询时间传递给后端
+  const fullDate = new Date(selectYear, 0, 1, 0, 0, 0)            //比如2024年，起始时间2024-01-01 00:00:00
+  const nextFullDate = new Date(selectYear+1, 0, 1, 0, 0, 0) //查询时间范围结束时间，2025-01-01 00:00:00

  // 将完整的日期时间格式化为需要的字符串形式，比如 2004-01-01 00:00:00
-  // TODO @scholar：看看，是不是可以使用 year 哈
-  queryParams.times[0] = `${fullDate.getFullYear()}-${String(fullDate.getMonth() + 1).padStart(
-    2,
-    '0'
-  )}-${String(fullDate.getDate()).padStart(2, '0')} ${String(fullDate.getHours()).padStart(2, '0')}:${String(fullDate.getMinutes()).padStart(2, '0')}:${String(fullDate.getSeconds()).padStart(2, '0')}`
+  queryParams.times[0] = dayjs(fullDate).format('YYYY-MM-DD HH:mm:ss')
+  queryParams.times[1] = dayjs(nextFullDate).format('YYYY-MM-DD HH:mm:ss')

  switch (activeTab.value) {
    case 'ContractCountPerformance':