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

src/view/sy_mapcopy.vue

@@ -238,6 +238,8 @@ const xuanzhongCs = ref([]);
 const cfJd = ref("");
 //存放村社
 const cfCs = ref("");
+//点击存放村社暂时
+const cfCsZs=ref('')
 //地图
 var map = null;
 //默认龙游县灰色地块
@@ -959,16 +961,12 @@ const tableType = reactive({
     },
     {
       label: "手机号",
-      property: "tel",
+      property: "contactTel",
+    },
+    {
+      label: "政治面貌",
+      property: "zzmm",
     },
-    // {
-    //   label: "证件号码",
-    //   property: "zy",
-    // },
-    // {
-    //   label: "政治面貌",
-    //   property: "zzmm",
-    // },
     {
       label: "居住状态",
       property: "jzzt",
@@ -1034,7 +1032,7 @@ const clear = () => {
   title_cs.value = "";
   cfJd.value = "";
   cfCs.value = "";
-
+  cfCsZs.value='';
   cs_un_choose_arr.value.forEach((item, index) => {
     map.removeOverlay(cs_un_choose_arr.value[index]);
   });
@@ -1774,7 +1772,7 @@ const person_detail = (age) => {
     .get(
       `/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${
         pagination.pageSize
-      }&age=${age || ""}&committee=${cfCs.value || ""}&xzjd=${cfJd.value || ""}`
+      }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${cfJd.value || ""}`
     )
     .then((res) => {
       if (res.code == 200) {
@@ -2663,6 +2661,7 @@ const createCs2 = (polygon, indexx) => {
   });
   map.addOverlay(cs_number_name_arr.value[indexx]);
   cs_number_name_arr.value[indexx].addEventListener("click", () => {
+    cfCsZs.value=polygon.name;
     if (
       choose.value.person == "cjr" ||
       choose.value.person == "dibian" ||
@@ -2813,6 +2812,7 @@ const DGcreateCs2 = (polygon, indexx) => {
   map.addOverlay(cs_dd_arr.value[indexx]);
   cs_dd_arr.value[indexx].addEventListener("click", () => {
     console.log(cfJd.value, polygon.name);
+    cfCsZs.value=polygon.name;
     if (
       choose.value.person == "cjr" ||
       choose.value.person == "dibian" ||
@@ -2846,7 +2846,7 @@ const reset_font = () => {
   }
 };
 onMounted(() => {
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   reset_font();
   initMap();
   getData();