diff --git a/src/assets/img/shuju/volunteer3.png b/src/assets/img/shuju/volunteer3.png
index a070fa69..509fdf17 100644
Binary files a/src/assets/img/shuju/volunteer3.png and b/src/assets/img/shuju/volunteer3.png differ
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
index 53e007da..1f646b05 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">
@@ -111,6 +113,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 +167,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: []
@@ -220,7 +223,7 @@ export default {
}
this.pieData.push(ob)
})
- this.getMapData()
+ // this.getMapData()
} else {
this.$message.error(msg)
}
@@ -364,6 +367,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) {
@@ -765,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;
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) {
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 58206f45..496f3e1c 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,
@@ -455,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]);
},
@@ -671,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图层
@@ -958,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