Merge branch 'master' of http://121.37.12.51:13000/jialong.yu/FE_IASF_client

src/components/breadcrumb/index.vue

@@ -32,8 +32,6 @@ export default {
     },
    filters: {
     i18nName(name,type) {
-      console.log('name=>',name)
-      console.log('type=>',type)
       switch (name) {
         case '专利':
           return type.t('column.patent')
@@ -45,7 +43,7 @@ export default {
          return type.t('column.scientificResearch')
          
         default:
-          break;
+          return name
       }
     }
    }

src/components/menuTree/index.vue

@@ -42,12 +42,26 @@ export default {
 </script>
 <style lang="scss" scoped>
 
+.menu-child{
+    /deep/ .el-menu-item {
+     background-color: transparent !important;
+    }
+  
+    &:hover {
+      background-color: transparent !important;
+    }
+  }
 @media (min-width: 280px) and (max-width: 1200px) {
   .menu-child{
     /deep/ .el-menu-item {
-      height: 40px;line-height: 40px;color: black !important;
+      height: 40px;line-height: 40px;color: black !important;background-color: transparent !important;
+    }
+  
+    &:hover {
+      background-color: transparent !important;
     }
   }
+
   .el-submenu{
     /deep/ .el-submenu__title{
       height: 40px;

src/i18n/index.js

@@ -61,7 +61,14 @@ export const messages = {
       patent:'专利',
       monograph: '专著',
       paper: '论文',
-      scientificResearch: '科学研究'
+      scientificResearch: '科学研究',
+      sfeLintroduce: 'S³FEL介绍',
+      develHistory:'发展历程',
+      sfeltrailer: 'S³FEL宣传片',
+      geographicLocation: '地理位置',
+      organization: '机构设置',
+      introduce: '介绍',
+      ActivityIntroduction: '活动简介'
     }
   },
   'en': {
@@ -106,7 +113,7 @@ export const messages = {
       patentClassification: 'PatentClassification',
       applicationDate: 'ApplicationDate',
       selectDate: 'SelectDate',
-      pleaseEnterPatentOfficer: 'Please enter the patent name/inventor name/application number officer',
+      pleaseEnterPatentOfficer: 'Please enter the patent name/inventor name/application number',
       patentName: 'Patent title',
       patentClassification: 'Patent classification',
       ApplicationNumber:'Application number',
@@ -125,7 +132,14 @@ export const messages = {
       patent: 'Patent',
       monograph: 'Monograph',
       paper: 'Paper',
-      scientificResearch: 'scientific research'
+      scientificResearch: 'Scientific research',
+      sfeLintroduce: 'Sfe lintroduce',
+      develHistory:'Development history',
+      sfeltrailer: 'Sfel trailer',
+      geographicLocation: 'geographic location',
+      organization: 'Organization',
+      introduce: 'Introduce',
+      ActivityIntroduction: 'Activity Introduction'
     }
   }
 };

src/mixins/overview/index.js

@@ -14,6 +14,7 @@ export default {
           const json = JSON.parse(this.preview ?
             data :
             data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
+            console.log('json=》',json)
             this.modules = json
           console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
         }
@@ -23,12 +24,31 @@ export default {
     tabChange(i) {
       this.active = i
       // 跳转到固定的长页，这里的id不能变
-      let path = '/overviewIntro?id=220'
+      let path = '/overviewIntro?id=378'
-      if (i == 1) path = '/overviewDevHistory?id=214'
+      if (i == 1) path = '/overviewDevHistory?id=379'
-      if (i == 2) path = '/overviewTrailer?id=215'
+      if (i == 2) path = '/overviewTrailer?id=380'
-      if (i == 3) path = '/overviewLocation?id=216'
+      if (i == 3) path = '/overviewLocation?id=381'
-      if (i == 4) path = '/overviewSetup?id=229'
+      if (i == 4) path = '/overviewSetup?id=382'
-      this.$router.push(path + '&siteId=3')
+      this.$router.push(path + '&siteId=4')
     },
+  },
+  filters: {
+    i18nName(name,type) {
+      switch (name) {
+        case 'S³FEL介绍':
+          return type.t('column.sfeLintroduce')
+        case '发展历程':
+          return type.t('column.develHistory')
+        case 'S³FEL宣传片':
+           return type.t('column.sfeltrailer')
+        case '地理位置':
+           return type.t('column.geographicLocation')
+        case '机构设置':
+          return type.t('column.organization')
+         
+        default:
+          return name
+      }
+    }
   }
 };

src/pages/article/activity.vue

@@ -12,6 +12,9 @@
           <div v-if="form.keynoteSpeaker" class="meta">{{$t('column.speaker')}}：{{ form.keynoteSpeaker }}</div>
           <div v-if="form.lectureSeries" class="meta">{{$t('column.series')}}：{{ form.lectureSeries }}</div>
 
+          <h6>{{$t('column.ActivityIntroduction')}}</h6>
+          <div> {{ form.eventProfile }}</div>
+
           <h6>{{$t('column.content')}}</h6>
           <div v-html="form.mainBody"></div>
           <div v-if="form.fileList && form.fileList.length" class="annex">

src/pages/column/index.vue

@@ -82,7 +82,7 @@
              </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">
+             <template v-else-if="!columns.find(i=>i.children.length) && info.listStyleId ===15 || info.listStyleId ===10 || info.listStyleId ===16">
              </template>
             <el-tree v-else class="columns" ref="leftColumn" :data="columns"
               highlight-current :expand-on-click-node="false" default-expand-all :props="defaultProps" node-key="id"

src/pages/overviewDevHistory/index.vue

@@ -9,7 +9,7 @@
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
-        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item | i18nName($i18n) }}</li>
       </template>
     </ul>
 
@@ -17,8 +17,28 @@
       <div class="inner">
         <h2 class="wow fadeInLeft">{{ modules[1].form.title }}</h2>
         <p class="en">{{ modules[1].form.des }}</p>
-
+        <div v-if="modules[1]" class="event">
-        <div v-if="modules[2].list.length" class="event">
+          <ul class="time">
+            <template v-for="(item, i) in modules[1].list">
+              <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}" @click="yearClick(i)">{{ item.title }}</li>
+            </template>
+          </ul>
+          <div class="right">
+            <h6 class="year">{{ modules[1].list[curYear].title }}</h6>
+            <ul class="list">
+              <template v-for="(e, j) in modules[1].list[curYear].list">
+                <li v-if="e.isEnable" :key="j" :class="{'cursor-pointer': isLink(e.link.linkName)}" @click="openLink(e)">
+                  <div class="texts">
+                    <p class="date">{{ e.title }}</p>
+                    <p class="text">{{ e.des }}</p>
+                  </div>
+                  <img v-if="e.pic" :src="e.pic" alt="" class="pic">
+                </li>
+              </template>
+            </ul>
+          </div>
+        </div>
+        <!-- <div v-if="modules[2]" class="event">
           <ul class="time">
             <template v-for="(item, i) in modules[2].list">
               <li v-if="item.isEnable" :key="i" :class="{active: curYear == i}" @click="yearClick(i)">{{ item.title }}</li>
@@ -38,7 +58,7 @@
               </template>
             </ul>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
   </div>
@@ -181,11 +201,18 @@ export default {
       width: 31.25rem;
     }
     .date {
+      width: 31.25rem;
       margin-bottom: .75rem;
       font-size: 1.26rem;
       font-family: PingFangSC-Semibold, PingFang SC;
       font-weight: 600;
       color: #333;
+      display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    word-break: break-all
     }
     .text {
       font-size: 1.08rem;

src/pages/overviewIntro/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="wrap">
+  <div class="wrap" v-if="modules.length>=1">
     <div class="single-banner single-banner-overview">
       <img class="banner-img" :src="modules[0].form.pic" alt="">
       <div class="texts">
@@ -9,7 +9,7 @@
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
-        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item | i18nName($i18n) }}</li>
       </template>
     </ul>
 
@@ -24,7 +24,7 @@
           <div class="text" v-html="modules[1].form.des"></div>
         </div>
       </div>
-      <div class="intro-bg">
+      <div class="intro-bg" v-if="modules[2]">
         <div class="mask"></div>
         <div class="texts">
           <h6>{{ modules[2].form.title }}</h6>

src/pages/overviewLocation/index.vue

@@ -9,7 +9,7 @@
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
-        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item | i18nName($i18n) }}</li>
       </template>
     </ul>
 

src/pages/overviewSetup/index.vue

@@ -9,7 +9,7 @@
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
-        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item | i18nName($i18n) }}</li>
       </template>
     </ul>
 

src/pages/overviewTrailer/index.vue

@@ -9,7 +9,7 @@
 
     <ul class="tabs wow fadeInLeft">
       <template v-for="(item, i) in tabs">
-        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item }}</li>
+        <li :class="{active: i == active}" :key="i" @click="tabChange(i)">{{ item | i18nName($i18n) }}</li>
       </template>
     </ul>
 

src/pages/publication/index.vue

@@ -87,7 +87,7 @@ export default {
         case '论文':
          return type.t('column.paper')
         default:
-          break;
+          return name
       }
     }
   }

src/pages/publication/single.vue

@@ -8,7 +8,7 @@
     </div>
 
     <div class="tab-content">
-      <Breadcrumb style="margin-bottom: 30px" ref="breadcrumb" :data.sync="routes"/>
+      <!-- <Breadcrumb style="margin-bottom: 30px" ref="breadcrumb" :data.sync="routes"/> -->
       <!-- 根据栏目的listStyleId判断是哪个列表样式，这个出版物页面只显示下面三个列表样式 -->
       <!-- 论文 -->
       <Thesis v-if="type === 46" :id.sync="id" />

src/pages/publish/show.vue

@@ -13,7 +13,7 @@
             <p class="name">{{ $t('column.quote') }}</p>
             <p class="val">{{ form.quote }}</p>
           </template>
-          <p class="name">{{ $t('column.abstract') }}</p>
+          <p class="name">{{ $t('column.introduce') }}</p>
           <div class="flex">
             <div class="des" v-html="form.mainBody"></div>
             <!-- <img v-if="form.titleImg" width="222" height="222" :src="form.titleImg" alt=""> -->