jialong.yu
/
FE_IASF_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

修复bug

Browse Source
master
wangchenguang 2 years ago
parent 5049fc9ebf
commit c629a74e3f
18 changed files with 233 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 70
      src/i18n/index.js
  2. 2
      src/mixins/article/index.js
  3. 3
      src/pages/application/index.vue
  4. 4
      src/pages/article/index.vue
  5. 2
      src/pages/careers/index.vue
  6. 8
      src/pages/column/index.vue
  7. 1
      src/pages/exp/index.vue
  8. 11
      src/pages/home/index.vue
  9. 3
      src/pages/news/index.vue
  10. 113
      src/pages/org/index.vue
  11. 12
      src/pages/overviewSetup/index.vue
  12. 14
      src/pages/publication/monograph.vue
  13. 24
      src/pages/publication/patent.vue
  14. 12
      src/pages/publication/thesis.vue
  15. 20
      src/pages/publish/show.vue
  16. 25
      src/pages/sfel/index.vue
  17. 6
      src/pages/talent/index.vue
  18. 1
      src/setting.js

70
src/i18n/index.js
Unescape View File

@ -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'
}
}
};

2
src/mixins/article/index.js
Unescape View File

@ -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) { // 非站外链接

3
src/pages/application/index.vue
Unescape View File

@ -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;

4
src/pages/article/index.vue
Unescape View File

@ -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;

2
src/pages/careers/index.vue
Unescape View File

@ -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 {

8
src/pages/column/index.vue
Unescape View File

@ -82,6 +82,8 @@
</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">
</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"
icon-class="el-icon-arrow-down" @node-click="(item) => columnClick(item, 1)">
@ -236,7 +238,8 @@
<img class="icon" src="@/assets/images/online.png" alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button type="primary" class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
<el-button v-if="item.listStyleId === 15" type="primary" class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
@ -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;

1
src/pages/exp/index.vue
Unescape View File

@ -149,6 +149,7 @@ export default {
font-size: .98rem;
color: #333;
line-height: 1.7rem;
-webkit-line-clamp: inherit;
}
}
.list {

11
src/pages/home/index.vue
Unescape View File

@ -87,7 +87,7 @@
<ul class="stat">
<li class="wow fadeInRight" data-wow-delay="0.2s">
<!-- <p class="num">{{ modules[10].form.title }}</p> -->
<animate-number class="num" ref="num1" from="0" to="5000" duration="3000" />
<animate-number class="num" ref="num1" from="0" :to="modules[10].form.title" duration="3000" />
<p class="text">{{ modules[10].form.des }}</p>
</li>
<li class="wow fadeInRight" data-wow-delay="0.4s">
@ -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;

3
src/pages/news/index.vue
Unescape View File

@ -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;

113
src/pages/org/index.vue
Unescape View File

@ -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;
}
}
}

12
src/pages/overviewSetup/index.vue
Unescape View File

@ -52,6 +52,18 @@ export default {
<style lang="scss" scoped>
@import url(../../plugins/wow/animate.css);
@import "../../styles/page/page.scss";
.single-banner {
.banner-img {
height: 24rem;
}
.texts {
top: auto !important;
bottom: 2rem;
h6 {
font-size: 2.16rem
}
}
}
.tabs {
display: flex;
justify-content: center;

14
src/pages/publication/monograph.vue
Unescape View File

@ -2,12 +2,12 @@
<div class="wrap">
<div class="forms">
<div class="item">
<span class="label">出版时间：</span>
<span class="label">{{$t('column.Publicationtime')}}：</span>
<el-date-picker
style="width: 300px"
v-model="form.publicationTime"
type="year"
placeholder="请选择出版时间"
:placeholder="$t('column.pleaseSelectThePublicationTime')"
format="yyyy"
value-format="yyyy"
clearable
@ -15,15 +15,15 @@
</el-date-picker>
</div>
<div class="search">
<input type="text" placeholder="请输入著作名称/出版社名称/编写人员" v-model="form.monographQueryKeyWord" clearable>
<input type="text" :placeholder="$t('column.PleasenameoftheAuthor')" v-model="form.monographQueryKeyWord" clearable>
</div>
</div>
<el-table :data="list" class="patent-table" ref="table" stripe header-align="center">
<el-table-column prop="title" label="著作名称" align="center" min-width="150"></el-table-column>
<el-table-column prop="publishingHouse" label="出版社" align="center" min-width="150"></el-table-column>
<el-table-column prop="writersAndEditors" label="编写人员" align="center" min-width="150"></el-table-column>
<el-table-column prop="publicationYear" label="出版时间" align="center" min-width="150"></el-table-column>
<el-table-column prop="title" :label="$t('column.titleOfWork')" align="center" min-width="150"></el-table-column>
<el-table-column prop="publishingHouse" :label="$t('column.press')" align="center" min-width="150"></el-table-column>
<el-table-column prop="writersAndEditors" :label="$t('column.authorPersion')" align="center" min-width="150"></el-table-column>
<el-table-column prop="publicationYear" :label="$t('column.Publicationtime')" align="center" min-width="150"></el-table-column>
</el-table>
<div class="pagination">
<el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>

24
src/pages/publication/patent.vue
Unescape View File

@ -2,8 +2,8 @@
<div class="wrap">
<div class="forms">
<div class="item">
<span class="label">专利类别：</span>
<el-select v-model="form.patentClassId" clearable @change="initData">
<span class="label">{{$t('column.patentClassification')}}：</span>
<el-select v-model="form.patentClassId" clearable @change="initData" :placeholder="$t('column.Pleaseselect')">
<el-option
v-for="item in patentClasses"
:key="item.id"
@ -13,32 +13,32 @@
</el-select>
</div>
<div class="item">
<span class="label">申请日期：</span>
<span class="label">{{$t('column.applicationDate')}}：</span>
<el-date-picker
v-model="form.applicationDate"
type="date"
placeholder="选择日期"
:placeholder="$t('column.applicationDate')"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
@change="initData">
</el-date-picker>
</div>
<div class="search">
<input type="text" placeholder="请输入专利名称/发明人姓名/申请号员" v-model="form.patentQueryKeyWord" clearable>
<input type="text" :placeholder="$t('column.pleaseEnterPatentOfficer')" v-model="form.patentQueryKeyWord" clearable>
</div>
</div>
<el-table :data="list" class="patent-table" ref="table" stripe header-align="center">
<el-table-column prop="title" label="专利名称" align="center" min-width="150"></el-table-column>
<el-table-column label="专利类别" align="center" min-width="150">
<el-table-column prop="title" :label="$t('column.patentName')" align="center" min-width="150"></el-table-column>
<el-table-column :label="$t('column.patentName')" align="center" min-width="150">
<template slot-scope="scope">
{{ scope.row.patentClassId ? patentClasses.find(e => e.id == scope.row.patentClassId).name : '' }}
{{ scope.row.patentClassId ? patentClasses.find(e => e.id == scope.row.patentClassId).name === '发明专利' ? $t('column.inventionpatent') : $t('column.practicalAppearance') : '' }}
</template>
</el-table-column>
<el-table-column prop="applicationNumber" label="申请号" align="center" min-width="150"></el-table-column>
<el-table-column prop="applicationDate" label="申请日期" align="center" min-width="150"></el-table-column>
<el-table-column prop="dateOfAuthorization" label="授权日期" align="center" min-width="150"></el-table-column>
<el-table-column prop="inventor" label="发明人" align="center" min-width="150"></el-table-column>
<el-table-column prop="applicationNumber" :label="$t('column.ApplicationNumber')" align="center" min-width="150"></el-table-column>
<el-table-column prop="applicationDate" :label="$t('column.ApplicationDate')" align="center" min-width="150"></el-table-column>
<el-table-column prop="dateOfAuthorization" :label="$t('column.AuthorizationDate')" align="center" min-width="150"></el-table-column>
<el-table-column prop="inventor" :label="$t('column.inventor')" align="center" min-width="150"></el-table-column>
</el-table>
<div class="pagination">
<el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>

12
src/pages/publication/thesis.vue
Unescape View File

@ -2,12 +2,12 @@
<div class="wrap">
<div class="forms">
<div class="item">
<span class="label">发表年度：</span>
<span class="label">{{$t('column.publicationyear')}}：</span>
<el-date-picker
style="width: 300px"
v-model="form.publicationYear"
type="year"
placeholder="请选择出版时间"
:placeholder="$t('column.pleaseSelectThePublicationTime')"
format="yyyy"
value-format="yyyy"
clearable
@ -15,16 +15,16 @@
</el-date-picker>
</div>
<div class="search">
<input type="text" placeholder="请输入论文题目/期刊名称/作者名称" v-model="form.paperQueryKeyWord" clearable>
<input type="text" :placeholder="$t('column.PleaseEnterThePaperName')" v-model="form.paperQueryKeyWord" clearable>
</div>
</div>
<ul class="list">
<li v-for="(item, i) in articles" :key="i" @click="$parent.toArtice(item)">
<h6>{{ item.title }}</h6>
<p class="meta">作者: {{ item.author }}</p>
<p class="meta">期刊名称: {{ item.periodicalName }}</p>
<p class="meta">出版年: {{ item.publicationYear }} 卷: {{ item.reel }} 文献号: {{ item.documentNumber }}</p>
<p class="meta">{{$t('column.author')}}: {{ item.author }}</p>
<p class="meta">{{$t('column.journalName')}}: {{ item.periodicalName }}</p>
<p class="meta">{{$t('column.yearofpublication')}}: {{ item.publicationYear }} &nbsp; &nbsp; {{$t('column.rollUp')}}: {{ item.reel }} &nbsp; &nbsp; {{$t('column.documentNumber')}}: {{ item.documentNumber }}</p>
</li>
</ul>
</div>

20
src/pages/publish/show.vue
Unescape View File

@ -6,40 +6,40 @@
<div class="left">
<h2>{{ form.title }}</h2>
<template v-if="form.author">
<p class="name">作者</p>
<p class="name">{{ $t('column.author') }}</p>
<p class="val">{{ form.author }}</p>
</template>
<template v-if="form.quote">
<p class="name">引用</p>
<p class="name">{{ $t('column.quote') }}</p>
<p class="val">{{ form.quote }}</p>
</template>
<p class="name">摘要</p>
<p class="name">{{ $t('column.abstract') }}</p>
<div class="flex">
<div class="des" v-html="form.mainBody"></div>
<img v-if="form.titleImg" width="222" height="312" :src="form.titleImg" alt="">
<img v-if="form.titleImg" width="222" height="222" :src="form.titleImg" alt="">
</div>
</div>
<div class="right">
<img class="pic" src="@/assets/images/publish3.png" alt="">
<div class="texts">
<template v-if="form.periodicalName">
<p class="name">刊物名称</p>
<p class="name">{{ $t('column.publicationName') }}</p>
<p class="val">{{ form.periodicalName }}</p>
</template>
<p class="name">出版年份</p>
<p class="val">{{ form.publicationYear }}年</p>
<p class="name">{{ $t('column.yearOfPublication') }}</p>
<p class="val">{{ form.publicationYear }}{{ $t('column.year') }}</p>
<div class="flex">
<div v-if="form.reel" class="m-r-40">
<p class="name">卷</p>
<p class="name">{{ $t('column.rollUp') }}</p>
<p class="val">{{ form.reel }}</p>
</div>
<div v-if="form.documentNumber">
<p class="name">文献号</p>
<p class="name">{{ $t('column.documentNumber') }}</p>
<p class="val">{{ form.documentNumber }}</p>
</div>
</div>
<template v-if="form.publicationTypeId">
<p class="name">出版物类型</p>
<p class="name">{{ $t('column.publicationType') }}</p>
<p class="val">{{ form.publicationTypeId && publicationTypes.find(e => e.id == form.publicationTypeId).name }}</p>
</template>
<template v-if="form.doi">

25
src/pages/sfel/index.vue
Unescape View File

@ -383,15 +383,15 @@ export default {
.wrap {
/deep/ .el-carousel__container {
height: 58.95rem;
height: 100vh;
}
/deep/ .el-carousel__container {
height: 58.95rem;
height: 100vh;
}
.topImg {
height: 58.95rem;
height: 100vh;
img {
height: 58.95rem;
height: 100vh;
}
}
}
@ -508,6 +508,15 @@ export default {
transition: .3s;
}
}
.card {
li {
.texts {
.des {
min-height: 3rem;
}
}
}
}
.card {
display: flex;
flex-wrap: wrap;
@ -600,7 +609,7 @@ export default {
}
}
.cards {
padding: 1rem;
padding: 2.85rem 1rem;
background-color: #fff;
transition: .5s;
cursor: pointer;
@ -608,15 +617,15 @@ export default {
transform: translateX(10px);
}
h6 {
margin-bottom: .5rem;
font-size: .96rem;
margin-bottom: 1.2rem;
font-size: 1.08rem;
color: #48525E;
}
.a-line {
@include ellipsis;
}
.sum {
font-size: .72rem;
font-size: .9rem;
color: #6D7C8E;
@include ellipsis;
}

6
src/pages/talent/index.vue
Unescape View File

@ -55,7 +55,7 @@
<p class="type">{{ modules[5].form.subTitle }}</p>
<h6>{{ modules[5].form.title }}</h6>
<div class="des">{{ modules[5].form.des }}</div>
<el-button v-if="isLink(modules[5].form.link.linkName)" type="primary" @click="openLink(modules[5].form)">查看更多</el-button>
<el-button v-if="isLink(modules[5].form.link.linkName)" type="primary" @click="openLink(modules[5].form)">{{ $t('column.seeMore') }}</el-button>
</div>
</div>
<div class="item wow fadeInDown" data-wow-delay="0.3s">
@ -66,7 +66,7 @@
<p class="type">{{ modules[6].form.subTitle }}</p>
<h6>{{ modules[6].form.title }}</h6>
<div class="des">{{ modules[6].form.des }}</div>
<el-button v-if="isLink(modules[6].form.link.linkName)" type="primary" @click="openLink(modules[6].form)">查看更多</el-button>
<el-button v-if="isLink(modules[6].form.link.linkName)" type="primary" @click="openLink(modules[6].form)">{{ $t('column.seeMore') }}</el-button>
</div>
</div>
</div>
@ -184,7 +184,7 @@ export default {
.des {
font-size: .88rem;
line-height: 1.65rem;
-webkit-line-clamp: 6;
-webkit-line-clamp: 5;
}
}
.style {

1
src/setting.js
Unescape View File

@ -6,6 +6,7 @@ let host = `${location.origin}/`
if (isDev) {
// host = 'http://192.168.31.52:10000/'
host = 'http://192.168.31.136:10000/'
// host = 'http://10.10.11.7/'
}
const Setting = {

Write Preview
Loading…
Cancel
Save