From a6f16fd8ec6c27e4c065039d46300de1c5bb1f7a Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 2 Aug 2024 15:55:35 +0800
Subject: [PATCH] gx

---
 src/view/dialog/dialogMapDp.vue |   1 +
 src/view/person/index.vue       |  54 ++++++++++++-----
 src/view/sy_mapcopy.vue         | 101 ++++++++++++++++++++++++--------
 3 files changed, 117 insertions(+), 39 deletions(-)

diff --git a/src/view/dialog/dialogMapDp.vue b/src/view/dialog/dialogMapDp.vue
index 2b79948..bb01be5 100644
--- a/src/view/dialog/dialogMapDp.vue
+++ b/src/view/dialog/dialogMapDp.vue
@@ -152,6 +152,7 @@ const handleRowClick = (row, column, event) => {
   console.log(row);
   router.push({
     path: `/home/index/person`,
+    query: {nm: row.nm, identNo: row.identNo },
   });
 };
 // 详情弹框
diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 205c6cd..8c7c5db 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -12,49 +12,50 @@
                     <div class="my-info-item">
                         <div class="my-info-label ">姓&emsp;&emsp;名</div>
                         <div class="my-info-content">
-                            <p>王一</p>
+                            <p>{{baseInfo.nm}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label">证件类型</div>
                         <div class="my-info-content">
-                            <p>身份证</p>
+                            <p>{{baseInfo.zjlx || '身份证'}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label">证件号码</div>
                         <div class="my-info-content">
-                            <p>330223********5665</p>
+                            <p>{{baseInfo.identNo}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label">政治面貌</div>
                         <div class="my-info-content">
-                            <p>党员</p>
+                            <p>{{baseInfo.zzmm || ''}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label">居住状态</div>
                         <div class="my-info-content">
-                            <p>居住</p>
+                            <p v-if="baseInfo.jzzt == 1">居住</p>
+                            <p v-else>未居住</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label ">民&emsp;&emsp;族</div>
                         <div class="my-info-content">
-                            <p>汉</p>
+                            <p>{{baseInfo.ethnic}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label ">性&emsp;&emsp;别</div>
                         <div class="my-info-content">
-                            <p>男</p>
+                            <p>{{baseInfo.gender}}</p>
                         </div>
                     </div>
                     <div class="my-info-item">
                         <div class="my-info-label">户口登记地</div>
                         <div class="my-info-content">
-                            <p>浙江省衢州市龙游县*******王村</p>
+                            <p>{{baseInfo.domicAddr}}</p>
                         </div>
                     </div>
                 </div>
@@ -146,8 +147,12 @@
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,onMounted } from 'vue'
 import Dialog from "@/view/dialog/dialog.vue";
+import { useRouter, useRoute } from "vue-router";
+import http from "@/utils/request.js";
+const router = useRouter();
+const routers = useRoute();
 const data = ref([
     {
         type: '基础养老金',
@@ -180,6 +185,9 @@ const pagination = reactive({
 const handleTableChange = (pagination) => {
     console.log(pagination)
 }
+const baseInfo=ref({
+   
+})
 const data1 = ref([
     {
         type: '职工医疗',
@@ -245,7 +253,23 @@ const close = (pagination) => {
 const handlePagination = (pagination) => {
     dialogShow.value = false
 }
-
+const getData =(nm,identNo)=>{
+      http
+    .get(
+      `/api/ggfwyth/ysyzt/getRysmzqDetails?nm=${nm}&identNo=${
+        identNo
+      }`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        baseInfo.value=res.data;
+      }
+    });
+}
+onMounted(()=>{
+    // console.log(routers.query);
+    getData(routers.query.nm,routers.query.identNo)
+})
 </script>
 
 <style lang="scss" scoped>
@@ -480,12 +504,12 @@ const handlePagination = (pagination) => {
             margin-bottom: 20px;
             cursor: pointer;
 
-            &:hover {
-                background: rgba(0, 158, 255, 0.38);
-                box-shadow: inset 0px 0px 11px 0px rgba(255, 255, 255, 0.5);
-            }
+            // &:hover {
+            //     background: rgba(0, 158, 255, 0.38);
+            //     box-shadow: inset 0px 0px 11px 0px rgba(255, 255, 255, 0.5);
+            // }
         }
-
+            
         .my-tag-item_active {
             background: rgba(0, 158, 255, 0.38);
             box-shadow: inset 0px 0px 11px 0px rgba(255, 255, 255, 0.5);
diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue
index 8a1b835..c0618a4 100644
--- a/src/view/sy_mapcopy.vue
+++ b/src/view/sy_mapcopy.vue
@@ -160,6 +160,10 @@
         @close="close"
         @handle="handlePagination"
       >
+      <template #jzzt="{ currentCol, currentData }">
+        <div v-if="currentData.jzzt==1">居住</div>
+        <div v-else>未居住</div>
+      </template>
       </Dialog>
     </teleport>
   </div>
@@ -951,48 +955,41 @@ const tableType = reactive({
   columns: [
     {
       label: "姓名",
-      property: "xm",
+      property: "nm",
     },
     {
       label: "手机号",
-      property: "phone",
+      property: "tel",
     },
     // {
     //   label: "证件号码",
     //   property: "zy",
     // },
-    {
-      label: "政治面貌",
-      property: "zzmm",
-    },
+    // {
+    //   label: "政治面貌",
+    //   property: "zzmm",
+    // },
     {
       label: "居住状态",
       property: "jzzt",
+      type:'slot'
     },
     {
       label: "民族",
-      property: "mz",
+      property: "ethnic",
     },
     {
       label: "性别",
-      property: "xb",
+      property: "gender",
     },
     {
       label: "户口登记地",
-      property: "hkdjd",
-      width: "200px",
+      property: "domicAddr",
+      width: "300px",
     },
   ],
   data: [
-    {
-      xm: "张三",
-      phone: "123456789012345678",
-      zzmm: "党员",
-      jzzt: "未居住",
-      mz: "汉族",
-      xb: "男",
-      hkdjd: "浙江省杭州市西湖区",
-    },
+ 
   ],
 });
 // 表格分页
@@ -1739,6 +1736,17 @@ const to_jd = (item_name) => {
 };
 //详情
 const open_detail = () => {
+  let age = "";
+  if (choose.value.person == "9999") {
+    age = "";
+  } else if (choose.value.person == "6666") {
+    age = "";
+  } else if (choose.value.person == 1) {
+    age = "0";
+  } else {
+    age = choose.value.person - 1;
+  }
+  person_detail(age);
   dialogShow.value = true;
 };
 const close = () => {
@@ -1748,10 +1756,33 @@ const close = () => {
 //表格分页
 const handlePagination = (current) => {
   pagination.currentPage = current;
-  getTable(tableType.url, pagination.currentPage);
+  let age = "";
+  if (choose.value.person == "9999") {
+    age = "";
+  } else if (choose.value.person == "6666") {
+    age = "";
+  } else if (choose.value.person == 1) {
+    age = "0";
+  } else {
+    age = choose.value.person - 1;
+  }
+  person_detail();
 };
 //获取人口详情接口
-const person_detail = () => {};
+const person_detail = (age) => {
+  http
+    .get(
+      `/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${
+        pagination.pageSize
+      }&age=${age || ""}&committee=${cfCs.value || ""}&xzjd=${cfJd.value || ""}`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data=res.data;
+        pagination.total = res.count;
+      }
+    });
+};
 //--------公共服务圈-----------
 //点击服务圈村
 const changeFwq = async (id, name, names) => {
@@ -2632,8 +2663,18 @@ const createCs2 = (polygon, indexx) => {
   });
   map.addOverlay(cs_number_name_arr.value[indexx]);
   cs_number_name_arr.value[indexx].addEventListener("click", () => {
-    console.log(polygon.name);
-    open_detail();
+    if (
+      choose.value.person == "cjr" ||
+      choose.value.person == "dibian" ||
+      choose.value.person == "db" ||
+      choose.value.person == "gxy" ||
+      choose.value.person == "tnb" ||
+      choose.value.person == "tyjr" ||
+      choose.value.person == "kjer"
+    ) {
+    } else {
+      open_detail();
+    }
   });
 };
 //添加单个村社
@@ -2772,7 +2813,19 @@ const DGcreateCs2 = (polygon, indexx) => {
   map.addOverlay(cs_dd_arr.value[indexx]);
   cs_dd_arr.value[indexx].addEventListener("click", () => {
     console.log(cfJd.value, polygon.name);
-    open_detail();
+    if (
+      choose.value.person == "cjr" ||
+      choose.value.person == "dibian" ||
+      choose.value.person == "db" ||
+      choose.value.person == "gxy" ||
+      choose.value.person == "tnb" ||
+      choose.value.person == "tyjr" ||
+      choose.value.person == "kjer"
+    ) {
+    } else {
+      open_detail();
+    }
+    // open_detail();
   });
 };
 //适配