Skip to content

C
civil-front
Commit 76f809f0 by 李耀琨
Options

优化

parent 98ded76d
Showing with 48 additions and 24 deletions
src/views/unified/tapSwitch/marriage.vue
...@@ -30,13 +30,32 @@ ...@@ -30,13 +30,32 @@
<div class="warningInfo" v-if="a == true">暂无下级数据</div> <div class="warningInfo" v-if="a == true">暂无下级数据</div>
<div class="titleHead">婚姻统计</div> <div class="titleHead">婚姻统计</div>
<div class="socialOrganizationFlex"> <div class="socialOrganizationFlex">
<div class="text">共</div> <div class="flexBox">
<div> <!-- <div class="imgBox"></div> -->
<div class="borderBottom"></div> <img
<div class="yellowNums">{{ marriageLine.iaTotalNum }}</div> src="./../../../assets/images/01-结婚总数.png"
<div class="borderTop"></div> alt=""
class="marriageImg"
/>
<div>
<div class="marriedNum">结婚总数(对)</div>
<div class="yellowNum">{{ marriageStats.marryNum }}</div>
</div>
</div>
<div class="flexBox">
<!-- <div class="imgBox"></div> -->
<img
src="./../../../assets/images/02-离婚总数.png"
alt=""
class="marriageImg"
/>
<div>
<div class="marriedNum">离婚总数(对)</div>
<div class="yellowNum">
{{ marriageStats.divorceNum }}
</div>
</div>
</div> </div>
<div class="text">个</div>
</div> </div>
<div id="mainInfo" class="trend"></div> <div id="mainInfo" class="trend"></div>
</div> </div>
...@@ -1049,7 +1068,7 @@ export default { ...@@ -1049,7 +1068,7 @@ export default {
.flexBox { .flexBox {
display: flex; display: flex;
margin: 36px auto; margin: 36px 20px;
width: 80%; width: 80%;
} }
...@@ -1145,7 +1164,8 @@ export default { ...@@ -1145,7 +1164,8 @@ export default {
.socialOrganizationFlex { .socialOrganizationFlex {
display: flex; display: flex;
justify-content: center; justify-content: center;
margin-top: 20px; // justify-content: space-around;
// margin-top: 20px;
//margin-left: 60px; //margin-left: 60px;
} }
......
src/views/unified/tapSwitch/population.vue
...@@ -93,14 +93,14 @@ ...@@ -93,14 +93,14 @@
<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">{{ orphanNum }}</div> <div class="size16">孤儿 (人)</div>
<div class="size16">孤儿</div> <div class="size24">{{ orphanNum }} </div>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="size16Info">事实无人领养 (人)</div>
<div class="size24Info">{{ noAdoptNum }}</div> <div class="size24Info">{{ noAdoptNum }}</div>
<div class="size16Info">事实无人领养</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="disabilityPeople"> <div class="disabilityPeople">
<div class="size16">贫困残疾人</div> <div class="size16">贫困残疾人 (人)</div>
<div class="size16">{{ povertyNum }}</div> <div class="size16">{{ povertyNum }}</div>
</div> </div>
</el-col> </el-col>
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<div class="disabilityPeople"> <div class="disabilityPeople">
<div class="size16">重度残疾人</div> <div class="size16">重度残疾人 (人)</div>
<div class="size16"> <div class="size16">
{{ severeNum }} {{ severeNum }}
</div> </div>
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
<div class="size24"> <div class="size24">
{{ threeYeartTotalData.cityToatlNum }} {{ threeYeartTotalData.cityToatlNum }}
</div> </div>
<div class="sizeFelx">万人</div> <div class="sizeFelx">（人）</div>
</div> </div>
<div class="sizecity16">城市</div> <div class="sizecity16">城市</div>
</div> </div>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<div class="sizeyellow24"> <div class="sizeyellow24">
{{ threeYeartTotalData.villageToatlNum }} {{ threeYeartTotalData.villageToatlNum }}
</div> </div>
<div class="sizeFelxYellow">万人</div> <div class="sizeFelxYellow">（人）</div>
</div> </div>
<div class="sizerural16">农村</div> <div class="sizerural16">农村</div>
</div> </div>
......
src/views/unified/tapSwitch/socialAssistance.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<div class="num"> <div class="num">
{{ cityAndvillagePeople.cityToatlNum }} {{ cityAndvillagePeople.cityToatlNum }}
</div> </div>
<div class="text">万人</div> <div class="text">人</div>
</div> </div>
<div class="rural">农村</div> <div class="rural">农村</div>
</div> </div>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<div class="nums"> <div class="nums">
{{ cityAndvillagePeople.villageToatlNum }} {{ cityAndvillagePeople.villageToatlNum }}
</div> </div>
<div class="texts">万人</div> <div class="texts">人</div>
</div> </div>
<div class="city">城市</div> <div class="city">城市</div>
</div> </div>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<div class="num"> <div class="num">
{{ cityAndvillageNum.cityToatlAmount }} {{ cityAndvillageNum.cityToatlAmount }}
</div> </div>
<div class="text">万元</div> <div class="text">元</div>
</div> </div>
<div class="rural">农村</div> <div class="rural">农村</div>
</div> </div>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<div class="nums"> <div class="nums">
{{ cityAndvillageNum.villageToatlAmount }} {{ cityAndvillageNum.villageToatlAmount }}
</div> </div>
<div class="texts">万元</div> <div class="texts">元</div>
</div> </div>
<div class="city">城市</div> <div class="city">城市</div>
</div> </div>
......
src/views/unified/tapSwitch/subsidies.vue
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
<div class="flex"> <div class="flex">
<div class="num"> <div class="num">
{{ poorDisabledNum.difficultTotalNum }} {{ poorDisabledNum.difficultTotalNum }}
</div> </div>
<div class="text">万</div> <div class="text">元</div>
</div> </div>
<div class="rural">贫困残疾救助</div> <div class="rural">贫困残疾救助</div>
</div> </div>
<div> <div>
<div class="flex"> <div class="flex">
<div class="nums">{{ poorDisabledNum.severeTotalNum }}</div> <div class="nums">{{ poorDisabledNum.severeTotalNum }}</div>
<div class="texts">万</div> <div class="texts">元</div>
</div> </div>
<div class="city">重度残疾救助</div> <div class="city">重度残疾救助</div>
</div> </div>
...@@ -78,13 +78,17 @@ ...@@ -78,13 +78,17 @@
/> />
<div class="warningInfo" v-if="LevelStats">暂无下级数据</div> <div class="warningInfo" v-if="LevelStats">暂无下级数据</div>
<div class="titleHead">残疾人比例</div> <div class="titleHead">残疾人比例</div>
<div class="subsidiesBox">
<div class="subsidiesText">残疾等级</div>
<div class="subsidiesText">总数(人)</div>
<div class="subsidiesText">占比%</div></div>
<div <div
class="subsidiesBox" class="subsidiesBox"
v-for="(item, index) in disabledLevelStats" v-for="(item, index) in disabledLevelStats"
:key="index" :key="index"
> >
<div class="subsidiesText">{{ item.level }}级残疾</div> <div class="subsidiesText">{{ item.level }}级残疾</div>
<div class="subsidiesText">总数{{ item.num }}</div> <div class="subsidiesText">{{ item.num }}</div>
<div class="subsidiesText">{{item.percentage}}%</div> <div class="subsidiesText">{{item.percentage}}%</div>
</div> </div>
</div> </div>
...@@ -1029,7 +1033,7 @@ export default { ...@@ -1029,7 +1033,7 @@ export default {
justify-content: space-around; justify-content: space-around;
align-items: center; align-items: center;
border-bottom: 2px solid #526787; border-bottom: 2px solid #526787;
margin: 60px 30px; margin: 50px 30px;
} }
.subsidiesText { .subsidiesText {
......
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