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 bb7ba1c82f228ce889e25d84a0de5120b60d20d4..533848eb496acff2014c18a91dee3df47cfdc5de 100644 --- a/package.json +++ b/package.json @@ -6,11 +6,11 @@ "private": false, "scripts": { "i": "pnpm install", - "dev": "vite --mode local-dev", - "dev-server": "vite --mode dev", + "local-dev": "vite --mode local-dev", + "dev": "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: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/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 97de9afc7186b6a22ca67ac0e984625b010e5877..4459e69e8a2060f3d90915200ad1cf4852abec92 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -32,6 +32,25 @@ 格式为 {{ fileType.join('/') }} 的文件 + diff --git a/src/plugins/echarts/index.ts b/src/plugins/echarts/index.ts index c7ad7a176e047c9faa6f464eb6d9eb5a1137ee8f..18d05aabfd958d76aa9ba5e9bb98a36da89ae786 100644 --- a/src/plugins/echarts/index.ts +++ b/src/plugins/echarts/index.ts @@ -2,23 +2,24 @@ import * as echarts from 'echarts/core' import { BarChart, + FunnelChart, + GaugeChart, LineChart, - PieChart, MapChart, PictorialBarChart, - RadarChart, - GaugeChart + PieChart, + RadarChart } from 'echarts/charts' import { - TitleComponent, - TooltipComponent, - GridComponent, - PolarComponent, AriaComponent, - ParallelComponent, + GridComponent, LegendComponent, + ParallelComponent, + PolarComponent, + TitleComponent, ToolboxComponent, + TooltipComponent, VisualMapComponent } from 'echarts/components' @@ -41,7 +42,8 @@ echarts.use([ CanvasRenderer, PictorialBarChart, RadarChart, - GaugeChart + GaugeChart, + FunnelChart ]) export default echarts diff --git a/src/views/crm/customer/CustomerImportForm.vue b/src/views/crm/customer/CustomerImportForm.vue index 7f92dc839ad039eb1675dfa6a99fdf29086584f1..17721a18066e6fb0e67fff44d50b1072cf2544b1 100644 --- a/src/views/crm/customer/CustomerImportForm.vue +++ b/src/views/crm/customer/CustomerImportForm.vue @@ -1,16 +1,24 @@