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

fix

Browse Source
master
yujialong 1 year ago
parent 53a419fe96
commit 3127624686
7 changed files with 53 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      public/index.html
  2. 15
      src/layouts/footer/index.vue
  3. 5
      src/layouts/header/index.vue
  4. 6
      src/layouts/home/index.vue
  5. 4
      src/pages/column/index.vue
  6. 9
      src/pages/overviewDevHistory/index.vue
  7. 2
      src/pages/overviewIntro/index.vue

1
public/index.html
Unescape View File

@ -7,6 +7,7 @@
<meta name="description" content="粒子研究院" /> <meta name="description" content="粒子研究院" />
<meta name="referrer" content="no-referrer" /> <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,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> <title>粒子研究院</title>
</head> </head>
<body> <body>

15
src/layouts/footer/index.vue
Unescape View File

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

5
src/layouts/header/index.vue
Unescape View File

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

6
src/layouts/home/index.vue
Unescape View File

@ -2,7 +2,8 @@
<div :class="['main', { channel: isHome, 'site-en': handleClass() }]"> <div :class="['main', { channel: isHome, 'site-en': handleClass() }]">
<v-head ref="header"></v-head> <v-head ref="header"></v-head>
<div class="layout"> <div class="layout">
<transition name="move" mode="out-in"> <transition name="move"
mode="out-in">
<router-view class="view"></router-view> <router-view class="view"></router-view>
</transition> </transition>
<el-backtop target=".layout"></el-backtop> <el-backtop target=".layout"></el-backtop>
@ -64,6 +65,9 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.main {
min-width: 1300px;
}
.main:not(.channel) { .main:not(.channel) {
min-height: calc(100% - 90px); min-height: calc(100% - 90px);
.layout { .layout {

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

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

9
src/pages/overviewDevHistory/index.vue
Unescape View File

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

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

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

Write Preview
Loading…
Cancel
Save