elink-star
/
ShibeiWorkPlatform_Frontend
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

多元主体分析中心点问题

shibei_master
jiangyy 3 years ago
parent
43aeea6deb
commit
7c551f0b5c
2 changed files with 52 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
  2. 46
      src/views/modules/visual/components/screen-map/index.vue

50
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
View File

@ -36,11 +36,11 @@
</div>
<div class="m-pagination">
<el-pagination :current-page="demand.pageNo"
:page-size="demand.pageSize"
:total="demand.total"
background
layout="prev, pager, next,total"
@current-change="handlePageNoChange_demand">
:page-size="demand.pageSize"
:total="demand.total"
background
layout="prev, pager, next,total"
@current-change="handlePageNoChange_demand">
</el-pagination>
</div>
</div>
@ -82,8 +82,8 @@
</div>
</div>
<duoyuan-dialog v-if="showInfoDialog"
:orgId="orgId"
@close="showInfoDialog = false" />
:orgId="orgId"
@close="showInfoDialog = false" />
</cpt-card>
</template>
@ -103,8 +103,8 @@ import { pieOption } from './pieOption.js'
import nextTick from 'dai-js/tools/nextTick'
const transparent = 'rgba(2, 2, 2, 0)'
const polygonColorArray = [ '#f59701', '#0067b6', '#e70014', '#8fc41e', '#00a1be' ]
const colorArray = [ '#1B51FF', '#00E5ED', '#7800FF', '#16D783', '#FF7800', '#FFBA00', '#FFD685', '#2A00FF', '#C600FF', '#FF2A00']
const polygonColorArray = ['#f59701', '#0067b6', '#e70014', '#8fc41e', '#00a1be']
const colorArray = ['#1B51FF', '#00E5ED', '#7800FF', '#16D783', '#FF7800', '#FFBA00', '#FFD685', '#2A00FF', '#C600FF', '#FF2A00']
const legendList = [
{ name: '#e70014', icon: require('../../../../../assets/img/shuju/volunteer4.png') },
{ name: '#f59701', icon: require('../../../../../assets/img/shuju/volunteer5.png') },
@ -349,7 +349,7 @@ export default {
return item.name == name
})
},
async loadOrgData (level='', orgId='') {
async loadOrgData (level = '', orgId = '') {
const url = "/gov/org/agency/maporg"
let params = {
orgId: orgId,
@ -363,7 +363,7 @@ export default {
if (!this.isRepeatItem(item.name)) {
let colorIndex = index < polygonColorArray.length ? index : 0
item.fillColor = transparent,
item.color = polygonColorArray[colorIndex]
item.color = polygonColorArray[colorIndex]
subPolygonList.push(item)
}
}
@ -375,7 +375,7 @@ export default {
// color: polygonColorArray[1]
// }
// polygonList.push(polygonData)
this.polygonList = [ ...this.polygonList, ...subPolygonList ]
this.polygonList = [...this.polygonList, ...subPolygonList]
} else {
this.$message.error(msg)
}
@ -451,7 +451,7 @@ export default {
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
} else {
this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList)
this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
}
},
@ -478,7 +478,7 @@ export default {
data.organizationPersonnel.forEach(item => {
organizationPersonnel = `${organizationPersonnel}${item.personName}(${item.personPhone})、`
})
organizationPersonnel = organizationPersonnel.substring(0, organizationPersonnel.length-1)
organizationPersonnel = organizationPersonnel.substring(0, organizationPersonnel.length - 1)
} else {
organizationPersonnel = '--'
}
@ -540,18 +540,18 @@ export default {
// data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--'
// data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--'
// let categoriesArray = []
// let categoriesArray = []
// for (let key in data.volunteerCategories) {
// categoriesArray.push(data.volunteerCategories[key])
// for (let key in data.volunteerCategories) {
// categoriesArray.push(data.volunteerCategories[key])
// }
// }
// if (categoriesArray.length > 0) {
// data.categories = categoriesArray.join(',')
// } else {
// data.categories = '--'
// }
// if (categoriesArray.length > 0) {
// data.categories = categoriesArray.join(',')
// } else {
// data.categories = '--'
// }
// let showData = `
// <div style='font-size:16px; color:#FFFFFF;'>居民信息</div>
@ -708,7 +708,7 @@ export default {
color: #fff;
}
.card-left-title::after {
content: '';
content: "";
position: absolute;
top: 50%;
left: 20px;
@ -716,7 +716,7 @@ export default {
height: 12px;
box-sizing: border-box;
margin-top: -6px;
background: #2865FA;
background: #2865fa;
border-radius: 50%;
}
.card-wr-map {

46
src/views/modules/visual/components/screen-map/index.vue
View File

@ -32,7 +32,7 @@
class="ol-popup-closer"></a>
<div id="popup-content"
class="popup-content"></div>
<a href="#"
<a href="#"
id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div>
@ -107,9 +107,9 @@ let polygonColorArray = [
'rgba(183, 185, 0, 0.16)'
];
//icon文字样式
//icon文字样式
let createTextStyle = function (feature) {
if (iconTextsStyle) {
let iconTextsStyles = { ...iconTextsStyle }
iconTextsStyles.text = feature.values_ && feature.values_.name || feature.name
@ -200,7 +200,9 @@ const vueGis = {
distanceMax: null,//显示的坐标距离中心点的范围
input_lat: null,
input_lon: null
input_lon: null,
isChangeCenter: true,//是否根据多边形改变数组
}
},
async mounted () {
@ -225,11 +227,11 @@ const vueGis = {
// iconArrays.forEach(item => {
// console.log(item.type, item.urlIndex, item.latitude, item.longitude)
// });
//初始化地图
this.initMap()
if (this.showPolIconLayer) {
console.log('showPolIconLayer++++++++++++++++++++++', this.showPolIconLayer)
//初始化多边形标注图层
@ -259,12 +261,13 @@ const vueGis = {
},
//刷新地图
async refreshMap (mapInfo, polygonArray, iconArrays) {
//刷新地图:地图信息，多边形数组，标注数组，是否根据多边形改变中心点
async refreshMap (mapInfo, polygonArray, iconArrays, isChangeCenter) {
this.mapInfo = mapInfo
this.polygonArray = []
this.polygonArray = []
this.polygonArray = polygonArray
this.iconArrays = iconArrays
this.isChangeCenter = isChangeCenter
if (iconSource) {
iconSource.clear()
}
@ -275,7 +278,7 @@ const vueGis = {
polIconSource.clear()
}
this.initPolIconLayer()
if (this.showPolygonLayer) {
this.initPolygonLayer()
//加载当前园区的标注
@ -293,7 +296,7 @@ const vueGis = {
}
this.setMapLocation()
// gaodeMapLayer.getSource().changed()
},
//加载区域多边形
@ -511,6 +514,11 @@ const vueGis = {
},
//设置地图定位的中心点和缩放级别
setMapLocation () {
if (!this.isChangeCenter) {
return false
}
// debugger
if (!this.zoom) {
this.setZoom(this.mapInfo.agencyLevel)
}
@ -557,7 +565,7 @@ const vueGis = {
mapView.setZoom(this.zoom);
},
firstCentermap() {
firstCentermap () {
if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint = []
this.centerPoint.push(this.mapInfo.longitude)
@ -749,14 +757,14 @@ const vueGis = {
this.overlay.getElement().parentNode.parentNode.style.display = 'block'
content.innerHTML = showData;
this.overlay.setPosition(coordinate);
//把 overlay 显示到指定的 x,y坐标
//把 overlay 显示到指定的 x,y坐标
},
// 关闭弹窗
handleClosePopup() {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
handleClosePopup () {
this.overlay.setPosition(undefined);
document.getElementById("popup-closer").blur();
return false;
},
//取随机数
@ -901,7 +909,7 @@ export default vueGis;
.popup-content {
width: 300px;
}
.popup-goMore{
.popup-goMore {
margin: 20px 0;
}
.ol-popup-closer:after {

Write Preview
Loading…
Cancel
Save