From 70e84c2fa80b6df99d6589469cf8c121d04376c7 Mon Sep 17 00:00:00 2001
From: lrw <319150264@qq.com>
Date: Fri, 26 May 2023 16:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Home/Map/data.js   | 28 ++++++++++++++++++++++++++++
 src/views/Home/Map/index.vue |  3 ++-
 src/views/Home/index.vue     | 21 +++++++++++++--------
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 src/views/Home/Map/data.js

diff --git a/src/views/Home/Map/data.js b/src/views/Home/Map/data.js
new file mode 100644
index 0000000..f0c37e2
--- /dev/null
+++ b/src/views/Home/Map/data.js
@@ -0,0 +1,28 @@
+export default [
+  { value: 45, name: "重庆市" },
+  { value: 20589, name: "浙江省" },
+  { value: 2149, name: "云南省" },
+  { value: 1308, name: "四川省" },
+  { value: 13175, name: "上海市" },
+  { value: 555, name: "陕西省" },
+  { value: 30, name: "山西省" },
+  { value: 410, name: "山东省" },
+  { value: 33, name: "青海省" },
+  { value: 7346, name: "宁夏" },
+  { value: 24635, name: "内蒙古" },
+  { value: 1014, name: "辽宁省" },
+  { value: 1043, name: "江西省" },
+  { value: 16477, name: "江苏省" },
+  { value: 3, name: "吉林省" },
+  { value: 1490, name: "湖南省" },
+  { value: 938, name: "湖北省" },
+  { value: 179, name: "黑龙江省" },
+  { value: 2970, name: "河南省" },
+  { value: 936, name: "河北省" },
+  { value: 633, name: "广西" },
+  { value: 36296, name: "广东省" },
+  { value: 63, name: "甘肃省" },
+  { value: 986, name: "福建省" },
+  { value: 205, name: "北京市" },
+  { value: 1059, name: "安徽省" },
+]
diff --git a/src/views/Home/Map/index.vue b/src/views/Home/Map/index.vue
index 85ad32e..29e5136 100644
--- a/src/views/Home/Map/index.vue
+++ b/src/views/Home/Map/index.vue
@@ -5,6 +5,7 @@
 import * as echarts from "echarts"
 import china from "./china.json"
 import allCode from "./allCode.json"
+import data from "./data"
 export default {
   data() {
     return {
@@ -123,7 +124,7 @@ export default {
               },
             },
             animation: false,
-            data: [{ name: "安徽省", value: 0 }],
+            data: data,
           },
         ],
       }
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index b63eb4f..5ce5342 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -13,7 +13,7 @@
               v-for="(e, index) in tabList"
               :key="index"
               :label="e.title"
-              :name="index + 1 + ''"
+              :name="e.type"
             >
               <ul
                 class="tabslist videoTabList"
@@ -248,16 +248,21 @@ export default {
       exampleList: [],
       tabList: [
         {
-          title: "新闻会议",
+          title: "通知公告",
+          type: "2",
         },
         {
-          title: "通知公告",
+          title: "新闻会议",
+          type: "1",
         },
+
         {
           title: "学术动态",
+          type: "3",
         },
         {
           title: "健康知识",
+          type: "4",
         },
       ],
       noticeTopList: [
@@ -277,7 +282,7 @@ export default {
         },
       ],
       noticeList: [],
-      curTab: "1",
+      curTab: "2",
       listLoading: false,
       rangeList: [], // 上报排名
       curQuarterList: [], //当前季度排名
@@ -326,9 +331,8 @@ export default {
     }
   },
   created() {
-    this.getArticleList("1")
+    this.getArticleList("2")
     this.getArticleList("6")
-    console.log(this.uploadPrefix)
   },
   mounted() {
     this.getRankTotal()
@@ -338,8 +342,9 @@ export default {
       document
         .querySelector("#vue-admin-beautiful")
         .addEventListener("scroll", () => {
-          let scrollTop = document.querySelector("#vue-admin-beautiful")
-            .scrollTop
+          let scrollTop = document.querySelector(
+            "#vue-admin-beautiful"
+          ).scrollTop
           if (scrollTop >= 700) {
             this.showFixed = true
           } else {
-- 
2.22.0