Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/sy_map.vue

@@ -1757,6 +1757,8 @@ const open_detail = () => {
     person_detail(age);
   } else if (choose.value.person == "6666") {
     age = "";
+    dialogShow.value = true;
+    person_detail2();
   } else if (
     choose.value.person == "残疾人" ||
     choose.value.person == "低边" ||
@@ -1796,20 +1798,12 @@ const handlePagination = (current) => {
   pagination.currentPage = current;
   let age = "";
   let tagId;
-  // 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;
-  // }
   if (choose.value.person == "9999") {
     age = "";
     person_detail(age);
   } else if (choose.value.person == "6666") {
     age = "";
+    person_detail2();
   } else if (
     choose.value.person == "残疾人" ||
     choose.value.person == "低边" ||
@@ -1867,6 +1861,25 @@ const person_detail = (age, tagId) => {
       }
     });
 };
+//获取死亡列表
+const person_detail2 = () => {
+  http
+    .get(
+      `/api/ggfwyth/ysyzt/getRyJbxxList?page=${pagination.currentPage}&size=${
+        pagination.pageSize
+      }&committee=${cfCsZs.value || ""}&town=${cfJd.value || ""}&sfsw=1`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        res.data.forEach((item, index) => {
+          item.index =
+            index + 1 + (pagination.currentPage - 1) * pagination.pageSize;
+        });
+        pagination.total = res.count;
+      }
+    });
+};
 //--------公共服务圈-----------
 //获取服务圈村社数据
 const getFwq = () => {