tianq 3 years ago
parent
commit
80a134c0fa
  1. 9
      src/views/modules/census/census-accountActiveList.vue
  2. 9
      src/views/modules/census/census-accountList.vue
  3. 52
      src/views/modules/census/census-houseList.vue
  4. 22
      src/views/modules/census/census-nineList.vue
  5. 9
      src/views/modules/census/census-orgStatusList.vue
  6. 43
      src/views/modules/census/census-residentList.vue
  7. 186
      src/views/modules/communityParty/dyhx/party.vue

9
src/views/modules/census/census-accountActiveList.vue

@ -497,4 +497,13 @@ export default {
border-radius: 6px; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

9
src/views/modules/census/census-accountList.vue

@ -677,4 +677,13 @@ export default {
border-radius: 6px; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

52
src/views/modules/census/census-houseList.vue

@ -48,8 +48,8 @@
<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>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:' + TableHeight + 'px;margin-top:20px'"> <div :style="'height:' + TableHeight + 'px;margin-top:20px'">
<screen-echarts-frame <screen-echarts-frame
@handelClickMyPei="handelClickMyPei" @handelClickMyPei="handelClickMyPei"
@ -58,27 +58,27 @@
ref="pieChart" ref="pieChart"
></screen-echarts-frame> ></screen-echarts-frame>
</div> </div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
<div class="kuai" :style="{ backgroundColor: color[index] }"></div> <div class="kuai" :style="{ backgroundColor: color1[index] }"></div>
<div class="content"> <div class="content">
<div class="name">{{ item.name }}</div> <div class="name">{{ index }}{{ item.name }}</div>
<div class="num">{{ item.value }}</div> <div class="num">{{ item.value }}</div>
<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div> <div class="unit" :style="{ color: color1[index] }">{{ item.radio }}%</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
</el-row> </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>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:' + TableHeight + 'px;margin-top:20px'"> <div :style="'height:' + TableHeight + 'px;margin-top:20px'">
<screen-echarts-frame2 <screen-echarts-frame2
@handelClickMyPei="handelClickMyPei2" @handelClickMyPei="handelClickMyPei2"
@ -87,8 +87,8 @@
ref="pieChart2" ref="pieChart2"
></screen-echarts-frame2> ></screen-echarts-frame2>
</div> </div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:' + TableHeight + 'px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend2"> <div class="legend2">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
@ -99,13 +99,13 @@
<div class="content"> <div class="content">
<div class="name">{{ item.name }}</div> <div class="name">{{ item.name }}</div>
<div class="num">{{ item.value }}</div> <div class="num">{{ item.value }}</div>
<div class="unit" :style="{ color: color[index] }">{{ item.radio }}%</div> <div class="unit" :style="{ color: color2[index] }">{{ item.radio }}%</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
</el-row> </div>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -192,7 +192,7 @@ export default {
return time.getTime() > nowData; return time.getTime() > nowData;
}; };
return { return {
optionData:{}, optionData: {},
dialogVisible: false, dialogVisible: false,
detailId: '', detailId: '',
detailData: {}, detailData: {},
@ -233,7 +233,8 @@ export default {
pieInitState2: false, pieInitState2: false,
pieOption: [], pieOption: [],
pieOption2: [], pieOption2: [],
color: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], color1: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#FEB349', '#FE6252', '#F0D915', '#5DC7F0'],
color2: ['#3C94FE', '#22C1C3', '#F0D915', '#FE6252', '#A17AFA', '#A19FFF', '#6FC364', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'],
chartData: [], chartData: [],
chartData2: [], chartData2: [],
pieData: [], pieData: [],
@ -448,7 +449,7 @@ export default {
color: '#fff' color: '#fff'
} }
}, },
color: this.color, color: this.color1,
title: { title: {
text: this.pieData.total, text: this.pieData.total,
subtext: '总数', subtext: '总数',
@ -552,7 +553,7 @@ export default {
color: '#fff' color: '#fff'
} }
}, },
color: this.color, color: this.color2,
title: { title: {
text: this.pieData2.total, text: this.pieData2.total,
subtext: '总数', subtext: '总数',
@ -714,7 +715,7 @@ export default {
// const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]; // const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }];
// this.orgOptions = this.deepTree(_arr); // this.orgOptions = this.deepTree(_arr);
this.orgOptions = []; this.orgOptions = [];
this.optionData=data; this.optionData = data;
this.orgOptions.push(data); this.orgOptions.push(data);
this.orgId = data.agencyId; this.orgId = data.agencyId;
this.orgIdPath = data.orgIdPath; this.orgIdPath = data.orgIdPath;
@ -909,4 +910,13 @@ export default {
border-radius: 6px; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

22
src/views/modules/census/census-nineList.vue

@ -26,8 +26,8 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<div class="div_table_title">九小场所分析</div> <div class="div_table_title">九小场所分析</div>
<el-row> <div class="flex">
<el-col :span="6"> <div class="width1">
<div style="height:220px;margin-top:20px"> <div style="height:220px;margin-top:20px">
<screen-echarts-frame <screen-echarts-frame
@handelClickMyPei="handelClickMyPei" @handelClickMyPei="handelClickMyPei"
@ -36,8 +36,8 @@
ref="pieChart" ref="pieChart"
></screen-echarts-frame> ></screen-echarts-frame>
</div> </div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div style="height:220px;margin-top:20px;display:flex;align-items: center;"> <div style="height:220px;margin-top:20px;display:flex;align-items: center;">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
@ -50,8 +50,8 @@
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
</el-row> </div>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -245,7 +245,6 @@ export default {
this.tableLoading = true; this.tableLoading = true;
const url = '/gov/org/enterprise/list'; const url = '/gov/org/enterprise/list';
const { pageSize, pageNo, formData } = this; const { pageSize, pageNo, formData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
@ -669,4 +668,13 @@ export default {
border-radius: 6px; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

9
src/views/modules/census/census-orgStatusList.vue

@ -570,4 +570,13 @@ export default {
.cur { .cur {
cursor: pointer; cursor: pointer;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

43
src/views/modules/census/census-residentList.vue

@ -26,18 +26,18 @@
<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>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:220px;margin-top:20px'">
<screen-echarts-frame <screen-echarts-frame
@handelClickMyPei="handelClickMyPei" @handelClickMyPei="handelClickMyPei"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
@myChartMethod="pieInitOk" @myChartMethod="pieInitOk"
ref="pieChart" ref="pieChart"
></screen-echarts-frame> ></screen-echarts-frame>
</div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
@ -50,23 +50,23 @@
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
</el-row> </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>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:220px;margin-top:20px'">
<screen-echarts-frame2 <screen-echarts-frame2
@handelClickMyPei="handelClickMyPei2" @handelClickMyPei="handelClickMyPei2"
:style="{ width: '100%', height: '100%' }" :style="{ width: '100%', height: '100%' }"
@myChartMethod="pieInitOk2" @myChartMethod="pieInitOk2"
ref="pieChart2" ref="pieChart2"
></screen-echarts-frame2> ></screen-echarts-frame2>
</div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem2(item)">
@ -79,8 +79,8 @@
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
</el-row> </div>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
@ -872,10 +872,19 @@ export default {
.diy-button--output { .diy-button--output {
width: 100px; width: 100px;
height: 38px; height: 38px;
z-index: 99; z-index: 99;
background: #feb349; 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; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

186
src/views/modules/communityParty/dyhx/party.vue

@ -24,8 +24,8 @@
<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>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:220px;margin-top:20px'"> <div :style="'height:220px;margin-top:20px'">
<screen-echarts-frame <screen-echarts-frame
@handelClickMyPei="handelClickMyPei" @handelClickMyPei="handelClickMyPei"
@ -34,8 +34,8 @@
ref="pieChart" ref="pieChart"
></screen-echarts-frame> ></screen-echarts-frame>
</div> </div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData.data" @click="handleClickItem(item)">
@ -48,60 +48,51 @@
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
<el-col :span="24"> >
<div class="census_searchcensus2"> </div>
<div class="census_searchcensus_box"></div> <div class="census_searchcensus2">
<el-button size="small" class="diy-button--output" @click="handleExport('age')">导出</el-button> <div class="census_searchcensus_box"></div>
</div> <el-button size="small" class="diy-button--output" @click="handleExport('age')">导出</el-button>
</el-col> </div>
<el-col :span="24">
<el-table <el-table
class="table" class="table"
:data="tableDataAge" :data="tableDataAge"
border border
:height="tableHeight" :height="tableHeight"
v-loading="tableLoadingAge" v-loading="tableLoadingAge"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
style="width: 100%" style="width: 100%"
> >
<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column> <el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
<el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column> <el-table-column prop="age" header-align="center" align="center" :show-overflow-tooltip="true" label="年龄" min-width="100"></el-table-column>
<el-table-column <el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
prop="mobile"
header-align="center"
align="center"
:show-overflow-tooltip="true"
label="手机号码"
min-width="130"
></el-table-column>
<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate"> <el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button> <el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@size-change="pageSizeChangeHandleAge" @size-change="pageSizeChangeHandleAge"
@current-change="pageCurrentChangeHandleAge" @current-change="pageCurrentChangeHandleAge"
:current-page.sync="agePageNo" :current-page.sync="agePageNo"
:page-sizes="[10, 20, 50, 100, 200]" :page-sizes="[10, 20, 50, 100, 200]"
:page-size="agePageSize" :page-size="agePageSize"
layout="sizes, prev, pager, next, total,jumper" layout="sizes, prev, pager, next, total,jumper"
:total="ageTotal" :total="ageTotal"
></el-pagination> ></el-pagination>
</el-col>
</el-row>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="div_table_title">党员学历统计</div> <div class="div_table_title">党员学历统计</div>
<el-row> <div class="flex">
<el-col :span="12"> <div class="width1">
<div :style="'height:220px;margin-top:20px'"> <div :style="'height:220px;margin-top:20px'">
<screen-echarts-frame2 <screen-echarts-frame2
@handelClickMyPei="handelClickMyPei2" @handelClickMyPei="handelClickMyPei2"
@ -110,8 +101,8 @@
ref="pieChart2" ref="pieChart2"
></screen-echarts-frame2> ></screen-echarts-frame2>
</div> </div>
</el-col> </div>
<el-col :span="12"> <div class="flex1">
<div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'"> <div :style="'height:220px;margin-top:20px;display:flex;align-items: center;'">
<div class="legend"> <div class="legend">
<div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)"> <div class="legend-row" :key="item.name" v-for="(item, index) in chartData2.data" @click="handleClickItem(item)">
@ -124,55 +115,45 @@
</div> </div>
</div> </div>
</div> </div>
</el-col> </div>
<el-col :span="24"> </div>
<div class="census_searchcensus2"> <div class="census_searchcensus2">
<div class="census_searchcensus_box"></div> <div class="census_searchcensus_box"></div>
<el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button> <el-button size="small" class="diy-button--output" @click="handleExport('edu')">导出</el-button>
</div> </div>
</el-col>
<el-col :span="24"> <el-table
<el-table class="table"
class="table" :data="tableData"
:data="tableData" border
border :height="tableHeight"
:height="tableHeight" v-loading="tableLoading"
v-loading="tableLoading" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" style="width: 100%"
style="width: 100%" >
> <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
<el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column> <el-table-column prop="name" header-align="center" align="center" label="姓名" :show-overflow-tooltip="true" min-width="120"></el-table-column>
<el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column> <el-table-column prop="education" header-align="center" align="center" :show-overflow-tooltip="true" label="学历" min-width="130"></el-table-column>
<el-table-column <el-table-column prop="mobile" header-align="center" align="center" :show-overflow-tooltip="true" label="手机号码" min-width="130"></el-table-column>
prop="mobile"
header-align="center"
align="center"
:show-overflow-tooltip="true"
label="手机号码"
min-width="130"
></el-table-column>
<el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate"> <el-table-column label="操作" fixed="right" width="120" header-align="center" align="center" class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button> <el-button type="text" class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination <el-pagination
@size-change="pageSizeChangeHandleNew" @size-change="pageSizeChangeHandleNew"
@current-change="pageCurrentChangeHandleNew" @current-change="pageCurrentChangeHandleNew"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[10, 20, 50, 100, 200]" :page-sizes="[10, 20, 50, 100, 200]"
:page-size="pageSize" :page-size="pageSize"
layout="sizes, prev, pager, next, total,jumper" layout="sizes, prev, pager, next, total,jumper"
:total="total" :total="total"
></el-pagination> ></el-pagination>
</el-col>
</el-row>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -1039,4 +1020,13 @@ export default {
border-radius: 6px; border-radius: 6px;
color: #fff; color: #fff;
} }
.flex {
display: flex;
.width1 {
width: 220px;
}
.flex1 {
flex: 1;
}
}
</style> </style>

Loading…
Cancel
Save