diff --git a/src/const/column.js b/src/const/column.js index f38a5b6..1789b06 100644 --- a/src/const/column.js +++ b/src/const/column.js @@ -22,32 +22,6 @@ name: '子级优先栏目' } ], - long: [ - { - name: 'SFEL', - path: 'sfel' - }, - { - name: 'SFEL-科普之窗', - path: 'science' - }, - { - name: 'SFEL-装置介绍-实验站', - path: 'exp' - }, - { - name: 'SFEL-人才队伍', - path: 'talent' - }, - { - name: 'SFEL-用户共享', - path: 'userSharing' - }, - { - name: 'SFEL-概况', - path: 'survey' - }, - ], // 出版物类型 publicationTypes: [ { diff --git a/src/pages/devHistory/index.vue b/src/pages/devHistory/index.vue new file mode 100644 index 0000000..728e45f --- /dev/null +++ b/src/pages/devHistory/index.vue @@ -0,0 +1,85 @@ + + + + + diff --git a/src/pages/estate/event/index.vue b/src/pages/estate/event/index.vue index c1fa526..df06781 100644 --- a/src/pages/estate/event/index.vue +++ b/src/pages/estate/event/index.vue @@ -97,14 +97,14 @@ export default { .history { h2 { position: relative; - font-size: 2.2rem; + font-size: 2rem; font-family: PingFangSC-Semibold, PingFang SC; font-weight: 600; color: #1C1C1C; } .en { margin: -15px 0 40px; - font-size: 2.2rem; + font-size: 2rem; font-family: PingFangSC-Light, PingFang SC; font-weight: 300; color: #E3E3E3; @@ -150,7 +150,7 @@ export default { } .year { margin: 0 0 20px 20px; - font-size: 3.8rem; + font-size: 3.2rem; font-family: ToppanBunkyuMidashiGothicStdN-ExtraBold, ToppanBunkyuMidashiGothicStdN; font-weight: 800; color: #1A81F4; diff --git a/src/pages/estate/index/index.vue b/src/pages/estate/index/index.vue index 794e8a1..b55bf6e 100644 --- a/src/pages/estate/index/index.vue +++ b/src/pages/estate/index/index.vue @@ -381,7 +381,7 @@ export default { .des { height: 60px; margin: 10px 0; - font-size: 1.1rem; + font-size: 1rem; font-family: SFProDisplay; font-weight: 500; color: #333; diff --git a/src/pages/estate/location/index.vue b/src/pages/estate/location/index.vue index a97e61e..a8f8400 100644 --- a/src/pages/estate/location/index.vue +++ b/src/pages/estate/location/index.vue @@ -89,7 +89,7 @@ export default { } .tab-content { - width: 80%; + width: 70%; max-width: 1504px; padding-bottom: 100px; margin: 30px auto 0; @@ -131,7 +131,7 @@ export default { } h6 { margin-bottom: 24px; - font-size: 2.4rem; + font-size: 2rem; font-family: PingFangSC-Light, PingFang SC; font-weight: 300; } diff --git a/src/pages/estate/survey/index.vue b/src/pages/estate/survey/index.vue index f866a8a..82aebfe 100644 --- a/src/pages/estate/survey/index.vue +++ b/src/pages/estate/survey/index.vue @@ -83,7 +83,7 @@ export default { h6 { position: relative; margin-bottom: 30px; - font-size: 1.4rem; + font-size: 1.2rem; font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi; font-weight: bold; color: #333; diff --git a/src/pages/governance/index.vue b/src/pages/governance/index.vue index 5532ebf..e8e0938 100644 --- a/src/pages/governance/index.vue +++ b/src/pages/governance/index.vue @@ -4,7 +4,6 @@
-
@@ -13,7 +12,7 @@

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

-
{{ modules[1].form.des }}
+
@@ -22,26 +21,17 @@
-

发顺丰散发放散阀发放散阀

-
产业促进委员会对理事会负责,是贯彻战略性新兴产业发展需求牵引导向,强化设施服务深圳和大湾区高新技术产业发展,加强“从0 到1”原创科技成果持续供给产业,强化科技服务经济的专门机构。 - - 产业促进委员会主要负责根据深圳和大湾区产业需求及发展动态,挖掘、凝练高新技术产业发展的“卡脖子”技术和下一代产业发展关键技术;对研究院设施的产业需求、建设方案和性能指标进行咨询建议,参与编制设施中产业板块线站机时分配方案;收集产业用户对设施的管理运行模式、装置使用和升级需求、重点合作课题的建议和意见,为设施服务产业发展方向、研究计划、运行管理等的完善和改进提供决策参考;负责对定期举办产业用户培训进行指导,积极引导高新技术企业与研究院深度合作,促进设施服务产业经济发展。
+

{{ modules[3].form.title }}

+
- +
@@ -49,14 +39,12 @@ + + diff --git a/src/pages/mission/index.vue b/src/pages/mission/index.vue index 16bab68..9a7de7d 100644 --- a/src/pages/mission/index.vue +++ b/src/pages/mission/index.vue @@ -4,7 +4,6 @@
-
@@ -19,7 +18,7 @@
{{ modules[1].form.title }}
-
{{ modules[1].form.des }}
+
{{ modules[2].form.title }}
-
{{ modules[2].form.des }}
+
@@ -39,36 +38,17 @@
-
指导思想
+
{{ modules[3].form.title }}
@@ -192,8 +172,8 @@ export default { padding: 0 20px; } h6 { - margin-bottom: 20px; - font-size: 1.5rem; + margin-bottom: 1rem; + font-size: 1.3rem; color: #272727; @include ellipsis(); } @@ -205,11 +185,8 @@ export default { } } @media (max-width: 1200px) { - body { - width: 100% !important; - } .inner { - width: 100%; + width: 98%; } .item { img { @@ -228,153 +205,25 @@ export default { } } } -@media (max-width: 320px) { - .wrap { - .single-banner { - .banner-img { - height: 13rem; - } - .texts { - top: 6rem; - left: 12rem; - .banner-title{ - font-size: 1.5rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } - } - } - .block { - .inner { - img { - height: 18rem; - } - .texts { - padding: 1.25rem; - top: 1.5rem; - } - } - } -} -@media (min-width: 320px) and (max-width: 375px) { - .wrap { - .single-banner { - .banner-img { - height: 13rem; - } - .texts { - top: 6rem; - left: 12rem; - .banner-title{ - font-size: 1.5rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } - } - } -} -@media (min-width: 375px) and (max-width: 480px) { - .wrap { - .single-banner { - .banner-img { - height: 20rem; - } - .texts { - top: 10rem; - left: 12rem; - .banner-title{ - font-size: 1.5rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } - } - } -} -@media (min-width: 480px) and (max-width: 640px) { - .wrap { - .single-banner { - .banner-img { - height: 25rem; - } - .texts { - top: 10rem; - left: 12rem; - .banner-title{ - font-size: 2rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } +@media (max-width: 980px) { + .mind { + .list { + flex-direction: column; } - } -} -@media (min-width: 640px) and (max-width: 768px) { - .wrap { - .single-banner { - .banner-img { - height: 35rem; - } - .texts { - top: 20rem; - left: 12rem; - .banner-title{ - font-size: 2rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } - } - } -} -@media (min-width: 768px) and (max-width: 980px) { - .wrap { - .single-banner { - .banner-img { - height: 35rem; - } - .texts { - top: 20rem; - left: 12rem; - .banner-title{ - font-size: 2rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } - } + li { + width: 100%; } } } -@media (min-width: 980px) and (max-width: 1200px) { - .wrap { - .single-banner { - .banner-img { - height: 40rem; +@media (max-width: 480px) { + .mind { + li { + .pic { + width: 150px; + height: 130px; } .texts { - top: 20rem; - left: 12rem; - .banner-title{ - font-size: 2rem; - margin-bottom: .5rem; - } - .banner-des{ - font-size: .85rem; - } + width: calc(100% - 150px); } } } diff --git a/src/pages/org/index.vue b/src/pages/org/index.vue new file mode 100644 index 0000000..d125ce4 --- /dev/null +++ b/src/pages/org/index.vue @@ -0,0 +1,253 @@ + + + + + \ No newline at end of file diff --git a/src/pages/overview/index.vue b/src/pages/overview/index.vue new file mode 100644 index 0000000..252a98c --- /dev/null +++ b/src/pages/overview/index.vue @@ -0,0 +1,347 @@ + + + + + diff --git a/src/pages/researchTeam/index.vue b/src/pages/researchTeam/index.vue new file mode 100644 index 0000000..bd18155 --- /dev/null +++ b/src/pages/researchTeam/index.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file diff --git a/src/pages/scientific/index.vue b/src/pages/scientific/index.vue new file mode 100644 index 0000000..3e3c18d --- /dev/null +++ b/src/pages/scientific/index.vue @@ -0,0 +1,378 @@ + + + + + diff --git a/src/pages/talentCenter/index.vue b/src/pages/talentCenter/index.vue index b8a7f58..753c387 100644 --- a/src/pages/talentCenter/index.vue +++ b/src/pages/talentCenter/index.vue @@ -82,11 +82,12 @@