diff --git a/src/views/dataBoard/overview/components/MapResourceInfo.vue b/src/views/dataBoard/overview/components/MapResourceInfo.vue index 93171310f..7f89ed804 100644 --- a/src/views/dataBoard/overview/components/MapResourceInfo.vue +++ b/src/views/dataBoard/overview/components/MapResourceInfo.vue @@ -118,7 +118,7 @@ - + @@ -130,6 +130,12 @@ import MapResourceInfoMore from "@/views/dataBoard/overview/components/MapResour export default { name: "MapResourceInfo", components: {Title, CallPhone, MapResourceInfoMore}, + props: { + currentLevelData: { + type: Object, + default: () => {} + } + }, data() { return { dialogVisible: false, @@ -174,6 +180,7 @@ export default { type: this.type, education: this.education, hobby: this.hobby, + id: this.id }) }, getData(type) { diff --git a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue index fa7086f36..55feed72b 100644 --- a/src/views/dataBoard/overview/components/MapResourceInfoMore.vue +++ b/src/views/dataBoard/overview/components/MapResourceInfoMore.vue @@ -1,189 +1,193 @@ - - - - - - - - - - - 资源类型: - {{ typesList[types] }} - - - - + + + + + + - - 单位名称: - {{ detail.unitName }} - - - - - 分类: - {{ detail.typeName }} - - - - - 服务事项: - {{ - detail.serviceMatterNameList ? detail.serviceMatterNameList.join('、') : '' - }} - - - - - - 联系人: - {{ detail.contact }} - - - - - 联系电话: - {{ detail.contactMobile }} - - - - - - 地理位置: - {{ detail.address }} - - - - - - - 组织名称: - {{ detail.organizationName }} - - - - - 分类: - {{ detail.categoryName }} - - + + - 服务事项: - {{ detail.serviceItem }} + 资源类型: + {{ typesList[types] }} - - - 联系人: - {{ detail.principalName }} - - - - - 联系电话: - {{ detail.principalPhone }} - - - - - - 地理位置: - {{ detail.address }} - - - + + - - - - 姓名: - {{ detail.name }} - - - - - 联系电话: - {{ detail.mobile }} - - - - - - 年龄: - {{ detail.birthday ? getAgeByDateOfBirth(detail.birthday) : '未知' }} - - - - - 学历: - {{ education ? education.cultureLevelName : '' }} - - - - + + 单位名称: + {{ detail.unitName }} + + + + + 分类: + {{ detail.typeName }} + + + + + 服务事项: + {{ + detail.serviceMatterNameList ? detail.serviceMatterNameList.join('、') : '' + }} + + + + + + 联系人: + {{ detail.contact }} + + + + + 联系电话: + {{ detail.contactMobile }} + + + + + + 地理位置: + {{ detail.address }} + + + + + + + 组织名称: + {{ detail.organizationName }} + + + + + 分类: + {{ detail.categoryName }} + + + + + 服务事项: + {{ detail.serviceItem }} + + + + + 联系人: + {{ detail.principalName }} + + + + + 联系电话: + {{ detail.principalPhone }} + + + + + + 地理位置: + {{ detail.address }} + + + - - 所在位置: - {{ detail.houseInfo.homeName }} - - - - - 兴趣爱好: - {{ hobby ? hobby.hobbyRemark : '' }} - - - - - - - - + + + + 姓名: + {{ detail.name }} + + + + + 联系电话: + {{ detail.mobile }} + + + + + + 年龄: + {{ detail.birthday ? getAgeByDateOfBirth(detail.birthday) : '未知' }} + + + + + 学历: + {{ education ? education.cultureLevelName : '' }} + + + + - - - - - + + 所在位置: + {{ detail.houseInfo.homeName }} + + + + + 兴趣爱好: + {{ hobby ? hobby.hobbyRemark : '' }} + + + + + + + + + + + + + - - - - - + + + + + - - - 查看 - - - - + + + 查看 + 查看 + + + + + - - + + + + + + diff --git a/src/views/dataBoard/overview/components/map-top.vue b/src/views/dataBoard/overview/components/map-top.vue index 505eb5370..e9f54db59 100644 --- a/src/views/dataBoard/overview/components/map-top.vue +++ b/src/views/dataBoard/overview/components/map-top.vue @@ -20,8 +20,8 @@ - - + +