Skip to content

C
civil-front
Commit 304b0435 by 苏咏卓
Options

页面更新

parent febb6153
Showing with 130 additions and 48 deletions
.env.development
ENV = 'development' ENV = 'development'
# 接口地址 # 接口地址
#VUE_APP_BASE_API = 'http://124.227.197.29:8088/' VUE_APP_BASE_API = 'http://124.227.197.29:8088/'
#VUE_APP_WS_API = 'ws://124.227.197.29:8088'
#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' VUE_APP_WS_API = 'ws://124.227.197.29:8088'
VUE_APP_FILE_API = 'http://124.227.197.29:8088/' 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'
#VUE_APP_FILE_API = 'http://124.227.197.29:8088/'
# 是否启用 babel-plugin-dynamic-import-node插件 # 是否启用 babel-plugin-dynamic-import-node插件
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/views/unified/tapSwitch/childWelfare.vue
...@@ -120,9 +120,9 @@ ...@@ -120,9 +120,9 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="title">当前选择：广西全区</div> <div class="title">当前选择：{{ address ? address : "广西全区" }}</div>
<div class="childWelfareMap" id="childWelfareMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
<div class="childWelfareMap" id="childWelfareMap"></div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -227,6 +227,7 @@ export default { ...@@ -227,6 +227,7 @@ export default {
data() { data() {
return { return {
num: 0, num: 0,
address:"",
tableData: [], tableData: [],
agencyChildStats: {}, agencyChildStats: {},
agencyChildStatsList: { agencyChildStatsList: {
...@@ -367,9 +368,11 @@ export default { ...@@ -367,9 +368,11 @@ export default {
returnInfo() { returnInfo() {
this.num = 0; this.num = 0;
this.address = "广西全区"
this.getMapData("g450000"); this.getMapData("g450000");
this.getAgencyChildStatsListFun("450000"); this.getAgencyChildStatsListFun("450000");
this.getAgencyPercentageStatsFun("450000"); this.getAgencyPercentageStatsFun("450000");
this.getAgencyChildStatsFun("450000")
}, },
/** /**
...@@ -469,6 +472,7 @@ export default { ...@@ -469,6 +472,7 @@ export default {
"区域信息地区码", "区域信息地区码",
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.address = res.name;
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
...@@ -478,6 +482,7 @@ export default { ...@@ -478,6 +482,7 @@ export default {
this.getAgencyPercentageStatsFun( this.getAgencyPercentageStatsFun(
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.getAgencyChildStatsFun(mapList.features[res.dataIndex].properties.adcode)
} }
}); });
}, },
...@@ -924,7 +929,9 @@ export default { ...@@ -924,7 +929,9 @@ export default {
.returnInfos { .returnInfos {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
margin: 0px 0 0 30px; margin: 10px 30px 0 0;
display: flex;
justify-content: flex-end;
} }
.input { .input {
......
src/views/unified/tapSwitch/marriage.vue
<template> <template>
<div> <div>
<br />
<br />
<el-row :gutter="18"> <el-row :gutter="18">
<!--左 --> <!--左 -->
<el-col :span="6"> <el-col :span="6">
...@@ -90,9 +87,9 @@ ...@@ -90,9 +87,9 @@
class="marriageImg" class="marriageImg"
/> />
<div> <div>
<div class="marriedNum">申请离婚(对)</div> <div class="marriedNum">离婚总数(对)</div>
<div class="yellowNum"> <div class="yellowNum">
{{ marriageStats.inDivorceNum }} {{ marriageStats.divorceNum }}
</div> </div>
</div> </div>
</div> </div>
...@@ -104,8 +101,8 @@ ...@@ -104,8 +101,8 @@
class="marriageImg" class="marriageImg"
/> />
<div> <div>
<div class="marriedNum">成功离婚(对)</div> <div class="marriedNum">申请离婚/确定离婚(对)</div>
<div class="yellowNum">{{ marriageStats.divorceNum }}</div> <div class="yellowNum">{{ marriageStats.inDivorceNum }}/{{ marriageStats.divorceNum }}</div>
</div> </div>
</div> </div>
<div class="flexBox"> <div class="flexBox">
...@@ -155,12 +152,13 @@ ...@@ -155,12 +152,13 @@
class="lowerRight" class="lowerRight"
/> />
<div class="title"> <div class="title">
当前选择：广西全区 当前选择：{{ address ? address : "广西全区" }}
<el-select <!-- <el-select
v-model="value" v-model="value"
size="mini" size="mini"
placeholder="选择年份" placeholder="选择年份"
style="width: 100px" style="width: 100px"
@change="searchChange"
> >
<el-option <el-option
v-for="item in options" v-for="item in options"
...@@ -169,10 +167,10 @@ ...@@ -169,10 +167,10 @@
:value="item.value" :value="item.value"
> >
</el-option> </el-option>
</el-select> </el-select> -->
</div> </div>
<div class="marriageMap" id="marriageMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
<div class="marriageMap" id="marriageMap"></div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -265,8 +263,18 @@ ...@@ -265,8 +263,18 @@
<el-table-column prop="manDomicile" label="所在地" align="center"> <el-table-column prop="manDomicile" label="所在地" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="type" label="婚姻状况" align="center"> <el-table-column prop="type" label="婚姻状况" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.type=='IA'?'结婚':scope.row.type=='IB'?'离婚':scope.row.type=='ICA'?'补办结婚证':scope.row.type=='ICB'?'补办离婚证':'不详'}} {{
scope.row.type == "IA"
? "结婚"
: scope.row.type == "IB"
? "离婚"
: scope.row.type == "ICA"
? "补办结婚证"
: scope.row.type == "ICB"
? "补办离婚证"
: "不详"
}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="registerDate" label="时间" align="center"> <el-table-column prop="registerDate" label="时间" align="center">
...@@ -302,28 +310,30 @@ export default { ...@@ -302,28 +310,30 @@ export default {
marriageStats: {}, marriageStats: {},
areaUnderMarriageStatsList: {}, areaUnderMarriageStatsList: {},
value: "", value: "",
address: "",
options: [ options: [
{ {
value: "选项1", value: "2017",
label: "黄金糕", label: "2017",
}, },
{ {
value: "选项2", value: "2018",
label: "双皮奶", label: "2018",
}, },
{ {
value: "选项3", value: "2019",
label: "蚵仔煎", label: "2019",
}, },
{ {
value: "选项4", value: "2020",
label: "龙须面", label: "2020",
}, },
{ {
value: "选项5", value: "2021",
label: "北京烤鸭", label: "2021",
}, },
], ],
date:""
}; };
}, },
created() { created() {
...@@ -334,6 +344,11 @@ export default { ...@@ -334,6 +344,11 @@ export default {
this.marriageSearchFun(); this.marriageSearchFun();
}, },
methods: { methods: {
searchChange(e){
console.log(e)
this.date = e
},
inputBtn() { inputBtn() {
console.log(this.value); console.log(this.value);
this.marriageSearchFun(); this.marriageSearchFun();
...@@ -351,6 +366,7 @@ export default { ...@@ -351,6 +366,7 @@ export default {
getFivesYearMarriageLineFun(data) { getFivesYearMarriageLineFun(data) {
getFivesYearMarriageLine({ getFivesYearMarriageLine({
areaCode: data, areaCode: data,
year:this.date
}).then((res) => { }).then((res) => {
console.log(res, "获取近5年结婚走势"); console.log(res, "获取近5年结婚走势");
this.marriageLine = res.data.admin; this.marriageLine = res.data.admin;
...@@ -361,6 +377,7 @@ export default { ...@@ -361,6 +377,7 @@ export default {
getMarriageStatsFun(data) { getMarriageStatsFun(data) {
getMarriageStats({ getMarriageStats({
areaCode: data, areaCode: data,
year:this.date
}).then((res) => { }).then((res) => {
console.log(res, "获取结婚离婚人数"); console.log(res, "获取结婚离婚人数");
this.marriageStats = res.data; this.marriageStats = res.data;
...@@ -370,6 +387,7 @@ export default { ...@@ -370,6 +387,7 @@ export default {
getAreaUnderMarriageStatsListFun(data) { getAreaUnderMarriageStatsListFun(data) {
getAreaUnderMarriageStatsList({ getAreaUnderMarriageStatsList({
areaCode: data, areaCode: data,
year:this.date
}).then((res) => { }).then((res) => {
console.log(res, "获取地区结婚离婚人数列表"); console.log(res, "获取地区结婚离婚人数列表");
this.areaUnderMarriageStatsList = res.data; this.areaUnderMarriageStatsList = res.data;
...@@ -387,6 +405,7 @@ export default { ...@@ -387,6 +405,7 @@ export default {
returnInfo() { returnInfo() {
this.num = 0; this.num = 0;
this.address = "广西全区";
this.getMapData("g450000"); this.getMapData("g450000");
this.getFivesYearMarriageLineFun("450000"); this.getFivesYearMarriageLineFun("450000");
this.getMarriageStatsFun("450000"); this.getMarriageStatsFun("450000");
...@@ -490,6 +509,7 @@ export default { ...@@ -490,6 +509,7 @@ export default {
"区域信息地区码", "区域信息地区码",
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.address = res.name;
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
...@@ -977,7 +997,9 @@ export default { ...@@ -977,7 +997,9 @@ export default {
.returnInfos { .returnInfos {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
margin: 0px 0 0 30px; margin: 10px 30px 0 0;
display: flex;
justify-content: flex-end;
} }
.input { .input {
......
src/views/unified/tapSwitch/mechanism.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
class="lowerRight" class="lowerRight"
/> />
<div class="title">儿童福利机构</div> <div class="title">儿童福利机构</div>
<div class="mechanismNum">1000个</div> <div class="mechanismNum">{{ childrenNum }}个</div>
<div id="children" class="children"></div> <div id="children" class="children"></div>
<div></div> <div></div>
</div> </div>
...@@ -92,9 +92,11 @@ ...@@ -92,9 +92,11 @@
class="lowerRight" class="lowerRight"
/> />
<div class="wians"> <div class="wians">
<div class="title">当前选择：广西全区</div> <div class="title">
<div class="mechanismMap" id="mechanismMap"></div> 当前选择：{{ address ? address : "广西全区" }}
</div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
<div class="mechanismMap" id="mechanismMap"></div>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -231,6 +233,7 @@ export default { ...@@ -231,6 +233,7 @@ export default {
data() { data() {
return { return {
num: 0, num: 0,
address: "",
tableData: [], tableData: [],
soorganStats: {}, soorganStats: {},
areaUnderSoorganStatsList: {}, areaUnderSoorganStatsList: {},
...@@ -254,6 +257,7 @@ export default { ...@@ -254,6 +257,7 @@ export default {
welfareHomeName: [], welfareHomeName: [],
nursingFacilityNum: 125, nursingFacilityNum: 125,
beadhouseNum: 169, beadhouseNum: 169,
childrenNum: 120,
}; };
}, },
created() { created() {
...@@ -322,6 +326,10 @@ export default { ...@@ -322,6 +326,10 @@ export default {
res.data.forEach((item) => { res.data.forEach((item) => {
this.welfareHomeName.push(item.name); this.welfareHomeName.push(item.name);
}); });
this.childrenNum = 0;
res.data.forEach((item) => {
this.childrenNum += item.value * 1;
});
console.log(this.welfareHomeName); console.log(this.welfareHomeName);
this.childrenFun(); this.childrenFun();
}); });
...@@ -337,6 +345,7 @@ export default { ...@@ -337,6 +345,7 @@ export default {
returnInfo() { returnInfo() {
this.num = 0; this.num = 0;
this.address = "广西全区";
this.getMapData("g450000"); this.getMapData("g450000");
this.getSoorganStatsFun("450000"); this.getSoorganStatsFun("450000");
this.getAreaUnderSoorganStatsListFun("450000"); this.getAreaUnderSoorganStatsListFun("450000");
...@@ -441,6 +450,7 @@ export default { ...@@ -441,6 +450,7 @@ export default {
"区域信息地区码", "区域信息地区码",
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.address = res.name;
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
...@@ -985,6 +995,8 @@ export default { ...@@ -985,6 +995,8 @@ export default {
.returnInfos { .returnInfos {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
margin: 0px 0 0 30px; margin: 10px 30px 0 0;
display: flex;
justify-content: flex-end;
} }
</style> </style>
\ No newline at end of file
src/views/unified/tapSwitch/population.vue
<template> <template>
<div> <div>
<el-row :gutter="18"> <el-row :gutter="18">
<!--左 --> <!--左 -->
<el-col :span="6"> <el-col :span="6">
...@@ -32,7 +31,7 @@ ...@@ -32,7 +31,7 @@
<el-row :gutter="20" justify="center"> <el-row :gutter="20" justify="center">
<el-col :span="12"> <el-col :span="12">
<el-row justify="center"> <el-row justify="center">
<el-col :span="6" > <el-col :span="6">
<!-- <div class="marriageImg"></div> --> <!-- <div class="marriageImg"></div> -->
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -92,13 +91,13 @@ ...@@ -92,13 +91,13 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="size24">2000</div> <div class="size24">{{ orphanNum }}</div>
<div class="size16">孤儿</div> <div class="size16">孤儿</div>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="size24Info">1000</div> <div class="size24Info">{{ noAdoptNum }}</div>
<div class="size16Info">事实无人领养</div> <div class="size16Info">事实无人领养</div>
</div> </div>
</el-col> </el-col>
...@@ -134,9 +133,9 @@ ...@@ -134,9 +133,9 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="title">当前选择：广西全区</div> <div class="title">当前选择：{{ address ? address : "广西全区" }}</div>
<div class="populationMap" id="populationMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
<div class="populationMap" id="populationMap"></div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -272,12 +271,28 @@ export default { ...@@ -272,12 +271,28 @@ export default {
data() { data() {
return { return {
num: 0, num: 0,
address: "",
marriageLine: {}, marriageLine: {},
marriageStats: {}, marriageStats: {},
threeYearShjzAchieveStats: {}, threeYearShjzAchieveStats: {},
threeYeartTotalData: {}, threeYeartTotalData: {},
areaDisabledIssueStats: {}, areaDisabledIssueStats: {},
cremationRateStats: {}, cremationRateStats: [
{ name: "南宁市", value: 321 },
{ name: "柳州市", value: 431 },
{ name: "桂林市", value: 792 },
{ name: "梧州市", value: 876 },
{ name: "北海市", value: 782 },
{ name: "防城港市", value: 452 },
{ name: "钦州市", value: 213 },
{ name: "贵港市", value: 342 },
{ name: "玉林市", value: 231 },
{ name: "百色市", value: 163 },
{ name: "贺州市", value: 530 },
{ name: "河池市", value: 483 },
{ name: "来宾市", value: 104 },
{ name: "崇左市", value: 231 },
],
cremation: [], cremation: [],
agencyChildStatsList: { agencyChildStatsList: {
areaList: [ areaList: [
...@@ -329,6 +344,8 @@ export default { ...@@ -329,6 +344,8 @@ export default {
"90", "90",
], ],
}, },
orphanNum: 172,
noAdoptNum: 159,
}; };
}, },
created() { created() {
...@@ -367,6 +384,15 @@ export default { ...@@ -367,6 +384,15 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res, "儿童福利统计"); console.log(res, "儿童福利统计");
this.agencyChildStatsList = res.data; this.agencyChildStatsList = res.data;
this.orphanNum = 0;
res.data.orphanNumList.forEach((item) => {
this.orphanNum += item * 1;
});
this.noAdoptNum = 0;
res.data.factUnadoptedNumList.forEach((item) => {
this.noAdoptNum += item * 1;
console.log(this.noAdoptNum);
});
this.orphanFun(); this.orphanFun();
}); });
}, },
...@@ -416,12 +442,14 @@ export default { ...@@ -416,12 +442,14 @@ export default {
returnInfo() { returnInfo() {
this.num = 0; this.num = 0;
this.address = "广西全区"
this.getMapData("g450000"); this.getMapData("g450000");
this.getFivesYearMarriageLineFun("450000"); this.getFivesYearMarriageLineFun("450000");
this.getMarriageStatsFun("450000"); this.getMarriageStatsFun("450000");
this.getAgencyChildStatsListFun("450000"); this.getAgencyChildStatsListFun("450000");
this.getThreeYearShjzAchieveStatsFun("450000"); this.getThreeYearShjzAchieveStatsFun("450000");
this.getAreaDisabledIssueStatsFun("450000"); this.getAreaDisabledIssueStatsFun("450000");
this.getCremationRateStatsFun("450000");
}, },
/** /**
...@@ -521,6 +549,7 @@ export default { ...@@ -521,6 +549,7 @@ export default {
"区域信息地区码", "区域信息地区码",
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.address = res.name;
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
...@@ -539,6 +568,9 @@ export default { ...@@ -539,6 +568,9 @@ export default {
this.getAreaDisabledIssueStatsFun( this.getAreaDisabledIssueStatsFun(
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.getCremationRateStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
} }
}); });
}, },
...@@ -1155,7 +1187,7 @@ export default { ...@@ -1155,7 +1187,7 @@ export default {
} }
.target { .target {
width: 100%; width: 100%;
height: 280px; height: 284px;
} }
.size24 { .size24 {
font-size: 24px; font-size: 24px;
...@@ -1253,6 +1285,8 @@ export default { ...@@ -1253,6 +1285,8 @@ export default {
.returnInfos { .returnInfos {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
margin: 0px 0 0 30px; margin: 10px 30px 0 0;
display: flex;
justify-content: flex-end;
} }
</style> </style>
\ No newline at end of file
src/views/unified/tapSwitch/provide.vue
...@@ -105,9 +105,9 @@ ...@@ -105,9 +105,9 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="title">当前选择：广西全区</div> <div class="title">当前选择：{{ address ? address : "广西全区" }}</div>
<div class="provideMap" id="provideMap"></div>
<a class="returnInfos" @click="returnInfo">返回上一级</a> <a class="returnInfos" @click="returnInfo">返回上一级</a>
<div class="provideMap" id="provideMap"></div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -241,6 +241,7 @@ export default { ...@@ -241,6 +241,7 @@ export default {
data() { data() {
return { return {
num: 0, num: 0,
address:"",
tableData: [], tableData: [],
value: "", value: "",
cremationStats: {}, cremationStats: {},
...@@ -307,6 +308,7 @@ export default { ...@@ -307,6 +308,7 @@ export default {
returnInfo() { returnInfo() {
this.num = 0; this.num = 0;
this.address = "广西全区"
this.getMapData("g450000"); this.getMapData("g450000");
this.getCremationStatsFun("450000"); this.getCremationStatsFun("450000");
this.getCremationRateStatsFun("450000"); this.getCremationRateStatsFun("450000");
...@@ -410,6 +412,7 @@ export default { ...@@ -410,6 +412,7 @@ export default {
"区域信息地区码", "区域信息地区码",
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
this.address = res.name;
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
...@@ -833,7 +836,9 @@ export default { ...@@ -833,7 +836,9 @@ export default {
.returnInfos { .returnInfos {
font-size: 16px; font-size: 16px;
color: #fff; color: #fff;
margin: 0px 0 0 30px; margin: 10px 30px 0 0;
display: flex;
justify-content: flex-end;
} }
.input { .input {
......
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