From 5d7447740b54ac68924bf80b8c9c2e361acdc2bc Mon Sep 17 00:00:00 2001 From: jn517618 Date: Fri, 5 Jan 2024 09:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 5 + package.json | 1 + public/img/energySourcesProvince/map3.png | Bin 0 -> 7734 bytes public/img/energySourcesProvince/map4.png | Bin 0 -> 2601 bytes public/index.html | 3 +- src/main.js | 6 +- .../component/electricity.vue | 1 + .../component/emissionAll.vue | 1 + .../component/intensity.vue | 1 + .../energySourcesProvince/component/maps.vue | 66 +- .../component/measure.vue | 1 + .../component/pathMap.vue | 653 ++++++++++++++++++ .../component/statistics.vue | 1 + .../component/tendency.vue | 1 + .../component/togetherPercent.vue | 1 + src/views/energySourcesProvince/index.vue | 3 +- 16 files changed, 732 insertions(+), 12 deletions(-) create mode 100644 public/img/energySourcesProvince/map3.png create mode 100644 public/img/energySourcesProvince/map4.png create mode 100644 src/views/energySourcesProvince/component/pathMap.vue diff --git a/package-lock.json b/package-lock.json index 946f74d..853da9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6154,6 +6154,11 @@ "integrity": "sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==", "dev": true }, + "highcharts": { + "version": "9.3.3", + "resolved": "https://registry.npmmirror.com/highcharts/-/highcharts-9.3.3.tgz", + "integrity": "sha512-QeOvm6cifeZYYdTLm4IxZsXcOE9c4xqfs0z0OJJ0z7hhA9WG0rmcVAyuIp5HBl/znjA/ayYHmpYjBYD/9PG4Fg==" + }, "highlight.js": { "version": "10.7.3", "resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.7.3.tgz", diff --git a/package.json b/package.json index 2bf357d..2e76a2b 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "echarts": "^5.3.3", "element-china-area-data": "^5.0.2", "element-ui": "^2.15.6", + "highcharts": "^9.3.3", "js-base64": "^2.5.1", "js-cookie": "^2.2.0", "js-md5": "^0.7.3", diff --git a/public/img/energySourcesProvince/map3.png b/public/img/energySourcesProvince/map3.png new file mode 100644 index 0000000000000000000000000000000000000000..e362e9798ba48db67a487a41992ec90ca2587fd6 GIT binary patch literal 7734 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 KQfBz~)Bge9sMjC> literal 0 HcmV?d00001 diff --git a/public/img/energySourcesProvince/map4.png b/public/img/energySourcesProvince/map4.png new file mode 100644 index 0000000000000000000000000000000000000000..4c17fd89587c6ec008a67d0167c1b463292dc22f GIT binary patch literal 2601 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 LNkvXXu0mjf?zZ(m literal 0 HcmV?d00001 diff --git a/public/index.html b/public/index.html index 68a2b83..ed75b7a 100644 --- a/public/index.html +++ b/public/index.html @@ -24,6 +24,8 @@ + + 嘉禾县铸锻造工业互联网平台 @@ -119,7 +121,6 @@ - \ No newline at end of file diff --git a/src/main.js b/src/main.js index aec15ea..f97ffe8 100644 --- a/src/main.js +++ b/src/main.js @@ -89,7 +89,11 @@ import moment from 'moment' import 'moment/locale/zh-cn' Vue.prototype.$moment = moment - +import BaiduMap from 'vue-baidu-map' +Vue.use(BaiduMap, { + /* Visit http://lbsyun.baidu.com/apiconsole/key for details about app key. */ + ak: "pHiErcuhbkhahttKsqCn4WEFWuFeF8wU" +}) new Vue({ router, diff --git a/src/views/energySourcesProvince/component/electricity.vue b/src/views/energySourcesProvince/component/electricity.vue index b6903d9..7dc2f9f 100644 --- a/src/views/energySourcesProvince/component/electricity.vue +++ b/src/views/energySourcesProvince/component/electricity.vue @@ -210,6 +210,7 @@ export default { position: absolute; bottom: 0.24rem; left: 0.24rem; + z-index: 9; .tit-r { font-size: 0.14rem; diff --git a/src/views/energySourcesProvince/component/emissionAll.vue b/src/views/energySourcesProvince/component/emissionAll.vue index e4e6d26..cdc37e8 100644 --- a/src/views/energySourcesProvince/component/emissionAll.vue +++ b/src/views/energySourcesProvince/component/emissionAll.vue @@ -219,6 +219,7 @@ export default { position: absolute; top: 0.86rem; left: 0.24rem; + z-index: 9; .tit-r { font-size: 0.14rem; diff --git a/src/views/energySourcesProvince/component/intensity.vue b/src/views/energySourcesProvince/component/intensity.vue index 2c7ed51..2169f55 100644 --- a/src/views/energySourcesProvince/component/intensity.vue +++ b/src/views/energySourcesProvince/component/intensity.vue @@ -210,6 +210,7 @@ export default { position: absolute; bottom: 0.24rem; right: 0.24rem; + z-index: 9; .tit-r { font-size: 0.14rem; diff --git a/src/views/energySourcesProvince/component/maps.vue b/src/views/energySourcesProvince/component/maps.vue index 9520e6b..52b3635 100644 --- a/src/views/energySourcesProvince/component/maps.vue +++ b/src/views/energySourcesProvince/component/maps.vue @@ -15,15 +15,24 @@ - +
+ +
+
+ + + diff --git a/src/views/energySourcesProvince/component/measure.vue b/src/views/energySourcesProvince/component/measure.vue index 0d894b2..d6bca25 100644 --- a/src/views/energySourcesProvince/component/measure.vue +++ b/src/views/energySourcesProvince/component/measure.vue @@ -168,6 +168,7 @@ export default { position: absolute; top: 0.86rem; right: 0.24rem; + z-index: 9; .tit-r { font-size: 0.14rem; diff --git a/src/views/energySourcesProvince/component/pathMap.vue b/src/views/energySourcesProvince/component/pathMap.vue new file mode 100644 index 0000000..865c21f --- /dev/null +++ b/src/views/energySourcesProvince/component/pathMap.vue @@ -0,0 +1,653 @@ + + + + + + \ No newline at end of file diff --git a/src/views/energySourcesProvince/component/statistics.vue b/src/views/energySourcesProvince/component/statistics.vue index e41c4a7..6191ff1 100644 --- a/src/views/energySourcesProvince/component/statistics.vue +++ b/src/views/energySourcesProvince/component/statistics.vue @@ -156,6 +156,7 @@ export default { position: absolute; top: 3.3rem; left: 0.24rem; + z-index: 9; .tit-r { diff --git a/src/views/energySourcesProvince/component/tendency.vue b/src/views/energySourcesProvince/component/tendency.vue index 9054a99..ce95523 100644 --- a/src/views/energySourcesProvince/component/tendency.vue +++ b/src/views/energySourcesProvince/component/tendency.vue @@ -211,6 +211,7 @@ export default { top: 4.69rem; right: 0.24rem; + z-index: 9; .tit-r { font-size: 0.14rem; color: rgba($color: #fff, $alpha: 0.4); diff --git a/src/views/energySourcesProvince/component/togetherPercent.vue b/src/views/energySourcesProvince/component/togetherPercent.vue index dc7ae50..811165f 100644 --- a/src/views/energySourcesProvince/component/togetherPercent.vue +++ b/src/views/energySourcesProvince/component/togetherPercent.vue @@ -222,6 +222,7 @@ export default { position: absolute; bottom: 0.24rem; right: 4.94rem; + z-index: 9; .tit-r { font-size: 0.14rem; diff --git a/src/views/energySourcesProvince/index.vue b/src/views/energySourcesProvince/index.vue index 0558102..3bf4058 100644 --- a/src/views/energySourcesProvince/index.vue +++ b/src/views/energySourcesProvince/index.vue @@ -40,7 +40,6 @@ import intensity from "./component/intensity.vue"; import maps from "./component/maps.vue"; import { getEntrustDay, getDataAcquisition } from "@/api/monitoring/monitoring"; import { setRemPc } from "@/util/util"; - export default { data() { return { @@ -56,7 +55,7 @@ export default { ringPercent, togetherPercent, intensity, - maps + maps, }, created() { this.$nextTick(() => {