diff --git a/.env.localhost b/.env.localhost index cebbe88..d8f8dfb 100644 --- a/.env.localhost +++ b/.env.localhost @@ -5,7 +5,7 @@ VITE_PUBLIC_PATH = '/' VITE_APP_USE_MOCK = false # proxy -VITE_PROXY = [["/api-local","http://127.0.0.1:8002/api"],["/api-mock","http://127.0.0.1:8003"]] +VITE_PROXY = [["/api-local","https://lcxj-test.t-aaron.com/api"],["/api-mock","http://127.0.0.1:8003"]] # base api VITE_APP_GLOB_BASE_API = '/api-local' diff --git a/package-lock.json b/package-lock.json index 2f8f5ed..e48f813 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3475,6 +3475,22 @@ "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==", "dev": true }, + "echarts": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.1.tgz", + "integrity": "sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==", + "requires": { + "tslib": "2.3.0", + "zrender": "5.4.1" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } + }, "ee-first": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz", @@ -8454,6 +8470,21 @@ "dev": true } } + }, + "zrender": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.1.tgz", + "integrity": "sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==", + "requires": { + "tslib": "2.3.0" + }, + "dependencies": { + "tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" + } + } } } } diff --git a/package.json b/package.json index d806ab1..02d1bd4 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "ali-oss": "^6.17.1", "axios": "^0.26.1", "dayjs": "^1.11.2", + "echarts": "^5.4.1", "mockjs": "^1.1.0", "ol": "^6.15.1", "pinia": "^2.0.13", diff --git a/src/views/dashboard/components/Echarts.vue b/src/views/dashboard/components/Echarts.vue new file mode 100644 index 0000000..015d818 --- /dev/null +++ b/src/views/dashboard/components/Echarts.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/src/views/dashboard/components/OneMap.vue b/src/views/dashboard/components/OneMap.vue index 508c194..e38469f 100644 --- a/src/views/dashboard/components/OneMap.vue +++ b/src/views/dashboard/components/OneMap.vue @@ -32,7 +32,7 @@ - +