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 e62db9a09f
commit dc26567cad
8 changed files with 352 additions and 251 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. 2
      src/components/menuTree/index.vue
  2. 2
      src/layouts/navbar/index.vue
  3. 4
      src/pages/article/index.vue
  4. 559
      src/pages/column/index.vue
  5. 9
      src/pages/estate/event/index.vue
  6. 8
      src/pages/iasf/index.vue
  7. 10
      src/pages/overviewDevHistory/index.vue
  8. 9
      src/pages/overviewSetup/index.vue

2
src/components/menuTree/index.vue
Unescape View File

@ -1,7 +1,7 @@
<template>
<div class="menu-child">
<template v-for="item in this.menuList">
<el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
<el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
:class="{active: $route.query.id == item.id}"
:key="item.id"
:index="String(item.id)"

2
src/layouts/navbar/index.vue
Unescape View File

@ -11,7 +11,7 @@
@select="jump"
:default-active="String(active)">
<menuTree :menuList="menus" />
<el-submenu :popper-class="site == 2 && $store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
<el-submenu :popper-class="$store.getters.getModelType ? 'iasf-menu-popup' : isHome ? 'home-menu-popup' : ''"
v-show="showMoreBtns"
index="522222">
<template slot="title">

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

@ -110,7 +110,7 @@ export default {
}
},
{
name: data.title
name: data.columnName
}
]
// 文章被禁用了就直接返回
@ -209,7 +209,7 @@ export default {
}
.brief {
padding-bottom: 1.5rem;
margin-bottom: 1rem;
margin: 1rem 0;
font-size: 1.2rem;
line-height: 1.33;
color: #606060;

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

@ -135,242 +135,271 @@
</el-tree>
<template v-if="articles.length">
<template v-if="info.listStyleId === 12">
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55}"
class="readDetail"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
<div class="texts">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}</span>
<div class="des"
v-html="item.mainBody"></div>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button type="primary"
class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
<!-- 只有一篇文章，则直接显示文章详情 -->
<div v-if="articles.length === 1"
class="detail">
<template v-if="article.articleTemplate != 72">
<h2>{{ article.title }}</h2>
<!-- <div class="meta">{{ article.source && article.source + ' | ' }} {{ article.author && article.author + ' | ' }} {{ article.releaseTime }}</div>
<div class="meta">{{ article.edit && $t('column.edit') + '：' + article.edit }} {{ article.audit && ' | ' + $t('column.auditor') + '：' + article.audit }} {{ article.label && ' | ' + $t('column.label') + '：' + article.label }}</div> -->
</template>
<p v-if="article.summary"
class="brief">{{ article.summary }}</p>
<div class="des"
v-html="article.mainBody"></div>
<div v-if="article.fileList && article.fileList.length"
class="annex">
<h6>{{$t('column.attachmentDownload')}}</h6>
<ul class="files">
<li v-for="(file, i) in article.fileList"
:key="i">
<span class="name">{{ file.fileName }}</span>
<span class="download"
@click="download(file)">{{$t('column.download')}}</span>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
</div>
</div>
</template>
<template v-else-if="info.listStyleId === 11 || info.listStyleId === 15 || info.listStyleId === 10">
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55}"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<div class="texts leftBox">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15|| item.listStyleId === 11) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}
<template v-if="item.labelName != ''">
| {{ item.labelName }}
</template>
</span>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
</div>
<template v-else>
<template v-if="info.listStyleId === 12">
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55}"
class="readDetail"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
<div class="texts">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}</span>
<div class="des"
v-html="item.mainBody"></div>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
</div>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
</template>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button type="primary"
class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
</div>
</div>
</div>
</template>
<template v-else>
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55, 'org': info.listStyleId === 68}"
class="overDetail"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
<div class="texts">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12 || item.listStyleId == 68">
<span class="meta">{{ item.releaseTime }}</span>
<div class="des"
v-html="item.mainBody"></div>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
</template>
<template v-else-if="info.listStyleId === 11 || info.listStyleId === 15 || info.listStyleId === 10">
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55}"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<div class="texts leftBox">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15|| item.listStyleId === 11) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12">
<span class="meta">{{ item.releaseTime }}
<template v-if="item.labelName != ''">
| {{ item.labelName }}
</template>
</span>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button v-if="item.listStyleId === 15 || item.listStyleId == 68"
type="primary"
class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
</div>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
</template>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
</div>
</div>
</div>
</template>
<template v-else>
<div class="article-wrap">
<ul class="articles">
<li v-for="(item, i) in articles"
:key="i"
:class="{'news-notice': info.listStyleId === 55, 'org': info.listStyleId === 68}"
class="overDetail"
@click="toArtice(item)">
<template v-if="info.listStyleId === 55">
<div class="releaseTime">
<p class="d">{{ item.date }}</p>
<p class="m">{{ item.month }}</p>
</div>
<div class="news-title">{{ item.title }}</div>
</template>
<template v-else>
<img class="pic"
:src="item.titleImg"
alt=""
onerror="javascript:this.src='./images/1.png';" />
<div class="texts">
<p v-if="(item.listStyleId === 10 || item.listStyleId === 15) && item.classificationName"
class="type">
{{ item.classificationName }}
</p>
<h6 class="titleDes">{{ item.title }}</h6>
<template v-if="item.listStyleId === 11 || item.listStyleId == 12 || item.listStyleId == 68">
<span class="meta">{{ item.releaseTime }}</span>
<div class="des"
v-html="item.mainBody"></div>
</template>
<span v-if="item.listStyleId === 10 "
class="meta">{{ item.releaseTime }} {{ item.labelName && ' | ' +
item.labelName }}</span>
<template v-if="item.listStyleId === 15 || item.listStyleId === 16">
<div v-if="item.keynoteSpeaker"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/mine.png"
alt="" /> {{ item.keynoteSpeaker }}
</div>
<div v-if="item.activityStartTime"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/time.png"
alt="" />
{{ item.activityStartTime + ' ~ ' + item.activityEndTime }}
</div>
<div v-if="item.offlineLocation"
class="meta m-b-10">
<img class="icon"
src="@/assets/images/location.png"
alt="" /> {{ item.offlineLocation }}
</div>
<div v-if="item.onlineLocation"
class="meta">
<img class="icon"
src="@/assets/images/online.png"
alt="" /> {{ item.onlineLocation }}
</div>
</template>
<el-button v-if="item.listStyleId === 15 || item.listStyleId == 68"
type="primary"
class="readDetailBtn">{{ $t('column.readDetail') }}</el-button>
</div>
</template>
</li>
</ul>
<div v-if="articles.length"
class="pagination">
<el-pagination background
@current-change="currentChange"
:current-page="page"
:page-size="pageSize"
layout="total, prev, pager, next"
:total="total"></el-pagination>
</div>
</div>
</template>
</template>
</template>
<div v-else
@ -451,7 +480,8 @@ export default {
news: [],
hots: [],
deepestId: '',
getAllId: null
getAllId: null,
article: {}
};
},
components: {
@ -744,8 +774,14 @@ export default {
})
this.articles = articles
this.total = +data.total;
// 如果栏目那勾选了“只有一篇文章时，以详情方式展示”，并且只有一篇文章，则跳转到详情页
// 如果栏目那勾选了“只有一篇文章时，以详情方式展示”，并且只有一篇文章，则直接展示详情
// this.total == 1 && this.info.showWithDetails && this.$router.push(`/article?articleId=${this.articles[0].id}&id=${this.articles[0].columnId}`)
if (this.total == 1) {
this.$post(`${this.api.findArticle}?id=${articles[0].id}`).then(async ({ data }) => {
this.article = data
console.log("🚀 ~ file: index.vue:778 ~ .then ~ this.article:", this.article)
}).catch(err => { })
}
})
.catch((res) => { });
},
@ -778,7 +814,11 @@ export default {
id = [this.$refs.leftColumn.getCurrentKey()];
}
this.getArticle(id);
}
},
// 下载附件
download (e) {
Util.downloadFile(e.fileName, e.filePath)
},
}
};
</script>
@ -922,6 +962,9 @@ export default {
}
/deep/.columns {
& + .detail {
padding-left: 10px;
}
width: 22%;
margin-right: 0.6rem;
overflow: auto;
@ -1207,6 +1250,58 @@ export default {
background-color: $partyTheme !important;
}
}
.detail {
flex: 1;
h2 {
margin-bottom: 1rem;
font-size: 1.9rem;
color: #1c1c1c;
}
.meta {
margin: 1rem 0;
font-size: 0.88rem;
color: #9b9b9b;
}
.brief {
padding-bottom: 1.5rem;
margin-bottom: 1rem;
font-size: 1.2rem;
line-height: 1.33;
color: #606060;
border-bottom: 1px solid #d8d8d8;
}
/deep/.des {
img {
max-width: 100%;
}
}
.annex {
margin-top: 30px;
h6 {
padding-left: 8px;
margin-bottom: 20px;
font-size: 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
line-height: 1;
color: #333;
border-left: 4px solid #1583ff;
}
li {
display: flex;
align-items: center;
margin-bottom: 10px;
}
.name {
margin-right: 8px;
font-size: 14px;
}
.download {
color: #1583ff;
cursor: pointer;
}
}
}
.none {
display: inline-flex;
flex-direction: column;

9
src/pages/estate/event/index.vue
Unescape View File

@ -45,10 +45,11 @@
<p class="date">{{ e.title }}</p>
<p class="text">{{ e.des }}</p>
</div>
<img v-if="e.pic"
:src="e.pic"
alt=""
class="pic">
<el-image v-if="e.pic"
class="pic"
:src="e.pic"
:preview-src-list="[e.pic]">
</el-image>
</li>
</template>
</ul>

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

@ -63,7 +63,8 @@
<div class="block news-wrap">
<div class="inner">
<h2 class="b-title wow fadeInUp">{{ modules[4].form.title }}</h2>
<p class="intro wow fadeInUp"
<p v-if="modules[4].form.des"
class="intro wow fadeInUp"
data-wow-delay="0.5s">{{ modules[4].form.des }}</p>
<div class="all-link"
@click="toAll(modules[5].form)">
@ -576,8 +577,11 @@ export default {
}
.right {
position: relative;
display: flex;
flex-direction: column;
justify-content: center;
width: 50%;
padding: 42px 71px 90px 58px;
padding: 42px 71px 42px 58px;
background: #026be1;
color: #fff;
transition: 0.3s;

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

@ -45,11 +45,11 @@
<p class="date">{{ e.title }}</p>
<p class="text">{{ e.des }}</p>
</div>
<img v-if="e.pic"
:src="e.pic"
alt=""
class="pic">
<el-image v-if="e.pic"
class="pic"
:src="e.pic"
:preview-src-list="[e.pic]">
</el-image>
</li>
</template>
</ul>

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

@ -29,9 +29,10 @@
alt="">
</div>
<div class="lg-bg">
<img width="100%"
:src="modules[2].form.pic"
alt="">
<el-image style="width: 100%;"
:src="modules[2].form.pic"
:preview-src-list="[modules[2].form.pic]">
</el-image>
</div>
</div>
@ -100,7 +101,7 @@ export default {
}
}
.lg-bg {
width: 85%;
width: 50%;
margin: 0 auto;
}
@media (max-width: 1200px) {

Write Preview
Loading…
Cancel
Save