diff --git a/src/i18n/index.js b/src/i18n/index.js index 46c5d26..9f1e9ce 100644 --- a/src/i18n/index.js +++ b/src/i18n/index.js @@ -24,7 +24,40 @@ export const messages = { all: '全部', readDetail: '阅读详情', offline:'线下', - more: '更多' + more: '更多', + author: '作者', + quote: '引用', + abstract: '摘要', + publicationName: '刊物名称', + yearOfPublication: '出版年份', + year: '年', + rollUp: '卷', + documentNumber: '文献号', + publicationType: '出版物类型', + publicationyear: '发表年度', + pleaseSelectThePublicationTime: '请选择出版时间', + PleaseEnterThePaperName: '请输入论文题目/期刊名称/作者名称', + journalName: '期刊名称', + yearofpublication: '出版年', + patentClassification: '专利类别', + applicationDate: '申请日期', + selectDate: '选择日期', + pleaseEnterPatentOfficer: '请输入专利名称/发明人姓名/申请号员', + patentName: '专利名称', + patentClassification: '专利类别', + ApplicationNumber: '申请号', + ApplicationDate: '申请日期', + AuthorizationDate: '授权日期', + inventor: '发明人', + Pleaseselect: '请选择', + Publicationtime: '出版时间', + PleasenameoftheAuthor: '请输入著作名称/出版社名称/编写人员', + titleOfWork: '著作名称', + press: '出版社', + authorPersion: '编写人员', + seeMore: '查看更多', + inventionpatent: '发明专利', + practicalAppearance: '实用外观' } }, 'en': { @@ -52,7 +85,40 @@ export const messages = { all: 'All', readDetail: 'Read Detail', offline: 'Offline', - more: 'More' + more: 'More', + author: 'Author', + quote: 'Quote', + abstract: 'Abstract', + publicationName: 'PublicationName', + yearOfPublication: 'YearOfPublication', + year: 'Year', + rollUp: 'RollUp', + documentNumber: 'DocumentNumber', + publicationType: 'PublicationType', + publicationyear: 'PublicationYear', + pleaseSelectThePublicationTime: 'Please select the publication time', + PleaseEnterThePaperName: 'Please enter the paper title/journal name/author name', + journalName: 'JournalName', + yearofpublication: 'YearOfpublication', + patentClassification: 'PatentClassification', + applicationDate: 'ApplicationDate', + selectDate: 'SelectDate', + pleaseEnterPatentOfficer: 'Please enter the patent name/inventor name/application number officer', + patentName: 'Patent name', + patentClassification: 'Patent classification', + ApplicationNumber:'Application number', + ApplicationDate: 'Application date', + AuthorizationDate: 'Authorization Date', + inventor: 'Inventor', + Pleaseselect: 'Please select', + Publicationtime: 'Publication time', + PleasenameoftheAuthor: 'Please enter the name of the work/publisher/author', + titleOfWork: 'Title of work', + press: 'press', + authorPersion: 'Author', + seeMore: 'See more', + inventionpatent: 'Invention Patent', + practicalAppearance:'Practical appearance' } } }; \ No newline at end of file diff --git a/src/mixins/article/index.js b/src/mixins/article/index.js index eddd63f..6db219b 100644 --- a/src/mixins/article/index.js +++ b/src/mixins/article/index.js @@ -23,7 +23,7 @@ export default { console.log('menuVisible=>' ,menuVisible) // 跳转链接 if (typeId === 2) { - if ( menuVisible === 1 || to.children.find(i=>i.menuVisible ===1)) return + if ( menuVisible === 1 && to.children.find(i=>i.menuVisible ===1)) return let href = to.linkAddress const cType = to.connectionType if (cType !== 2) { // 非站外链接 diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue index 76a27de..fba0f6b 100644 --- a/src/pages/application/index.vue +++ b/src/pages/application/index.vue @@ -318,10 +318,11 @@ export default { overflow: hidden; } .des { - margin: 14px 0; + margin: 2px 0; font-size: .9rem; color: #333; line-height: 22px; + -webkit-line-clamp: 2; } .meta { font-size: .8rem; diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue index c8a9526..07f78af 100644 --- a/src/pages/article/index.vue +++ b/src/pages/article/index.vue @@ -181,8 +181,8 @@ export default { } } .banner { - height: 14.4rem; - padding: 7.68rem 0 0 22.1875rem; + height: 21.6rem; + padding: 14.68rem 0 0 22.1875rem; font-size: 2.16rem; font-weight: 600; color: #fff; diff --git a/src/pages/careers/index.vue b/src/pages/careers/index.vue index a2b9b1d..22007fe 100644 --- a/src/pages/careers/index.vue +++ b/src/pages/careers/index.vue @@ -295,7 +295,7 @@ export default { z-index: 1; width: 43.333%; height: 100%; - padding: 138px 30px 30px 103px; + padding: 138px 30px 130px 103px; background-color: rgba(54, 54, 54, .65); } .pic { diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 51088d3..90bf1ac 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -82,6 +82,8 @@ + + columnClick(item, 1)"> @@ -236,7 +238,8 @@ {{ item.onlineLocation }} - {{ $t('column.readDetail') }} + {{ $t('column.readDetail') }} + @@ -781,8 +784,7 @@ export default { color: #333; background: #f7f7f7; border: 0; - border-top-left-radius: 6px; - border-bottom-left-radius: 6px; + border-radius: 6px; &:focus { outline: none; diff --git a/src/pages/exp/index.vue b/src/pages/exp/index.vue index 79984fc..455c269 100644 --- a/src/pages/exp/index.vue +++ b/src/pages/exp/index.vue @@ -149,6 +149,7 @@ export default { font-size: .98rem; color: #333; line-height: 1.7rem; + -webkit-line-clamp: inherit; } } .list { diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 0ba0cee..5d14f5f 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -87,7 +87,7 @@ - + {{ modules[10].form.des }} @@ -146,6 +146,8 @@ 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 138 ~ this.$post ~ this.modules", this.modules) @@ -215,9 +217,16 @@ 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; } .des { font-size: 1.024rem; diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index 8efe4e1..f71c0cc 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -595,7 +595,6 @@ export default { .left { width: 44.875rem; margin-right: 20px; - background-color: #fff; overflow: hidden; cursor: pointer; .pic { @@ -608,6 +607,8 @@ export default { .texts { display: flex; padding: 2rem 1.5rem; + background-color: #fff; + } .meta { padding: .5714rem 1.314rem .5714rem 0; @@ -662,7 +663,7 @@ export default { h6 { margin-bottom: 0.5714rem; font-size: 1.1428rem; - color: #333; + color: #333; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; diff --git a/src/pages/org/index.vue b/src/pages/org/index.vue index d125ce4..38eb30b 100644 --- a/src/pages/org/index.vue +++ b/src/pages/org/index.vue @@ -124,11 +124,12 @@ export default { @media (max-width: 320px) { .single-banner { .banner-img { - height: 13rem; + height: auto; } .texts { - top: 9rem !important; - left: 8rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } @@ -136,117 +137,147 @@ export default { } .org{ .pic { - width: 100%; - height: 13rem; + width: 80%; + height: auto; } } } @media (min-width: 320px) and (max-width: 375px) { .single-banner { .banner-img { - height: 15rem; + height: auto; } .texts { - top: 11rem !important; - left: 10rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } + .org{ + .pic { + width: 80%; + height: auto; + } + } } @media (min-width: 375px) and (max-width: 480px) { .single-banner { .banner-img { - height: 18rem; + height: auto; } .texts { - top: 14rem !important; - left: 13rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } + .org{ + .pic { + width: 80%; + height: auto; + } + } } @media (min-width: 480px) and (max-width: 640px) { .single-banner { .banner-img { - height: 22rem; + height: auto; } .texts { - top: 18rem !important; - left: 25rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } + .org{ + .pic { + width: 80%; + height: auto; + } + } } @media (min-width: 640px) and (max-width: 768px) { .single-banner { .banner-img { - height: 25rem; + height: auto; } .texts { - top: 21rem !important; - left: 37rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } - .tab-content{ - .org{ - .pic { - width: 100%; - height: 25rem; - } + .org{ + flex-direction: row; + .left { + width: 60%; + } + .pic { + width: 30%; + height: auto; } } } @media (min-width: 768px) and (max-width: 980px) { .single-banner { .banner-img { - height: 28rem; + height: auto; } .texts { - top: 21rem !important; - left: 37rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } - .tab-content{ - .org{ - .pic { - width: 100%; - height: 28rem; - } + .org{ + flex-direction: row; + .left { + width: 60%; + } + .pic { + width: 30%; + height: auto; } } } @media (min-width: 980px) and (max-width: 1200px) { .single-banner { .banner-img { - height: 32rem; + height: auto; } .texts { - top: 21rem !important; - left: 37rem !important; + bottom: 0 !important; + left: 1rem !important; + top: auto !important; .banner-title { font-size: 1.5rem; } } } - .tab-content{ - .org{ - .pic { - width: 100%; - height: 32rem; - } + .org{ + flex-direction: row; + .left { + width: 60%; + } + .pic { + width: 30%; + height: auto; } } } diff --git a/src/pages/overviewSetup/index.vue b/src/pages/overviewSetup/index.vue index fa352d0..0e4ae57 100644 --- a/src/pages/overviewSetup/index.vue +++ b/src/pages/overviewSetup/index.vue @@ -52,6 +52,18 @@ export default {
{{ modules[10].form.des }}