yujialong 10 months ago
parent c498b38796
commit 2887d41dec
  1. 11
      src/mixins/page/index.js
  2. 6
      src/pages/article/index.vue
  3. 6
      src/pages/column/index.vue
  4. 3
      src/pages/iasf/index.vue
  5. 13
      src/pages/news/index.vue
  6. 1073
      src/pages/researchNew/index.vue
  7. 3
      src/pages/sfelNew/index.vue
  8. 14
      src/router/modules/researchNew.js

@ -15,9 +15,18 @@ export default {
} }
}, },
mounted() { mounted() {
this.getInfo && this.id && this.getInfo() this.getInfo && this.id && this.getColumnInfo()
}, },
methods: { methods: {
// 获取栏目详情
getColumnInfo () {
this.$post(`${this.api.findColumn}?id=${this.id}`)
.then(({ data }) => {
// 栏目被禁用了,则不显示页面
data.menuVisible || this.getInfo()
})
.catch((res) => { });
},
// 打开链接 // 打开链接
async openLink(item) { async openLink(item) {
const { link } = item const { link } = item

@ -230,8 +230,8 @@ export default {
border-bottom: 1px solid #d8d8d8; border-bottom: 1px solid #d8d8d8;
} }
/deep/.des { /deep/.des {
width: 100%; // width: 100%;
overflow: auto; // overflow: auto;
a { a {
color: rgb(0, 0, 238); color: rgb(0, 0, 238);
word-wrap: break-word; word-wrap: break-word;
@ -241,12 +241,14 @@ export default {
object-fit: cover; object-fit: cover;
} }
ul { ul {
// padding-left: 40px;
list-style: disc; list-style: disc;
li { li {
list-style: inherit; list-style: inherit;
} }
} }
ol { ol {
// padding-left: 40px;
list-style: decimal; list-style: decimal;
li { li {
list-style: inherit; list-style: inherit;

@ -573,11 +573,14 @@ export default {
// //
getInfo () { getInfo () {
this.loading = true this.loading = true
this.loaded = false
this.id && this.id &&
this.$post(`${this.api.findColumn}?id=${this.id}`) this.$post(`${this.api.findColumn}?id=${this.id}`)
.then(({ data }) => { .then(({ data }) => {
this.columnClick(data); this.columnClick(data);
if (data.typeId !== 3) this.loaded = true; // if (data.typeId !== 3 && !data.menuVisible) {
this.loaded = true; //
}
this.info = data this.info = data
this.pageSize = data.pageSize || 10 this.pageSize = data.pageSize || 10
this.showNav = this.showNavIds.includes(data.listStyleId) this.showNav = this.showNavIds.includes(data.listStyleId)
@ -1266,7 +1269,6 @@ export default {
margin-bottom: 5px; margin-bottom: 5px;
font-size: 0.98rem; font-size: 0.98rem;
cursor: pointer; cursor: pointer;
@include ellipsis;
&:hover { &:hover {
color: $main-color; color: $main-color;

@ -363,6 +363,9 @@ export default {
document.onscroll = this.throttle(this.scroll, 200) document.onscroll = this.throttle(this.scroll, 200)
}, },
beforeDestroy () {
document.onscroll = null
},
methods: { methods: {
// //
getInfo () { getInfo () {

@ -517,8 +517,8 @@ export default {
width: 100%; width: 100%;
li { li {
flex: 1; width: 32.5%;
margin-right: 0.88rem; margin-right: 1%;
box-shadow: 0px 0px 20px 0px rgba(176, 176, 176, 0.21); box-shadow: 0px 0px 20px 0px rgba(176, 176, 176, 0.21);
border-radius: 6px; border-radius: 6px;
transition: 0.3s; transition: 0.3s;
@ -659,7 +659,7 @@ export default {
object-fit: cover; object-fit: cover;
} }
.texts { .texts {
width: 24rem; width: calc(100% - 15rem);
margin-right: 3.5rem; margin-right: 3.5rem;
} }
h6 { h6 {
@ -867,13 +867,6 @@ export default {
} }
} }
} }
.card-list {
li {
.texts {
margin-right: 30px;
}
}
}
} }
} }
.conference { .conference {

File diff suppressed because it is too large Load Diff

@ -271,6 +271,9 @@ export default {
new WOW().init() new WOW().init()
if (this.$store.getters.getModelType) document.onscroll = this.throttle(this.scroll, 200) if (this.$store.getters.getModelType) document.onscroll = this.throttle(this.scroll, 200)
}, },
beforeDestroy () {
document.onscroll = null
},
methods: { methods: {
// //
getInfo () { getInfo () {

@ -0,0 +1,14 @@
import BasicLayout from '@/layouts/home'
const name = 'researchNew'
export default {
path: `/${name}`,
component: BasicLayout,
children: [
{
name,
path: `/${name}`,
component: () => import(`@/pages/${name}`),
meta: { title: '' }
}
]
};
Loading…
Cancel
Save