From 1151df11d50b43a09e79eb0c82f9986679974f28 Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Tue, 6 Aug 2024 11:22:49 +0800
Subject: [PATCH] gx

---
 src/assets/person/back.png    | Bin 0 -> 949 bytes
 src/assets/person/back_bg.png | Bin 0 -> 2858 bytes
 src/view/home.vue             |  27 ++++++++------
 src/view/person/index.vue     |  66 +++++++++++++++++++++++++---------
 src/view/sy_mapcopy.vue       |   4 ++-
 5 files changed, 68 insertions(+), 29 deletions(-)
 create mode 100644 src/assets/person/back.png
 create mode 100644 src/assets/person/back_bg.png

diff --git a/src/assets/person/back.png b/src/assets/person/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca0864e2d9804608cf6d947ed38f4c89b1628999
GIT binary patch
literal 949
zcmV;m14{gfP)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px&Z%IT!R9HvFmtTlfbri=xXSP*iHx{?~lVy)37-pD0g%5!n&fE#v{t?80P!CEy
zB}62I3K~TO3ei(ku!t#=>CUKBY#6?j^;Q->7%IZdZDA*3W4FEYmEZNwc->})o!LM0
zd%O3Z?>QgN?|07mU8BV+R`djL7+7oYPA+X<wz6NyH=9dbENckkByeA3^Rt(>%?k<E
zO4}5qSXKe!Q=m5z*ML{Ow0*v8AjOK_1`Yvr$SFY~pSBZA1>yWQGO|xfZ1Fh)ydDcU
z0qpS7c3~+Y8X#j=wd&tKjtYij0k8K2WVf%eUzZvp1UXmLU@*mL;Hi2*gK-%<5jWa}
z2x?TVM)}zXZL%G$6)SRS-`b97p0-uNMT7H+fYaGE_GingDOU7%tVHJ-qiwT5;ut*~
z%qQ(~Gqsh<+AZVb_`wBSTCcPn?)KpyM5HlRG|>lU?Ef*z!F^_~B{Wu8HKV>>wi;i=
z#FBU`pRo@+fI*U#d^RFnQ+y40H10>ncZmeg<?c7P8{uk{@2Ib*O?(9m#6*XGO7Z4w
z`gY)4TiERLyb-pB2V&YWtCGz<VpDg4xQDZ4Jzg_Pz(X<86I3bG1?@n@ZO`0PGI0+_
zfuY!bjCd(4{13#vI6tn3XJ$Buu|DSL!gMb?hF6<wa2+q#uO|CBgV@$^BA)Rw_D$1S
zGdiKwHqF<w%KD_2wii04h=ft!`VGiLuYS*^SU>0VEnU&d+5jU4_25M>ZTW?QIDN_2
zD-t7hUkTVcCx|l&587X34c4yc;n>iiRTl%~lGI!Fxd|jAe@9w^EJo0|d=xAC4A>cc
zztl|-cing|0=dyWkg|4Rd=i07bq!?H*SjY6halow*FZ`Y9T&V9Wn`=?Ajhxk-oBOi
zK;P|zaHuOFC0~0a?hI68-Liv(BP76GKf~V?H;MBp+qSGAZglV;KbUx|UM&e@V>V@f
zEE~vKU+ZeZ{gP~mP2W9U%06m3eHXi%j#bn@32zAY8uZuw8@!)On`>&}x+^2@X4NT(
znaSx-O)#)(hK$4p!FI$j#$e2EAmczjWe4K1!ocnT1p%i7n>q!Vr|znWLM~$$XWQ5B
ztarNHJUzB)<__Zr|D+gs$!xlrwvmyUAiS?W*=B&*<^skM6^v_w?=imhlKkSfu9fdw
X?a(rM5UO#|00000NkvXXu0mjfPdmHg

literal 0
HcmV?d00001

diff --git a/src/assets/person/back_bg.png b/src/assets/person/back_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe70d56212a567db868c8fabe5003fe787c9c6f4
GIT binary patch
literal 2858
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
IM6N<$g3m)$EC2ui

literal 0
HcmV?d00001

diff --git a/src/view/home.vue b/src/view/home.vue
index 2867d35..f226580 100644
--- a/src/view/home.vue
+++ b/src/view/home.vue
@@ -5,7 +5,17 @@
           <img class="title" src="../assets/img_07.png" alt="" />
         </div> -->
       <Header />
-      <router-view />
+      <!-- <keep-alive include="首页地图">
+        <router-view />
+      </keep-alive> -->
+      <!-- <router-view v-slot="{ Component }">
+        <keep-alive>
+          <component :is="Component" />
+        </keep-alive>
+      </router-view> -->
+      <keep-alive :max="1" :include="['首页地图']">
+        <router-view />
+      </keep-alive>
     </div>
   </div>
 </template>
@@ -13,7 +23,7 @@
 <script setup>
 import Header from "../components/header.vue";
 
-import { ref, onMounted, onBeforeMount ,watch, nextTick} from "vue";
+import { ref, onMounted, onBeforeMount, watch, nextTick } from "vue";
 import { useRouter, useRoute } from "vue-router";
 const router = useRouter();
 const routers = useRoute();
@@ -21,9 +31,9 @@ console.log(routers.path);
 watch(
   () => routers.path,
   (newVal, oldVal) => {
-  nextTick(()=>{
-     reset_font()
-  })
+    nextTick(() => {
+      reset_font();
+    });
   }
 );
 const reset_font = () => {
@@ -31,7 +41,6 @@ const reset_font = () => {
   let height =
     document.documentElement.clientHeight || document.body.clientHeight;
 
-
   document.querySelector("#m").style.transformOrigin = "top left";
   document.querySelector("#m").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
@@ -39,17 +48,14 @@ const reset_font = () => {
   document.querySelector(".header_content").style.transformOrigin = "top left";
   document.querySelector(".header_content").style.transform =
     "scale(" + width / 1920 + "," + height / 1080 + ")";
-  if (
-    document.querySelector(".left")) {
+  if (document.querySelector(".left")) {
     document.querySelector(".left").style.transformOrigin = "bottom left";
     document.querySelector(".left").style.transform =
       "scale(" + width / 1920 + "," + height / 1080 + ")";
     document.querySelector(".right").style.transformOrigin = "bottom right";
     document.querySelector(".right").style.transform =
       "scale(" + width / 1920 + "," + height / 1080 + ")";
-
   }
-
 };
 onMounted(() => {
   reset_font();
@@ -93,7 +99,6 @@ body {
   overflow: hidden;
   // position: absolute;
   z-index: -1;
-
 }
 
 #emap {
diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 4226495..11a0dca 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -9,7 +9,7 @@
           <div class="my-info-item">
             <div class="my-info-label">姓&emsp;&emsp;名</div>
             <div class="my-info-content">
-              <p>{{ baseInfo.nm || baseInfo.xm}}</p>
+              <p>{{ baseInfo.nm || baseInfo.xm }}</p>
             </div>
           </div>
           <div class="my-info-item">
@@ -22,7 +22,7 @@
             <div class="my-info-label">证件号码</div>
             <div class="my-info-content">
               <p>******************</p>
-               <!-- <p>{{ baseInfo.identNo }}</p> -->
+              <!-- <p>{{ baseInfo.identNo }}</p> -->
             </div>
           </div>
           <div class="my-info-item">
@@ -85,6 +85,10 @@
         <div class="main-tag-item">身后事</div>
         <div class="main-tag-item">综合</div>
         <div class="person-main-person"></div>
+        <div class="back" @click="back()">
+          <img src="@/assets/person/back.png" alt="" />
+          <p>返回</p>
+        </div>
       </div>
       <div class="person-side">
         <div class="my-label">
@@ -410,16 +414,16 @@ const getData = (nm, identNo) => {
             item.show = Number(res.data[item.jkName]);
           }
         });
-        if(res.data.yljlx){
-          data.value=[
+        if (res.data.yljlx) {
+          data.value = [
             {
-              type:res.data.yljlx,
-              date:res.data.yljffrq,
-              sum:res.data.yljffje
-            }
-          ]
-        }else{
-           data.value=[]
+              type: res.data.yljlx,
+              date: res.data.yljffrq,
+              sum: res.data.yljffje,
+            },
+          ];
+        } else {
+          data.value = [];
         }
         // console.log(dataMyTag.myTag, 555);
       }
@@ -452,17 +456,19 @@ const getData = (nm, identNo) => {
 //       }
 //     });
 // };
+const back=()=>{
+  router.back()
+}
 onMounted(() => {
   // console.log(routers.query);
-  if(routers.query.type == 'map'){
+  if (routers.query.type == "map") {
     getData(routers.query.nm, routers.query.identNo);
-  }else{
+  } else {
     // getData2(routers.query.nm, routers.query.identNo);
-    baseInfo.value.nm=routers.query.nm;
-    baseInfo.value.dz=routers.query.dz;
-    baseInfo.value.identNo=routers.query.identNo;
+    baseInfo.value.nm = routers.query.nm;
+    baseInfo.value.dz = routers.query.dz;
+    baseInfo.value.identNo = routers.query.identNo;
   }
-  
 });
 </script>
 
@@ -766,4 +772,30 @@ onMounted(() => {
     }
   }
 }
+.back {
+  box-sizing: border-box;
+  position: absolute;
+  width: 88px;
+  height: 36px;
+  top: 0px;
+  left: 30px;
+  background: url("../../assets/person/back_bg.png") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  align-items: center;
+  padding: 10px 16px;
+  z-index: 10;
+  cursor: pointer;
+  img {
+    width: 17px;
+    height: 16px;
+  }
+  p {
+    margin-left: 5px;
+    font-weight: 400;
+    font-size: 16px;
+    color: #b5eaff;
+    line-height: 22px;
+  }
+}
 </style>
diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue
index acb188d..08b81ee 100644
--- a/src/view/sy_mapcopy.vue
+++ b/src/view/sy_mapcopy.vue
@@ -179,6 +179,7 @@ import {
   defineProps,
   watch,
   nextTick,
+  onActivated
 } from "vue";
 import { ElMessage } from "element-plus";
 import tools from "@/utils/tools";
@@ -1752,6 +1753,7 @@ const open_detail = () => {
 const close = () => {
   dialogShow.value = false;
   pagination.total = 100;
+  pagination.currentPage=1;
 };
 //表格分页
 const handlePagination = (current) => {
@@ -1766,7 +1768,7 @@ const handlePagination = (current) => {
   } else {
     age = choose.value.person - 1;
   }
-  person_detail();
+  person_detail(age);
 };
 //获取人口详情接口
 const person_detail = (age) => {