+
-
- {{item.name}}>
+
+ 五大图层
+
+ 五大图层>
- {{orgData.name}}
+ 个人档案
+
+
-
+
居民信息
所属网格：
{{ selInfo.gridName }}
@@ -146,6 +150,10 @@
志愿者类别：
{{ selInfo.categories }}
+
+
更多
+ 企业信息
@@ -193,71 +201,59 @@
+
@@ -399,6 +397,7 @@ import { requestPost } from "@/js/dai/request";
import cptTb from "@/views/modules/visual/cpts/tb";
import cptCard from "@/views/modules/visual/cpts/card";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
+import People from "../../basicinfo/people";
var centerPointGlobal = [120.664619, 36.504963]
@@ -521,8 +520,7 @@ const vueGis = {
//下钻层级记录
runNum: 0,
- runAgencyArray: [],
- selUserId: '',
+ routerArray: [],
center: [],
zoom: null,
parentPolygon: [],
@@ -571,19 +569,23 @@ const vueGis = {
demand: {
loading: false,
colList: [
+ {
+ align: "center",
+ width: "15%",
+ },
{
align: "center",
width: "25%",
},
{
align: "center",
- width: "75%",
+ width: "60%",
},
],
- header: ["分类", "名称"],
+ header: ["图例", "分类", "名称"],
list: [],
- pageSize: 10,
+ pageSize: 50,
pageNo: 1,
total: 0,
},
@@ -599,17 +601,17 @@ const vueGis = {
'zhaoshizhaohuojingshenbing': require('../../../../../assets/img/shuju/fiveLayer/zhaoshizhaohuojingshenbing.png'),
- 'co_yjdw': require('../../../../../assets/img/shuju/fiveLayer/co_yjdw.png'),
+ 'yjdw': require('../../../../../assets/img/shuju/fiveLayer/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'),
+ 'whdw': require('../../../../../assets/img/shuju/fiveLayer/whdw.png'),
'sr_ggld': require('../../../../../assets/img/shuju/fiveLayer/sr_ggld.png'),
- 'co_lwh': require('../../../../../assets/img/shuju/fiveLayer/co_lwh.png'),
+ 'lwh': require('../../../../../assets/img/shuju/fiveLayer/lwh.png'),
'sr_tyc': require('../../../../../assets/img/shuju/fiveLayer/sr_tyc.png'),
- 'co_lyjlb': require('../../../../../assets/img/shuju/fiveLayer/co_lyjlb.png'),
+ 'lyjlb': require('../../../../../assets/img/shuju/fiveLayer/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'),
+ 'zaxld': require('../../../../../assets/img/shuju/fiveLayer/zaxld.png'),
+ 'other': require('../../../../../assets/img/shuju/fiveLayer/other.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'),
@@ -652,7 +654,9 @@ const vueGis = {
showPopup: false,
selPlaceType: '',
- selInfo: {}
+ selInfo: {},
+ selUserId: '',
+ showPeopleInfo: false
}
},
@@ -691,13 +695,17 @@ const vueGis = {
},
methods: {
+ toPeople () {
+ this.showPeopleInfo = true
+ },
+
//添加覆盖层
addOverlay () {
// 使用变量存储弹窗所需的 DOM 对象
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({
@@ -720,11 +728,7 @@ const vueGis = {
closer.blur();
return false;
};
- if (goMore) {
- goMore.onclick = function () {
- _that.$emit('lookMore')
- };
- }
+
},
//注册地图点击事件
@@ -751,8 +755,14 @@ const vueGis = {
if (!info.id) {
return false
}
+ if (!info.latitude || !info.longitude) {
+ this.$message.warning("请先完善坐标位置")
+ return false
+ }
this.selPlaceType = info.placeType
- if (info.placeType === 'resi' || info.placeType === 'specil_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员
+ if (info.placeType === 'resi' || info.placeType === 'special_resi') {//综合治理图层和公共服务图层中的失能人员、失智人员
+ // info.id = "dd0bd55db0ca4b629c40bc914a08368e"
+ this.selUserId = info.id
this.loadResi(info)
}
if (info.placeType === 'public_service') {//公共服务图层
@@ -788,7 +798,7 @@ const vueGis = {
},
async loadResi (info) {
- const url = "/epmetuser/icresiuser/resi-brief/" + 'dd0bd55db0ca4b629c40bc914a08368e'
+ const url = "/epmetuser/icresiuser/resi-brief/" + info.id
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution"
let params = {}
@@ -822,7 +832,7 @@ const vueGis = {
}
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, true)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -830,8 +840,8 @@ const vueGis = {
},
async loadPublicService (info) {
- // const url = "/gov/org/icPublicService/detail"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail"
+ const url = "/gov/org/icPublicService/detail"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/detail"
let params = {
icPublicServiceId: info.id
@@ -850,7 +860,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -862,14 +872,14 @@ const vueGis = {
//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,
+ icEventId: info.id,
});
if (code === 0) {
let coordinate = [info.longitude, info.latitude]
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
@@ -879,8 +889,8 @@ const vueGis = {
},
async loadDangerousChemicals (info) {
- // const url = "/gov/org/icDangerousChemicals/detail"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
+ const url = "/gov/org/icDangerousChemicals/detail"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icDangerousChemicals/detail"
let params = {
icSuperiorResourceId: info.id
@@ -902,7 +912,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -910,8 +920,8 @@ const vueGis = {
},
async loadCityManagement (info) {
- // const url = "/gov/org/icCityManagement/detail"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
+ const url = "/gov/org/icCityManagement/detail"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail"
let params = {
icCityManagementId: info.id
@@ -930,7 +940,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -958,7 +968,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -966,8 +976,8 @@ const vueGis = {
},
async loadSuperiorResource (info) {
- // const url = "/gov/org/icSuperiorResource/detail"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
+ const url = "/gov/org/icSuperiorResource/detail"
+ // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icSuperiorResource/detail"
let params = {
icSuperiorResourceId: info.id
@@ -986,7 +996,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
- this.handleShowPopup(coordinate, false)
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
@@ -994,8 +1004,8 @@ const vueGis = {
},
async loadEnterprisePartrol (info) {
- // const url = "/gov/org/enterprise/detail"
- const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
+ 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)
@@ -1004,7 +1014,7 @@ const vueGis = {
let coordinate = [info.longitude, info.latitude]
this.selInfo = JSON.parse(JSON.stringify(data))
-
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
}
@@ -1019,7 +1029,7 @@ const vueGis = {
let coordinate = [info.longitude, info.latitude]
this.selInfo = JSON.parse(JSON.stringify(data))
-
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
}
@@ -1042,18 +1052,15 @@ const vueGis = {
}
this.selInfo = JSON.parse(JSON.stringify(data))
+ this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
}
},
- handleShowPopup (coordinate, isShowMore) {
- if (isShowMore) {
- document.getElementById("popup-goMore").style.display = 'block'
- } else {
- document.getElementById("popup-goMore").style.display = 'none'
- }
+ handleShowPopup (coordinate) {
+
// console.log(this.overlay.getElement())
let content = document.getElementById("popup-content");
this.overlay.getElement().style.display = 'block'
@@ -1073,6 +1080,7 @@ const vueGis = {
//点击图层
async handleClickCoverage (index) {
+ this.demand.pageNo = 1
this.coverageTypesList[index].select = !this.coverageTypesList[index].select
let item = this.coverageTypesList[index]
@@ -1093,7 +1101,7 @@ const vueGis = {
//点击类别
async handleClickCategory (index, colIndex) {
-
+ this.demand.pageNo = 1
this.categoryListshow[index][colIndex].sel = !this.categoryListshow[index][colIndex].sel
// this.categoryList[index * 4 + colIndex].sel = !this.categoryList[index * 4 + colIndex].sel
@@ -1124,6 +1132,7 @@ const vueGis = {
let selData = this.tableList[index]
mapView.setCenter([selData.longitude, selData.latitude]);
this.clickMapVolunteer(selData)
+
// alert(index)
},
@@ -1175,10 +1184,10 @@ 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";
+ async getTable () {
+ 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,
@@ -1189,46 +1198,12 @@ 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;
- data.list = [
- {
- 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.tableList = data.list
this.demand.list = data.list
this.demand.list.forEach(item => {
@@ -1244,6 +1219,7 @@ const vueGis = {
// item.categoryKey ? item.categoryKey : '--',
item.imgObj,
+ item.categoryName,
item.content ? item.content : '',
];
@@ -1256,8 +1232,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,
@@ -1269,43 +1245,12 @@ const vueGis = {
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
+
+ this.demand.total = data.total;
+
this.iconArrays = data.list
- // 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) => {
+ this.iconArrays.forEach((item, index) => {
item.url = this.iconUrlArray[item.categoryKey]
});
@@ -1438,26 +1383,10 @@ const vueGis = {
},
//返回所选组织
- handleClickAgency (index) {
-
- const cutNum = this.runAgencyArray.length - index//要减去的长度
- this.runNum = this.runNum - cutNum
-
- this.orgData = this.runAgencyArray[index]
+ handleClickRouter (index) {
- for (let i = 0; i < cutNum; i++) {
- this.runAgencyArray.pop()
- }
-
- this.orgId = this.orgData.id
- this.orgLevel = this.orgData.level
- this.center = this.orgData.center
- this.zoom = this.orgData.zoom
+ this.showPeopleInfo = false
- this.$nextTick(() => {
- this.refreshMap(true)
- this.$forceUpdate()
- });
},
@@ -1865,7 +1794,7 @@ const vueGis = {
...mapGetters(["clientHeight"])
},
- components: { cptTb, cptCard, ScreenLoading },
+ components: { cptTb, cptCard, ScreenLoading, People },
}
export default vueGis;
@@ -1894,11 +1823,50 @@ export default vueGis;
padding-bottom: 5px;
}
+.info-prop {
+ position: relative;
+ margin: 10px 0;
+ display: flex;
+ padding-left: 15px;
+ font-size: 12px;
+
+ .info-pics {
+ display: flex;
+ margin: 10px 0;
+ img {
+ display: block;
+ width: 32%;
+ height: 90px;
+ margin-right: 9px;
+ object-fit: cover;
+ }
+ }
+ > span,
+ > div {
+ display: block;
+ max-width: 300px;
+ }
+}
+
.popContentTitle {
font-size: 12px;
color: #ffffff;
margin-top: 5px;
}
+
+.div_resi_more {
+ display: flex;
+ justify-content: center;
+ margin-top: 20px;
+}
+
+.span_resi_more {
+ font-size: 16px;
+ text-decoration: underline;
+}
+.span_resi_more:hover {
+ cursor: pointer;
+}
难点痛点
+ 所属网格：
+ {{ selInfo.gridName }}
+
+ 发生时间：
+ {{ selInfo.happenTime }}
+
+ 事件内容：
+ {{ selInfo.eventContent }}
+
-
-
+
+
- 所属网格：
- {{ selInfo.gridName }}
-
-
- 发生时间：
- {{ selInfo.happenTime }}
-
-
-
- 事件内容：
- {{ selInfo.eventContent }}
-
-
-
- 图片：
-
- 更多>>>>
+
- ![]()
+
-
+ 图片：
+
+
+ ![]()
-
- 音频：
-
-
+
+
+ 音频：
+
-
+
-
-
-
- 反映渠道：
- {{ selInfo.sourceTypeName || "--" }}
-
-
- 地址：
- {{ selInfo.address || "--" }}
-
-
- 报事人：
- {{ selInfo.name || "--" }}
-
-
- 手机号：
- {{ selInfo.mobile || "--" }}
-
-
- 身份证号：
- {{ selInfo.idCard || "--" }}
反映渠道：
+ {{ selInfo.sourceTypeName|| "--" }}
+
+ 地址：
+ {{ selInfo.address || "--" }}
+
+ 报事人：
+ {{selInfo.name || "--" }}
+
+ 手机号：
+ {{ selInfo.mobile || "--" }}
+
+ 身份证号：
+ {{ selInfo.idCard || "--" }}
+
@@ -367,10 +363,12 @@