Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/router/index.js

@@ -9,7 +9,7 @@ const router = createRouter({
   routes: [
     {
       path: '/',
-      redirect: '/guide'
+      redirect: '/home/index'
     },
     {
       name: '引导页',

src/view/analyze.vue

@@ -260,9 +260,9 @@ const data = reactive({
       data: ["0", "0", "0", "0", "0", "0"], //医保支出万元以上
     },
   ], //数据查看
-  leftCenterYear: ["2019","2020", "2021", "2022", "2023", "2024"], //年份
+  leftCenterYear: ["2019", "2020", "2021", "2022", "2023", "2024"], //年份
-  zccs1: ["图书馆", "交通出行", "景区"], //一码通
+  zccs1: ["图书馆", "公共自行车", "小奔通"], //一码通
-  zccs2: ["100", "130", "220"], //一码通
+  zccs2: ["100", "3924", "3905"], //一码通
   analysis: {
     lnr: {
       fgxy: { rs: "1610", zb: "51.77" },
@@ -288,7 +288,12 @@ const data = reactive({
         woman: "194178",
       },
     },
-    push: [{ name: "小奔通", num: 4196 }],
+    push: [
+      { name: "小奔通", num: 4196 },
+      { name: "交通", num: 102 },
+      { name: "两慢病", num: 2 },
+      { name: "天气", num: 102 },
+    ],
   },
 });
 const minData = reactive({
@@ -354,15 +359,14 @@ const getData = async () => {
       });
 
       data.leftCenterYear = res.data.dataShow.year;
-      data.ViewData[2].data = res.data.dataShow.gxyrs.gxyrs;//高血压
+      data.ViewData[2].data = res.data.dataShow.gxyrs.gxyrs; //高血压
-      data.ViewData[2].value = res.data.dataShow.gxyrs.total;//高血压年份
+      data.ViewData[2].value = res.data.dataShow.gxyrs.total; //高血压年份
-      data.ViewData[3].data = res.data.dataShow.tnbrs.tnbrs;//糖尿病
+      data.ViewData[3].data = res.data.dataShow.tnbrs.tnbrs; //糖尿病
-      data.ViewData[3].value = res.data.dataShow.tnbrs.total;//糖尿病年份
+      data.ViewData[3].value = res.data.dataShow.tnbrs.total; //糖尿病年份
-      data.ViewData[7].data = res.data.dataShow.dibao.dbjzrc;//低保
+      data.ViewData[7].data = res.data.dataShow.dibao.dbjzrc; //低保
-      data.ViewData[7].value = res.data.dataShow.dibao.total;//低保年份
+      data.ViewData[7].value = res.data.dataShow.dibao.total; //低保年份
-      data.ViewData[8].data = res.data.dataShow.tekun.tkjzrc;//特困
+      data.ViewData[8].data = res.data.dataShow.tekun.tkjzrc; //特困
-      data.ViewData[8].value = res.data.dataShow.tekun.total;//特困年份
+      data.ViewData[8].value = res.data.dataShow.tekun.total; //特困年份
-
     }
   });
 };

src/view/echarts_yl/ylJHSY.vue

@@ -85,7 +85,7 @@ const getOption = () => {
       },
     },
     legend: {
-      data: ["计划生育人数", "计划生育补贴金额"],
+      data: ["计划生育补贴人数", "计划生育补贴金额"],
       top: "3%",
       textStyle: {
         fontSize: 16,
@@ -125,7 +125,7 @@ const getOption = () => {
       {
         type: "value",
         scale: true,
-        name: "计划生育人数",
+        name: "计划生育补贴人数",
         splitLine: {
           //分割线配置
           show: false,
@@ -212,7 +212,7 @@ const getOption = () => {
       {
         z: 1,
         yAxisIndex: 0,
-        name: "计划生育人数",
+        name: "计划生育补贴人数",
         data: data.list1,
         barWidth: 20,
         type: "bar",

src/view/education.vue

@@ -447,6 +447,14 @@ const tableType = reactive({
       label: "学校名称",
       property: "xxmc",
     },
+    {
+      label: "区域",
+      property: "qq",
+    },
+    {
+      label: "学段",
+      property: "xd",
+    },
     {
       label: "班级数",
       property: "bjs",
@@ -459,14 +467,7 @@ const tableType = reactive({
       label: "学生数",
       property: "xss",
     },
-    {
+
-      label: "区域",
-      property: "qq",
-    },
-    {
-      label: "学段",
-      property: "xd",
-    },
     {
       label: "性质",
       property: "xz",

src/view/guide.vue

@@ -215,6 +215,7 @@ const changeTab = (val) => {
     transTime.value = 0
   }, 800);
 }
+
 const toPage = (val) => {
   router.push({
     path: `${val}`,

src/view/sy.vue

@@ -280,7 +280,7 @@
                 <img src="../assets/images/sy/dropDown.png" />
                 <span>龙游通平均日活</span>
               </div>
-              <span style="margin-right: 20px">2714</span>
+              <span style="margin-right: 20px">9073</span>
             </div>
           </div>
           <el-table