Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc
This commit is contained in:
commit
04f2a0ff54
|
@ -1212,6 +1212,31 @@ const getDatas = async (e, i) => {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 年龄百分比
|
||||
const agename = [
|
||||
"09Percent",
|
||||
"1019Percent",
|
||||
"2029Percent",
|
||||
"3039Percent",
|
||||
"4049Percent",
|
||||
"5059Percent",
|
||||
"6069Percent",
|
||||
"7079Percent",
|
||||
"8089Percent",
|
||||
"9099Percent",
|
||||
"100nlPercent",
|
||||
];
|
||||
if (res.data.ageGroupsPercent) {
|
||||
console.log(PopulationRatio.value[0].progress);
|
||||
agename.forEach((key, index) => {
|
||||
if (PopulationRatio.value[index]) {
|
||||
PopulationRatio.value[index].progress =
|
||||
res.data.ageGroupsPercent[key];
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
};
|
||||
|
@ -1270,6 +1295,29 @@ const getDatas2 = async (e, i, cs) => {
|
|||
}
|
||||
});
|
||||
});
|
||||
// 年龄百分比
|
||||
const agename = [
|
||||
"09Percent",
|
||||
"1019Percent",
|
||||
"2029Percent",
|
||||
"3039Percent",
|
||||
"4049Percent",
|
||||
"5059Percent",
|
||||
"6069Percent",
|
||||
"7079Percent",
|
||||
"8089Percent",
|
||||
"9099Percent",
|
||||
"100nlPercent",
|
||||
];
|
||||
if (res.data.ageGroupsPercent) {
|
||||
console.log(PopulationRatio.value[0].progress);
|
||||
agename.forEach((key, index) => {
|
||||
if (PopulationRatio.value[index]) {
|
||||
PopulationRatio.value[index].progress =
|
||||
res.data.ageGroupsPercent[key];
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
@ -2935,6 +2983,7 @@ onMounted(() => {
|
|||
height: 120px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-top: 4px;
|
||||
|
||||
.progress-wrapper {
|
||||
display: flex;
|
||||
|
@ -3004,7 +3053,7 @@ onMounted(() => {
|
|||
}
|
||||
|
||||
span {
|
||||
top: 24px;
|
||||
top: 30px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3022,7 +3071,7 @@ onMounted(() => {
|
|||
position: absolute;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
width: 2px;
|
||||
width: 1px;
|
||||
height: 20px;
|
||||
}
|
||||
|
||||
|
@ -3030,7 +3079,7 @@ onMounted(() => {
|
|||
position: absolute;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
font-size: 18px;
|
||||
font-size: 14px;
|
||||
|
||||
&.above-line1 {
|
||||
top: -50px;
|
||||
|
@ -3044,7 +3093,7 @@ onMounted(() => {
|
|||
}
|
||||
|
||||
&.below-line2 {
|
||||
top: 40px !important ; //下面百分比
|
||||
top: 45px !important ; //下面百分比
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue