elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

组织，导出

jly/task002
tianq 2 years ago
parent
6e9a98ce7c
commit
daf755e2e4
2 changed files with 23 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/views/modules/census/census-orgStatusList.vue
  2. 36
      src/views/modules/census/census-residentList.vue

6
src/views/modules/census/census-orgStatusList.vue
View File

@ -355,7 +355,7 @@ export default {
let agencyId = ''; let agencyId = '';
let tmp = this.formData.orgId; let tmp = this.formData.orgId;
if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) { if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
agencyId = this.formData.orgId; agencyId = this.formData.orgId;
this.level = this.formData.level; this.level = this.formData.level;
} else { } else {
@ -382,11 +382,13 @@ export default {
let url = '/gov/org/customeragency/getCommunityCountList'; let url = '/gov/org/customeragency/getCommunityCountList';
let agencyId = ''; let agencyId = '';
let tmp = this.formData.orgId; let tmp = this.formData.orgId;
if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) {
if (tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null){
agencyId = this.formData.orgId; agencyId = this.formData.orgId;
} else { } else {
agencyId = this.agencyId; agencyId = this.agencyId;
} }
console.log("agencyId",agencyId)
const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate }); const { data, code, msg } = await requestPost(url, { agencyId: agencyId, timeStart: this.formData.startDate, timeEnd: this.formData.endDate });
this.$refs.pieChart.hideLoading(); this.$refs.pieChart.hideLoading();

36
src/views/modules/census/census-residentList.vue
View File

@ -25,22 +25,22 @@
<div class="div_table"> <div class="div_table">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="div_table_title">居民年龄统计</div> <div class="div_table_title">居民学历统计</div>
<div class="flex"> <div class="flex">
<div class="width1"> <div class="width1">
<div class="box"> <div class="box">
<screen-echarts-frame <screen-echarts-frame2
@handelClickMyPei="handelClickMyPei" @handelClickMyPei="handelClickMyPei2"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
@myChartMethod="pieInitOk" @myChartMethod="pieInitOk2"
ref="pieChart" ref="pieChart2"
></screen-echarts-frame> ></screen-echarts-frame2>
</div> </div>
</div> </div>
<div class="flex1"> <div class="flex1">
<div class="box"> <div class="box">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)">
<div class="kuai" :style="{ backgroundColor: color[index] }"></div> <div class="kuai" :style="{ backgroundColor: color[index] }"></div>
<div class="content"> <div class="content">
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
@ -54,22 +54,22 @@
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="div_table_title">居民学历统计</div> <div class="div_table_title">居民年龄统计</div>
<div class="flex"> <div class="flex">
<div class="width1"> <div class="width1">
<div class="box"> <div class="box">
<screen-echarts-frame2 <screen-echarts-frame
@handelClickMyPei="handelClickMyPei2" @handelClickMyPei="handelClickMyPei"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
@myChartMethod="pieInitOk2" @myChartMethod="pieInitOk"
ref="pieChart2" ref="pieChart"
></screen-echarts-frame2> ></screen-echarts-frame>
</div> </div>
</div> </div>
<div class="flex1"> <div class="flex1">
<div class="box"> <div class="box">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2Data" @click="handleClickItem2(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartDataData" @click="handleClickItem(item)">
<div class="kuai" :style="{ backgroundColor: color[index] }"></div> <div class="kuai" :style="{ backgroundColor: color[index] }"></div>
<div class="content"> <div class="content">
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
@ -248,6 +248,8 @@ export default {
else this.formData[n] = ''; else this.formData[n] = '';
} }
this.orgType = ''; this.orgType = '';
this.code='';
this.codeType='';
this.handleSearch(); this.handleSearch();
}, },
show(row) { show(row) {
@ -653,11 +655,11 @@ export default {
const url = '/epmetuser/icresiuser/portrayal-listexport'; const url = '/epmetuser/icresiuser/portrayal-listexport';
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
let tmp = this.formData.orgId; let tmp = this.formData.orgId;
if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)) { if (!(tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null)){
this.formData.orgId = ''; this.formData.orgId = '';
this.orgType = ''; this.orgType = '';
this.code = ''; // this.code = '';
this.codeType = ''; // this.codeType = '';
} }
axios({ axios({

Write Preview
Loading…
Cancel
Save