gx

src/view/person/index.vue

@@ -77,14 +77,16 @@
         </div>
       </div>
       <div class="person-main">
-        <div class="main-tag-item">出生</div>
+        <div class="main-tag-item" @click="onClickTag2('出生')">出生</div>
-        <div class="main-tag-item">学习</div>
+        <div class="main-tag-item" @click="onClickTag2('学习')">学习</div>
-        <div class="main-tag-item">工作</div>
+        <div class="main-tag-item" @click="onClickTag2('工作')">工作</div>
-        <div class="main-tag-item">婚育</div>
+        <div class="main-tag-item" @click="onClickTag2('婚育')">婚育</div>
-        <div class="main-tag-item">置业</div>
+        <div class="main-tag-item" @click="onClickTag2('置业')">置业</div>
-        <div class="main-tag-item">退休<br />养老</div>
+        <div class="main-tag-item" @click="onClickTag2('退休养老')">
-        <div class="main-tag-item">身后事</div>
+          退休<br />养老
-        <div class="main-tag-item">综合</div>
+        </div>
+        <div class="main-tag-item" @click="onClickTag2('身后事')">身后事</div>
+        <div class="main-tag-item" @click="onClickTag2('综合')">综合</div>
         <div class="person-main-person"></div>
         <div class="back" @click="back()">
           <img src="@/assets/person/back.png" alt="" />
@@ -116,19 +118,19 @@
             }"
           >
             <el-table-column
-              prop="type"
+              prop="yljlx"
               label="养老金类型"
               width="160"
               align="center"
             />
             <el-table-column
-              prop="date"
+              prop="yljffrq"
               label="发放日期"
               width="160"
               align="center"
             />
             <el-table-column
-              prop="sum"
+              prop="yljffje"
               label="发放金额(元）"
               width="160"
               align="center"
@@ -142,7 +144,7 @@
             prev-text="上一页"
             next-text="下一页"
             v-model:current-page="pagination.currentPage"
-            @current-change="handlePagination"
+            @current-change="handlePaginationYL"
           />
         </div>
         <div class="my-label">
@@ -201,7 +203,7 @@
             prev-text="上一页"
             next-text="下一页"
             v-model:current-page="pagination1.currentPage"
-            @current-change="handlePagination"
+            @current-change="handlePaginationYLJ"
           />
         </div>
       </div>
@@ -224,6 +226,7 @@ import { reactive, ref, onMounted, watch } from "vue";
 import Dialog from "@/view/dialog/dialog.vue";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/utils/request.js";
+const identNo = ref("");
 const jump = ref("");
 const props = defineProps({
   message: {
@@ -236,28 +239,7 @@ const props = defineProps({
 const emit = defineEmits(["backMap"]);
 const router = useRouter();
 const routers = useRoute();
-const data = ref([
+//特殊标签列表
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-  {
-    type: "基础养老金",
-    date: "2022-01-01",
-    sum: "1000",
-  },
-]);
 const dataMyTag = reactive({
   myTag: [
     {
@@ -337,6 +319,29 @@ const dataMyTag = reactive({
     },
   ],
 });
+//存放养老金数据
+const data = ref([
+  {
+    type: "基础养老金",
+    date: "2022-01-01",
+    sum: "1000",
+  },
+  {
+    type: "基础养老金",
+    date: "2022-01-01",
+    sum: "1000",
+  },
+  {
+    type: "基础养老金",
+    date: "2022-01-01",
+    sum: "1000",
+  },
+  {
+    type: "基础养老金",
+    date: "2022-01-01",
+    sum: "1000",
+  },
+]);
 const pagination = reactive({
   current: 1,
   pageSize: 5,
@@ -347,6 +352,7 @@ const handleTableChange = (pagination) => {
   console.log(pagination);
 };
 const baseInfo = ref({});
+//存放医疗金数据
 const data1 = ref([
   {
     type: "职工医疗",
@@ -381,50 +387,233 @@ const pagination1 = reactive({
 });
 const dialogShow = ref(false);
 const tableType = reactive({
-  title: "基础养老金",
+  url: "",
-  columns: [
+  title: "",
-    {
+  columns: [],
-      label: "领取日期",
-      property: "date",
-    },
-    {
-      label: "领取医院",
-      property: "hospital",
-    },
-    {
-      label: "详情",
-      property: "info",
-    },
-  ],
   data: [],
 });
+const columnsList = reactive({
+  特殊标签: {
+    url: "",
+    column: [
+      {
+        label: "领取日期",
+        property: "date",
+      },
+      {
+        label: "领取医院",
+        property: "hospital",
+      },
+      {
+        label: "详情",
+        property: "info",
+      },
+    ],
+  },
+  身后事: {
+    url: "/api/ggfwyth/ysyzt/getRyshsxx",
+    column: [
+      {
+        label: "所在殡仪馆",
+        property: "byg",
+      },
+      {
+        label: "火化日期",
+        property: "hhrq",
+      },
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "死亡日期",
+        property: "swrq",
+      },
+    ],
+  },
+  学习: {
+    url: "/api/ggfwyth/ysyzt/getRyxxxx",
+    column: [
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "学校",
+        property: "xx",
+      },
+      {
+        label: "班级",
+        property: "bj",
+      },
+    ],
+  },
+  工作: {
+    url: "/api/ggfwyth/ysyzt/getRygzxx",
+    column: [
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "工作单位",
+        property: "gzdw",
+      },
+      {
+        label: "工作时间",
+        property: "gzsj",
+      },
+    ],
+  },
+  出生: {
+    url: "/api/ggfwyth/ysyzt/getRycsxx",
+    column: [
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "出生地点",
+        property: "birthPlace",
+      },
+      {
+        label: "出生时间",
+        property: "birthTime",
+      },
+    ],
+  },
+  置业: {
+    url: "/api/ggfwyth/ysyzt/getRyzyxx",
+    column: [
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "车牌号码",
+        property: "cphm",
+      },
+      {
+        label: "房产共有情况",
+        property: "fcgyqk",
+      },
+      {
+        label: "房产面积",
+        property: "fcmj",
+      },
+      {
+        label: "房产用途",
+        property: "fcyt",
+      },
+      {
+        label: "房产坐落",
+        property: "fczl",
+      },
+      {
+        label: "企业地址",
+        property: "qydz",
+      },
+      {
+        label: "企业经营状态",
+        property: "qyjyzt",
+      },
+      {
+        label: "企业名称",
+        property: "qymc",
+      },
+      {
+        label: "统一社会信用代码",
+        property: "tyshxydm",
+      },
+    ],
+  },
+  退休养老: {
+    url: "/api/ggfwyth/ysyzt/getRyylxxList",
+    column: [
+      {
+        label: "身份证号码",
+        property: "identNo",
+      },
+      {
+        label: "养老金发放金额",
+        property: "yljffje",
+      },
+      {
+        label: "养老金发放日期",
+        property: "yljffrq",
+      },
+      {
+        label: "养老金类型",
+        property: "yljlx",
+      },
+    ],
+  },
+});
+//特殊标签弹框
 const onClickTag = (item) => {
+  tableType.title = item.name;
+  tableType.columns = columnsList["特殊标签"].column;
+  dialogShow.value = true;
+};
+//圆球弹框
+const onClickTag2 = (name) => {
+  tableType.title = name;
+  tableType.url = columnsList[name].url;
+  tableType.columns = columnsList[name].column;
+  getTable(tableType.url);
   dialogShow.value = true;
 };
 const paginationDialog = reactive({
   current: 1,
-  pageSize: 5,
+  pageSize: 10,
   total: 50,
   showTotal: 0,
 });
+//获取表格数据
+const getTable = (url) => {
+  http
+    .get(url, {
+      identNo: identNo.value,
+      current: paginationDialog.current,
+      size: paginationDialog.pageSize,
+    })
+    .then((res) => {
+      if(res.code==200){
+        tableType.data=res.data;
+      }
+    });
+};
 const close = (pagination) => {
   dialogShow.value = false;
 };
-const handlePagination = (pagination) => {
+//医疗金分页
-  dialogShow.value = false;
+const handlePaginationYLJ=(pagination)=>{
+
+}
+//养老金分页
+const handlePaginationYL=(pagination)=>{
+
+}
+//弹框分页
+const handlePaginationDlog = (pagination) => {
+  // dialogShow.value = false;
 };
 //地图过来接口
-const getData = (nm, identNo) => {
+const getData = (identNo) => {
   http
-    .get(`/api/ggfwyth/ysyzt/getRysmzqDetails?nm=${nm}&identNo=${identNo}`)
+    .get(`/api/ggfwyth/ysyzt/getRyJbxxDetails?identNo=${identNo}`)
     .then((res) => {
       if (res.code == 200) {
-        baseInfo.value = res.data;
+        baseInfo.value = res.data.ryjbxx;
-
+        dataMyTag.myTag.forEach((item) => {
-        dataMyTag.myTag.map((item) => {
+          res.data.rybqxx.forEach((itemm, indexx) => {
-          if (res.data[item.jkName]) {
+            if (itemm.bq == item.name) {
-            item.show = Number(res.data[item.jkName]);
+              item.show = 1;
-          }
+            }
+          });
+          // if (res.data[item.jkName]) {
+          //   item.show = Number(res.data[item.jkName]);
+          // }
         });
         if (res.data.yljlx) {
           data.value = [
@@ -468,6 +657,14 @@ const getData = (nm, identNo) => {
 //       }
 //     });
 // };
+const getYlj=()=>{
+  http.get('/api/ggfwyth/ysyzt/getRyylxxList',{identNo:identNo.value}).then(res=>{
+    if(res.code==200){
+      data.value=res.data;
+      // tableType.total=res.data.total;
+    }
+  })
+}
 const back = () => {
   if (jump.value == "detail") {
     router.back();
@@ -478,7 +675,9 @@ const back = () => {
 watch(
   () => props.message,
   (newValue, oldValue) => {
-    getData(props.message.nm, props.message.identNo);
+    identNo.value = props.message.identNo;
+    getData(props.message.identNo);
+    getYlj()
     jump.value = "map";
   }
 );
@@ -488,9 +687,13 @@ onMounted(() => {
     baseInfo.value.dz = routers.query.dz;
     baseInfo.value.identNo = routers.query.identNo;
     jump.value = "detail";
+    // getData("3");
+    // identNo.value="3"
+    getYlj()
   } else {
     jump.value = "map";
   }
+
 });
 </script>
 

src/view/sy_details.vue

@@ -551,12 +551,13 @@ const tableHeaderColor = (arg) => {
   return {
     // paddingLeft: "10px",
     letterSpacing: "1px",
-    fontSize: "15px",
+    fontSize: "16px",
     height: "79px",
     backgroundColor: "rgba(23, 62, 115)",
     color: "#fff",
     border: "none",
     textAlign: "center",
+      fontFamily: "PingFangSC, PingFang SC",
     // boxShadow: " inset 0px 0px 56px 0px rgba(173,221,255,0.5)",
   };
 };

src/view/sy_map.vue

@@ -1753,7 +1753,7 @@ const closeDetail = () => {
 const person_detail = (age) => {
   http
     .get(
-      `/api/ggfwyth/ysyzt/getRysmzq?page=${pagination.currentPage}&size=${
+      `/api/ggfwyth/ysyzt/getRyJbxxList?page=${pagination.currentPage}&size=${
         pagination.pageSize
       }&age=${age || ""}&committee=${cfCsZs.value || ""}&town=${
         cfJd.value || ""