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

This commit is contained in:
姚宇浩 2024-07-29 13:06:58 +08:00
commit 703604fdb2
4 changed files with 297 additions and 283 deletions

View File

@ -1246,7 +1246,7 @@ const getData = async () => {
// data.salvageServices[key] = res.data.jzfw[key];
// });
data.salvageServices.jzrc = addThousandSeparator(res.data.jzfw.jzrc);
data.salvageServices.jzje = addThousandSeparator(res.data.jzfw.jzje) ;
data.salvageServices.jzje = addThousandSeparator(res.data.jzfw.jzje);
}
// &
const jysyKeys = ["xxzs", "xszs", "jzgzs"];
@ -1421,20 +1421,21 @@ const showEc = (val) => {
1411, 1232,
]; //
dataEc.times = [
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"29",
"30",
"01",
"02",
"03",
"04",
"05",
"06",
"07",
"08",
"09",
"10",
"28",
];
dialogShowEc.value = true;
break;
@ -1464,21 +1465,21 @@ const showTab = (val) => {
7574, 8647, 9515, 8974,
];
dataTab.times = [
"14",
"15",
"16",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"01",
"02",
"03",
"04",
"05",
"06",
"07",
"08",
"09",
"10",
];
dataTab.data = [
{
@ -1573,21 +1574,21 @@ const showTab = (val) => {
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",
"29",
"30",
"01",
"02",
"03",
"04",
"05",
"06",
"07",
"08",
"09",
"10",
];
dataTab.data = [
{

View File

@ -23,7 +23,7 @@
<el-table-column prop="xm" label="姓名" width="60" />
<el-table-column prop="dz" label="地址" />
<el-table-column prop="nl" label="年龄" />
<el-table-column prop="sfzhm" label="身份证号" />
<!-- <el-table-column prop="sfzhm" label="身份证号" /> -->
<el-table-column prop="bq" label="人口标签" />
</el-table>
<el-pagination
@ -116,7 +116,7 @@
<el-table-column prop="fullName" label="姓名" width="60" />
<el-table-column prop="address" label="地址" />
<el-table-column prop="age" label="年龄" />
<el-table-column prop="IDNumber" label="身份证号" />
<!-- <el-table-column prop="IDNumber" label="身份证号" /> -->
<el-table-column prop="PopulationLabel" label="人口标签" />
</el-table>
<el-pagination
@ -141,193 +141,7 @@ import http from "@/utils/request.js";
const data = reactive({
pagedData: [],
first: true,
tableData: [
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
],
// tableData1: [
// {
// SerialNumber: "01",
// SubsidyType: "",
// SubsidRecipients:
// "",
// SubsidyStandards: "330-1100/",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "02",
// SubsidyType: "",
// SubsidRecipients:
// " ",
// SubsidyStandards: "1714/",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "03",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards: "171.4/",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "04",
// SubsidyType: "",
// SubsidRecipients:
// "",
// SubsidyStandards: ",12",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "05",
// SubsidyType: "",
// SubsidRecipients:
// "",
// SubsidyStandards: "330//",
// ProcessingMethod:
// "",
// },
// {
// SerialNumber: "06",
// SubsidyType: "",
// SubsidRecipients:
// "",
// SubsidyStandards: "3000//",
// ProcessingMethod: "10",
// },
// {
// SerialNumber: "07",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards: "3%",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "08",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards: "150//",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "09",
// SubsidyType: "",
// SubsidRecipients:
// "",
// SubsidyStandards:
// "15000/;C7500/D22500/",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "10",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards: "1510/·",
// ProcessingMethod: "线",
// },
// {
// SerialNumber: "11",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards: "",
// ProcessingMethod:
// "",
// },
// {
// SerialNumber: "12",
// SubsidyType: "",
// SubsidRecipients: "",
// SubsidyStandards:
// "660%80%70%900080%",
// ProcessingMethod:
// "6",
// },
// {
// SerialNumber: "13",
// SubsidyType: "",
// SubsidRecipients:
// "1.2.访访",
// SubsidyStandards:
// "350/51750175017501750",
// ProcessingMethod: "",
// },
// {
// SerialNumber: "14",
// SubsidyType: "",
// SubsidRecipients:
// "1.2.访访",
// SubsidyStandards:
// "5",
// ProcessingMethod: "",
// },
// ],
tableData: [],
tableData1: [
{
SerialNumber: "01",
@ -645,6 +459,55 @@ const data = reactive({
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
{
fullName: "王*",
address: "龙游县东华街道",
age: "13",
IDNumber: "330825****92022011",
PopulationLabel: "低保、 困难儿童",
},
],
});
//

View File

@ -1453,11 +1453,13 @@ const changeFwq = async (id, list, center, name, names) => {
fwq_list_arr.value.forEach((item, index) => {
map.removeOverlay(fwq_list_arr.value[index]); //
});
drawACircle("hide"); //
} else {
await getServiceCircle(names, name);
choose.value.fwq = id;
map.clearOverlays(); //
choose.value.person=''
addggfwq(); //
setTimeout(() => {
goMapCenter(center, 16); //
@ -2208,7 +2210,7 @@ const updateFwqList = (data, townName, communityName) => {
(item) => item.xzjd === townName && item.csq === communityName
)
.map((item) => ({
x: 33,
x: 53,
y: 0,
img: fwqbg1,
img2: b2,
@ -2964,6 +2966,7 @@ onMounted(() => {
}
.zyys {
margin-top: 25px;
.zyys_content {
margin-top: 20px;
box-sizing: border-box;

View File

@ -3,22 +3,32 @@
<div class="displayFlex left_bg">
<div class="title">基本公共服务</div>
<div class="lineEnd"></div>
<div class="menuBar">
<div class="tabPosition" v-for="(item, index) in data.tabPosition">
<div class="tabPositionBox">
<div class="tabPositionBox" @click="toggleVisibility(item)">
<div class="img"><img :src="item.img" alt="" /></div>
<div class="tabsItem">
{{ item.name }}
</div>
</div>
<transition name="fade-scale">
<div v-show="item.visible">
<div
class="tabPositionminBox"
v-for="(item1, index1) in item.son"
:class="data.taps == item1.id ? 'tabPositionminBoxBgc' : ''"
@click="tapshow(index1)"
:class="
data.taps == item1.id && data.taps1 == item.id
? 'tabPositionminBoxBgc'
: ''
"
@click="tapshow(item.id, index1)"
>
{{ item1.name }}
</div>
</div>
</transition>
</div>
</div>
</div>
<div class="displayFlex right_bg">
<div class="formText">
@ -156,43 +166,126 @@ const goto = (url) => {
};
const data = reactive({
taps1: "6",
taps: "0",
taps1: "0",
tabPosition: [
{
id: "0",
name: "幼有所育",
img: icon1,
visible: false,
son: [
{
id: "0",
name: "优孕优生服务",
},
{
id: "1",
name: "儿童健康服务",
},
{
id: "2",
name: "儿童关爱服务",
},
],
},
{
id: "1",
name: "学有所教",
img: icon2,
visible: false,
son: [
{
id: "0",
name: "学前教育助学服务",
},
{
id: "1",
name: "义务教育服务",
},
{
id: "2",
name: "老有所得",
name: "普通高中助学服务",
},
{
id: "3",
name: "中等职业教育助学服务",
},
],
},
{
id: "2",
name: "劳有所得",
img: icon3,
visible: false,
son: [
{
id: "0",
name: "就业创业服务",
},
{
id: "1",
name: "工伤失业保险服务",
},
],
},
{
id: "3",
name: "病有所医",
img: icon4,
visible: false,
son: [
{
id: "0",
name: "公共卫生服务",
},
{
id: "1",
name: "医疗保险服务",
},
{
id: "2",
name: "计划生育扶助服务",
},
],
},
{
id: "4",
name: "老有所养",
img: icon5,
visible: false,
son: [
{
id: "0",
name: "养老助老服务",
},
{
id: "1",
name: "养老保险服务",
},
],
},
{
id: "5",
name: "住有所居",
img: icon6,
visible: false,
son: [
{
id: "0",
name: "公租房服务",
},
{
id: "1",
name: "住房改造服务",
},
],
},
{
id: "6",
name: "弱有所扶",
img: icon7,
visible: true,
son: [
{
id: "0",
@ -200,37 +293,73 @@ const data = reactive({
},
{
id: "1",
name: "公共法律服务",
name: "法律援助服务",
},
{
id: "2",
name: "扶残助残服务",
},
{
id: "3",
name: "儿童健康服务",
},
],
},
{
id: "7",
name: "军有所",
name: "军有所",
img: icon8,
visible: false,
son: [
{
id: "0",
name: "优军优抚服务",
},
],
},
{
id: "8",
name: "文有所化",
img: icon9,
visible: false,
son: [
{
id: "0",
name: "公共文化服务",
},
],
},
{
id: "9",
name: "体有所育",
img: icon10,
visible: false,
son: [
{
id: "0",
name: "公共体育服务",
},
],
},
{
id: "10",
name: "事有所便",
img: icon11,
visible: false,
son: [
{
id: "0",
name: "生活便利服务",
},
{
id: "1",
name: "生活安全服务",
},
{
id: "2",
name: "生活环境服务",
},
{
id: "3",
name: "殡葬公共服务",
},
],
},
],
tableData: [
@ -255,7 +384,7 @@ const data = reactive({
targetValue6: "县医保局",
},
{
highFrequencyApp: "困难群众医疗费用综合保障率(%%)",
highFrequencyApp: "困难群众医疗费用综合保障率(%)",
targetValue: ">83",
targetValue1: ">83",
targetValue2: "86.59(1-5月)",
@ -314,10 +443,18 @@ const data = reactive({
],
});
const tapshow = (val) => {
// console.log(val);
data.taps = val;
const tapshow = (parentId, childId) => {
// data.taps1 = parentId;
// data.taps = childId;
};
const toggleVisibility = (val) => {
data.tabPosition.forEach((parent) => {
if (parent.id === val.id) {
parent.visible = !parent.visible;
}
});
};
//
const tableHeaderColor = (arg) => {
return {
@ -378,6 +515,14 @@ const rowState = (row) => {
border-bottom: 1px dashed #fff;
margin: 17px 0;
}
.menuBar::-webkit-scrollbar {
display: none; /* Chrome Safari */
}
.menuBar {
height: 100vh;
overflow-y: auto;
}
.tabPosition {
display: flex;
flex-direction: column;
@ -385,14 +530,13 @@ const rowState = (row) => {
font-size: 22px;
font-weight: 500;
letter-spacing: 1px;
img {
}
.tabPosition img {
width: 18px;
height: 18px;
margin-right: 10px;
vertical-align: middle;
}
.tabPositionBox {
display: flex;
align-items: center;
@ -400,24 +544,30 @@ const rowState = (row) => {
cursor: pointer;
}
.tabPositionminBox {
font-size: 18px;
display: flex;
align-items: center;
justify-content: center;
width: 200px;
height: 50px;
border-radius: 4px;
cursor: pointer;
// opacity: 0.45;
}
.tabPositionminBoxBgc {
background: rgba(73, 121, 191);
}
.fade-scale-enter-active,
.fade-scale-leave-active {
transition: opacity 0.5s ease;
}
.fade-scale-enter,
.fade-scale-leave-to {
opacity: 0;
}
}
.left_bg {
// width: 642px;
width: 230px;
width: 270px;
height: 943px;
box-sizing: border-box;
padding: 19px 17px;
@ -593,14 +743,11 @@ const rowState = (row) => {
border: none !important;
padding-left: 10px !important;
}
}
:deep(.el-table td.el-table__cell) {
padding: 12px 0px;
}
:deep(.el-table--enable-row-hover .el-table__body tr:hover > td) {
background-color: #2f4b74;
}