Skip to content

C
civil-front
Commit 57ee9fdb by 苏咏卓
Options

更新

parent 8ca9834d
Showing with 64 additions and 111 deletions
src/views/unified/tapSwitch/socialAssistance.vue
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="warningInfo" v-if="num != 0">暂无下级数据</div> <div class="warningInfo" v-if="a == true">暂无下级数据</div>
<div class="titleHead">当前享受低保人数</div> <div class="titleHead">当前享受低保人数</div>
<div class="xxxBox"> <div class="xxxBox">
<div class="gradientBoxs"> <div class="gradientBoxs">
...@@ -54,6 +54,20 @@ ...@@ -54,6 +54,20 @@
{{ getEnjoyNum.villageNumRate }} {{ getEnjoyNum.villageNumRate }}
</div> </div>
</div> </div>
<div class="gradientBoxs">
<div class="gradientTitle">特困人数</div>
<div class="vertical"></div>
<div class="gradientTwoNum">
{{ getEnjoyNum.poorNum }}
</div>
</div>
<div class="gradientBoxs">
<div class="gradientTitle">临时救助人数</div>
<div class="vertical"></div>
<div class="gradientTwoNum">
{{ getEnjoyNum.temporaryNum }}
</div>
</div>
</div> </div>
<!-- <div class="provideFlex"> <!-- <div class="provideFlex">
...@@ -150,18 +164,22 @@ ...@@ -150,18 +164,22 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="warningInfo" v-if="num != 0">暂无下级数据</div> <div class="warningInfo" v-if="b == true">暂无下级数据</div>
<div class="titleHead">农村城市低保人数比例统计</div> <div class="titleHead">城市农村低保人数比例统计</div>
<div class="displayBox"> <div class="displayBox">
<div class="gradientBox"> <div class="gradientBox">
<div class="gradientTitle">城市</div> <div class="gradientTitle">城市</div>
<div class="vertical"></div> <div class="vertical"></div>
<div class="gradientOneNum">{{ getEnjoyNum.cityNumRate }}</div> <div class="gradientOneNum">
{{ getEnjoyNum.cityNumRate }}
</div>
</div> </div>
<div class="gradientBox"> <div class="gradientBox">
<div class="gradientTitle">农村</div> <div class="gradientTitle">农村</div>
<div class="vertical"></div> <div class="vertical"></div>
<div class="gradientTwoNum">{{ getEnjoyNum.villageNumRate }}</div> <div class="gradientTwoNum">
{{ getEnjoyNum.villageNumRate }}
</div>
</div> </div>
</div> </div>
<div id="fiveCapital" class="trend"></div> <div id="fiveCapital" class="trend"></div>
...@@ -206,9 +224,18 @@ ...@@ -206,9 +224,18 @@
<!-- <div class="titleHead"> <!-- <div class="titleHead">
当前选择：{{ address ? address : "广西全区" }} 当前选择：{{ address ? address : "广西全区" }}
</div> --> </div> -->
<img class="returnInfos" src="./../../../assets/images/returns.png" @click="returnInfo" v-if="num != 0"/> <img
class="returnInfos"
src="./../../../assets/images/returns.png"
@click="returnInfo"
v-if="num != 0"
/>
<div class="socialAssistanceMap" id="socialAssistanceMap"></div> <div class="socialAssistanceMap" id="socialAssistanceMap"></div>
<img class="guideIcon" src="./../../../assets/images/guide.png" alt=""> <img
class="guideIcon"
src="./../../../assets/images/guide.png"
alt=""
/>
<!-- </div> --> <!-- </div> -->
</el-col> </el-col>
</el-row> </el-row>
...@@ -236,8 +263,8 @@ ...@@ -236,8 +263,8 @@
alt="" alt=""
class="lowerRight" class="lowerRight"
/> />
<div class="warningInfo" v-if="num != 0">暂无下级数据</div> <div class="warningInfo" v-if="c == true">暂无下级数据</div>
<div class="titleHead">农村城市低保人数统计</div> <div class="titleHead">城市农村低保人数统计</div>
<div id="ruralAndcity" class="ruralAndcity"></div> <div id="ruralAndcity" class="ruralAndcity"></div>
</div> </div>
</el-col> </el-col>
...@@ -359,10 +386,6 @@ ...@@ -359,10 +386,6 @@
<script> <script>
import * as echarts from "echarts"; import * as echarts from "echarts";
import { import {
getThreeYearShjzAchieveStats,
getThreeYearShjzProvideStats,
getFivesYearShjzAchieveStats,
getAreaYearShjzAchieveStats,
societyHelpSearch, societyHelpSearch,
getMapData, getMapData,
getEnjoyNum, getEnjoyNum,
...@@ -376,7 +399,6 @@ export default { ...@@ -376,7 +399,6 @@ export default {
a: false, a: false,
b: false, b: false,
c: false, c: false,
d: false,
address: "", address: "",
tableData: [], tableData: [],
pageInfo: { pageInfo: {
...@@ -387,10 +409,6 @@ export default { ...@@ -387,10 +409,6 @@ export default {
loading: true, loading: true,
values: "", values: "",
getEnjoyNum: {}, getEnjoyNum: {},
fivesYearShjzAchieveStats: {},
threeYearShjzProvideStats: {},
fivesYearShjzAchieveStats: {},
areaYearShjzAchieveStats: {},
getAreaUnderNumStats: {}, getAreaUnderNumStats: {},
fivesYearEnjoyStats: {}, fivesYearEnjoyStats: {},
cityNames: [], cityNames: [],
...@@ -400,10 +418,6 @@ export default { ...@@ -400,10 +418,6 @@ export default {
}; };
}, },
created() { created() {
this.getThreeYearShjzAchieveStatsFun();
this.getThreeYearShjzProvideStatsFun();
this.getFivesYearShjzAchieveStatsFun();
this.getAreaYearShjzAchieveStatsFun();
this.getAreaUnderNumStatsFun(); this.getAreaUnderNumStatsFun();
this.getMapData("g450000"); //默认展示广西 g450000 this.getMapData("g450000"); //默认展示广西 g450000
this.societyHelpSearchFun(); this.societyHelpSearchFun();
...@@ -463,37 +477,11 @@ export default { ...@@ -463,37 +477,11 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res, "获取享受低保人数"); console.log(res, "获取享受低保人数");
this.getEnjoyNum = res.data; this.getEnjoyNum = res.data;
});
},
getThreeYearShjzAchieveStatsFun(data) {
getThreeYearShjzAchieveStats({
areaCode: data,
}).then((res) => {
console.log(res, "获取近三年城市农村低保发放人数统计");
this.threeYearShjzAchieveStats = res.data.admin;
this.cityAndvillagePeople = res.data.totalData;
this.fivePeopleFun(res.data.admin);
});
},
getThreeYearShjzProvideStatsFun(data) {
getThreeYearShjzProvideStats({ areaCode: data }).then((res) => {
console.log(res, "获取近三年城市农村低保发放金额统计");
this.threeYearShjzProvideStats = res.data.admin;
this.cityAndvillageNum = res.data.totalData;
// this.fiveCapitalFun(res.data.admin);
});
},
getFivesYearShjzAchieveStatsFun(data) {
getFivesYearShjzAchieveStats({ areaCode: data }).then((res) => {
console.log(res, "农村城市低保人数统计");
if (res.data.length == 0) { if (res.data.length == 0) {
this.c = true; this.a = true;
return; return;
} }
this.fivesYearShjzAchieveStats = res.data.admin; this.a = false;
}); });
}, },
...@@ -503,6 +491,11 @@ export default { ...@@ -503,6 +491,11 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res, "获取指定区域下的数据"); console.log(res, "获取指定区域下的数据");
this.getAreaUnderNumStats = res.data; this.getAreaUnderNumStats = res.data;
if (res.data.length == 0) {
this.c = true;
return;
}
this.c = false;
this.ruralAndcityFun(); this.ruralAndcityFun();
}); });
}, },
...@@ -513,24 +506,15 @@ export default { ...@@ -513,24 +506,15 @@ export default {
}).then((res) => { }).then((res) => {
console.log(res, "获取近五年折线图"); console.log(res, "获取近五年折线图");
this.fivesYearEnjoyStats = res.data; this.fivesYearEnjoyStats = res.data;
if (res.data.length == 0) {
this.b = true;
return;
}
this.b = false;
this.fiveCapitalFun(res.data); this.fiveCapitalFun(res.data);
}); });
}, },
getAreaYearShjzAchieveStatsFun(data) {
getAreaYearShjzAchieveStats({ areaCode: data }).then((res) => {
console.log(res, "获取近三年城市农村低保发放人数统计 城市柱形图");
// this.areaYearShjzAchieveStats = res.data;
// res.data.areaList.forEach(item => {
// this.cityNames.push(
// item.name
// )
// });
// console.log(this.cityNames);
//this.ruralAndcityFun();
});
},
//获取地图数据 //获取地图数据
getMapData(areaId) { getMapData(areaId) {
getMapData(areaId).then((res) => { getMapData(areaId).then((res) => {
...@@ -543,13 +527,10 @@ export default { ...@@ -543,13 +527,10 @@ export default {
this.num = 0; this.num = 0;
this.address = "广西全区"; this.address = "广西全区";
this.getMapData("g450000"); this.getMapData("g450000");
this.getThreeYearShjzAchieveStatsFun("450000");
this.getThreeYearShjzProvideStatsFun("450000");
this.getFivesYearShjzAchieveStatsFun("450000");
this.getAreaYearShjzAchieveStatsFun("450000");
this.societyHelpSearchFun("450000"); this.societyHelpSearchFun("450000");
this.getEnjoyNumFun("450000"); this.getEnjoyNumFun("450000");
this.getFivesYearEnjoyStatsFun("450000"); this.getFivesYearEnjoyStatsFun("450000");
this.getAreaUnderNumStatsFun("450000")
}, },
/** /**
...@@ -644,18 +625,6 @@ export default { ...@@ -644,18 +625,6 @@ export default {
console.log(this.num, "大于大于2的时候执行到区县的信息"); console.log(this.num, "大于大于2的时候执行到区县的信息");
if (this.num >= 2) { if (this.num >= 2) {
this.address = res.name; this.address = res.name;
this.getThreeYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getThreeYearShjzProvideStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getFivesYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getAreaYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.societyHelpSearchFun( this.societyHelpSearchFun(
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
...@@ -681,18 +650,6 @@ export default { ...@@ -681,18 +650,6 @@ export default {
this.getMapData( this.getMapData(
"g" + mapList.features[res.dataIndex].properties.adcode "g" + mapList.features[res.dataIndex].properties.adcode
); );
this.getThreeYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getThreeYearShjzProvideStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getFivesYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.getAreaYearShjzAchieveStatsFun(
mapList.features[res.dataIndex].properties.adcode
);
this.societyHelpSearchFun( this.societyHelpSearchFun(
mapList.features[res.dataIndex].properties.adcode mapList.features[res.dataIndex].properties.adcode
); );
...@@ -1229,7 +1186,7 @@ export default { ...@@ -1229,7 +1186,7 @@ export default {
width: 25px; width: 25px;
height: 25px; height: 25px;
z-index: 9999; z-index: 9999;
cursor:pointer cursor: pointer;
} }
.returnInfos img { .returnInfos img {
...@@ -1360,30 +1317,38 @@ export default { ...@@ -1360,30 +1317,38 @@ export default {
height: 60px; height: 60px;
background: linear-gradient(to right, #204c81, #09225b, #0e2c63); background: linear-gradient(to right, #204c81, #09225b, #0e2c63);
border-radius: 8px; border-radius: 8px;
margin: 20px auto 0 auto; margin: 16px auto 0 auto;
padding: 5px 0; padding: 5px 0;
} }
.gradientTitle { .gradientTitle {
width: 160px;
text-align: center;
font-size: 12px; font-size: 12px;
color: #c5cfdd; color: #c5cfdd;
} }
.gradientOneNum { .gradientOneNum {
width: 160px;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
text-align: center;
background: linear-gradient(to top, #fab98a, #f18870); background: linear-gradient(to top, #fab98a, #f18870);
-webkit-background-clip: text; -webkit-background-clip: text;
color: transparent; color: transparent;
} }
.gradientTwoNum { .gradientTwoNum {
width: 160px;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
text-align: center;
background: linear-gradient(to top, #54d7e4, #63bcdb); background: linear-gradient(to top, #54d7e4, #63bcdb);
-webkit-background-clip: text; -webkit-background-clip: text;
color: transparent; color: transparent;
} }
.gradientThreeNum { .gradientThreeNum {
width: 160px;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
text-align: center;
background: linear-gradient(to top, #c7c85a, #70ad47); background: linear-gradient(to top, #c7c85a, #70ad47);
-webkit-background-clip: text; -webkit-background-clip: text;
color: transparent; color: transparent;
......
src/views/unified/tapSwitch/subsidies.vue
...@@ -34,14 +34,14 @@ ...@@ -34,14 +34,14 @@
<div class="gradientTitle">贫困残疾救助</div> <div class="gradientTitle">贫困残疾救助</div>
<div class="vertical"></div> <div class="vertical"></div>
<div class="gradientOneNum"> <div class="gradientOneNum">
{{ pk }} {{ poorDisabledNum.difficultTotalNum }}
</div> </div>
</div> </div>
<div class="gradientBox"> <div class="gradientBox">
<div class="gradientTitle">重度残疾救助</div> <div class="gradientTitle">重度残疾救助</div>
<div class="vertical"></div> <div class="vertical"></div>
<div class="gradientTwoNum"> <div class="gradientTwoNum">
{{ zd }}% {{ poorDisabledNum.severeTotalNum }}
</div> </div>
</div> </div>
</div> </div>
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
<div class="warningInfo" v-if="DisabledIssueStats"> <div class="warningInfo" v-if="DisabledIssueStats">
暂无下级数据 暂无下级数据
</div> </div>
<div class="titleHead">农村城市低保人数统计</div> <div class="titleHead">城市农村低保人数统计</div>
<div id="ruralAndcity" class="ruralAndcity"></div> <div id="ruralAndcity" class="ruralAndcity"></div>
</div> </div>
</el-col> </el-col>
...@@ -348,18 +348,6 @@ export default { ...@@ -348,18 +348,6 @@ export default {
} }
this.yearDisabledIssueStats = res.data.admin; this.yearDisabledIssueStats = res.data.admin;
this.poorDisabledNum = res.data.totalNumMap; this.poorDisabledNum = res.data.totalNumMap;
let difficultTotalNum = this.poorDisabledNum.difficultTotalNum;
let difficultTotal = (difficultTotalNum / 10000).toFixed(1);
let severeTotalNum = this.poorDisabledNum.severeTotalNum;
let severeTotal = (severeTotalNum / 10000).toFixed(1);
console.log(
"----保留一位小数----",
"贫困",
difficultTotal,
"重度",
severeTotal
);
(this.pk = difficultTotal), (this.zd = severeTotal);
this.IssueStats = false; this.IssueStats = false;
this.fivePeopleFun(res.data.admin); this.fivePeopleFun(res.data.admin);
}); });
...@@ -1128,12 +1116,12 @@ export default { ...@@ -1128,12 +1116,12 @@ export default {
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
padding: 0 20px; padding: 0 12px;
} }
.gradientBox { .gradientBox {
display: flex; display: flex;
align-items: center; align-items: center;
width: 180px; width: 200px;
height: 60px; height: 60px;
background: linear-gradient(to right, #204c81, #09225b, #0e2c63); background: linear-gradient(to right, #204c81, #09225b, #0e2c63);
border-radius: 8px; border-radius: 8px;
......
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