From b0f927b437aea9f5af91eac34927d2b8c83ad26e Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 15 Jun 2022 09:30:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=A4=9A=E5=85=83=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E4=B8=AD=E5=BF=83=E7=82=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?maporg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 53e007da..dbaf1df0 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -364,6 +364,9 @@ export default { } const { data, code, msg } = await requestPost(url, params) if (code === 0) { + this.agencyInfo.agencyLevel = data.agencyLevel, + this.agencyInfo.longitude = data.longitude, + this.agencyInfo.latitude = data.latitude let subPolygonList = [] data.children.forEach((item, index) => { if (item.coordinates && item.coordinates.length > 0) { From b11271fb98481fce1576a7232131ba60d31ea1aa Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 28 Jun 2022 15:39:28 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue | 3 ++- .../visual/communityGovern/duoyuanfuwu/pieOption.js | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index dbaf1df0..300d9e1b 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -111,6 +111,7 @@ const legendList = [ { name: '#8fc41e', icon: require('../../../../../assets/img/shuju/volunteer7.png') }, { name: '#00a1be', icon: require('../../../../../assets/img/shuju/volunteer8.png') }, { name: '#0067b6', icon: require('../../../../../assets/img/shuju/volunteer9.png') }, + { name: '#e5007f', icon: require('../../../../../assets/img/shuju/volunteer3.png') }, { name: '', icon: require('../../../../../assets/img/shuju/volunteer1.png') } ] const defaultLegendIcon = require('../../../../../assets/img/shuju/volunteer1.png') @@ -164,10 +165,10 @@ export default { require('../../../../../assets/img/shuju/volunteer5.png'), // 楼委会 require('../../../../../assets/img/shuju/volunteer7.png'), // 老友俱乐部 require('../../../../../assets/img/shuju/volunteer8.png'), // 治安巡逻 + require('../../../../../assets/img/shuju/volunteer3.png'), // 应急队伍 require('../../../../../assets/img/shuju/volunteer9.png'), // 其他 require('../../../../../assets/img/shuju/volunteer1.png'), // 采集员 require('../../../../../assets/img/shuju/volunteer2.png'), // 代办员 - require('../../../../../assets/img/shuju/volunteer3.png'), // 能人达人 require('../../../../../assets/img/shuju/volunteer6.png'), // 调解员 ], polygonList: [] diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js index ae6ffd8c..3afabd25 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/pieOption.js @@ -44,7 +44,7 @@ export function pieOption (_charts) { // tooltip: { // }, center: center, - radius: ['53%', '53.3%'], + radius: ['48%', '48.3%'], label: { show: false }, @@ -70,7 +70,7 @@ export function pieOption (_charts) { // name: 'Access From', type: 'pie', center: center, - radius: ['30%', '43%'], + radius: ['25%', '38%'], avoidLabelOverlap: false, // top: top + '%', // height: '80%', @@ -87,14 +87,14 @@ export function pieOption (_charts) { edgeDistance: 1, lineHeight: 15, color: '#fff', - fontSize: 10, + fontSize: 8, // distanceToLabelLine: -60, rich: { name: { padding: [0, 6, 0, 6] }, a: { - fontSize: 25, + fontSize: 23, color: '#fff', padding: [0, 6, 6, 6] }, @@ -110,9 +110,9 @@ export function pieOption (_charts) { labelLine: { show: false, smooth: 0.2, - length: 40, + length: 20, length2: 0, - maxSurfaceAngle: 80 + maxSurfaceAngle: 60 }, labelLayout: function (params) { From fe33533c21de36613e65b499a097dd08b9f64f1a Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 28 Jun 2022 16:26:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 300d9e1b..39a8cf28 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -62,7 +62,9 @@ @clickFeature="clickMap" :showIconLayer="true" :showPolygonLayer="true" + :showPolIconLayer="true" :clickType="'popup'" + :areaScale="0.1" :isAddOpenlay="true">
From c93bbb2a59314580675697a90d47074cf23e41b9 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 28 Jun 2022 17:35:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/components/screen-map/index.vue | 90 ++++++++++++++----- 1 file changed, 67 insertions(+), 23 deletions(-) diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 0d9f75ce..e85e184c 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -197,7 +197,7 @@ const vueGis = { //icon图标样式 iconUrlArray: [], iconTextColor: '#ffffff', - distanceMax: null,//显示的坐标距离中心点的范围 + distanceMax: null,//显示的坐标距离中心点的范围 input_lat: null, input_lon: null, @@ -207,7 +207,6 @@ const vueGis = { }, async mounted () { - }, methods: { showPosition () { @@ -231,7 +230,6 @@ const vueGis = { //初始化地图 this.initMap() - if (this.showPolIconLayer) { console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer) //初始化多边形标注图层 @@ -246,6 +244,7 @@ const vueGis = { this.loadPolygon() } + if (this.showIconLayer) { //初始化icon图层 this.initIconLayer() @@ -296,7 +295,6 @@ const vueGis = { } this.setMapLocation() // gaodeMapLayer.getSource().changed() - }, //加载区域多边形 @@ -355,6 +353,7 @@ const vueGis = { this.loadPolIcon(feature) } + } }, @@ -363,7 +362,7 @@ const vueGis = { loadPolIcon (feature) { polIconSource.clear() let polyIconFeatures = []; - console.log('feature-----', feature) + // console.log('feature-----', feature) feature.forEach(oneIcon => { var extent = boundingExtent(oneIcon.getGeometry().getCoordinates()[0]); //获取一个坐标数组的边界，格式为[minx,miny,maxx,maxy] @@ -380,7 +379,7 @@ const vueGis = { id: oneIcon.id_ } }); - // console.log('oneIcon----', oneIcon) + // console.log('oneIcon----ddd', oneIcon) let polyIconStyle = new Style({ image: new Icon({ // anchor: [0.5, 0.5], @@ -416,12 +415,14 @@ const vueGis = { info: { ...oneIcon } } }); + // console.log('oneIcon----', this.iconUrlArray[oneIcon.urlIndex]) let iconStyle = new Style({ image: new Icon({ // anchor: [0.5, 0.5], // imgSize: [32, 32], // scale: 0.5, - src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] + // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0] + src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] }), // text: createTextStyle(oneIcon) }); @@ -454,8 +455,8 @@ const vueGis = { return (distance < max || distance === max) // debugger - // return - // var wgs84Sphere = new ol.Sphere(6378137); + // return + // var wgs84Sphere = new ol.Sphere(6378137); // wgs84Sphere.haversineDistance([120.21592590991689, 30.210793016606],[120.21670777384473, 30.211168525868086]); }, @@ -514,6 +515,46 @@ const vueGis = { }, //设置地图定位的中心点和缩放级别 setMapLocation () { + if (!this.zoom) { + this.setZoom(this.mapInfo.agencyLevel) + } + this.centerPoint = [] + + + //如果存在中心点（返回时赋值） + if (this.center && this.center.length > 0) { + this.centerPoint = this.center + this.centerFlag = 'point' + this.center = [] + + } else if (polygonLayer.getSource().getFeatures()[0]) {//如果是初次进入,存在下级组织 + this.centerFlag = 'flag_polygon' + + } else if (this.mapInfo.longitude && this.mapInfo.latitude) { + this.centerPoint.push(this.mapInfo.longitude) + this.centerPoint.push(this.mapInfo.latitude) + this.centerFlag = 'point' + + } else { + this.centerPoint = centerPointGlobal + this.centerFlag = 'point' + } + // debugger + if (this.centerFlag === 'flag_parent') { + let parentFeatures = parentLayer.getSource().getFeatures()[0] + let polygon = parentFeatures.getGeometry(); + map.getView().fit(polygon, map.getSize()); + this.zoom = map.getView().getZoom() - 1 + + } else if (this.centerFlag === 'flag_polygon') { + let polygonFeatures = polygonLayer.getSource().getFeatures()[0] + let polygon = polygonFeatures.getGeometry(); + map.getView().fit(polygon, map.getSize()); + this.zoom = map.getView().getZoom() - 1 + + } else { + mapView.setCenter(this.centerPoint); + } if (!this.isChangeCenter) { return false @@ -579,13 +620,13 @@ const vueGis = { }, //根据组织层级设置缩放级别 - setZoom (level) { - if (level === 'district') { - this.zoom = 11 - } else if (level === 'street') { - this.zoom = 12 - } else if (level === 'community') { - this.zoom = 13 + setZoom(level) { + if (level === "district") { + this.zoom = 11; + } else if (level === "street") { + this.zoom = 12; + } else if (level === "community") { + this.zoom = 13; } }, @@ -630,15 +671,18 @@ const vueGis = { }; })(); - // select = new Select({ - // style: overlayStyle - // }); - // 有BUG 加入多边形选中样式时，如果同时存在icon层和多边形层，点击icon会使icon消失 ---zhaotongyao 2022.06.01 + select = new Select({ + style: overlayStyle + }); - map.addLayer(polygonLayer) - // map.addInteraction(select); + map.addLayer(polygonLayer) + if (this.$route.path == '/main-shuju/visual-communityGovern-duoyuanfuwu-duoyuanfuwufenxi' || this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决 + console.log('去掉默认点击') + } else { + map.addInteraction(select); + } }, //初始化多边形icon图层 @@ -917,4 +961,4 @@ export default vueGis; // color: rgba(1, 17, 104, 1); color: #fff; } - \ No newline at end of file + \ No newline at end of file From 7751745864a36f11c6fa903127bd98370df5a46d Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Tue, 28 Jun 2022 18:53:48 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/volunteer3.png | Bin 2211 -> 3640 bytes .../duoyuanfuwu/duoyuanfuwufenxi.vue | 5 ++++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png index a070fa692a1af623028a4209dec8bca37ca7b9b8..2d2493957000c0cfb479f74bcbe0034f541475ef 100644 GIT binary patch literal 3640 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 diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 39a8cf28..395477b9 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -771,7 +771,10 @@ export default { align-items: center; margin-top: 10px; margin-right: 40px; - + .title-icon { + width: 40px; + height: 34px; + } .map-tips-icon { width: 20px; height: 10px; From 22a78d42426772ed41fe24184aab114cf4105c74 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 29 Jun 2022 10:31:16 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 395477b9..1f646b05 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -223,7 +223,7 @@ export default { } this.pieData.push(ob) }) - this.getMapData() + // this.getMapData() } else { this.$message.error(msg) } From 20447ebe26befda03ce6533cb9fcd691ef0d5555 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 29 Jun 2022 10:58:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/shuju/volunteer3.png | Bin 3640 -> 2821 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png index 2d2493957000c0cfb479f74bcbe0034f541475ef..509fdf17fbf7fae8605ff14d743a050a55d83a46 100644 GIT binary patch delta 2192 zcmZ{mXE+-Q8-_!Q8a>q_HVLZgGlCRRF%uFajoPcn42my3wi>}#l^S*I86!?nGf}H` z>{Ue&t5u4sy^0=cfBkX(_Q(6a*Y#Y_ecgZGW|3GBTY&ZH9B_kiX{18Qw^3bDMJ`v&U@iN<&$U>19d3$C_bGKk2Bh>ol(DtJ2ye^d$v1&-H$Ok@ z7(a`kBN`(9IiJ6rbncETEbSf?_)`2A@$nl+#3}z$e)d;bn4s@F8B>!Y1h>f1ZOk`C zo|3rH@Z|JJ)@|+52fL$p_?HqHEfKQ)aLfr&!C(+@7^>;0w*?#`Fs=7iJXaFdmOCAo z?r#c8H}Zo>92fj(izToOZkr}X=IuFpQ{!-dOP}Y{t@n-Wye2V(nF*Kbj$ddUg-vUEsi?+1ky4cR)4t<>O&EL zUu%<;ciE`$yL46GdHT!K0)3*9Hug!Ku^5^Gp!i$TjJJ57$*C+uCCM2*!b~aBmE`NU zn}Tcq3jR&D1C5$&niU^k$Ox9P+tkV}HdQUTykfjv$c(n{>3sbt9YIR+E!V9pnEgz! zea{r{cCUtVGW>Dk{iZ``9 zy$uB4YVxY1Nait!;b~1J#%3xfs<3@wPq$>X?t4Lr^mzHSN}9q%Fm#8on(fE~k_C;XwTs}KZT+tpVm;EO!f%BeW8M_FfU@ti;9 z@cxXf#6Xfy>^x8Pnxbd22s>kVWF1HE7j${Z7O6gp6DH0yvqxWwjLerG#*!;wm%Krj znjL3?ch;PEA7xp5G;WJe4DZ~yHVIs$ibr=AI!`ED-qMTZT-LkSSbzPUN3W83tUSwB zJj#URLG5axzH4A_l9OqSn_qnyY1CLkoWUHlF7gbGmYI2F$QQW~nW!TaUto&lP2>jU zo8CQ<86umMNQV%bXUuObXg9K7%6=i0n5cpoTI>Ca-OUp?Glm9<^&Q*P)0|kU0!kwZ zi5J3s4gr8?q#G^^JFZ6sa2($e!?g@+zNPaaH9MGwn@bTA_}Jb-KbN>EzF_RzXHUa4 z9cpnv2r$JeJ1A>^-{3cj{7|@Hl^r;uCpv-n!T0S{?H{iyd$a~|!`M$uwx}xb6aX(s z)5}-PVH~DDCx!C76a^;<5696{e2^CSN1oYR)IYWHMKTXI+5rto)VNJLlDP*l=Xu}Q z=t+h>W&K?e7=inxP=zsEuplb3FR&_KlEmQyVc%vkPsFGm}M2if{Rhq8pm!%!lR zuySd%ti6(ZDBaDLlJ@nkX1kUAkj*;G($I>3LawMJU2x;ecKlj^Dyk_=%xfmjh*0z* z$Ta1Mb|PTtDWuRN-ep#ImGI=D`zY6-dfQdKFBGN)dC>b?Aj3g?=(i$Ml zH1Ten0r_qH*sQvkyCoszS&fa|35n>bHf@^QT9g)$@SZ}b@6t6)TN130_dm?%SZ;S_ zQoCLEbgEj>f@l&o_vb*-K#UWr-aac-vdzwC_q$0!cdgB~@vH|4Z*z0fpSx=C&5k=l z=t4KyP|d_v3Z&zH`j4O+|FpCk=7Qrh3m?g@>>ItJ-HJs(Fpsjeb z9^QN%<-z4Q^(t9zE}KgTjV8g3wXqKH&5F1P`Rw(*m9;W=&ceKW!|Xv2r<&dMS%>}? z-0P+mm2(_c&W6DWWU}@^?6K+CdSgIAt1hb1H(e-Y3NCHQ$7w-ZNnOUewfILlfy$#Y zV;;XiEw<3g65MN#GKIJgT|D*Qk0nnSU$@vw%(EAnQ*%XfKWSIuNAwV*CJ_*{tG&Q;Ot` zIEvg_vDO0TI=>_GhYo+}*nZFKB@)46VVLyIr+eBZvb=vlq=Ef}&3mpapRZvg^)kOD zT9OUCANAC{Eik;`WSsI47I-w&TG?PukI&Uq#F;M>rTi|1G5LFwtDCg%JIh>Ae)t1? zCWNRQq$hN2Lduzcjemu0J}uK2W`=J{&U*}MTYX?}KbH)?uvwDdnD_XU?0CuJ1VCU$ VT5+d$89$#400xCc*62CK{2!M;1^fU2 delta 3017 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 Qzu!3ssc(*G(Q}UbA5;K|!T