From 90987233f46e0b9134059ddd2699a7bd2067d509 Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Fri, 2 Aug 2024 15:56:12 +0800
Subject: [PATCH] gx

---
 src/view/dialog/diaLogElderlyData.vue |  2 +-
 src/view/dialog/dialogEnrol.vue       |  4 ++-
 src/view/person/index.vue             | 12 +++++--
 src/view/sy_mapcopy.vue               |  2 +-
 src/view/sy_table.vue                 | 46 +++++++++++++++++++++++++--
 5 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/src/view/dialog/diaLogElderlyData.vue b/src/view/dialog/diaLogElderlyData.vue
index c12b47c..e98093c 100644
--- a/src/view/dialog/diaLogElderlyData.vue
+++ b/src/view/dialog/diaLogElderlyData.vue
@@ -188,7 +188,7 @@ const closeDialog = () => {
 :deep(.el-dialog) {
   --el-dialog-bg-color: none;
   --el-dialog-width: 55% !important;
-  --el-dialog-margin-top: 7vh;
+  --el-dialog-margin-top: 11vh;
 }
 
 .my-header {
diff --git a/src/view/dialog/dialogEnrol.vue b/src/view/dialog/dialogEnrol.vue
index 61f27e3..de369a8 100644
--- a/src/view/dialog/dialogEnrol.vue
+++ b/src/view/dialog/dialogEnrol.vue
@@ -240,7 +240,9 @@ const selectChange1 = (e) => {
 :deep(.el-dialog) {
   --el-dialog-bg-color: none;
   --el-dialog-width: 76% !important;
-  --el-dialog-margin-top: 7vh;
+  --el-dialog-margin-top: 11vh;
+  // --el-dialog-margin-bottom: 0px !important;
+  margin-bottom: 0px !important;
 }
 
 .my-header {
diff --git a/src/view/person/index.vue b/src/view/person/index.vue
index 205c6cd..bf3682a 100644
--- a/src/view/person/index.vue
+++ b/src/view/person/index.vue
@@ -73,8 +73,8 @@
                 <div class="main-tag-item">出生</div>
                 <div class="main-tag-item">学习</div>
                 <div class="main-tag-item">工作</div>
-                <div class="main-tag-item">置业</div>
                 <div class="main-tag-item">婚育</div>
+                <div class="main-tag-item">置业</div>
                 <div class="main-tag-item">退休<br />养老</div>
                 <div class="main-tag-item">身后事</div>
                 <div class="main-tag-item">综合</div>
@@ -146,7 +146,7 @@
 </template>
 
 <script setup>
-import { reactive, ref } from 'vue'
+import { reactive, ref,onMounted } from 'vue'
 import Dialog from "@/view/dialog/dialog.vue";
 const data = ref([
     {
@@ -246,6 +246,14 @@ const handlePagination = (pagination) => {
     dialogShow.value = false
 }
 
+onMounted(() => {
+    
+//   // 初始调用 updateClock 以立即显示时间
+//   updateClock();
+//   data.nowTab = router.currentRoute.value.fullPath;
+//   // 每隔一秒钟调用一次 updateClock 以更新时钟显示
+//   setInterval(updateClock, 1000);
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/view/sy_mapcopy.vue b/src/view/sy_mapcopy.vue
index 8a1b835..5a2ba17 100644
--- a/src/view/sy_mapcopy.vue
+++ b/src/view/sy_mapcopy.vue
@@ -47,7 +47,7 @@
                       'below-line2': index % 2 === 0,
                     },
                   ]"
-                  >{{ item.progress + "%" }}</span
+                  >{{ (item.progress).toFixed(2) + "%" }}</span
                 >
                 <span
                   style="color: #fff; white-space: nowrap"
diff --git a/src/view/sy_table.vue b/src/view/sy_table.vue
index 3a8a9d5..f9d8642 100644
--- a/src/view/sy_table.vue
+++ b/src/view/sy_table.vue
@@ -50,6 +50,7 @@
             <el-table
               border
               :data="data.tableData"
+              max-height="280"
               style="width: 100%; height: 280x"
               class="table_border"
               :row-style="rowState"
@@ -463,19 +464,37 @@ const data = reactive({
 });
 
 const tapshow = (parentId, childId) => {
-  // console.log(parentId, childId, "菜单名");
+  console.log(parentId, childId, "菜单名");
   data.taps1 = parentId.id;
   data.taps = childId;
   getData(parentId.name, parentId.son[childId].name);
+
+  // 年龄百分比
+  const menuName = [
+    "幼有善育",
+    "学有优教",
+    "劳有所得",
+    "病有良医",
+    "老有康养",
+    "住有宜居",
+    "弱有众扶",
+  ];
+  // 检查 parentId 的第一个字符是否与 menuName 中的第一个字符匹配
+  const firstChar = parentId.name.charAt(0);
+  const matchingMenu = menuName.find((name) => name.charAt(0) === firstChar);
+  if (matchingMenu) {
+    sevenYX(matchingMenu);
+  }
 };
 const toggleVisibility = (val) => {
-  // console.log(val, "最低生活保障");
+  console.log(val, "最低生活保障");
   data.tabPosition.forEach((parent) => {
     parent.visible = false;
     if (parent.id === val.id) {
       parent.visible = !parent.visible;
     }
   });
+  tapshow(val,0)
 };
 
 // 服务表格样式
@@ -533,9 +552,32 @@ const getData = async (name, fullName) => {
       }
     });
 };
+const sevenYX = (name) => {
+  http.get(`/api/ggfwyth/pg/qyx?ly=${name}`).then((res) => {
+    if (res.code == 200) {
+      console.log(res.data, "七优享");
+      data.tableData = [];
+      if (res.data.length > 0) {
+        res.data.forEach((item, index) => {
+          data.tableData.push({
+            highFrequencyApp: item.zb, //	指标
+            targetValue: item.mbz, //目标值(市)
+            targetValue1: item.mbz, ////目标值(县)
+            targetValue2: item.wcz, //完成值
+            targetValue3: item.sspm, //省市排名
+            targetValue4: item.zbqk, //是否达标 	指标情况
+            targetValue5: item.qtdw, //牵头单位
+            targetValue6: item.zrdw, //责任单位
+          });
+        });
+      }
+    }
+  });
+};
 
 onMounted(() => {
   getData("弱有所扶", "社会救助服务");
+  sevenYX("弱有众扶");
 });
 // onMounted(() => {
 //   let token = tools.data.get("token");