From 6281529cf4c9c7b29188c1c08a14660a74c91797 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Mon, 9 Dec 2024 16:33:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/view/person/index.vue | 90 ++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 40 deletions(-)

diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 0674461..39a0b37 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -106,8 +106,9 @@
         <div class="videoCamera" v-if="dataMyTag.camera" @click="openCamera()">
           <img src="@/assets/images/sxt_detail.png" alt="" />
         </div>
-        <div class="main_table" v-if="showFw">
+        <div class="main_table">
           <el-table
+            v-loading="showFw"
             :data="tableMain.data"
             border
             style="width: 100%"
@@ -547,7 +548,7 @@ const dataMyTag = reactive({
    * @description 标题头
    */
   myTag1: [
-  {
+    {
       name: "出生",
       label: "出生",
     },
@@ -639,40 +640,7 @@ const camerali = reactive({
   name: "",
 });
 const tableMain = reactive({
-  data: [
-    {
-      date: "1",
-      xs: "1",
-    },
-    {
-      date: "2",
-      xs: "0",
-    },
-    {
-      date: "1",
-      xs: "1",
-    },
-    {
-      date: "2",
-      xs: "0",
-    },
-    {
-      date: "1",
-      xs: "1",
-    },
-    {
-      date: "2",
-      xs: "0",
-    },
-    {
-      date: "1",
-      xs: "1",
-    },
-    {
-      date: "2",
-      xs: "0",
-    },
-  ],
+  data: [],
   columns: [
     {
       label: "服务内容",
@@ -1132,15 +1100,13 @@ const visitRecords = () => {
     });
 };
 //获取服务内容
-const showFw = ref(false);
-const getFw = () => {
-  http
+const getFw = async() => {
+  await http
     .get(
       `/api/ggfwyth/pg/fwjgqdxq?sfzhm=${routers.query.identNo}&xh=${routers.query.xh}`
     )
     .then((res) => {
       if (res.code == 200) {
-        showFw.value = true;
         // tableType.data = res.data;
         // tableType.name = data.name;
         // tableType.typeId = routers.query.id;
@@ -1171,6 +1137,45 @@ const getFw = () => {
         });
       }
     });
+    showFw.value = false;
+};
+const showFw = ref(true);
+//获取服务内容(地图过来)
+const getFw2 = async(identNo) => {
+  await http.get(`/api/ggfwyth/ysyzt/fwxq?sfzhm=${identNo}`).then((res) => {
+    if (res.code == 200) {
+      // tableType.data = res.data;
+      // tableType.name = data.name;
+      // tableType.typeId = routers.query.id;
+      // dialogShow.value = true;
+      tableMain.data.length = 0;
+      if (res.data.wxs.length > 0) {
+        res.data.wxs.forEach((item, index) => {
+          let obj = {
+            xs: "0",
+            date: item.bzlx,
+          };
+          tableMain.data.push(obj);
+        });
+      }
+      // data.tableData.length = [];
+      if (res.data.ysx.length > 0) {
+        res.data.ysx.forEach((item, index) => {
+          let obj = {
+            xs: "1",
+            date: item.bzlx,
+          };
+          tableMain.data.push(obj);
+        });
+      }
+      
+    } else {
+      ElMessage.warning({
+        message: res.message,
+      });
+    }
+  });
+  showFw.value = false;
 };
 // 打开摄像头
 const openCamera = () => {
@@ -1212,6 +1217,7 @@ const back = () => {
 watch(
   () => props.message,
   (newValue, oldValue) => {
+    showFw.value = true;
     errorMessage.value = "";
     // identNo.value = props.message.identNo;
     dataMyTag.identNo = props.message.identNo;
@@ -1221,10 +1227,13 @@ watch(
     onClickTag2("出生", "出生");
     jump.value = "map";
     getshs();
+    getFw2(props.message.identNo);
+  
   }
 );
 onMounted(() => {
   if (routers.query.type) {
+    showFw.value = true;
     errorMessage.value = "";
     dataMyTag.identNo = routers.query.identNo;
     jump.value = "detail";
@@ -1234,6 +1243,7 @@ onMounted(() => {
     onClickTag2("出生", "出生");
     getshs();
     getFw();
+   
   } else {
     jump.value = "map";
   }