{{colItem.categoryName}}
-
+
@@ -108,8 +108,265 @@
+
+ class="popup-content">
+
+
+ 居民信息
+ 所属网格：
+ {{ selInfo.gridName }}
+
+ 所属小区：
+ {{ selInfo.villageName }}
+
+ 本地户籍：
+ {{ selInfo.isBdhjShow }}
+
+ 姓名：
+ {{ selInfo.icUserName }}
+
+ 手机：
+ {{ selInfo.mobile }}
+
+ 性别：
+ {{ selInfo.genderShow }}
+
+ 身份证号：
+ {{ selInfo.idCard }}
+
+ 出生日期：
+ {{ selInfo.birthday }}
+
+ 联系人：
+ {{ selInfo.contacts }}
+
+ 联系人手机：
+ {{ selInfo.contactsMobile }}
+
+ 志愿者类别：
+ {{ selInfo.categories }}
+
+
+
+ 企业信息
+ 企业名称：
+ {{ selInfo.name }}
+
+ 企业类型：
+ {{ selInfo.categoryName }}
+
+ 周边安全距离：
+ {{ selInfo.safeDistance }}
+
+ 危化品种类：
+ {{ selInfo.dangerTypeName }}
+
+ 负责人：
+ {{ selInfo.principalName }}
+
+ 联系电话：
+ {{ selInfo.principalMobile }}
+
+ 经营地址：
+ {{ selInfo.address }}
+
+ 备注：
+ {{ selInfo.remark }}
+
+
+
+ 场所信息
+ 场所名称：
+ {{ selInfo.name }}
+
+ 场所分类：
+ {{ selInfo.categoryName }}
+
+ 占地面积：
+ {{ selInfo.areaCovered }}
+
+ 容纳人数：
+ {{ selInfo.capacity }}
+
+ 地址：
+ {{ selInfo.address }}
+
+
+
+
+
+
+
+
+ 所属网格：
+ {{ selInfo.gridName }}
+
+
+ 发生时间：
+ {{ selInfo.happenTime }}
+
+
+
+ 事件内容：
+ {{ selInfo.eventContent }}
+
+
+
+ 图片：
+
+
+
+ ![]()
+
+
+
+ 音频：
+
+
+
+
+
+
+
+ 反映渠道：
+ {{ selInfo.sourceTypeName || "--" }}
+
+
+ 地址：
+ {{ selInfo.address || "--" }}
+
+
+ 报事人：
+ {{ selInfo.name || "--" }}
+
+
+ 手机号：
+ {{ selInfo.mobile || "--" }}
+
+
+ 身份证号：
+ {{ selInfo.idCard || "--" }}
+
+
+
+
+
+ 组织信息
+ 组织名称：
+ {{ selInfo.organizationName }}
+
+ 组织分类：
+ {{ selInfo.categoryName }}
+
+ 组织人数：
+ {{ selInfo.organizationPersonCount }}
+
+ 组织成员：
+ {{ selInfo.organizationPersonnelShow }}
+
+ 服务事项：
+ {{ selInfo.serviceItem }}
+
+ 负责人：
+ {{ selInfo.principalName }}
+
+ 联系电话：
+ {{ selInfo.principalPhone }}
+
+ 创建时间：
+ {{ selInfo.organizationCreatedTime }}
+
+
+
+ 房屋信息
+ 房屋名称：
+ {{ selInfo.houseName }}
+
+ 房屋类型：
+ {{ selInfo.houseTypeName }}
+
+ 房屋用途：
+ {{ selInfo.purposeName }}
+
+ 房屋状态：
+ {{ selInfo.rentName }}
+
+ 房主姓名：
+ {{ selInfo.ownerName }}
+
+ 联系方式：
+ {{ selInfo.ownerPhone }}
+
+ 房主身份证：
+ {{ selInfo.ownerIdCard }}
+
+
+
+
+ 企事业信息
+ 场所类型：
+ {{ selInfo.placeTypeName }}
+
+ 场所区域：
+ {{ selInfo.gridName }}
+
+ 场所名称：
+ {{ selInfo.placeOrgName }}
+
+ 场所地址：
+ {{ selInfo.address }}
+
+ 规模：
+ {{ selInfo.scale }}
+
+ 负责人：
+ {{ selInfo.personInCharge }}
+
+ 联系电话：
+ {{ selInfo.mobile }}
+
+
+
+
+
+
更多>>>>
@@ -312,7 +569,7 @@ const vueGis = {
pageSize: 10,
demand: {
- loading: true,
+ loading: false,
colList: [
{
align: "center",
@@ -332,26 +589,70 @@ const vueGis = {
},
iconUrlArray: {
- 'volunteer1': require('../../../../../assets/img/shuju/volunteer1.png'),
- 'volunteer2': require('../../../../../assets/img/shuju/volunteer2.png'),
- 'volunteer3': require('../../../../../assets/img/shuju/volunteer3.png'),
- 'volunteer4': require('../../../../../assets/img/shuju/volunteer4.png'),
- 'volunteer5': require('../../../../../assets/img/shuju/volunteer5.png'),
'anzhibangjiao': require('../../../../../assets/img/shuju/fiveLayer/anzhibangjiao.png'),
'buliangqingshaonian': require('../../../../../assets/img/shuju/fiveLayer/buliangqingshaonian.png'),
'shequjiaozheng': require('../../../../../assets/img/shuju/fiveLayer/shequjiaozheng.png'),
- 'xfry': require('../../../../../assets/img/shuju/fiveLayer/xfry.png'),
+ 'resi_xfry': require('../../../../../assets/img/shuju/fiveLayer/resi_xfry.png'),
'xidurenyuan': require('../../../../../assets/img/shuju/fiveLayer/xidurenyuan.png'),
'xiejiaorenyuan': require('../../../../../assets/img/shuju/fiveLayer/xiejiaorenyuan.png'),
'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'),
+ 'co_yjdw': require('../../../../../assets/img/shuju/fiveLayer/co_yjdw.png'),
+ 'sr_gy': require('../../../../../assets/img/shuju/fiveLayer/sr_gy.png'),
+ 'sr_gc': require('../../../../../assets/img/shuju/fiveLayer/sr_gc.png'),
+ 'co_whdw': require('../../../../../assets/img/shuju/fiveLayer/co_whdw.png'),
+ 'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'),
+ 'co_lwh': require('../../../../../assets/img/shuju/fiveLayer/co_lwh.png'),
+ 'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'),
+ 'co_lyjlb': require('../../../../../assets/img/shuju/fiveLayer/co_lyjlb.png'),
+ 'sr_yjy': require('../../../../../assets/img/shuju/fiveLayer/sr_yjy.png'),
+ 'co_zaxld': require('../../../../../assets/img/shuju/fiveLayer/co_zaxld.png'),
+ 'co_qt': require('../../../../../assets/img/shuju/fiveLayer/co_qt.png'),
+ 'sr_jzz': require('../../../../../assets/img/shuju/fiveLayer/sr_jzz.png'),
+ 'sr_djc': require('../../../../../assets/img/shuju/fiveLayer/sr_djc.png'),
+ 'sr_rfqck': require('../../../../../assets/img/shuju/fiveLayer/sr_rfqck.png'),
+ 'ep_lg': require('../../../../../assets/img/shuju/fiveLayer/ep_lg.png'),
+ 'sr_xfz': require('../../../../../assets/img/shuju/fiveLayer/sr_xfz.png'),
+ 'pu_jgzsbm': require('../../../../../assets/img/shuju/fiveLayer/pu_jgzsbm.png'),
+
+ 'gr_czw': require('../../../../../assets/img/shuju/fiveLayer/gr_czw.png'),
+ 'ep_cycs': require('../../../../../assets/img/shuju/fiveLayer/ep_cycs.png'),
+ 'dc_jyz': require('../../../../../assets/img/shuju/fiveLayer/dc_jyz.png'),
+ 'ep_gwylcs': require('../../../../../assets/img/shuju/fiveLayer/ep_gwylcs.png'),
+ 'dc_jqz': require('../../../../../assets/img/shuju/fiveLayer/dc_jqz.png'),
+ 'dc_whpdw': require('../../../../../assets/img/shuju/fiveLayer/dc_whpdw.png'),
+ 'ep_wb': require('../../../../../assets/img/shuju/fiveLayer/ep_wb.png'),
+ 'ep_mrxycs': require('../../../../../assets/img/shuju/fiveLayer/ep_mrxycs.png'),
+ 'dc_yqhjz': require('../../../../../assets/img/shuju/fiveLayer/dc_yqhjz.png'),
+ 'dc_jzgd': require('../../../../../assets/img/shuju/fiveLayer/dc_jzgd.png'),
+ 'ep_scjgqy': require('../../../../../assets/img/shuju/fiveLayer/ep_scjgqy.png'),
+
+ 'cm_nmsc': require('../../../../../assets/img/shuju/fiveLayer/cm_nmsc.png'),
+ 'event_tdnd': require('../../../../../assets/img/shuju/fiveLayer/event_tdnd.png'),
+ 'cm_bhsc': require('../../../../../assets/img/shuju/fiveLayer/cm_bhsc.png'),
+ 'cm_cjsc': require('../../../../../assets/img/shuju/fiveLayer/cm_cjsc.png'),
+ 'ep_lssd': require('../../../../../assets/img/shuju/fiveLayer/ep_lssd.png'),
+
+
+ 'resi_szry': require('../../../../../assets/img/shuju/fiveLayer/resi_szry.png'),
+ 'ps_lyy': require('../../../../../assets/img/shuju/fiveLayer/ps_lyy.png'),
+ 'resi_snry': require('../../../../../assets/img/shuju/fiveLayer/resi_snry.png'),
+ 'ps_mzb': require('../../../../../assets/img/shuju/fiveLayer/ps_mzb.png'),
+ 'ps_zs': require('../../../../../assets/img/shuju/fiveLayer/ps_zs.png'),
+ 'ps_wss': require('../../../../../assets/img/shuju/fiveLayer/ps_wss.png'),
+ 'ps_jjz': require('../../../../../assets/img/shuju/fiveLayer/ps_jjz.png'),
+ 'ep_xx': require('../../../../../assets/img/shuju/fiveLayer/ep_xx.png'),
+ 'ep_yy': require('../../../../../assets/img/shuju/fiveLayer/ep_yy.png'),
+
},
iconArrays: [],
overlay: null,
showPopup: false,
+ selPlaceType: '',
+ selInfo: {}
}
},
@@ -446,10 +747,11 @@ const vueGis = {
//点击项目
async clickMapVolunteer (info) {
+ // info.placeType = 'resi'
if (!info.id) {
return false
}
-
+ this.selPlaceType = info.placeType
if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员
this.loadResi(info)
}
@@ -457,28 +759,29 @@ const vueGis = {
this.loadPublicService(info)
}
if (info.placeType === 'dangerous_chemicals') {//重点危化品企业
-
+ this.loadDangerousChemicals(info)
}
if (info.placeType === 'event') {//难点痛点
-
+ this.loadEvent(info)
}
if (info.placeType === 'city_management') {//城市管理图层
-
+ this.loadCityManagement(info)
}
if (info.placeType === 'community_org') {//社区自组织
-
+ this.loadCommunityOrg(info)
}
if (info.placeType === 'superior_resource') {//优势资源
-
+ this.loadSuperiorResource(info)
}
- if (info.placeType === '') {//群租房
-
+ if (info.placeType === 'group_rent') {//群租房
+ this.loadGroupRent(info)
}
- if (info.placeType === '') {//来自联建单位的机关直属部门
+ if (info.placeType === 'party_unit') {//来自联建单位的机关直属部门
+ this.loadPartyUnit(info)
}
- if (info.placeType === '') {//来自企事业查询的
-
+ if (info.placeType === 'enterprise_partrol') {//来自企事业查询的
+ this.loadEnterprisePartrol(info)
}
@@ -517,45 +820,9 @@ const vueGis = {
} else {
data.categories = '--'
}
+ this.selInfo = JSON.parse(JSON.stringify(data))
- let showData = `
- 联建单位信息
+ 单位名称：
+ {{ selInfo.unitName }}
+
+ 分类：
+ {{ selInfo.typeName }}
+
+ 服务事项：
+ {{ selInfo.serviceMatterListShow }}
+
+ 联系人：
+ {{ selInfo.contact }}
+
+ 联系电话：
+ {{ selInfo.contactMobile }}
+
+ 在职党员：
+ {{ selInfo.memberCount }}
+
+ 备注：
+ {{ selInfo.remark }}
+
+ 地理位置：
+ {{ selInfo.address }}
+
+ 居民信息
- 所属网格：
- `+ data.gridName + `
-
- 所属小区：
- `+ data.villageName + `
-
- 本地户籍：
- `+ data.isBdhjShow + `
-
- 姓名：
- `+ data.icUserName + `
-
- 手机：
- `+ data.mobile + `
-
- 性别：
- `+ data.genderShow + `
-
- 身份证号：
- `+ data.idCard + `
-
- 出生日期：
- `+ data.birthday + `
-
- 联系人：
- `+ data.contacts + `
-
- 联系人手机：
- `+ data.contactsMobile + `
-
- 志愿者类别：
- `+ data.categories + `
-
- `
- // console.log(showData)
- this.handleShowPopup(showData, coordinate, true)
+ this.handleShowPopup(coordinate, true)
} else {
this.$message.error(msg)
@@ -580,34 +847,208 @@ const vueGis = {
data.capacity = data.capacity ? data.capacity : '--'
data.address = data.address ? data.address : '--'
+ this.selInfo = JSON.parse(JSON.stringify(data))
- let showData = `
- 场所信息
- 场所名称：
- `+ data.name + `
-
- 场所分类：
- `+ data.categoryName + `
-
- 占地面积：
- `+ data.areaCovered + `
-
- 容纳人数：
- `+ data.capacity + `
-
- 地址：
- `+ data.address + `
-
- `
- // console.log(showData)
- this.handleShowPopup(showData, coordinate, true)
+
+ this.handleShowPopup(coordinate, false)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadEvent (info) {
+ const url = "/gov/project/icEvent/detail";
+ //const url = "http://yapi.elinkservice.cn/mock/245/api/gov/project/icEvent/processAnalysis/eventDetail/" + this.eventId;
+
+ const { data, code, msg } = await requestPost(url, {
+ icEventId: this.eventId,
+ });
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+ this.handleShowPopup(coordinate, false)
+
+
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadDangerousChemicals (info) {
+ // const url = "/gov/org/icDangerousChemicals/detail"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
+
+ let params = {
+ icSuperiorResourceId: info.id
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ data.name = data.name ? data.name : '--'
+ data.categoryName = data.categoryName ? data.categoryName : '--'
+ data.safeDistance = data.safeDistance ? data.safeDistance : '--'
+ data.dangerTypeName = data.dangerTypeName ? data.dangerTypeName : '--'
+ data.principalName = data.principalName ? data.principalName : '--'
+ data.principalMobile = data.principalMobile ? data.principalMobile : '--'
+ data.address = data.address ? data.address : '--'
+ data.remark = data.remark ? data.remark : '--'
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+
+ this.handleShowPopup(coordinate, false)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadCityManagement (info) {
+ // const url = "/gov/org/icCityManagement/detail"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
+
+ let params = {
+ icCityManagementId: info.id
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ data.name = data.name ? data.name : '--'
+ data.categoryName = data.categoryName ? data.categoryName : '--'
+ data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
+ data.capacity = data.capacity ? data.capacity : '--'
+ data.address = data.address ? data.address : '--'
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+
+ this.handleShowPopup(coordinate, false)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadCommunityOrg (info) {
+ // const url = "/gov/org/icCityManagement/detail"
+ const url = "/heart/iccommunityselforganization/community-self-org-detail/" + info.id
+
+ let params = {}
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ data.orgPersonArray = []
+ data.organizationPersonnel.forEach(element => {
+ let orgPersonnel = element.personName + "(" + element.personPhone + ")"
+ data.orgPersonArray.push(orgPersonnel)
+ });
+
+ data.organizationPersonnelShow = data.orgPersonArray.join(",")
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+
+ this.handleShowPopup(coordinate, false)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadSuperiorResource (info) {
+ // const url = "/gov/org/icSuperiorResource/detail"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
+
+ let params = {
+ icSuperiorResourceId: info.id
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ data.name = data.name ? data.name : '--'
+ data.categoryName = data.categoryName ? data.categoryName : '--'
+ data.areaCovered = data.areaCovered ? data.areaCovered + '平方公里' : '--'
+ data.capacity = data.capacity ? data.capacity : '--'
+ data.address = data.address ? data.address : '--'
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+
+ this.handleShowPopup(coordinate, false)
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+ async loadEnterprisePartrol (info) {
+ // const url = "/gov/org/enterprise/detail"
+ const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
+
+ const { data, code, msg } = await requestGet(url)
+
+ if (code === 0) {
+ // debugger
+ let coordinate = [info.longitude, info.latitude]
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
} else {
this.$message.error(msg)
}
},
+ async loadGroupRent (info) {
+ const url = "/gov/org/ichouse/" + info.id
- handleShowPopup (showData, coordinate, isShowMore) {
+ const { data, code, msg } = await requestGet(url)
+
+ if (code === 0) {
+ // debugger
+ let coordinate = [info.longitude, info.latitude]
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+
+ } else {
+ this.$message.error(msg)
+ }
+ },
+ async loadPartyUnit (info) {
+ const url = '/heart/icpartyunit/detail'
+ // const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
+ let params = {
+ id: info.id
+ }
+
+ const { data, code, msg } = await requestPost(url, params)
+
+ if (code === 0) {
+ let coordinate = [info.longitude, info.latitude]
+ if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
+ data.serviceMatterList = []
+ } else {
+ data.serviceMatterListShow = data.serviceMatterNameList.join(',')
+ }
+
+ this.selInfo = JSON.parse(JSON.stringify(data))
+ } else {
+ this.$message.error(msg)
+ }
+ },
+
+
+ handleShowPopup (coordinate, isShowMore) {
if (isShowMore) {
document.getElementById("popup-goMore").style.display = 'block'
} else {
@@ -618,7 +1059,7 @@ const vueGis = {
this.overlay.getElement().style.display = 'block'
this.overlay.getElement().parentNode.style.display = 'block'
this.overlay.getElement().parentNode.parentNode.style.display = 'block'
- content.innerHTML = showData;
+ // content.innerHTML = showData;
this.overlay.setPosition(coordinate);
//把 overlay 显示到指定的 x,y坐标
@@ -692,8 +1133,8 @@ const vueGis = {
},
async loadCategoryList () {
- // const url = "/gov/org/coverage/categoryList"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList"
+ const url = "/gov/org/coverage/categoryList"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/categoryList"
let params = {
coverageTypes: this.coverageTypes,
@@ -702,171 +1143,17 @@ const vueGis = {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
- // this.categoryList = data
- this.categoryList = [
+ this.categoryList = data
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "机关直属部门"
- },
- {
- categoryKey: "0",
- categoryName: "deserunt"
- },
- {
- categoryKey: "1",
- categoryName: "deserunt"
- },
- {
- categoryKey: "2",
- categoryName: "deserunt"
- },
- {
- categoryKey: "3",
- categoryName: "deserunt"
- },
- {
- categoryKey: "4",
- categoryName: "deserunt"
- },
- ]
this.categoryKeys = []
this.categoryListshow = []
let itemArray = []
this.categoryList.forEach((item, index) => {
- if (!item.dataIcon) {
- item.dataIcon = require('../../../../../assets/img/shuju/volunteer3.png')
- }
+
+ item.dataIcon = this.iconUrlArray[item.categoryKey]
+
item.sel = true
this.categoryKeys.push(item.categoryKey)
@@ -889,9 +1176,9 @@ const vueGis = {
//加载组织数据
async getTable (isPage) {
- this.demand.loading = true
- // const url = "/data/aggregator/coverage/dataList";
- const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
+ // this.demand.loading = true
+ const url = "/data/aggregator/coverage/dataList";
+ // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
let params = {
coverageTypes: this.coverageTypes,
categoryKeys: this.categoryKeys,
@@ -902,42 +1189,46 @@ const vueGis = {
};
const { data, code, msg } = await requestPost(url, params);
- this.demand.loading = false;
+ // this.demand.loading = false;
if (code === 0) {
this.demand.total = data.total;
this.tableList = data.list
- this.tableList = [
- {
- categoryKey: "volunteer1",
- content: "volunteer1",
- id: "123",
- latitude: "36.082230",
- longitude: "120.3868167667315",
- },
- {
- categoryKey: "volunteer2",
- content: "volunteer2",
- id: "123",
- latitude: "36.062227",
- longitude: "120.389455",
- },
- {
- categoryKey: "volunteer3",
- content: "volunteer3",
- id: "123",
- latitude: "36.072214",
- longitude: "120.389455",
- },
- {
- categoryKey: "volunteer4",
- content: "volunteer4",
- id: "123",
- latitude: "36.07394505338441",
- longitude: "120.3868167667315",
- }
- ]
+ // this.tableList = [
+ // {
+ // categoryKey: "resi_xfry",
+ // content: "信访人员",
+ // id: "123",
+ // latitude: "36.082230",
+ // longitude: "120.3868167667315",
+ // placeType: 'resi'
+ // },
+ // {
+ // categoryKey: "sr_gy",
+ // content: "公园",
+ // id: "123",
+ // latitude: "36.062227",
+ // longitude: "120.389455",
+ // placeType: 'public_service'
+ // },
+ // {
+ // categoryKey: "ep_scjgqy",
+ // content: "生产加工企业",
+ // id: "123",
+ // latitude: "36.072214",
+ // longitude: "120.389455",
+ // placeType: 'dangerous_chemicals'
+ // },
+ // {
+ // categoryKey: "ps_wss",
+ // content: "卫生所（室）",
+ // id: "123",
+ // latitude: "36.07394505338441",
+ // longitude: "120.3868167667315",
+ // placeType: 'city_management'
+ // }
+ // ]
this.demand.list = data.list.map((item) => {
return [
item.categoryKey ? item.categoryKey : '--',
@@ -952,8 +1243,8 @@ const vueGis = {
//加载组织数据
async getMapTable () {
- // const url = "/data/aggregator/coverage/dataList";
- const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
+ const url = "/data/aggregator/coverage/dataList";
+ // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/coverage/dataList";
let params = {
coverageTypes: this.coverageTypes,
categoryKeys: this.categoryKeys,
@@ -966,36 +1257,40 @@ const vueGis = {
if (code === 0) {
this.iconArrays = data.list
- this.iconArrays = [
- {
- categoryKey: "volunteer1",
- content: "volunteer1",
- id: "123",
- latitude: "36.082230",
- longitude: "120.3868167667315",
- },
- {
- categoryKey: "volunteer2",
- content: "volunteer2",
- id: "123",
- latitude: "36.062227",
- longitude: "120.389455",
- },
- {
- categoryKey: "volunteer3",
- content: "volunteer3",
- id: "123",
- latitude: "36.072214",
- longitude: "120.389455",
- },
- {
- categoryKey: "volunteer4",
- content: "volunteer4",
- id: "123",
- latitude: "36.07394505338441",
- longitude: "120.3868167667315",
- }
- ]
+ // this.iconArrays = [
+ // {
+ // categoryKey: "resi_xfry",
+ // content: "信访人员",
+ // id: "123",
+ // latitude: "36.082230",
+ // longitude: "120.3868167667315",
+ // placeType: 'resi'
+ // },
+ // {
+ // categoryKey: "sr_gy",
+ // content: "公园",
+ // id: "123",
+ // latitude: "36.062227",
+ // longitude: "120.389455",
+ // placeType: 'public_service'
+ // },
+ // {
+ // categoryKey: "ep_scjgqy",
+ // content: "生产加工企业",
+ // id: "123",
+ // latitude: "36.072214",
+ // longitude: "120.389455",
+ // placeType: 'dangerous_chemicals'
+ // },
+ // {
+ // categoryKey: "ps_wss",
+ // content: "卫生所（室）",
+ // id: "123",
+ // latitude: "36.07394505338441",
+ // longitude: "120.3868167667315",
+ // placeType: 'city_management'
+ // }
+ // ]
this.iconArrays.forEach((item, index) => {
item.url = this.iconUrlArray[item.categoryKey]
@@ -1577,21 +1872,43 @@ export default vueGis;
.ol-overlaycontainer-stopevent {
display: none;
}
-
+
+
+