xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gxgetDatas2

This commit is contained in:
姚宇浩 2024-08-05 16:54:56 +08:00
parent 1d54b1c526
commit 4ad9d7b311
3 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/view/person/index.vue
View File

@ -35,7 +35,8 @@
<div class="my-info-label">居住状态</div> <div class="my-info-label">居住状态</div>
<div class="my-info-content"> <div class="my-info-content">
<p v-if="baseInfo.jzzt == 1">居住</p> <p v-if="baseInfo.jzzt == 1">居住</p>
<p v-else>未居住</p> <p v-else-if="baseInfo.jzzt == 0">未居住</p>
<p v-else></p>
</div> </div>
</div> </div>
<div class="my-info-item"> <div class="my-info-item">
@ -424,39 +425,42 @@ const getData = (nm, identNo) => {
} }
}); });
}; };
const getData2 = (nm, identNo) => { // const getData2 = (nm, identNo) => {
http // http
.get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`) // .get(`/api/ggfwyth/pg/lyxsdbrymdDetails?xm=${nm}&sfzhm=${identNo}`)
.then((res) => { // .then((res) => {
if (res.code == 200) { // if (res.code == 200) {
baseInfo.value = res.data; // baseInfo.value = res.data;
// dataMyTag.myTag.map((item) => { // // dataMyTag.myTag.map((item) => {
// if (res.data[item.jkName]) { // // if (res.data[item.jkName]) {
// item.show = Number(res.data[item.jkName]); // // item.show = Number(res.data[item.jkName]);
// } // // }
// }); // // });
if(res.data.yljlx){ // if(res.data.yljlx){
data.value=[ // data.value=[
{ // {
type:res.data.yljlx, // type:res.data.yljlx,
date:res.data.yljffrq, // date:res.data.yljffrq,
sum:res.data.yljffje // sum:res.data.yljffje
} // }
] // ]
}else{ // }else{
data.value=[] // data.value=[]
} // }
// console.log(dataMyTag.myTag, 555); // // console.log(dataMyTag.myTag, 555);
} // }
}); // });
}; // };
onMounted(() => { onMounted(() => {
// console.log(routers.query); // console.log(routers.query);
if(routers.query.type == 'map'){ if(routers.query.type == 'map'){
getData(routers.query.nm, routers.query.identNo); getData(routers.query.nm, routers.query.identNo);
}else{ }else{
getData2(routers.query.nm, routers.query.identNo); // getData2(routers.query.nm, routers.query.identNo);
baseInfo.value.nm=routers.query.nm;
baseInfo.value.dz=routers.query.dz;
baseInfo.value.identNo=routers.query.identNo;
} }
}); });

2
src/view/sy_details.vue
View File

@ -599,7 +599,7 @@ const handleRowClick = (row, column, event) => {
console.log(row); console.log(row);
router.push({ router.push({
path: `/home/index/person`, path: `/home/index/person`,
query: { nm: row.xm, identNo: row.sfzhm, type: "detail" }, query: { nm: row.xm, identNo: row.sfzhm, dz: row.dz, type: "detail" },
}); });
}; };
onMounted(() => { onMounted(() => {

53
src/view/sy_mapcopy.vue
View File

@ -47,7 +47,7 @@
'below-line2': index % 2 === 0, 'below-line2': index % 2 === 0,
}, },
]" ]"
>{{ (item.progress).toFixed(2) + "%" }}</span >{{ item.progress.toFixed(2) + "%" }}</span
> >
<span <span
style="color: #fff; white-space: nowrap" style="color: #fff; white-space: nowrap"
@ -111,7 +111,7 @@
<div class="right" style="width: 517px"> <div class="right" style="width: 517px">
<div class="jbggfwq"> <div class="jbggfwq">
<div class="title"> <div class="title">
<div class="title_name" ><span> 基本公共服务圈</span></div> <div class="title_name"><span> 基本公共服务圈</span></div>
</div> </div>
<div class="jbggfwq_content"> <div class="jbggfwq_content">
<div <div
@ -160,10 +160,10 @@
@close="close" @close="close"
@handle="handlePagination" @handle="handlePagination"
> >
<template #jzzt="{ currentCol, currentData }"> <template #jzzt="{ currentCol, currentData }">
<div v-if="currentData.jzzt==1">居住</div> <div v-if="currentData.jzzt == 1">居住</div>
<div v-else>未居住</div> <div v-else>未居住</div>
</template> </template>
</Dialog> </Dialog>
</teleport> </teleport>
</div> </div>
@ -239,7 +239,7 @@ const cfJd = ref("");
//存放村社 //存放村社
const cfCs = ref(""); const cfCs = ref("");
//点击存放村社暂时 //点击存放村社暂时
const cfCsZs=ref('') const cfCsZs = ref("");
//地图 //地图
var map = null; var map = null;
//默认龙游县灰色地块 //默认龙游县灰色地块
@ -970,7 +970,7 @@ const tableType = reactive({
{ {
label: "居住状态", label: "居住状态",
property: "jzzt", property: "jzzt",
type:'slot' type: "slot",
}, },
{ {
label: "民族", label: "民族",
@ -986,9 +986,7 @@ const tableType = reactive({
width: "300px", width: "300px",
}, },
], ],
data: [ data: [],
],
}); });
// 表格分页 // 表格分页
const pagination = reactive({ const pagination = reactive({
@ -1032,7 +1030,7 @@ const clear = () => {
title_cs.value = ""; title_cs.value = "";
cfJd.value = ""; cfJd.value = "";
cfCs.value = ""; cfCs.value = "";
cfCsZs.value=''; cfCsZs.value = "";
cs_un_choose_arr.value.forEach((item, index) => { cs_un_choose_arr.value.forEach((item, index) => {
map.removeOverlay(cs_un_choose_arr.value[index]); map.removeOverlay(cs_un_choose_arr.value[index]);
}); });
@ -1274,8 +1272,7 @@ const getDatas = async (e, i) => {
cs_dd_arr.value.forEach((item, index) => { cs_dd_arr.value.forEach((item, index) => {
map.removeOverlay(cs_dd_arr.value[index]); map.removeOverlay(cs_dd_arr.value[index]);
}); });
cs_dd_arr.value = [...xuanzhongCs.value]; cs_dd_arr.value = [...xuanzhongCs.value];
cs_dd_arr.value.map((item, index) => { cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index); DGcreateCs2(item, index);
@ -1751,8 +1748,6 @@ const open_detail = () => {
person_detail(age); person_detail(age);
dialogShow.value = true; dialogShow.value = true;
} }
}; };
const close = () => { const close = () => {
dialogShow.value = false; dialogShow.value = false;
@ -1779,11 +1774,13 @@ const person_detail = (age) => {
.get( .get(
`/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${ `/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${
pagination.pageSize pagination.pageSize
}&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${cfJd.value || ""}` }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${
cfJd.value || ""
}`
) )
.then((res) => { .then((res) => {
if (res.code == 200) { if (res.code == 200) {
tableType.data=res.data; tableType.data = res.data;
pagination.total = res.count; pagination.total = res.count;
} }
}); });
@ -2390,7 +2387,12 @@ const addPolygonCountyCs = () => {
// getDataBqs(cfJd.value, cfCs.value); // getDataBqs(cfJd.value, cfCs.value);
} }
//这段注意 //这段注意
getDatas2(cfJd.value, choose.value.person, cfCs.value); if (choose.value.person == 1) {
getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
} else {
getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);
}
// getDatas2(cfJd.value, choose.value.person, cfCs.value);
addCsChoose(); addCsChoose();
addCsUnChoose(); addCsUnChoose();
// if (choose.value.person == "") { // if (choose.value.person == "") {
@ -2470,7 +2472,7 @@ const addCsUnChoose = () => {
cs_dd_arr.value.push(a); cs_dd_arr.value.push(a);
xuanzhongCs.value.push(a); xuanzhongCs.value.push(a);
} }
}); });
xkzDk.forEach((itemm, indexx) => { xkzDk.forEach((itemm, indexx) => {
if (itemm.name == item.name) { if (itemm.name == item.name) {
chooseCsList.value.push(itemm); chooseCsList.value.push(itemm);
@ -2483,7 +2485,12 @@ const addCsUnChoose = () => {
// }); // });
// getDataBqs(cfJd.value, cfCs.value); // getDataBqs(cfJd.value, cfCs.value);
getDataBq(cfJd.value, cfCs.value); getDataBq(cfJd.value, cfCs.value);
getDatas2(cfJd.value, choose.value.person, cfCs.value); if (choose.value.person == 1) {
getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
} else {
getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);
}
// getDatas2(cfJd.value, choose.value.person, cfCs.value);
// if ( // if (
// choose.value.person == "cjr" || // choose.value.person == "cjr" ||
// choose.value.person == "dibian" || // choose.value.person == "dibian" ||
@ -2668,7 +2675,7 @@ const createCs2 = (polygon, indexx) => {
}); });
map.addOverlay(cs_number_name_arr.value[indexx]); map.addOverlay(cs_number_name_arr.value[indexx]);
cs_number_name_arr.value[indexx].addEventListener("click", () => { cs_number_name_arr.value[indexx].addEventListener("click", () => {
cfCsZs.value=polygon.name; cfCsZs.value = polygon.name;
if ( if (
choose.value.person == "cjr" || choose.value.person == "cjr" ||
choose.value.person == "dibian" || choose.value.person == "dibian" ||
@ -2819,7 +2826,7 @@ const DGcreateCs2 = (polygon, indexx) => {
map.addOverlay(cs_dd_arr.value[indexx]); map.addOverlay(cs_dd_arr.value[indexx]);
cs_dd_arr.value[indexx].addEventListener("click", () => { cs_dd_arr.value[indexx].addEventListener("click", () => {
console.log(cfJd.value, polygon.name); console.log(cfJd.value, polygon.name);
cfCsZs.value=polygon.name; cfCsZs.value = polygon.name;
if ( if (
choose.value.person == "cjr" || choose.value.person == "cjr" ||
choose.value.person == "dibian" || choose.value.person == "dibian" ||