diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue index 1cd4327e2..6dbda4e2b 100644 --- a/src/views/components/resiSearch.vue +++ b/src/views/components/resiSearch.vue @@ -535,6 +535,7 @@ export default { } else { let temp = []; for (let i in this.ageObj) { + if(this.ageObj[i]==null) this.ageObj[i] = '' temp.push(this.ageObj[i]); } let arr4 = [ diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue index 1da18b91e..16c58cc89 100644 --- a/src/views/modules/census/census-accountActiveList.vue +++ b/src/views/modules/census/census-accountActiveList.vue @@ -11,7 +11,6 @@ v-model="formData.orgId" :options="orgOptions" :props="orgOptionProps" - clearable :show-all-levels="false" @change="handleChangeAgency" /> @@ -40,6 +39,7 @@ > 查询 + 重置 @@ -78,7 +78,7 @@ :current-page.sync="pageNo" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total" > @@ -114,7 +114,7 @@ :current-page.sync="pageNo2" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize2)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total2" > @@ -223,6 +223,12 @@ export default { this.getCountLevel(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + }, handleSizeChange(val) { this.pageSize = val; window.localStorage.setItem('pageSize', val); @@ -256,7 +262,8 @@ export default { this.orgId = this.formData.orgId; } console.log(this.formData); - this.pageNo = 1;this.pageNo2 = 1; + this.pageNo = 1; + this.pageNo2 = 1; this.getTableData(); this.getTableData2(); this.getCountLevel(); @@ -284,7 +291,7 @@ export default { async handleExport(type) { const url = '/gov/org/staffLoginLog/accountActivityInfo-export'; - const { data, code, msg } = await requestPost(url, param); + // const { data, code, msg } = await requestPost(url, param); axios({ url: window.SITE_CONFIG['apiURL'] + url, @@ -395,7 +402,7 @@ export default { this.tableLoading2 = false; if (code === 0) { this.total2 = data.total || 0; - console.log(this.total2) + console.log(this.total2); this.tableData2 = data.list ? data.list.map(item => { return item; @@ -490,4 +497,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index 56ea1cbfe..8b1772342 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -11,7 +11,6 @@ v-model="formData.orgId" :options="orgOptions" :props="orgOptionProps" - clearable @change="handleChangeAgency" :show-all-levels="false" /> @@ -40,6 +39,7 @@ > 查询 + 重置
@@ -99,9 +99,9 @@ > - + - +
@@ -120,25 +120,32 @@ - + +
+ 导出 +
@@ -148,7 +155,7 @@ :current-page.sync="pageNo" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total" > @@ -269,6 +276,47 @@ export default { // this.getPie(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + }, + async handleExport() { + const url = '/gov/org/staffLoginLog/community-count-export'; + + // const { data, code, msg } = await requestPost(url, param); + + axios({ + url: window.SITE_CONFIG['apiURL'] + url, + method: 'post', + data: { + orgId: this.orgId, + level: this.orgType, + startDate: this.formData.startDate, + endDate: this.formData.endDate + }, + responseType: 'blob' + }) + .then(res => { + let fileName = window.decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]); + console.log('filename', fileName); + let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' }); + var url = window.URL.createObjectURL(blob); + var aLink = document.createElement('a'); + aLink.style.display = 'none'; + aLink.href = url; + aLink.setAttribute('download', fileName); + document.body.appendChild(aLink); + aLink.click(); + document.body.removeChild(aLink); //下载完成移除元素 + window.URL.revokeObjectURL(url); //释放掉blob对象 + }) + .catch(err => { + console.log('获取导出情失败', err); + return this.$message.error('网络错误'); + }); + }, handleSearch(val) { let tmp = this.formData.orgId; if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) { @@ -388,7 +436,7 @@ export default { async getCountLevel() { const url = '/gov/org/staffLoginLog/count-level'; - // const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/count-level'; + let param = { ...this.formData }; const { data, code, msg } = await requestPost(url, param); console.log('getCountLeveldata', data); @@ -402,13 +450,13 @@ export default { this.tableLoading = true; const url = '/gov/org/staffLoginLog/community-count'; - // const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count'; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { pageSize, pageNo, isPage: true, + dataRange: 'exclude_zero', ...formData }); @@ -620,4 +668,22 @@ export default { .cur { cursor: pointer; } +.diy-button--output { + width: 100px; + height: 38px; + + background: #feb349; + box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31); + border-radius: 6px; + color: #fff; +} +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index cbe1bd72b..ede0515de 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -8,7 +8,7 @@ 查询 + 重置 @@ -47,8 +48,8 @@
房屋用途统计
- - +
+
- - +
+
-
+
-
{{ item.name }}
+
{{ index }}{{ item.name }}
{{ item.value }}
-
{{ item.radio }}%
+
{{ item.radio }}%
- - +
+
房屋状态统计
- - +
+
- - +
+
@@ -98,13 +99,13 @@
{{ item.name }}
{{ item.value }}
-
{{ item.radio }}%
+
{{ item.radio }}%
- - +
+
@@ -142,7 +143,7 @@ :current-page.sync="pageNo" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total" > @@ -191,6 +192,7 @@ export default { return time.getTime() > nowData; }; return { + optionData: {}, dialogVisible: false, detailId: '', detailData: {}, @@ -231,7 +233,8 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -265,6 +268,15 @@ export default { this.getOrgTreeList(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + this.orgId = this.optionData.agencyId; + this.orgIdPath = this.optionData.orgIdPath; + this.orgType = this.optionData.level; + }, show(row) { this.dialogVisible = true; this.pageType = 'view'; @@ -280,7 +292,7 @@ export default { }, async getTableData() { this.tableLoading = true; - // const url = '/gov/org/staffLoginLog/community-count'; + const url = '/gov/org/ichouse/getHousePictureList'; const { pageSize, pageNo, formData } = this; @@ -437,7 +449,7 @@ export default { color: '#fff' } }, - color: this.color, + color: this.color1, title: { text: this.pieData.total, subtext: '总数', @@ -541,7 +553,7 @@ export default { color: '#fff' } }, - color: this.color, + color: this.color2, title: { text: this.pieData2.total, subtext: '总数', @@ -703,6 +715,7 @@ export default { // const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]; // this.orgOptions = this.deepTree(_arr); this.orgOptions = []; + this.optionData = data; this.orgOptions.push(data); this.orgId = data.agencyId; this.orgIdPath = data.orgIdPath; @@ -837,6 +850,7 @@ export default { border-radius: 6px; color: #fff; } + .div_search { .item_width_2 { width: 200px; @@ -896,4 +910,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue index 38b8bb69b..e1b728725 100644 --- a/src/views/modules/census/census-nineList.vue +++ b/src/views/modules/census/census-nineList.vue @@ -8,9 +8,9 @@ 查询 + 重置 @@ -25,8 +26,8 @@
九小场所分析
- - +
+
- - +
+
@@ -49,8 +50,8 @@
- - +
+
@@ -86,7 +87,7 @@ :current-page.sync="pageNo" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total" > @@ -177,7 +178,7 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: {}, placeType: '', pieData: [] @@ -208,6 +209,13 @@ export default { this.getPie(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + this.orgType = ''; + }, show(row) { this.dialogVisible = true; this.pageType = 'view'; @@ -236,7 +244,6 @@ export default { async getTableData() { this.tableLoading = true; const url = '/gov/org/enterprise/list'; - // const url = 'http://yapi.elinkservice.cn/mock/356/gov/org/staffLoginLog/community-count'; const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { @@ -661,4 +668,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue index 888923402..02bb76907 100644 --- a/src/views/modules/census/census-orgStatusList.vue +++ b/src/views/modules/census/census-orgStatusList.vue @@ -9,7 +9,6 @@ class="customer_cascader" ref="myCascader" filterable - clearable v-model="formData.orgId" :options="orgOptions" :props="orgOptionProps" @@ -45,6 +44,7 @@ 查询 + 重置
@@ -128,7 +128,7 @@ :current-page.sync="pageNo" :page-sizes="[10, 20, 50, 100, 200]" :page-size="parseInt(pageSize)" - layout="sizes, prev, pager, next, total" + layout="sizes, prev, pager, next, total,jumper" :total="total" > @@ -195,7 +195,7 @@ export default { startDate: '', endDate: '' }, - + cateOptions: [], eventTypeCheck: [], pageNo: 1, @@ -254,6 +254,12 @@ export default { // this.getPie(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + }, handleSearch(val) { this.getTableData(); this.getsubData(); @@ -356,8 +362,8 @@ export default { } const url = '/gov/org/customeragency/getAgencyCountList'; - let params = { agencyId: agencyId }; - const { data, code, msg } = await requestGet(url, params); + let params = { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate }; + const { data, code, msg } = await requestPost(url, params); if (code === 0) { data.map(item => { @@ -564,4 +570,13 @@ export default { .cur { cursor: pointer; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue index 345177447..cbe450483 100644 --- a/src/views/modules/census/census-residentList.vue +++ b/src/views/modules/census/census-residentList.vue @@ -8,7 +8,7 @@ 查询 + 重置
@@ -25,18 +26,18 @@
居民年龄统计
- - -
+
+
+ -
- - + +
+
@@ -44,28 +45,28 @@
{{ item.name }}
{{ item.value }}
-
{{ item.value / 100 }}%
+
{{ item.radio }}%
- - +
+
居民学历统计
- - -
+
+
+ -
- - + +
+
@@ -73,19 +74,19 @@
{{ item.name }}
{{ item.value }}
-
{{ item.value / 100 }}%
+
{{ item.radio }}%
- - +
+
- 导出 + 导出
@@ -200,7 +201,7 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -239,6 +240,13 @@ export default { this.getsubData2(); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + this.orgType = ''; + }, show(row) { this.dialogVisible = true; this.pageType = 'view'; @@ -260,7 +268,7 @@ export default { }, async getTableData() { this.tableLoading = true; - // const url = '/gov/org/staffLoginLog/community-count'; + const url = '/epmetuser/icresiuser/portrayal-list'; const { pageSize, pageNo, formData } = this; @@ -864,11 +872,19 @@ export default { .diy-button--output { width: 100px; height: 38px; - + z-index: 99; background: #feb349; box-shadow: 0px 2px 6px 0px rgba(198, 122, 16, 0.31); border-radius: 6px; color: #fff; } - +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue index 90e9eb8a5..a1f546fb5 100644 --- a/src/views/modules/communityParty/dyhx/party.vue +++ b/src/views/modules/communityParty/dyhx/party.vue @@ -15,8 +15,8 @@ @change="handleChangeAgency" > - 查询 + 重置 @@ -24,8 +24,8 @@
党员年龄统计
- - +
+
- - +
+
@@ -48,60 +48,51 @@
- - -
-
- 导出 -
- - - - - - - - - - - - - - - - - - +
+ > +
+
+
+ 导出 +
+ + + + + + + + + + + + + + +
党员学历统计
- - +
+
- - +
+
@@ -124,55 +115,45 @@
- - -
-
- 导出 -
- - - - - - - - - - - - - - - - - - +
+
+
+
+ 导出 +
+ + + + + + + + + + + + + + + @@ -220,19 +201,26 @@ export default { return { orgOptions: [], //组织 orgOptionProps: { - //组织 multiple: false, - value: 'agencyId', - label: 'agencyName', - children: 'subAgencyList', - emitPath: false, - checkStrictly: true + value: 'id', + label: 'partyOrgName', + children: 'children', + checkStrictly: true, + emitPath: false + + //组织 + // multiple: false, + // value: 'agencyId', + // label: 'agencyName', + // children: 'subAgencyList', + // emitPath: false, + // checkStrictly: true }, pieInitState: false, pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915','#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -297,7 +285,9 @@ export default { await nextTick(100); await this.getOrgTreeList(); // await this.getPartyOggList(); - + console.log(this.$store.state); + this.user = this.$store.state.user; + this.agencyId = this.user.agencyId; this.getAgeCount(); this.getEduCount(); this.getAgeList(); @@ -307,10 +297,18 @@ export default { // this.getGridList('query'); }, methods: { + resetForm() { + for (const n in this.formData) { + if (typeof this.formData[n] == 'object') this.formData[n] = []; + else this.formData[n] = ''; + } + }, handleChangeAgency(val) { let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; + console.log('obj', obj); if (obj) { - this.orgType = obj.level === 'grid' ? 'grid' : 'agency'; + // this.orgType = obj.level === 'grid' ? 'grid' : 'agency'; + // this.orgType = obj.level } else { this.orgType = ''; } @@ -748,27 +746,46 @@ export default { this.visibleLoading = false; }, - getOrgTreeList() { - const { user } = this.$store.state; - this.$http - .post('/gov/org/customeragency/agencygridtree', {}) - .then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg); - } else { - console.log('获取组织树成功', res.data); - // let { agencyList, subAgencyList } = res.data; - // const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]; - // this.orgOptions = this.deepTree(_arr); - this.orgOptions = []; - this.orgOptions.push(res.data); + async getOrgTreeList() { + function deleteChildren(arr) { + let childs = arr; + for (let i = childs.length; i--; i > 0) { + if (childs[i].children) { + if (childs[i].children.length) { + this.deleteChildren(childs[i].children); + } else { + delete childs[i].children; + } } - }) - .catch(() => { - return this.$message.error('网络错误'); - }); - }, + } + return arr; + } + + const { user } = this.$store.state; + const url = '/resi/partymember/icPartyOrg/getSearchTreelist'; + let params = { + agencyId: user.agencyId + }; + const { data, code, msg } = await requestGet(url, params); + console.log('data-orgparty----o', data); + if (code === 0) { + this.orgOptions = data; + this.changeKey(this.orgOptions); + } else { + } + }, + changeKey(arr) { + for (var i = 0; i < arr.length; i++) { + arr[i].value = arr[i].userId; + arr[i].label = arr[i].userName; + if (arr[i].children.length) { + this.changeKey(arr[i].children); + } else { + delete arr[i].children; + } + } + }, jumpDetail(val) { this.memberDialog = false; this.$router.push({ @@ -822,10 +839,10 @@ export default { edu: '/epmetuser/icresiuser/partymembereducationlist/export' }; const _arr = this.selectAgency[this.selectAgency.length - 1].split('-'); - const orgType = _arr[1] !== 'grid' ? 'agency' : 'grid'; + let params = { - orgId: _arr[0], - orgType: orgType, + orgId: this.orgId, + orgType: this.orgType, code: type == 'age' ? this.ageCode : this.eduCode }; // .post('epmetuser/icresiuser/exportExcel', params) @@ -1003,4 +1020,13 @@ export default { border-radius: 6px; color: #fff; } +.flex { + display: flex; + .width1 { + width: 220px; + } + .flex1 { + flex: 1; + } +} diff --git a/src/views/modules/communityParty/dyhx/party1.vue b/src/views/modules/communityParty/dyhx/party1.vue new file mode 100644 index 000000000..0c9ddb806 --- /dev/null +++ b/src/views/modules/communityParty/dyhx/party1.vue @@ -0,0 +1,1007 @@ + + + + + diff --git a/src/views/modules/communityParty/dyhx/party22.vue b/src/views/modules/communityParty/dyhx/party22.vue new file mode 100644 index 000000000..93ed4b792 --- /dev/null +++ b/src/views/modules/communityParty/dyhx/party22.vue @@ -0,0 +1,1184 @@ + + + + + +