diff --git a/src/view/analyze.vue b/src/view/analyze.vue
index 618e352..dbf1d17 100644
--- a/src/view/analyze.vue
+++ b/src/view/analyze.vue
@@ -195,72 +195,72 @@ const data = reactive({
   ViewData: [
     {
       name: "医保支出万元以上",
-      value: "11112",
+      value: "0",
       show: true,
-      data: ["100", "120", "199", "133", "210"], //医保支出万元以上
+      data: ["0", "0", "0", "0", "0", "0"], //医保支出万元以上
     },
     {
       name: "大病住院",
-      value: "120",
+      value: "0",
       show: false,
-      data: ["10", "12", "19", "13", "21"], //大病住院
+      data: ["0", "0", "0", "0", "0", "0"], //大病住院
     },
     {
       name: "高血压",
-      value: "2345",
+      value: "0",
       show: false,
-      data: ["100", "10", "199", "13", "210"], //高血压
+      data: ["0", "0", "0", "0", "0", "0"], //高血压
     },
     {
       name: "糖尿病",
-      value: "1241",
+      value: "0",
       show: false,
-      data: ["100", "120", "19", "133", "210"], //糖尿病
+      data: ["0", "0", "0", "0", "0", "0"], //糖尿病
     },
     {
       name: "高血脂",
-      value: "1414",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "13", "210"], //高血脂
+      data: ["0", "0", "0", "0", "0", "0"], //高血脂
     },
     {
       name: "高血糖",
-      value: "2355",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "133", "10"], //高血糖
+      data: ["0", "0", "0", "0", "0", "0"], //高血糖
     },
     {
       name: "残疾",
-      value: "455",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "133", "210"], //残疾
+      data: ["0", "0", "0", "0", "0", "0"], //残疾
     },
     {
       name: "低保",
-      value: "142",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "133", "210"], //低保
+      data: ["0", "0", "0", "0", "0", "0"], //低保
     },
     {
       name: "特困",
-      value: "98",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "133", "210"], //特困
+      data: ["0", "0", "0", "0", "0", "0"], //特困
     },
     {
       name: "其他疾病",
-      value: "144",
+      value: "0",
       show: false,
-      data: ["100", "120", "199", "133", "210"], //其他疾病
+      data: ["0", "0", "0", "0", "0", "0"], //其他疾病
     },
   ],
   DataViewing: [
     {
       name: "医保支出万元以上",
-      data: ["100", "120", "199", "133", "210"], //医保支出万元以上
+      data: ["0", "0", "0", "0", "0", "0"], //医保支出万元以上
     },
   ], //数据查看
-  leftCenterYear: ["2019", "2020", "2021", "2022", "2023"], //年份
+  leftCenterYear: ["2019","2020", "2021", "2022", "2023", "2024"], //年份
   zccs1: ["图书馆", "交通出行", "景区"], //一码通
   zccs2: ["100", "130", "220"], //一码通
   analysis: {
@@ -310,7 +310,7 @@ const minData = reactive({
 });
 // 数据查看
 const onViewData = (value, i) => {
-  clearInterval(interval); //清除定时器
+  clearInterval(interval); //关闭动画
   data.ViewData[i].show = !data.ViewData[i].show;
   data.DataViewing = data.ViewData.filter((item) => item.show).map((item) => ({
     name: item.name,
@@ -353,7 +353,16 @@ const getData = async () => {
         data.whistleblower.culeTotal.data[index] = res.data.lnr.rksj[key];
       });
 
-      // dataShow
+      data.leftCenterYear = res.data.dataShow.year;
+      data.ViewData[2].data = res.data.dataShow.gxyrs.gxyrs;//高血压
+      data.ViewData[2].value = res.data.dataShow.gxyrs.total;//高血压年份
+      data.ViewData[3].data = res.data.dataShow.tnbrs.tnbrs;//糖尿病
+      data.ViewData[3].value = res.data.dataShow.tnbrs.total;//糖尿病年份
+      data.ViewData[7].data = res.data.dataShow.dibao.dbjzrc;//低保
+      data.ViewData[7].value = res.data.dataShow.dibao.total;//低保年份
+      data.ViewData[8].data = res.data.dataShow.tekun.tkjzrc;//特困
+      data.ViewData[8].value = res.data.dataShow.tekun.total;//特困年份
+
     }
   });
 };
diff --git a/src/view/education.vue b/src/view/education.vue
index 2f81e4d..b0d284c 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -92,32 +92,49 @@
           <div class="schoolb">
             <img src="../assets/eduImg/xxgkTop.png" class="gkTop" alt="" />
             <div class="grade">
-              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
+              <div
+                class="schoolbs"
+                @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+              >
                 <span class="spot">初中</span>
                 <span>{{ data.xxgk.czxxsl }}</span>
               </div>
-              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
+              <div
+                class="schoolbs"
+                @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+              >
                 <span class="spot">高中</span>
                 <span>{{ data.xxgk.gzxxsl }}</span>
               </div>
             </div>
             <div class="grade">
-              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
+              <div
+                class="schoolbs"
+                @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+              >
                 <span class="spot">小学</span>
                 <span>{{ data.xxgk.xxxxsl }}</span>
               </div>
-              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
+              <div
+                class="schoolbs"
+                @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+              >
                 <span class="spot">中职</span>
                 <span>{{ data.xxgk.zzxxsl }}</span>
               </div>
             </div>
             <div class="grade grade1">
-              <div class="schoolbs" @click="showDialog('学校', '/api/ggfwyth/schoolList')">
+              <div
+                class="schoolbs"
+                @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+              >
                 <span class="spot">幼儿园</span>
                 <span>{{ data.xxgk.yeyxxsl }}</span>
               </div>
               <div class="schoolbs">
-                <span class="spot" @click="showDialog('学校', '/api/ggfwyth/schoolList')"
+                <span
+                  class="spot"
+                  @click="showDialog('学校', '/api/ggfwyth/schoolList')"
                   >特殊教育</span
                 >
                 <span>{{ data.xxgk.tsjyxxsl }}</span>
@@ -426,31 +443,22 @@ const tableType = reactive({
   url: "",
   title: "",
   columns: [
-    // {
-    //   label: "学校",
-    //   property: "school",
-    // },
-    // {
-    //   label: "教师数",
-    //   property: "teacher",
-    // },
-    // {
-    //   label: "学生数",
-    //   property: "student",
-    // },
-    // {
-    //   label: "班级数",
-    //   property: "banji",
-    // },
-
+    {
+      label: "学校名称",
+      property: "xxmc",
+    },
     {
       label: "班级数",
       property: "bjs",
     },
     {
-      label: "	教师数",
+      label: "教师数",
       property: "jss",
     },
+    {
+      label: "学生数",
+      property: "xss",
+    },
     {
       label: "区域",
       property: "qq",
@@ -459,14 +467,6 @@ const tableType = reactive({
       label: "学段",
       property: "xd",
     },
-    {
-      label: "学生数",
-      property: "xss",
-    },
-    {
-      label: "	学校名称",
-      property: "xxmc",
-    },
     {
       label: "性质",
       property: "xz",