diff --git a/public/baiduapi.js b/public/baiduapi.js index 3cee9ff..c189ded 100644 --- a/public/baiduapi.js +++ b/public/baiduapi.js @@ -1740,7 +1740,7 @@ window.BMAP_AUTHENTIC_KEY = "iSZit9hpxlgGq28nmIyFk8lQQ21widby"; B.url = B.N0[B.xz]; B.Rp = B.url.proto + B.url.domain.baidumap + "/"; B.jc = B.url.proto + ("2" == B.xz ? B.url.domain.main_domain_nocdn.other : B.url.domain.main_domain_nocdn.baidu) + "/"; - B.la = bmapcfg.home + B.la = bmapcfg&&bmapcfg.home // B.la = B.url.proto + ("2" == B.xz ? B.url.domain.main_domain_cdn.other[0] : B.url.domain.main_domain_nocdn.baidu) + "/"; B.gj = B.url.proto + B.url.domain.main_domain_cdn.webmap[0] + "/"; B.ZN = B.url.proto + B.url.domain.panoVerify + "/"; diff --git a/public/index.html b/public/index.html index d63d298..76e04fc 100644 --- a/public/index.html +++ b/public/index.html @@ -4,13 +4,17 @@ + + - - vue + + - +
diff --git a/src/assets/images/map/close.png b/src/assets/images/map/close.png new file mode 100644 index 0000000..6aba9f5 Binary files /dev/null and b/src/assets/images/map/close.png differ diff --git a/src/assets/images/map/dialogback.png b/src/assets/images/map/dialogback.png new file mode 100644 index 0000000..9780963 Binary files /dev/null and b/src/assets/images/map/dialogback.png differ diff --git a/src/assets/images/map/top01.png b/src/assets/images/map/top01.png new file mode 100644 index 0000000..4c58337 Binary files /dev/null and b/src/assets/images/map/top01.png differ diff --git a/src/assets/images/map/top02.png b/src/assets/images/map/top02.png new file mode 100644 index 0000000..79ccf31 Binary files /dev/null and b/src/assets/images/map/top02.png differ diff --git a/src/assets/images/map/top03.png b/src/assets/images/map/top03.png new file mode 100644 index 0000000..c9a3192 Binary files /dev/null and b/src/assets/images/map/top03.png differ diff --git a/src/assets/images/map/top04.png b/src/assets/images/map/top04.png new file mode 100644 index 0000000..4acff08 Binary files /dev/null and b/src/assets/images/map/top04.png differ diff --git a/src/assets/images/map/top05.png b/src/assets/images/map/top05.png new file mode 100644 index 0000000..44ecb86 Binary files /dev/null and b/src/assets/images/map/top05.png differ diff --git a/src/assets/images/map/top06.png b/src/assets/images/map/top06.png new file mode 100644 index 0000000..6c69525 Binary files /dev/null and b/src/assets/images/map/top06.png differ diff --git a/src/views/compositeIndex/components/mapWrap.vue b/src/views/compositeIndex/components/mapWrap.vue new file mode 100644 index 0000000..e724a5c --- /dev/null +++ b/src/views/compositeIndex/components/mapWrap.vue @@ -0,0 +1,135 @@ + + + diff --git a/src/views/compositeIndex/index.vue b/src/views/compositeIndex/index.vue index 25d8025..074ab53 100644 --- a/src/views/compositeIndex/index.vue +++ b/src/views/compositeIndex/index.vue @@ -4,7 +4,7 @@
- + > --> +
+ +
@@ -65,7 +68,8 @@ import Notification from "./components/notification"; import Endanger from "./components/endanger"; // import HomeMap from "./components/homeMap"; // import LineMap from "./components/lineMap" -import { topRanking } from '@/api/safetyIndex' +import mapWrap from "./components/mapWrap"; +import { topRanking } from "@/api/safetyIndex"; export default { name: "CompositeIndex", components: { @@ -75,12 +79,13 @@ export default { CompanyService, Notification, Endanger, + mapWrap, // HomeMap, // LineMap }, data() { return { - getPageUrl:'static/map.html', // 引入在线地图 + getPageUrl: "static/map.html", // 引入在线地图 options: [ { value: "1", @@ -92,10 +97,11 @@ export default { }, ], select_value: "地图", + mapData: [], }; }, mounted() { - this.get_rank() + //this.get_rank(); }, methods: { change_map(val) { @@ -109,13 +115,12 @@ export default { // 排名查询 async get_rank() { let params = { - scoreType: 'month' - } - let res = await topRanking(params) + scoreType: "month", + }; + let res = await topRanking(params); //console.log('restop',res); - let iframe_window = this.$refs.iframeDom.contentWindow - let data = res.data - iframe_window.postMessage(data,'*') + let iframe_window = this.$refs.iframeDom.contentWindow; + iframe_window.postMessage(res.data, "*"); }, }, }; @@ -170,4 +175,4 @@ export default { // } } } - \ No newline at end of file + diff --git a/src/views/factor/components/factorMap.vue b/src/views/factor/components/factorMap.vue index 905013f..a5f5926 100644 --- a/src/views/factor/components/factorMap.vue +++ b/src/views/factor/components/factorMap.vue @@ -37,10 +37,11 @@ export default { }, data() { return { - center_point: [121.619992, 30.025703], + center_point: window.$mapCfg.center, }; }, mounted() { + console.log(this.center_point) this.init_map(); }, methods: {