diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue index f6d9a462e..1305e4048 100644 --- a/src/views/modules/base/community/community.vue +++ b/src/views/modules/base/community/community.vue @@ -48,7 +48,7 @@ - 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) { diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index bbdb0db2c..5f4a3c763 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -2,6 +2,12 @@
+ 补全一户一码信息 导出 + @click="handleExportOpen">导出 批量删除 - 导出一户一档 + @click="handleExportYihuyidang()">导出一户一档 -->
@@ -183,6 +189,31 @@ @dialogOk="addFormOk"> + +
+ 导出房屋数据 + 导出一户一档 + 导出一户一码 +
+ + 取 消 + + + +
@@ -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) { diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue index 525c4b984..1ede57c69 100644 --- a/src/views/modules/base/community/roomForm.vue +++ b/src/views/modules/base/community/roomForm.vue @@ -40,6 +40,25 @@ +
+ + + + +
+ + 下载 +
+
- @@ -161,10 +180,10 @@ export default { houseType: '',//房屋类型【楼房，平房，别墅】 purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 rentFlag: 0,//房屋状态【是：1，否：0】 出租1、闲置2、自住 0 - ownerPhone: '', //房主电话 + ownerPhone: '', //联系方式 ownerName: '', //房主名字 ownerIdCard: '', //房主身份证 - remark: '' // 备注 + remark: '' }, keyWords: '', @@ -330,7 +349,7 @@ export default { houseType: '1',//房屋类型【楼房，平房，别墅】 purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】 rentFlag: 0,//是否出租【是：1，否：0】 - ownerPhone: '', //房主电话 + ownerPhone: '', //联系方式 ownerName: '', //房主名字 ownerIdCard: '', //房主身份证 remark: '' // 备注 diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 4f87e3f31..7fd7efe6e 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -102,7 +102,7 @@ width="90"> @@ -175,10 +175,10 @@ style="display: block"> diff --git a/src/views/modules/communityService/fuwujilu/detailForm.vue b/src/views/modules/communityService/fuwujilu/detailForm.vue index 5ed9abe58..6125199cc 100644 --- a/src/views/modules/communityService/fuwujilu/detailForm.vue +++ b/src/views/modules/communityService/fuwujilu/detailForm.vue @@ -139,6 +139,142 @@ +
+

反馈内容

+ + + + + + + + + + + + + + + + + 已完成 + + + + + + + + + + + + + + + + + +
+ + + {{ att.attachmentName }} + +
+ 无附件 + + +
+
@@ -202,6 +338,20 @@ export default { longitude: 36.0722275, //经度 latitude: 120.38945519 //纬度 }, + + feedbackFormData: { + serviceProjectId: '',// 服务项目id + serviceProjectName: '', + serviceGoal: '',// 服务目标 + serviceEffect: '',// 服务效果 + servicePeopleNumber: null,// 服务人数 + serviceStatus: 'completed',// 服务状态。in_service服务中；completed:已完成 + 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 [] + } + }, } } @@ -493,4 +676,18 @@ export default { diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue index 3ce7a034c..2309bd626 100644 --- a/src/views/modules/communityService/fuwujilu/fuwuList.vue +++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue @@ -253,6 +253,7 @@ @closed="showDetail = false"> -
{{ fmData.serviceCategory || "--" }}
+
{{ fmData.serviceCategory || "--" }}
-
{{ fmData.serviceName || "--" }}
+
{{ fmData.serviceName || "--" }}
 -
{{ fmData.serviceContent || "--" }}
+
{{ fmData.serviceContent || "--" }}
 -
{{ fmData.policyLevelName || "--" }}
+
{{ fmData.policyLevelName || "--" }}
 -
{{ fmData.policyGround || "--" }}
+
{{ fmData.policyGround || "--" }}
 -
{{ fmData.serviceTypeName }}
+
{{ fmData.serviceTypeName }}
 -
{{ fmData.orgName || "--" }}
+
{{ fmData.orgName || "--" }}
 -
{{ fmData.orgDescribe || "--" }}
+
{{ fmData.orgDescribe || "--" }}
 -
{{ fmData.principalName || "--" }}
+
{{ fmData.principalName || "--" }}
 -
{{ fmData.principalMobile || "--" }}
+
{{ fmData.principalMobile || "--" }}
 -
{{ fmData.remark || "--" }}
+
{{ fmData.remark || "--" }}
@@ -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; }); }, diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index 3bc967854..b53caf480 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/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 + } }); }, diff --git a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue b/src/views/modules/shequzhili/event/cpts/process-form-demand.vue index adc0abe19..93c82dc2f 100644 --- a/src/views/modules/shequzhili/event/cpts/process-form-demand.vue +++ b/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) { diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue index eef1de189..dfb584ae0 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue @@ -21,6 +21,7 @@ +
@@ -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);