From f4dd1bed633608a225613217cd80687d0efe4435 Mon Sep 17 00:00:00 2001
From: scholar <1145227973@qq.com>
Date: Fri, 19 Apr 2024 17:46:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?1,=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E5=88=B7=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=9B=202=EF=BC=8C=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=EF=BC=8C=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=B9=B4=E5=AE=9E=E7=8E=B0=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=90=8C=E6=A0=B7=E6=8C=89=E7=85=A7=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=E9=80=89=E6=8B=A9=E5=AE=9E=E7=8E=B0=EF=BC=9B=203?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=8E=AF=E6=AF=94=E5=90=8C=E6=AF=94?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=9B=204=EF=BC=8C=E5=9B=9E=E6=AC=BE?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ContractCountPerformance.vue   | 13 ++++---
 .../components/ContractPricePerformance.vue   | 11 +++---
 .../components/ReceivablePricePerformance.vue | 11 +++---
 .../crm/statistics/performance/index.vue      | 39 ++++++++++---------
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
index 6519e557..f135caa8 100644
--- a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
@@ -1,4 +1,4 @@
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
 <template>
   <!-- Echarts图 -->
   <el-card shadow="never">
@@ -180,6 +180,7 @@ const loadData = async () => {
 
   // 2.2 更新列表数据
   list.value = performanceList
+  convertListData()
   loading.value = false
 
 }
@@ -189,9 +190,10 @@ const columnsData = reactive([]);
 const tableData = reactive([{title: '当月合同数量统计（个）'}, {title: '上月合同数量统计（个）'},
   {title: '去年当月合同数量统计（个）'}, {title: '同比增长率（%）'}, {title: '环比增长率（%）'}])
 
-// 定义 init 方法
-const init = () => {
+// 定义 convertListData 方法，数据行列转置，展示每月数据
+const convertListData = () => {
   const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length);//清空数组
   columnsData.push(columnObj)
 
   list.value.forEach((item, index) => {
@@ -200,8 +202,8 @@ const init = () => {
     tableData[0]['prop' + index] = item.currentMonthCount
     tableData[1]['prop' + index] = item.lastMonthCount
     tableData[2]['prop' + index] = item.lastYearCount
-    tableData[3]['prop' + index] = item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] = item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    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'
   })
 }
 
@@ -210,6 +212,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
   await loadData()
-  init()
 })
 </script>
diff --git a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
index ae3c50df..41228a22 100644
--- a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
@@ -1,4 +1,4 @@
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
 <template>
   <!-- Echarts图 -->
   <el-card shadow="never">
@@ -180,6 +180,7 @@ const loadData = async () => {
 
   // 2.2 更新列表数据
   list.value = performanceList
+  convertListData()
   loading.value = false
 
 }
@@ -190,8 +191,9 @@ const tableData = reactive([{title: '当月合同金额统计（元）'}, {title
   {title: '同比增长率（%）'}, {title: '环比增长率（%）'}])
 
 // 定义 init 方法
-const init = () => {
+const convertListData = () => {
   const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length)//清空数组
   columnsData.push(columnObj)
 
   list.value.forEach((item, index) => {
@@ -200,8 +202,8 @@ const init = () => {
     tableData[0]['prop' + index] = item.currentMonthCount
     tableData[1]['prop' + index] = item.lastMonthCount
     tableData[2]['prop' + index] = item.lastYearCount
-    tableData[3]['prop' + index] = item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] = item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    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'
   })
 }
 
@@ -210,6 +212,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
   await loadData()
-  init()
 })
 </script>
diff --git a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
index b4dcaa80..1efcf920 100644
--- a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
@@ -1,4 +1,4 @@
-<!-- 客户总量统计 -->
+<!-- 员工业绩统计 -->
 <template>
   <!-- Echarts图 -->
   <el-card shadow="never">
@@ -180,6 +180,7 @@ const loadData = async () => {
 
   // 2.2 更新列表数据
   list.value = performanceList
+  convertListData()
   loading.value = false
 
 }
@@ -190,8 +191,9 @@ const tableData = reactive([{title: '当月回款金额统计（元）'}, {title
   {title: '去年当月回款金额统计（元）'}, {title: '同比增长率（%）'}, {title: '环比增长率（%）'}]);
 
 // 定义 init 方法
-const init = () => {
+const convertListData = () => {
   const columnObj = {label: '日期', prop: 'title'}
+  columnsData.splice(0, columnsData.length)//清空数组
   columnsData.push(columnObj)
 
   list.value.forEach((item, index) => {
@@ -200,8 +202,8 @@ const init = () => {
     tableData[0]['prop' + index] = item.currentMonthCount
     tableData[1]['prop' + index] = item.lastMonthCount
     tableData[2]['prop' + index] = item.lastYearCount
-    tableData[3]['prop' + index] = item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
-    tableData[4]['prop' + index] = item.lastMonthCount !== 0 ? (item.currentMonthCount / item.lastMonthCount).toFixed(2) : 'NULL'
+    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'
   })
 }
 
@@ -210,6 +212,5 @@ defineExpose({ loadData })
 /** 初始化 */
 onMounted(async () => {
   await loadData()
-  init()
 })
 </script>
diff --git a/src/views/crm/statistics/performance/index.vue b/src/views/crm/statistics/performance/index.vue
index 8997a50c..ea43ed4d 100644
--- a/src/views/crm/statistics/performance/index.vue
+++ b/src/views/crm/statistics/performance/index.vue
@@ -1,4 +1,4 @@
-<!-- 数据统计 - 员工客户分析 -->
+<!-- 数据统计 - 员工业绩分析 -->
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
@@ -9,16 +9,13 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="时间范围" prop="orderDate">
+      <el-form-item label="选择年份" prop="orderDate">
         <el-date-picker
-          v-model="queryParams.times"
-          :shortcuts="defaultShortcuts"
+          v-model="queryParams.times[0]"
           class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          type="year"
+          value-format="YYYY"
+          :default-time="[new Date().getFullYear()]"
         />
       </el-form-item>
       <el-form-item label="归属部门" prop="deptId">
@@ -62,7 +59,7 @@
         <ContractPricePerformance :query-params="queryParams" ref="ContractPricePerformanceRef" />
       </el-tab-pane>
       <!-- 员工回款金额统计 -->
-      <el-tab-pane label="员工回款金额统计" name="followupType" lazy>
+      <el-tab-pane label="员工回款金额统计" name="ReceivablePricePerformance" lazy>
         <ReceivablePricePerformance :query-params="queryParams" ref="ReceivablePricePerformanceRef" />
       </el-tab-pane>
     </el-tabs>
@@ -78,9 +75,6 @@ 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 CustomerFollowupType from './components/CustomerFollowupType.vue'
-import CustomerConversionStat from './components/CustomerConversionStat.vue'
-import CustomerDealCycle from './components/CustomerDealCycle.vue'
 
 defineOptions({ name: 'CrmStatisticsCustomer' })
 
@@ -88,9 +82,8 @@ const queryParams = reactive({
   deptId: useUserStore().getUser.deptId,
   userId: undefined,
   times: [
-    // 默认显示最近一周的数据
-    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7))),
-    formatDate(endOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24)))
+    // 默认显示当年的数据
+    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)))
   ]
 })
 
@@ -113,9 +106,19 @@ const ContractPricePerformanceRef = ref()
 // 3.员工回款金额统计
 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)
+
+  // 将完整的日期时间格式化为需要的字符串形式，比如 2004-01-01 00:00:00
+  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')}`
+
   switch (activeTab.value) {
     case 'ContractCountPerformance':
       ContractCountPerformanceRef.value?.loadData?.()

From 715f37eb0ba46ad46cc45873621916ed083bade4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 23 Apr 2024 23:31:52 +0800
Subject: [PATCH 2/3] =?UTF-8?q?crm=EF=BC=9Acode=20review=20=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E4=B8=9A=E7=BB=A9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ContractCountPerformance.vue   | 95 ++++++++++--------
 .../components/ContractPricePerformance.vue   | 95 ++++++++++--------
 .../components/ReceivablePricePerformance.vue | 98 +++++++++++--------
 .../crm/statistics/performance/index.vue      | 18 ++--
 4 files changed, 177 insertions(+), 129 deletions(-)

diff --git a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
index f135caa8..f911bb2d 100644
--- a/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractCountPerformance.vue
@@ -1,4 +1,5 @@
 <!-- 员工业绩统计 -->
+<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
   <!-- Echarts图 -->
   <el-card shadow="never">
@@ -10,9 +11,15 @@
   <!-- 统计列表 -->
   <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>
@@ -23,7 +30,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 }>() // 搜索参数
@@ -86,29 +93,30 @@ const echartsOption = reactive<EChartsOption>({
       type: 'shadow'
     }
   },
-  yAxis: [{
-    type: 'value',
-    name: '数量（个）',
-    axisTick: {
-      show: false
-    },
-    axisLabel: {
-      color: '#BDBDBD',
-      formatter: '{value}'
-    },
-    /** 坐标轴轴线相关设置 */
-    axisLine: {
-      lineStyle: {
-        color: '#BDBDBD'
+  yAxis: [
+    {
+      type: 'value',
+      name: '数量（个）',
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        color: '#BDBDBD',
+        formatter: '{value}'
+      },
+      /** 坐标轴轴线相关设置 */
+      axisLine: {
+        lineStyle: {
+          color: '#BDBDBD'
+        }
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: '#e6e6e6'
+        }
       }
     },
-    splitLine: {
-      show: true,
-      lineStyle: {
-        color: '#e6e6e6'
-      }
-    }
-  },
     {
       type: 'value',
       name: '',
@@ -134,7 +142,8 @@ const echartsOption = reactive<EChartsOption>({
           color: '#e6e6e6'
         }
       }
-    }],
+    }
+  ],
   xAxis: {
     type: 'category',
     name: '日期',
@@ -152,9 +161,7 @@ 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(
@@ -165,16 +172,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) * 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) * 100).toFixed(2) : 'NULL'
     )
   }
 
@@ -182,28 +189,34 @@ 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).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] =
+      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
   })
 }
 
diff --git a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
index 41228a22..f97b612c 100644
--- a/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ContractPricePerformance.vue
@@ -1,4 +1,5 @@
 <!-- 员工业绩统计 -->
+<!-- TODO @scholar:参考 ReceivablePricePerformance 建议改 -->
 <template>
   <!-- Echarts图 -->
   <el-card shadow="never">
@@ -10,9 +11,15 @@
   <!-- 统计列表 -->
   <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>
@@ -23,7 +30,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 }>() // 搜索参数
@@ -86,29 +93,30 @@ const echartsOption = reactive<EChartsOption>({
       type: 'shadow'
     }
   },
-  yAxis: [{
-    type: 'value',
-    name: '金额（元）',
-    axisTick: {
-      show: false
-    },
-    axisLabel: {
-      color: '#BDBDBD',
-      formatter: '{value}'
-    },
-    /** 坐标轴轴线相关设置 */
-    axisLine: {
-      lineStyle: {
-        color: '#BDBDBD'
+  yAxis: [
+    {
+      type: 'value',
+      name: '金额（元）',
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        color: '#BDBDBD',
+        formatter: '{value}'
+      },
+      /** 坐标轴轴线相关设置 */
+      axisLine: {
+        lineStyle: {
+          color: '#BDBDBD'
+        }
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: '#e6e6e6'
+        }
       }
     },
-    splitLine: {
-      show: true,
-      lineStyle: {
-        color: '#e6e6e6'
-      }
-    }
-  },
     {
       type: 'value',
       name: '',
@@ -134,7 +142,8 @@ const echartsOption = reactive<EChartsOption>({
           color: '#e6e6e6'
         }
       }
-    }],
+    }
+  ],
   xAxis: {
     type: 'category',
     name: '日期',
@@ -152,9 +161,7 @@ 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(
@@ -165,16 +172,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) * 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) * 100).toFixed(2) : 'NULL'
     )
   }
 
@@ -182,28 +189,34 @@ 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).toFixed(2) : 'NULL'
+    tableData[4]['prop' + index] =
+      item.lastYearCount !== 0 ? (item.currentMonthCount / item.lastYearCount).toFixed(2) : 'NULL'
   })
 }
 
diff --git a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
index 1efcf920..14f59909 100644
--- a/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
+++ b/src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
@@ -10,9 +10,16 @@
   <!-- 统计列表 -->
   <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"
+      >
+        <!-- TODO @scholar：IDEA 爆红的处理 -->
         <template #default="scope">
-          {{scope.row[item.prop]}}
+          {{ scope.row[item.prop] }}
         </template>
       </el-table-column>
     </el-table>
@@ -23,7 +30,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 }>() // 搜索参数
@@ -86,33 +93,35 @@ const echartsOption = reactive<EChartsOption>({
       type: 'shadow'
     }
   },
-  yAxis: [{
-    type: 'value',
-    name: '金额（元）',
-    axisTick: {
-      show: false
-    },
-    axisLabel: {
-      color: '#BDBDBD',
-      formatter: '{value}'
-    },
-    /** 坐标轴轴线相关设置 */
-    axisLine: {
-      lineStyle: {
-        color: '#BDBDBD'
+  yAxis: [
+    {
+      type: 'value',
+      name: '金额（元）',
+      axisTick: {
+        show: false
+      },
+      axisLabel: {
+        color: '#BDBDBD',
+        formatter: '{value}'
+      },
+      /** 坐标轴轴线相关设置 */
+      axisLine: {
+        lineStyle: {
+          color: '#BDBDBD'
+        }
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: '#e6e6e6'
+        }
       }
     },
-    splitLine: {
-      show: true,
-      lineStyle: {
-        color: '#e6e6e6'
-      }
-    }
-  },
     {
       type: 'value',
       name: '',
       axisTick: {
+        // TODO @scholar：IDEA 爆红的处理
         alignWithLabel: true,
         lineStyle: {
           width: 0
@@ -134,7 +143,8 @@ const echartsOption = reactive<EChartsOption>({
           color: '#e6e6e6'
         }
       }
-    }],
+    }
+  ],
   xAxis: {
     type: 'category',
     name: '日期',
@@ -152,9 +162,7 @@ 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(
@@ -165,16 +173,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) * 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) * 100).toFixed(2) : 'NULL'
     )
   }
 
@@ -182,28 +190,36 @@ const loadData = async () => {
   list.value = performanceList
   convertListData()
   loading.value = false
-
 }
 
 // 初始化数据
-const columnsData = reactive([]);
-const tableData = reactive([{title: '当月回款金额统计（元）'}, {title: '上月回款金额统计（元）'},
-  {title: '去年当月回款金额统计（元）'}, {title: '同比增长率（%）'}, {title: '环比增长率（%）'}]);
+// TODO @scholar：加个 as any[]，避免 idea 爆红
+const columnsData = reactive([] as any[])
+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'
+    // 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'
   })
 }
 
diff --git a/src/views/crm/statistics/performance/index.vue b/src/views/crm/statistics/performance/index.vue
index ea43ed4d..4a443c55 100644
--- a/src/views/crm/statistics/performance/index.vue
+++ b/src/views/crm/statistics/performance/index.vue
@@ -60,7 +60,10 @@
       </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>
@@ -70,7 +73,7 @@
 import * as DeptApi from '@/api/system/dept'
 import * as UserApi from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
-import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
+import { beginOfDay, formatDate } from '@/utils/formatTime'
 import { defaultProps, handleTree } from '@/utils/tree'
 import ContractCountPerformance from './components/ContractCountPerformance.vue'
 import ContractPricePerformance from './components/ContractPricePerformance.vue'
@@ -97,6 +100,7 @@ const userListByDeptId = computed(() =>
     : []
 )
 
+// TODO @scholar：改成尾注释，保证 vue 内容短一点；变量名小写
 // 活跃标签
 const activeTab = ref('ContractCountPerformance')
 // 1.员工合同数量统计
@@ -107,7 +111,7 @@ const ContractPricePerformanceRef = ref()
 const ReceivablePricePerformanceRef = ref()
 
 /** 搜索按钮操作 */
-const handleQuery =  () => {
+const handleQuery = () => {
   // 从 queryParams.times[0] 中获取到了年份
   const selectYear = parseInt(queryParams.times[0])
 
@@ -115,9 +119,11 @@ const handleQuery =  () => {
   const fullDate = new Date(selectYear, 0, 1, 0, 0, 0)
 
   // 将完整的日期时间格式化为需要的字符串形式，比如 2004-01-01 00:00:00
-  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')}`
+  // 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')}`
 
   switch (activeTab.value) {
     case 'ContractCountPerformance':

From a0996bd0cfb6c001e028b76b227f83c38b9ffd27 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 24 Apr 2024 21:50:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=20env=20=E5=A4=9A=E4=BD=99=E7=9A=84=20VITE?=
 =?UTF-8?q?=5FAPI=5FBASEPATH=20=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                                 | 3 ---
 .env.local                                               | 3 ---
 .env.prod                                                | 3 ---
 .env.stage                                               | 3 ---
 .env.test                                                | 3 ---
 src/views/mp/components/wx-reply/components/TabImage.vue | 2 +-
 src/views/mp/components/wx-reply/components/TabMusic.vue | 2 +-
 src/views/mp/components/wx-reply/components/TabVideo.vue | 2 +-
 src/views/mp/components/wx-reply/components/TabVoice.vue | 2 +-
 types/env.d.ts                                           | 1 -
 10 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.env.dev b/.env.dev
index 689718b2..5cce6646 100644
--- a/.env.dev
+++ b/.env.dev
@@ -12,9 +12,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 
-# 接口前缀
-VITE_API_BASEPATH=/dev-api
-
 # 接口地址
 VITE_API_URL=/admin-api
 
diff --git a/.env.local b/.env.local
index 3b997668..005d2f0d 100644
--- a/.env.local
+++ b/.env.local
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
-# 接口前缀
-VITE_API_BASEPATH=/dev-api
-
 # 接口地址
 VITE_API_URL=/admin-api
 
diff --git a/.env.prod b/.env.prod
index 35d729c3..842ba616 100644
--- a/.env.prod
+++ b/.env.prod
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
-# 接口前缀
-VITE_API_BASEPATH=
-
 # 接口地址
 VITE_API_URL=/admin-api
 
diff --git a/.env.stage b/.env.stage
index 26f9516b..f7c521bd 100644
--- a/.env.stage
+++ b/.env.stage
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
 
-# 接口前缀
-VITE_API_BASEPATH=
-
 # 接口地址
 VITE_API_URL=/admin-api
 
diff --git a/.env.test b/.env.test
index addbfb4e..7bf1b417 100644
--- a/.env.test
+++ b/.env.test
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
 # 上传路径
 VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
 
-# 接口前缀
-VITE_API_BASEPATH=
-
 # 接口地址
 VITE_API_URL=/admin-api
 
diff --git a/src/views/mp/components/wx-reply/components/TabImage.vue b/src/views/mp/components/wx-reply/components/TabImage.vue
index a2915779..6dbfeed6 100644
--- a/src/views/mp/components/wx-reply/components/TabImage.vue
+++ b/src/views/mp/components/wx-reply/components/TabImage.vue
@@ -63,7 +63,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{
diff --git a/src/views/mp/components/wx-reply/components/TabMusic.vue b/src/views/mp/components/wx-reply/components/TabMusic.vue
index c7caecb9..6421d244 100644
--- a/src/views/mp/components/wx-reply/components/TabMusic.vue
+++ b/src/views/mp/components/wx-reply/components/TabMusic.vue
@@ -67,7 +67,7 @@ import { Reply } from './types'
 
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{
diff --git a/src/views/mp/components/wx-reply/components/TabVideo.vue b/src/views/mp/components/wx-reply/components/TabVideo.vue
index 7d67d2fa..adb8fa37 100644
--- a/src/views/mp/components/wx-reply/components/TabVideo.vue
+++ b/src/views/mp/components/wx-reply/components/TabVideo.vue
@@ -58,7 +58,7 @@ import { Reply } from './types'
 
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() }
 
 const props = defineProps<{
diff --git a/src/views/mp/components/wx-reply/components/TabVoice.vue b/src/views/mp/components/wx-reply/components/TabVoice.vue
index 5a7a42d5..5dbe9a00 100644
--- a/src/views/mp/components/wx-reply/components/TabVoice.vue
+++ b/src/views/mp/components/wx-reply/components/TabVoice.vue
@@ -61,7 +61,7 @@ import { getAccessToken } from '@/utils/auth'
 import { Reply } from './types'
 const message = useMessage()
 
-const UPLOAD_URL = import.meta.env.VITE_API_BASEPATH + '/admin-api/mp/material/upload-temporary'
+const UPLOAD_URL = import.meta.env.VITE_BASE_URL + '/admin-api/mp/material/upload-temporary'
 const HEADERS = { Authorization: 'Bearer ' + getAccessToken() } // 设置上传的请求头部
 
 const props = defineProps<{
diff --git a/types/env.d.ts b/types/env.d.ts
index baf58957..057b5268 100644
--- a/types/env.d.ts
+++ b/types/env.d.ts
@@ -17,7 +17,6 @@ interface ImportMetaEnv {
   readonly VITE_APP_DOCALERT_ENABLE: string
   readonly VITE_BASE_URL: string
   readonly VITE_UPLOAD_URL: string
-  readonly VITE_API_BASEPATH: string
   readonly VITE_API_URL: string
   readonly VITE_BASE_PATH: string
   readonly VITE_DROP_DEBUGGER: string