Compare commits

..

No commits in common. "c020728959db135f8f6bb6158ecc50bb390eed2e" and "04f2a0ff543dcaaa95fd3b015f2889987c9ffe88" have entirely different histories.

4 changed files with 104 additions and 184 deletions

View File

@ -1368,7 +1368,6 @@ const getTableTab = (url, currentPage) => {
.then((res) => {
if (res.code == 200) {
dataTab.data = res.data;
console.log(res.data);
pagination.total = res.count;
dialogShowTab.value = true;
}
@ -1415,9 +1414,10 @@ const showEc = (val) => {
]; //
dataEc.list2 = [
695, 892, 1265, 1178, 1246, 1206, 1361, 1323, 1231, 893, 1032, 1196,
1411, 1232, 1232,
1411, 1232,
]; //
dataEc.times = [
"14",
"15",
"16",
"17",
@ -1432,7 +1432,6 @@ const showEc = (val) => {
"26",
"27",
"28",
"29",
];
dialogShowEc.value = true;
break;
@ -1457,33 +1456,27 @@ const showTab = (val) => {
dataTab.data = [];
switch (val) {
case "公共汽车":
// dataTab.list1 = [
// 8616, 9616, 10360, 10206, 8970, 10442, 9988, 9487, 8380, 8371, 7984,
// 7574, 8647, 9515, 8974,
// ];
// dataTab.times = [
// "14",
// "15",
// "16",
// "17",
// "18",
// "19",
// "20",
// "21",
// "22",
// "23",
// "24",
// "25",
// "26",
// "27",
// "28",
// ];
http.get(`/api/ggfwyth/bus`).then((res) => {
if (res.code == 200) {
dataTab.list1 = res.data.data;
dataTab.times = res.data.times;
}
});
dataTab.list1 = [
8616, 9616, 10360, 10206, 8970, 10442, 9988, 9487, 8380, 8371, 7984,
7574, 8647, 9515, 8974,
];
dataTab.times = [
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
];
dataTab.data = [
{
cc: "201A",
@ -1573,32 +1566,26 @@ const showTab = (val) => {
dialogShowTab.value = true;
break;
case "长途汽车":
http.get(`/api/ggfwyth/longDistanceBus`).then((res) => {
if (res.code == 200) {
dataTab.list1 = res.data.data;
dataTab.times = res.data.times;
}
});
// dataTab.list1 = [
// 97, 57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43,
// ];
// dataTab.times = [
// "14",
// "15",
// "16",
// "17",
// "18",
// "19",
// "20",
// "21",
// "22",
// "23",
// "24",
// "25",
// "26",
// "27",
// "28",
// ];
dataTab.list1 = [
97, 57, 37, 46, 46, 54, 40, 46, 37, 48, 39, 48, 48, 31, 43,
];
dataTab.times = [
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
];
dataTab.data = [
{
cc: "303",

View File

@ -541,7 +541,7 @@ const handleCurrentChange = (val) => {
const handlePagination = (current) => {
// console.log(current,"page1");
pagination.currentPage = current;
getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage);
getTable("/api/ggfwyth/ysyzt/lyxsdbrymd", pagination.currentPage);
};
//
const tableHeaderColor = (arg) => {
@ -593,7 +593,7 @@ const getTable = async (url, currentPage) => {
};
onMounted(() => {
getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage);
getTable("/api/ggfwyth/ysyzt/lyxsdbrymd", pagination.currentPage);
handleCurrentChange(1);
});
</script>

View File

@ -1097,6 +1097,7 @@ const getData = async (i, e) => {
"100nlPercent",
];
if (res.data.ageGroupsPercent) {
console.log(PopulationRatio.value[0].progress);
agename.forEach((key, index) => {
if (PopulationRatio.value[index]) {
PopulationRatio.value[index].progress =
@ -1227,6 +1228,7 @@ const getDatas = async (e, i) => {
"100nlPercent",
];
if (res.data.ageGroupsPercent) {
console.log(PopulationRatio.value[0].progress);
agename.forEach((key, index) => {
if (PopulationRatio.value[index]) {
PopulationRatio.value[index].progress =
@ -1308,6 +1310,7 @@ const getDatas2 = async (e, i, cs) => {
"100nlPercent",
];
if (res.data.ageGroupsPercent) {
console.log(PopulationRatio.value[0].progress);
agename.forEach((key, index) => {
if (PopulationRatio.value[index]) {
PopulationRatio.value[index].progress =

View File

@ -27,7 +27,7 @@
? 'tabPositionminBoxBgc'
: ''
"
@click="tapshow(item, index1)"
@click="tapshow(item.id, index1)"
>
{{ item1.name }}
</div>
@ -107,7 +107,7 @@
<i></i>
</div>
</div>
<div class="tableBox" v-if="data.tabPublicService.length > 0">
<div class="tableBox">
<div
class="tableBoxTop"
:style="{ backgroundImage: 'url(' + item.Bj + ')' }"
@ -120,7 +120,7 @@
</div>
<div
class="tableBoxCenter1"
@click="goto('/home/index/table/details', item)"
@click="goto('/home/index/table/details')"
>
详情
</div>
@ -136,9 +136,6 @@
</div>
</div>
</div>
<template v-else>
<el-empty description="无数据" />
</template>
</div>
</div>
</div>
@ -165,22 +162,26 @@ import Bj3 from "@/assets/sy-table/sy-table5.png";
import Bj4 from "@/assets/sy-table/sy-table6.png";
import { useRouter, useRoute } from "vue-router";
import http from "@/utils/request.js";
import { ElMessage } from "element-plus";
import tools from "@/utils/tools";
// onMounted(() => {
// let token = tools.data.get("token");
// // console.log(token, "token");
// if (token == null) {
// ElMessage.error("!");
// window.location.href =
// "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
// }
// });
const router = useRouter();
const routers = useRoute();
//
const goto = (url, val) => {
console.log(val);
if (val.name == "最低生活保障") {
router.push({
path: `${url}`,
});
} else {
ElMessage.warning(`${val.name}暂无无数据!`);
}
const goto = (url) => {
router.push({
path: `${url}`,
});
};
const data = reactive({
@ -423,55 +424,50 @@ const data = reactive({
},
],
tabPublicService: [
// {
// id: "0",
// Bj: Bj,
// name: "",
// text: "7374946320239912.65",
// progress: 95, //
// },
// {
// id: "1",
// name: "",
// Bj: Bj1,
// text: "3293312023722.29",
// progress: 95, //
// },
// {
// id: "2",
// name: "",
// Bj: Bj2,
// text: "",
// progress: 95, //
// },
// {
// id: "3",
// name: "",
// Bj: Bj3,
// text: "20236091036225.39",
// progress: 95, //
// },
// {
// id: "4",
// name: "",
// Bj: Bj4,
// text: "(2019)",
// progress: 95, //
// },
{
id: "0",
name: "最低生活保障",
Bj: Bj,
text: "我县在册低保对象7374户9463人为低保对象发放最低生活保障金2023年共支出低保金9912.65万元。",
progress: 95, //
},
{
id: "1",
name: "重特困人员救助供养",
Bj: Bj1,
text: "我县特困供养对象329户331人2023年支出特困供养经费722.29万元。",
progress: 95, //
},
{
id: "2",
name: "医疗救助",
Bj: Bj2,
text: "我县医疗救助的对象为民攻部门认定的特困供养人员最低生活保障家庭成员、最低生活保障边缘家庭成员(包括纳入低保、低边的因病致贫等支出型贫困对象)。",
progress: 95, //
},
{
id: "3",
name: "临时救助",
Bj: Bj3,
text: "为数助对象发放临时救助金2023年共救助609户1036人数助225.39万元。",
progress: 95, //
},
{
id: "4",
name: "受灾人员救助",
Bj: Bj4,
text: "机构改革以来(2019年),我县自然灾害形势总体平稳,未发生因灾亡人事故。",
progress: 95, //
},
],
Bj: [Bj, Bj1, Bj2, Bj3, Bj4],
});
const tapshow = (parentId, childId) => {
// console.log(parentId, childId, "");
data.taps1 = parentId.id;
data.taps = childId;
getData(parentId.name, parentId.son[childId].name);
// data.taps1 = parentId;
// data.taps = childId;
};
const toggleVisibility = (val) => {
// console.log(val, "");
data.tabPosition.forEach((parent) => {
parent.visible = false;
if (parent.id === val.id) {
parent.visible = !parent.visible;
}
@ -512,39 +508,6 @@ const rowState = (row) => {
};
}
};
const getData = async (name, fullName) => {
await http
.get(`/api/ggfwyth/pg/jbggfw?mc=${name}&xm=${fullName}`)
.then((res) => {
if (res.code == 200) {
data.tabPublicService = [];
if (res.data.length > 0) {
res.data.forEach((item, index) => {
const imageIndex = index % data.Bj.length;
data.tabPublicService.push({
id: index,
Bj: data.Bj[imageIndex],
name: item.sx,
text: item.bmfxqk,
progress: item.xh,
});
});
}
}
});
};
onMounted(() => {
getData("弱有所扶", "社会救助服务");
});
// onMounted(() => {
// let token = tools.data.get("token");
// if (token == null) {
// ElMessage.error("!");
// window.location.href =
// "http://220.191.238.50:996/api/login?returnURL=" + window.location.href;
// }
// });
</script>
<style lang="scss" scoped>
@ -621,7 +584,6 @@ onMounted(() => {
height: 50px;
background-color: #032862;
white-space: nowrap;
cursor: pointer;
}
.tabPositionminBox::before {
content: "";
@ -672,13 +634,11 @@ onMounted(() => {
.tableBox {
display: flex;
flex-wrap: wrap;
height: 460px;
overflow-y: auto;
:nth-child(3n).tableBoxTop {
margin-right: 0px;
}
.tableBoxTop {
width: 517px;
width: 510px;
height: 210px;
background-repeat: no-repeat;
background-size: 100% 100%;
@ -698,8 +658,7 @@ onMounted(() => {
}
.tableBoxTopa {
width: 470px;
height: 124px;
// background-color: pink;
// height: 90px;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
font-size: 22px;
@ -708,10 +667,6 @@ onMounted(() => {
text-align: left;
font-style: normal;
margin-top: 10px;
overflow-y: auto;
}
.tableBoxTopa::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
.progress-container {
position: absolute;
@ -766,31 +721,6 @@ onMounted(() => {
cursor: pointer;
}
}
// .tableBox::-webkit-scrollbar {
// display: none; /* Chrome Safari */
// }
/* 自定义整个滚动条 */
::-webkit-scrollbar {
width: 8px; /* 设置滚动条的宽度 */
}
/* 自定义滚动条轨道 */
::-webkit-scrollbar-track {
background: rgba(255, 255, 255, 0.2); /* 设置轨道的背景颜色 */
border-radius: 4px;
}
/* 自定义滚动条的滑块thumb */
::-webkit-scrollbar-thumb {
background: rgba(26, 161, 255, 0.4); /* 设置滑块的背景颜色 */
border-radius: 4px;
}
/* 当滑块悬停或活动时自定义滚动条的滑块 */
::-webkit-scrollbar-thumb:hover {
background: #555; /* 设置滑块在悬停状态下的背景颜色 */
border-radius: 4px;
}
}
}
.backgroundVirtual {