Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/person/index.vue

@@ -106,6 +106,50 @@
         <div class="videoCamera" v-if="dataMyTag.camera" @click="openCamera()">
           <img src="@/assets/images/sxt_detail.png" alt="" />
         </div>
+        <div class="main_table" v-if="showFw">
+          <el-table
+            :data="tableMain.data"
+            border
+            style="width: 100%"
+            height="220px"
+            :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',
+            }"
+          >
+            <template v-for="item in tableMain.columns">
+              <el-table-column
+                v-if="item.type == 'slot'"
+                :label="item.label"
+                :prop="item.property"
+                :width="item.width"
+              >
+                <template #default="scope">
+                  <!-- 医疗保险类型 -->
+                  <div v-if="item.property == 'xs'">
+                    <div v-if="scope.row.xs == 0">否</div>
+                    <div v-else>是</div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column
+                v-else
+                :width="item.width"
+                :prop="item.property"
+                :label="item.label"
+              />
+            </template>
+          </el-table>
+        </div>
       </div>
       <div class="person-side">
         <div v-if="dataMyTag.title == '医疗保险'">
@@ -335,17 +379,15 @@
               class="my-info-item"
               v-if="dataMyTag.title == '学习' && baseInfo.eduPhase"
             >
-              <div
+              <div class="my-info-label" style="min-width: 40px">学历</div>
-                class="my-info-label"
-                style="min-width: 40px"
-              >
-                学历
-              </div>
               <div class="my-info-content">
                 <p>{{ baseInfo.eduPhase || "" }}</p>
               </div>
             </div>
-            <div class="my-info-item" v-if="dataMyTag.title == '婚育' && baseInfo.maritalStatus">
+            <div
+              class="my-info-item"
+              v-if="dataMyTag.title == '婚育' && baseInfo.maritalStatus"
+            >
               <div class="my-info-label">婚姻状况</div>
               <div class="my-info-content">
                 <p>{{ baseInfo.maritalStatus || "" }}</p>
@@ -402,6 +444,7 @@ import { VideoCamera } from "@element-plus/icons-vue";
 import http from "@/utils/request.js";
 import tools from "@/utils/tools";
 import { ElMessage, ElMessageBox } from "element-plus";
+import { columns } from "element-plus/es/components/table-v2/src/common.mjs";
 const router = useRouter();
 const routers = useRoute();
 const identNo = ref("");
@@ -593,6 +636,54 @@ const camerali = reactive({
   hlsUriSsl: "",
   name: "",
 });
+const tableMain = reactive({
+  data: [
+    {
+      date: "1",
+      xs: "1",
+    },
+    {
+      date: "2",
+      xs: "0",
+    },
+    {
+      date: "1",
+      xs: "1",
+    },
+    {
+      date: "2",
+      xs: "0",
+    },
+    {
+      date: "1",
+      xs: "1",
+    },
+    {
+      date: "2",
+      xs: "0",
+    },
+    {
+      date: "1",
+      xs: "1",
+    },
+    {
+      date: "2",
+      xs: "0",
+    },
+  ],
+  columns: [
+    {
+      label: "服务内容",
+      property: "date",
+    },
+    {
+      label: "是否已享受",
+      property: "xs",
+      type: "slot",
+      width: "200px",
+    },
+  ],
+});
 const tableType = reactive({
   url: "",
   //特殊标签
@@ -1037,6 +1128,47 @@ const visitRecords = () => {
       }
     });
 };
+//获取服务内容
+const showFw=ref(false)
+const getFw = () => {
+  http
+    .get(
+      `/api/ggfwyth/pg/fwjgqdxq?sfzhm=${routers.query.identNo}&xh=${routers.query.xh}`
+    )
+    .then((res) => {
+      if (res.code == 200) {
+        showFw.value=true;
+        // tableType.data = res.data;
+        // tableType.name = data.name;
+        // tableType.typeId = routers.query.id;
+        // dialogShow.value = true;
+        tableMain.data.length=0;
+        if (res.data.wxs.length > 0) {
+          res.data.wxs.forEach((item, index) => {
+            let obj = {
+              xs:'0',
+              date: item.bzlx,
+            };
+            tableMain.data.push(obj);
+          });
+        }
+        // data.tableData.length = [];
+        if (res.data.ysx.length > 0) {
+          res.data.ysx.forEach((item, index) => {
+            let obj = {
+              xs:'1',
+              date: item.bzlx,
+            };
+            tableMain.data.push(obj);
+          });
+        }
+      } else {
+        ElMessage.warning({
+          message: res.message,
+        });
+      }
+    });
+};
 // 打开摄像头
 const openCamera = () => {
   // if (errorMessage.value) {
@@ -1098,6 +1230,7 @@ onMounted(() => {
     }
     onClickTag2("出生", "出生");
     getshs();
+    getFw();
   } else {
     jump.value = "map";
   }
@@ -1276,6 +1409,81 @@ onMounted(() => {
       background-size: 100% 100%;
       z-index: 3;
     }
+    .main_table {
+      box-sizing: border-box;
+      padding: 15px;
+      opacity: 0.85;
+      z-index: 5;
+      position: absolute;
+      bottom: -30px;
+      left: 90px;
+      width: 600px;
+      height: 250px;
+      background: linear-gradient(
+          270deg,
+          rgba(0, 52, 131, 0.69) 0%,
+          rgba(0, 32, 83, 0.77) 50%,
+          rgba(0, 60, 131, 0.74) 100%
+        ),
+        radial-gradient(
+          128% 99% at 100% 46%,
+          rgba(0, 48, 125, 0.29) 0%,
+          rgba(0, 61, 134, 0.42) 100%
+        );
+      box-shadow: inset 0px 0px 56px 0px rgba(173, 221, 255, 0.5);
+      border-radius: 8px;
+      :deep(.el-table) {
+        --el-table-header-bg-color: #ffffff3a;
+        --el-table-header-text-color: #ffffff;
+        --el-table-row-hover-bg-color: rgba(255, 255, 255, 0.1);
+        --el-table-header-hover-bg-color: rgba(255, 255, 255, 0.1);
+        --el-table-border-color: rgba(255, 255, 255, 0.1);
+        --el-table-row-hover-bg-color: rgba(255, 255, 255, 0.1);
+        --el-table-bg-color: none;
+        --el-table-tr-bg-color: none;
+        --el-table-border-color: rgba(255, 255, 255, 0.32);
+        --el-table-row-hover-bg-color: rgba(255, 255, 255, 0.1);
+        --el-table-text-color: #ffffff;
+      }
+
+      :deep(.el-pagination) {
+        --el-pagination-button-disabled-bg-color: none;
+        --el-pagination-bg-color: none;
+        --el-pagination-button-bg-color: none;
+        --el-pagination-button-color: #fff;
+        color: #fff;
+        justify-content: center;
+        margin-top: 24px;
+
+        .btn-prev,
+        .btn-next {
+          margin: 0;
+          color: #fff;
+          background: rgba(255, 255, 255, 0.14);
+          border: 1px solid #6bade1;
+
+          &:disabled {
+            color: #fff;
+            background: rgba(255, 255, 255, 0.14);
+            border: 1px solid #6bade1;
+          }
+        }
+
+        .el-pager {
+          li {
+            color: #fff;
+            background: rgba(255, 255, 255, 0.14);
+            border: 1px solid #6bade1;
+            margin: 0;
+          }
+
+          .is-active {
+            background: rgba(0, 144, 255, 0.49);
+            border: 1px solid #6bade1;
+          }
+        }
+      }
+    }
   }
 
   .my-label {

src/view/sy_details.vue

@@ -1224,7 +1224,7 @@ const handleRowClick = (row) => {
   } else {
     router.push({
       path: `/home/index/person`,
-      query: { identNo: data.identNo, type: "detail" },
+      query: { identNo: data.identNo,xh: routers.query.xh, type: "detail" },
     });
   }
 };