diff --git a/src/assets/images/device/13.png b/src/assets/images/device/13.png
new file mode 100644
index 0000000..f3d5bc5
Binary files /dev/null and b/src/assets/images/device/13.png differ
diff --git a/src/assets/images/device/14.png b/src/assets/images/device/14.png
new file mode 100644
index 0000000..4754bad
Binary files /dev/null and b/src/assets/images/device/14.png differ
diff --git a/src/assets/images/device/15.png b/src/assets/images/device/15.png
new file mode 100644
index 0000000..2c88e28
Binary files /dev/null and b/src/assets/images/device/15.png differ
diff --git a/src/assets/images/device/4.png b/src/assets/images/device/4.png
index 7de7688..83220c8 100644
Binary files a/src/assets/images/device/4.png and b/src/assets/images/device/4.png differ
diff --git a/src/const/column.js b/src/const/column.js
index 92c85b4..e5bc11e 100644
--- a/src/const/column.js
+++ b/src/const/column.js
@@ -22,52 +22,43 @@
name: '子级优先栏目'
}
],
- // 长页样式
- pageStyle: [
+ // 出版物类型
+ publicationTypes: [
{
id: 1,
- path: 'home',
- name: 'HOME'
+ name: '科技图书'
},
{
id: 2,
- path: 'about',
- name: 'ABOUT'
+ name: '科技期刊'
},
{
id: 3,
- path: 'careers',
- name: 'CAREERS'
+ name: '专利文献'
},
{
id: 4,
- path: 'edu',
- name: 'EDUCATION & COLLABORATION'
+ name: '会议文献'
},
{
id: 5,
- path: 'news',
- name: 'NEWS&EVENTS'
+ name: '科技报告'
},
{
id: 6,
- path: 'newsPress',
- name: 'NEWS&EVENTS-PRESS ROOM'
+ name: '政府出版物'
},
{
id: 7,
- path: 'newsProcurement',
- name: 'NEWS&EVENTS-PROCUREMENT'
+ name: '学位论文'
},
{
id: 8,
- path: 'research',
- name: 'RESEARCH'
+ name: '标准文献'
},
{
id: 9,
- path: 'application',
- name: 'APPLICATION'
+ name: '产品资料和其它'
}
],
}
\ No newline at end of file
diff --git a/src/pages/article/index.vue b/src/pages/article/index.vue
index 0b3b88e..7cc9d23 100644
--- a/src/pages/article/index.vue
+++ b/src/pages/article/index.vue
@@ -101,11 +101,14 @@ export default {
name: data.title
}
]
+ // 文章被禁用了就直接返回
if (data.isDisable) {
this.$router.back()
} else {
- if (data.articleTemplate === 25) { // 会议活动
- this.$router.replace(`/article/activity?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}`)
+ const temId = data.articleTemplate
+ let path = `?articleId=${this.id}&id=${id}&columnName=${columnName || ''}&path=${path || ''}`
+ if (temId === 25 || temId === 26) { // 会议活动/期刊详情
+ this.$router.replace((temId === 25 ? '/article/activity' : '/publish/show') + path)
} else {
this.form = data
this.columnId = data.columnId
diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue
index d6565ce..d904352 100644
--- a/src/pages/column/index.vue
+++ b/src/pages/column/index.vue
@@ -338,6 +338,11 @@ export default {
const { typeId } = to
// 如果是左边的栏目,并且是第一级,并且长页/链接,则不作反应
if (left && to.level === 1 && (typeId === 2 || typeId === 3)) return false
+ // 出版物则跳转到出版物列表
+ if (to.templateId === 8) {
+ this.$router.replace(`/publish?id=${this.id}&siteId=${this.$route.query.siteId || this.site}`)
+ return
+ }
// 跳转链接
if (typeId === 2) {
let href = to.linkAddress
@@ -434,6 +439,9 @@ export default {
\ No newline at end of file
diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue
index 430bc1a..07803fa 100644
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
@@ -19,7 +19,7 @@
-
+
{{ curArticle.title }}
@@ -53,7 +53,7 @@
{{ modules[2].form.des }}
-
+
{{ articles[0].title }}
@@ -301,7 +301,7 @@ export default {
left: 804px;
}
}
-.banner {
+.news-banner {
display: flex;
cursor: pointer;
.pic {
@@ -414,6 +414,12 @@ export default {
margin-right: 20px;
background-color: #fff;
cursor: pointer;
+ .pic {
+ transition: .3s;
+ &:hover {
+ transform: scale(1.05);
+ }
+ }
.texts {
padding: 40px 30px;
}
@@ -444,6 +450,10 @@ export default {
.pic {
width: 401px;
height: 197px;
+ transition: .3s;
+ &:hover {
+ transform: scale(1.05);
+ }
}
.des {
position: absolute;
diff --git a/src/pages/publish/index.vue b/src/pages/publish/index.vue
index 40204cd..19c6f63 100644
--- a/src/pages/publish/index.vue
+++ b/src/pages/publish/index.vue
@@ -1,6 +1,6 @@
-
+
{{ info.columnName }}
@@ -10,22 +10,15 @@
- - {{ item }}
+ - {{ item }}
- -
-
+
-
+
-
研究院与深大签约共建产学研专用线基本站建设
-
智能电网被设想为适应分布式光伏 ( PV ) 发电的高渗透率,这可能会在电压违规方面造成不利的电网影响。因此,PV Hosting 容量被用作规划工具,以确定导致第一次电压违规及以上需要基础设施升级的最大光伏安装容量。传统的托管容量分析方法基于场景且计算复杂,因为它们依赖迭代潮流算法,需要调查…
-
-
- -
-
-
-
研究院与深大签约共建产学研专用线基本站建设
-
智能电网被设想为适应分布式光伏 ( PV ) 发电的高渗透率,这可能会在电压违规方面造成不利的电网影响。因此,PV Hosting 容量被用作规划工具,以确定导致第一次电压违规及以上需要基础设施升级的最大光伏安装容量。传统的托管容量分析方法基于场景且计算复杂,因为它们依赖迭代潮流算法,需要调查…
+
{{ item.title }}
+
@@ -34,7 +27,7 @@
@@ -68,11 +80,10 @@ export default {
.banner {
position: relative;
height: 280px;
-
color: #fff;
.texts {
position: absolute;
- top: 123px;
+ top: 80px;
left: 243px;
}
.text {
diff --git a/src/pages/publish/show.vue b/src/pages/publish/show.vue
index 34c5f4d..11d9368 100644
--- a/src/pages/publish/show.vue
+++ b/src/pages/publish/show.vue
@@ -8,19 +8,19 @@
作者
{{ form.author }}
引用
-
{{ form.author }}
+
{{ form.quote }}
摘要
-
+
出版年份
-
2022年
+
{{ form.publicationYear }}年
出版物类型
-
2022年
+
{{ form.publicationTypeId && publicationTypes.find(e => e.id == form.publicationTypeId).name }}
DOI
-
2022年
+
{{ form.doi }}
其他字段
2022年
@@ -35,11 +35,13 @@ import Setting from '@/setting'
import Util from '@/libs/util'
import Breadcrumb from '@/components/breadcrumb'
import mixins from '@/mixins/article'
+import ColumnConst from '@/const/column'
export default {
mixins: [mixins],
data() {
return {
id: this.$route.query.articleId,
+ publicationTypes: ColumnConst.publicationTypes,
routes: [],
columnId: '',
form: {},
diff --git a/src/pages/sfel/index.vue b/src/pages/sfel/index.vue
index 9a092ee..a48843b 100644
--- a/src/pages/sfel/index.vue
+++ b/src/pages/sfel/index.vue
@@ -257,6 +257,15 @@
+
+
@@ -269,6 +278,7 @@ export default {
mixins: [mixins],
data() {
return {
+ columns: [],
curColumn: 0,
articles: [],
articles1: [],
@@ -279,6 +289,7 @@ export default {
},
mounted() {
new WOW().init()
+ this.getColumn()
},
methods: {
// 获取文章详情
@@ -388,11 +399,18 @@ export default {
this.curColumn = i
}
},
- // 跳转more
- toMore() {
- const { column } = this.modules[1].list[this.curColumn]
- column.length && this.$router.push(`/column?id=${column[column.length - 1]}`)
- }
+ // 资讯
+ getColumn() {
+ this.$post(this.api.listWithTreeMenuVisible, {
+ siteId: this.$route.query.siteId || this.$store.state.content.site,
+ columnName: '',
+ templateId: '',
+ typeId : '',
+ isSort: 1
+ }).then(({ data }) => {
+ this.columns = data
+ }).catch(err => {})
+ },
}
};
@@ -918,6 +936,32 @@ export default {
}
}
}
+.tools {
+ position: absolute;
+ top: 600px;
+ left: 0;
+ width: 226px;
+ text-align: center;
+ .logo {
+ padding: 44px 0;
+ background: #0C60BE;
+ box-shadow: 0px 0px 20px 0px rgba(184,191,200,0.3);
+ }
+ .nav {
+ li {
+ padding: 0 10px;
+ font-size: 24px;
+ line-height: 83px;
+ color: #fff;
+ background-color: #1D1D1D;
+ cursor: pointer;
+ @include ellipsis;
+ &.active {
+ background-color: #1583FF;
+ }
+ }
+ }
+}
@media (max-width: 1520px) {
.lg {
width: 98%;
diff --git a/src/styles/page/page.scss b/src/styles/page/page.scss
index 7102671..de3c740 100644
--- a/src/styles/page/page.scss
+++ b/src/styles/page/page.scss
@@ -35,6 +35,12 @@
width: 1400px;
margin: 0 auto;
}
+.banner {
+ height: 280px;
+ padding: 123px 0 0 243px;
+ font-size: 48px;
+ color: #fff;
+}
.banner-item {
position: relative;
width: 100%;