diff --git a/src/assets/img/Home/top20.png b/src/assets/img/Home/top20.png new file mode 100644 index 0000000000000000000000000000000000000000..0af2e91c374a78821927ff02ade6cedece6a9e50 Binary files /dev/null and b/src/assets/img/Home/top20.png differ diff --git a/src/components/layout/index.vue b/src/components/layout/index.vue index 8e084f445ebb1bb5390ea784ce1791ff9aa9bac6..62e5764a0a86db5c5ceed4e1146d14bd547bd9dc 100644 --- a/src/components/layout/index.vue +++ b/src/components/layout/index.vue @@ -108,6 +108,10 @@ export default { route: "/casesharing", name: "案例分享", }, + { + route: "/solution", + name: "解决方案", + }, ], loading: false, rules: { @@ -159,7 +163,9 @@ export default { const routerPath = !this.redirect || this.redirect === "/404" ? "/" : this.redirect this.$router.push({ path: routerPath }).catch((e) => {}) - this.loading = false + setTimeout(() => { + this.loading = false + }, 800) }) .catch((e) => { this.loading = false diff --git a/src/router/index.js b/src/router/index.js index 5e1f6d177e0d19d6b92d5fea23c24071bec8e16d..0cd0b3bd1fda4bc3d29ea68040ac5cdfcde85fa2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -29,8 +29,8 @@ export const constantRoutes = [ component: () => import("@/views/Home/ScientificResearch/index"), }, { - path: "/healthpopularization", - component: () => import("@/views/Home/HealthPopularization/index"), + path: "/solution", + component: () => import("@/views/Home/Solution/index"), }, ], }, diff --git a/src/views/Home/Solution/index.vue b/src/views/Home/Solution/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..a8e1909eff682dd3bf131ffe8aa1c4a16ecb6b9d --- /dev/null +++ b/src/views/Home/Solution/index.vue @@ -0,0 +1,14 @@ + + + diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue index 56830aa4e9617d546f705c54d506489854b29749..50b5b4356c2669b79b61eac868c3191cf8c97050 100644 --- a/src/views/Home/index.vue +++ b/src/views/Home/index.vue @@ -35,7 +35,7 @@
联盟地图
-
+
-
    +
    • @@ -59,19 +59,22 @@
- +
-
-
+
+
累计上报量机构排名
-
+
  • {{ index + 1 }}
    {{ item.unionName }}
    @@ -88,7 +91,9 @@
  • {{ index + 1 }}
    {{ item.unionName }}
    @@ -98,36 +103,32 @@
-
- -
-
-
健康科普
-
-
-
    -
  • - {{ item.name }} -
  • -
-
-
+ +
+
+
健康科普
+
+
+
    +
  • + {{ item.name }} +
  • +
+
+
@@ -205,34 +206,6 @@ export default { title: "典型案例小标题典型案例小标题", date: "2022-09-26", }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, - { - title: "典型案例小标题典型案例小标题", - date: "2022-09-26", - }, ], curTab: "新闻会议", rangeList: [], // 上报排名 @@ -297,14 +270,42 @@ export default { getRankTotal() { getRankTotal().then((res) => { if (res.code == 1) { - this.rangeList = res.data + // this.rangeList = res.data + this.rangeList = [ + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + ] } }) }, getCurrentQuarter() { getCurrentQuarter().then((res) => { if (res.code == 1) { - this.curQuarterList = res.data + // this.curQuarterList = res.data + this.curQuarterList = [ + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + { unionName: "包头医学院第二附属医院", nums: 12311 }, + ] } }) }, @@ -319,7 +320,7 @@ export default { margin-bottom: 38px; .box { width: 48%; - // height: 300px; + height: 300px; // background: blue; background: #fff; .video { @@ -364,6 +365,9 @@ export default { } } .dataAnalysis { + background: #fff; + margin-bottom: 32px; + padding: 32px; .box_title { width: 180px; height: 36px; @@ -377,8 +381,6 @@ export default { } .cenbox { height: 458px; - // background: url("~@/assets/img/Home/map.png") no-repeat center center; - // background-size: cover; .map { width: 100%; height: 422px; @@ -386,21 +388,20 @@ export default { } } .cenboxs { + width: 100%; display: flex; justify-content: space-between; - .range { - width: 46%; + width: 32%; background: #ffffff; border-radius: 4px; - border: 1px solid #d2d7f5; padding: 0 7px; .rangecontent { - margin-top: 6px; + margin-top: 24px; height: 408px; - background: rgba(78, 104, 255, 0.06); + background: rgba(78, 104, 255, 0.04); border-radius: 4px; - padding: 8px; + padding: 24px 32px; font-size: 14px; font-family: AlibabaPuHuiTiM; // color: #4e68ff; @@ -426,7 +427,41 @@ export default { background: url("~@/assets/img/Home/top10.png") no-repeat center center; background-size: contain; - margin-bottom: 8px; + margin-bottom: 18px; + } + .top20 { + height: 32px; + background: url("~@/assets/img/Home/top20.png") no-repeat center + center; + background-size: contain; + margin-bottom: 18px; + } + } + .left_range { + width: 60%; + .rangecontent { + .rangeList { + height: 100%; + display: flex; + flex-direction: column; + flex-wrap: wrap; + li { + width: 40%; + margin-bottom: 14px; + display: flex; + justify-content: space-between; + + div:nth-child(1) { + width: 20px; + } + div:nth-child(2) { + flex: 1; + } + div:nth-child(3) { + text-align: right; + } + } + } } } } @@ -438,7 +473,7 @@ export default { justify-content: space-between; li { cursor: pointer; - width: 43%; + width: 23%; margin-bottom: 24px; height: 188px; display: flex;