diff --git a/src/router/index.js b/src/router/index.js index bd3fbe5a..903016e6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -268,6 +268,11 @@ router.beforeEach((to, from, next) => { name: "社区党建", // url: "visual/basicinfo/basicInfoMain", children: [ + { + url: "/visual/communityParty/gridParty", + name: "网格党建平面图", + id: "5feawfwaefwa579", + }, { url: "/visual/communityParty/party", name: "党员信息统计", diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue new file mode 100644 index 00000000..fbe6af59 --- /dev/null +++ b/src/views/modules/visual/communityParty/gridParty.vue @@ -0,0 +1,736 @@ + + + + + + + diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue new file mode 100644 index 00000000..55041b78 --- /dev/null +++ b/src/views/modules/visual/communityParty/memberInfo.vue @@ -0,0 +1,251 @@ + + + + + + diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 56692699..e1490b41 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -32,6 +32,8 @@ class="ol-popup-closer"> + 更多>>>> @@ -668,6 +670,7 @@ const vueGis = { var container = document.getElementById("popup"); var closer = document.getElementById("popup-closer"); var content = document.getElementById("popup-content"); + var goMore = document.getElementById("popup-goMore") ? document.getElementById("popup-goMore") : null // 创建一个弹窗 Overlay 对象 this.overlay = new Overlay({ @@ -690,6 +693,11 @@ const vueGis = { closer.blur(); return false; }; + if (goMore) { + goMore.onclick = function () { + _that.$emit('lookMore') + }; + } }, //注册地图点击事件 @@ -721,7 +729,12 @@ const vueGis = { }); }, - handleShowPopup (showData, coordinate) { + handleShowPopup (showData, coordinate, isShowMore) { + if (isShowMore) { + document.getElementById("popup-goMore").style.display = 'block' + } else { + document.getElementById("popup-goMore").style.display = 'none' + } console.log(this.overlay.getElement()) let content = document.getElementById("popup-content"); this.overlay.getElement().style.display = 'block'