diff --git a/components.d.ts b/components.d.ts index 995b4b1..6dc0358 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,6 +9,8 @@ declare module 'vue' { export interface GlobalComponents { BarCom: typeof import('./src/components/echartsCom/barCom.vue')['default'] ElButton: typeof import('element-plus/es')['ElButton'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] + EquipmentDialog: typeof import('./src/components/customCom/equipmentDialog.vue')['default'] EquipmentLeasing: typeof import('./src/components/customCom/equipmentLeasing.vue')['default'] HotProvider: typeof import('./src/components/customCom/hotProvider.vue')['default'] LineCom: typeof import('./src/components/echarts/lineCom.vue')['default'] diff --git a/env.d.ts b/env.d.ts index f218ff3..c10a42c 100644 --- a/env.d.ts +++ b/env.d.ts @@ -1,2 +1,3 @@ /// -declare module "nprogress" \ No newline at end of file +declare module "nprogress" +declare module "BMap" \ No newline at end of file diff --git a/env/.env b/env/.env index 7cc3af2..3e92b94 100644 --- a/env/.env +++ b/env/.env @@ -1,4 +1,8 @@ # port 端口号 VITE_PORT = 8888 # 自动打开浏览器 -VITE_OPEN = true \ No newline at end of file +VITE_OPEN = true +# 百度地图key +VITE_AK = "cClgLBaLgGUdQDilX9dGvieL" +# 百度地图版本 +VITE_AK_v = "2" diff --git a/env/.env.dev b/env/.env.dev index 2781efa..39ba768 100644 --- a/env/.env.dev +++ b/env/.env.dev @@ -3,4 +3,9 @@ VITE_ENV = 'development' VITE_BUILD_MODE = 'dev' # 开发环境接口地址 -VITE_API_URL = '/proxyApi' \ No newline at end of file +VITE_API_URL = '/proxyApi' +# 百度地图key +VITE_AK = "cClgLBaLgGUdQDilX9dGvieL" + +# 百度地图版本 +VITE_AK_v = "2" \ No newline at end of file diff --git a/env/.env.production b/env/.env.production index ff00d18..11fcc46 100644 --- a/env/.env.production +++ b/env/.env.production @@ -3,4 +3,8 @@ VITE_ENV = 'production' VITE_BUILD_MODE = 'prod' # 线上环境接口地址 -VITE_API_URL = 'https://production.com' \ No newline at end of file +VITE_API_URL = 'https://production.com' +# 百度地图key +VITE_AK = "cClgLBaLgGUdQDilX9dGvieL" +# 百度地图版本 +VITE_AK_v = "2" \ No newline at end of file diff --git a/env/.env.sit b/env/.env.sit index 705ebda..f75f7a7 100644 --- a/env/.env.sit +++ b/env/.env.sit @@ -3,4 +3,8 @@ VITE_ENV = 'production' VITE_BUILD_MODE = 'sit' # 线上环境接口地址 -VITE_API_URL = 'https://testSit.com' \ No newline at end of file +VITE_API_URL = 'https://testSit.com' +# 百度地图key +VITE_AK = "cClgLBaLgGUdQDilX9dGvieL" +# 百度地图版本 +VITE_AK_v = "2" \ No newline at end of file diff --git a/env/.env.uat b/env/.env.uat index d1d891b..63e7629 100644 --- a/env/.env.uat +++ b/env/.env.uat @@ -4,4 +4,8 @@ VITE_ENV = 'production' VITE_BUILD_MODE = 'uat' # 线上环境接口地址 -VITE_API_URL = 'https://testUat.com' \ No newline at end of file +VITE_API_URL = 'https://testUat.com' +# 百度地图key +VITE_AK = "cClgLBaLgGUdQDilX9dGvieL" +# 百度地图版本 +VITE_AK_v = "2" \ No newline at end of file diff --git a/index.html b/index.html index a888544..2938b2d 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ Vite App +
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7014f08..45e1230 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ dependencies: vue: specifier: ^3.3.4 version: 3.3.4 + vue-baidu-map-3x: + specifier: ^1.0.35 + version: 1.0.35(vue@3.3.4) vue-router: specifier: ^4.2.5 version: 4.2.5(vue@3.3.4) @@ -1015,6 +1018,32 @@ packages: resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==} engines: {node: '>=8'} + /bmaplib.curveline@1.0.0: + resolution: {integrity: sha512-9wcFMVhiYxNPqpvsLDAADn3qDhNzXp2mA6VyHSHg2XOAgSooC7ZiujdFhy0sp+0QYjTfJ/MjmLuNoUg2HHxH4Q==} + dev: false + + /bmaplib.distancetool@1.0.2: + resolution: {integrity: sha512-EvxMnQRH6xM036zx5OLPyTg5tMCTbFBuGTTHOtExLy2/T0X6v5Va0YE7c3IPm/a/Eo5V/ynYpOLOLZbRY8ccyA==} + dev: false + + /bmaplib.heatmap@1.0.4: + resolution: {integrity: sha512-rmhqUARBpUSJ9jXzUI2j7dIOqnc38bqubkx/8a349U2qtw/ulLUwyzRD535OrA8G7w5cz4aPKm6/rNvUAarg/Q==} + dev: false + + /bmaplib.lushu@1.0.7: + resolution: {integrity: sha512-LVvgpESPii6xGxyjnQjq8u+ic4NjvhdCPV/RiSS/PGTUdZKeTDS7prSpleJLZH3ES0+oc0gYn8bw0LtPYUSz2w==} + dev: false + + /bmaplib.markerclusterer@1.0.13: + resolution: {integrity: sha512-VrLyWSiuDEVNi0yUfwOhFQ6z1oEEHS4w36GNu3iASu6p52QIx9uAXMUkuSCHReNR0bj2Cp9SA1dSx5RpojXajQ==} + dependencies: + bmaplib.texticonoverlay: 1.0.2 + dev: false + + /bmaplib.texticonoverlay@1.0.2: + resolution: {integrity: sha512-4ZTWr4ZP3B6qEWput5Tut16CfZgII38YwM3bpyb4gFTQyORlKYryFp9WHWrwZZaHlOyYDAXG9SX0hka43jTADg==} + dev: false + /boolbase@1.0.0: resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==} dev: false @@ -2139,6 +2168,10 @@ packages: source-map-support: 0.5.21 dev: false + /tiny-emitter@2.1.0: + resolution: {integrity: sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==} + dev: false + /to-fast-properties@2.0.0: resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} engines: {node: '>=4'} @@ -2346,6 +2379,21 @@ packages: optionalDependencies: fsevents: 2.3.3 + /vue-baidu-map-3x@1.0.35(vue@3.3.4): + resolution: {integrity: sha512-1FDzxgd+X7MVcG8JbyyxDOSYRDUi96qEuuNICQmwlAE/EDwf4vz1oYRhRz05s/MuDpW7aIBlubF/PlSTpBlUEw==} + peerDependencies: + vue: ^3.2.25 + dependencies: + bmaplib.curveline: 1.0.0 + bmaplib.distancetool: 1.0.2 + bmaplib.heatmap: 1.0.4 + bmaplib.lushu: 1.0.7 + bmaplib.markerclusterer: 1.0.13 + tiny-emitter: 2.1.0 + vue: 3.3.4 + vue-router: 4.2.5(vue@3.3.4) + dev: false + /vue-demi@0.12.5(vue@3.3.4): resolution: {integrity: sha512-BREuTgTYlUr0zw0EZn3hnhC3I6gPWv+Kwh4MCih6QcAeaTlaIX0DwOVN0wHej7hSvDPecz4jygy/idsgKfW58Q==} engines: {node: '>=12'} diff --git a/src/App.vue b/src/App.vue index 023235c..fa60f12 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,6 +2,8 @@ \ No newline at end of file diff --git a/src/components/customCom/equipmentLeasing.vue b/src/components/customCom/equipmentLeasing.vue index 373caa4..9a80d3e 100644 --- a/src/components/customCom/equipmentLeasing.vue +++ b/src/components/customCom/equipmentLeasing.vue @@ -19,13 +19,14 @@ - + + 添加自定义覆盖物 + + +
+

图示中为房产覆盖物，鼠标移到覆盖物上，自动显示房屋套数

+ + + diff --git a/src/components/mapBaidu/mapLine.vue b/src/components/mapBaidu/mapLine.vue index e69de29..0a15aa5 100644 --- a/src/components/mapBaidu/mapLine.vue +++ b/src/components/mapBaidu/mapLine.vue @@ -0,0 +1,105 @@ + + + + + \ No newline at end of file diff --git a/src/components/mapBaidu/mapStart.png b/src/components/mapBaidu/mapStart.png new file mode 100644 index 0000000..f442395 Binary files /dev/null and b/src/components/mapBaidu/mapStart.png differ diff --git a/src/main.ts b/src/main.ts index 1be882a..e7c8d5e 100644 --- a/src/main.ts +++ b/src/main.ts @@ -11,12 +11,7 @@ import highcharts from 'highcharts'; import highcharts3d from 'highcharts/highcharts-3d'; // 调用3d图表 highcharts3d(highcharts); - -import BaiduMap from 'vue-baidu-map' -Vue.use(BaiduMap, { - ak: 'U4Bn9fW4tEtgEOtQ29cTpIBm47Ey4LCX'//百度地图密钥 -}); const app = createApp(App) app.use(createPinia()) diff --git a/src/assets/styles/common.scss b/src/style/scss/common.scss similarity index 100% rename from src/assets/styles/common.scss rename to src/style/scss/common.scss diff --git a/src/style/scss/index.scss b/src/style/scss/index.scss new file mode 100644 index 0000000..9f20023 --- /dev/null +++ b/src/style/scss/index.scss @@ -0,0 +1,5 @@ +@import './variable.scss'; +@import './mixin.scss'; +@import './common.module.scss'; +@import './nprogress.scss'; +@import './common.scss'; \ No newline at end of file diff --git a/src/assets/styles/nprogress.scss b/src/style/scss/nprogress.scss similarity index 100% rename from src/assets/styles/nprogress.scss rename to src/style/scss/nprogress.scss diff --git a/src/style/scss/vantReset.scss b/src/style/scss/vantReset.scss deleted file mode 100644 index effa2c4..0000000 --- a/src/style/scss/vantReset.scss +++ /dev/null @@ -1,4 +0,0 @@ -.van-button--primary { - background-color: $main-color; - border: $main-color; -} diff --git a/src/views/echarts/index.vue b/src/views/echarts/index.vue index 6df5516..b9e499a 100644 --- a/src/views/echarts/index.vue +++ b/src/views/echarts/index.vue @@ -1,12 +1,15 @@ @@ -54,6 +57,20 @@ import mapEcharts from "../../components/echartsCom/mapEcharts.vue" import barCom from "../../components/echartsCom/barCom.vue" import Pie3dCom from "../../components/echartsCom/Pie3dCom.vue" import hotProvider from "../../components/customCom/hotProvider.vue" +import mapLine from "components/mapBaidu/mapLine.vue" + + + + + + + + + + + + + const lineComProps = reactive({ title: "折线图", legendDataList: ["Email"],//, "Union Ads", "Video Ads", "Direct", "Search Engine" diff --git a/vite.config.ts b/vite.config.ts index c2e7053..d5f0858 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -71,7 +71,7 @@ export default ({ mode }: any) => { scss: { // 两种方式都可以 additionalData: - "@import '@/style/scss/variable.scss';@import '@/style/scss/mixin.scss';@import '@/style/scss/vantReset.scss';" + "@import '@/style/scss/index.scss';" } }