gx

src/view/person/index.vue

@@ -197,6 +197,7 @@ import { reactive, ref, onMounted, watch, computed } from "vue";
 import Dialog from "@/view/dialog/dialog.vue";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/utils/request.js";
+import tools from "@/utils/tools";
 const identNo = ref("");
 const jump = ref("");
 const props = defineProps({
@@ -238,26 +239,26 @@ const dataMyTag = reactive({
       jkName: "tyjr",
       show: 0,
     },
-    {
+    // {
-      name: "留守",
+    //   name: "留守",
-      jkName: "jzzt",
+    //   jkName: "jzzt",
-      show: 0,
+    //   show: 0,
-    },
+    // },
     {
       name: "困境儿童",
       jkName: "kjet",
       show: 0,
     },
-    {
+    // {
-      name: "医保支出万元以上",
+    //   name: "医保支出万元以上",
-      jkName: "",
+    //   jkName: "",
-      show: 0,
+    //   show: 0,
-    },
+    // },
-    {
+    // {
-      name: "残疾",
+    //   name: "残疾",
-      jkName: "cj",
+    //   jkName: "cj",
-      show: 0,
+    //   show: 0,
-    },
+    // },
     {
       name: "高血压",
       jkName: "gxy",
@@ -268,26 +269,26 @@ const dataMyTag = reactive({
       jkName: "tnb",
       show: 0,
     },
-    {
+    // {
-      name: "高血脂",
+    //   name: "高血脂",
-      jkName: "",
+    //   jkName: "",
-      show: 0,
+    //   show: 0,
-    },
+    // },
-    {
+    // {
-      name: "高血糖",
+    //   name: "高血糖",
-      jkName: "",
+    //   jkName: "",
-      show: 0,
+    //   show: 0,
-    },
+    // },
-    {
+    // {
-      name: "其他疾病",
+    //   name: "其他疾病",
-      jkName: "",
+    //   jkName: "",
-      show: 0,
+    //   show: 0,
-    },
+    // },
-    {
+    // {
-      name: "大病住院",
+    //   name: "大病住院",
-      jkName: "",
+    //   jkName: "",
-      show: 0,
+    //   show: 0,
-    },
+    // },
   ],
   title: "出生",
   myTag1: [
@@ -607,7 +608,7 @@ const getData = (identNo) => {
       if (res.code == 200) {
         baseInfo.value = res.data.ryjbxx;
         dataMyTag.myTag.forEach((item) => {
-          item.show=0;
+          item.show = 0;
           res.data.rybqxx.forEach((itemm, indexx) => {
             if (itemm.bq == item.name) {
               item.show = 1;
@@ -634,11 +635,22 @@ watch(
   }
 );
 onMounted(() => {
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   if (routers.query.type) {
     baseInfo.value.nm = routers.query.nm;
     baseInfo.value.dz = routers.query.dz;
     baseInfo.value.identNo = routers.query.identNo;
+    baseInfo.value.bq = routers.query.bq;
     jump.value = "detail";
+    dataMyTag.myTag.forEach((item) => {
+      item.show = 0;
+      if(item.name=='特困'&& baseInfo.value.bq.includes('贫困')){
+         item.show = 1;
+      }
+      if(baseInfo.value.bq.includes(item.name)){
+        item.show = 1;
+      }
+    });
     // getData("3");
     // identNo.value = "3";
     onClickTag2("出生");

src/view/sy_details.vue

@@ -139,6 +139,7 @@
 import { ref, reactive, onMounted } from "vue";
 import http from "@/utils/request.js";
 import { useRouter, useRoute } from "vue-router";
+import tools from "@/utils/tools";
 const router = useRouter();
 const routers = useRoute();
 const data = reactive({
@@ -600,10 +601,11 @@ const handleRowClick = (row, column, event) => {
   console.log(row);
   router.push({
     path: `/home/index/person`,
-    query: { nm: row.xm, identNo: row.sfzhm, dz: row.dz, type: "detail" },
+    query: { nm: row.xm, identNo: row.sfzhm, dz: row.dz,bq:row.bq, type: "detail" },
   });
 };
 onMounted(() => {
+    // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage);
   handleCurrentChange(1);
 });

src/view/sy_map.vue

@@ -374,30 +374,37 @@ const tsbq_id_total = ref([
   {
     name: "残疾人",
     id: "cjr",
+    tagId:5,
   },
   {
     name: "低边",
     id: "dibian",
+    tagId:2,
   },
   {
     name: "低保",
     id: "db",
+    tagId:1,
   },
   {
     name: "高血压",
     id: "gxy",
+    tagId:9,
   },
   {
     name: "糖尿病",
     id: "tnb",
+    tagId:7,
   },
   {
     name: "退役军人",
     id: "tyjr",
+    tagId:8,
   },
   {
     name: "困境儿童",
     id: "kjer",
+    tagId:3,
   },
 ]);
 //单选中社区区块
@@ -762,6 +769,10 @@ const tableType = reactive({
     {
       label: "性别",
       property: "gender",
+    },
+        {
+      label: "年龄",
+      property: "age",
     },
     {
       label: "户口登记地",
@@ -1683,27 +1694,31 @@ const to_jd = (item_name) => {
 //详情
 const open_detail = () => {
   let age = "";
-  // if (choose.value.person == "9999") {
+  let tagId;
-  //   age = "";
-  //   person_detail(age);
-  //   dialogShow.value = true;
-  // } else if (choose.value.person == "6666") {
-  //   age = "";
-  // } else if (choose.value.person == 1) {
-  //   age = "0";
-  //   person_detail(age);
-  //   dialogShow.value = true;
-  // } else {
-  //   age = choose.value.person - 1;
-  //   person_detail(age);
-  //   dialogShow.value = true;
-  // }
   if (choose.value.person == "9999") {
     age = "";
     person_detail(age);
     dialogShow.value = true;
   } else if (choose.value.person == "6666") {
     age = "";
+  } else 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"
+  ) {
+    console.log(88888);
+    age = "";
+    tsbq_id_total.value.forEach((item,index)=>{
+      if(choose.value.person==item.id){
+        tagId=item.tagId;
+      }
+    })
+    person_detail(age, tagId);
+    dialogShow.value = true;
   } else {
     age = choose.value.person;
     person_detail(age);
@@ -1714,12 +1729,13 @@ const close = () => {
   dialogShow.value = false;
   pagination.total = 100;
   pagination.currentPage = 1;
-  tableType.data=[];
+  tableType.data = [];
 };
 //表格分页
 const handlePagination = (current) => {
   pagination.currentPage = current;
   let age = "";
+  let tagId;
   // if (choose.value.person == "9999") {
   //   age = "";
   // } else if (choose.value.person == "6666") {
@@ -1731,12 +1747,30 @@ const handlePagination = (current) => {
   // }
   if (choose.value.person == "9999") {
     age = "";
+    person_detail(age);
   } else if (choose.value.person == "6666") {
     age = "";
+  } else 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"
+  ) {
+    age = "";
+     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) => {
@@ -1752,13 +1786,15 @@ const closeDetail = () => {
   window.removeEventListener("resize", reset_font2);
 };
 //获取人口列表接口
-const person_detail = (age) => {
+const person_detail = (age, tagId) => {
   http
     .get(
       `/api/ggfwyth/ysyzt/getRyJbxxList?page=${pagination.currentPage}&size=${
         pagination.pageSize
       }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${
         cfJd.value || ""
+      }&tagId=${
+        tagId || ""
       }`
     )
     .then((res) => {
@@ -1786,15 +1822,15 @@ const getFwq = () => {
           });
         });
       });
-      let arr=[]
+      let arr = [];
-      jbfwqPx.forEach((item,index)=>{
+      jbfwqPx.forEach((item, index) => {
-        jbfwqTotal.value.forEach((item2,index2)=>{
+        jbfwqTotal.value.forEach((item2, index2) => {
-          if(item==item2.name){
+          if (item == item2.name) {
-            arr.push(item2)
+            arr.push(item2);
           }
-        })
+        });
-      })
+      });
-      jbfwqTotal.value=arr;
+      jbfwqTotal.value = arr;
     }
   });
 };
@@ -2756,18 +2792,18 @@ 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 (
+    // if (
-      choose.value.person == "cjr" ||
+    //   choose.value.person == "cjr" ||
-      choose.value.person == "dibian" ||
+    //   choose.value.person == "dibian" ||
-      choose.value.person == "db" ||
+    //   choose.value.person == "db" ||
-      choose.value.person == "gxy" ||
+    //   choose.value.person == "gxy" ||
-      choose.value.person == "tnb" ||
+    //   choose.value.person == "tnb" ||
-      choose.value.person == "tyjr" ||
+    //   choose.value.person == "tyjr" ||
-      choose.value.person == "kjer"
+    //   choose.value.person == "kjer"
-    ) {
+    // ) {
-    } else {
+    // } else {
     open_detail();
-    }
+    // }
   });
 };
 //添加单个村社
@@ -2825,10 +2861,6 @@ const DGcreateCs = (polygon, indexx) => {
 };
 //添加单个村社(+数量)
 const DGcreateCs2 = (polygon, indexx) => {
-  // console.log(choose.value.person, "单个村社", polygon);
-  // console.log("单个村社", polygon.name);
-  // console.log("单个村社", polygon.number);
-  // console.log("单个村社", polygon.swrs);
   function createLabelDOM() {
     var content = document.createElement("div");
     content.style.display = "flex";
@@ -2907,19 +2939,18 @@ const DGcreateCs2 = (polygon, indexx) => {
   cs_dd_arr.value[indexx].addEventListener("click", () => {
     console.log(cfJd.value, polygon.name);
     cfCsZs.value = polygon.name;
-    if (
+    // if (
-      choose.value.person == "cjr" ||
+    //   choose.value.person == "cjr" ||
-      choose.value.person == "dibian" ||
+    //   choose.value.person == "dibian" ||
-      choose.value.person == "db" ||
+    //   choose.value.person == "db" ||
-      choose.value.person == "gxy" ||
+    //   choose.value.person == "gxy" ||
-      choose.value.person == "tnb" ||
+    //   choose.value.person == "tnb" ||
-      choose.value.person == "tyjr" ||
+    //   choose.value.person == "tyjr" ||
-      choose.value.person == "kjer"
+    //   choose.value.person == "kjer"
-    ) {
+    // ) {
-    } else {
+    // } else {
     open_detail();
-    }
+    // }
-    // open_detail();
   });
 };
 //适配

src/view/sy_table.vue

@@ -662,6 +662,7 @@ const sevenYX = (name) => {
 };
 
 onMounted(() => {
+  // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   getData("弱有所扶", "社会救助服务");
   sevenYX("弱有众扶");
 });

vite.config.js

@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        target: "http://10.0.0.65:8095/", //刘进
+        // target: "http://10.0.0.65:8095/", //刘进
-        // target: "http://220.191.238.50:996/", //线上
+        target: "http://220.191.238.50:996/", //线上
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },