From 23a6f253d05a8c9de8f682ba5d59e2f2c42f1494 Mon Sep 17 00:00:00 2001
From: littleeewolf <2285716495@qq.com>
Date: Sat, 10 Aug 2024 22:31:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/person/index.vue | 57 ++++++++++++++++++++++-----------------
 src/view/sy_details.vue   | 15 +----------
 2 files changed, 33 insertions(+), 39 deletions(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 54918e6..2357af9 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -166,6 +166,18 @@
             <div class="my-label-title">{{ dataMyTag.title }}</div>
           </div>
           <div class="my-info">
+            <div class="my-info-item" v-if="dataMyTag.title == '学习'">
+              <div class="my-info-label">学&emsp;&emsp;历</div>
+              <div class="my-info-content">
+                <p>{{ baseInfo.eduPhase || "" }}</p>
+              </div>
+            </div>
+            <div class="my-info-item" v-if="dataMyTag.title == '婚育'">
+              <div class="my-info-label">婚姻状况</div>
+              <div class="my-info-content">
+                <p>{{ baseInfo.maritalStatus || "" }}</p>
+              </div>
+            </div>
             <div
               class="my-info-item"
               v-for="(item, index) in tableType.columns"
@@ -506,17 +518,21 @@ const columnsList = reactive({
       },
     ],
   },
+  婚育: {
+    url: "",
+    column: [],
+  },
 });
 //判断title
-const pdT = computed(() => {
-  if (tableType.title == "综合") {
-    return "医疗金发放情况";
-  } else if (tableType.title == "退休养老") {
-    return "养老金发放情况";
-  } else {
-    return tableType.title;
-  }
-});
+// const pdT = computed(() => {
+//   if (tableType.title == "综合") {
+//     return "医疗金发放情况";
+//   } else if (tableType.title == "退休养老") {
+//     return "养老金发放情况";
+//   } else {
+//     return tableType.title;
+//   }
+// });
 //判断类型
 const pd = computed(() => {
   return (name, type) => {
@@ -550,7 +566,12 @@ const onClickTag2 = (name, label) => {
   dataMyTag.title = label;
   tableType.url = columnsList[name].url;
   tableType.columns = columnsList[name].column;
-  getTable(tableType.url, true);
+  if(name=='婚育'){
+
+  }else{
+    getTable(tableType.url, true);
+  }
+  
 };
 //判断右侧显示的为表格还是列表，0为列表，1为表格
 const rightType = ref(0);
@@ -637,22 +658,8 @@ 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;
+    getData(routers.query.identNo);
     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("出生");
   } else {
     jump.value = "map";
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 77257f4..a4bbfcb 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -601,26 +601,13 @@ const handleRowClick = (row, column, event) => {
   console.log(row);
   router.push({
     path: `/home/index/person`,
-    query: { nm: row.xm, identNo: row.sfzhm, dz: row.dz,bq:row.bq, type: "detail" },
+    query: { identNo: row.sfzhm,type: "detail" },
   });
 };
-const person_detail = () => {
-  http
-    .get(
-      `/api/ggfwyth/ysyzt/getRyJbxxList?page=1&size=10&town=溪口镇&tagId=1`
-    )
-    .then((res) => {
-      if (res.code == 200) {
-        // tableType.data = res.data;
-        // pagination.total = res.count;
-      }
-    });
-};
 onMounted(() => {
     tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d");
   getTable("/api/ggfwyth/pg/lyxsdbrymd", pagination.currentPage);
   handleCurrentChange(1);
-  person_detail();
 });
 </script>