root/feiyang-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Branch_csl' (#1) from Branch_csl into master

Browse Source 
Reviewed-on: http://120.46.37.243:3000/cms/feiyang-web/pulls/1
This commit is contained in:
root 2024-08-01 06:28:09 +00:00
commit 8e4760cf5d
4 changed files with 1347 additions and 1202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "feiyang",
"name": "feiyang-web",
"version": "0.1.0",
"lockfileVersion": 2,
"requires": true,

100
src/views/HomeView.vue
View File

@ -34,7 +34,8 @@
<h3 style="font-size: 24px;
color: #3c3c48;
color: rgba(60, 60, 72, .8);
line-height: 30px;">{{indexNew[0]?.subTitle||'' }}</h3>
line-height: 30px;">{{indexNew[0]?.subTitle||'' }}
</h3>
<div style=" color: rgba(115, 115, 124, .6); font-size: 13px;
color: #95959d;
@ -44,7 +45,6 @@
overflow: hidden;
-webkit-box-orient: vertical;
text-align: justify;" v-html=" indexNew[0]?.subContent||''">
</div>
</div>
<div style="overflow: hidden;">
@ -70,25 +70,30 @@
</div>
<div class="index_1" style="width: 80%;margin: 0 auto;padding: 85px 0;">
<div class="content-top">
<div class="content-left">
<div class="content-left" style=" padding-right: 36px; position: relative;">
<h3>{{newscatagary[1]?.name}}</h3>
<h6>{{newscatagary[1]?.enName}}</h6>
<h3 style="font-size: 14.5px; color: #293d48;">{{ indexinfo[textindex]?.subTitle }}</h3>
<h5 style=" color: #8e8e95;margin-top: 18px;font-size: 100%;font-weight: normal;line-height: 22px;">{{ indexinfo[textindex]?.subContent }}</h5>
<h3 style="margin-top:15px;font-size: 14.5px; color: #293d48;">
{{ indexinfo[textindex]?.subTitle }}</h3>
<h5
style=" color: #8e8e95;margin-top: 18px;font-size: 100%;font-weight: normal;line-height: 22px;">
{{ indexinfo[textindex]?.subContent }}
</h5>
<div style="width: 50%;"></div>
<div class="swiper-button-prev" @click="back"></div><!--左箭头。如果放置在swiper外面，需要自定义样式。-->
<div class="swiper-button-next" @click="next"></div><!--右箭头。如果放置在swiper外面，需要自定义样式。-->
</div>
<div class="content-right">
<div class="swiper-container swiper6">
<div class="swiper-wrapper">
<div class="swiper-slide yanshi" v-for="item in indexinfo" :key="item.id"><img :src="item.pic"
style="width: 851px;height:320px;cursor: pointer;" @click="routerTo(item.id)"></div>
<div class="swiper-slide yanshi" v-for="item in indexinfo" :key="item.id"><img
:src="item.pic" style="width: 100%;height:320px;cursor: pointer;"
@click="routerTo(item.id)"></div>
</div>
<div class="swiper-pagination"></div>
<div class="swiper-button-prev" @click="back"></div><!--左箭头。如果放置在swiper外面，需要自定义样式。-->
<div class="swiper-button-next" @click="next"></div><!--右箭头。如果放置在swiper外面，需要自定义样式。-->
</div>
@ -122,8 +127,12 @@
<div class="swiper2" style="max-width: 80vw;overflow: hidden;height: 100%;">
<div class="swiper-wrapper swiper9">
<div class="swiper-slide" style="cursor: pointer;height: 316px;" v-for="item in smallPicturearr" :key="item.id" v-if="item.state=='true'" @click="projecto(item.id)" >
<img :src="item.picture" style=" width: 100%;height:100%;margin: auto;border-radius: 5%;"></div>
<div class="swiper-slide" style="cursor: pointer;height: 316px;"
v-for="item in smallPicturearr" :key="item.id" v-if="item.state=='true'"
@click="projecto(item.id)">
<img :src="item.picture"
style=" width: 100%;height:100%;margin: auto;border-radius: 5%;">
</div>
</div>
<div class="swiper-pagination2" style="text-align: center;"></div>
@ -151,7 +160,8 @@
<!-- <h3></h3> -->
<h5 style="line-height: 20px;">
{{componydata[0]?.content}}<span style="color:RGB(48, 113, 183);float: right;font-weight: bold;cursor: pointer;"
{{componydata[0]?.content}}<span
style="color:RGB(48, 113, 183);float: right;font-weight: bold;cursor: pointer;"
@click="switchto">MORE...</span>
</h5>
<!-- <h5></h5> -->
@ -165,10 +175,11 @@
<div style="max-width: 80vw;overflow: hidden;height: 100%;margin: auto;">
<div class="swiper3">
<div class="swiper-wrapper swiper9">
<div class="swiper-slide" v-for="item in achievementarr" :key="item.id" v-if="item.state=='true'"
@click="honorto(item.id)"
<div class="swiper-slide" v-for="item in achievementarr" :key="item.id"
v-if="item.state=='true'" @click="honorto(item.id)"
style="background-color: rgb(240,246,250);border-radius: 10px;padding: 20px;box-sizing: border-box;cursor: pointer;">
<img :src="item.picture" style=" height:239px ;margin: auto;display: block;"></div>
<img :src="item.picture" style=" height:239px ;margin: auto;display: block;">
</div>
</div>
<div class="swiper-pagination1" style="text-align: center;"></div>
@ -187,7 +198,18 @@
import Swiper from 'swiper'
import 'swiper/css/swiper.min.css'
import { achievementPic,NewCategary, hyDtai, swiperimg, backgroundText, smallPicture,honor,componyhonor,indexNews,indexInformation } from '@/api'
import {
achievementPic,
NewCategary,
hyDtai,
swiperimg,
backgroundText,
smallPicture,
honor,
componyhonor,
indexNews,
indexInformation
} from '@/api'
export default {
data() {
return {
@ -230,8 +252,7 @@ export default {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev',
},
}
)
})
})
})
@ -256,8 +277,7 @@ export default {
prevEl: '.swiper-button-prev',
},
}
)
})
})
})
//背景图文轮播图
@ -281,7 +301,9 @@ export default {
})
})
//荣誉展示
honor({'year':'all'}).then((res) => {
honor({
'year': 'all'
}).then((res) => {
this.achievementarr = res.data
this.$nextTick(() => {
new Swiper('.swiper3', {
@ -312,7 +334,9 @@ export default {
NewCategary().then((res) => {
this.newscatagary = res.data
indexInformation({articleType:res.data[1]?.name}).then((res)=>{
indexInformation({
articleType: res.data[1]?.name
}).then((res) => {
this.indexinfo = res.data
this.$nextTick(() => {
new Swiper('.swiper6', {
@ -333,7 +357,9 @@ export default {
})
})
})
indexNews({articleType:res.data[0]?.name}).then((res)=>{
indexNews({
articleType: res.data[0]?.name
}).then((res) => {
console.log(1111)
this.indexNew = res.data
})
@ -396,7 +422,9 @@ export default {
switchto() {
this.$router.push({
path: '/aboutus',
query:{'category':'honor'}
query: {
'category': 'honor'
}
})
},
changeto(id) {
@ -447,7 +475,6 @@ this.$router.push({
// }
}
}
</script>
<style scoped>
.banner {
@ -659,13 +686,30 @@ h6 {
color: rgba(255, 255, 255, .5);
font-weight: bold;
}
.flow{
}
.flow {}
.a::after {
background-color: unset;
}
.yanshi::after {
width: 0px !important;
}
.swiper-button-prev,
.swiper-container-rtl .swiper-button-next {
left: 10px;
right: auto;
top: auto;
bottom: 0 !important;
}
.swiper-button-next,
.swiper-container-rtl .swiper-button-prev {
right: 36px;
left: auto;
top: auto;
bottom: 0 !important;
}
</style>

102
src/views/detail.vue
View File

@ -8,7 +8,7 @@
<a style="padding: 0;" href="news">新闻内容</a> <a href="javascript:;">企业新闻</a>
</div>
<div class="list" style="bottom:-15px">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tabs v-model="activeName">
<el-tab-pane label="新闻详情" name="first"></el-tab-pane>
</el-tabs>
@ -26,54 +26,101 @@
<div class="divider "></div>
<div class="cont" v-html="content"></div>
</div>
<div style="width: 80%;margin: auto;text-align: right; color: #333;font-weight: bold;font-size: 14px;cursor: pointer;" @click="changeto">返回列表</div>
<div class="xk" @click="changeto">返回列表</div>
<div class="black">
<div class="black-sub" @click="changetoUS(upId)"> <span v-if="upId">< 上一篇</span> </div>
<div class="black-top" @click="changetoUS(downId)"> <span v-if="downId">下一篇 ></span> </div>
</div>
<div class="con">
</div>
</div>
</div>
</template>
<script>
import { newsdetail,msgdetail } from '@/api';
import {
newsdetail,
msgdetail
} from '@/api';
// import 'react-quill/dist/quill.snow.css';
export default {
data() {
return {
activeName:'企业新闻',
name: '',
content: '',
time:''
time: '',
upId:'',//上一篇
downId:''//下一篇
}
},
watch:{
'$route'(to, from){
this.kk();
}
},
methods: {
changeto(){
this.$router.push({path:'news'})
changetoUS(id){
// if(this.activeName=='新闻资讯'){
this.$router.push({
path:'/detail?type='+this.activeName+'&&id='+id
})
}
,
changeto() {
this.$router.push({
path: 'news'
})
},
mounted(){
// if(this.$route.query.type=='1'){
msgdetail({id:this.$route.query.id,articleType:this.$route.query.type}).then((res)=>{
kk(){
msgdetail({
id: this.$route.query.id,
articleType: this.$route.query.type
}).then((res) => {
this.content = res.data.content
this.name = res.data.name
this.time = res.data.releaseTime
this.downId = res.data.downId//下一篇
this.upId = res.data.upId//上一篇
})
// }else{
// newsdetail({id:this.$route.query.id}).then((res)=>{
// this.content=res.data.content
// this.name=res.data.name
// this.time=res.data.releaseTime
// })
// }
}
},
mounted() {
this.kk();
}
}
</script>
<style scoped>
.xk {
width: 80%;
margin: auto;
text-align: right;
color: #333;
font-weight: bold;
font-size: 14px;
cursor: pointer;
}
.black {
width: 80%;
margin: 0 auto;
display: flex;
justify-content: space-between;
align-items: center;
margin-top: 20px;
}
.black>div {
cursor: pointer;
}
.black-sub {}
.divider {
width: 100%;
height: 3px;
@ -81,21 +128,25 @@ changeto(){
position: static;
margin-bottom: 28px;
}
.name {
font-size: 30px;
color: #0007a9;
color: rgba(0, 7, 169, .8);
line-height: 36px;
}
.news_d {
padding: 60px 0 90px;
overflow: hidden;
}
.Wrapper {
position: relative;
background-color: #fff;
z-index: 100;
}
/* .news_d .name {
font-size: 30px;
color: #0007a9;
@ -112,6 +163,7 @@ border: none;
::v-deep .el-tabs__nav-wrap::after {
background-color: transparent;
}
.news_d .con p {
font-size: 14.5px;
color: #8e8e95;
@ -142,12 +194,15 @@ background-color: transparent;
top: 0;
z-index: -1;
}
.top-box {
margin: 16px 0 30px;
}
::v-deep .ql-editor {
white-space: normal;
}
.date {
font-size: 26px;
@ -158,10 +213,12 @@ background-color: transparent;
padding: 0 30px;
width: 100%;
}
.page_ban .content {
position: relative;
height: 100%;
}
.content {
width: 80%;
margin: 0 auto;
@ -173,6 +230,7 @@ background-color: transparent;
left: 0;
bottom: 0;
}
div,
li {
box-sizing: border-box;
@ -225,6 +283,10 @@ li {
color: rgba(255, 255, 255, 0.8);
font-weight: bold;
}
.dwlwt{
cursor: not-allowed !important;
pointer-events:none;
}
/* .cont >>> img{
max-width: 500px;
} */

69
src/views/news.vue
View File

@ -29,7 +29,10 @@
<!-- <div class="date">{{item.releaseTime}}</div> -->
</div>
<div>
<div class="news_li_con"><div class="title">{{item.name}}</div> <div class="introduction" v-html="item.content"></div> </div>
<div class="news_li_con">
<div class="title">{{item.name}}</div>
<div class="introduction" v-html="item.content"></div>
</div>
</div>
</el-card>
@ -39,7 +42,9 @@
</div>
<div style="width: 80%;margin: auto;">
<div v-for="item in rest" class="newsitem" style="overflow: hidden; padding: 30px 0 24px;position: relative;cursor: pointer;display: flex;" @click="changeto(item.id)">
<div v-for="item in rest" class="newsitem"
style="overflow: hidden; padding: 30px 0 24px;position: relative;cursor: pointer;display: flex;"
@click="changeto(item.id)">
<div class="date1" style=""><img :src="item.pic" style="width: 236px;height: 157px;"></img></div>
<div class="" style=" margin-left: 35px;overflow: hidden;">
<div style=" font-size: 18px;
@ -65,7 +70,8 @@
</div>
</div>
<div style="height: 40px;"></div>
<div class="page_more wow fadeInUp animated" data-wow-delay=".2s" id="More" style="visibility: visible; animation-delay: 0.2s; animation-name: fadeInUp;" @click="addnews">
<div class="page_more wow fadeInUp animated" data-wow-delay=".2s" id="More"
style="visibility: visible; animation-delay: 0.2s; animation-name: fadeInUp;" @click="addnews">
<em>更多新闻</em>
</div>
<div style="height: 60px;"></div>
@ -74,8 +80,14 @@
</template>
<script>
import '@/assets/images/news1.png'
import { getnews,getmsg,NewCategary} from '@/api';
import { Loading } from 'element-ui';
import {
getnews,
getmsg,
NewCategary
} from '@/api';
import {
Loading
} from 'element-ui';
export default {
data() {
return {
@ -94,22 +106,19 @@ export default{
NewCategary().then((res) => {
this.newscatagary = res.data
})
getnews({'page':0,'articleType':this.activeName}).then((res)=>{
getnews({
'page': 0,
'articleType': this.activeName
}).then((res) => {
loadingInstance.close();
// 遍历数组，对每个对象的richText属性进行处理
res.data.content.forEach(item => {
// 去除所有标签和空格
item.content = item.content?.replace(/<[^>]+>/g, '').trim();
});
this.newslist = res.data.content
let arr = this.newslist.slice(0, 3)
this.newshow = arr
loadingInstance.close();
})
},
methods: {
@ -121,7 +130,10 @@ export default{
let loadingInstance = Loading.service('loading');
// if(this.activeName=='行业动态'){
getmsg({'page':0,'articleType':this.activeName}).then((res)=>{
getmsg({
'page': 0,
'articleType': this.activeName
}).then((res) => {
// 遍历数组，对每个对象的richText属性进行处理
res.data.content.forEach(item => {
@ -156,7 +168,10 @@ export default{
addnews() {
this.page = this.page + 1
// if(this.activeName=='新闻资讯'){
getmsg({'page':this.page,'articleType':this.activeName}).then((res)=>{
getmsg({
'page': this.page,
'articleType': this.activeName
}).then((res) => {
// console.log(res)
for (let i = 0; i < res.data.content.length; i++) {
res.data.content[i].content = res.data.content[i].content?.replace(/<[^>]+>/g, '').trim();
@ -219,6 +234,7 @@ export default{
top: 0;
z-index: -1;
}
.date {
font-size: 26px;
@ -230,10 +246,12 @@ export default{
padding: 0 30px;
width: 100%;
}
.page_ban .content {
position: relative;
height: 100%;
}
.content {
width: 80%;
margin: 0 auto;
@ -245,6 +263,7 @@ export default{
left: 0;
bottom: 0;
}
div,
li {
box-sizing: border-box;
@ -316,6 +335,7 @@ li {
::v-deep .el-tabs__nav-wrap::after {
background-color: transparent;
}
.card_img1 {
border-radius: 14px;
@ -327,6 +347,7 @@ li {
margin-bottom: 16px;
border-radius: 14px;
}
.card_img2 {
border-radius: 14px;
background-image: url('../assets/images/news2.png');
@ -338,6 +359,7 @@ li {
margin-bottom: 16px;
border-radius: 14px;
}
.card_img3 {
border-radius: 14px;
background-image: url('../assets/images/news3.png');
@ -349,10 +371,12 @@ li {
margin-bottom: 16px;
border-radius: 14px;
}
.colitem {
display: inline-block;
float: none;
}
.mark::before {
content: '';
@ -368,19 +392,23 @@ float: none;
border-radius: 14px;
}
::v-deep .el-card.is-always-shadow {
border-radius: 14px;
box-shadow: initial;
}
::v-deep el-card {
border: none
}
.news_li_con {
position: relative;
padding-left: 28px;
height: 150px;
overflow: hidden;
}
.news_li_con:before {
content: '';
width: 6px;
@ -390,6 +418,7 @@ overflow: hidden;
top: 4px;
left: 0;
}
.title {
font-size: 22px;
color: #3c3c48;
@ -406,6 +435,7 @@ overflow: hidden;
-ms-transition: all .4s;
-o-transition: all .4s;
}
.introduction {
min-height: 72px;
font-size: 14.5px;
@ -418,6 +448,7 @@ overflow: hidden;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
.more {
position: absolute;
bottom: 0;
@ -427,12 +458,15 @@ overflow: hidden;
text-transform: uppercase;
letter-spacing: -.4px;
}
div {
box-sizing: border-box;
}
.el-col {
padding: 0px 8px;
}
.newsitem::before {
content: '';
width: 100%;
@ -442,6 +476,7 @@ div{
bottom: 0;
left: 0;
}
.newsitem .date1 {
width: 236px;
float: left;
@ -450,6 +485,7 @@ div{
color: rgb(48, 113, 183);
line-height: 1;
}
.title1 {
font-size: 20px;
color: #3c3c48;
@ -467,6 +503,7 @@ div{
-ms-transition: all .4s;
-o-transition: all .4s;
}
.newsitem .introduction1 {
font-size: 14.5px;
color: #848484;
@ -477,6 +514,7 @@ div{
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.page_more {
position: relative;
font-size: 18px;
@ -491,6 +529,7 @@ div{
-ms-border-radius: 14px;
-o-border-radius: 14px;
}
::v-deep .el-card {
border: none;
}