Skip to content

C
civil-front
Commit 288e58f6 by 李耀琨
Options

更新代码

parent 76f809f0
Showing with 150 additions and 30 deletions
src/views/home.vue
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
/> />
<div class="flex-container"> <div class="flex-container">
<img <img
src="./../assets/images/img/标题.png" src="./../assets/images/img/标题1.png"
alt="" alt=""
class="flex-container-tetli" class="flex-container-tetli"
/> />
......
src/views/unified/entrance.vue
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
class="background-image" class="background-image"
/> />
<div class="flex-container"> <div class="flex-container">
<img src="./../../assets/images/img/标题.png" alt="" class="flex-container-tetli"> <img src="./../../assets/images/img/标题1.png" alt="" class="flex-container-tetli">
<!-- <img src="./../../assets/images/标题左边素材.png" alt="" class="about" /> <!-- <img src="./../../assets/images/标题左边素材.png" alt="" class="about" />
<div class="title-text"> <div class="title-text">
民政数据分析系统 民政数据分析系统
......
src/views/unified/tapSwitch/population.vue
...@@ -237,24 +237,28 @@ ...@@ -237,24 +237,28 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="sizecity16">城市低保对象(人)</div>
<div class="sizeFlex"> <div class="sizeFlex">
<div class="size24"> <div class="size24">
{{ threeYeartTotalData.cityToatlNum }} <!-- {{ threeYeartTotalData.cityToatlNum }} -->
343634
</div> </div>
<div class="sizeFelx">（人）</div>
</div> </div>
<div class="sizecity16">城市</div>
</div> </div>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<div class="rescue"> <div class="rescue">
<div class="sizerural16">农村低保对象(人)</div>
<div class="sizeFlex"> <div class="sizeFlex">
<div class="sizeyellow24"> <div class="sizeyellow24">
{{ threeYeartTotalData.villageToatlNum }} <!-- {{ threeYeartTotalData.villageToatlNum }} -->
2488258
</div> </div>
<div class="sizeFelxYellow">（人）</div>
</div> </div>
<div class="sizerural16">农村</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/unified/tapSwitch/socialAssistance.vue
...@@ -28,28 +28,96 @@ ...@@ -28,28 +28,96 @@
class="lowerRight" class="lowerRight"
/> />
<div class="warningInfo" v-if="num != 0">暂下级数据</div> <div class="warningInfo" v-if="num != 0">暂下级数据</div>
<div class="titleHead">三年享受低保人数</div> <div class="titleHead">当前享受低保人数</div>
<div class="display">
<!-- <div class="provideFlex">
<div class="text">城市</div>
<div> <div>
<div class="borderBottom"></div>
<div class="textNum"> 152435 </div>
<div class="borderTop"></div>
</div>
<div class="text">户</div>
</div>
<div class="provideFlex">
<div class="text">农村</div>
<div>
<div class="borderBottom"></div>
<div class="textNum"> 864076 </div>
<div class="borderTop"></div>
</div>
<div class="text">户</div>
</div> -->
<div class="provideFlex">
<div class="text">城市低保人数</div>
<div>
<div class="borderBottom"></div>
<div class="textNum"> 343634 </div>
<div class="borderTop"></div>
</div>
<div class="text">个</div>
</div>
<div class="provideFlex">
<div class="text">农村低保人数</div>
<div>
<div class="borderBottom"></div>
<div class="textNum"> 2488258 </div>
<div class="borderTop"></div>
</div>
<div class="text">个</div>
</div>
<!-- <div class="display"> -->
<!-- <div>
<div class="flex"> <div class="flex">
<div class="num"> <div class="num">
{{ cityAndvillagePeople.cityToatlNum }} {{ cityAndvillagePeople.cityToatlNum }}
343634
</div> </div>
<div class="text">人</div> <div class="text">人</div>
</div> </div>
<div class="rural">农村</div> <div class="rural">城市</div>
</div> -->
<!-- <div>
<div class="flex">
<div class="nums">
{{ cityAndvillagePeople.villageToatlNum }}
2488258
</div>
<div class="texts">人</div>
</div>
<div class="city">农村</div>
</div> -->
<!-- </div> -->
<!-- <div class="display">
<div>
<div class="flex">
<div class="num">
{{ cityAndvillagePeople.cityToatlNum }}
152435
</div>
<div class="text">户</div>
</div>
<div class="rural">城市</div>
</div> </div>
<div> <div>
<div class="flex"> <div class="flex">
<div class="nums"> <div class="nums">
{{ cityAndvillagePeople.villageToatlNum }} {{ cityAndvillagePeople.villageToatlNum }}
864076
</div> </div>
<div class="texts">人</div> <div class="texts">户</div>
</div> </div>
<div class="city">城市</div> <div class="city">农村</div>
</div> </div>
</div> </div> -->
<div id="fivePeople" class="trend"></div> <!-- <div id="fivePeople" class="trend"></div> -->
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
...@@ -81,24 +149,24 @@ ...@@ -81,24 +149,24 @@
<div class="warningInfo" v-if="num != 0">暂下级数据</div> <div class="warningInfo" v-if="num != 0">暂下级数据</div>
<div class="titleHead">三年享受低保资金</div> <div class="titleHead">三年享受低保资金</div>
<div class="display"> <div class="display">
<div> <!-- <div>
<div class="flex"> <div class="flex">
<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> -->
<div> <!-- <div>
<div class="flex"> <div class="flex">
<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> -->
</div> </div>
<div id="fiveCapital" class="trend"></div> <div id="fiveCapital" class="trend"></div>
</div> </div>
...@@ -205,7 +273,9 @@ ...@@ -205,7 +273,9 @@
class="lowerRight" class="lowerRight"
/> />
<div class="wiansInfo"> <div class="wiansInfo">
<div class="titleHead">{{ address ? address : "广西全区" }}低保对象查询</div> <div class="titleHead">
{{ address ? address : "广西全区" }}低保对象查询
</div>
<el-input <el-input
type="text" type="text"
placeholder="身份证或者姓名查询" placeholder="身份证或者姓名查询"
...@@ -308,7 +378,7 @@ export default { ...@@ -308,7 +378,7 @@ export default {
a: false, a: false,
b: false, b: false,
c: false, c: false,
d:false, d: false,
address: "", address: "",
tableData: [], tableData: [],
pageInfo: { pageInfo: {
...@@ -755,7 +825,8 @@ export default { ...@@ -755,7 +825,8 @@ export default {
name: "城市", name: "城市",
type: "line", type: "line",
stack: "总量", stack: "总量",
data: data.cityData, // data: data.cityData,
data: 0,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#7C8FAB", color: "#7C8FAB",
...@@ -769,7 +840,8 @@ export default { ...@@ -769,7 +840,8 @@ export default {
name: "农村", name: "农村",
type: "line", type: "line",
stack: "总量", stack: "总量",
data: data.villageData, // data: data.villageData,
data: 0,
itemStyle: { itemStyle: {
normal: { normal: {
color: "#968E38", color: "#968E38",
...@@ -1138,9 +1210,10 @@ export default { ...@@ -1138,9 +1210,10 @@ export default {
} }
.display { .display {
display: flex; // display: flex;
justify-content: space-around; // justify-content: space-around;
align-items: center; // align-items: center;
text-align: center;
margin: 30px 0; margin: 30px 0;
} }
...@@ -1173,12 +1246,12 @@ export default { ...@@ -1173,12 +1246,12 @@ export default {
} }
.rural { .rural {
font-size: 12px; // font-size: 12px;
color: #fff; color: #fff;
} }
.city { .city {
font-size: 12px; // font-size: 12px;
color: #fff; color: #fff;
} }
...@@ -1235,4 +1308,46 @@ export default { ...@@ -1235,4 +1308,46 @@ export default {
color: #ffb0b3; color: #ffb0b3;
z-index: 999; z-index: 999;
} }
.provideFlex {
display: flex;
justify-content: center;
margin-top: 30px;
//margin-left: 36px;
}
.text {
font-size: 16px;
color: #fff;
margin-top: 16px;
}
.textNum {
width: 180px;
font-size: 24px;
text-align: center;
color: #fff;
font-weight: bold;
}
.textNums {
width: 180px;
font-size: 24px;
text-align: center;
color: #c1bdbd;
font-weight: bold;
}
.borderBottom {
width: 180px;
height: 12px;
border: 2px solid #0e62bf;
border-bottom: none;
}
.borderTop {
width: 180px;
height: 12px;
border: 2px solid #0e62bf;
border-top: none;
}
</style> </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