gx

src/view/analyze.vue

@@ -834,6 +834,8 @@ const data = reactive({
       { name: "交通", num: 4026 },
       { name: "两慢病", num: 2 },
       { name: "天气", num: 102 },
+            { name: "低保低边医疗救助政策", num: 87 },
+      { name: "孕妇生育津贴申领", num: 19 },
     ],
   },
 });

src/view/person/index.vue

@@ -93,13 +93,13 @@
         </div>
       </div>
       <div class="person-side">
-        <div v-if="rightList.length < 1">
+        <div >
           <div class="my-label">
-            <div class="my-label-title">{{ tableType.title }}</div>
+            <div class="my-label-title">{{ pdT }}</div>
           </div>
           <div class="my-table">
             <el-table
-              :data="data"
+              :data="tableType.data"
               border
               style="width: 100%"
               max-height="500"
@@ -134,128 +134,27 @@
               :total="pagination.total"
               prev-text="上一页"
               next-text="下一页"
-              v-model:current-page="pagination.currentPage"
+              v-model:current-page="pagination.current"
-              @current-change="handlePaginationYL"
+              @current-change="handlePagination"
             />
           </div>
         </div>
-        <div v-else>
+        <div >
           <div class="my-label">
-            <div class="my-label-title">基本信息</div>
+            <div class="my-label-title">{{ pdT }}</div>
           </div>
           <div class="my-info">
-            <div class="my-info-item">
+            <div
-              <div class="my-info-label">姓&emsp;&emsp;名</div>
+              class="my-info-item"
-              <div class="my-info-content">
+              v-for="(item, index) in tableType.columns"
-                <p>{{ baseInfo.nm || baseInfo.xm }}</p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">证件类型</div>
-              <div class="my-info-content">
-                <p>{{ baseInfo.zjlx || "身份证" }}</p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">证件号码</div>
-              <div class="my-info-content">
-                <p>******************</p>
-                <!-- <p>{{ baseInfo.identNo }}</p> -->
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">政治面貌</div>
-              <div class="my-info-content">
-                <p>{{ baseInfo.zzmm || "" }}</p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">居住状态</div>
-              <div class="my-info-content">
-                <p v-if="baseInfo.jzzt == 1">居住</p>
-                <p v-else-if="baseInfo.jzzt == 0">未居住</p>
-                <p v-else></p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">民&emsp;&emsp;族</div>
-              <div class="my-info-content">
-                <p>{{ baseInfo.ethnic }}</p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">性&emsp;&emsp;别</div>
-              <div class="my-info-content">
-                <p>{{ baseInfo.gender }}</p>
-              </div>
-            </div>
-            <div class="my-info-item">
-              <div class="my-info-label">户口登记地</div>
-              <div class="my-info-content">
-                <p>{{ baseInfo.domicAddr || baseInfo.dz }}</p>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- <div class="my-label">
-          <div class="my-label-title">医疗金发放情况</div>
-        </div> -->
-        <!-- <div class="my-table">
-          <el-table
-            :data="data1"
-            border
-            style="width: 100%"
-            max-height="250"
-            :header-cell-style="{
-              border: 'none',
-              height: '60px',
-              fontSize: '18px',
-              color: '#fff',
-            }"
-            :row-style="{
-              letterSpacing: '1px',
-              fontSize: '16px',
-              height: '50px',
-              backgroundColor: 'rgba(31, 63, 113, 1)',
-              color: '#fff',
-            }"
             >
-            <el-table-column
+              <div class="my-info-label">{{ item.label }}</div>
-              prop="type"
+              <div class="my-info-content" v-if="rightList?.length != 0">
-              label="医疗类型"
+                <p>{{ pd(item.label, rightList[item.property]) }}</p>
-              width="115"
+              </div>
-              align="center"
+            </div>
-            />
+          </div>
-            <el-table-column
+        </div>
-              prop="date"
-              label="使用日期"
-              width="115"
-              align="center"
-            />
-            <el-table-column
-              prop="sum"
-              label="使用金额"
-              width="115"
-              align="center"
-            />
-            <el-table-column
-              prop="sum"
-              label="详情"
-              width="135"
-              align="center"
-            />
-          </el-table>
-          <el-pagination
-            background
-            layout="prev, pager, next"
-            :page-size="pagination1.pageSize"
-            :total="pagination1.total"
-            prev-text="上一页"
-            next-text="下一页"
-            v-model:current-page="pagination1.currentPage"
-            @current-change="handlePaginationYLJ"
-          />
-        </div> -->
       </div>
     </div>
     <Dialog
@@ -272,7 +171,7 @@
 </template>
 
 <script setup>
-import { reactive, ref, onMounted, watch } from "vue";
+import { reactive, ref, onMounted, watch, computed } from "vue";
 import Dialog from "@/view/dialog/dialog.vue";
 import { useRouter, useRoute } from "vue-router";
 import http from "@/utils/request.js";
@@ -444,43 +343,7 @@ const pagination = reactive({
   total: 50,
   showTotal: 0,
 });
-const handleTableChange = (pagination) => {
-  console.log(pagination);
-};
 const baseInfo = ref({});
-//存放医疗金数据
-const data1 = ref([
-  {
-    type: "职工医疗",
-    date: "2023/12",
-    sum: "500",
-    info: "人民医院******",
-  },
-  {
-    type: "职工医疗",
-    date: "2023/12",
-    sum: "500",
-    info: "人民医院******",
-  },
-  {
-    type: "职工医疗",
-    date: "2023/12",
-    sum: "500",
-    info: "人民医院******",
-  },
-  {
-    type: "职工医疗",
-    date: "2023/12",
-    sum: "500",
-    info: "人民医院******",
-  },
-]);
-const pagination1 = reactive({
-  current: 1,
-  pageSize: 5,
-  total: 50,
-  showTotal: 0,
-});
 const dialogShow = ref(false);
 const tableType = reactive({
   url: "",
@@ -517,10 +380,6 @@ const columnsList = reactive({
         label: "火化日期",
         property: "hhrq",
       },
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "死亡日期",
         property: "swrq",
@@ -530,10 +389,6 @@ const columnsList = reactive({
   学习: {
     url: "/api/ggfwyth/ysyzt/getRyxxxx",
     column: [
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "学校",
         property: "xx",
@@ -547,10 +402,6 @@ const columnsList = reactive({
   工作: {
     url: "/api/ggfwyth/ysyzt/getRygzxx",
     column: [
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "工作单位",
         property: "gzdw",
@@ -564,10 +415,6 @@ const columnsList = reactive({
   出生: {
     url: "/api/ggfwyth/ysyzt/getRycsxx",
     column: [
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "出生地点",
         property: "birthPlace",
@@ -581,10 +428,6 @@ const columnsList = reactive({
   置业: {
     url: "/api/ggfwyth/ysyzt/getRyzyxx",
     column: [
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "车牌号码",
         property: "cphm",
@@ -626,10 +469,6 @@ const columnsList = reactive({
   退休养老: {
     url: "/api/ggfwyth/ysyzt/getRyylxxList",
     column: [
-      {
-        label: "身份证号码",
-        property: "identNo",
-      },
       {
         label: "养老金发放金额",
         property: "yljffje",
@@ -647,10 +486,6 @@ const columnsList = reactive({
   综合: {
     url: "/api/ggfwyth/ysyzt/getRyzhxx",
     column: [
-      // {
-      //   label: "身份证号码",
-      //   property: "identNo",
-      // },
       {
         label: "医疗保险类型",
         property: "ylbxlx",
@@ -666,6 +501,37 @@ const columnsList = reactive({
     ],
   },
 });
+//判断title
+const pdT = computed(() => {
+  if (tableType.title == "综合") {
+    return "医疗金发放情况";
+  } else if (tableType.title == "退休养老") {
+    return "养老金发放情况";
+  } else {
+    return tableType.title;
+  }
+});
+//判断类型
+const pd = computed(() => {
+  return (name, type) => {
+    if (name == "医疗保险类型") {
+      if (type == "0") {
+        return "城乡居民基本医疗保险";
+      } else {
+        return "职工基本医疗保险";
+      }
+    } else if (name == "养老金类型") {
+      if (type == "0") {
+        return "城乡居民养老金";
+      } else {
+        return "职工养老金";
+      }
+    } else {
+      return type;
+    }
+  };
+});
+
 //特殊标签弹框
 const onClickTag = (item) => {
   tableType.title = item.name;
@@ -677,7 +543,7 @@ const onClickTag2 = (name) => {
   tableType.title = name;
   tableType.url = columnsList[name].url;
   tableType.columns = columnsList[name].column;
-  getTable(tableType.url);
+  getTable(tableType.url, true);
 };
 const paginationDialog = reactive({
   current: 1,
@@ -689,40 +555,45 @@ const paginationDialog = reactive({
 const rightType = ref(0);
 //存放右侧单条数据
 const rightList = ref([]);
-//获取表格数据
+//获取右侧表格数据
-const getTable = (url) => {
+const getTable = (url, csh) => {
   http
     .get(url, {
       identNo: identNo.value,
-      current: paginationDialog.current,
+      current: pagination.current,
-      size: paginationDialog.pageSize,
+      size: pagination.pageSize,
     })
     .then((res) => {
       if (res.code == 200) {
         tableType.data = res.data;
+        if (csh) {
           if (tableType.data?.length > 1) {
             rightType.value = 1;
           } else {
-          if (tableType.data == null) {
+            if (tableType.data == null || tableType.data.length == 0) {
-            rightList.value = [];
+              rightList.value.length = 0;
             } else {
               rightList.value = tableType.data[0];
             }
             rightType.value = 0;
           }
+        }
+
         console.log(rightType.value);
       }
     });
 };
-const close = (pagination) => {
+
+const close = () => {
   dialogShow.value = false;
 };
-//医疗金分页
+//右侧表格分页
-const handlePaginationYLJ = (pagination) => {};
+const handlePagination = (currentPage) => {
-//养老金分页
+  pagination.current = currentPage;
-const handlePaginationYL = (pagination) => {};
+  getTable(tableType.url, false);
+};
 //弹框分页
-const handlePaginationDialog = (pagination) => {
+const handlePaginationDialog = (currentPage) => {
   // dialogShow.value = false;
 };
 //地图过来接口
@@ -784,20 +655,7 @@ const getData = (identNo) => {
 //       }
 //     });
 // };
-const getYlj = () => {
+
-  http
-    .get("/api/ggfwyth/ysyzt/getRyylxxList", {
-      identNo: identNo.value,
-      current: pagination.current,
-      size: pagination.pageSize,
-    })
-    .then((res) => {
-      if (res.code == 200) {
-        data.value = res.data;
-        // tableType.total=res.data.total;
-      }
-    });
-};
 const back = () => {
   if (jump.value == "detail") {
     router.back();
@@ -810,7 +668,6 @@ watch(
   (newValue, oldValue) => {
     identNo.value = props.message.identNo;
     getData(props.message.identNo);
-    getYlj();
     onClickTag2("出生");
     jump.value = "map";
   }
@@ -821,9 +678,8 @@ onMounted(() => {
     baseInfo.value.dz = routers.query.dz;
     baseInfo.value.identNo = routers.query.identNo;
     jump.value = "detail";
-    // getData("3");
+    getData("3");
-    // identNo.value="3"
+    identNo.value = "3";
-    getYlj();
     onClickTag2("出生");
   } else {
     jump.value = "map";
@@ -1002,7 +858,7 @@ onMounted(() => {
 
       .my-info-label {
         position: relative;
-        min-width: 80px;
+        min-width: 40px;
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
         font-size: 18px;

src/view/sy_map.vue

@@ -1713,6 +1713,8 @@ const open_detail = () => {
 const close = () => {
   dialogShow.value = false;
   pagination.total = 100;
+  pagination.currentPage = 1;
+  tableType.data=[];
 };
 //表格分页
 const handlePagination = (current) => {