From 4e7e00b234a9082e3062c6ccce84a296d3322b1d Mon Sep 17 00:00:00 2001
From: yaoyuhao <yaoyuhao@ydool.com>
Date: Wed, 12 Jun 2024 11:27:16 +0800
Subject: [PATCH] 1

---
 src/view/echarts_sy/zwfw1.vue |  2 +-
 src/view/echarts_sy/zwfw2.vue |  5 +++--
 src/view/echarts_sy/zwfw3.vue |  4 ++--
 src/view/yl.vue               | 38 ++++++++++++++++++++---------------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/src/view/echarts_sy/zwfw1.vue b/src/view/echarts_sy/zwfw1.vue
index 5efefc9..575e62e 100644
--- a/src/view/echarts_sy/zwfw1.vue
+++ b/src/view/echarts_sy/zwfw1.vue
@@ -131,7 +131,7 @@ const option = {
 
   title: [
     {
-      text: "99.25%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
       right: "18%",
       bottom: "40%",
       textStyle: {
diff --git a/src/view/echarts_sy/zwfw2.vue b/src/view/echarts_sy/zwfw2.vue
index 17fdc5f..1666f73 100644
--- a/src/view/echarts_sy/zwfw2.vue
+++ b/src/view/echarts_sy/zwfw2.vue
@@ -127,8 +127,9 @@ const option = {
   
   title: [
     {
-      text: "0.03%",
-      right: "22%",
+      // text: "0.03%",
+      text:`${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
+      right: "19%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",
diff --git a/src/view/echarts_sy/zwfw3.vue b/src/view/echarts_sy/zwfw3.vue
index b4c6030..b16cd5f 100644
--- a/src/view/echarts_sy/zwfw3.vue
+++ b/src/view/echarts_sy/zwfw3.vue
@@ -126,8 +126,8 @@ const option = {
   
   title: [
     {
-      text: "0.02%",
-      right: "22%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
+      right: "19%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",
diff --git a/src/view/yl.vue b/src/view/yl.vue
index e324d54..6159709 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -183,7 +183,10 @@
           </div>
         </div>
         <div class="history">
-          <div class="history1" @click="showDialog('养老机构', '')">
+          <div
+            class="history1"
+            @click="showDialog('养老机构', '/api/ggfwyth/yljghmcList')"
+          >
             <div>
               <span>{{ data.yljgzlzx.yljg }}<span class="unit">个</span></span>
             </div>
@@ -198,7 +201,12 @@
             <img src="@/assets/YLimg/ylimg3.png" alt="" />
             <img class="historyimg" src="@/assets/YLimg/ylimg6.png" alt="" />
           </div> -->
-          <div class="history1" @click="showDialog('居家养老服务照料中心', '')">
+          <div
+            class="history1"
+            @click="
+              showDialog('居家养老服务照料中心', '/api/ggfwyth/yljgzlzxList')
+            "
+          >
             <div>
               <span>{{ data.yljgzlzx.zlzx }}<span class="unit">个</span></span>
             </div>
@@ -345,15 +353,15 @@ const xz_column = ref([
 const yl_column = ref([
   {
     label: "机构名称",
-    property: "name",
+    property: "mc",
   },
   {
     label: "机构地址",
-    property: "address",
+    property: "dz",
   },
   {
     label: "老人数量",
-    property: "oldMan",
+    property: "rzlrsl",
   },
 ]);
 // 表格分页
@@ -379,17 +387,15 @@ const showDialog = (title, url) => {
 };
 //获取表格数据
 const getTable = (url, currentPage) => {
-  dialogShow.value = true;
-  tableType.data = [];
-  // http
-  //   .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
-  //   .then((res) => {
-  //     if (res.code == 200) {
-  //       tableType.data = res.data;
-  //       pagination.total = res.count;
-  //       dialogShow.value = true;
-  //     }
-  //   });
+  http
+    .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
+    .then((res) => {
+      if (res.code == 200) {
+        tableType.data = res.data;
+        pagination.total = res.count;
+        dialogShow.value = true;
+      }
+    });
 };
 const close = () => {
   dialogShow.value = false;