Merge branch 'main' of git.zdool.com:xs/ggfwjsc
This commit is contained in:
commit
567f05588f
|
@ -1450,6 +1450,13 @@ const personTotal = ref([
|
|||
ages: "12岁",
|
||||
age: "1000",
|
||||
},
|
||||
{
|
||||
id: 14,
|
||||
name: "死亡总人口",
|
||||
value: "5650",
|
||||
ages: "死亡总人口",
|
||||
age: "1000",
|
||||
},
|
||||
]);
|
||||
|
||||
//特殊标签
|
||||
|
@ -2079,9 +2086,18 @@ const getData = async (i, e) => {
|
|||
age: "",
|
||||
value: "res.data.total",
|
||||
},
|
||||
{
|
||||
id: "6666",
|
||||
name: "死亡总人口",
|
||||
value: "5650",
|
||||
ages: "死亡总人口",
|
||||
age: "1000",
|
||||
},
|
||||
];
|
||||
personTotal.value[0].rksl = res.data.total;
|
||||
personTotal.value[0].ages = "总人口";
|
||||
personTotal.value[1].rksl = res.data.swrs;
|
||||
personTotal.value[1].ages = "死亡";
|
||||
res.data.age.forEach((item, index) => {
|
||||
personTotal.value.push({
|
||||
id: index + 1,
|
||||
|
@ -2098,6 +2114,7 @@ const getData = async (i, e) => {
|
|||
// }
|
||||
// });
|
||||
// });
|
||||
console.log(111, res.data.townWwrs);
|
||||
mapTownCount.map((item) => {
|
||||
item.number = 0;
|
||||
res.data.town.map((items) => {
|
||||
|
@ -2421,6 +2438,19 @@ onMounted(() => {
|
|||
background-size: 100% 100%;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.content_item:nth-child(2) {
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding: 24px;
|
||||
width: 100%;
|
||||
height: 57px;
|
||||
background-image: url(@/assets/images/map/unchoose.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% 100%;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.content_item_name {
|
||||
position: relative;
|
||||
|
|
Loading…
Reference in New Issue