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 # 从宿主机中挂载的目录

File diff suppressed because it is too large Load Diff

View File

@ -1,294 +1,274 @@
<template> <template>
<div> <div>
<div class="page_ban"> <div class="page_ban">
<div class="img compbg"></div> <div class="img compbg"></div>
<div class="content"> <div class="content">
<div class="page_nav"> <div class="page_nav">
<div class="name"> <div class="name">
<a style="padding: 0;" href="/project">工程资讯</a> <a href="javascript:;">工程详情</a> <a style="padding: 0;" href="/project">工程资讯</a> <a href="javascript:;">工程详情</a>
</div> </div>
<div class="list" style="bottom:-15px"> <div class="list" style="bottom:-15px">
<el-tabs v-model="activeName"> <el-tabs v-model="activeName" >
<el-tab-pane label="工程详情" name="first"></el-tab-pane> <el-tab-pane label="工程详情" name="first"></el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="Wrapper news_d"> <div class="Wrapper news_d">
<div style="display: flex;width: 95%;justify-content: space-between;"> <div style="display: flex;width: 95%;justify-content: space-between;">
<div style="width: 30%;background-color:rgb(228,235,241);"> <div style="width: 30%;background-color:rgb(228,235,241);">
<div style="width: 100%;padding-left: 30%;box-sizing: border-box;"> <div style="width: 100%;padding-left: 30%;box-sizing: border-box;">
<div class="z_xq_cont_top_lt">工程简介</div> <div class="z_xq_cont_top_lt">工程简介</div>
<div class="z_xq_cont_top_ls"></div> <div class="z_xq_cont_top_ls"></div>
<!-- <div class="z_xq_cont_top_lc"><img src="https://www.fygroup.cn//skin/images/xqjt.png"></div> --> <!-- <div class="z_xq_cont_top_lc"><img src="https://www.fygroup.cn//skin/images/xqjt.png"></div> -->
<div class="z_xq_cont_top_lx"> <div class="z_xq_cont_top_lx">
<div class="jzmssj">{{area}} <span class="dwi"></span></div> <div class="jzmssj">{{area}} <span class="dwi"></span></div>
<div class="jzmsms">工程建筑面积</div> <div class="jzmsms">工程建筑面积</div>
</div> </div>
<div class="z_xq_cont_top_lx"> <div class="z_xq_cont_top_lx">
<div class="jzmssj">{{ height }} <span class="dwi">M</span></div> <div class="jzmssj">{{ height }} <span class="dwi">M</span></div>
<div class="jzmsms">建筑高度</div> <div class="jzmsms">建筑高度</div>
</div> </div>
</div> </div>
</div> </div>
<div style="width: 70%;"> <div style="width: 70%;">
<div class="content ql-editor" style="text-align: center;"> <div class="content ql-editor" style="text-align: center;">
<div class="name">{{ name }}</div> <div class="name">{{ name }}</div>
<div class="top-box"> <div class="top-box">
<!-- <div class="date">{{time}}</div> --> <!-- <div class="date">{{time}}</div> -->
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<div class="cont" v-html="content"></div> <div class="cont" v-html="content"></div>
</div> </div>
<div class="con"> <div class="con">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import { projectdetail } from '@/api';
projectdetail export default{
} from '@/api'; data(){
export default { return{
data() { name:'',
return { content:'',
name: '', time:'',
content: '', area:'',
time: '', height:''
area: '', }
height: '' },
} methods:{
},
methods: {
}, },
mounted() { mounted(){
projectdetail(this.$route.query).then((res) => { projectdetail(this.$route.query).then((res)=>{
this.content = res.data.particulars this.content=res.data.particulars
this.name = res.data.name this.name=res.data.name
this.time = res.data.completeTime this.time=res.data.completeTime
this.area = res.data.area this.area=res.data.area
this.height = res.data.height this.height=res.data.height
}) })
}, },
} }
</script> </script>
<style scoped> <style scoped>
.divider { .divider {
width: 100%; width: 100%;
height: 3px; height: 3px;
background-color: #0059a7; background-color: #0059a7;
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 {
padding: 60px 0 90px;
.news_d { overflow: hidden;
padding: 60px 0 0px; }
overflow: hidden; .Wrapper {
} position: relative;
background-color: #fff;
.Wrapper { z-index: 100;
position: relative; }
background-color: #fff; /* .news_d .name {
z-index: 100;
}
/* .news_d .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;
} */ } */
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
color: rgba(255, 255, 255, 0.8); color: rgba(255, 255, 255, 0.8);
border: none; border: none;
} }
::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; line-height: 26px;
line-height: 26px; margin-bottom: 26px;
margin-bottom: 26px; text-align: justify;
text-align: justify; }
}
.compbg { .compbg {
background-image: url('../assets/images/banner.png'); background-image: url('../assets/images/banner.png');
} }
.page_ban { .page_ban {
height: 404px; height: 404px;
position: relative; position: relative;
text-align: center; text-align: center;
z-index: 101; z-index: 101;
} }
.page_ban .img { .page_ban .img {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-size: cover; background-size: cover;
position: absolute; position: absolute;
left: 0; left: 0;
top: 0; top: 0;
z-index: -1; z-index: -1;
} }
.top-box{
margin: 16px 0 30px;
}
.date{
.top-box { font-size: 26px;
margin: 16px 0 30px; color: #dfd4c3;
} line-height: 1;
.date { bottom: 20px;
padding: 0 30px;
width: 100%;
}
.page_ban .content {
position: relative;
height: 100%;
}
.content {
width: 86%;
margin: 0 auto;
}
font-size: 26px; .page_nav {
color: #dfd4c3; width: 100%;
line-height: 1; position: absolute;
left: 0;
bottom: 0;
}
div,
li {
box-sizing: border-box;
}
bottom: 20px; .page_nav .name {
padding: 0 30px; float: left;
width: 100%; }
}
.page_ban .content { .page_nav .list {
position: relative; position: relative;
height: 100%; float: right;
} margin-right: -35px;
}
.content { .page_nav a {
width: 86%; float: left;
margin: 0 auto; line-height: 76px;
} position: relative;
font-size: 14.5px;
.page_nav { color: white;
width: 100%; font-weight: bold;
position: absolute; text-decoration: none;
left: 0; }
bottom: 0;
}
div, .page_nav .name a {
li { padding-left: 30px;
box-sizing: border-box; /* background: url() no-repeat left 30px; */
} }
.page_nav .name { .page_nav .list {
float: left; position: relative;
} float: right;
margin-right: -35px;
}
.page_nav .list { .page_nav .list a {
position: relative; color: #e7dfd2;
float: right; color: rgba(231, 223, 210, .7);
margin-right: -35px; margin-right: 35px;
} }
.page_nav a { .page_nav a {
float: left; float: left;
line-height: 76px; line-height: 76px;
position: relative; position: relative;
font-size: 14.5px; font-size: 14.5px;
color: white; color: rgba(255, 255, 255, 0.8);
font-weight: bold; font-weight: bold;
text-decoration: none; }
} .z_xq_cont_top_lt {
font-size: 25px;
color: #000000;
margin-top: 55px;
font-weight: bold;
}
.z_xq_cont_top_ls {
font-size: 20px;
color: #263d8f;
margin: 20px 0;
}
.z_xq_cont_top_lc {
overflow: hidden;
}
.z_xq_cont_top_lc img {
-webkit-box-sizing: border-box;
box-sizing: border-box;
vertical-align: middle;
border: 0;
}
.z_xq_cont_top_lx {
height: 88px;
border-left: 1px solid #CCCCCC;
padding-left: 10px;
margin-top: 50px;
}
.z_xq_cont_top_lx .jzmssj {
font-size: 46px;
color: #263d8f;
font-weight: 100;
line-height: 52px;
}
.z_xq_cont_top_lx .jzmssj .dwi {
font-size: 14px;
color: #666666;
}
.cont{
width: 70%;
margin: 0 auto;
}
.cont >>> img{
max-width:500px;
}
.page_nav .name a {
padding-left: 30px;
/* background: url() no-repeat left 30px; */
}
.page_nav .list {
position: relative;
float: right;
margin-right: -35px;
}
.page_nav .list a {
color: #e7dfd2;
color: rgba(231, 223, 210, .7);
margin-right: 35px;
}
.page_nav a {
float: left;
line-height: 76px;
position: relative;
font-size: 14.5px;
color: rgba(255, 255, 255, 0.8);
font-weight: bold;
}
.z_xq_cont_top_lt {
font-size: 25px;
color: #000000;
margin-top: 55px;
font-weight: bold;
}
.z_xq_cont_top_ls {
font-size: 20px;
color: #263d8f;
margin: 20px 0;
}
.z_xq_cont_top_lc {
overflow: hidden;
}
.z_xq_cont_top_lc img {
-webkit-box-sizing: border-box;
box-sizing: border-box;
vertical-align: middle;
border: 0;
}
.z_xq_cont_top_lx {
height: 88px;
border-left: 1px solid #CCCCCC;
padding-left: 10px;
margin-top: 50px;
}
.z_xq_cont_top_lx .jzmssj {
font-size: 46px;
color: #263d8f;
font-weight: 100;
line-height: 52px;
}
.z_xq_cont_top_lx .jzmssj .dwi {
font-size: 14px;
color: #666666;
}
.cont {
display: flex;
width: 100%;
}
.cont>>>img {
width: 100%;
}
</style> </style>