From f947ef5e0491b86661e54e4f597da6f8fb8df3b9 Mon Sep 17 00:00:00 2001
From: wangchenguang <728837162@qq.com>
Date: Fri, 28 Apr 2023 10:55:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/images/en-white.png | Bin 1321 -> 1351 bytes
src/assets/images/en.png | Bin 1928 -> 1313 bytes
src/components/breadcrumb/index.vue | 4 +--
src/components/menuTree/index.vue | 16 ++++++++++-
src/i18n/index.js | 20 +++++++++++---
src/mixins/overview/index.js | 34 +++++++++++++++++++-----
src/pages/article/activity.vue | 3 +++
src/pages/column/index.vue | 2 +-
src/pages/overviewDevHistory/index.vue | 35 ++++++++++++++++++++++---
src/pages/overviewIntro/index.vue | 6 ++---
src/pages/overviewLocation/index.vue | 2 +-
src/pages/overviewSetup/index.vue | 2 +-
src/pages/overviewTrailer/index.vue | 2 +-
src/pages/publication/index.vue | 2 +-
src/pages/publication/single.vue | 2 +-
src/pages/publish/show.vue | 2 +-
16 files changed, 104 insertions(+), 28 deletions(-)
diff --git a/src/assets/images/en-white.png b/src/assets/images/en-white.png
index e649f07041bdd499a468014467ef4985ab59c6a9..403d5a44dd9c545d2d24a76475e8e5d30bf279eb 100644
GIT binary patch
literal 1351
zcmeAS@N?(olHy`uVBq!ia0vp^vOp}u!3-o<3A)SxQjEnx?oNz1PwLbIIh+L^k;M!Q
z+`=Ht$S`Y;1Oo#TZ-7sTD^T+PC>RX^a0p0u^G5&^#QKsTzhDM-g^=DO4}Sc8eREx*
zyEr3{bJvxh|KF6zG8uN?`TFYL#{+=^GhTi_^=J3YtEn<me?2Q;zRc_KM497Wn%LTT
zN<HT-&i;OW-zxdUw+ULJweS0Pm`R+`nSRjvc$rYZM8%zXVXUq1Tx_c9Yn(p&EndE;
z@&+f%<5`*ySKMCncGJ=Pm24vGqs=#bnLYoQT)1$y!L_?jmwwvopsl;d*FR{IhOOzo
zx+yV{{C3+CiXW|Bwcoq>L$={$V49Zjba4!+n3H><GFm85gzbZ|l!2Soj+m5&#v^R%
z9_|854{egV=;LCnadb`3w*y|@m$@>Qo)t5`oqK=Fub#Wr>_PHX|7TXd%RgtE&d0zT
z9J0r4@zss0*<W9KolXd~aISPs6%9(h5;FV8)U0h0tg{W5pV+tWSYpJnTfB=luiJHO
zUb;%IPTHsIvtpa7gKbSt{1@5SE4O|XTlbA89~n)y>xe6dyj;FxXGwRlcBXKKXxNG^
zz1!~HQ+uPKq;Fk*(j)UaTd&a5X?#W%%gt_hZm2VNiml#t+Q~L?>#fv7%l8)Dk6ZNj
zx5!TYL(Jl#A$RK;=JRc6Hnchr@a2I)T?PMBt8D&a2FK?U1xw5R8@ShfSmArMf;Df=
z6q)F)<_0qMg_E9K5%@Pl)L;1NkN+*rKW1*O(2c27ikxt<xFGK39tMN7iA$SKJT3_I
zivfn?qE62!g|OIpS##aqOg*`}jOBVx9{W|1$>&;}6n$@quHL)uMBTHtmIu$)-d@ae
zQRV&a$!F7U9}bi^xj*&&$L|~MDkSF32sHh6;@6MPmaDhl3x>9yxqLIdIArhn=Vxs>
zUi-K&xV}W|eTAW&hw0x>S6`dEJim2sANLBbm#yFBSEM~^TCn)lKZ#GzL}vKUUs>n*
z@@tj!#be9XPYB<mwdTIkUBNlKZeBU`J#)#-{yz!DUTOb!?r=$(y!KbT)fLmN776EH
qM>Mx^C5acG`tPSBs`B%>{+<U5-aol?u^O1X89ZJ6T-G@yGywoO8jbq^
literal 1321
zcmV+^1=jkBP)<h;3K|Lk000e1NJLTq001Na001Kh1^@s6`~|2W00001b5ch_0Itp)
z=>Px(<4Ht8R9Hu~n0v^ca~Q`z-#HUTikMU8lw%Gdk#~zITWE7gW6p<2iN$JLgh-UA
z&1usT#wMW_Ii?**!aoinhZ%*!a@cGxeV?xT>3*O0K0NRHdawW9_x|0#`}4c5?{)Y+
zq7RFR&4E3DiNGY_DBwU~S72M<PvAS?d*EH*P2h82t)zeY_(XS!+7?H|KEMUQX$i7J
z+dB#P9`G9QoFv2bWwk&Nu?;X4xDGfL*a`@s^$?{muLnK=9spjFWKT9)<>nFL@Z1fY
z0~l-*um<=GIB1wqK7`+U9=Ju4!&+-YfFfc)U><NGFb?<)SPU!!&H!!#HfuX+#q)oG
zCxN+=zNveE5Ku(y4%`Dw2ewSF+y*==X<bCz2i!11AT#{!y@1(up6UXnW*$ue`~NF}
zS->hub~_o$*E7RL;H1tg_SDnB6_OmvK~@Hu0n7)s1HJ^#m-K#lbwqgm)xiD0)*~g#
zEWAw8GnGIQv46(b*|g5$0~QpX>47=|STag4+2ijx8j{wQ_g6%0k)fHB+OU9UN&2Oi
zK123UmIDjEFt7aq*qHxtX6~ChtaGGGz+9IENyU2@Xm8*N;1u9%V5X$ED`0j5?f@>y
z>?@Y|oqGXm%XP=*D!u@4QEjrfyq_fR(J=#^3cQf@=Ec;Gvtf{BIamrDS$g1_GCQ-d
z`%Xkm0jv+Vl_vY$wN8=`(*?Q<xHa8<m86ALJEWlR1TF=3%KGFiTrA0%)3JzfjdEBm
z{x-9gyyv`P4|~XTZkTrW0g}G0+a)60$Lvvu!eU%fhA9C(2wc-flh0oU&MtIhpieXA
zUjYY8+R*1lwaX&nc;I2+us+(%XTagbcMbGM#(Fhy@^Ht6hVUMpZN?)?n~tUx-!)LD
z3IneIQ~nR2(RjG*p%uVD6;KM*L)uu|Mgv(pE@Bqx#NPgrFrH`JTHJ8Q$}F9w23iiB
zo>_LNq%X=}j0g{Ao`rT9E0WT_8w})@;Ss|_*u|2bssQ@6)J%sI%^pyD(QU=G$@6qE
zWx7R`+l|Xiq2F$!Hqhjp=C%ihRO<9l0c04rkS3^Covpw}z(s)5+J*EH;LI!ohH*)7
z%`?o8#erLUSq0E|N$d0f?pfti+gYBejsZT*Ztgng3Vvc9c;|8v?%BW7%bY!)0&h>z
zKIT>;$zJhB)==3)1(2sp>#tYndu3hg1@bz7<K_%yrz;Er%8z<;YsaqkJai+l(DP6O
zkS_vnlz=?EIW)yJsSA{cwx%ZJ5IEq=LM>22od-Og6QeJEo)}lQgzUId$Sm3`foUo7
zGLUa7Zn~f3MZslcQX7y*1q;uYLZ5b-r0I1)d5ChjEKbi$*H-{}*19~Od5(727D-xD
z8L}d6b0YLOaxSo1(m;cU_ROKI3^g9uu?EOu_vmYA>vofia3fHj+M|W*(gaD98-Ofc
zUy&{PDl3P~9$J(jo|BdrV@oSgLRqj=CCzUDa{4+udwZNOm>!F(fP4sN=C#G#)fZ4g
zjq@p5G*oqi^$!g8NEML1?`-omeNM&x?LQp!0Qq*{&APXQidfCeiPF{AGx*Q>_gR27
zX8S2G0d80Ju&-SmPq+S((d*JNZm^x3Xro1hv&g^o98#f|w%3RA+@buqA0V$e2{>Vt
f*XK4k%V5=iOW`)74!o!{00000NkvXXu0mjf<Q00_
diff --git a/src/assets/images/en.png b/src/assets/images/en.png
index d834c3ee00165d2e88635dc097bed5174946b40f..7054afe8ae70722e62a3b5ce05d221e274fb270c 100644
GIT binary patch
literal 1313
zcmV++1>X9JP)<h;3K|Lk000e1NJLTq0012T000~a1^@s6ozJwY00001b5ch_0olnc
ze*gdg32;bRa{vGf6951U69E94oEQKA1jb23K~#90tyWuXR7Dux?Lw<b8ws|+12te@
z6iWgRsKHB!m_TAwYKX?@gGqxgCW?`eXhb(LzEBNnR9uZT(y+T{X7A_HtyRESi{S3g
zoZW5FfKV(-DyR_!u@>q#=gcm<+jB}wI?0!_J2U_P&3~Qocw9y(&Kkl=zKm+-W~%YG
zfdOEI>iiOL88{34Kr|MM=;n*qw;`O&Eq2p4?I44rUeY(*NK|t@l<ovk5#N7-$!Ty-
z9Exas8!-y40X0)MD^jZGS5w{Wf}-QV1)}p`Ev3_w3S0sH1o=Ut=R1hX8)rlqHwp_t
z_z?uhpx_^(vm-<|w^4&1luEBfEHD9?erlMTqxx`zyGzNa*S3%cgmu6WEZh>&3QKM4
z`3J!G3`qqpL;e@Udn>}_b0$>_jfh7Vu`Mh>U~8<`Y$~to=0?n&o`tm*Kw6}|`L-#9
z5q0<ms^vFe(+S~Hs<UU~>FRiZa1judUYIed?P|6sl+0DfSJC*bSbWP?$QV`4Wm7z%
z^SiO0t#I*wRAXoG6(w|1CfbBEF*}W<TI=^8xSG*e=qw3Cd1o!568UZ^*1oM!bP-{A
zhoo{V!inr+)N>2mzXS7sxVxDLlw_{8(u!TS1!fwHch-^yqlcGZJ!4s?Ghu0(q_XYZ
z-S)`|AzqN~w%6U<%)X*(?w(50Lso||%<VK?Sm>B&8sCIHLh-v{HM6{GjSwGn^j#yi
zBUEM2r&1Yj$-O7-1mceqqd4D@G|3uKt8Hj^%l&@8w}up!@;9m7MBGS!NA2&7$9Y|e
zRJi4=qVop>{j+Rea(qSx(Kgw=IM^$|>r<ffS5ZEj0)eZRisn70sQdv;R*@1i={1aF
zb#sM1z^93GUXNwE&i{go9tj3d_$mpJT<bC4gZ0pyK;wJyeOZuxZ@JhoJBe}h#uDj=
z+Sl_i-z95vVvZnmjf%|tSpMn3@7qhHaL0UkLXilkfUwi)W$P4I-!ULU?auX^loO##
zN!f3xY@;4rzAuQ(BcjP`tiy#=Nu-ZAM2&oXEH%^|P3BulK${y7jREoj#V9N!`p^RW
zj>`lcr=JhC30Z{dDQWGbhotyj@O1(O{5K}{cH_n1KpGN>urF0?!oE+a%Dc<Z_!&vM
zJE&%wWO8l<1_deUFWw?#QEpF^NyABYGX$TbRvTldBE9A+H`1O+2A1$)Vqfq-V*k%l
zQJEAy))z`;mMFN^(4WT~NyUh0yct6Kfb*FAl4$vLPNaYjJ@k%{%2wi{SdDP(kn3gA
zpqgEUnqN!$Ox#RtSGbS2I+BX|R8-c1r1(N)7kcS-C(=-&P!E?r49`4@J&$4jy;@Qn
zXdM-|mdbBawCsIKI<v@;)T&FB*Q2Yf!Q_76H78OfS!|YdeL>=q6RAi_%)K8@9BvuJ
z%fXdY4Dswl9G-^To^&E5dgdm0LqYS7m0|bXT2ee!@B-0t_sjfnCoK)X-)euAqy|#H
z9aw?nX|IC8k6`^gh!ha5L9CxC*Qv$^NZMR!%kr0G-8z#xWbaP^1xPLA6Lnl>bPV4E
z6>h(XLq(+Qp>lI@8?o5YdBl1JGM8t_b>Rwhj=7Th{Udd#wTD33<7DCW0PYW=jNbSk
XkqjijJ7bS#00000NkvXXu0mjfq{(zy
literal 1928
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
O0000<MNUMnLSTYTL%Wp#
diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index d560cbc..95245d5 100644
--- a/src/components/breadcrumb/index.vue
+++ b/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
}
}
}
diff --git a/src/components/menuTree/index.vue b/src/components/menuTree/index.vue
index 6699c1d..b7661ad 100644
--- a/src/components/menuTree/index.vue
+++ b/src/components/menuTree/index.vue
@@ -41,13 +41,27 @@ 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;
diff --git a/src/i18n/index.js b/src/i18n/index.js
index f1be9a5..e1404be 100644
--- a/src/i18n/index.js
+++ b/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'
}
}
};
\ No newline at end of file
diff --git a/src/mixins/overview/index.js b/src/mixins/overview/index.js
index 1bac983..64e792d 100644
--- a/src/mixins/overview/index.js
+++ b/src/mixins/overview/index.js
@@ -14,7 +14,8 @@ export default {
const json = JSON.parse(this.preview ?
data :
data[data.length - 1][data[data.length - 1].state ? 'theEditedJson' : 'jsonBeforeEditing'])
- this.modules = json
+ console.log('json=》',json)
+ this.modules = json
console.log("🚀 ~ file: index.vue ~ line 180 ~ this.$post ~ json", json)
}
}).catch(err => {})
@@ -23,12 +24,31 @@ export default {
tabChange(i) {
this.active = i
// 跳转到固定的长页，这里的id不能变
- let path = '/overviewIntro?id=220'
- if (i == 1) path = '/overviewDevHistory?id=214'
- if (i == 2) path = '/overviewTrailer?id=215'
- if (i == 3) path = '/overviewLocation?id=216'
- if (i == 4) path = '/overviewSetup?id=229'
- this.$router.push(path + '&siteId=3')
+ let path = '/overviewIntro?id=378'
+ if (i == 1) path = '/overviewDevHistory?id=379'
+ if (i == 2) path = '/overviewTrailer?id=380'
+ if (i == 3) path = '/overviewLocation?id=381'
+ if (i == 4) path = '/overviewSetup?id=382'
+ 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
+ }
+ }
}
};
\ No newline at end of file
diff --git a/src/pages/article/activity.vue b/src/pages/article/activity.vue
index 454a843..8e7c389 100644
--- a/src/pages/article/activity.vue
+++ b/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">
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index 655e249..961c2eb 100644
--- a/src/pages/column/index.vue
+++ b/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"
diff --git a/src/pages/overviewDevHistory/index.vue b/src/pages/overviewDevHistory/index.vue
index a1825ef..5396cc3 100644
--- a/src/pages/overviewDevHistory/index.vue
+++ b/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[2].list.length" class="event">
+ <div v-if="modules[1]" 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;
diff --git a/src/pages/overviewIntro/index.vue b/src/pages/overviewIntro/index.vue
index ec280f3..851a8cb 100644
--- a/src/pages/overviewIntro/index.vue
+++ b/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>
diff --git a/src/pages/overviewLocation/index.vue b/src/pages/overviewLocation/index.vue
index e3cef93..d5eb9ee 100644
--- a/src/pages/overviewLocation/index.vue
+++ b/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>
diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue
index 0e4ae57..a958715 100644
--- a/src/pages/overviewSetup/index.vue
+++ b/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>
diff --git a/src/pages/overviewTrailer/index.vue b/src/pages/overviewTrailer/index.vue
index c01fdf4..8402463 100644
--- a/src/pages/overviewTrailer/index.vue
+++ b/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>
diff --git a/src/pages/publication/index.vue b/src/pages/publication/index.vue
index e88b27e..6778ed2 100644
--- a/src/pages/publication/index.vue
+++ b/src/pages/publication/index.vue
@@ -87,7 +87,7 @@ export default {
case '论文':
return type.t('column.paper')
default:
- break;
+ return name
}
}
}
diff --git a/src/pages/publication/single.vue b/src/pages/publication/single.vue
index 4f5143e..ac33441 100644
--- a/src/pages/publication/single.vue
+++ b/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" />
diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue
index 568a6ab..2d88e94 100644
--- a/src/pages/publish/show.vue
+++ b/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=""> -->