diff --git a/src/view/dialog/diaLogTab.vue b/src/view/dialog/diaLogTab.vue
index 0f41ccf..917ffd4 100644
--- a/src/view/dialog/diaLogTab.vue
+++ b/src/view/dialog/diaLogTab.vue
@@ -240,7 +240,7 @@ onMounted(() => {
   data.list1 = props.list1;
   data.year = props.year;
   const paginationTotal = document.querySelector(".el-pagination__total");
-  console.log(paginationTotal);
+  // console.log(paginationTotal);
   // paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`;
 });
 
diff --git a/src/view/dialog/dialog.vue b/src/view/dialog/dialog.vue
index a73851f..e8d1420 100644
--- a/src/view/dialog/dialog.vue
+++ b/src/view/dialog/dialog.vue
@@ -177,7 +177,7 @@ onMounted(() => {
   data.title = props.title;
   data.tableData = props.tableData;
   const paginationTotal = document.querySelector(".el-pagination__total");
-  console.log(paginationTotal);
+  // console.log(paginationTotal);
   // paginationTotal.innerText = `总共 ${props.pagination.total} 组数据`;
 });
 
diff --git a/src/view/echarts_sy/zwfw1.vue b/src/view/echarts_sy/zwfw1.vue
index 4814a54..575e62e 100644
--- a/src/view/echarts_sy/zwfw1.vue
+++ b/src/view/echarts_sy/zwfw1.vue
@@ -11,17 +11,17 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "2.0收件数",
-    value: 90,
+    value: 33044,
   },
   {
     name: "总收件数",
-    value: 100,
+    value: 33295,
   },
 ];
 //内圈数据
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "2.0收件数",
     itemStyle: {
       normal: {
@@ -45,7 +45,7 @@ var data = [
     },
   },
   {
-    value: 10,
+    value: dataList[1].value - dataList[0].value,
     name: "",
     itemStyle: {
       normal: {
@@ -63,7 +63,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "总收件数",
     itemStyle: {
       normal: {
@@ -75,7 +75,7 @@ var data = [
 //外圈数据
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -95,7 +95,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -106,34 +106,33 @@ const data1 = [
 ];
 
 const option = {
-  legend: 
-    {
-      selectedMode:false,
-      itemWidth: 10,
-      itemHeight: 10,
-      itemGap: 10,
-      icon: "circle",
-      data: ["2.0收件数","",'总收件数'],
-      bottom: "3%",
-      width: 380,
-      textStyle: {
-        color: "#ffffff", // 修改图例颜色为红色
-      },
-      formatter: function (params) {
-        var num = "";
-        for (let i = 0; i < dataList.length; i++) {
-          if (dataList[i].name == params) {
-            num = dataList[i].value;
-          }
-        }
-        return params + "  " + num;
-      },
+  legend: {
+    selectedMode: false,
+    itemWidth: 10,
+    itemHeight: 10,
+    itemGap: 10,
+    icon: "circle",
+    data: ["2.0收件数", "", "总收件数"],
+    bottom: "3%",
+    width: 380,
+    textStyle: {
+      color: "#ffffff", // 修改图例颜色为红色
     },
+    formatter: function (params) {
+      var num = "";
+      for (let i = 0; i < dataList.length; i++) {
+        if (dataList[i].name == params) {
+          num = dataList[i].value;
+        }
+      }
+      return params + "  " + num;
+    },
+  },
 
   title: [
     {
-      text: "90%",
-      right: "24%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
+      right: "18%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",
diff --git a/src/view/echarts_sy/zwfw2.vue b/src/view/echarts_sy/zwfw2.vue
index bc12318..1666f73 100644
--- a/src/view/echarts_sy/zwfw2.vue
+++ b/src/view/echarts_sy/zwfw2.vue
@@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "超期受理数",
-    value: 90,
+    value: 9,
   },
   {
     name: "应受理数",
-    value: 100,
+    value: 32561,
   },
 ];
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "超期受理数",
     itemStyle: {
       normal: {
@@ -58,7 +58,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "应受理数",
     itemStyle: {
       normal: {
@@ -69,7 +69,7 @@ var data = [
 ];
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -89,7 +89,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -127,8 +127,9 @@ const option = {
   
   title: [
     {
-      text: "90%",
-      right: "24%",
+      // 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 6b64bf3..b16cd5f 100644
--- a/src/view/echarts_sy/zwfw3.vue
+++ b/src/view/echarts_sy/zwfw3.vue
@@ -11,16 +11,16 @@ const chart = ref(); // 创建DOM引用
 const dataList = [
   {
     name: "超期办理数",
-    value: 90,
+    value: 7,
   },
   {
     name: "应办理数",
-    value: 100,
+    value: 31615,
   },
 ];
 var data = [
   {
-    value: 90,
+    value: dataList[0].value,
     name: "超期办理数",
     itemStyle: {
       normal: {
@@ -58,7 +58,7 @@ var data = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "应办理数",
     itemStyle: {
       normal: {
@@ -69,7 +69,7 @@ var data = [
 ];
 const data1 = [
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -89,7 +89,7 @@ const data1 = [
     },
   },
   {
-    value: 100,
+    value: dataList[1].value,
     name: "",
     itemStyle: {
       normal: {
@@ -126,8 +126,8 @@ const option = {
   
   title: [
     {
-      text: "90%",
-      right: "24%",
+      text: `${((dataList[0].value / dataList[1].value)*100).toFixed(2)}%`,
+      right: "19%",
       bottom: "40%",
       textStyle: {
         color: "#ffffff",
diff --git a/src/view/sy.vue b/src/view/sy.vue
index 3c7bfb3..a440734 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -441,25 +441,6 @@
             <i></i>
           </div>
         </div>
-        <!-- <table class="table">
-          <tbody>
-            <tr v-for="(item, index) in jtsyList" :key="index" style="display: flex; box-sizing: border-box">
-              <td>{{ item.name }}</td>
-              <td>
-                <div class="s1" style="font-size: 16px">{{ item.key1 }}</div>
-                :<span class="s2" style="font-size: 15px">{{
-                  item.key1_value
-                }}</span>
-              </td>
-              <td>
-                <span class="s1" style="font-size: 16px">{{ item.key2 }}</span>:<span class="s2"
-                  style="font-size: 15px">{{
-                    item.key2_value
-                  }}</span>
-              </td>
-            </tr>
-          </tbody>
-        </table> -->
         <div class="jtsyBox">
           <div class="jtsyBoxtop">
             <div class="jtsyBoxtop1" @click="showEc('公共自行车')">
@@ -488,7 +469,7 @@
                 </div>
                 <div>
                   {{ data.jtsyList[1].key2 }}：
-                  <span>{{ data.jtsyList[1].key2_value }}</span>
+                  <span>{{ data.jtsyList[1].key2_value }}h</span>
                 </div>
               </div>
             </div>
@@ -776,11 +757,11 @@ const pagination = reactive({
 });
 const handlePagination = (current) => {
   pagination.currentPage = current;
-  if (tableType.title == "医院卫生院") {
-    getTable2(tableType.url, pagination.currentPage);
-  } else {
+  // if (tableType.title == "医院卫生院") {
+  //   getTable2(tableType.url, pagination.currentPage);
+  // } else {
     getTable(tableType.url, pagination.currentPage);
-  }
+  // }
 };
 const showDialog = (title, url) => {
   tableType.title = title;
@@ -803,7 +784,8 @@ const showDialog2 = (title, url) => {
     tableType.title = title;
     tableType.url = url;
     tableType.columns = ylws_columns.value;
-    getTable2(url, pagination.currentPage);
+     dialogShow.value = true;
+    // getTable(url, pagination.currentPage);
   }
 };
 
@@ -1099,44 +1081,6 @@ const jysyList = ref([
   },
 ]);
 
-const jtsyList = ref([
-  {
-    name: "公共自行车",
-    key1: "骑行次数",
-    key1_value: "1172491",
-    key2: "骑行时长",
-    key2_value: "1283h",
-  },
-  {
-    name: "电动单车",
-    key1: "骑行次数",
-    key1_value: "1172491",
-    key2: "骑行时长",
-    key2_value: "1283h",
-  },
-  {
-    name: "公共汽车",
-    key1: "公交线路",
-    key1_value: "176",
-    key2: "乘坐人次",
-    key2_value: "239741",
-  },
-  {
-    name: "长途汽车",
-    key1: "班车次数",
-    key1_value: "133",
-    key2: "客流量",
-    key2_value: "192874",
-  },
-  {
-    name: "高铁",
-    key1: "列车班次",
-    key1_value: "23",
-    key2: "客流量",
-    key2_value: "113414",
-  },
-]);
-
 // 县城学校师生比样式
 const cs = computed(() => {
   let str = `--teacher: ${jysyList.value[0].teacher}; --total: ${
@@ -1300,6 +1244,10 @@ const getData = async () => {
         data.tysyList[index].value = res.data.whtysy[key];
       });
       // 交通事业
+      data.jtsyList[1].key1_value = res.data.transportation.electricbicycle.cyclingFrequency
+      data.jtsyList[1].key2_value = res.data.transportation.electricbicycle.cyclingDduration
+      data.jtsyList[4].key1_value = res.data.transportation.highSpeedRail.trainSchedule
+      data.jtsyList[4].key2_value = res.data.transportation.highSpeedRail.passengerFlow
     }
   });
 };
@@ -2396,6 +2344,7 @@ const showTab = (val) => {
     margin-bottom: 20px;
 
     .choose {
+      cursor: pointer;
       text-align: center;
       line-height: 40px;
       width: 170px;
@@ -2411,6 +2360,7 @@ const showTab = (val) => {
     }
 
     .noChoose {
+      cursor: pointer;
       text-align: center;
       line-height: 40px;
       width: 170px;
@@ -2872,6 +2822,7 @@ table {
     .jtsyBoxtop1 {
       position: relative;
       display: flex;
+      overflow: hidden;
       .turn {
         width: 146px;
         height: 104px;
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;