diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue index 7c57e7d..c0ac814 100644 --- a/src/layouts/footer/index.vue +++ b/src/layouts/footer/index.vue @@ -34,15 +34,15 @@
- Email: std@mail.iasf.ac.cn + Email: {{ isSfel ? 'fel@mail.iasf.ac.cn' : 'std@mail.iasf.ac.cn' }}
- Telephone: 0086-755-21096026 + Telephone: {{ isSfel ? '0755-21096052' : '0086-755-21096026' }}
- Address: 268 Zhenyuan St, Building A3, Floor 3-6, Guangming District, Shenzhen, Guangdong, P.R.China + Address: {{ isSfel ? '自由电子激光工程经理部' : '268 Zhenyuan St, Building A3, Floor 3-6, Guangming District, Shenzhen, Guangdong, P.R.China' }}
@@ -65,6 +65,13 @@ export default { columns: [], }; }, + computed: { + // 是否是sfel网站 + isSfel() { + const id = this.$route.query.siteId || this.$store.state.content.site + return id == 3 + } + }, mounted(){ this.getColumn() }, diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index e3679d4..4c2b7bc 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -5,13 +5,12 @@
- - -
+ + +
- - - + +
@@ -23,7 +22,6 @@ export default { data() { return { isHome: this.$route.path === '/home' || this.$route.path === '/sfel', - isSfel: this.$route.path === '/sfel', showSearch: false, title: '', searchTimer: null @@ -32,10 +30,14 @@ export default { components: { navbar }, + computed: { + isSfel() { + return this.$route.path === '/sfel' + }, + }, watch: { '$route'() { - this.isHome = this.$route.path === '/home' || this.$route.path === '/sfel', - this.isSfel = this.$route.path === '/sfel' + this.isHome = this.$route.path === '/home' || this.$route.path === '/sfel' }, }, beforeDestroy () { @@ -51,6 +53,9 @@ export default { ]), toIndex() { this.$refs.nav.jump() + }, + stop() { + }, // 获取页面滚动距离(home长页专用) handleScroll () { @@ -131,31 +136,31 @@ $height: 90px; top: 67px; right: 89px; display: flex; - padding: 10px; + align-items: center; + padding: 10px 15px 10px 10px; background-color: #fff; - box-shadow: 0px 4px 7px 0px rgba(0,0,0,0.3); - .icon { - display: inline-flex; - justify-content: center; - align-items: center; - width: 46px; - height: 46px; - background: #1583FF; - border-radius: 0px 6px 6px 0px; - cursor: pointer; - } + box-shadow: 0px 6px 9px 0px rgba(0,0,0,0.3); input { width: 300px; - height: 46px; + height: 40px; padding: 0 40px 0 15px; font-size: 16px; color: #333; line-height: 46px; - background-color: #f5f5f5; border: 0; border-radius: 4px; outline: none; } + .search-icon { + padding-right: 15px; + margin: 0 15px; + cursor: pointer; + border-right: 1px solid #ccc; + } + .close-icon { + font-size: 28px; + cursor: pointer; + } } @media (max-width: 1660px) { .header { diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 86f4af8..8e937f8 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -1,6 +1,6 @@ -
-
-
-
组织架构
-

根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。

+
+
+

发展历程

+

DEVELOPMENT HISTORY

+ +
+
    +
  • 2022
    • +
  • 2021
    • +
  • 2020
    • +
+
+
2022
+
    +
  • +
    +

    10月11日

    +

    深圳综合粒子设施研究院加入国际超导加速器联盟

    +
    + +
    • +
  • +
    +

    10月11日

    +

    深圳综合粒子设施研究院加入国际超导加速器联盟

    +
    + +
    • +
  • +
    +

    10月11日

    +

    深圳综合粒子设施研究院加入国际超导加速器联盟

    +
    +
    • +
+
- -
-
-
-
@@ -70,6 +96,10 @@ export default { \ No newline at end of file diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue index d34a1ee..5b80510 100644 --- a/src/pages/overviewSetup/index.vue +++ b/src/pages/overviewSetup/index.vue @@ -16,13 +16,13 @@
-
组织架构
-

根据《深圳综合粒子设施理事会章程》有关规定，研究院实行理事会领导下的院长负责制，理事长由市长担任，副理事长由分管发改、科创副市长，以及中山大学、南方科技大学校长担任，理事成员包括市政府秘书长、相关副秘书长及政府部门、高等院校、科研机构、龙头企业相关负责同志。

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

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

- +
- +
diff --git a/src/pages/publish/index.vue b/src/pages/publish/index.vue index 165ef11..3f3fc0a 100644 --- a/src/pages/publish/index.vue +++ b/src/pages/publish/index.vue @@ -57,8 +57,8 @@ export default { // 查询文章列表 getArticle() { this.$post(this.api.newlyPublishedArticles, { - role: 1, - isadmin: false, + + siteId: this.$route.query.siteId || this.site, columnIds: [this.id], pageNum: this.page, diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue index 8cb79a3..7122432 100644 --- a/src/pages/publish/show.vue +++ b/src/pages/publish/show.vue @@ -150,8 +150,8 @@ export default { }).catch(err => {}) this.$post(this.api.newlyPublishedArticles, { - role: 1, - isadmin: false, + + pageNum: 1, pageSize: 5, siteId: this.$route.query.siteId || this.$store.state.content.site diff --git a/src/router/modules/overviewDevHistory.js b/src/router/modules/overviewDevHistory.js new file mode 100644 index 0000000..a87fd98 --- /dev/null +++ b/src/router/modules/overviewDevHistory.js @@ -0,0 +1,14 @@ +import BasicLayout from '@/layouts/home' +const name = 'overviewDevHistory' +export default { + path: `/${name}`, + component: BasicLayout, + children: [ + { + name, + path: `/${name}`, + component: () => import(`@/pages/${name}`), + meta: { title: '' } + } + ] +};