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 0000000..e362e97 Binary files /dev/null and b/public/img/energySourcesProvince/map3.png differ diff --git a/public/img/energySourcesProvince/map4.png b/public/img/energySourcesProvince/map4.png new file mode 100644 index 0000000..4c17fd8 Binary files /dev/null and b/public/img/energySourcesProvince/map4.png differ 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(() => {