Compare commits

..

3 Commits

Author SHA1 Message Date
duanxiaohai 0f25cc3dc7 gx 2024-08-01 10:38:43 +08:00
duanxiaohai 70b6a43dc2 Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc 2024-08-01 10:35:47 +08:00
duanxiaohai 6155e8a108 gx 2024-08-01 10:35:42 +08:00
1 changed files with 55 additions and 6 deletions

View File

@ -1219,6 +1219,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];
}
});
}
} }
}); });
}; };
@ -1277,6 +1302,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];
}
});
}
} }
}); });
}; };
@ -2642,9 +2690,9 @@ onMounted(() => {
color: #6bfeff; color: #6bfeff;
text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5); text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
} }
.content_item_value { // .content_item_value {
// display: flex; // // display: flex;
} // }
.choose { .choose {
background-image: url(@/assets/images/map/choose.png) !important; background-image: url(@/assets/images/map/choose.png) !important;
@ -2937,6 +2985,7 @@ onMounted(() => {
height: 120px; height: 120px;
display: flex; display: flex;
align-items: center; align-items: center;
margin-top: 4px;
.progress-wrapper { .progress-wrapper {
display: flex; display: flex;
@ -3006,7 +3055,7 @@ onMounted(() => {
} }
span { span {
top: 24px; top: 26px;
} }
} }
} }
@ -3024,7 +3073,7 @@ onMounted(() => {
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
width: 2px; width: 1px;
height: 20px; height: 20px;
} }
@ -3032,7 +3081,7 @@ onMounted(() => {
position: absolute; position: absolute;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
font-size: 18px; font-size: 14px;
&.above-line1 { &.above-line1 {
top: -50px; top: -50px;