diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue index a92b508ce..0f9e3da3c 100644 --- a/src/views/modules/census/census-accountActiveList.vue +++ b/src/views/modules/census/census-accountActiveList.vue @@ -9,7 +9,7 @@ class="customer_cascader" ref="myCascader" filterable - v-model="orgId" + v-model="formData.orgId" :options="orgOptions" :props="orgOptionProps" :show-all-levels="false" @@ -39,7 +39,7 @@ placeholder="结束时间" > - 查询 + 查询 @@ -207,23 +207,7 @@ export default { maxTableHeight() { return this.$store.state.inIframe ? this.clientHeight - 440 + this.iframeHeigh : this.clientHeight - 440; }, - satisfactionNameM() { - return function(row) { - let text = '--'; - if (row.satisfactionName) { - text = row.satisfactionName; - } else if (row.satisfaction == 1) { - text = '不满意'; - } else if (row.satisfaction == 5) { - text = '非常满意'; - } else if (row.satisfaction < 5 && row.satisfaction > 1) { - text = '基本满意'; - } else { - text = '--'; - } - return text; - }; - }, + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: { @@ -241,7 +225,7 @@ export default { this.agencyId = this.user.agencyId; this.getOrgTreeList(); this.getTableData(); - this.getCateOptions(); + }, methods: { handleChangeAgency(val) { @@ -260,68 +244,6 @@ export default { } }, - handleEventType(val) { - // console.log('val-----eee', val) - console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes()); - const nodes = this.$refs.cascaderEvent.getCheckedNodes(); - this.formData.firstIdList = []; - this.formData.secondIdList = []; - let level1 = nodes.filter(item => item.level === 1); - let level2 = nodes.filter(item => item.level === 2); - console.log('level2----1', level2); - level1.forEach(item => { - console.log('level2----2', level2); - if (item.hasChildren) { - for (let i = level2.length - 1; i >= 0; i--) { - if (level2[i].parent.value === item.value) level2.splice(i, 1); - } - } - }); - this.formData.firstIdList = level1.map(item => item.value); - this.formData.secondIdList = level2.map(item => item.value); - }, - handleSelectionChange(val) { - this.multipleSelection = []; - val.forEach(element => { - this.multipleSelection.push(element.icEventId); - }); - console.log(this.multipleSelection); - }, - async handleMarkDiffcult() { - const url = '/gov/project/icEvent/difficultpointevent'; - - let params = { - icEventIdList: this.multipleSelection, - type: '1' - }; - - const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success('标记成功'); - this.getTableData(); - } else { - this.$message.error(msg); - } - }, - async handleCancalDiffcult() { - const url = '/gov/project/icEvent/difficultpointevent'; - - let params = { - icEventIdList: this.multipleSelection, - type: '0' - }; - - const { data, code, msg } = await requestPost(url, params); - - if (code === 0) { - this.$message.success('取消标记成功'); - this.getTableData(); - } else { - this.$message.error(msg); - } - }, - handleSearch(val) { console.log(this.formData); this.pageNo = 1; @@ -379,27 +301,6 @@ export default { }); }, - async handleAdd() { - this.pageType = 'add'; - }, - - async handleWatch(row) { - this.eventId = row.icEventId; - const url = '/gov/project/icEvent/detail'; - // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail"; - - const { data, code, msg } = await requestPost(url, { - icEventId: this.eventId - }); - - if (code === 0) { - this.eventDetailData = { ...data }; - this.pageType = 'info'; - } else { - this.$message.error(msg); - } - }, - //加载组织数据 async handleDispose(row) { this.eventId = row.icEventId; @@ -418,55 +319,6 @@ export default { } }, - //显示语音窗口 - handleShowVoice(url) { - this.selVoiceUrl = url; - this.showVoice = true; - }, - - handleClose() { - this.pageType = 'list'; - this.eventId = ''; - this.getTableData(); - }, - handleOk() { - this.pageType = 'list'; - this.eventId = ''; - this.pageNo = 1; - this.getTableData(); - }, - - handleEditSuccess() { - this.handleClose(); - this.getTableData(); - }, - - async handleDel(rowData) { - let message = '确认删除?'; - - this.$confirm(message, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - this.delEvent(rowData.icEventId); - }) - .catch(err => {}); - }, - async delEvent(eventId) { - const url = '/gov/project/icEvent/delete'; - let idsArr = [eventId]; - - const { data, code, msg } = await requestPost(url, idsArr); - - if (code === 0) { - this.$message.success('删除成功！'); - this.getTableData(); - } else { - this.$message.error('操作失败！'); - } - }, async getCountLevel() { // const url = '/gov/org/staffLoginLog/count-level'; const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level'; @@ -507,27 +359,6 @@ export default { this.getTableData(); }, - resetSearch() { - this.agencyIdArray = []; - this.formData = { - agencyId: '', - gridId: '', - sourceType: '', - eventContent: '', - name: '', - mobile: '', - startTime: '', - endTime: '', - status: '', - firstIdList: [], - secondIdList: [] - }; - this.eventTypeCheck = []; - - this.pageNo = 1; - this.getTableData(); - // this.loadTable() - }, deepTree(arr, child) { if (Array.isArray(arr) && arr.length > 0) { return arr.map(item => { @@ -547,6 +378,15 @@ export default { @import '@/assets/scss/buttonstyle.scss'; @import '@/assets/scss/modules/management/list-main.scss'; @import '@/assets/scss/modules/shequzhili/event-info.scss'; +.btnSearch { + float: right; + width: 100px; + height: 38px; + background: #2195fe; + box-shadow: 0px 2px 6px 0px rgba(28, 107, 253, 0.31); + border-radius: 6px; + color: #fff; +} .div_search { .item_width_2 { width: 200px; @@ -557,9 +397,10 @@ export default { text-align: center; margin: 0 auto; display: flex; - align-items: bottom; - justify-content:space-between; - margin-bottom:20px; + + justify-content: space-between; + align-items: flex-end; + margin-bottom: 20px; margin-top: 20px; .census_searchcensus_box { align-items: flex-end; @@ -600,7 +441,7 @@ export default { width: 100px; height: 38px; background: #feb349; - // box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31); + box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31); border-radius: 6px; color: #fff; } diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index 31643d6ee..89ec4862f 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -26,7 +26,6 @@ value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd" placeholder="开始时间" - @change="getTableData()" > 至 + 查询
@@ -123,36 +122,23 @@
- - - - + + + + + + + + + + 0) { @@ -498,7 +481,7 @@ export default { let PieData = {}; PieData.name = data.map(item => item.agencyName); PieData.data = data.map(item => { - return { value: item.count, id: item.agencyId, level: item.agencyLevel,name:item.agencyName }; + return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName }; }); console.log(PieData); this.iniPieChart(PieData); @@ -531,7 +514,7 @@ export default { this.show(4); this.level = param.level; this.orgId = param.id; - this.orgName=param.name + this.orgName = param.name; } } }; @@ -541,6 +524,15 @@ export default { @import '@/assets/scss/buttonstyle.scss'; @import '@/assets/scss/modules/management/list-main.scss'; @import '@/assets/scss/modules/shequzhili/event-info.scss'; +.btnSearch { + float: right; + width: 100px; + height: 38px; + background: #2195fe; + box-shadow: 0px 2px 6px 0px rgba(28, 107, 253, 0.31); + border-radius: 6px; + color: #fff; +} .div_search { .item_width_2 { width: 200px; diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index 3763ac739..d5470c531 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -1,12 +1,413 @@ - + + +