yujialong 1 year ago
parent 53a419fe96
commit 3127624686
  1. 1
      public/index.html
  2. 31
      src/layouts/footer/index.vue
  3. 5
      src/layouts/header/index.vue
  4. 24
      src/layouts/home/index.vue
  5. 4
      src/pages/column/index.vue
  6. 19
      src/pages/overviewDevHistory/index.vue
  7. 2
      src/pages/overviewIntro/index.vue

@ -7,6 +7,7 @@
<meta name="description" content="粒子研究院" />
<meta name="referrer" content="no-referrer" />
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta name="viewport" content="width=device-width, user-scalable=yes, shrink-to-fit=no" />
<title>粒子研究院</title>
</head>
<body>

@ -53,16 +53,20 @@
<p class="meta">Institute of Advanced Science Facilities, ShenzhenIASF</p>
<p class="meta">Tel400-0010-998</p>
</div>
<div v-for="(item, i) in columns"
:key="i"
class="column">
<h6 @click="columnTo(item)">{{ item.columnName }}</h6>
<ul v-if="item.children.length"
class="children">
<li v-for="(column, j) in item.children"
:key="j"
@click="columnTo(column)">{{ column.columnName }}</li>
</ul>
<div class="column-wrap">
<template v-for="(item, i) in columns">
<div v-if="isIasf || (!isIasf && i < 5)"
:key="i"
class="column">
<h6 @click="columnTo(item)">{{ item.columnName }}</h6>
<ul v-if="item.children.length && !isIasf"
class="children">
<li v-for="(column, j) in item.children"
:key="j"
@click="columnTo(column)">{{ column.columnName }}</li>
</ul>
</div>
</template>
</div>
</div>
<a class="copyright">粤ICP备2020131940号 粤公安网34565432456765432号</a>
@ -161,7 +165,8 @@ export default {
typeId: '',
isSort: 1
}).then(({ data }) => {
this.columns = data.slice(0, 5)
// this.columns = data.slice(0, 5)
this.columns = data
}).catch(err => { })
},
// iasf
@ -261,6 +266,10 @@ export default {
margin-bottom: 10px;
font-size: 14px;
}
.column-wrap {
display: inline-flex;
flex-wrap: wrap;
}
.column {
margin: 0 20px;
h6 {

@ -7,11 +7,9 @@
alt="">
</template>
<template v-else>
<img :src="require('@/assets/images/' + (isSfel ? 'logo2' : isHome ? 'logo' : 'logo2') + '.png')"
alt="">
</template>
</a>
<!-- pc端 -->
<template v-if="$store.getters.getModelType">
@ -165,7 +163,8 @@ export default {
'setKeyword'
]),
toIndex () {
this.$refs.nav.jump()
location.href = this.$router.resolve(`/column?siteId=${Util.isEn(this.site) ? 1 : 2}`).href
location.reload()
},
stop () {

@ -2,7 +2,8 @@
<div :class="['main', { channel: isHome, 'site-en': handleClass() }]">
<v-head ref="header"></v-head>
<div class="layout">
<transition name="move" mode="out-in">
<transition name="move"
mode="out-in">
<router-view class="view"></router-view>
</transition>
<el-backtop target=".layout"></el-backtop>
@ -18,7 +19,7 @@ import vHead from '../header'
import vFooter from '../footer'
import { mapMutations } from 'vuex'
export default {
data() {
data () {
return {
enSite: [1, 4, 6] // id
};
@ -28,11 +29,11 @@ export default {
vFooter
},
computed: {
isHome() {
isHome () {
return Util.isIndex()
},
},
mounted() {
mounted () {
this.$route.query.siteId && this.setSite(this.$route.query.siteId)
document.body.onclick = e => {
e.stopPropagation()
@ -43,11 +44,11 @@ export default {
...mapMutations('content', [
'setSite'
]),
handleClass() {
handleClass () {
return this.enSite.includes(+this.$route.query.siteId || this.$store.state.content.site)
},
// ,退
autoLogout() {
autoLogout () {
let lastTime = new Date().getTime();
document.onmousedown = () => {
lastTime = new Date().getTime();
@ -64,10 +65,13 @@ export default {
};
</script>
<style lang="scss" scoped>
.main {
min-width: 1300px;
}
.main:not(.channel) {
min-height: calc(100% - 90px);
.layout {
padding-top: 90px;
}
min-height: calc(100% - 90px);
.layout {
padding-top: 90px;
}
}
</style>

@ -135,8 +135,8 @@
</el-tree>
<template v-if="articles.length">
<!-- 只有一篇文章则直接显示文章详情 -->
<div v-if="articles.length === 1"
<!-- 列表样式选的是列表详情则直接显示最新一篇文章详情 -->
<div v-if="info.listStyleId === 73"
class="detail">
<template v-if="article.articleTemplate != 72">

@ -45,11 +45,13 @@
<p class="date">{{ e.title }}</p>
<p class="text">{{ e.des }}</p>
</div>
<el-image v-if="e.pic"
class="pic"
:src="e.pic"
:preview-src-list="[e.pic]">
</el-image>
<div class="pic-wrap">
<el-image v-if="e.pic"
class="pic"
:src="e.pic"
:preview-src-list="[e.pic]">
</el-image>
</div>
</li>
</template>
</ul>
@ -199,9 +201,14 @@ export default {
transform: rotate(45deg);
}
}
.pic {
.pic-wrap {
width: 17.5rem;
height: 9.75rem;
text-align: center;
}
.pic {
// width: 17.5rem;
height: 100%;
}
}
}

@ -21,7 +21,7 @@
<div class="tab-content">
<div class="intro">
<img class="pic"
src="http://10.10.11.7/images/overviewIntro/1.png"
:src="modules[1].form.pic"
alt="">
<div class="right">
<div class="relative">

Loading…
Cancel
Save