diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 8c3d48d..c098640 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -374,37 +374,47 @@ const tsbq_id_total = ref([
   {
     name: "残疾人",
     id: "cjr",
-    tagId:5,
+    tagId: 5,
   },
   {
     name: "低边",
     id: "dibian",
-    tagId:2,
+    tagId: 2,
   },
   {
     name: "低保",
     id: "db",
-    tagId:1,
+    tagId: 1,
   },
   {
     name: "高血压",
     id: "gxy",
-    tagId:9,
+    tagId: 9,
   },
   {
     name: "糖尿病",
     id: "tnb",
-    tagId:7,
+    tagId: 7,
   },
   {
     name: "退役军人",
     id: "tyjr",
-    tagId:8,
+    tagId: 8,
   },
   {
     name: "困境儿童",
     id: "kjer",
-    tagId:3,
+    tagId: 3,
+  },
+  {
+    name: "孤儿",
+    id: "ge",
+    tagId: 4,
+  },
+  {
+    name: "特困",
+    id: "tk",
+    tagId: 6,
   },
 ]);
 //单选中社区区块
@@ -770,7 +780,7 @@ const tableType = reactive({
       label: "性别",
       property: "gender",
     },
-        {
+    {
       label: "年龄",
       property: "age",
     },
@@ -981,7 +991,8 @@ const getData = async (e) => {
     changeRs(e1);
   }
 };
-const getDatas = async (e, i) => {
+const getDatas = async (e, i, y = true) => {
+  //y用来判断选中标签后，点击街道，不重复渲染
   if (i == "9999") {
     i = "";
   }
@@ -1104,10 +1115,12 @@ const getDatas = async (e, i) => {
               });
             }
           } else {
-            if (choose.value.person == "") {
-              addCs();
-            } else {
-              addCs2();
+            if (y) {
+              if (choose.value.person == "") {
+                addCs();
+              } else {
+                addCs2();
+              }
             }
           }
         }
@@ -1146,7 +1159,9 @@ const getDatas2 = async (e, i, cs) => {
     i == "gxy" ||
     i == "tnb" ||
     i == "tyjr" ||
-    i == "kjer"
+    i == "kjer" ||
+    i == "ge" ||
+    i == "tk"
   ) {
     i = "";
   }
@@ -1301,7 +1316,9 @@ const getDatas2 = async (e, i, cs) => {
     i1 == "gxy" ||
     i1 == "tnb" ||
     i1 == "tyjr" ||
-    i1 == "kjer"
+    i1 == "kjer" ||
+    i1 == "ge" ||
+    i1 == "tk"
   ) {
   } else {
     if (choose.value.person == "") {
@@ -1315,28 +1332,51 @@ const getDatas2 = async (e, i, cs) => {
     }
   }
 };
+
 //特殊标签
 //获取特殊标签
 //特殊标签列表数据请求
+const changeTagId = (bq) => {
+  tsbq_id_total.value.forEach((item, index) => {
+    if (bq == item.id) {
+      console.log(item.tagId);
+      return item.tagId;
+    }
+  });
+};
 const getDataBq = async (jd, cs) => {
   await http
-    .get(`/api/ggfwyth/ysyzt/getTsbq?csq=${cs || ""}&xzjd=${jd || ""}`)
+    .get(`/api/ggfwyth/ysyzt/getBqRs?committee=${cs || ""}&town=${jd || ""}`)
     .then((res) => {
       if (res.code == 200) {
         tsbqTotal.value.length = 0;
-        for (let name in res.data) {
+        res.data.forEach((item, index) => {
           let idd = "";
-          for (let v = 0; v < tsbq_id_total.value.length; v++) {
-            if (tsbq_id_total.value[v].name == name) {
-              idd = tsbq_id_total.value[v].id;
+          tsbq_id_total.value.forEach((itemm, indexx) => {
+            if (item.bq == itemm.name) {
+              idd = itemm.id;
             }
-          }
+          });
           tsbqTotal.value.push({
             id: idd,
-            name: name,
-            rksl: res.data[name] || 0,
+            name: item.bq,
+            rksl: item.rs || 0,
+            tagId: item.tagId,
           });
-        }
+        });
+        // for (let name in res.data) {
+        //   let idd = "";
+        //   for (let v = 0; v < tsbq_id_total.value.length; v++) {
+        //     if (tsbq_id_total.value[v].name == name) {
+        //       idd = tsbq_id_total.value[v].id;
+        //     }
+        //   }
+        //   tsbqTotal.value.push({
+        //     id: idd,
+        //     name: name,
+        //     rksl: res.data[name] || 0,
+        //   });
+        // }
       }
     });
 };
@@ -1361,178 +1401,199 @@ const getDataBqs2 = async (jd, cs, bq, f = true) => {
   //f用来判断执不执行changeRs2
   let data = {};
   let vv = 0;
+  let tagIdBq;
+  tsbq_id_total.value.forEach((item, index) => {
+    if (bq == item.id) {
+      tagIdBq = item.tagId;
+    }
+  });
   if (cs == "" && jd == "") {
     data = {
-      tsbq: bq,
+      tagId: tagIdBq,
     };
     vv = 1;
   } else if (cs == "") {
     data = {
-      xzjd: jd,
-      tsbq: bq,
+      town: jd,
+      tagId: tagIdBq,
     };
     vv = 2;
   } else {
     data = {
-      xzjd: jd,
-      tsbq: bq,
-      csq: cs,
+      town: jd,
+      tagId: tagIdBq,
+      committee: cs,
     };
     vv = 3;
   }
-  await http.get(`/api/ggfwyth/ysyzt/getTsbqByXzjdOrCsq`, data).then((res) => {
-    if (res.code == 200) {
-      if (cfJd.value != "") {
-        xkzCenter.map((item) => {
-          item.numbers = 0;
-          res.data.map((items) => {
-            if (items.csq == item.name) {
-              item.numbers = items.rs;
-            }
+  await http
+    .get(`/api/ggfwyth/ysyzt/getBqRsByTownAndCommittee`, data)
+    .then((res) => {
+      if (res.code == 200) {
+        if (cfJd.value != "") {
+          xkzCenter.map((item) => {
+            item.numbers = 0;
+            res.data.map((items) => {
+              if (items.committee == item.name) {
+                item.numbers = items.rs;
+              }
+            });
           });
+        }
+
+        if (f) {
+          changeRs2(bq);
+        }
+
+        cs_name_arr.value.forEach((item, index) => {
+          map.removeOverlay(cs_name_arr.value[index]);
         });
-      }
-
-      if (f) {
-        changeRs2(bq);
-      }
-
-      cs_name_arr.value.forEach((item, index) => {
-        map.removeOverlay(cs_name_arr.value[index]);
-      });
-      cs_number_name_arr.value.forEach((item, index) => {
-        map.removeOverlay(cs_number_name_arr.value[index]);
-      });
-      cs_dd_arr.value.forEach((item, index) => {
-        map.removeOverlay(cs_dd_arr.value[index]);
-      });
-      if (title_jd.value == "") {
-      } else {
-        if (sfdd.value) {
-          if (choose.value.person == "") {
-            cs_dd_arr.value.forEach((item, index) => {
-              map.removeOverlay(cs_dd_arr.value[index]);
-            });
-            cs_dd_arr.value = [...xuanzhongCs.value];
-            cs_dd_arr.value.map((item, index) => {
-              DGcreateCs(item, index);
-            });
-          } else {
-            cs_dd_arr.value.forEach((item, index) => {
-              map.removeOverlay(cs_dd_arr.value[index]);
-            });
-            cs_dd_arr.value = [...xuanzhongCs.value];
-            cs_dd_arr.value.map((item, index) => {
-              DGcreateCs2(item, index);
-            });
-          }
+        cs_number_name_arr.value.forEach((item, index) => {
+          map.removeOverlay(cs_number_name_arr.value[index]);
+        });
+        cs_dd_arr.value.forEach((item, index) => {
+          map.removeOverlay(cs_dd_arr.value[index]);
+        });
+        if (title_jd.value == "") {
         } else {
-          if (choose.value.person == "") {
-            addCs();
+          if (sfdd.value) {
+            if (choose.value.person == "") {
+              cs_dd_arr.value.forEach((item, index) => {
+                map.removeOverlay(cs_dd_arr.value[index]);
+              });
+              cs_dd_arr.value = [...xuanzhongCs.value];
+              cs_dd_arr.value.map((item, index) => {
+                DGcreateCs(item, index);
+              });
+            } else {
+              cs_dd_arr.value.forEach((item, index) => {
+                map.removeOverlay(cs_dd_arr.value[index]);
+              });
+              cs_dd_arr.value = [...xuanzhongCs.value];
+              cs_dd_arr.value.map((item, index) => {
+                DGcreateCs2(item, index);
+              });
+            }
           } else {
-            addCs2();
+            if (choose.value.person == "") {
+              addCs();
+            } else {
+              addCs2();
+            }
           }
         }
       }
-    }
-  });
+    });
 };
 //单点选择区域获取特殊标签
 const getDataBqs3 = async (jd, cs, bq) => {
   //f用来判断执不执行changeRs2
   let data = {};
   let vv = 0;
+  let tagIdBq;
+  tsbq_id_total.value.forEach((item, index) => {
+    if (bq == item.id) {
+      tagIdBq = item.tagId;
+    }
+  });
   if (cs == "" && jd == "") {
     data = {
-      tsbq: bq,
+      tagId: btagIdBqq,
     };
     vv = 1;
   } else if (cs == "") {
     data = {
-      xzjd: jd,
-      tsbq: bq,
+      town: jd,
+      tagId: tagIdBq,
     };
     vv = 2;
   } else {
     data = {
-      xzjd: jd,
-      tsbq: bq,
-      csq: cs,
+      town: jd,
+      tagId: tagIdBq,
+      committee: cs,
     };
     vv = 3;
   }
-  await http.get(`/api/ggfwyth/ysyzt/getTsbqByXzjdOrCsq`, data).then((res) => {
-    if (res.code == 200) {
-      // if (cfJd.value != "") {
-      xkzCenter.map((item) => {
-        item.numbers = 0;
-        res.data.map((items) => {
-          if (items.csq == item.name) {
-            item.numbers = items.rs;
-          }
-        });
-      });
-      // }
-      // cs_name_arr.value.forEach((item, index) => {
-      //   map.removeOverlay(cs_name_arr.value[index]);
-      // });
-      // cs_number_name_arr.value.forEach((item, index) => {
-      //   map.removeOverlay(cs_number_name_arr.value[index]);
-      // });
-      // cs_dd_arr.value.forEach((item, index) => {
-      //   map.removeOverlay(cs_dd_arr.value[index]);
-      // });
-      // if (title_jd.value == "") {
-      // } else {
-      // if (sfdd.value) {
-      cs_dd_arr.value = [...xuanzhongCs.value];
-      if (choose.value.person == "") {
-        // cs_dd_arr.value.forEach((item, index) => {
-        //   map.removeOverlay(cs_dd_arr.value[index]);
-        // });
-        cs_dd_arr.value.map((item, index) => {
-          DGcreateCs(item, index);
-        });
-      } else {
-        // cs_dd_arr.value = [...xuanzhongCs.value];
-        console.log(cs_dd_arr.value);
-        cs_dd_arr.value.map((item, index) => {
-          DGcreateCs2(item, index);
-        });
-      }
-      // }
-      // else {
-      //   if (choose.value.person == "") {
-      //     addCs();
-      //   } else {
-      //     addCs2();
-      //   }
-      // }
-      // }
-    }
-  });
-};
-//特殊标签单独获取各个街道人数
-const getDataBqJD = async (bq) => {
-  let data = {};
-  data = {
-    tsbq: bq,
-  };
-
-  await http.get(`/api/ggfwyth/ysyzt/getTsbqByXzjdOrCsq`, data).then((res) => {
-    if (res.code == 200) {
-      if (res?.data) {
-        mapTownCount.map((item) => {
+  await http
+    .get(`/api/ggfwyth/ysyzt/getBqRsByTownAndCommittee`, data)
+    .then((res) => {
+      if (res.code == 200) {
+        // if (cfJd.value != "") {
+        xkzCenter.map((item) => {
           item.numbers = 0;
           res.data.map((items) => {
-            if (items.xzjd == item.name) {
+            if (items.committee == item.name) {
               item.numbers = items.rs;
             }
           });
         });
+        // }
+        // cs_name_arr.value.forEach((item, index) => {
+        //   map.removeOverlay(cs_name_arr.value[index]);
+        // });
+        // cs_number_name_arr.value.forEach((item, index) => {
+        //   map.removeOverlay(cs_number_name_arr.value[index]);
+        // });
+        // cs_dd_arr.value.forEach((item, index) => {
+        //   map.removeOverlay(cs_dd_arr.value[index]);
+        // });
+        // if (title_jd.value == "") {
+        // } else {
+        // if (sfdd.value) {
+        cs_dd_arr.value = [...xuanzhongCs.value];
+        if (choose.value.person == "") {
+          // cs_dd_arr.value.forEach((item, index) => {
+          //   map.removeOverlay(cs_dd_arr.value[index]);
+          // });
+          cs_dd_arr.value.map((item, index) => {
+            DGcreateCs(item, index);
+          });
+        } else {
+          // cs_dd_arr.value = [...xuanzhongCs.value];
+          console.log(cs_dd_arr.value);
+          cs_dd_arr.value.map((item, index) => {
+            DGcreateCs2(item, index);
+          });
+        }
+        // }
+        // else {
+        //   if (choose.value.person == "") {
+        //     addCs();
+        //   } else {
+        //     addCs2();
+        //   }
+        // }
+        // }
       }
+    });
+};
+//特殊标签单独获取各个街道人数
+const getDataBqJD = async (bq) => {
+  let data = {};
+  tsbq_id_total.value.forEach((item, index) => {
+    if (bq == item.id) {
+      data = {
+        tagId: item.tagId,
+      };
     }
   });
+  await http
+    .get(`/api/ggfwyth/ysyzt/getBqRsByTownAndCommittee`, data)
+    .then((res) => {
+      if (res.code == 200) {
+        if (res?.data) {
+          mapTownCount.map((item) => {
+            item.numbers = 0;
+            res.data.map((items) => {
+              if (items.town == item.name) {
+                item.numbers = items.rs;
+              }
+            });
+          });
+        }
+      }
+    });
 };
 //人口，标签切换执行
 const changeRs = (id) => {
@@ -1661,10 +1722,12 @@ const to_jd = (item_name) => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
-    getDatas(cfJd.value, "");
+    getDatas(cfJd.value, "",false);
   } else if (choose.value.person != "") {
     if (choose.value.person == "9999") {
       getDatas(cfJd.value, "");
@@ -1708,15 +1771,17 @@ const open_detail = () => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     console.log(88888);
     age = "";
-    tsbq_id_total.value.forEach((item,index)=>{
-      if(choose.value.person==item.id){
-        tagId=item.tagId;
+    tsbq_id_total.value.forEach((item, index) => {
+      if (choose.value.person == item.id) {
+        tagId = item.tagId;
       }
-    })
+    });
     person_detail(age, tagId);
     dialogShow.value = true;
   } else {
@@ -1726,6 +1791,7 @@ const open_detail = () => {
   }
 };
 const close = () => {
+  cfCsZs.value = "";
   dialogShow.value = false;
   pagination.total = 100;
   pagination.currentPage = 1;
@@ -1757,20 +1823,21 @@ const handlePagination = (current) => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     age = "";
-     tsbq_id_total.value.forEach((item,index)=>{
-      if(choose.value.person==item.id){
-        tagId=item.tagId;
+    tsbq_id_total.value.forEach((item, index) => {
+      if (choose.value.person == item.id) {
+        tagId = item.tagId;
       }
-    })
+    });
     person_detail(age, tagId);
   } else {
     age = choose.value.person;
     person_detail(age);
   }
-  
 };
 //打开人物详情页面
 const openMessage = (e) => {
@@ -1793,9 +1860,7 @@ const person_detail = (age, tagId) => {
         pagination.pageSize
       }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${
         cfJd.value || ""
-      }&tagId=${
-        tagId || ""
-      }`
+      }&tagId=${tagId || ""}`
     )
     .then((res) => {
       if (res.code == 200) {
@@ -2216,20 +2281,16 @@ const addPolygonCounty = () => {
             choose.value.person == "gxy" ||
             choose.value.person == "tnb" ||
             choose.value.person == "tyjr" ||
-            choose.value.person == "kjer"
+            choose.value.person == "kjer" ||
+            choose.value.person == "ge" ||
+            choose.value.person == "tk"
           ) {
             getDataBqs2(cfJd.value, cfCs.value, choose.value.person, false);
-            getDatas(cfJd.value, "");
+            getDatas(cfJd.value, "", false);
           } else if (choose.value.person != "") {
             if (choose.value.person == "9999") {
               getDatas(cfJd.value, "");
             } else {
-              // if (choose.value.person == 1) {
-              //   getDatas(cfJd.value, "0"); //0岁传字符串
-              // } else {
-              //   getDatas(cfJd.value, choose.value.person - 1);
-              // }
-
               getDatas(cfJd.value, choose.value.person);
             }
           }
@@ -2382,7 +2443,9 @@ const createCustomOverlayJd2 = (polygon, indexx) => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     num = "numbers";
   } else {
@@ -2494,7 +2557,9 @@ const addPolygonCountyCs = () => {
           choose.value.person == "gxy" ||
           choose.value.person == "tnb" ||
           choose.value.person == "tyjr" ||
-          choose.value.person == "kjer"
+          choose.value.person == "kjer" ||
+          choose.value.person == "ge" ||
+          choose.value.person == "tk"
         ) {
           getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
         } else {
@@ -2630,7 +2695,9 @@ const addCsUnChoose = () => {
           choose.value.person == "gxy" ||
           choose.value.person == "tnb" ||
           choose.value.person == "tyjr" ||
-          choose.value.person == "kjer"
+          choose.value.person == "kjer" ||
+          choose.value.person == "ge" ||
+          choose.value.person == "tk"
         ) {
           getDataBqs3(cfJd.value, cfCs.value, choose.value.person);
         }
@@ -2772,7 +2839,9 @@ const createCs2 = (polygon, indexx) => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     num = "numbers";
   } else {
@@ -2918,7 +2987,9 @@ const DGcreateCs2 = (polygon, indexx) => {
     choose.value.person == "gxy" ||
     choose.value.person == "tnb" ||
     choose.value.person == "tyjr" ||
-    choose.value.person == "kjer"
+    choose.value.person == "kjer" ||
+    choose.value.person == "ge" ||
+    choose.value.person == "tk"
   ) {
     num = "numbers";
   } else {