Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
姚宇浩 2024-05-27 15:20:39 +08:00
commit 472c64bedb
1 changed files with 30 additions and 15 deletions

View File

@ -72,12 +72,12 @@
</div>
<div class="rolling">
<div
v-for="(item, index) in 20"
v-for="(item, index) in data.lifeAssistance.subsidyInformation"
:key="index"
class="fundingContent"
>
<span class="spot">城乡居民最低生活保障金</span>
<span class="spot">99,126,474</span>
<span class="spot">{{ item.btsx }}</span>
<span class="spot">{{ item.btje }}</span>
<!-- <span class="spot">70.88</span> -->
</div>
</div>
@ -131,23 +131,23 @@
</div>
<div class="czrBox">
<div class="situation situation2"></div>
</div>
<div class="czrBox">
<div class="situation situation3"></div>
<div class="column">
<div v-for="item in data.diversification.hszhxms">
发起单位: {{ item.fqdw }}
<br>
项目名称: {{item.xmmc}}
<br>
<br />
项目名称: {{ item.xmmc }}
<br />
公众筹款金额(): {{ item.gzzcje }}
<br>
<br />
捐赠支出金额: {{ item.jzzcje }}
<br>
<br />
捐赠人次: {{ item.jzrc }}
</div>
</div>
</div>
<div class="czrBox">
<div class="situation situation3"></div>
</div>
</div>
</div>
<!-- <eBubble></eBubble> -->
@ -226,21 +226,35 @@ const data = reactive({
],
}, //
});
//
const addThousandSeparator = (numberString) => {
return parseInt(numberString.trim(), 10).toLocaleString("en-US");
};
const getData = async () => {
await http.get("/api/ggfwyth/succour").then((res) => {
if (res.code == 200) {
console.log(res.data);
//
// data.education.data[0] = res.data.specialAssistance.education.data[0];
// &&
data.education.data = res.data.specialAssistance.education.data;
data.education.year = res.data.specialAssistance.education.year;
// &&
data.housing.data = res.data.specialAssistance.housing.data;
data.housing.year = res.data.specialAssistance.housing.year;
//
//
//
data.lifeAssistance.subsidyInformation =
res.data.lifeAssistance.subsidyInformation;
res.data.lifeAssistance.subsidyInformation.forEach((item, index) => {
data.lifeAssistance.subsidyInformation[index].btje =
addThousandSeparator(item.btje);
});
//
// &&
//
data.diversification.hszhxms = res.data.diversification.hszhxms;
}
});
};
@ -768,8 +782,8 @@ onBeforeMount(() => {
.czr-bj {
width: 529px;
// height: 350px;
// height: calc(100% - 26px);
// height: 200px;
background: rgba(0, 103, 165, 0.18);
box-shadow: inset 0px 0px 58px 0px rgba(37, 175, 252, 0.47);
border-radius: 2px;
@ -800,12 +814,13 @@ onBeforeMount(() => {
}
.situation2 {
background-image: url(@/assets/images/work/dyh1.png);
background-image: url(@/assets/images/work/dyh2.png);
}
.situation3 {
background-image: url(@/assets/images/work/dyh2.png);
background-image: url(@/assets/images/work/dyh1.png);
}
}
.school {
display: flex;