Compare commits

..

No commits in common. "master" and "Branch_csl" have entirely different histories.

3 changed files with 917 additions and 1002 deletions

View File

@ -1,31 +0,0 @@
kind: pipeline
type: docker
name: feiyang-web
steps:
- name: build
image: node:18.18.0
volumes:
- name: build-file
path: /build/dist
commands:
- npm install --registry=https://registry.npmmirror.com/
- npm run build
- cp -r dist/. /build/dist
- name: remote_transmit
image: appleboy/drone-ssh # SSH工具镜像
settings:
host: 101.43.112.107 # 远程连接地址
username: root # 远程连接账号
password:
from_secret: ssh_password # 从Secret中读取SSH密码
port: 22 # 远程连接端口
command_timeout: 5m # 远程执行命令超时时间
script:
- scp -r /feiyang/build/index root@1.94.20.201:~/server
volumes: # 定义流水线挂载目录,用于共享数据
- name: build-file
host:
path: /feiyang/build/index # 从宿主机中挂载的目录

View File

@ -64,8 +64,7 @@
<div style="color:rgba(60,115,164);font-size:40px">{{componyarr[0].sketchIn}} <div style="color:rgba(60,115,164);font-size:40px">{{componyarr[0].sketchIn}}
</div> </div>
<div style="height: 40px;"></div> <div style="height: 40px;"></div>
<div style="color: rgba(0,0,0,.6);line-height: 30px;width: 57%;" class="init" <div style="color: rgba(0,0,0,.6);line-height: 30px;width: 57%;" class="init" v-html="componyarr[0].contentIn">
v-html="componyarr[0].contentIn">
</div> </div>
<div style="height: 40px;"></div> <div style="height: 40px;"></div>
@ -76,8 +75,7 @@
<div style="color:rgba(60,115,164);font-size:40px">{{componyarr[0].sketchDown}} <div style="color:rgba(60,115,164);font-size:40px">{{componyarr[0].sketchDown}}
</div> </div>
<div style="height: 40px;"></div> <div style="height: 40px;"></div>
<div style="color: rgba(0,0,0,.6);line-height: 30px;width: 57%;" class="init" <div style="color: rgba(0,0,0,.6);line-height: 30px;width: 57%;" class="init" v-html="componyarr[0].contentDown">
v-html="componyarr[0].contentDown">
</div> </div>
<div style="height: 70px;"></div> <div style="height: 70px;"></div>
@ -149,25 +147,24 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="images_cl"> <div style="width: 80%;margin: auto;flex-wrap: wrap;justify-content: space-between; display: grid;
<div style="width: auto;margin-bottom: 20px;border-radius: 10px;cursor: pointer;" grid-template-columns: repeat(auto-fill, minmax(31.33%, 1fr));
v-for="item in honorList" :key="item.id" @click="changeto(item.id)"> grid-column-gap: 2%;">
<div style="width: auto;margin-bottom: 20px;border-radius: 10px;cursor: pointer;" v-for="item in honorList" :key="item.id" @click="changeto(item.id)">
<div style="background-color: rgb(240,246,250); border-radius: 14px 14px 0 0;"> <div style="background-color: rgb(240,246,250); border-radius: 14px 14px 0 0;">
</div> </div>
<div class="img_cl" style="height: 100%;text-align: center; border: 5px solid #F8F8F8;"> <div style="height: 100%;text-align: center; border: 5px solid #F8F8F8;">
<img :src="item.picture" alt="200603" style="scale: 0.85;height: 285px;width: 379px"> <img :src="item.picture" alt="200603" style="scale: 0.85;height: 285px;width: 379px"> </div>
</div>
</div> </div>
</div> </div>
<div v-if="!honorList.length" <div v-if="!honorList.length" style="height: 400px;display: flex;justify-content: center;align-items: center;">
style="height: 400px;display: flex;justify-content: center;align-items: center;">
<div style="color: #999;">该年份暂无内容展示</div> <div style="color: #999;">该年份暂无内容展示</div>
</div> </div>
</div> </div>
@ -228,20 +225,16 @@
</div> </div>
</template> </template>
<script> <script>
import { import { honor,culture,compony } from '@/api';
honor, import { honorList } from '@/api';
culture,
compony
} from '@/api';
import {
honorList
} from '@/api';
export default { export default {
data() { data() {
return { return {
activeName: 'first', activeName: 'first',
timeIndex: 0, timeIndex: 0,
timeLineList: [{ timeLineList:
[
{
"timestamp": "全部", "timestamp": "全部",
"color": "#999", "color": "#999",
"fontsize": 18, "fontsize": 18,
@ -342,11 +335,7 @@
async getHonner(year){ async getHonner(year){
const { const {data:res} = await honorList({'year':year});
data: res
} = await honorList({
'year': year
});
console.log(res) console.log(res)
this.honorList = res this.honorList = res
}, },
@ -366,7 +355,8 @@
// this.$refs.mytimeline.style.marginLeft = marginLeft - 220 + 'px'; // this.$refs.mytimeline.style.marginLeft = marginLeft - 220 + 'px';
if (this.timeIndex < 1) { if (this.timeIndex < 1) {
return return
} else { }
else {
this.timeIndex = this.timeIndex - 1 this.timeIndex = this.timeIndex - 1
console.log(this.timeIndex) console.log(this.timeIndex)
const year = this.timeLineList[this.timeIndex].year const year = this.timeLineList[this.timeIndex].year
@ -397,30 +387,7 @@
} }
}; };
</script> </script>
<style scoped lang="scss"> <style scoped>
.images_cl {
width: 80%;
margin: auto;
flex-wrap: wrap;
justify-content: space-between;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(31.33%, 1fr));
}
@media screen and (max-width:1523px) {
.img_cl {
img {
width: 100% !important;
}
}
}
@media screen and (max-width:1241px) {
.images_cl {
grid-template-columns: repeat(auto-fill, minmax(45%, 1fr));
}
}
.compbg { .compbg {
background-image: url('../assets/images/banner.png'); background-image: url('../assets/images/banner.png');
} }
@ -735,11 +702,10 @@
margin-left: -22px; */ margin-left: -22px; */
flex: 0.5 flex: 0.5
} }
.init p{ .init p{
margin:16px 0 margin:16px 0
}
}
.ul_box { .ul_box {
width: 100%; width: 100%;

View File

@ -53,9 +53,7 @@
</div> </div>
</template> </template>
<script> <script>
import { import { projectdetail } from '@/api';
projectdetail
} from '@/api';
export default{ export default{
data(){ data(){
return{ return{
@ -88,25 +86,21 @@
position: static; position: static;
margin-bottom: 28px; margin-bottom: 28px;
} }
.name { .name {
font-size: 30px; font-size: 30px;
color: #0007a9; color: #0007a9;
color: rgba(0, 7, 169, .8); color: rgba(0, 7, 169, .8);
line-height: 36px; line-height: 36px;
} }
.news_d { .news_d {
padding: 60px 0 0px; padding: 60px 0 90px;
overflow: hidden; overflow: hidden;
} }
.Wrapper { .Wrapper {
position: relative; position: relative;
background-color: #fff; background-color: #fff;
z-index: 100; z-index: 100;
} }
/* .news_d .name { /* .news_d .name {
font-size: 30px; font-size: 30px;
color: #0007a9; color: #0007a9;
@ -123,7 +117,6 @@
::v-deep .el-tabs__nav-wrap::after { ::v-deep .el-tabs__nav-wrap::after {
background-color: transparent; background-color: transparent;
} }
.news_d .con p { .news_d .con p {
font-size: 14.5px; font-size: 14.5px;
color: #8e8e95; color: #8e8e95;
@ -154,11 +147,9 @@
top: 0; top: 0;
z-index: -1; z-index: -1;
} }
.top-box{ .top-box{
margin: 16px 0 30px; margin: 16px 0 30px;
} }
.date{ .date{
font-size: 26px; font-size: 26px;
@ -169,12 +160,10 @@
padding: 0 30px; padding: 0 30px;
width: 100%; width: 100%;
} }
.page_ban .content { .page_ban .content {
position: relative; position: relative;
height: 100%; height: 100%;
} }
.content { .content {
width: 86%; width: 86%;
margin: 0 auto; margin: 0 auto;
@ -186,7 +175,6 @@
left: 0; left: 0;
bottom: 0; bottom: 0;
} }
div, div,
li { li {
box-sizing: border-box; box-sizing: border-box;
@ -239,56 +227,48 @@
color: rgba(255, 255, 255, 0.8); color: rgba(255, 255, 255, 0.8);
font-weight: bold; font-weight: bold;
} }
.z_xq_cont_top_lt { .z_xq_cont_top_lt {
font-size: 25px; font-size: 25px;
color: #000000; color: #000000;
margin-top: 55px; margin-top: 55px;
font-weight: bold; font-weight: bold;
} }
.z_xq_cont_top_ls { .z_xq_cont_top_ls {
font-size: 20px; font-size: 20px;
color: #263d8f; color: #263d8f;
margin: 20px 0; margin: 20px 0;
} }
.z_xq_cont_top_lc { .z_xq_cont_top_lc {
overflow: hidden; overflow: hidden;
} }
.z_xq_cont_top_lc img { .z_xq_cont_top_lc img {
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
vertical-align: middle; vertical-align: middle;
border: 0; border: 0;
} }
.z_xq_cont_top_lx { .z_xq_cont_top_lx {
height: 88px; height: 88px;
border-left: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC;
padding-left: 10px; padding-left: 10px;
margin-top: 50px; margin-top: 50px;
} }
.z_xq_cont_top_lx .jzmssj { .z_xq_cont_top_lx .jzmssj {
font-size: 46px; font-size: 46px;
color: #263d8f; color: #263d8f;
font-weight: 100; font-weight: 100;
line-height: 52px; line-height: 52px;
} }
.z_xq_cont_top_lx .jzmssj .dwi { .z_xq_cont_top_lx .jzmssj .dwi {
font-size: 14px; font-size: 14px;
color: #666666; color: #666666;
} }
.cont{ .cont{
display: flex; width: 70%;
width: 100%; margin: 0 auto;
}
.cont >>> img{
max-width:500px;
} }
.cont>>>img {
width: 100%;
}
</style> </style>