diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue index b30029d6c..1b3e93f30 100644 --- a/src/views/modules/census/census-accountActiveList.vue +++ b/src/views/modules/census/census-accountActiveList.vue @@ -154,17 +154,9 @@ export default { tableData: [], formData: { - gridId: '', - agencyId: '', - sourceType: '', - eventContent: '', - name: '', - mobile: '', - startTime: '', - endTime: '', - status: '', - firstIdList: [], - secondIdList: [] + orgId:"", + startDate:"", + endDate:"", }, cateOptions: [], eventTypeCheck: [], @@ -177,14 +169,7 @@ export default { startPickerOptions: { disabledDate: startDisabledDate }, - eventId: '', - - eventDetailData: {}, - - showVoice: false, - selVoiceUrl: '', - - multipleSelection: [] + censusData:{} }; }, computed: { @@ -214,18 +199,9 @@ export default { methods: { handleChangeAgency(val) { let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; - if (obj) { - if (obj.level === 'grid') { - this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.formData.agencyId = ''; - } else { - this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.formData.gridId = ''; - } - } else { - this.formData.agencyId = ''; - this.formData.gridId = ''; - } + console.log(obj); + this.formData.orgId = obj.agencyId; + this.formData.level = obj.level; }, handleSearch(val) { @@ -256,7 +232,7 @@ export default { async handleExport(type) { const url = '/gov/org/staffLoginLog/accountActivityInfo-export'; - const { pageSize, pageNo, formData } = this; + const {formData } = this; axios({ url: window.SITE_CONFIG['apiURL'] + url, method: 'post', @@ -312,6 +288,7 @@ export default { console.log('getCountLeveldata', data); if (code === 0) { this.censusData = data; + console.log("this.censusData ",this.censusData ) } else { this.$message.error(msg); } diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index 2d1822db7..9761b2cca 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -366,18 +366,9 @@ export default { }, handleChangeAgency(val) { let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; - if (obj) { - if (obj.level === 'grid') { - this.formData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.formData.agencyId = ''; - } else { - this.formData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : ''; - this.formData.gridId = ''; - } - } else { - this.formData.agencyId = ''; - this.formData.gridId = ''; - } + console.log(obj); + this.formData.orgId = obj.agencyId; + this.formData.level = obj.level; }, deepTree(arr, child) { if (Array.isArray(arr) && arr.length > 0) {