Skip to content

C
civil-front
Commit 94def35b by 苏咏卓
Options

完成查询，修改区域柱形图显示

parent a9b2b9ec
Showing with 344 additions and 43 deletions
.env.development
......@@ -7,7 +7,7 @@ VUE_APP_FILE_API = 'http://124.227.197.29:8088/'
#VUE_APP_BASE_API = 'http://172.18.99.141:9888/'
#VUE_APP_WS_API = 'ws://124.227.197.29:8088'
3VUE_APP_FILE_API = 'http://124.227.197.29:8088/'
#VUE_APP_FILE_API = 'http://124.227.197.29:8088/'
# 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/views/unified/tapSwitch/childWelfare.vue
......@@ -120,8 +120,12 @@
alt=""
class="lowerRight"
/>
<div class="titleHead">当前选择：{{ address ? address : "广西全区" }}</div>
<a class="returnInfos" @click="returnInfo" v-if="num != 0" >返回上一级</a>
<div class="titleHead">
当前选择：{{ address ? address : "广西全区" }}
</div>
<a class="returnInfos" @click="returnInfo" v-if="num != 0"
>返回上一级</a
>
<div class="childWelfareMap" id="childWelfareMap"></div>
</div>
</el-col>
......@@ -203,9 +207,26 @@
</el-table-column>
<el-table-column prop="idCard" label="身份证" align="center">
</el-table-column>
<el-table-column prop="fullAddress" label="所在福利院" align="center">
<el-table-column
prop="fullAddress"
label="所在福利院"
align="center"
>
</el-table-column>
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -227,8 +248,14 @@ export default {
data() {
return {
num: 0,
address:"",
address: "",
tableData: [],
pageInfo: {
page: 1,
size: 7,
total: 0,
},
loading: false,
agencyChildStats: {},
agencyChildStatsList: {
agencyNumList: [
......@@ -318,13 +345,29 @@ export default {
childSearchFun(data) {
childSearch({
keyword: this.value,
areaCode: data
areaCode: data,
...this.pageInfo,
}).then((res) => {
console.log(res, "儿童搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.childSearchFun();
},
getAgencyChildStatsFun(data) {
getAgencyChildStats({ areaCode: data }).then((res) => {
console.log(res, "统计该区域的机构和儿童数量");
......@@ -369,12 +412,12 @@ export default {
returnInfo() {
this.num = 0;
this.address = "广西全区"
this.address = "广西全区";
this.getMapData("g450000");
this.getAgencyChildStatsListFun("450000");
this.getAgencyPercentageStatsFun("450000");
this.getAgencyChildStatsFun("450000")
this.childSearchFun("450000")
this.getAgencyChildStatsFun("450000");
this.childSearchFun("450000");
},
/**
......@@ -432,6 +475,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -471,8 +517,12 @@ export default {
this.getAgencyPercentageStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getAgencyChildStatsFun(mapList.features[res.dataIndex].properties.adcode)
this.childSearchFun(mapList.features[res.dataIndex].properties.adcode)
this.getAgencyChildStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.childSearchFun(
mapList.features[res.dataIndex].properties.adcode
);
} else {
console.log("点击取值", res);
console.log("地图数组", mapList.features);
......@@ -492,8 +542,12 @@ export default {
this.getAgencyPercentageStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getAgencyChildStatsFun(mapList.features[res.dataIndex].properties.adcode)
this.childSearchFun(mapList.features[res.dataIndex].properties.adcode)
this.getAgencyChildStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.childSearchFun(
mapList.features[res.dataIndex].properties.adcode
);
}
});
},
......@@ -711,7 +765,7 @@ export default {
name: "机构",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -728,7 +782,7 @@ export default {
{
name: "孤儿",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -745,7 +799,7 @@ export default {
{
name: "无人领养",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -971,4 +1025,10 @@ export default {
.el-icon-search {
color: #fff;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
src/views/unified/tapSwitch/marriage.vue
......@@ -261,13 +261,22 @@
</el-table-column>
<el-table-column
prop="manName"
label="名称"
label="男方姓名"
align="center"
width="60px"
width="80px"
>
</el-table-column>
<el-table-column
prop="girl"
label="女方姓名"
align="center"
width="80px"
>
</el-table-column>
<el-table-column prop="manDomicile" label="所在地" align="center">
</el-table-column>
<el-table-column prop="orgName" label="登记处" align="center">
</el-table-column>
<el-table-column prop="type" label="婚姻状况" align="center">
<template slot-scope="scope">
{{
......@@ -286,6 +295,19 @@
<el-table-column prop="registerDate" label="时间" align="center">
</el-table-column>
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -317,6 +339,12 @@ export default {
areaUnderMarriageStatsList: {},
value: "",
address: "",
pageInfo: {
page: 1,
size: 7,
total: 0,
},
loading: false,
options: [
{
value: "2017",
......@@ -364,12 +392,28 @@ export default {
marriageSearch({
keyword: this.value,
areaCode: data,
...this.pageInfo
}).then((res) => {
console.log(res, "搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.marriageSearchFun();
},
getFivesYearMarriageLineFun(data) {
getFivesYearMarriageLine({
areaCode: data,
......@@ -475,6 +519,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -829,7 +876,7 @@ export default {
name: "结婚",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -846,7 +893,7 @@ export default {
{
name: "离婚",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -1067,4 +1114,10 @@ export default {
border: 1px solid #0e62bf;
border-top: none;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
src/views/unified/tapSwitch/mechanism.vue
......@@ -408,6 +408,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -654,7 +657,7 @@ export default {
name: "社团",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -671,7 +674,7 @@ export default {
{
name: "民非",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -688,7 +691,7 @@ export default {
{
name: "基金会",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......
src/views/unified/tapSwitch/population.vue
......@@ -522,7 +522,7 @@ export default {
// zoom: 1.15,
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 480,
layoutSize: 420,
itemStyle: {
......@@ -1142,7 +1142,7 @@ export default {
name: "贫困残疾人",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -1159,7 +1159,7 @@ export default {
{
name: "重度残疾人",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -1300,7 +1300,7 @@ export default {
.populationMap {
width: 100%;
height: 100%;
height: 430px;
background-color: #082c61;
}
......
src/views/unified/tapSwitch/provide.vue
......@@ -184,6 +184,7 @@
:data="tableData"
stripe
style="width: 100%; background-color: #082c61; color: #2177b9"
:loading="loading"
fit
:header-cell-style="{ background: '#082C61', color: '#DAD7DB' }"
:cell-style="{ background: '#082C61', color: '#DAD7DB' }"
......@@ -220,6 +221,19 @@
>
</el-table-column>
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -252,6 +266,12 @@ export default {
cremationRateStats: {},
cremationStatsList: {},
cremation: [],
pageInfo: {
page: 1,
size: 7,
total: 0,
},
loading: false,
};
},
created() {
......@@ -271,12 +291,28 @@ export default {
cremationSearch({
keyword: this.value,
areaCode: data,
...this.pageInfo,
}).then((res) => {
console.log(res, "殡葬搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.cremationSearchFun();
},
getCremationStatsFun(data) {
getCremationStats({ areaCode: data }).then((res) => {
console.log(res, "统计该区域的殡葬火化量");
......@@ -376,6 +412,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -659,7 +698,7 @@ export default {
name: "火化量",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -676,7 +715,7 @@ export default {
{
name: "火化率",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -884,4 +923,10 @@ export default {
color: #7f8b9d;
margin: 10px 20px;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
src/views/unified/tapSwitch/socialAssistance.vue
......@@ -255,6 +255,19 @@
>
</el-table-column>
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -283,6 +296,12 @@ export default {
num: 0,
address: "",
tableData: [],
pageInfo: {
page: 1,
size: 10,
total: 0,
},
loading: false,
values: "",
fivesYearShjzAchieveStats: {},
threeYearShjzProvideStats: {},
......@@ -320,12 +339,28 @@ export default {
societyHelpSearch({
keyword: this.values,
areaCode: data,
...this.pageInfo
}).then((res) => {
console.log(res, "低保对象搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.societyHelpSearchFun();
},
getThreeYearShjzAchieveStatsFun(data) {
getThreeYearShjzAchieveStats({
areaCode: data,
......@@ -441,6 +476,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -899,7 +937,7 @@ export default {
name: "农村",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -916,7 +954,7 @@ export default {
{
name: "城市",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -1158,4 +1196,10 @@ export default {
.el-icon-search {
color: #fff;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
src/views/unified/tapSwitch/socialOrganization.vue
......@@ -248,6 +248,19 @@
>
</el-table-column>
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -275,6 +288,12 @@ export default {
num: 0,
address: "",
tableData: [],
pageInfo: {
page: 1,
size: 15,
total: 0,
},
loading: false,
soorganStats: {},
SoorganPercentageStats: [],
placeNames: [],
......@@ -300,12 +319,28 @@ export default {
soorganSearch({
keyword: this.value,
areaCode: data,
...this.pageInfo
}).then((res) => {
console.log(res, "社会组织搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.soorganSearchFun();
},
getSoorganStatsFun(data) {
getSoorganStats({ areaCode: data }).then((res) => {
console.log(res, "获取社会机构统计");
......@@ -406,6 +441,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -688,7 +726,7 @@ export default {
name: "社团",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -705,7 +743,7 @@ export default {
{
name: "民非",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -722,7 +760,7 @@ export default {
{
name: "基金会",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -965,4 +1003,10 @@ export default {
.el-icon-search {
color: #fff;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
src/views/unified/tapSwitch/subsidies.vue
......@@ -126,7 +126,9 @@
<div class="titleHead">
当前选择：{{ address ? address : "广西全区" }}
</div>
<a class="returnInfos" @click="returnInfo">返回上一级</a>
<a class="returnInfos" @click="returnInfo" v-if="num != 0"
>返回上一级</a
>
<div class="subsidiesMap" id="subsidiesMap"></div>
</div>
</el-col>
......@@ -218,6 +220,19 @@
<!-- <el-table-column prop="date" label="补助标准" align="center">
</el-table-column> -->
</el-table>
<div class="paginationInfo">
<el-pagination
layout="prev, pager, next"
:total="pageInfo.total"
:page-size="pageInfo.size"
:page-sizes="[10, 50, 100, 200]"
:current-page="pageInfo.page"
@size-change="sizeChange"
@current-change="pageChange"
background
>
</el-pagination>
</div>
</div>
</div>
</el-col>
......@@ -245,6 +260,12 @@ export default {
num: 0,
address: "",
tableData: [],
pageInfo: {
page: 1,
size: 15,
total: 0,
},
loading: false,
yearDisabledIssueStats: {},
disabledLevelStats: {},
areaDisabledIssueStats: {},
......@@ -269,12 +290,28 @@ export default {
deformedManSearch({
keyword: this.value,
areaCode: data,
...this.pageInfo,
}).then((res) => {
console.log(res, "残疾人搜索");
this.tableData = res.data;
this.tableData = res.data.rows;
this.pageInfo.total = res.data.total;
this.loading = false;
});
},
// 显示数量切换
sizeChange(e) {
this.pageInfo.size = e;
this.pageChange(1); // 切换数量时页数为1
},
// 页数切换
pageChange(e) {
this.pageInfo.page = e;
this.loading = true;
this.deformedManSearchFun();
},
getYearDisabledIssueStatsFun(data) {
getYearDisabledIssueStats({ areaCode: data }).then((res) => {
console.log(res, "近三年发放人数和金额统计");
......@@ -372,6 +409,9 @@ export default {
//name: "项目任务完成情况",
type: "map",
mapType: "GX", // 自定义扩展图表类型
layoutCenter: ["50%", "50%"],
// 如果宽高比大于 1 则宽度为 100，如果小于 1 则高度为 100，保证了不超过 100x100 的区域
layoutSize: 420,
itemStyle: {
normal: {
label: { show: true, color: "#fff" },
......@@ -721,7 +761,7 @@ export default {
name: "贫困残疾",
type: "bar",
barGap: 0,
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -738,7 +778,7 @@ export default {
{
name: "重度残疾",
type: "bar",
label: labelOption,
//label: labelOption,
emphasis: {
focus: "series",
},
......@@ -986,4 +1026,10 @@ export default {
.el-icon-search {
color: #fff;
}
.paginationInfo {
display: flex;
justify-content: center;
margin-top: 30px;
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment