diff --git a/src/pages/devHistory/index.vue b/src/pages/devHistory/index.vue index 728e45f..c9e5e73 100644 --- a/src/pages/devHistory/index.vue +++ b/src/pages/devHistory/index.vue @@ -79,7 +79,9 @@ export default { color: #E3E3E3; } .text { + max-width: 1200px; margin: 30px 0; + overflow: auto; } } diff --git a/src/pages/industrial/index.vue b/src/pages/industrial/index.vue index b27edb4..ce26f86 100644 --- a/src/pages/industrial/index.vue +++ b/src/pages/industrial/index.vue @@ -13,7 +13,7 @@

{{ modules[1].form.subTitle }}

-
{{ modules[1].form.des }}
+
diff --git a/src/pages/mission/index.vue b/src/pages/mission/index.vue index 9a7de7d..e3e862d 100644 --- a/src/pages/mission/index.vue +++ b/src/pages/mission/index.vue @@ -15,7 +15,7 @@ :class="{ 'cursor-pointer': isLink(modules[1].form.link.linkName) }" @click="openLink(modules[1].form)" > - +
{{ modules[1].form.title }}
@@ -27,7 +27,7 @@ :class="{ 'cursor-pointer': isLink(modules[2].form.link.linkName) }" @click="openLink(modules[2].form)" > - +
{{ modules[2].form.title }}
diff --git a/src/pages/researchTeam/index.vue b/src/pages/researchTeam/index.vue index bd18155..7fdc54f 100644 --- a/src/pages/researchTeam/index.vue +++ b/src/pages/researchTeam/index.vue @@ -109,7 +109,7 @@ export default { filter() { const { title } = this this.modules[1].list = this.allList.filter(e => { - return e.name.includes(title) + return e.name.includes(title) || e.job.includes(title) || e.major.includes(title) || e.honor.includes(title) }) }, // 资讯 diff --git a/src/pages/scientific/index.vue b/src/pages/scientific/index.vue index 3e3c18d..4249b2d 100644 --- a/src/pages/scientific/index.vue +++ b/src/pages/scientific/index.vue @@ -8,7 +8,7 @@
-
+
    @@ -163,6 +163,7 @@ export default { @import url(../../plugins/wow/animate.css); @import "../../styles/page/page.scss"; .items { + margin-top: 2rem; li { position: relative; height: 600px; @@ -182,7 +183,6 @@ export default { top: 100px; left: 80px; width: 500px; - min-height: 350px; padding: 30px; color: #333; background-color: rgba(255, 255, 255, .85); @@ -315,7 +315,10 @@ export default { } } .about { - padding: 10rem 0 3rem; + display: flex; + flex-direction: column; + justify-content: center; + height: 840px; text-align: center; background: url(../../assets/images/about-bg.png) no-repeat center center; background-size: 100% 100%; @@ -353,6 +356,9 @@ export default { } } } + .about { + height: 30rem; + } } @media (max-width: 780px) { .program {