Browse Source

合并分支

test
YUJT 3 years ago
parent
commit
bb108979e5
  1. 6
      src/views/modules/base/community/community.vue
  2. 125
      src/views/modules/base/community/communityTable.vue
  3. 29
      src/views/modules/base/community/roomForm.vue
  4. 19
      src/views/modules/base/community/roomTable.vue
  5. 12
      src/views/modules/communityService/fuwujilu/addForm.vue
  6. 209
      src/views/modules/communityService/fuwujilu/detailForm.vue
  7. 1
      src/views/modules/communityService/fuwujilu/fuwuList.vue
  8. 10
      src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue
  9. 14
      src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue
  10. 13
      src/views/modules/shequzhili/event/cpts/add.vue
  11. 11
      src/views/modules/shequzhili/event/cpts/process-form-demand.vue
  12. 9
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
  13. 20
      src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue
  14. 1090
      src/views/modules/visual/communityParty/partyOld.vue
  15. 67
      src/views/modules/visual/components/screen-map/index.vue

6
src/views/modules/base/community/community.vue

@ -48,7 +48,7 @@
</el-input>
</el-form-item>
<el-form-item label="房主手机"
<el-form-item label="联系方式"
prop="ownerPhone">
<el-input v-model="ownerPhone"
class="item_width_2"
@ -234,7 +234,7 @@ export default {
await this.loadOrgData()
await this.loadTree()
await this.loadOpenNode()
// await this.loadOpenNode()
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
if (this.treeData.length > 0) {
@ -312,6 +312,8 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.openNodes = []
this.openNodes.push(data[0].id)
this.treeData = data
if (!isRefresh && data.length > 0) {

125
src/views/modules/base/community/communityTable.vue

@ -2,6 +2,12 @@
<div>
<div class="div_btn">
<el-button v-if="showYhymInfo"
style=""
class="diy-button--reset"
size="small"
:loading="yhymLoading"
@click="handleYhymInfo">补全一户一码信息</el-button>
<el-button style=""
class="diy-button--add"
size="small"
@ -66,7 +72,7 @@
<el-button style="margin-left:10px"
class="diy-button--reset"
size="small"
@click="handleExport">导出</el-button>
@click="handleExportOpen">导出</el-button>
<el-button v-if="agencyObj.level == 'community'"
style="margin-left:10px"
class="diy-button--qrcode"
@ -76,11 +82,11 @@
class="diy-button--more"
size="small"
@click="deleteBatch">批量删除</el-button>
<el-button style=";margin-left:10px"
<!-- <el-button style=";margin-left:10px"
class="diy-button--export"
size="small"
:disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button>
@click="handleExportYihuyidang()">导出一户一档</el-button> -->
</div>
@ -183,6 +189,31 @@
@dialogOk="addFormOk"></community-form>
</el-dialog>
<el-dialog
title="导出"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
<div>
<el-button class="diy-button--reset"
size="small"
@click="handleExport">导出房屋数据</el-button>
<el-button class="diy-button--export"
size="small"
:disabled="yihuyidangDisabled"
@click="handleExportYihuyidang()">导出一户一档</el-button>
<el-button class="diy-button--qrcode"
size="small"
:disabled="yihuyimaDisabled"
:loading="exportBtn"
@click="handleExportYihuyima()">导出一户一码</el-button>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false"> </el-button>
<!-- <el-button type="primary" @click="dialogVisible = false"> </el-button> -->
</span>
</el-dialog>
</div>
</template>
@ -208,6 +239,9 @@ export default {
tableLoading: true,
showImportBtn: false,//
roleList: [],//
showYhymInfo: false, //
yhymLoading: false,
agencyObj: {},//
@ -225,7 +259,9 @@ export default {
fileName: "",
uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import',
yihuyidangDisabled: false,
yihuyimaDisabled: false,
exportBtn: false,
dialogVisible: false //
}
},
components: {
@ -246,7 +282,13 @@ export default {
async loadTable (fromTree, treeObj) {
console.log(111, this.staffAgencyId)
//
this.roleList = localStorage.getItem('roleList')
if (this.roleList.indexOf('root_manager') > -1 || this.roleList.indexOf('manager') > -1) {
this.showYhymInfo = true
} else {
this.showYhymInfo = false
}
this.tableLoading = true
if (fromTree) {
this.agencyObj = treeObj
@ -330,6 +372,34 @@ export default {
})
},
//
async handleYhymInfo () {
this.yhymLoading = true
const url = "/gov/org/house/createBatchHouseCodeAndUrl"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.yhymLoading = false
this.$message({
type: "success",
message: "批量生成成功"
});
} else if (code > 8000) {
this.yhymLoading = false
this.$message({
showClose: true,
message: msg,
duration: 0
})
} else {
this.yhymLoading = false
this.$message.error(msg)
}
},
handleEdit (row) {
this.formTitle = '修改小区'
this.formShow = true
@ -486,7 +556,11 @@ export default {
// this.download(res.data, '1.png')
})
},
//
//
handleExportOpen () {
this.dialogVisible = true
},
//
async handleExport () {
let title = this.agencyObj.label
title = title + '—小区列表'
@ -512,6 +586,10 @@ export default {
},
handleClose(done) {
this.dialogVisible = false
},
//
download (data, downFileName) {
if (!data) {
@ -613,6 +691,41 @@ export default {
},
//
handleExportYihuyima () {
this.exportBtn = true
this.yihuyimaDisabled = true
let title = this.agencyObj.label
title = title + '-一户一码'
let url = "/gov/org/house/downloadZip"
let params = {
level: this.agencyObj.level,
id: this.agencyObj.id
}
app.ajax.exportFilePost(
url,
params,
(data, rspMsg) => {
this.download(data, title + '.Zip')
this.exportBtn = false
this.yihuyimaDisabled = false
},
(rspMsg, data) => {
this.exportBtn = false
this.yihuyimaDisabled = false
this.$message.error(rspMsg);
}
);
},
//
beforeUpload (file, type) {

29
src/views/modules/base/community/roomForm.vue

@ -40,6 +40,25 @@
</el-input>
</el-form-item>
<div v-if="formType === 'detail'">
<el-form-item label="房屋编码"
prop="houseCode"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="30"
v-model="dataForm.houseCode">
</el-input>
</el-form-item>
<div v-if="dataForm.houseQrcodeUrl"
style="display: flex;flex-direction: column;">
<img style="margin-left: 70px;width: 200px;"
:src="dataForm.houseQrcodeUrl">
<a style="margin-left: 80px"
:href="dataForm.houseQrcodeUrl"
target="_blank">下载</a>
</div>
</div>
<el-form-item label="房屋类型"
prop="houseType"
label-width="150px"
@ -91,13 +110,13 @@
v-model="dataForm.ownerName">
</el-input>
</el-form-item>
<el-form-item label="房主电话"
<el-form-item label="联系方式"
prop="ownerPhone"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type='number'
placeholder="请输入房主电话"
placeholder="请输入联系方式"
v-model="dataForm.ownerPhone">
</el-input>
</el-form-item>
@ -161,10 +180,10 @@ export default {
houseType: '',//
purpose: '',//
rentFlag: 0,//10 12 0
ownerPhone: '', //
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '', //
remark: '' //
remark: ''
},
keyWords: '',
@ -330,7 +349,7 @@ export default {
houseType: '1',//
purpose: '1',//
rentFlag: 0,//10
ownerPhone: '', //
ownerPhone: '', //
ownerName: '', //
ownerIdCard: '', //
remark: '' //

19
src/views/modules/base/community/roomTable.vue

@ -102,7 +102,7 @@
width="90">
</el-table-column>
<el-table-column prop="ownerPhone"
label="房主电话"
label="联系方式"
width="110">
</el-table-column>
<el-table-column prop="ownerIdCard"
@ -213,6 +213,7 @@ export default {
// showImportBtn: false,//
agencyObj: {},//
agencyLevel: '',//level grid neighborHood building agency
validTableDataNum: 0,//
@ -339,6 +340,20 @@ export default {
}
if (this.agencyObj.level === 'grid') {
this.agencyLevel = 'grid'
} else if (this.agencyObj.level === 'neighborHood') {
this.agencyLevel = 'neighborHood'
} else if (this.agencyObj.level === 'building') {
this.agencyLevel = 'building'
} else {
this.agencyLevel = 'agency'
}
// if (fromTree) {
// this.agencyObj = treeObj
@ -346,7 +361,7 @@ export default {
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
level: this.agencyObj.level,
level: this.agencyLevel,
id: this.agencyObj.id,
ownerName: this.ownerName,
ownerPhone: this.ownerPhone,

12
src/views/modules/communityService/fuwujilu/addForm.vue

@ -122,10 +122,10 @@
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
maxlength="1000"
show-word-limit
:rows="3"
placeholder="请输入备注,不超过500字"
placeholder="请输入备注,不超过1000字"
v-model="formData.remark"></el-input>
</el-form-item>
<el-form-item label="直接反馈"
@ -162,10 +162,10 @@
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
maxlength="1000"
show-word-limit
:rows="3"
placeholder="请输入服务目标,不超过500字"
placeholder="请输入服务目标,不超过1000字"
v-model="feedbackFormData.serviceGoal"></el-input>
</el-form-item>
@ -175,10 +175,10 @@
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="500"
maxlength="1000"
show-word-limit
:rows="3"
placeholder="请输入服务效果,不超过500字"
placeholder="请输入服务效果,不超过1000字"
v-model="feedbackFormData.serviceEffect"></el-input>
</el-form-item>

209
src/views/modules/communityService/fuwujilu/detailForm.vue

@ -139,6 +139,142 @@
</el-form>
<div v-show="formData.serviceStatus==='completed'">
<h3 class="d-h3">反馈内容</h3>
<el-form ref="ref_form_feedback"
:inline="true"
:disabled="true"
:model="feedbackFormData"
class="div_form">
<el-form-item label="服务目标"
prop="serviceGoal"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="1000"
show-word-limit
:rows="3"
placeholder="请输入服务目标,不超过1000字"
v-model="feedbackFormData.serviceGoal"></el-input>
</el-form-item>
<el-form-item label="服务效果"
prop="serviceEffect"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
type="textarea"
maxlength="1000"
show-word-limit
:rows="3"
placeholder="请输入服务效果,不超过1000字"
v-model="feedbackFormData.serviceEffect"></el-input>
</el-form-item>
<el-form-item label="服务人数"
style="display: block"
prop="servicePeopleNumber"
label-width="150px">
<el-input-number class="item_width_1"
v-model="feedbackFormData.servicePeopleNumber"
:min="0"
:max="9999"
label="服务人数"></el-input-number>
</el-form-item>
<el-form-item label="服务状态"
label-width="150px"
prop="serviceStatus">
<span>已完成</span>
<!-- <el-select class="item_width_1"
v-model="feedbackFormData.serviceStatus"
placeholder="全部"
clearable>
<el-option v-for="item in statusArray"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select> -->
</el-form-item>
<el-form-item label="满意度"
label-width="150px"
prop="satisfaction">
<el-select class="item_width_1"
v-model="feedbackFormData.satisfaction"
placeholder="全部"
clearable>
<el-option v-for="item in satisfyArray"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="地址"
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
v-model="feedbackFormData.address"></el-input>
</el-form-item>
<!-- <el-form-item label="地图位置"
label-width="150px"
style="display: block">
<div style="width:500px">
<div class="div_map">
<div id="map_app">
</div>
<div class="div_searchmap">
<el-input maxlength="50"
size="mini"
placeholder="请输入关键字"
v-model="keyWords">
</el-input>
<el-button style="margin-left: 10px"
type="primary"
size="mini"
@click="handleSearchMap">查询</el-button>
</div>
</div>
</div>
</el-form-item> -->
<el-form-item class="block"
label="附件"
label-width="150px"
prop="attach">
<!-- <el-upload v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
class="upload-demo"
:on-preview="handleFileDownload"
accept=".doc,.pdf,.xls,.docx,.xlsx,.jpg,.png,.jpeg,.bmp,.mp4,.wma,.m4a,.mp3"
:limit="3"
:file-list="fileList">
</el-upload> -->
<div v-if="feedbackFormData.attachmentList&&feedbackFormData.attachmentList.length>0"
class="attachement-list">
<a :href="att.attachmentUrl"
target="_blank"
:key="att.attachmentUrl"
v-for="att in feedbackFormData.attachmentList">
<i class="el-icon-folder-opened"></i>
{{ att.attachmentName }}
</a>
</div>
<span v-else>无附件</span>
</el-form-item>
</el-form>
</div>
</div>
<div class="div_btn">
@ -202,6 +338,20 @@ export default {
longitude: 36.0722275, //
latitude: 120.38945519 //
},
feedbackFormData: {
serviceProjectId: '',// id
serviceProjectName: '',
serviceGoal: '',//
serviceEffect: '',//
servicePeopleNumber: null,//
serviceStatus: 'completed',// in_servicecompleted:
satisfaction: '',//:bad:good:perfect
longitude: '',//
latitude: '',//
address: '',
attachmentList: [],//
},
serviceList: [],//list
endPickerOptions: {
@ -211,18 +361,19 @@ export default {
disabledDate: startDisabledDate
},
projectList: [],
fileList: [],
uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
}
},
components: {},
mounted () {
if (this.serviceRecordId) {//
this.loadInfo()
}
// this.initMap()
console.log('mounted')
},
@ -240,13 +391,26 @@ export default {
if (code === 0) {
this.formData = { ...data }
this.formData.serviceRecordId = this.serviceRecordId
this.feedbackFormData = { ...data.feedBack }
this.feedbackFormData.servicePeopleNumber = this.formData.servicePeopleNumber
this.fileList = []
if (data.feedBack.attachmentList && data.feedBack.attachmentList.length > 0) {
data.feedBack.attachmentList.forEach(element => {
let obj = {
name: element.attachmentName,
format: element.attachmentFormat,
url: element.attachmentUrl,
}
this.fileList.push(obj)
});
}
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
@ -303,6 +467,19 @@ export default {
},
//
handleFileDownload (file) {
var a = document.createElement('a');
var event = new MouseEvent('click');
a.download = file.name;
console.log(a)
a.href = file.url;
a.dispatchEvent(event);
},
// init
initMap () {
//
@ -485,7 +662,13 @@ export default {
default () {
return []
}
}
},
satisfyArray: {
type: Array,
default () {
return []
}
},
}
}
</script>
@ -493,4 +676,18 @@ export default {
<style lang="scss" scoped >
@import "@/assets/scss/modules/management/form-main.scss";
.attachement-list {
// padding-left: 20px;
a {
display: block;
cursor: pointer;
// color: #4df0ff;
font-size: 14px;
i {
color: #333;
}
}
}
</style>

1
src/views/modules/communityService/fuwujilu/fuwuList.vue

@ -253,6 +253,7 @@
@closed="showDetail = false">
<detail-form ref="ref_detail_form"
:serviceRecordId="serviceRecordId"
:satisfyArray="satisfyArray"
:categrayArray="categrayArray"
@handleOk="handleOk"
@handleClose="handleClose"

10
src/views/modules/communityService/fuwuxiangmu/cpts/edit.vue

@ -29,7 +29,7 @@
>
</el-option>
</el-select>
<div v-else>{{ fmData.serviceCategory || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.serviceCategory || "--" }}</div>
</el-form-item>
<el-form-item
@ -47,7 +47,7 @@
v-model="fmData.serviceName"
>
</el-input>
<div v-else>{{ fmData.serviceName || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.serviceName || "--" }}</div>
</el-form-item>
<el-form-item
@ -66,7 +66,7 @@
placeholder="请输入服务内容,不超过1000字"
v-model="fmData.serviceContent"
></el-input>
<div v-else>{{ fmData.serviceContent || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.serviceContent || "--" }}</div>
</el-form-item>
<el-form-item
@ -89,7 +89,7 @@
>
</el-option>
</el-select>
<div v-else>{{ fmData.policyLevelName || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.policyLevelName || "--" }}</div>
</el-form-item>
<el-form-item
@ -108,7 +108,7 @@
placeholder="请输入政策依据,不超过1000字"
v-model="fmData.policyGround"
></el-input>
<div v-else>{{ fmData.policyGround || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.policyGround || "--" }}</div>
</el-form-item>
<el-form-item

14
src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue

@ -30,7 +30,7 @@
>
</el-option>
</el-select>
<div v-else>{{ fmData.serviceTypeName }}</div>
<div style="width:610px" v-else>{{ fmData.serviceTypeName }}</div>
</el-form-item>
<el-form-item
@ -48,7 +48,7 @@
v-model="fmData.orgName"
>
</el-input>
<div v-else>{{ fmData.orgName || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.orgName || "--" }}</div>
</el-form-item>
<el-form-item
@ -67,7 +67,7 @@
placeholder="请输入服务内容,不超过1000字"
v-model="fmData.orgDescribe"
></el-input>
<div v-else>{{ fmData.orgDescribe || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.orgDescribe || "--" }}</div>
</el-form-item>
<el-form-item
@ -84,7 +84,7 @@
placeholder="请输入负责人姓名"
v-model="fmData.principalName"
></el-input>
<div v-else>{{ fmData.principalName || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.principalName || "--" }}</div>
</el-form-item>
<el-form-item
@ -101,7 +101,7 @@
placeholder="请输入联系方式"
v-model="fmData.principalMobile"
></el-input>
<div v-else>{{ fmData.principalMobile || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.principalMobile || "--" }}</div>
</el-form-item>
<el-form-item
@ -165,7 +165,7 @@
placeholder="请输入备注,不超过500字"
v-model="fmData.remark"
></el-input>
<div v-else>{{ fmData.remark || "--" }}</div>
<div style="width:610px" v-else>{{ fmData.remark || "--" }}</div>
</el-form-item>
</el-form>
</div>
@ -348,7 +348,7 @@ export default {
geocoder
.getAddress({ location: new TMap.LatLng(lat, lng) }) //
.then((result) => {
// this.fmData.address = result.result.address;
this.fmData.address = result.result.address;
});
},

13
src/views/modules/shequzhili/event/cpts/add.vue

@ -312,6 +312,7 @@ export default {
//
keyWords: '',
isFirst: true,//
// oss/file/uploadvariedfile
dialogImageUrl: 'oss/file/uploadvariedfile',
@ -620,7 +621,7 @@ export default {
this.handleMoveCenter()
})
this.handleMoveCenter()
this.convert()
// this.convert()
},
setMarker (lat, lng) {
@ -699,8 +700,14 @@ export default {
geocoder
.getAddress({ location: location }) //
.then((result) => {
this.formData.address = result.result.address
//
if (!this.isFirst) {//
this.formData.address = result.result.address
}
if (this.isFirst) {
this.isFirst = false
}
});
},

11
src/views/modules/shequzhili/event/cpts/process-form-demand.vue

@ -469,9 +469,14 @@ export default {
handleServiceChange (type, val) {
if (val === "social_org") {
if (type === "add") this.getServiceuserList(val, "add_demand");
else this.getServiceuserList(val, "query_demand");
} else this.getServiceuserList(val, "");
if (type === "add") {
this.getServiceuserList(val, "add_demand");
} else {
this.getServiceuserList(val, "query_demand");
}
} else {
this.getServiceuserList(val, "");
}
},
async getServiceuserList (serviceType, query) {

9
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue

@ -21,6 +21,7 @@
</template>
<screen-nodata class="nodata" v-else></screen-nodata>
</div>
<div class="dashed-line"></div>
<div class="list right-list">
<template v-if="info.content">
<!-- <div class="item-title">需求内容</div> -->
@ -290,6 +291,12 @@ export default {
.list-wr {
display: flex;
padding: 0 20px;
.dashed-line {
width: 1px;
height: 600px;
margin: 0 15px;
border: 1px dashed #1257c9;
}
.left-list {
width: 280px !important;
height: 600px;
@ -322,7 +329,7 @@ export default {
}
}
.right-list {
padding: 0 25px !important;
padding: 0 15px !important;
}
}
</style>

20
src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue

@ -369,8 +369,10 @@ export default {
if (item.coordinates && item.coordinates.length > 0) {
if (!this.isRepeatItem(item.name)) {
let colorIndex = index < polygonColorArray.length ? index : 0
item.fillColor = transparent,
item.color = polygonColorArray[colorIndex]
// item.fillColor = 'rgba(0, 229, 237, 0.16)'
item.fillColor = transparent
item.color = '#00E5ED'
// item.color = polygonColorArray[colorIndex]
subPolygonList.push(item)
}
}
@ -456,7 +458,10 @@ export default {
if (this.isfirstInit) {
// this.agencyInfo.level = 'agency'
//mapInfo, polygonArray, polIconUrlArray, iconArrays, iconUrlArray
this.$refs.map.loadMap(this.agencyInfo, this.polygonList, null, this.distributionsList, this.iconUrlArray, null)
const polygonIconArray = [
'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20211116/a219130b6bc74b0b80b5ddb0fce0892a.png',
]
this.$refs.map.loadMap(this.agencyInfo, this.polygonList, polygonIconArray, this.distributionsList, this.iconUrlArray, null)
} else {
this.$refs.map.refreshMap(this.agencyInfo, this.polygonList, this.distributionsList, false)
}
@ -464,10 +469,11 @@ export default {
//
async clickMap (feature) {
if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
await this.loadOrgData(feature.values_.level, feature.values_.id)
this.loadMap()
}
//
// if (feature.values_.coordinates && feature.values_.coordinates.length > 0) {
// await this.loadOrgData(feature.values_.level, feature.values_.id)
// this.loadMap()
// }
console.log('标注信息', feature.values_.properties)
if (!feature.values_.properties) {
return

1090
src/views/modules/visual/communityParty/partyOld.vue

File diff suppressed because it is too large

67
src/views/modules/visual/components/screen-map/index.vue

@ -20,11 +20,21 @@
</div>-->
<div class="div_map" :id="mapId" :ref="mapId"></div>
<div id="popup" style="display: none" class="ol-popup">
<a href="#" id="popup-closer" class="ol-popup-closer"></a>
<div id="popup-content" class="popup-content"></div>
<a href="#" id="popup-goMore" class="popup-goMore">更多>>>></a>
<div class="div_map"
:id="mapId"
:ref="mapId">
</div>
<div id="popup"
style="display: none;"
class="ol-popup">
<a href="#"
id="popup-closer"
class="ol-popup-closer"></a>
<div id="popup-content"
class="popup-content"></div>
<a href="#"
id="popup-goMore"
class="popup-goMore">更多>>>></a>
</div>
</div>
</template>
@ -217,7 +227,7 @@ const vueGis = {
// });
//
this.initMap();
this.initMap()
if (this.showPolIconLayer) {
console.log("showPolIconLayer++++++++++++++++++++++", this.showPolIconLayer);
//
@ -491,7 +501,48 @@ const vueGis = {
map.removeInteraction(dblClickInteraction);
},
//
setMapLocation() {
setMapLocation () {
if (!this.zoom) {
this.setZoom(this.mapInfo.agencyLevel)
}
this.centerPoint = []
//
if (this.center && this.center.length > 0) {
this.centerPoint = this.center
this.centerFlag = 'point'
this.center = []
} else if (polygonLayer.getSource().getFeatures()[0]) {//,
this.centerFlag = 'flag_polygon'
} else if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint.push(this.mapInfo.longitude)
this.centerPoint.push(this.mapInfo.latitude)
this.centerFlag = 'point'
} else {
this.centerPoint = centerPointGlobal
this.centerFlag = 'point'
}
// debugger
if (this.centerFlag === 'flag_parent') {
let parentFeatures = parentLayer.getSource().getFeatures()[0]
let polygon = parentFeatures.getGeometry();
map.getView().fit(polygon, map.getSize());
this.zoom = map.getView().getZoom() - 1
} else if (this.centerFlag === 'flag_polygon') {
let polygonFeatures = polygonLayer.getSource().getFeatures()[0]
let polygon = polygonFeatures.getGeometry();
map.getView().fit(polygon, map.getSize());
this.zoom = map.getView().getZoom() - 1
} else {
mapView.setCenter(this.centerPoint);
}
if (!this.isChangeCenter) {
return false;
}
@ -533,7 +584,7 @@ const vueGis = {
}
mapView.setZoom(this.zoom);
},
firstCentermap() {
firstCentermap () {
if (this.mapInfo.longitude && this.mapInfo.latitude) {
this.centerPoint = [];
this.centerPoint.push(this.mapInfo.longitude);

Loading…
Cancel
Save