From 89f5ba486f88775bec4527eb65746a9fe308b4e4 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Fri, 30 Aug 2024 16:38:45 +0800
Subject: [PATCH] gx

---
 src/view/person/index.vue | 43 ++++++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 503e091..54403f6 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -562,7 +562,19 @@ const paginationDialog = reactive({
   total: 50,
   showTotal: 0,
 });
-const baseInfo = ref({});
+const baseInfo = ref({
+  nm: "",
+  xm: "",
+  zjlx: "",
+  age: "",
+  jzzt: "0",
+  ethnic: "",
+  gender: "",
+  domicAddr: "",
+  dz: "",
+  eduPhase: "",
+  maritalStatus: "",
+});
 const dialogShow = ref(false);
 const camera = reactive({
   show: false,
@@ -930,21 +942,22 @@ const getData = (identNo) => {
   http
     .get(`/api/ggfwyth/ysyzt/getRyJbxxDetails?identNo=${identNo}`)
     .then((res) => {
-      if (res.code == 200) {
-        baseInfo.value = res.data.ryjbxx;
-        dataMyTag.camera = res.data.camera;
-        dataMyTag.myTag.forEach((item) => {
-          item.show = 0;
-          res.data.rybqxx.forEach((itemm, indexx) => {
-            if (itemm.bq == item.name) {
-              item.show = 1;
-            }
+      if (res.code === 200 && res.data) {
+        const { ryjbxx, camera, rybqxx } = res.data;
+        // 判断 ryjbxx 和 camera 是否存在
+        baseInfo.value = ryjbxx || {}; // 如果 ryjbxx 未定义则赋值为空对象
+        dataMyTag.camera = camera || {}; // 如果 camera 未定义则赋值为空对象
+
+        if (Array.isArray(dataMyTag.myTag)) {
+          dataMyTag.myTag.forEach((item) => {
+            item.show =
+              rybqxx && rybqxx.some((itemm) => itemm.bq === item.name) ? 1 : 0;
           });
-        });
-        // if (dataMyTag.camera) {
-        //   getCameraUrl();
-        // }
+        }
       }
+    })
+    .catch((error) => {
+      console.error("Error fetching data:", error);
     });
 };
 const oneCardSolution = () => {
@@ -1014,6 +1027,8 @@ watch(
     errorMessage.value = "";
     // identNo.value = props.message.identNo;
     dataMyTag.identNo = props.message.identNo;
+    console.log("请求getData");
+
     getData(props.message.identNo);
     onClickTag2("出生", "出生");
     jump.value = "map";