From 64af029c86fd0f5f29237be11f7d58c9ba8aca7a Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 11 Apr 2024 15:25:48 +0800
Subject: [PATCH] =?UTF-8?q?CRM:=20=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E7=94=BB=E5=83=8F=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.local => .env.local-dev | 0
package.json | 6 ++---
src/components/DictSelect/src/DictSelect.vue | 1 -
... => CrmStatisticsPortraitCustomerArea.vue} | 24 +++++++++----------
...CrmStatisticsPortraitCustomerIndustry.vue} | 7 +++---
...=> CrmStatisticsPortraitCustomerLevel.vue} | 8 +++----
...> CrmStatisticsPortraitCustomerSource.vue} | 7 +++---
src/views/crm/statistics/portrait/index.vue | 17 +++++++------
8 files changed, 34 insertions(+), 36 deletions(-)
rename .env.local => .env.local-dev (100%)
rename src/views/crm/statistics/portrait/components/{CustomerAddress.vue => CrmStatisticsPortraitCustomerArea.vue} (88%)
rename src/views/crm/statistics/portrait/components/{CustomerIndustry.vue => CrmStatisticsPortraitCustomerIndustry.vue} (95%)
rename src/views/crm/statistics/portrait/components/{CustomerLevel.vue => CrmStatisticsPortraitCustomerLevel.vue} (94%)
rename src/views/crm/statistics/portrait/components/{CustomerSource.vue => CrmStatisticsPortraitCustomerSource.vue} (95%)
diff --git a/.env.local b/.env.local-dev
similarity index 100%
rename from .env.local
rename to .env.local-dev
diff --git a/package.json b/package.json
index 58460358..8fa4e871 100644
--- a/package.json
+++ b/package.json
@@ -6,11 +6,11 @@
"private": false,
"scripts": {
"i": "pnpm install",
- "dev": "vite --mode local-dev",
+ "local-server": "vite --mode local-dev",
"dev-server": "vite --mode dev",
"ts:check": "vue-tsc --noEmit",
- "build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
- "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
+ "build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
+ "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
"build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
diff --git a/src/components/DictSelect/src/DictSelect.vue b/src/components/DictSelect/src/DictSelect.vue
index 54279cec..2d59e23c 100644
--- a/src/components/DictSelect/src/DictSelect.vue
+++ b/src/components/DictSelect/src/DictSelect.vue
@@ -33,7 +33,6 @@ import { getBoolDictOptions, getIntDictOptions, getStrDictOptions } from '@/util
// 接受父组件参数
interface Props {
- modelValue?: any // 值
dictType: string // 字典类型
valueType: string // 字典值类型
}
diff --git a/src/views/crm/statistics/portrait/components/CustomerAddress.vue b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerArea.vue
similarity index 88%
rename from src/views/crm/statistics/portrait/components/CustomerAddress.vue
rename to src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerArea.vue
index f31c7963..1b5b3b30 100644
--- a/src/views/crm/statistics/portrait/components/CustomerAddress.vue
+++ b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerArea.vue
@@ -25,8 +25,7 @@ import {
StatisticsPortraitApi
} from '@/api/crm/statistics/portrait'
-// TODO @puhui999：address 换成 area 会更合适哈，
-defineOptions({ name: 'CustomerAddress' })
+defineOptions({ name: 'CustomerArea' })
const props = defineProps<{ queryParams: any }>() // 搜索参数
// 注册地图
@@ -107,22 +106,21 @@ const loadData = async () => {
areaStatisticsList.value = areaList.map((item: CrmStatisticCustomerAreaRespVO) => {
return {
...item,
- areaName: item.areaName // TODO @puhui999：这里最好注释下原因哈
- .replace('维吾尔自治区', '')
- .replace('壮族自治区', '')
- .replace('回族自治区', '')
- .replace('自治区', '')
- .replace('省', '')
+ areaName: item.areaName // TODO @puhui999：这里最好注释下原因哈, 🤣 我从 mall copy 过来的
+ // .replace('维吾尔自治区', '')
+ // .replace('壮族自治区', '')
+ // .replace('回族自治区', '')
+ // .replace('自治区', '')
+ // .replace('省', '')
}
})
- builderLeftMap()
- builderRightMap()
+ buildLeftMap()
+ buildRightMap()
loading.value = false
}
defineExpose({ loadData })
-// TODO @puhui999：builder 改成 build 更合理哈
-const builderLeftMap = () => {
+const buildLeftMap = () => {
let min = 0
let max = 0
echartsOption.series![0].data = areaStatisticsList.value.map((item) => {
@@ -134,7 +132,7 @@ const builderLeftMap = () => {
echartsOption.visualMap!['max'] = max
}
-const builderRightMap = () => {
+const buildRightMap = () => {
let min = 0
let max = 0
echartsOption2.series![0].data = areaStatisticsList.value.map((item) => {
diff --git a/src/views/crm/statistics/portrait/components/CustomerIndustry.vue b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerIndustry.vue
similarity index 95%
rename from src/views/crm/statistics/portrait/components/CustomerIndustry.vue
rename to src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerIndustry.vue
index d1f3c173..f41fdd9c 100644
--- a/src/views/crm/statistics/portrait/components/CustomerIndustry.vue
+++ b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerIndustry.vue
@@ -39,7 +39,7 @@ import {
} from '@/api/crm/statistics/portrait'
import { EChartsOption } from 'echarts'
import { DICT_TYPE, getDictLabel } from '@/utils/dict'
-import { getSumValue } from '@/utils'
+import { erpCalculatePercentage, getSumValue } from '@/utils'
import { isEmpty } from '@/utils/is'
defineOptions({ name: 'CustomerIndustry' })
@@ -185,8 +185,9 @@ const calculateProportion = (sourceList: CrmStatisticCustomerIndustryRespVO[]) =
const sumDealCount = getSumValue(list.map((item) => item.dealCount))
list.forEach((item) => {
item.industryPortion =
- item.customerCount === 0 ? 0 : ((item.customerCount / sumCustomerCount) * 100).toFixed(2)
- item.dealPortion = item.dealCount === 0 ? 0 : ((item.dealCount / sumDealCount) * 100).toFixed(2)
+ item.customerCount === 0 ? 0 : erpCalculatePercentage(item.customerCount, sumCustomerCount)
+ item.dealPortion =
+ item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount)
})
}
diff --git a/src/views/crm/statistics/portrait/components/CustomerLevel.vue b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerLevel.vue
similarity index 94%
rename from src/views/crm/statistics/portrait/components/CustomerLevel.vue
rename to src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerLevel.vue
index 2f81c0fc..3025ae8b 100644
--- a/src/views/crm/statistics/portrait/components/CustomerLevel.vue
+++ b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerLevel.vue
@@ -39,7 +39,7 @@ import {
} from '@/api/crm/statistics/portrait'
import { EChartsOption } from 'echarts'
import { DICT_TYPE, getDictLabel } from '@/utils/dict'
-import { getSumValue } from '@/utils'
+import { erpCalculatePercentage, getSumValue } from '@/utils'
import { isEmpty } from '@/utils/is'
defineOptions({ name: 'CustomerSource' })
@@ -184,10 +184,10 @@ const calculateProportion = (levelList: CrmStatisticCustomerLevelRespVO[]) => {
const sumCustomerCount = getSumValue(list.map((item) => item.customerCount))
const sumDealCount = getSumValue(list.map((item) => item.dealCount))
list.forEach((item) => {
- // TODO @puhui999：可以使用 erpCalculatePercentage 方法
item.levelPortion =
- item.customerCount === 0 ? 0 : ((item.customerCount / sumCustomerCount) * 100).toFixed(2)
- item.dealPortion = item.dealCount === 0 ? 0 : ((item.dealCount / sumDealCount) * 100).toFixed(2)
+ item.customerCount === 0 ? 0 : erpCalculatePercentage(item.customerCount, sumCustomerCount)
+ item.dealPortion =
+ item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount)
})
}
diff --git a/src/views/crm/statistics/portrait/components/CustomerSource.vue b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerSource.vue
similarity index 95%
rename from src/views/crm/statistics/portrait/components/CustomerSource.vue
rename to src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerSource.vue
index af1708fc..2bbc7c2e 100644
--- a/src/views/crm/statistics/portrait/components/CustomerSource.vue
+++ b/src/views/crm/statistics/portrait/components/CrmStatisticsPortraitCustomerSource.vue
@@ -40,7 +40,7 @@ import {
import { EChartsOption } from 'echarts'
import { DICT_TYPE, getDictLabel } from '@/utils/dict'
import { isEmpty } from '@/utils/is'
-import { getSumValue } from '@/utils'
+import { erpCalculatePercentage, getSumValue } from '@/utils'
defineOptions({ name: 'CustomerSource' })
const props = defineProps<{ queryParams: any }>() // 搜索参数
@@ -185,8 +185,9 @@ const calculateProportion = (sourceList: CrmStatisticCustomerSourceRespVO[]) =>
const sumDealCount = getSumValue(list.map((item) => item.dealCount))
list.forEach((item) => {
item.sourcePortion =
- item.customerCount === 0 ? 0 : ((item.customerCount / sumCustomerCount) * 100).toFixed(2)
- item.dealPortion = item.dealCount === 0 ? 0 : ((item.dealCount / sumDealCount) * 100).toFixed(2)
+ item.customerCount === 0 ? 0 : erpCalculatePercentage(item.customerCount, sumCustomerCount)
+ item.dealPortion =
+ item.dealCount === 0 ? 0 : erpCalculatePercentage(item.dealCount, sumDealCount)
})
}
diff --git a/src/views/crm/statistics/portrait/index.vue b/src/views/crm/statistics/portrait/index.vue
index 88793837..0cbaf221 100644
--- a/src/views/crm/statistics/portrait/index.vue
+++ b/src/views/crm/statistics/portrait/index.vue
@@ -61,19 +61,19 @@
<el-tabs v-model="activeTab">
<!-- 城市分布分析 -->
<el-tab-pane label="城市分布分析" lazy name="addressRef">
- <CustomerAddress ref="addressRef" :query-params="queryParams" />
+ <CrmStatisticsPortraitCustomerArea ref="addressRef" :query-params="queryParams" />
</el-tab-pane>
<!-- 客户级别分析 -->
<el-tab-pane label="客户级别分析" lazy name="levelRef">
- <CustomerLevel ref="levelRef" :query-params="queryParams" />
+ <CrmStatisticsPortraitCustomerLevel ref="levelRef" :query-params="queryParams" />
</el-tab-pane>
<!-- 客户来源分析 -->
<el-tab-pane label="客户来源分析" lazy name="sourceRef">
- <CustomerSource ref="sourceRef" :query-params="queryParams" />
+ <CrmStatisticsPortraitCustomerSource ref="sourceRef" :query-params="queryParams" />
</el-tab-pane>
<!-- 客户行业分析 -->
<el-tab-pane label="客户行业分析" lazy name="industryRef">
- <CustomerIndustry ref="industryRef" :query-params="queryParams" />
+ <CrmStatisticsPortraitCustomerIndustry ref="industryRef" :query-params="queryParams" />
</el-tab-pane>
</el-tabs>
</el-col>
@@ -85,11 +85,10 @@ import * as UserApi from '@/api/system/user'
import { useUserStore } from '@/store/modules/user'
import { beginOfDay, defaultShortcuts, endOfDay, formatDate } from '@/utils/formatTime'
import { defaultProps, handleTree } from '@/utils/tree'
-// TODO @puhui999：最好命名带上模块名，如：CrmStatisticsPortrait
-import CustomerAddress from './components/CustomerAddress.vue'
-import CustomerIndustry from './components/CustomerIndustry.vue'
-import CustomerSource from './components/CustomerSource.vue'
-import CustomerLevel from './components/CustomerLevel.vue'
+import CrmStatisticsPortraitCustomerArea from './components/CrmStatisticsPortraitCustomerArea.vue'
+import CrmStatisticsPortraitCustomerIndustry from './components/CrmStatisticsPortraitCustomerIndustry.vue'
+import CrmStatisticsPortraitCustomerSource from './components/CrmStatisticsPortraitCustomerSource.vue'
+import CrmStatisticsPortraitCustomerLevel from './components/CrmStatisticsPortraitCustomerLevel.vue'
defineOptions({ name: 'CrmStatisticsPortrait' })