From 5f6379ba8016790a4177d9d4e95bf823a4787bd4 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Fri, 13 Sep 2024 11:40:15 +0800
Subject: [PATCH] 111

---
 src/view/dialog/dialogRW.vue |  2 +-
 src/view/sy_details.vue      |  9 +++++----
 src/view/sy_map.vue          |  2 +-
 src/view/sy_table.vue        | 22 +++++++++++-----------
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/view/dialog/dialogRW.vue b/src/view/dialog/dialogRW.vue
index ff5f2e7..a340dd6 100644
--- a/src/view/dialog/dialogRW.vue
+++ b/src/view/dialog/dialogRW.vue
@@ -213,7 +213,7 @@ const confirmEvent = () => {
     name: data.character.xm,
     address: data.character.dz,
     phone: "",
-    type: "ggdw_mz_db",
+    type: data.character.id,
   };
   http.post(`/api/ggfwyth/pg/reported`, ReportedDto).then((res) => {
     if (res.code == 200) {
diff --git a/src/view/sy_details.vue b/src/view/sy_details.vue
index 9d57aaf..f61c378 100644
--- a/src/view/sy_details.vue
+++ b/src/view/sy_details.vue
@@ -304,10 +304,10 @@ const router = useRouter();
 const routers = useRoute();
 const data = reactive({
   name: "",
-  identNo: "",//人物ID
-  first: 1,//随访记录&体检记录切换
-  tabelshow: true,//老年人福利补贴切换
-  pagedData: [],//服务内容清单(中间)临时分页数据
+  identNo: "", //人物ID
+  first: 1, //随访记录&体检记录切换
+  tabelshow: true, //老年人福利补贴切换
+  pagedData: [], //服务内容清单(中间)临时分页数据
   columns: [],
   column_1: [],
   column_2: [],
@@ -2422,6 +2422,7 @@ const statusDetails = (val) => {
         tableType.character = {
           ...val,
           age: val.nl,
+          id: routers.query.id,
           // dz: val.address,
           titleName: formData.name,
         };
diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue
index 41b64cb..9528ce4 100644
--- a/src/view/sy_map.vue
+++ b/src/view/sy_map.vue
@@ -4057,7 +4057,7 @@ const reset_font2 = () => {
     "scale(" + width / 1920 + "," + height / 1080 + ")";
 };
 onMounted(async () => {
-  //  tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); 
+   tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); 
   loadingss.value = true;
   reset_font();
   await getXzsj();
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 652640d..7805f5d 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -196,7 +196,7 @@ const goto = (val) => {
   if (availableRoutes.includes(val.name)) {
     router.push({
       path: "/home/index/table/details",
-      query: { name: val.name },
+      query: { name: val.name, id: val.id },
     });
   } else {
     ElMessage.warning({
@@ -640,7 +640,7 @@ const getData = async (name, fullName) => {
           res.data.forEach((item, index) => {
             const imageIndex = index % data.Bj.length;
             data.tabPublicService.push({
-              id: index,
+              id: item.id,
               Bj: data.Bj[imageIndex],
               name: item.sx,
               text: item.bmfxqk,
@@ -979,16 +979,16 @@ onMounted(() => {
 }
 </style>
 <style lang="scss" scoped>
-.tab{
+.tab {
   :deep(.el-table) {
-  background: rgba(32, 64, 115, 1);
-  color: #ffffff;
-  --el-table-border-color: rgba(57, 107, 161);
-  --el-table-tr-bg-color: none;
-  --el-table-header-bg-color: none;
-  --el-table-header-text-color: none;
-  border: 1px solid #7aceff;
-}
+    background: rgba(32, 64, 115, 1);
+    color: #ffffff;
+    --el-table-border-color: rgba(57, 107, 161);
+    --el-table-tr-bg-color: none;
+    --el-table-header-bg-color: none;
+    --el-table-header-text-color: none;
+    border: 1px solid #7aceff;
+  }
 }
 
 // :deep(.el-table tr) {