Compare commits

..

No commits in common. 'b5216d833f47de4a70494df644e63dd2ee78eee2' and '1e0bbbcbc06fd46eed8b0ee7c28f910bf11c8a41' have entirely different histories.

  1. BIN
      src/assets/images/en-white.png
  2. BIN
      src/assets/images/en.png
  3. 4
      src/components/breadcrumb/index.vue
  4. 16
      src/components/menuTree/index.vue
  5. 20
      src/i18n/index.js
  6. 34
      src/mixins/overview/index.js
  7. 3
      src/pages/article/activity.vue
  8. 2
      src/pages/column/index.vue
  9. 35
      src/pages/overviewDevHistory/index.vue
  10. 6
      src/pages/overviewIntro/index.vue
  11. 2
      src/pages/overviewLocation/index.vue
  12. 2
      src/pages/overviewSetup/index.vue
  13. 2
      src/pages/overviewTrailer/index.vue
  14. 2
      src/pages/publication/index.vue
  15. 2
      src/pages/publication/single.vue
  16. 2
      src/pages/publish/show.vue

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

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

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

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

@ -14,8 +14,7 @@ export default {
const json = JSON.parse(this.preview ? const json = JSON.parse(this.preview ?
data : data :
data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing']) data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
console.log('json=》',json) this.modules = json
this.modules = json
console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json) console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
} }
}).catch(err => {}) }).catch(err => {})
@ -24,31 +23,12 @@ export default {
tabChange(i) { tabChange(i) {
this.active = i this.active = i
// 跳转到固定的长页,这里的id不能变 // 跳转到固定的长页,这里的id不能变
let path = '/overviewIntro?id=378' let path = '/overviewIntro?id=220'
if (i == 1) path = '/overviewDevHistory?id=379' if (i == 1) path = '/overviewDevHistory?id=214'
if (i == 2) path = '/overviewTrailer?id=380' if (i == 2) path = '/overviewTrailer?id=215'
if (i == 3) path = '/overviewLocation?id=381' if (i == 3) path = '/overviewLocation?id=216'
if (i == 4) path = '/overviewSetup?id=382' if (i == 4) path = '/overviewSetup?id=229'
this.$router.push(path + '&siteId=4') this.$router.push(path + '&siteId=3')
}, },
},
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
}
}
} }
}; };

@ -12,9 +12,6 @@
<div v-if="form.keynoteSpeaker" class="meta">{{$t('column.speaker')}}{{ form.keynoteSpeaker }}</div> <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> <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> <h6>{{$t('column.content')}}</h6>
<div v-html="form.mainBody"></div> <div v-html="form.mainBody"></div>
<div v-if="form.fileList && form.fileList.length" class="annex"> <div v-if="form.fileList && form.fileList.length" class="annex">

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

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

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

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

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

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

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

@ -8,7 +8,7 @@
</div> </div>
<div class="tab-content"> <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判断是哪个列表样式这个出版物页面只显示下面三个列表样式 --> <!-- 根据栏目的listStyleId判断是哪个列表样式这个出版物页面只显示下面三个列表样式 -->
<!-- 论文 --> <!-- 论文 -->
<Thesis v-if="type === 46" :id.sync="id" /> <Thesis v-if="type === 46" :id.sync="id" />

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

Loading…
Cancel
Save