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

src/view/sy_details.vue

@@ -605,7 +605,7 @@ const handleRowClick = (row, column, event) => {
   });
 };
 onMounted(() => {
-    tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage);
   handleCurrentChange(1);
 });

src/view/sy_map.vue

@@ -762,6 +762,10 @@ const tableType = reactive({
     {
       label: "手机号",
       property: "contactTel",
+    },
+        {
+      label: "年龄",
+      property: "age",
     },
     {
       label: "政治面貌",
@@ -780,10 +784,7 @@ const tableType = reactive({
       label: "性别",
       property: "gender",
     },
-    {
+
-      label: "年龄",
-      property: "age",
-    },
     {
       label: "户口登记地",
       property: "domicAddr",
@@ -3041,7 +3042,7 @@ const reset_font2 = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(() => {
-  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   reset_font();
   initMap();
   getData();