fix

src/layouts/footer/index.vue

@@ -1,47 +1,66 @@
 <template>
   <div>
-    <div v-if="showDefaultPath.includes($route.path)" class="footer">
+    <div v-if="showDefaultPath.includes($route.path)"
+         class="footer">
       <div class="info">
         <div class="leftBox">
-          <img class="m-b-20" src="@/assets/images/iasf.png" alt="">
+          <img class="m-b-20"
+               src="@/assets/images/iasf.png"
+               alt="">
           <p class="meta">Copyright ©2002- 2021</p>
           <p class="meta">Institute of Advanced Science Facilities, ShenzhenIASF</p>
           <p class="meta">Tel：400-0010-998</p>
         </div>
-        <div v-for="(item, i) in columns" :key="i" class="column">
+        <div v-for="(item, i) in columns"
+             :key="i"
+             class="column">
           <h6 @click="columnTo(item)">{{ item.columnName }}</h6>
-          <ul v-if="item.children.length" class="children">
-            <li v-for="(column, j) in item.children" :key="j" @click="columnTo(column)">{{ column.columnName }}</li>
+          <ul v-if="item.children.length"
+              class="children">
+            <li v-for="(column, j) in item.children"
+                :key="j"
+                @click="columnTo(column)">{{ column.columnName }}</li>
           </ul>
         </div>
       </div>
       <a class="copyright">粤ICP备2020131940号 粤公安网34565432456765432号</a>
     </div>
 
-    <div v-if="showContactPath.includes($route.path)" class="contact">
+    <div v-if="showContactPath.includes($route.path)"
+         class="contact">
       <div class="inner">
         <div class="title">
           <h6>Contact us</h6>
           <p class="text">CONTACT US</p>
         </div>
         <div class="region">
-          <img class="dot" src="@/assets/images/dot.png" alt="">
+          <img class="dot"
+               src="@/assets/images/dot.png"
+               alt="">
           <p class="name">Shenzhen</p>
         </div>
         <div class="info">
-          <img class="logo" src="@/assets/images/logo.png" alt="">
+          <img class="logo"
+               src="@/assets/images/logo.png"
+               alt="">
           <div class="texts">
             <div class="lines">
               <div class="line">
-                <img class="icon" src="@/assets/images/mail.png" alt="">
+                <img class="icon"
+                     src="@/assets/images/mail.png"
+                     alt="">
                 Email: {{ isSfel ? 'fel@mail.iasf.ac.cn' : 'std@mail.iasf.ac.cn' }}
               </div>
               <div class="line">
-                <img class="icon" src="@/assets/images/tel.png" alt="">
+                <img class="icon"
+                     src="@/assets/images/tel.png"
+                     alt="">
                 Telephone: {{ isSfel ? '0755-21096052' : '0086-755-21096026' }}
               </div>
               <div class="line">
-                <img class="icon" src="@/assets/images/address.png" alt="">
+                <img class="icon"
+                     src="@/assets/images/address.png"
+                     alt="">
                 Address: {{ isSfel ? '自由电子激光工程经理部' : '268 Zhenyuan St, Building A3, Floor 3-6, Guangming District, Shenzhen, Guangdong, P.R.China' }}
               </div>
             </div>
@@ -60,7 +79,7 @@ export default {
   mixins: [mixins],
   data () {
     return {
-      showDefaultPath: ['/home'], // 展示默认页脚的页面
+      showDefaultPath: ['/home', '/iasf'], // 展示默认页脚的页面
       showContactPath: ['/news', '/sfel', '/talent', '/about', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面
       columns: [],
     };
@@ -120,14 +139,14 @@ export default {
         li {
             margin: 12px 0;
             font-size: 14px;
-      color: #6D7384;
+            color: #6d7384;
             white-space: nowrap;
             cursor: pointer;
         }
     }
     .copyright {
         font-size: 14px;
-    color: #6D7384;
+        color: #6d7384;
     }
 }
 .contact {
@@ -139,11 +158,10 @@ export default {
         margin: 0 auto;
     }
     .title {
-
         width: 419px;
         height: 263px;
         padding: 147px 0 0 40px;
-    background-color: #0854FE;
+        background-color: #0854fe;
         h6 {
             z-index: 2;
             position: relative;
@@ -260,5 +278,4 @@ export default {
         }
     }
 }
-
 </style>

src/layouts/header/index.vue

@@ -1,55 +1,108 @@
 <template>
   <div :class="['header', { channel: isHome, estate: isEstate }]">
-    <a class="logo" @click="toIndex">
+    <a class="logo"
+       @click="toIndex">
       <template v-if="!$store.getters.getModelType">
-      <img :src="require('@/assets/images/logo2.png')" alt="">
+        <img :src="require('@/assets/images/logo2.png')"
+             alt="">
       </template>
       <template v-else>
 
-      <img :src="require('@/assets/images/' + (isSfel ? 'logo2' : isHome ? 'logo' : 'logo2') + '.png')" alt="">
+        <img :src="require('@/assets/images/' + (isSfel ? 'logo2' : isHome ? 'logo' : 'logo2') + '.png')"
+             alt="">
       </template>
 
     </a>
     <!-- pc端 -->
     <template v-if="$store.getters.getModelType">
-      <navbar v-if="navShow" ref="nav" :isHome.sync="isHome" :isEstate.sync="isEstate" @showMoreBtns="updateBtnsType"></navbar>
+      <navbar v-if="navShow"
+              ref="nav"
+              :isHome.sync="isHome"
+              :isEstate.sync="isEstate"
+              @showMoreBtns="updateBtnsType"></navbar>
       <div class="tools">
-        <img class="search" :src="require('@/assets/images/search' + (isHome ? '-white' : '') + '.png')" alt="" @click.stop="toggleSearch">
+        <img class="search"
+             :src="require('@/assets/images/search' + (isHome ? '-white' : '') + '.png')"
+             alt=""
+             @click.stop="toggleSearch">
+        <template v-if="site == 2">
+          <img class="search"
+               :src="require('@/assets/images/email' + (isHome ? '-white' : '') + '.png')"
+               alt=""
+               @click.stop="toMail">
+          <img class="search"
+               :src="require('@/assets/images/oa' + (isHome ? '-white' : '') + '.png')"
+               alt=""
+               @click.stop="toMail">
+        </template>
         <template v-if="$i18n.locale == 'en'">
-          <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang">
+          <img :src="require('@/assets/images/cn' + (isHome ? '-white' : '') + '.png')"
+               alt=""
+               @click.stop="toggleLang">
         </template>
         <template v-else-if="$i18n.locale == 'zh'">
-          <img :src="require('@/assets/images/en' + (isHome ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang">
+          <img :src="require('@/assets/images/en' + (isHome ? '-white' : '') + '.png')"
+               alt=""
+               @click.stop="toggleLang">
         </template>
 
-
-        <div v-if="showSearch" class="search-wrap" @click.stop="stop">
-          <input ref="search" type="text" :placeholder="$t('column.titlePlaceholder')" v-model="title">
-          <img class="search-icon" src="@/assets/images/search.png" alt="" @click="handleSearch">
-          <i class="el-icon-close close-icon" @click="showSearch = false"></i>
+        <div v-if="showSearch"
+             class="search-wrap"
+             @click.stop="stop">
+          <input ref="search"
+                 type="text"
+                 :placeholder="$t('column.titlePlaceholder')"
+                 v-model="title">
+          <img class="search-icon"
+               src="@/assets/images/search.png"
+               alt=""
+               @click="handleSearch">
+          <i class="el-icon-close close-icon"
+             @click="showSearch = false"></i>
         </div>
       </div>
     </template>
     <!-- 手机端 -->
     <template v-else>
-      <i class="rightBox" :class="modelType ? 'el-icon-s-fold': 'el-icon-s-unfold' " @click="updateModelType"></i>
-      <div class="contentBox" v-show="modelType">
-        <navbar ref="nav" :isHome.sync="isHome" :updateModelType="updateType"></navbar>
+      <i class="rightBox"
+         :class="modelType ? 'el-icon-s-fold': 'el-icon-s-unfold' "
+         @click="updateModelType"></i>
+      <div class="contentBox"
+           v-show="modelType">
+        <navbar ref="nav"
+                :isHome.sync="isHome"
+                :updateModelType="updateType"></navbar>
         <div class="modelBox">
-          <div class="searchBox"><img class="search" :src="require('@/assets/images/search' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')" alt="" @click.stop="toggleSearch"></div>
+          <div class="searchBox"><img class="search"
+                 :src="require('@/assets/images/search' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')"
+                 alt=""
+                 @click.stop="toggleSearch"></div>
           <div class="languageBox">
             <!-- <img :src="require('@/assets/images/cn' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang"> -->
             <template v-if="$i18n.locale == 'en'">
-          <img :src="require('@/assets/images/cn' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang">
+              <img :src="require('@/assets/images/cn' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')"
+                   alt=""
+                   @click.stop="toggleLang">
             </template>
             <template v-else-if="$i18n.locale == 'zh'">
-          <img :src="require('@/assets/images/en' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')" alt="" @click.stop="toggleLang">
+              <img :src="require('@/assets/images/en' + (isHome && $store.getters.getModelType ? '-white' : '') + '.png')"
+                   alt=""
+                   @click.stop="toggleLang">
             </template>
           </div>
-          <div v-if="showSearch" class="search-wrap" @click.stop="stop">
-            <input ref="search" type="text" :placeholder="$t('column.titlePlaceholder')" v-model="title">
-            <img class="search-icon" src="@/assets/images/search.png" alt="" @click="handleSearch">
-            <i class="el-icon-close close-icon" @click="showSearch = false"></i>
+          <div v-if="showSearch"
+               class="search-wrap"
+               @click.stop="stop">
+            <input ref="search"
+                   type="text"
+                   :placeholder="$t('column.titlePlaceholder')"
+                   v-model="title">
+            <img class="search-icon"
+                 src="@/assets/images/search.png"
+                 alt=""
+                 @click="handleSearch">
+            <i class="el-icon-close close-icon"
+               @click="showSearch = false"></i>
           </div>
         </div>
       </div>
@@ -81,6 +134,9 @@ export default {
     isSfel () {
       return this.$route.path === '/sfel'
     },
+    site () {
+      return this.$route.query.siteId || this.$store.state.content.site
+    }
   },
   watch: {
     '$route.path': {
@@ -138,6 +194,14 @@ export default {
         this.$refs.search.focus()
       })
     },
+    // mail点击
+    toMail () {
+      window.open('https://qiye.aliyun.com/alimail/auth/login?custom_login_flag=1&reurl=%2Falimail%2F')
+    },
+    // oa点击
+    toOa () {
+      window.open('http://oa.iasf.ac.cn/sys/portal/page.jsp')
+    },
     // 切换语言
     toggleLang () {
       let id = +(this.$route.query.siteId || this.$store.state.content.site)
@@ -182,7 +246,7 @@ $height: 90px;
         border-bottom: 1px solid #f7f7f7;
     }
     &.estate {
-    background-color: rgba(0, 0, 0, .15);
+        background-color: rgba(0, 0, 0, 0.15);
     }
     .logo {
         position: absolute;
@@ -260,7 +324,8 @@ $height: 90px;
     max-height: 30rem;
     overflow-y: scroll;
 }
-.searchBox, .languageBox{
+.searchBox,
+.languageBox {
     padding-left: 20px;
     height: 56px;
     line-height: 56px;
@@ -281,7 +346,7 @@ $height: 90px;
             margin-right: 20px;
         }
         .tools {
-      right: 30px
+            right: 30px;
         }
     }
 }
@@ -292,7 +357,8 @@ $height: 90px;
         background-color: #fff;
     }
     .contentBox {
-    .searchBox, .languageBox{
+        .searchBox,
+        .languageBox {
             padding-left: 20px;
             height: 40px;
             line-height: 40px;
@@ -304,10 +370,8 @@ $height: 90px;
         width: 70%;
         input {
             width: 15rem;
-      padding: 0 .5rem 0 .1rem;
+            padding: 0 0.5rem 0 0.1rem;
         }
     }
-  
 }
-
 </style>

src/mixins/page/index.js

@@ -109,6 +109,10 @@ export default {
     // 判断是否有添加链接
     isLink(linkName) {
       return linkName !== '无' && linkName !== ''
+    },
+    // 关联栏目专用，获取栏目标题
+    getColumnTitle(form) {
+      return form.columnTitle == 1 ? form.columnName : form.columnTitleCustom
     }
   }
 };

src/pages/article/activity.vue

@@ -140,7 +140,7 @@ export default {
 <style lang="scss" scoped>
 @import './editor.css';
 .content {
-    width: 1400px;
+    width: 1200px;
 }
 .banner {
     height: 280px;

src/pages/article/editor.css

@@ -1,4 +1,4 @@
-.mce-content-body:not([dir=rtl]) blockquote {
+.mce-content-body:not([dir='rtl']) blockquote {
     padding: 8px 15px;
     border-left: 0;
     background-color: #ededed;
@@ -10,6 +10,9 @@
     /* width: 900px; */
     margin: 0 auto;
 }
+.tiny-wrap .blue {
+    color: #1583ff;
+}
 .tiny-wrap blockquote p {
     margin: 0;
     font-style: italic;
@@ -33,10 +36,12 @@
     font-weight: 400;
     color: #101010;
     line-height: 32px;
+    white-space: pre-wrap;
 }
-.tiny-wrap .en-block p, .tiny-wrap .en-block .img-des {
+.tiny-wrap .en-block p,
+.tiny-wrap .en-block .img-des {
     font-family: ProximaNova;
-  letter-spacing: -.0135em;
+    letter-spacing: -0.0135em;
     line-height: 1.5em;
 }
 .tiny-wrap .block .tiny-title {
@@ -72,3 +77,40 @@
     width: 300px;
     height: 190px;
 }
+.tiny-wrap .people {
+    display: flex;
+    align-items: center;
+    margin-bottom: 30px;
+}
+.tiny-wrap .people .pic {
+    max-width: 400px;
+    margin-right: 50px;
+}
+.tiny-wrap .people h6 {
+    font-size: 24px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333333;
+}
+.tiny-wrap .people h6 {
+    margin-top: 20px;
+    font-size: 18px;
+    color: #333;
+    line-height: 35px;
+}
+.tiny-wrap .p-title {
+    display: flex;
+    align-items: center;
+    margin: 0 0 10px;
+    font-size: 22px;
+    font-weight: 400;
+    color: #333;
+}
+.tiny-wrap .p-title:before {
+    content: '';
+    width: 5px;
+    height: 19px;
+    margin-right: 8px;
+    background: #1583ff;
+    border-radius: 4px;
+}

src/pages/article/index.vue

@@ -15,8 +15,9 @@
             <h2>{{ form.title }}</h2>
             <div class="meta">{{ form.source && form.source + ' | ' }} {{ form.author && form.author + ' | ' }} {{ form.totalBrowsing }} {{$t('column.views')}} | {{ form.releaseTime }}</div>
             <div class="meta">{{ form.edit && $t('column.edit') + '：' + form.edit }} {{ form.audit && ' | ' + $t('column.auditor') + '：' + form.audit }} {{ form.label && ' | ' + $t('column.label') + '：' + form.label }}</div>
-            <p class="brief">{{ form.summary }}</p>
           </template>
+          <p v-if="form.summary"
+             class="brief">{{ form.summary }}</p>
           <div class="des"
                v-html="form.mainBody"></div>
           <div v-if="form.fileList && form.fileList.length"
@@ -57,6 +58,7 @@ export default {
       columnBanner: '',
       isParty: 0, // 组织机构
       isPeople: 0, // 人物详情
+      gotBanner: 0
     }
   },
   components: {
@@ -107,18 +109,19 @@ export default {
             // 如果没上传banner
             if (!data.bannerImg) {
               this.getBanner(this.$refs.right.columns)
-              this.form.bannerImg = this.columnBanner || require('@/assets/images/article-banner.png')
+              this.form.bannerImg = this.gotBanner && this.columnBanner || require('@/assets/images/article-banner.png')
             }
+
+            // 浏览量+1
+            this.$post(`${this.api.articlePreview}?contentId=${this.id}`).then(({ data }) => { }).catch(err => { })
             this.loaded = true
           }
         }
       }).catch(err => { })
-
-      // 浏览量+1
-      this.$post(`${this.api.articlePreview}?contentId=${this.id}`).then(({ data }) => { }).catch(err => { })
     },
     // 列表详情
     getColumnInfo () {
+      console.log("🚀 ~ file: index.vue:125 ~ getColumnInfo ~ this.columnId:", this.columnId)
       this.columnId && this.$post(`${this.api.findColumn}?id=${this.columnId}`)
         .then(({ data }) => {
           if (data.detailStyleId == 69) this.isParty = 1
@@ -130,6 +133,7 @@ export default {
       for (const e of data) {
         if (e.columnBanner) this.columnBanner = e.columnBanner
         if (e.id == this.columnId) {
+          this.gotBanner = 1
           break
         } else {
           this.getBanner(e.children)

src/pages/column/index.vue

@@ -52,6 +52,7 @@
               </i> -->
             </div>
           </div>
+          <!-- 侧导航+新闻列表(含文章概述) -->
           <div v-if="info.listStyleId === 12"
                class="forms">
             <div class="item">
@@ -115,13 +116,7 @@
           </div>
 
           <div class="contents">
-            <template v-if="!isFilter && showNav && columns.length && !columns.find(i=>i.children.length) && info.listStyleId !==55">
-            </template>
-            <template v-if="!columns.find(i=>i.children.length) && info.listStyleId ===55">
-            </template>
-            <template v-else-if="!columns.find(i=>i.children.length) && info.listStyleId ===15 || info.listStyleId ===10 || info.listStyleId ===16">
-            </template>
-            <el-tree v-else
+            <el-tree v-if="columns.length && columns.find(e => e.children.length) && !isFilter && showNav && info.listStyleId !== 15"
                      class="columns"
                      ref="leftColumn"
                      :data="columns"
@@ -138,6 +133,7 @@
                 <span :title="node.label">{{ node.label }}</span>
               </span>
             </el-tree>
+
             <template v-if="info.listStyleId === 12">
               <div class="article-wrap">
                 <ul class="articles">
@@ -216,14 +212,12 @@
                 </div>
               </div>
             </template>
-
             <template v-else-if="info.listStyleId === 11 || info.listStyleId === 15 || info.listStyleId === 10">
               <div class="article-wrap">
                 <ul class="articles">
                   <li v-for="(item, i) in articles"
                       :key="i"
                       :class="{'news-notice': info.listStyleId === 55}"
-                      class="otherData"
                       @click="toArtice(item)">
                     <template v-if="info.listStyleId === 55">
                       <div class="releaseTime">
@@ -233,7 +227,6 @@
                       <div class="news-title">{{ item.title }}</div>
                     </template>
                     <template v-else>
-
                       <div class="texts leftBox">
                         <p v-if="(item.listStyleId === 10 || item.listStyleId === 15|| item.listStyleId === 11) && item.classificationName"
                            class="type">
@@ -300,7 +293,7 @@
                 <ul class="articles">
                   <li v-for="(item, i) in articles"
                       :key="i"
-                      :class="{'news-notice': info.listStyleId === 55}"
+                      :class="{'news-notice': info.listStyleId === 55, 'org': info.listStyleId === 68}"
                       class="overDetail"
                       @click="toArtice(item)">
                     <template v-if="info.listStyleId === 55">
@@ -321,7 +314,7 @@
                           {{ item.classificationName }}
                         </p>
                         <h6 class="titleDes">{{ item.title }}</h6>
-                        <template v-if="item.listStyleId === 11 || item.listStyleId == 12">
+                        <template v-if="item.listStyleId === 11 || item.listStyleId == 12 || item.listStyleId == 68">
                           <span class="meta">{{ item.releaseTime }}</span>
                           <div class="des"
                                v-html="item.mainBody"></div>
@@ -356,7 +349,7 @@
                                  alt="" /> {{ item.onlineLocation }}
                           </div>
                         </template>
-                        <el-button v-if="item.listStyleId === 15"
+                        <el-button v-if="item.listStyleId === 15 || item.listStyleId == 68"
                                    type="primary"
                                    class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
 
@@ -434,7 +427,7 @@ export default {
       sameStyle: 1,
       allColumnId: [],
       showNav: false,
-      showNavIds: [10, 11, 12, 16, 55], // 显示侧导航的模板id
+      showNavIds: [10, 11, 12, 16, 55, 68], // 显示侧导航的模板id
       isFilter: false,
       page: 1,
       pageSize: 10,
@@ -605,6 +598,7 @@ export default {
           this.getAllId = id
           this.getArticle(id);
           this.columns = data;
+          console.log("🚀 ~ file: index.vue:608 ~ .then ~ this.columns:", this.columns)
           // 如果没上传banner
           if (!this.info.columnBanner) {
             this.getBanner(data);
@@ -675,7 +669,7 @@ export default {
           const site = cType === 1 ? this.$route.query.siteId || this.site : to.siteSelection;
           if (ids[1]) {
             // 文章
-            href = '/article?id=' + ids[1];
+            href = '/article?articleId=' + ids[1];
           } else {
             // 栏目
             const columnIds = ids[0].split(',');
@@ -993,12 +987,7 @@ export default {
         .readDetail {
             padding: 1.3rem 1.5rem;
             justify-content: flex-start;
-            align-items: flex-start;
-            .leftBox {
-                p {
-                    margin-top: 1.25rem;
-                }
-            }
+            align-items: center;
             .texts {
                 padding-left: 1.5rem;
                 .titleDes {
@@ -1011,12 +1000,8 @@ export default {
                 }
             }
             .titleDes {
-                display: -webkit-box;
-                -webkit-box-orient: vertical;
-                -webkit-line-clamp: 1;
-                text-overflow: ellipsis;
-                overflow: hidden;
                 margin-top: 0.8rem;
+                -webkit-line-clamp: 1;
             }
             .readDetailBtn {
                 margin-top: 1.3rem;
@@ -1108,6 +1093,9 @@ export default {
             @include mul-ellipsis(2);
         }
     }
+    .org {
+        padding: 15px;
+    }
     .right {
         width: 14%;
         min-width: 15rem;
@@ -1196,6 +1184,9 @@ export default {
     }
     .article {
         .readDetailBtn {
+            width: 100px;
+            padding: 10px 20px;
+            margin-top: 10px;
             background-color: $partyTheme;
             border-color: $partyTheme;
         }

src/pages/governance/index.vue

@@ -20,7 +20,7 @@
           </div>
           <img class="bg"
                width="562"
-               height="506"
+               height="467"
                :src="modules[1].form.pic"
                alt="">
         </div>

src/pages/iasf/index.vue

@@ -71,33 +71,29 @@
               <li v-if="i"
                   :key="i"
                   class="wow fadeInDown"
-                  :data-wow-delay="(0.1 * i).toFixed(1) + 's'">
+                  :data-wow-delay="(0.1 * i).toFixed(1) + 's'"
+                  @click="toArtice(item, modules[4].form)">
                 <img class="pic"
                      :src="item.titleImg"
                      alt="">
                 <div class="texts">
                   <p class="meta">{{ item.releaseTime }} {{ item.classificationName && ' | ' + item.classificationName }}</p>
                   <div class="des">{{ item.title }}</div>
-                  <img class="arrow"
-                       src="@/assets/images/arrow.png"
-                       alt=""
-                       @click="toArtice(item, modules[4].form)">
                 </div>
               </li>
             </template>
           </ul>
         </template>
         <ul class="news-carousel">
-          <li v-if="articles1.length"
-              @click="toArtice(curArticle1, modules[5].form)">
+          <li v-if="articles1.length">
             <img class="pic"
-                 :src="curArticle1.titleImg"
+                 src="http://10.10.11.7/images/iasf/8.png"
                  alt="">
             <div class="texts">
-              <h6>{{ curArticle1.title }}</h6>
+              <h6 @click="toAll(modules[5].form)">{{ getColumnTitle(modules[5].form) }}</h6>
               <p class="meta">{{ curArticle1.source }}</p>
               <div class="des"
-                   v-html="curArticle1.mainBody"></div>
+                   @click="toArtice(curArticle1, modules[5].form)">{{ curArticle1.title }}</div>
               <p class="date">{{ curArticle1.releaseTime }}</p>
             </div>
             <div class="action">
@@ -113,16 +109,15 @@
                  @click.stop="nextCarousel(1)"></i>
             </div>
           </li>
-          <li v-if="articles2.length"
-              @click="toArtice(curArticle2, modules[6].form)">
+          <li v-if="articles2.length">
             <img class="pic"
-                 :src="curArticle2.titleImg"
+                 src="http://10.10.11.7/images/iasf/9.png"
                  alt="">
             <div class="texts">
-              <h6>{{ curArticle2.title }}</h6>
-              <p class="meta">{{ curArticle2.source }}</p>
+              <h6 @click="toAll(modules[6].form)">{{ getColumnTitle(modules[6].form) }}</h6>
+              <p class="meta">{{ curArticle2.classificationName }}</p>
               <div class="des"
-                   v-html="curArticle2.mainBody"></div>
+                   @click="toArtice(curArticle2, modules[6].form)">{{ curArticle2.title }}</div>
               <p class="date">{{ curArticle2.releaseTime }}</p>
             </div>
             <div class="action">
@@ -138,16 +133,14 @@
                  @click.stop="nextCarousel(2)"></i>
             </div>
           </li>
-          <li v-if="articles3.length"
-              @click="toArtice(curArticle3, modules[7].form)">
+          <li v-if="articles3.length">
             <img class="pic"
-                 :src="curArticle3.titleImg"
+                 src="http://10.10.11.7/images/iasf/10.png"
                  alt="">
             <div class="texts">
-              <h6>{{ curArticle3.title }}</h6>
-              <p class="meta">{{ curArticle3.source }}</p>
-              <div class="des"
-                   v-html="curArticle3.mainBody"></div>
+              <h6 @click="toAll(modules[7].form)">{{ getColumnTitle(modules[7].form) }}</h6>
+              <div class="des m-t-8"
+                   @click="toArtice(curArticle3, modules[7].form)">{{ curArticle3.title }}</div>
               <p class="date">{{ curArticle3.releaseTime }}</p>
             </div>
             <div class="action">
@@ -208,6 +201,7 @@
           <div class="left wow fadeInLeft"
                data-wow-delay="0.5s">
             <h6>{{ modules[11].form.title }}</h6>
+            <p class="sub-title">{{ modules[11].form.subTitle }}</p>
             <div class="text"
                  v-html="modules[11].form.des"></div>
             <el-button v-if="isLink(modules[11].form.link.linkName)"
@@ -230,7 +224,9 @@
           <div class="text"
                v-html="modules[12].form.des"></div>
           <img src="@/assets/images/arrow-white.png"
-               alt="">
+               alt=""
+               :class="{'arrow': isLink(modules[12].form.link.linkName)}"
+               @click="openLink(modules[12].form)">
         </div>
         <img class="pic"
              :src="modules[12].form.pic"
@@ -284,7 +280,12 @@
     <ul class="tools">
       <li v-for="(item, i) in modules[18].list"
           :key="i"
-          @click="openLink(item)">{{ item.title }}</li>
+          @click="openLink(item)">
+        <img :src="'http://10.10.11.7/images/iasf/icon' + (i < 4 ? i + 1 : 1) + '.png'"
+             alt=""
+             class="icon">
+        {{ item.title }}
+      </li>
     </ul>
   </div>
 </template>
@@ -413,14 +414,14 @@ export default {
 @import url(../../plugins/wow/animate.css);
 @import '../../styles/page/page.scss';
 .iasf-banner {
-    height: 600px;
+    height: 727px;
     img {
         width: 100%;
         height: 100%;
     }
     .texts {
         position: absolute;
-        top: 30%;
+        bottom: 40%;
         left: 120px;
         h6,
         .text {
@@ -469,16 +470,11 @@ export default {
         border-left: 2px solid #dfe4e9;
     }
     h6 {
-        min-height: 4.5rem;
         margin-bottom: 1.56rem;
         line-height: 2rem;
         font-size: 1.368rem;
         color: #333;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 2;
-        text-overflow: ellipsis;
-        overflow: hidden;
+        @include mul-ellipsis(2);
     }
     .des {
         font-size: 1.024rem;
@@ -554,6 +550,7 @@ export default {
         width: calc((100% - 18px) / 3);
         margin-right: 9px;
         background-color: #fff;
+        cursor: pointer;
         &:nth-child(3n) {
             margin-right: 0;
         }
@@ -563,7 +560,7 @@ export default {
         height: 220px;
     }
     .texts {
-        padding: 20px 24px;
+        padding: 20px 24px 50px;
         background-color: #fff;
     }
     .meta {
@@ -583,9 +580,8 @@ export default {
     li {
         position: relative;
         width: calc((100% - 18px) / 3);
-        height: 320px;
+        height: 284px;
         margin-right: 9px;
-        cursor: pointer;
         &:nth-child(3n) {
             margin-right: 0;
         }
@@ -607,6 +603,7 @@ export default {
     h6 {
         font-size: 1.2rem;
         font-family: PingFangSC-Medium, PingFang SC;
+        cursor: pointer;
     }
     .meta {
         margin: 8px 0;
@@ -617,6 +614,7 @@ export default {
         margin-bottom: 8px;
         font-size: 1rem;
         font-family: PingFangSC-Medium, PingFang SC;
+        cursor: pointer;
     }
     .date {
         font-size: 0.8rem;
@@ -708,8 +706,12 @@ export default {
     h6 {
         font-size: 1.6rem;
     }
+    .sub-title {
+        margin: 8px 0 20px;
+        font-size: 0.9rem;
+    }
     .text {
-        margin: 20px 0;
+        margin-bottom: 60px;
         font-size: 1rem;
         line-height: 2;
     }
@@ -827,8 +829,12 @@ export default {
             }
         }
     }
+    .news {
+        flex-direction: column;
+        li {
+            width: 100%;
+        }
     }
-@media (max-width: 920px) {
     .news-banner {
         flex-direction: column;
         .pic-wrap,

src/pages/industrial/index.vue

@@ -249,7 +249,7 @@ export default {
     li {
         display: flex;
         justify-content: space-between;
-        height: 500px;
+        height: 433px;
         margin-bottom: 60px;
         color: #333;
         background-color: #fff;
@@ -270,7 +270,7 @@ export default {
             font-family: PingFangSC-Medium, PingFang SC;
         }
         .text {
-            margin: 1rem 0;
+            margin: 14px 0 40px;
             font-size: 1rem;
             line-height: 1.6;
         }
@@ -284,7 +284,7 @@ export default {
         }
         .pic {
             width: 48%;
-            height: 500px;
+            height: 423px;
             margin: -20px -20px 0 0;
             border-radius: 100px 0 0 0;
         }
@@ -292,7 +292,7 @@ export default {
 }
 
 .app-inner {
-    width: 1558px;
+    width: 1200px;
 }
 .app {
     display: flex;
@@ -303,9 +303,9 @@ export default {
         flex-direction: column;
         justify-content: center;
         align-items: center;
-        width: 368px;
-        height: 252px;
-        margin: 0 14px 14px 0;
+        width: calc((100% - 30px) / 4);
+        height: 200px;
+        margin: 0 10px 10px 0;
         transition: 0.3s;
         &:hover {
             transform: scale(1.05);
@@ -326,6 +326,7 @@ export default {
     }
     .icon {
         position: relative;
+        width: 62px;
         transition: 0.5s;
     }
     .text {

src/pages/lightSources/index.vue

@@ -38,7 +38,6 @@
                class="table">
           <thead>
             <tr>
-              <th>序号</th>
               <th>光源名称</th>
               <th>国家</th>
               <th>电子束能量（GeV）</th>
@@ -59,7 +58,6 @@
             <td>{{ item.stations }}</td>
             <td>{{ item.intergenerational }}</td>
             <td>{{ item.time }}</td>
-            <td>{{ item.name }}</td>
             <td>{{ item.emittance }}</td>
             <td>{{ item.status }}</td>
           </tr>
@@ -68,7 +66,6 @@
                class="table">
           <thead>
             <tr>
-              <th>序号</th>
               <th>光源名称</th>
               <th>国家</th>
               <th>地点</th>
@@ -78,6 +75,7 @@
               <th>重复频率/Hz Repetition rate</th>
               <th>设施长度/m Overall length</th>
               <th>线站数量</th>
+              <th>状态</th>
               <th>出光时间</th>
             </tr>
           </thead>

src/pages/overview/index.vue

@@ -21,7 +21,7 @@
           </div>
           <img class="bg"
                width="562"
-               height="506"
+               height="418"
                :src="modules[1].form.pic"
                alt="">
         </div>
@@ -220,13 +220,13 @@ export default {
         -webkit-line-clamp: 6;
     }
     .bg {
-        margin: -122px 0 0 0;
+        margin: -115px -80px 0 0;
         border-top-right-radius: 40px;
     }
 }
 .core {
     position: relative;
-    height: 370px;
+    height: 424px;
     margin-bottom: 40px;
     &:last-child {
         .texts {
@@ -264,15 +264,17 @@ export default {
 .fac {
     .event {
         position: relative;
-        padding: 70px 250px 70px 60px;
+        height: 387px;
+        padding: 70px 300px 70px 60px;
         background: url(http://10.10.11.7/images/overview/16.png) 0 0/100% 100% no-repeat;
         h6 {
+            position: relative;
             font-size: 2.2rem;
             font-family: PingFangSC-Medium, PingFang SC;
             color: #333;
         }
         .en {
-            margin-top: -10px;
+            margin-top: -30px;
             font-size: 2rem;
             font-family: AppleSystemUIFont;
             color: #e4e4e4;
@@ -289,7 +291,7 @@ export default {
         li {
             position: relative;
             width: calc((100% - 40px) / 3);
-            height: 380px;
+            height: 359px;
             margin-right: 20px;
             &:last-child {
                 margin-right: 0;
@@ -325,6 +327,7 @@ export default {
 .scan {
     .scan-inner {
         display: flex;
+        justify-content: flex-end;
         padding-left: 20%;
     }
     .left {
@@ -366,7 +369,6 @@ export default {
             font-family: PingFangSC-Medium, PingFang SC;
             color: #333;
             line-height: 1.6;
-            @include mul-ellipsis(2);
         }
     }
     .total {
@@ -386,10 +388,15 @@ export default {
         }
     }
     .pic {
-        width: 70%;
+        width: 826px;
         height: 700px;
     }
 }
+@media (max-width: 1600px) {
+    .scan .scan-inner {
+        padding-left: 10vw;
+    }
+}
 @media (max-width: 1400px) {
     .history {
         .texts {

src/pages/researchTeam/index.vue

@@ -27,9 +27,9 @@
 
           <ul class="teams">
             <li v-for="(item, i) in articles"
-                :key="i">
-              <div class="line cursor-pointer"
+                :key="i"
                 @click="toArtice(item, modules[1].form)">
+              <div class="line">
                 <img src="http://10.10.11.7/images/researchTeam/3.png"
                      alt=""
                      class="icon">
@@ -103,14 +103,15 @@ export default {
             data :
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
           this.modules = json
-          this.allList = json[1].list
           console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
 
           // 获取文章列表
           const { column, articleNum } = json[1].form
           if (column.length) {
             this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
-              this.articles = Util.removeTag(data)
+              const articles = Util.removeTag(data)
+              this.allList = articles
+              this.articles = this.sortList(articles)
             }).catch(err => { })
           }
         }
@@ -119,10 +120,17 @@ export default {
     // 筛选列表
     filter () {
       const { title, curLetter } = this
-      this.modules[1].list = this.allList.filter(e => {
-        console.log(11, pinyin(e.name, { toneType: 'none' })[0].toUpperCase())
-        return (e.name.includes(title) || e.job.includes(title) || e.major.includes(title) || e.honor.includes(title)) && (curLetter === '全部' || (curLetter !== '全部' && curLetter === pinyin(e.name, { toneType: 'none' })[0].toUpperCase()))
+      this.articles = this.allList.filter(e => {
+        return (e.title.includes(title) || e.post.includes(title) || e.major.includes(title) || e.honor.includes(title)) && (curLetter === '全部' || (curLetter !== '全部' && curLetter === pinyin(e.title, { toneType: 'none' })[0].toUpperCase()))
+      })
+    },
+    // 列表按首字母拼音排序
+    sortList (list) {
+      list.forEach(e => {
+        e.sortTitle = pinyin(e.title, { toneType: 'none' })[0].toUpperCase()
       })
+
+      return list.sort((a, b) => a.sortTitle.charCodeAt(0) - b.sortTitle.charCodeAt(0))
     },
     // 字母点击回调
     letterClick (e) {
@@ -137,13 +145,13 @@ export default {
 @import url(../../plugins/wow/animate.css);
 @import '../../styles/page/page.scss';
 .content {
-    width: 1400px;
+    width: 1200px;
 }
 .article {
     display: flex;
     justify-content: space-between;
     .left {
-        width: 66%;
+        width: 75%;
         .search {
             display: inline-flex;
             width: 34%;
@@ -199,6 +207,7 @@ export default {
             padding: 20px 30px;
             margin: 0 10px 10px 0;
             background: url(http://10.10.11.7/images/researchTeam/2.png) 0 0 / cover no-repeat;
+            cursor: pointer;
             &:nth-child(even) {
                 margin-right: 0;
             }

src/pages/scientific/index.vue

@@ -149,7 +149,7 @@ export default {
     margin-top: 2rem;
     li {
         position: relative;
-        height: 600px;
+        height: 559px;
         margin-bottom: 60px;
         &:nth-child(even) {
             .texts {
@@ -301,7 +301,7 @@ export default {
     display: flex;
     flex-direction: column;
     justify-content: center;
-    height: 840px;
+    height: 643px;
     text-align: center;
     background: url(../../assets/images/about-bg.png) no-repeat center center;
     background-size: 100% 100%;

src/pages/talentCentre/index.vue

@@ -71,6 +71,28 @@
               <span class="date">{{ item.releaseTime }}</span>
             </li>
           </ul>
+
+          <p class="l-title">{{$t('column.hot')}}</p>
+          <ul class="list">
+            <li v-for="(item, i) in hots"
+                :key="i"
+                :title="item.title"
+                @click="toArtice(item)">
+              <p class="text">{{ item.title }}</p>
+              <span class="date">{{ item.releaseTime }}</span>
+            </li>
+          </ul>
+
+          <p class="l-title">{{$t('column.latestNews')}}</p>
+          <ul class="list">
+            <li v-for="(item, i) in news"
+                :key="i"
+                :title="item.title"
+                @click="toArtice(item)">
+              <p class="text">{{ item.title }}</p>
+              <span class="date">{{ item.releaseTime }}</span>
+            </li>
+          </ul>
         </div>
       </div>
     </div>
@@ -93,11 +115,13 @@ export default {
         value: 'id',
         label: 'title'
       },
-      articles: []
+      articles: [],
+      news: [],
+      hots: []
     }
   },
   mounted () {
-
+    this.getColumn()
   },
   methods: {
     // 获取文章详情
@@ -109,14 +133,25 @@ export default {
           const json = JSON.parse(this.preview ?
             data :
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+
+          json[4].list = json[4].list.filter(e => e.isEnable)
+          json[4].list.unshift({
+            title: '人才中心'
+          })
+          json[4].list.forEach((e, i) => {
+            e.id = i
+          })
           this.modules = json
+          this.$nextTick(e => {
+            this.$refs.column.setCurrentKey(0)
+          })
           console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
 
           // 获取文章列表
           const { column } = json[5].form
           if (column.length) {
             this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
-              this.articles = Util.removeTag(data)
+              this.articles = Util.removeTag(data.slice(0, 5))
             }).catch(err => { })
           }
         }
@@ -126,7 +161,21 @@ export default {
       this.openLink(row)
       console.log("🚀 ~ file: index.vue:126 ~ columnClick ~ row:", row)
 
-    }
+    },
+    // 资讯
+    getColumn () {
+      this.$post(`${this.api.hotContent}?siteId=${this.site}`).then(({ data }) => {
+        this.hots = Util.removeTag(data)
+      }).catch(err => { })
+
+      this.$post(this.api.newlyPublishedArticles, {
+        pageNum: 1,
+        pageSize: 5,
+        siteId: this.site
+      }).then(({ data }) => {
+        this.news = Util.removeTag(data.records)
+      }).catch(res => { })
+    },
   }
 };
 </script>
@@ -138,13 +187,13 @@ export default {
     background-color: #fff;
 }
 .content {
-    width: 1400px;
+    width: 1200px;
 }
 .article {
     display: flex;
     justify-content: space-between;
     .left {
-        width: 66%;
+        width: 75%;
         .talent-title {
             padding-bottom: 10px;
             font-size: 1.2rem;
@@ -165,7 +214,7 @@ export default {
         margin-top: 4rem;
         li {
             position: relative;
-            height: 450px;
+            height: 433px;
             margin-bottom: 2rem;
             &:nth-child(even) {
                 .texts {
@@ -243,7 +292,7 @@ export default {
         }
     }
 }
-@media (max-width: 1400px) {
+@media (max-width: 1200px) {
     .content {
         width: 90%;
     }

src/pages/team/index.vue

@@ -83,7 +83,7 @@ export default {
 @import '../../styles/page/page.scss';
 .content {
     display: flex;
-    width: 1400px;
+    width: 1200px;
     justify-content: space-between;
     .left {
         width: calc(100% - 300px);
@@ -110,7 +110,7 @@ export default {
             color: #333;
         }
         .job {
-            margin: 10px 0;
+            margin: 16px 0;
             font-size: 1rem;
             font-family: PingFangSC-Regular, PingFang SC;
             color: #333;