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/calendar/index.vue b/src/views/modules/communityParty/calendar/index.vue index 61ec69266..eb45bbd05 100644 --- a/src/views/modules/communityParty/calendar/index.vue +++ b/src/views/modules/communityParty/calendar/index.vue @@ -1,6 +1,118 @@ @@ -15,12 +127,36 @@ export default { calendar, }, data() { - return {}; + let todayObj = new Date(); + + return { + currentYearStr: todayObj.getFullYear() + "", + currentMonth: todayObj.getMonth(), + + partyOptions: [], + + fmData: { + party: "", + }, + }; + }, + computed: { + currentYear() { + return parseInt(this.currentYearStr); + }, }, async mounted() { // await this.getPartyOggList() }, methods: { + handleChangeParty() {}, + + handleChangeDate(item) { + console.log("handleChangeDate"); + this.currentYearStr = item.year + ""; + this.currentMonth = item.month; + }, + async getPartyOggList() { const url = "/resi/partymember/icPartyOrg/getSearchTreelist"; let params = { @@ -38,8 +174,197 @@ export default { diff --git a/src/views/modules/cpts/baobiao/index.vue b/src/views/modules/cpts/baobiao/index.vue new file mode 100644 index 000000000..86cf18c39 --- /dev/null +++ b/src/views/modules/cpts/baobiao/index.vue @@ -0,0 +1,198 @@ + + + + + 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); } },