From a914b5595022273f672adb48fe843f887337f895 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 13 Mar 2023 16:16:13 +0800
Subject: [PATCH] fix

---
 src/assets/images/logo2.png                   | Bin 0 -> 4289 bytes
 src/layouts/footer/index.vue                  |   8 +-
 src/layouts/header/index.vue                  |   7 +-
 src/layouts/navbar/index.vue                  |   1 -
 src/libs/util.js                              |   1 +
 src/mixins/page/index.js                      |  34 +-----
 src/pages/application/index.vue               |   2 +-
 src/pages/article/activity.vue                |  14 +--
 src/pages/article/index.vue                   |   9 +-
 src/pages/column/index.vue                    |  12 +-
 src/pages/deviceIntroLayout/index.vue         |  50 +-------
 src/pages/home/index.vue                      |   2 +-
 src/pages/news/index.vue                      |  11 +-
 src/pages/overviewLocation/index.vue          |  99 ++++++++++++++++
 .../{survey => overviewTrailer}/index.vue     |  26 ++--
 src/pages/publish/show.vue                    |  89 ++++++++++++--
 src/pages/sfel/index.vue                      | 112 +++++++++++++-----
 src/router/modules/overviewLocation.js        |   2 +-
 src/router/modules/overviewTrailer.js         |   2 +-
 src/styles/page/page.scss                     |   4 +
 20 files changed, 309 insertions(+), 176 deletions(-)
 create mode 100644 src/assets/images/logo2.png
 create mode 100644 src/pages/overviewLocation/index.vue
 rename src/pages/{survey => overviewTrailer}/index.vue (70%)

diff --git a/src/assets/images/logo2.png b/src/assets/images/logo2.png
new file mode 100644
index 0000000000000000000000000000000000000000..86be683953db4f36f917742622bb8a0d55203690
GIT binary patch
literal 4289
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

literal 0
HcmV?d00001

diff --git a/src/layouts/footer/index.vue b/src/layouts/footer/index.vue
index 1c4e0c0..7c57e7d 100644
--- a/src/layouts/footer/index.vue
+++ b/src/layouts/footer/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div v-if="!showContactPath.includes($route.path)" class="footer">
+    <div v-if="showDefaultPath.includes($route.path)" class="footer">
       <div class="info">
         <div style="margin-right: 100px">
           <img class="m-b-20" src="@/assets/images/iasf.png" alt="">
@@ -18,7 +18,7 @@
       <a class="copyright">粤ICP备2020131940号  粤公安网34565432456765432号</a>
     </div>
     
-    <div v-else class="contact">
+    <div v-if="showContactPath.includes($route.path)" class="contact">
       <div class="inner">
         <div class="title">
           <h6>Contact us</h6>
@@ -55,13 +55,13 @@
   </div>
 </template>
 <script>
-import Setting from '@/setting'
 import mixins from '@/mixins/article'
 export default {
   mixins: [mixins],
   data() {
     return {
-      showContactPath: ['/news', '/sfel'],
+      showDefaultPath: ['/home'], // 展示默认页脚的页面
+      showContactPath: ['/news', '/sfel', '/talent', '/about', '/careers', '/edu', '/news'], // 展示联系我们页脚的页面
       columns: [],
     };
   },
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index c10bff5..e246ac4 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -2,11 +2,7 @@
   <div :class="['header', { channel: isHome }]">
     <a class="logo" @click="toIndex">
       <img v-if="isHome" src="@/assets/images/logo.png" alt="">
-      <template v-else>
-        <img src="@/assets/images/logo-black.png" alt="">
-        <!-- <img src="@/assets/images/logo1.png" alt="">
-        深圳中能高重复自由电子激光 -->
-      </template>
+      <img v-else src="@/assets/images/logo-black.png" alt="">
     </a>
     <navbar ref="nav" :isHome.sync="isHome"></navbar>
     <div class="tools">
@@ -23,7 +19,6 @@
 </template>
 <script>
 import { mapMutations } from 'vuex'
-import Setting from '@/setting'
 import navbar from '../navbar'
 export default {
   data() {
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 1a7f938..d58dbd5 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -7,7 +7,6 @@
 </template>
 
 <script>
-import Setting from '@/setting'
 import menuTree from '@/components/menuTree'
 import mixins from '@/mixins/article'
 import { mapState, mapMutations } from 'vuex'
diff --git a/src/libs/util.js b/src/libs/util.js
index 557c5fa..5eb0b83 100644
--- a/src/libs/util.js
+++ b/src/libs/util.js
@@ -113,6 +113,7 @@ const util = {
       list.map(e => {
         // 有摘要取摘要，没有摘要就去掉正文里的标签空格
         e.mainBody = e.summary || e[prop].replace(/(<p class="img-des">[^>]+<\/p>)|(<[^>]+>)|((&nbsp;)+)/g , '')
+        e.releaseTime = e.releaseTime.split(' ')[0]
       })
       return list
     },
diff --git a/src/mixins/page/index.js b/src/mixins/page/index.js
index a8a7494..2e7601f 100644
--- a/src/mixins/page/index.js
+++ b/src/mixins/page/index.js
@@ -11,41 +11,9 @@ export default {
     }
   },
   mounted() {
-    this.getInfo()
+    this.getInfo && this.getInfo()
   },
   methods: {
-    // 点击栏目回调
-    columnTo(to) {
-      const { typeId } = to
-      // 跳转链接
-      if (typeId === 2) {
-        let href = to.linkAddress
-        const cType = to.connectionType
-        if (cType !== 2) { // 非站外链接
-          const ids = href.split('-') // 栏目文章是用-分割的，栏目是必选，文章不是必选。选择了文章则跳转到文章页，否则跳转到栏目页
-          // 站点id：站内链接取当前站点，其他站点链接取siteSelection
-          const site = cType === 1 ?
-            (this.$route.query.siteId || this.site) :
-            to.siteSelection
-          if (ids[1]) { // 文章
-            href = '/article?articleId=' + ids[1]
-          } else { // 栏目
-            const columnIds = ids[0].split(',')
-            href = '/column?id=' + columnIds[columnIds.length - 1]
-          }
-          href = this.$router.resolve(href + '&siteId=' + site).href
-        }
-        // 是否新窗口打开
-        if (to.isOpen) {
-          window.open(href)
-        } else {
-          location.href = href
-        }
-      } else if (typeId !== 4 || (typeId === 4 && !to.children.length)) {
-        // 常规栏目跳转到column页，长页栏目直接获取path
-        this.$router.push(`/${typeId === 3 ? to.path : 'column'}?id=${to.id}&siteId=${this.$route.query.siteId || this.site}`).catch(err => {})
-      }
-    },
     // 打开链接
     async openLink(item) {
       const { link } = item
diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue
index 9535a27..f803485 100644
--- a/src/pages/application/index.vue
+++ b/src/pages/application/index.vue
@@ -63,7 +63,7 @@
             <div class="texts">
               <h6>{{ item.title }}</h6>
               <div class="des" v-html="item.mainBody"></div>
-              <span class="meta">{{ item.createTime }}</span>
+              <span class="meta">{{ item.releaseTime }}</span>
             </div>
           </li>
         </ul>
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index 69048ac..613941e 100644
--- a/src/pages/article/activity.vue
+++ b/src/pages/article/activity.vue
@@ -30,7 +30,7 @@
           <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.createTime }}</span>
+              <span class="date">{{ item.releaseTime }}</span>
             </li>
           </ul>
 
@@ -38,7 +38,7 @@
           <ul class="list">
             <li v-for="(item, i) in news" :key="i" @click="toArtice(item)">
               <p class="text">{{ item.title }}</p>
-              <span class="date">{{ item.createTime }}</span>
+              <span class="date">{{ item.releaseTime }}</span>
             </li>
           </ul>
         </div>
@@ -75,7 +75,7 @@ export default {
   },
   watch: {
     '$route'() {
-      this.id = this.$route.query.id
+      this.id = this.$route.query.articleId
       this.getInfo()
     }
   },
@@ -124,19 +124,19 @@ export default {
     },
     // 资讯
     getColumn() {
-      this.$post(this.api.listWithTree, {
+      this.$post(this.api.listWithTreeMenuVisible, {
         siteId: this.$route.query.siteId || this.$store.state.content.site,
         columnName: '',
         templateId: '',
         typeId	: '',
-        isSort: 0
+        isSort: 1
       }).then(({ data }) => {
         this.columns = data
         this.getInfo()
       }).catch(err => {})
       
       this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
-        this.hots = data
+        this.hots = Util.removeTag(data)
       }).catch(err => {})
     },
     // 最新资讯
@@ -146,7 +146,7 @@ export default {
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
       }).then(({ data }) => {
-        this.news = data.records
+        this.news = Util.removeTag(data.records)
       }).catch(res => {})
     },
     // 下载附件
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index 0d5abfa..b0c3873 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -75,7 +75,7 @@ export default {
   },
   watch: {
     '$route'() {
-      this.id = this.$route.query.id
+      this.id = this.$route.query.articleId
       this.getInfo()
     }
   },
@@ -110,6 +110,7 @@ export default {
           if (temId === 25 || temId === 26) { // 会议活动/期刊详情
             this.$router.replace((temId === 25 ? '/article/activity' : '/publish/show') + path)
           } else {
+            data.releaseTime = data.releaseTime.split(' ')[0]
             this.form = data
             this.columnId = data.columnId
             // 如果没上传banner
@@ -138,7 +139,7 @@ export default {
     },
     // 资讯
     getColumn() {
-      this.$post(this.api.listWithTree, {
+      this.$post(this.api.listWithTreeMenuVisible, {
         siteId: this.$route.query.siteId || this.$store.state.content.site,
         columnName: '',
         templateId: '',
@@ -150,7 +151,7 @@ export default {
       }).catch(err => {})
       
       this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
-        this.hots = data
+        this.hots = Util.removeTag(data)
       }).catch(err => {})
     },
     // 最新资讯
@@ -160,7 +161,7 @@ export default {
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
       }).then(({ data }) => {
-        this.news = data.records
+        this.news = Util.removeTag(data.records)
       }).catch(res => {})
     },
     // 下载附件
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 8c4e051..98c6442 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -74,10 +74,10 @@
                     <p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName" class="type">{{ item.classificationName }}</p>
                     <h6>{{ item.title }}</h6>
                     <template v-if="item.listStyleId === 11">
-                      <span class="meta">{{ item.updateTime }}</span>
+                      <span class="meta">{{ item.releaseTime }}</span>
                       <div class="des" v-html="item.mainBody"></div>
                     </template>
-                    <span v-if="item.listStyleId === 10" class="meta">{{ item.updateTime }} {{ item.labelName && ' | ' + item.labelName }}</span>
+                    <span v-if="item.listStyleId === 10" class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' + item.labelName }}</span>
                     <template v-if="item.listStyleId === 15 || item.listStyleId === 16">
                       <div v-if="item.keynoteSpeaker" class="meta m-b-10"><img class="icon" src="@/assets/images/mine.png" alt=""> {{ item.keynoteSpeaker }}</div>
                       <div v-if="item.activityStartTime" class="meta m-b-10"><img class="icon" src="@/assets/images/time.png" alt=""> {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}</div>
@@ -99,7 +99,7 @@
           <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.createTime }}</span>
+              <span class="date">{{ item.releaseTime }}</span>
             </li>
           </ul>
 
@@ -107,7 +107,7 @@
           <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.createTime }}</span>
+              <span class="date">{{ item.releaseTime }}</span>
             </li>
           </ul>
           <div class="shadow"></div>
@@ -315,7 +315,7 @@ export default {
       }).catch(err => {})
       
       this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
-        this.hots = data
+        this.hots = Util.removeTag(data)
       }).catch(err => {})
     },
     // 最新资讯
@@ -325,7 +325,7 @@ export default {
         pageSize: 5,
         siteId: this.$route.query.siteId || this.$store.state.content.site
       }).then(({ data }) => {
-        this.news = data.records
+        this.news = Util.removeTag(data.records)
       }).catch(res => {})
     },
     // 会议时间筛选回调
diff --git a/src/pages/deviceIntroLayout/index.vue b/src/pages/deviceIntroLayout/index.vue
index 5560704..d5f5380 100644
--- a/src/pages/deviceIntroLayout/index.vue
+++ b/src/pages/deviceIntroLayout/index.vue
@@ -30,9 +30,6 @@
 
 <script>
 import mixins from '@/mixins/page'
-import Setting from '@/setting'
-import Util from '@/libs/util'
-import Breadcrumb from '@/components/breadcrumb'
 import WOW from 'wow.js'
 export default {
   mixins: [mixins],
@@ -41,56 +38,11 @@ export default {
       routes: []
     }
   },
-  components: {
-    Breadcrumb
-  },
   mounted() {
     new WOW().init()
-    this.getColumn()
   },
   methods: {
-    // 获取文章详情
-    getInfo() {
-      // 预览/详情
-      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
-        if (data.length) {
-          // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
-          const json = JSON.parse(this.preview ?
-            data :
-            data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
-          this.modules = json
-          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
-        }
-      }).catch(err => {})
-    },
-    // 获取父级所有栏目名称和id
-    getParent(data, id) {
-      for (const e of data) {
-        if (e.id == id) {
-          this.routes.push({
-            name: e.columnName,
-            query: {
-              id: e.id
-            }
-          })
-          break
-        } else if (e.children.length) {
-          this.routes.push({
-            name: e.columnName,
-            query: {
-              id: e.id
-            }
-          })
-          this.getParent(e.children, id)
-        }
-      }
-    },
-    // 获取上级面包屑
-    getColumn() {
-      this.$post(`${this.api.oneLevelChecksThemAll}?id=${this.id}`).then(({ data }) => {
-        this.getParent(data, this.id)
-      }).catch(err => {})
-    },
+    
   }
 };
 </script>
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 8ce7bad..5b1c0b0 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -43,7 +43,7 @@
             <div class="texts">
               <h6>{{ item.title }}</h6>
               <div class="des" v-html="item.mainBody"></div>
-              <span class="meta">{{ item.createTime }}</span>
+              <span class="meta">{{ item.releaseTime }}</span>
             </div>
           </li>
         </ul>
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 8723cf7..15e3ed0 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -24,7 +24,7 @@
           <div class="right">
             <h6>{{ curArticle.title }}</h6>
             <div class="des" v-html="curArticle.mainBody"></div>
-            <p class="meta">{{ curArticle.createTime }} {{ curArticle.author && ' | ' + curArticle.author }}</p>
+            <p class="meta">{{ curArticle.releaseTime }} {{ curArticle.author && ' | ' + curArticle.author }}</p>
             <ul class="inds">
               <li v-for="i in modules[1].list[curColumn].articles.length > 2 ? 3 : modules[1].list[curColumn].articles.length" :key="i" :class="{active: curInd == i - 1}" @click.stop="switchCarousel(i - 1)"></li>
             </ul>
@@ -36,7 +36,7 @@
             <li v-if="i > 2" :key="i" class="wow fadeInDown" :data-wow-delay="(0.1 * i).toFixed(1) + 's'">
               <img class="pic" :src="item.titleImg" alt="">
               <div class="texts">
-                <p class="meta">{{ item.createTime }} {{ item.author && ' | ' + item.author }}</p>
+                <p class="meta">{{ item.releaseTime }} {{ item.author && ' | ' + item.author }}</p>
                 <div class="des">{{ item.title }}</div>
                 <img class="arrow" src="@/assets/images/arrow.png" alt="" @click="toArtice(item, modules[1].list[curColumn])">
               </div>
@@ -63,11 +63,11 @@
             <ul class="show-card">
               <li v-if="articles[1]" @click="toArtice(articles[1], modules[3].form)">
                 <img class="pic" :src="articles[1].titleImg" alt="">
-                <div class="des">{{ articles[1].title }}</div>
+                <div class="text">{{ articles[1].title }}</div>
               </li>
               <li v-if="articles[2]" @click="toArtice(articles[2], modules[3].form)">
                 <img class="pic" :src="articles[2].titleImg" alt="">
-                <div class="des">{{ articles[2].title }}</div>
+                <div class="text">{{ articles[2].title }}</div>
               </li>
             </ul>
             <ul class="card-list">
@@ -474,7 +474,7 @@ export default {
         transform: scale(1.05);
       }
     }
-    .des {
+    .text {
       position: absolute;
       bottom: 0;
       left: 0;
@@ -483,6 +483,7 @@ export default {
       color: #fff;
       line-height: 48px;
       text-align: center;
+      @include ellipsis;
       background: rgba(0,0,0,0.49);
       box-shadow: 0px 0px 30px 0px rgba(48,48,48,0.08);
     }
diff --git a/src/pages/overviewLocation/index.vue b/src/pages/overviewLocation/index.vue
new file mode 100644
index 0000000..acb7b5a
--- /dev/null
+++ b/src/pages/overviewLocation/index.vue
@@ -0,0 +1,99 @@
+<template>
+  <div class="wrap">
+    <div class="single-banner single-banner-overview">
+      <img class="banner-img" :src="modules[0].form.pic" alt="">
+      <div class="texts">
+        <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+      </div>
+    </div>
+
+    <ul class="tabs wow fadeInLeft">
+      <template v-for="(item, i) in tabs">
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+      </template>
+    </ul>
+
+    <div class="tab-content">
+      <div v-html="modules[1].form.des"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import mixins from '@/mixins/page'
+import WOW from 'wow.js'
+export default {
+  mixins: [mixins],
+  data() {
+    return {
+      active: 3,
+      tabs: ['S³FEL介绍', '发展历程', 'S³FEL宣传片', '地理位置', '机构设置']
+    }
+  },
+  mounted() {
+    new WOW().init()
+  },
+  methods: {
+    // 获取文章详情
+    getInfo() {
+      // 预览/详情
+      this.$post(`${this.api[this.preview ? 'getRedisCache' : 'findPage']}?columnId=${this.id}`).then(({ data }) => {
+        if (data.length) {
+          // state：已发布（1）则取theEditedJson，草稿（0）则取jsonBeforeEditing
+          const json = JSON.parse(this.preview ?
+            data :
+            data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+          this.modules = json
+          console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
+        }
+      }).catch(err => {})
+    },
+    // tab回调
+    tabChange(i) {
+      this.active = i
+      if (i == 2) this.$router.push('/overviewTrailer?id=165&siteId=3')
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+@import url(../../plugins/wow/animate.css);
+@import "../../styles/page/page.scss";
+.wrap {
+  background: url(../../assets/images/survey1.png) (0 559px)/auto no-repeat,
+              url(../../assets/images/survey2.png) (bottom right)/auto no-repeat;
+}
+.tabs {
+  display: flex;
+  justify-content: center;
+  box-shadow: 0px 2px 10px 0px rgba(223,223,223,0.28);
+  li {
+    padding: 25px 19px;
+    margin: 0 10px;
+    font-size: 22px;
+    color: #333;
+    border-bottom: 4px solid transparent;
+    text-shadow: 0px 2px 14px rgba(167,167,167,0.26);
+    cursor: pointer;
+    &.active {
+      color: #1583FF;
+      border-bottom-color: #1583FF;
+    }
+  }
+}
+.tab-content {
+  width: 1000px;
+  padding: 77px 0;
+  margin: 0 auto;
+}
+.video {
+  width: 100%;
+  margin-bottom: 55px;
+}
+.text {
+  font-size: 18px;
+  color: #020202;
+  line-height: 32px;
+}
+</style>
\ No newline at end of file
diff --git a/src/pages/survey/index.vue b/src/pages/overviewTrailer/index.vue
similarity index 70%
rename from src/pages/survey/index.vue
rename to src/pages/overviewTrailer/index.vue
index 78229b7..53dd6ca 100644
--- a/src/pages/survey/index.vue
+++ b/src/pages/overviewTrailer/index.vue
@@ -1,15 +1,11 @@
 <template>
   <div class="wrap">
-    <el-carousel height="480px" :interval="6000" :arrow="(modules[0] && modules[0].list.filter(e => e.isEnable).length > 1) ? 'hover' : 'never'" :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
-      <template v-for="(item, i) in modules[0].list">
-        <el-carousel-item v-if="item.pic && item.isEnable" :key="i">
-          <div :class="['banner-item', {'cursor-pointer': isLink(item.link.linkName)}]" @click="openLink(item)">
-            <img :src="item.pic" alt="">
-            <p class="banner-name">{{ item.title }}</p>
-          </div>
-        </el-carousel-item>
-      </template>
-    </el-carousel>
+    <div class="single-banner single-banner-overview">
+      <img class="banner-img" :src="modules[0].form.pic" alt="">
+      <div class="texts">
+        <h6 class="banner-title">{{ modules[0].form.title }}</h6>
+      </div>
+    </div>
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
@@ -19,21 +15,18 @@
 
     <div class="tab-content">
       <template v-if="active === 2">
-        <video v-if="modules[3].form.video" class="video" ref="video" autoplay controls loop>
-          <source :src="modules[3].form.video" type="video/mp4">
+        <video v-if="modules[1].form.video" class="video" ref="video" autoplay controls loop>
+          <source :src="modules[1].form.video" type="video/mp4">
           您的浏览器不支持 video 标签。
         </video>
-        <div class="text">{{ modules[3].form.des }}</div>
+        <div v-html="modules[1].form.des"></div>
       </template>
-      <div v-if="active === 3" v-html="modules[4].form.des"></div>
     </div>
   </div>
 </template>
 
 <script>
 import mixins from '@/mixins/page'
-import Setting from '@/setting'
-import Util from '@/libs/util'
 import WOW from 'wow.js'
 export default {
   mixins: [mixins],
@@ -64,6 +57,7 @@ export default {
     // tab回调
     tabChange(i) {
       this.active = i
+      i == 3 && this.$router.push('/overviewLocation?id=166&siteId=3')
     },
   }
 };
diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue
index c64ff1a..6ed0175 100644
--- a/src/pages/publish/show.vue
+++ b/src/pages/publish/show.vue
@@ -5,12 +5,19 @@
       <div class="article">
         <div class="left">
           <h2>{{ form.title }}</h2>
-          <p class="name">作者</p>
-          <p class="val">{{ form.author }}</p>
-          <p class="name">引用</p>
-          <p class="val">{{ form.quote }}</p>
+          <template v-if="form.author">
+            <p class="name">作者</p>
+            <p class="val">{{ form.author }}</p>
+          </template>
+          <template v-if="form.quote">
+            <p class="name">引用</p>
+            <p class="val">{{ form.quote }}</p>
+          </template>
           <p class="name">摘要</p>
-          <div class="des" v-html="form.mainBody"></div>
+          <div class="flex">
+            <div class="des" v-html="form.mainBody"></div>
+            <img v-if="form.titleImg" width="222" height="312" :src="form.titleImg" alt="">
+          </div>
         </div>
         <div class="right">
           <img class="pic" src="@/assets/images/publish3.png" alt="">
@@ -19,6 +26,8 @@
               <p class="name">刊物名称</p>
               <p class="val">{{ form.periodicalName }}</p>
             </template>
+            <p class="name">出版年份</p>
+            <p class="val">{{ form.publicationYear }}年</p>
             <div class="flex">
               <div v-if="form.reel" class="m-r-40">
                 <p class="name">卷</p>
@@ -29,12 +38,30 @@
                 <p class="val">{{ form.documentNumber }}</p>
               </div>
             </div>
-            <p class="name">出版物类型</p>
-            <p class="val">{{ form.publicationTypeId && publicationTypes.find(e => e.id == form.publicationTypeId).name }}</p>
-            <p class="name">DOI</p>
-            <p class="val">{{ form.doi }}</p>
-            <p class="name">其他字段</p>
-            <p class="val">2022年</p>
+            <template v-if="form.publicationTypeId">
+              <p class="name">出版物类型</p>
+              <p class="val">{{ form.publicationTypeId && publicationTypes.find(e => e.id == form.publicationTypeId).name }}</p>
+            </template>
+            <template v-if="form.doi">
+              <p class="name">DOI</p>
+              <p class="val">{{ form.doi }}</p>
+            </template>
+            
+            <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" @click="toArtice(item)">
+                <p class="text">{{ item.title }}</p>
+                <span class="date">{{ item.releaseTime }}</span>
+              </li>
+            </ul>
           </div>
         </div>
       </div>
@@ -58,6 +85,8 @@ export default {
       columnId: '',
       form: {},
       columnBanner: '',
+      news: [],
+      hots: []
     }
   },
   components: {
@@ -71,6 +100,7 @@ export default {
   },
   mounted() {
     this.getInfo()
+    this.getArticle()
   },
   methods: {
     // 获取文章详情
@@ -113,6 +143,20 @@ export default {
         }
       }
     },
+    // 热点内容和最新资讯
+    getArticle() {
+      this.$post(`${this.api.hotContent}?siteId=${this.$route.query.siteId || this.$store.state.content.site}`).then(({ data }) => {
+        this.hots = Util.removeTag(data)
+      }).catch(err => {})
+
+      this.$post(this.api.newlyPublishedArticles, {
+        pageNum: 1,
+        pageSize: 5,
+        siteId: this.$route.query.siteId || this.$store.state.content.site
+      }).then(({ data }) => {
+        this.news = Util.removeTag(data.records)
+      }).catch(res => {})
+    },
   }
 };
 </script>
@@ -150,6 +194,10 @@ export default {
       color: #333;
       line-height: 30px;
     }
+    .des {
+      width: 469px;
+      margin-right: 49px;
+    }
   }
   h2 {
     padding-bottom: 27px;
@@ -181,6 +229,25 @@ export default {
       line-height: 20px;
     }
   }
+  .list {
+    margin-bottom: 20px;
+    li {
+      padding: 16px 0;
+      border-bottom: 1px solid #D8D8D8;
+    }
+    .text {
+      margin-bottom: 5px;
+      font-size: 14px;
+      cursor: pointer;
+      &:hover {
+        color: $main-color;
+      }
+    }
+    .date {
+      font-size: 12px;
+      color: #999;
+    }
+  }
 }
 @media (max-width: 1420px) {
   .content {
diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue
index b123a11..de703dd 100644
--- a/src/pages/sfel/index.vue
+++ b/src/pages/sfel/index.vue
@@ -25,7 +25,7 @@
             <div class="right">
               <h6>{{ curArticle.title }}</h6>
               <div class="des" v-html="curArticle.mainBody"></div>
-              <p class="meta">{{ curArticle.releaseTime }} {{ curArticle.author && ' | ' + curArticle.author }}</p>
+              <p class="meta">{{ curArticle.releaseTime }} {{ curArticle.classificationName && ' | ' + curArticle.classificationName }}</p>
               <ul class="inds">
                 <li v-for="i in articles.length > 3 ? 4 : articles.length" :key="i" :class="{active: curInd == i - 1}" @click.stop="switchCarousel(i - 1)"></li>
               </ul>
@@ -59,27 +59,27 @@
         </div>
         <div class="shop-shows" v-if="articles1.length">
           <div class="left wow fadeInLeft" data-wow-delay="0.5s">
-            <el-carousel height="405px">
+            <el-carousel height="413px">
               <template v-for="(item, i) in articles1">
                 <el-carousel-item v-if="i < 4" :key="i">
-                  <div class="item">
+                  <div class="item" @click="toArtice(item, modules[4].form)">
                     <img class="pic" :src="item.titleImg" alt="">
                     <p class="text">{{ item.title }}</p>
                   </div>
                 </el-carousel-item>
               </template>
             </el-carousel>
-            <div v-if="articles1.length > 4" class="cards" style="margin-top: 18px;">
-              <h6>{{ articles1[4].title }}</h6>
+            <div v-if="articles1.length > 4" class="cards" style="margin-top: 18px;" @click="toArtice(articles1[4], modules[4].form)">
+              <h6 class="a-line">{{ articles1[4].title }}</h6>
               <div class="sum">{{ articles1[4].mainBody }}</div>
               <p class="date">{{ articles1[4].releaseTime }}</p>
             </div>
             <div class="card-wrap">
-              <div v-if="articles1.length > 5" class="cards" style="margin-right: 18px">
+              <div v-if="articles1.length > 5" class="cards" style="margin-right: 18px" @click="toArtice(articles1[5], modules[4].form)">
                 <h6>{{ articles1[5].title }}</h6>
                 <p class="date">{{ articles1[5].releaseTime }}</p>
               </div>
-              <div v-if="articles1.length > 6" class="cards">
+              <div v-if="articles1.length > 6" class="cards" @click="toArtice(articles1[6], modules[4].form)">
                 <h6>{{ articles1[6].title }}</h6>
                 <p class="date">{{ articles1[6].releaseTime }}</p>
               </div>
@@ -88,8 +88,11 @@
           <div v-if="articles1.length > 7" class="right wow fadeInRight" data-wow-delay="0.5s">
             <ul class="card-list">
               <template v-for="(item, i) in articles1">
-                <li v-if="i > 6 && i < 10" :key="i">
-                  <img class="pic" :src="item.titleImg" alt="">
+                <li v-if="i > 6 && i < 10" :key="i" @click="toArtice(item, modules[4].form)">
+                  <div class="releaseTime">
+                    <p class="d">{{ item.date }}</p>
+                    <p class="m">{{ item.month }}</p>
+                  </div>
                   <div class="texts">
                     <h6>{{ item.title }}</h6>
                     <div class="des" v-html="item.mainBody"></div>
@@ -97,7 +100,7 @@
                 </li>
               </template>
             </ul>
-            <div v-if="articles1.length > 10" class="slide">
+            <div v-if="articles1.length > 10" class="slide" @click="toArtice(articles1[10], modules[4].form)">
               <img class="pic" :src="articles1[10].titleImg" alt="">
               <p class="text">{{ articles1[10].title }}</p>
             </div>
@@ -135,6 +138,10 @@
                     <img class="icon" src="@/assets/images/time.png" alt="">
                     会议时间: {{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
                   </p>
+                  <p v-if="item.onlineLocation" class="text">
+                    <img class="icon" src="@/assets/images/online.png" alt="">
+                    {{ item.onlineLocation }}
+                  </p>
                   <p v-if="item.offlineLocation" class="text">
                     <img class="icon" src="@/assets/images/location.png" alt="">
                     {{ item.offlineLocation }}
@@ -159,25 +166,25 @@
         <div v-if="articles3.length" class="media-wrap">
           <div class="left">
             <div class="slides">
-              <div class="item wow fadeInLeft" data-wow-delay="0.5s" style="margin-right: 20px">
+              <div class="item wow fadeInLeft" data-wow-delay="0.5s" style="margin-right: 20px" @click="toArtice(articles3[0], modules[9].form)">
                 <img width="100%" height="100%" :src="articles3[0].titleImg" alt="">
                 <div class="text">{{ articles3[0].title }}</div>
               </div>
-              <div v-if="articles3.length > 1" class="item wow fadeInLeft" data-wow-delay="0.5s">
+              <div v-if="articles3.length > 1" class="item wow fadeInLeft" data-wow-delay="0.5s" @click="toArtice(articles3[1], modules[9].form)">
                 <img width="100%" height="100%" :src="articles3[1].titleImg" alt="">
                 <div class="text">{{ articles3[1].title }}</div>
               </div>
             </div>
             <ul class="list">
               <template v-for="(item, i) in articles3">
-                <li v-if="i > 1 && i < 5" :key="i" class="wow fadeInDown" :data-wow-delay="(0.1 * i).toFixed(1) + 's'">
+                <li v-if="i > 1 && i < 5" :key="i" class="wow fadeInDown" :data-wow-delay="(0.1 * i).toFixed(1) + 's'" @click="toArtice(item, modules[9].form)">
                   <h6>{{ item.title }}</h6>
                   <div class="des">{{ item.mainBody }}</div>
                 </li>
               </template>
             </ul>
           </div>
-          <div v-if="articles3.length > 5" class="right wow bounceInRight" data-wow-delay="0.8s">
+          <div v-if="articles3.length > 5" class="right wow bounceInRight" data-wow-delay="0.8s" @click="toArtice(articles3[5], modules[9].form)">
             <div class="img-wrap">
               <img :src="articles3[5].titleImg" alt="">
             </div>
@@ -197,7 +204,6 @@
             {{ modules[9].form.title }}
             <span class="sub">{{ modules[9].form.subTitle }}</span>
           </h5>
-          <span class="more" @click="toAll(modules[10].form)">MORE</span>
         </div>
         <ul class="news">
           <li v-for="(item, i) in modules[10].list" :key="i" class="wow fadeInDown" :data-wow-delay="(0.2 * i).toFixed(1) + 's'" :class="{'cursor-pointer': item.link.linkName !== '无'}" @click="openLink(item)">
@@ -221,7 +227,7 @@
           <span class="more" @click="toAll(modules[12].form)">MORE</span>
         </div>
         <template v-if="articles4.length">
-          <div class="slide">
+          <div class="slide" @click="toArtice(articles4[0], modules[12].form)">
             <div class="texts">
               <h6>{{ articles4[0].title }}</h6>
               <div class="des">{{ articles4[0].mainBody }}</div>
@@ -233,7 +239,7 @@
           </div>
           <ul class="list">
             <template v-for="(item, i) in articles3">
-              <li v-if="i && i < 4" :key="i" class="wow fadeInDown" :data-wow-delay="(0.1 * i).toFixed(1) + 's'">
+              <li v-if="i && i < 4" :key="i" class="wow fadeInDown" :data-wow-delay="(0.1 * i).toFixed(1) + 's'" @click="toArtice(item, modules[12].form)">
                 <div class="des">{{ item.title }}</div>
                 <p class="date">{{ item.releaseTime }}</p>
               </li>
@@ -245,7 +251,7 @@
 
     <div class="tools">
       <div class="logo">
-        <img src="@/assets/images/logo.png" alt="">
+        <img src="@/assets/images/logo2.png" alt="">
       </div>
       <ul class="nav">
         <li v-for="(item, i) in navs" :key="i" class="column" @click="toAnchor(item)">{{ item.name }}</li>
@@ -299,7 +305,16 @@ export default {
           if (json[4].form.column.length) {
             const { column, articleNum } = json[4].form
             this.$post(`${this.api.queryArticlesByColumnType}?columnId=${column[column.length - 1]}`).then(({ data }) => {
-              this.articles1 = Util.removeTag(data.slice(0, articleNum || 11))
+              const articles = Util.removeTag(data.slice(0, articleNum || 11))
+              articles.forEach(e => {
+                // 把发布日期分割成年月和日，页面上要展示
+                if (e.releaseTime) {
+                  const date = e.releaseTime.split('-')
+                  e.date = date[2]
+                  e.month = date[0] + '/' + date[1]
+                }
+              })
+              this.articles1 = articles
             }).catch(err => {})
           }
           if (json[6].form.column.length) {
@@ -342,7 +357,7 @@ export default {
       clearInterval(this.timer)
       this.timer = setInterval(() => {
         this.curInd++
-        if (this.curInd > 2) this.curInd = 0
+        if (this.curInd > 3) this.curInd = 0
         this.curArticle = this.articles[this.curInd] || {}
       }, 5000)
     },
@@ -518,6 +533,7 @@ export default {
     .item {
       position: relative;
       height: 100%;
+      cursor: pointer;
       .pic {
         width: 100%;
         height: 100%;
@@ -532,6 +548,7 @@ export default {
         font-size: 18px;
         color: #fff;
         line-height: 59px;
+        @include ellipsis;
         background-color: rgba(0, 0, 0, 0.57);
       }
       &:hover {
@@ -545,12 +562,17 @@ export default {
       margin-top: 18px;
       .cards {
         flex: 1;
+        height: 134px;
+      }
+      h6 {
+        @include mul-ellipsis(2);
       }
     }
     .cards {
       padding: 20px;
       background-color: #fff;
       transition: .5s;
+      cursor: pointer;
       &:hover {
         transform: translateX(10px);
       }
@@ -558,7 +580,9 @@ export default {
         margin-bottom: 10px;
         font-size: 18px;
         color: #48525E;
-        @include mul-ellipsis(2);
+      }
+      .a-line {
+        @include ellipsis;
       }
       .sum {
         font-size: 14px;
@@ -593,18 +617,34 @@ export default {
       margin-bottom: 18px;
       background-color: #fff;
       transition: .3s;
+      cursor: pointer;
       &:hover {
         transform: scale(1.05);
       }
     }
-    .pic {
-      width: 124px;
-      height: 92px;
-      margin-right: 28px;
+    .releaseTime {
+      width: 88px;
+      height: 88px;
+      padding: 10px 0 16px;
+      margin-right: 24px;
+      text-align: center;
+    }
+    .d {
+      font-size: 36px;
+      font-family: DINCondensed-Bold, DINCondensed;
+      font-weight: bold;
+      color: #333333;
+      line-height: 43px;
+    }
+    .m {
+      font-size: 14px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #666666;
+      line-height: 20px;
     }
     .texts {
-      width: 504px;
-      margin-right: 60px;
+      width: calc(100% - 110px);
     }
     h6 {
       margin-bottom: 10px;
@@ -625,6 +665,7 @@ export default {
     position: relative;
     height: 284px;
     overflow: hidden;
+    cursor: pointer;
     .pic {
       width: 100%;
       height: 100%;
@@ -657,8 +698,8 @@ export default {
   }
   .left {
     position: relative;
-    width: 688px;
-    height: 690px;
+    min-width: 698px;
+    height: 688px;
     margin-right: 20px;
     cursor: pointer;
     overflow: hidden;
@@ -749,6 +790,7 @@ export default {
       width: 366px;
       height: 197px;
       overflow: hidden;
+      cursor: pointer;
       img {
         width: 100%;
         height: 100%;
@@ -780,6 +822,7 @@ export default {
         height: 78px;
         margin-bottom: 41px;
         transition: .5s;
+        cursor: pointer;
         &:last-child {
           margin-bottom: 0;
         }
@@ -789,7 +832,7 @@ export default {
       }
       h6 {
         margin-bottom: 17px;
-        font-size: 20px;
+        font-size: 18px;
         font-family: PingFangSC-Medium, PingFang SC;
         font-weight: 500;
         color: #272727;
@@ -808,6 +851,7 @@ export default {
     width: 44%;
     box-shadow: 0px 0px 30px 0px rgba(48,48,48,0.08);
     transition: .5s;
+    cursor: pointer;
     .img-wrap {
       width: 100%;
       height: 422px;
@@ -901,6 +945,7 @@ export default {
   .slide {
     display: flex;
     margin-bottom: 14px;
+    cursor: pointer;
   }
   .texts {
     width: 51%;
@@ -947,6 +992,7 @@ export default {
       margin-right: 14px;
       background: url(../../assets/images/sfel/7.png) 0 0/cover no-repeat;
       transition: .5s;
+      cursor: pointer;
       &:nth-child(2) {
         background-image: url(../../assets/images/sfel/8.png);
       }
@@ -1008,5 +1054,11 @@ export default {
   .lg {
     width: 98%;
   }
+  .conference .card-list {
+    width: 734px;
+    .texts {
+      width: 460px;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/router/modules/overviewLocation.js b/src/router/modules/overviewLocation.js
index f2c840a..3a54ae1 100644
--- a/src/router/modules/overviewLocation.js
+++ b/src/router/modules/overviewLocation.js
@@ -1,5 +1,5 @@
 import BasicLayout from '@/layouts/home'
-const name = 'survey'
+const name = 'overviewLocation'
 export default {
   path: `/${name}`,
   component: BasicLayout,
diff --git a/src/router/modules/overviewTrailer.js b/src/router/modules/overviewTrailer.js
index f2c840a..babe046 100644
--- a/src/router/modules/overviewTrailer.js
+++ b/src/router/modules/overviewTrailer.js
@@ -1,5 +1,5 @@
 import BasicLayout from '@/layouts/home'
-const name = 'survey'
+const name = 'overviewTrailer'
 export default {
   path: `/${name}`,
   component: BasicLayout,
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index 478469d..fcf1d2f 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -73,6 +73,10 @@
     top: 160px;
     left: 267px;
   }
+  &.single-banner-overview .texts {
+    top: 332px;
+    left: 278px;
+  }
   .banner-title {
     margin-bottom: 19px;
     font-size: 48px;