Browse Source

Merge branch 'dev-tuceng0616' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-tuceng0616

shibei_master
dai 3 years ago
parent
commit
13803327c3
  1. 0
      src/assets/img/shuju/fiveLayer/lwh.png
  2. 0
      src/assets/img/shuju/fiveLayer/lyjlb.png
  3. 0
      src/assets/img/shuju/fiveLayer/other.png
  4. 0
      src/assets/img/shuju/fiveLayer/whdw.png
  5. 0
      src/assets/img/shuju/fiveLayer/yjdw.png
  6. 0
      src/assets/img/shuju/fiveLayer/zaxld.png
  7. 2
      src/assets/scss/modules/visual/fiveLayerMap.scss
  8. 219
      src/views/modules/communityService/ninePlaces/places/places.vue
  9. 28
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  10. 4
      src/views/modules/shequzhili/event/cpts/event-detail.vue
  11. 71
      src/views/modules/shequzhili/event/eventList.vue
  12. 2
      src/views/modules/visual/basicinfo/peopleSearch.vue
  13. 390
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

0
src/assets/img/shuju/fiveLayer/co_lwh.png → src/assets/img/shuju/fiveLayer/lwh.png

Before

Width:  |  Height:  |  Size: 640 B

After

Width:  |  Height:  |  Size: 640 B

0
src/assets/img/shuju/fiveLayer/co_lyjlb.png → src/assets/img/shuju/fiveLayer/lyjlb.png

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 557 B

0
src/assets/img/shuju/fiveLayer/co_qt.png → src/assets/img/shuju/fiveLayer/other.png

Before

Width:  |  Height:  |  Size: 580 B

After

Width:  |  Height:  |  Size: 580 B

0
src/assets/img/shuju/fiveLayer/co_whdw.png → src/assets/img/shuju/fiveLayer/whdw.png

Before

Width:  |  Height:  |  Size: 560 B

After

Width:  |  Height:  |  Size: 560 B

0
src/assets/img/shuju/fiveLayer/co_yjdw.png → src/assets/img/shuju/fiveLayer/yjdw.png

Before

Width:  |  Height:  |  Size: 542 B

After

Width:  |  Height:  |  Size: 542 B

0
src/assets/img/shuju/fiveLayer/co_zaxld.png → src/assets/img/shuju/fiveLayer/zaxld.png

Before

Width:  |  Height:  |  Size: 563 B

After

Width:  |  Height:  |  Size: 563 B

2
src/assets/scss/modules/visual/fiveLayerMap.scss

@ -210,7 +210,7 @@
.tb {
height: calc(88vh - 302px - 10px - 90px);
height: calc(88vh - 302px - 10px - 150px);
overflow-y: auto;
@include scrollBar;
margin-top:20px;

219
src/views/modules/communityService/ninePlaces/places/places.vue

@ -5,88 +5,85 @@
:model="formData"
ref="ref_searchform"
:label-width="'100px'">
<div>
<el-form-item label="场所名称"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
size="small"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="item_width_1"
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId">
<el-select class="item_width_1"
v-model="formData.gridId"
size="small"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="规模"
prop="scale">
<el-select class="item_width_1"
size="small"
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所类型"
prop="ninePlaceVal">
<el-select class="item_width_1"
size="small"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-button style="margin-left:30px"
<el-form-item label="场所名称"
prop="placeOrgName">
<el-input v-model="formData.placeOrgName"
size="small"
class="item_width_1"
clearable
placeholder="请输入九小场所名称">
</el-input>
</el-form-item>
<el-form-item label="联系电话"
prop="mobile">
<el-input v-model="formData.mobile"
size="small"
class="item_width_1"
clearable
placeholder="请输入电话">
</el-input>
</el-form-item>
<el-form-item label="场所区域"
prop="gridId">
<el-select class="item_width_1"
v-model="formData.gridId"
size="small"
class="diy-button--search"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
placeholder="全部"
clearable>
<el-option v-for="item in gridList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="规模"
prop="scale">
<el-select class="item_width_1"
size="small"
class="diy-button--reset"
@click="resetSearch">重置</el-button>
</div>
v-model="formData.scale"
placeholder="请选择"
clearable>
<el-option v-for="item in scaleList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="场所类型"
prop="ninePlaceVal">
<el-select class="item_width_1"
size="small"
v-model="formData.ninePlaceVal"
placeholder="请选择"
clearable>
<el-option v-for="item in placeTypeList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-button style="margin-left:30px"
size="small"
class="diy-button--search"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--reset"
@click="resetSearch">重置</el-button>
</el-form>
</div>
<div class="div_table">
@ -151,12 +148,16 @@
class="operate">
<template slot-scope="scope">
<el-button type="text"
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text"
<el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
@ -185,7 +186,7 @@
class="dialog-h"
@closed="diaClose">
<places-form ref="ref_form"
:gridList="gridList"
:agencyId="agencyId"
:scaleList="scaleList"
:placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"
@ -265,7 +266,8 @@ export default {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
agencyId: this.agencyId,
purpose:"query"
}
const { data, code, msg } = await requestPost(url, params)
@ -369,6 +371,13 @@ export default {
this.$refs.ref_form.initForm('edit', row.placeOrgId)
})
},
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.placeOrgId)
})
},
addFormCancle () {
this.formShow = false
@ -464,7 +473,7 @@ export default {
computed: {
tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300
return this.$store.state.inIframe ? this.clientHeight - 400 + this.iframeHeight : this.clientHeight - 400
},
@ -478,42 +487,8 @@ export default {
}
}
</script>
<style lang="scss" scoped >
.div_main {
width: 100%;
}
.div_search {
background: #ffffff;
border-radius: 4px;
padding: 30px 20px 5px;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
}
.item_width_1 {
width: 260px;
}
.div_table {
background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
margin-top: 15px;
padding: 23px 30px 10px;
.table {
margin-top: 20px;
}
}
.div_btn {
}
.el-row {
/* margin-bottom: 20px; */
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-right: 50px;
}
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/list-main.scss";
</style>

28
src/views/modules/communityService/ninePlaces/places/placesForm.vue

@ -148,6 +148,7 @@ export default {
async initForm (type, placeOrgId) {
this.$refs.ref_form.resetFields();
this.loadGrid()
this.formType = type
if (placeOrgId) {
@ -156,6 +157,25 @@ export default {
await this.loadFormData()
}
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId,
purpose:"addorupdate"
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
//
@ -301,10 +321,6 @@ export default {
},
props: {
gridList: {
type: Array,
default: []
},
scaleList: {
type: Array,
default: []
@ -313,6 +329,10 @@ export default {
type: Array,
default: []
},
agencyId: {
type: String,
default: ""
},
}
}
</script>

4
src/views/modules/shequzhili/event/cpts/event-detail.vue

@ -58,6 +58,10 @@
<span class="info-title-2">身份证号</span>
<span>{{ info.idCard?info.idCard:'--' }}</span>
</div>
<div class="info-prop">
<span class="info-title-2">痛点难点</span>
<span>{{ info.difficultPointName }}</span>
</div>
<div v-if="info.operationType==='1'"
class="info-prop">
<span class="info-title-2">已立项</span>

71
src/views/modules/shequzhili/event/eventList.vue

@ -125,6 +125,14 @@
<el-button @click="handleExport"
class="diy-button--reset"
size="small">导出</el-button>
<el-button @click="handleMarkDiffcult"
class="diy-button--export"
size="small">标记痛点难点</el-button>
<el-button @click="handleCancalDiffcult"
class="diy-button--delete"
size="small">取消标记痛点难点</el-button>
</div>
<el-table :data="tableData"
@ -132,7 +140,13 @@
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
class="table"
style="width: 100%"
@selection-change="handleSelectionChange"
:height="maxTableHeight">
<el-table-column label=""
fixed="left"
type="selection"
align="center"
width="50" />
<el-table-column label="序号"
fixed="left"
type="index"
@ -241,6 +255,17 @@
<span v-else>--</span>
</template>
</el-table-column>
<el-table-column prop="status"
align="center"
label="痛点难点"
width="80"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.difficultPoint==='1'"></span>
</template>
</el-table-column>
<el-table-column fixed="right"
label="操作"
@ -412,6 +437,8 @@ export default {
showVoice: false,
selVoiceUrl: '',
multipleSelection: []
};
},
computed: {
@ -440,6 +467,50 @@ export default {
this.getTableData();
},
methods: {
handleSelectionChange (val) {
this.multipleSelection = [];
val.forEach(element => {
this.multipleSelection.push(element.icEventId)
});
console.log(this.multipleSelection)
},
async handleMarkDiffcult () {
const url = "/gov/project/icEvent/difficultpointevent"
let params = {
icEventIdList: this.multipleSelection,
type: "1"
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message.success('标记成功')
this.getTableData();
} else {
this.$message.error(msg)
}
},
async handleCancalDiffcult () {
const url = "/gov/project/icEvent/difficultpointevent"
let params = {
icEventIdList: this.multipleSelection,
type: "0"
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.$message.success('取消标记成功')
this.getTableData();
} else {
this.$message.error(msg)
}
},
handleSearch (val) {
console.log(this.formData);

2
src/views/modules/visual/basicinfo/peopleSearch.vue

@ -180,7 +180,7 @@ export default {
async toSubAgency (type, userId) {
return this.$router.push({ path: `/main-shuju/visual-basicinfo-people/${userId}` });
// this.orgLevel = 'people'
// this.selUserId = userId

390
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -2,19 +2,23 @@
<div style="position: relative">
<!-- 组织路由 -->
<div class="div_top">
<div class="router_line"></div>
<div class="div_router">
<span class="router_parents"
v-for="(item,index) in runAgencyArray"
@click="handleClickAgency(index)"
:key="index">{{item.name}}<span class="arrow">></span></span>
<div v-if="!showPeopleInfo">
<span class="router_child">五大图层</span>
</div>
<div v-if="showPeopleInfo"> <span class="router_parents"
@click="handleClickRouter">五大图层<span class="arrow">></span></span>
<span class="router_child">{{orgData.name}}</span>
<span class="router_child">个人档案</span>
</div>
</div>
</div>
<div class="div_content">
<div v-show="!showPeopleInfo"
class="div_content">
<div class="div_map"
id="map"
@ -111,7 +115,7 @@
<div id="popup-content"
class="popup-content">
<div v-show="selPlaceType==='resi'|| selPlaceType === 'specil_resi'">
<div v-show="selPlaceType==='resi'|| selPlaceType === 'special_resi'">
<div class="popTitle">居民信息</div>
<div class="popContentTitle">所属网格
<span>{{ selInfo.gridName }}</span>
@ -146,6 +150,10 @@
<div class="popContentTitle">志愿者类别
<span>{{ selInfo.categories }}</span>
</div>
<div class="div_resi_more">
<div @click="toPeople"
class="span_resi_more">更多</div>
</div>
</div>
<div v-show="selPlaceType==='dangerous_chemicals'">
<div class="popTitle">企业信息</div>
@ -193,71 +201,59 @@
</div>
</div>
<div v-show="selPlaceType==='event'">
<div class="popTitle">难点痛点</div>
<div class="popContentTitle">所属网格
<span>{{ selInfo.gridName }}</span>
</div>
<div class="popContentTitle">发生时间
<span>{{ selInfo.happenTime }}</span>
</div>
<div class="popContentTitle">事件内容
<span>{{ selInfo.eventContent }}</span>
</div>
<div class="m-info">
<div class="info-prop">
<span>所属网格</span>
<span>{{ selInfo.gridName }}</span>
</div>
<div class="info-prop">
<span>发生时间</span>
<span>{{ selInfo.happenTime }}</span>
</div>
<div class="info-prop">
<span>事件内容</span>
<span>{{ selInfo.eventContent }}</span>
</div>
<div v-if="selInfo.imageList&&selInfo.imageList.length>0"
class="info-prop">
<span>图片</span>
<div class="info-pics">
<img :src="src"
:key="src"
style="width:100px;height:100px;padding-right:10px"
v-for="src in eventInfo.imageList"
@click="watchImg(src)" />
<div v-if="selInfo.imageList&&selInfo.imageList.length>0"
class="info-prop">
<span>图片</span>
<div class="info-pics">
<img :src="src"
:key="src"
style="width:100px;height:100px;padding-right:10px"
v-for="src in eventInfo.imageList"
@click="watchImg(src)" />
</div>
</div>
</div>
<div v-if="selInfo.voiceList&&selInfo.voiceList.length>0"
class="info-prop">
<span>音频</span>
<div class="info-pics">
<audio controls>
<source :src="item.url"
type=""
:key="item.url"
v-for="item in eventInfo.voiceList" />
</audio>
<div v-if="selInfo.voiceList&&selInfo.voiceList.length>0"
class="info-prop">
<span>音频</span>
<div class="info-pics">
<audio controls>
<source :src="item.url"
type=""
:key="item.url"
v-for="item in eventInfo.voiceList" />
</audio>
</div>
</div>
<div class="info-prop">
<span>反映渠道</span>
<span>{{ selInfo.sourceTypeName || "--" }}</span>
</div>
<div class="info-prop">
<span>地址</span>
<span>{{ selInfo.address || "--" }}</span>
</div>
<div class="info-prop">
<span>报事人</span>
<span>{{ selInfo.name || "--" }}</span>
</div>
<div class="info-prop">
<span>手机号</span>
<span>{{ selInfo.mobile || "--" }}</span>
</div>
<div class="info-prop">
<span>身份证号</span>
<span>{{ selInfo.idCard || "--" }}</span>
</div>
</div>
<div class="popContentTitle">反映渠道
<span>{{ selInfo.sourceTypeName|| "--" }}</span>
</div>
<div class="popContentTitle">地址
<span>{{ selInfo.address || "--" }}</span>
</div>
<div class="popContentTitle">报事人
<span>{{selInfo.name || "--" }}</span>
</div>
<div class="popContentTitle">手机号
<span>{{ selInfo.mobile || "--" }}</span>
</div>
<div class="popContentTitle">身份证号
<span>{{ selInfo.idCard || "--" }}</span>
</div>
</div>
<div v-show="selPlaceType==='community_org'">
@ -367,10 +363,12 @@
</div>
</div>
<a href="#"
id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div>
<people v-if="showPeopleInfo"
:uid="selUserId"
ref="ref_people"></people>
</div>
</template>
@ -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;
</script>
@ -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;
}
</style>
<style lang="scss" >
@ -1967,9 +1935,7 @@ export default vueGis;
.popup-content {
width: 300px;
}
.popup-goMore {
margin: 20px 0;
}
.ol-popup-closer:after {
content: "✖";
// color: rgba(1, 17, 104, 1);

Loading…
Cancel
Save