gx

src/assets/css/common.css

@@ -16,6 +16,10 @@
   font-family: titleNore; 
   src: url('../css/优设标题黑.ttf')
 }
+@font-face {
+  font-family: titletheRightWay; 
+  src: url('../css/庞门正道标题体3.0.ttf')
+}
 
 span,
 p,

src/view/person/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="person-container">
+    <a @click="back()" class="page_back"><i class="el-icon-arrow-left" title="返回"></i>返回</a>
+
     <div class="person-content">
       <div class="person-side">
         <div class="my-label">
@@ -9,7 +11,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 +24,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">
@@ -386,6 +388,11 @@ const tableType = reactive({
 const onClickTag = (item) => {
   dialogShow.value = true;
 };
+const back = () =>{
+    //  sessionStorage.setItem('return',true);
+     window.location.href = 'javascript:history.back(-1)';
+}
+
 const paginationDialog = reactive({
   current: 1,
   pageSize: 5,
@@ -410,16 +417,16 @@ const getData = (nm, identNo) => {
             item.show = Number(res.data[item.jkName]);
           }
         });
-        if(res.data.yljlx){
+        if (res.data.yljlx) {
-          data.value=[
+          data.value = [
             {
-              type:res.data.yljlx,
+              type: res.data.yljlx,
-              date:res.data.yljffrq,
+              date: res.data.yljffrq,
-              sum:res.data.yljffje
+              sum: res.data.yljffje,
-            }
+            },
-          ]
+          ];
-        }else{
+        } else {
-           data.value=[]
+          data.value = [];
         }
         // console.log(dataMyTag.myTag, 555);
       }
@@ -454,15 +461,14 @@ const getData = (nm, identNo) => {
 // };
 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.nm = routers.query.nm;
-    baseInfo.value.dz=routers.query.dz;
+    baseInfo.value.dz = routers.query.dz;
-    baseInfo.value.identNo=routers.query.identNo;
+    baseInfo.value.identNo = routers.query.identNo;
   }
-  
 });
 </script>
 
@@ -595,7 +601,8 @@ onMounted(() => {
 
     .my-label-title {
       display: inline-block;
-      font-family: PangMenZhengDao, PangMenZhengDao;
+      // font-family: PangMenZhengDao, PangMenZhengDao;
+      font-family: titletheRightWay, titletheRightWay;
       font-weight: normal;
       font-size: 34px;
       color: #b8fcfc;

src/view/sy_mapcopy.vue

@@ -1752,6 +1752,8 @@ 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) => {
@@ -2485,7 +2487,7 @@ const addCsUnChoose = () => {
         // });
         // getDataBqs(cfJd.value, cfCs.value);
         getDataBq(cfJd.value, cfCs.value);
-              if (choose.value.person == 1) {
+        if (choose.value.person == 1) {
           getDatas2(cfJd.value, "0", cfCs.value); //0岁传字符串
         } else {
           getDatas2(cfJd.value, choose.value.person - 1, cfCs.value);