diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue index 486dc9ec7..3e41d2ab9 100644 --- a/src/views/modules/base/community/buildTable.vue +++ b/src/views/modules/base/community/buildTable.vue @@ -57,6 +57,9 @@ size="small" :disabled="yihuyidangDisabled" @click="handleExportYihuyidang()">导出一户一档 + 智能填报
@@ -194,6 +197,7 @@ @dialogOk="addFormOk"> +
@@ -204,6 +208,7 @@ import BuildForm from './buildForm' import { requestPost } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 +import baobiao from "@/views/modules/cpts/baobiao"; let loading // 加载动画 export default { @@ -230,13 +235,19 @@ export default { yihuyidangDisabled: false, + displayedBaobiaoBtn: false, } }, components: { + baobiao, BuildForm }, - async mounted () { - console.log('building11111111111111111111111111') + async mounted() { + this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({ + elseParams: { + categoryKeys:['house_info'], categoryKey: 'house_info', + } + }); }, computed: { tableHeight () { @@ -248,6 +259,28 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { + reportForm(){ + let paramMap = { + pageSize: this.pageSize, + pageNo: this.pageNo, + level: this.agencyObj.level, + id: this.agencyObj.id, + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + sortType: this.sortType, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, + }; + this.$refs.baobiao.init({ + elseParams: { + categoryKeys:['house_info'], categoryKey: 'house_info', paramMap + } + }) + }, + indexMethod (index) { return index + 1; }, diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index 9097217b5..c579de9a7 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -8,12 +8,6 @@ size="small" :loading="yhymLoading" @click="handleYhymInfo">补全一房一码信息 - 补全小程序小区码 导出一户一档 --> + 智能填报
@@ -220,6 +217,7 @@ +
@@ -231,6 +229,7 @@ import { requestPost } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 import axios from 'axios' +import baobiao from "@/views/modules/cpts/baobiao"; let loading // 加载动画 export default { @@ -267,14 +266,21 @@ export default { yihuyidangDisabled: false, yihuyimaDisabled: false, exportBtn: false, - dialogVisible: false // 导出 + dialogVisible: false, // 导出 + + displayedBaobiaoBtn: false, } }, components: { + baobiao, CommunityForm }, - async mounted () { - + async mounted() { + this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({ + elseParams: { + categoryKeys:['house_info'], categoryKey: 'house_info', + } + }); }, computed: { tableHeight () { @@ -285,7 +291,27 @@ export default { ...mapGetters(['clientHeight', 'iframeHeight']) }, methods: { - + reportForm(){ + let paramMap = { + pageSize: this.pageSize, + pageNo: this.pageNo, + level: this.agencyObj.level, + id: this.agencyObj.id, + ownerName: this.ownerName, + ownerPhone: this.ownerPhone, + rentFlag: this.rentFlag, + purpose: this.purpose, + remark: this.remark, + sortType: this.sortType, + updateStartDate: this.updateStartDate, + updateEndDate: this.updateEndDate, + }; + this.$refs.baobiao.init({ + elseParams: { + categoryKeys:['house_info'], categoryKey: 'house_info', paramMap + } + }) + }, async loadTable (fromTree, treeObj) { console.log(111, this.staffAgencyId) // 是否显示补全一房一码信息按钮 @@ -418,34 +444,6 @@ export default { } }, - // 补全小程序一户一码 - async createBatchNeiQrUrl () { - this.yhymLoading = true - const url = "/gov/org/neighborhood/createBatchNeiQrUrl" - - 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) - } - }, - async handleEdit (row) { this.formTitle = '修改小区' this.formShow = true diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue index 8be48e23d..4dadadb71 100644 --- a/src/views/modules/base/community/roomTable.vue +++ b/src/views/modules/base/community/roomTable.vue @@ -1,222 +1,246 @@ - diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index efd2c776a..a45a5b80b 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -234,6 +234,22 @@ var geocoder // 新建一个正逆地址解析类 let loading // 加载动画 export default { data () { + let initFormData = () => { + let _form = { + unitName: '', + serviceMatterList: [], + type: '', + contact: '', + contactMobile: '', + memberCount: 0, + remark: '', //备注【最大500字】 + address: '', //详细地址 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 + } + + return _form + } return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 @@ -241,22 +257,7 @@ export default { keyWords: '', activityId: '', - formData: { - gridId: '', - serviceMatter: '',//服务事项 - serviceMatterList: [], - unitId: '',//单位ID - unitIdList: [], - title: '',//活动标题 - target: '',//活动目标 - content: '',//活动内容 - activityTime: '',//活动时间 - peopleCount: 0,//服务人数 - result: '', //活动结果 - address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519 //纬度 - }, + formData: initFormData(), serviceList: [], // gridList: [], agencyId: '' @@ -274,23 +275,31 @@ export default { async initForm (type, activityId) { this.startLoading() this.$refs.ref_form.resetFields(); - // const { user } = this.$store.state - // this.agencyId = user.agencyId - // await this.loadGrid() //获取服务事项 await this.loadService() + let { latitude, longitude } = this.$store.state.user; + if (!latitude || latitude == "" || latitude == "0") { + latitude = 39.9088810666821; + longitude = 116.39743841556731; + } + + this.formData.latitude = latitude + this.formData.longitude = longitude + this.formType = type if (activityId) { this.activityId = activityId this.formData.id = activityId await this.loadFormData() } else { - map.setCenter(new TMap.LatLng(36.0722275, 120.38945519)) - this.setMarker(36.0722275, 120.38945519) + } + + map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) + this.setMarker(this.formData.latitude, this.formData.longitude) this.endLoading() }, @@ -353,8 +362,8 @@ export default { } console.log(this.formData.content) - map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude))) - this.setMarker(this.formData.latitude, this.formData.longitude) + // map.setCenter(new TMap.LatLng(parseFloat(this.formData.latitude), parseFloat(this.formData.longitude))) + // this.setMarker(this.formData.latitude, this.formData.longitude) } else { this.$message.error(msg) } @@ -519,20 +528,16 @@ export default { this.activityId = '' this.keyWords = '' this.formData = { - gridId: '', - serviceMatter: '',//服务事项 + unitName: '', serviceMatterList: [], - unitId: '',//单位ID - unitIdList: [], - title: '',//活动标题 - target: '',//活动目标 - content: '',//活动内容 - activityTime: '',//活动时间 - peopleCount: 0,//服务人数 - result: '', //活动结果 + type: '', + contact: '', + contactMobile: '', + memberCount: 0, + remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519 //纬度 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 } }, // 开启加载动画 diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue index 0feb07c8b..23db7d00e 100644 --- a/src/views/modules/communityParty/regionalParty/units.vue +++ b/src/views/modules/communityParty/regionalParty/units.vue @@ -477,9 +477,10 @@ export default { }, handleDetail (row) { - this.detailShow = true + this.formTitle = '详情' + this.formShow = true this.$nextTick(() => { - this.$refs.ref_detail.initForm(row) + this.$refs.ref_form.initForm('detail', row.id) }) }, @@ -501,7 +502,7 @@ export default { handleAdd () { this.formTitle = '新增' - this.formShow = 'edit' + this.formShow = true this.$nextTick(() => { this.$refs.ref_form.initForm('add', null) }) @@ -574,12 +575,12 @@ export default { if (code === 0) { if (data.type) { - this.$message({ - type: "success", - message: data.msg || "同步成功" - }); - - this.loadTable() + this.$message({ + type: "success", + message: data.msg || "同步成功" + }); + + this.loadTable() } else { this.$message.error(data.msg) } diff --git a/src/views/modules/communityParty/regionalParty/unitsDetail.vue b/src/views/modules/communityParty/regionalParty/unitsDetail.vue index 306fc3f83..b9f18486b 100644 --- a/src/views/modules/communityParty/regionalParty/unitsDetail.vue +++ b/src/views/modules/communityParty/regionalParty/unitsDetail.vue @@ -106,7 +106,7 @@ export default { } }, components: {}, - mounted () { + created () { this.initMap() }, @@ -118,6 +118,7 @@ export default { }, async initForm (row) { + this.startLoading() this.formData = { ...row } map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index ac3965ea8..f6de440b1 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -173,14 +173,8 @@ var geocoder // 新建一个正逆地址解析类 let loading // 加载动画 export default { data () { - return { - formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 - - btnDisable: false, - - unitId: '', - keyWords: '', - formData: { + let initFormData = () => { + let _form = { unitName: '', serviceMatterList: [], type: '', @@ -189,15 +183,27 @@ export default { memberCount: 0, remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: 36.0722275, //经度 - latitude: 120.38945519 //纬度 - }, + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 + } + + return _form + } + return { + formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 + + btnDisable: false, + + unitId: '', + keyWords: '', + formData: initFormData(), serviceList: [],//服务list } }, components: {}, mounted () { + this.initMap() }, @@ -210,16 +216,27 @@ export default { //获取服务事项 await this.loadService() + let { latitude, longitude } = this.$store.state.user; + if (!latitude || latitude == "" || latitude == "0") { + latitude = 39.9088810666821; + longitude = 116.39743841556731; + } + + this.formData.latitude = latitude + this.formData.longitude = longitude + this.formType = type if (unitId) { this.unitId = unitId this.formData.id = unitId await this.loadFormData() } else { - map.setCenter(new TMap.LatLng(36.0722275, 120.38945519)) - this.setMarker(36.0722275, 120.38945519) + } + map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) + this.setMarker(this.formData.latitude, this.formData.longitude) + this.endLoading() }, @@ -259,8 +276,8 @@ export default { } this.formData = { ...data } - map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) - this.setMarker(this.formData.latitude, this.formData.longitude) + // map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) + // this.setMarker(this.formData.latitude, this.formData.longitude) } else { this.$message.error(msg) } @@ -329,7 +346,7 @@ export default { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap () { // 定义地图中心点坐标 - var center = new window.TMap.LatLng(36.0722275, 120.38945519) + var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude) // 定义map变量，调用 TMap.Map() 构造函数创建地图 map = new window.TMap.Map(document.getElementById('app'), { center: center, // 设置地图中心点坐标 @@ -450,8 +467,8 @@ export default { memberCount: 0, remark: '', //备注【最大500字】 address: '', //详细地址 - longitude: '', //经度 - latitude: '' //纬度 + longitude: this.$store.state.user.longitude, //经度 + latitude: this.$store.state.user.latitude//纬度 } }, // 开启加载动画 diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue new file mode 100644 index 000000000..169c801a5 --- /dev/null +++ b/src/views/modules/cpts/baobiao/index.vue @@ -0,0 +1,187 @@ + + + + + diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue index b53caf480..d3581582a 100644 --- a/src/views/modules/shequzhili/event/cpts/add.vue +++ b/src/views/modules/shequzhili/event/cpts/add.vue @@ -402,10 +402,20 @@ export default { async mounted () { const { user } = this.$store.state this.agencyId = user.agencyId + let { latitude, longitude } = this.$store.state.user; + if (!latitude || latitude == "" || latitude == "0") { + latitude = 39.9088810666821; + longitude = 116.39743841556731; + } + + this.formData.latitude = latitude + this.formData.longitude = longitude + + this.initMap() this.loadGrid(); this.getCategoryList() - this.initMap() + }, @@ -597,7 +607,7 @@ export default { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap () { // 定义地图中心点坐标 - var center = new window.TMap.LatLng(36.0722275, 120.38945519) + var center = new window.TMap.LatLng(this.formData.latitude, this.formData.longitude) // 定义map变量，调用 TMap.Map() 构造函数创建地图 map = new window.TMap.Map(document.getElementById('app'), { center: center, // 设置地图中心点坐标 diff --git a/src/views/modules/visual/cpts/map/index.vue b/src/views/modules/visual/cpts/map/index.vue index 80110912b..acd84557f 100644 --- a/src/views/modules/visual/cpts/map/index.vue +++ b/src/views/modules/visual/cpts/map/index.vue @@ -560,13 +560,13 @@ export default { }, updateGrid() { - const { polygonData } = this; + const { polygonData,polygonDotData } = this; if (polygonLayer) { polygonLayer.setData(polygonData); lineLayer.setData(polygonData); - textLayer.setData(polygonData); - posLayer.setData(polygonData); - circleLayer.setData(polygonData); + textLayer.setData(polygonDotData); + posLayer.setData(polygonDotData); + circleLayer.setData(polygonDotData); } },