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

fix

Browse Source
master
yujialong 2 years ago
parent 32e448ba5d
commit fffb3a824c
6 changed files with 155 additions and 105 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. 24
      src/const/modules.js
  2. 94
      src/pages/column/page/deviceIntroBeam.vue
  3. 2
      src/pages/column/page/deviceIntroLinear.vue
  4. 2
      src/pages/column/page/estate/survey/index.vue
  5. 6
      src/pages/column/page/exp.vue
  6. 2
      src/plugins/requests/index.js

24
src/const/modules.js
Unescape View File

@ -4218,6 +4218,17 @@ export default {
{ {
type: 'form', type: 'form',
forms: [ forms: [
{
type: 'input',
prop: 'title',
label: '标题',
required: true
},
{
type: 'input',
prop: 'subTitle',
label: '小标题'
},
{ {
type: 'media', type: 'media',
prop: 'pic', prop: 'pic',
@ -4225,12 +4236,14 @@ export default {
required: true required: true
}, },
{ {
type: 'textarea', type: 'editor',
prop: 'des', prop: 'des',
label: '描述' label: '描述'
} }
], ],
form: { form: {
title: '实验线站',
subTitle: 'EXPERIMENT STATIONS',
pic: 'http://10.10.11.7/images/exp/2.png', pic: 'http://10.10.11.7/images/exp/2.png',
des: ` 科学实验站是S³FEL面向国家重大需求、聚焦科学前沿和引领地区产业发展的关键，旨在重点探究量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的关键技术和科学难题。S³FEL的供光具有超高时间分辨（40飞秒）、超高重复频率（最高百万赫兹）和超高亮度（电子束能量达2.5 Gev）的特点。 des: ` 科学实验站是S³FEL面向国家重大需求、聚焦科学前沿和引领地区产业发展的关键，旨在重点探究量子材料、能源催化、生物医药、大气与星际科学、原子分子科学等领域的关键技术和科学难题。S³FEL的供光具有超高时间分辨（40飞秒）、超高重复频率（最高百万赫兹）和超高亮度（电子束能量达2.5 Gev）的特点。
@ -4959,7 +4972,7 @@ export default {
required: true required: true
}, },
{ {
type: 'textarea', type: 'editor',
prop: 'des', prop: 'des',
label: '描述' label: '描述'
} }
@ -5260,6 +5273,12 @@ export default {
{ {
type: 'form', type: 'form',
forms: [ forms: [
{
type: 'upload',
prop: 'pic',
label: '图片',
required: true
},
{ {
type: 'editor', type: 'editor',
prop: 'des', prop: 'des',
@ -5267,6 +5286,7 @@ export default {
}, },
], ],
form: { form: {
pic: 'http://10.10.11.7/images/device/2.png',
des: `波荡器是S³FEL光束线的关键部件，由一系列N极和S极交替排列的磁铁阵列构成，是一种能够产生空间周期性分布磁场的电磁装置。被超导直线加速器加速的高能电子束经过波荡器时，将扭摆状波荡前行。通过合理选择电子束和波荡器的参数，可使电子束在每个波动周期内与波荡器发出的同步辐射相互干涉，以获得超高亮度、强相干、高重频的X射线自由电子激光。`, des: `波荡器是S³FEL光束线的关键部件，由一系列N极和S极交替排列的磁铁阵列构成，是一种能够产生空间周期性分布磁场的电磁装置。被超导直线加速器加速的高能电子束经过波荡器时，将扭摆状波荡前行。通过合理选择电子束和波荡器的参数，可使电子束在每个波动周期内与波荡器发出的同步辐射相互干涉，以获得超高亮度、强相干、高重频的X射线自由电子激光。`,
} }
}, },

94
src/pages/column/page/deviceIntroBeam.vue
Unescape View File

@ -3,59 +3,85 @@
<div class="actions"> <div class="actions">
<p class="page-name">页面设置/装置介绍</p> <p class="page-name">页面设置/装置介绍</p>
<div> <div>
<el-button type="primary" @click="preview">预览</el-button> <el-button type="primary"
@click="preview">预览</el-button>
<el-button @click="save(0)">保存为草稿</el-button> <el-button @click="save(0)">保存为草稿</el-button>
<el-button type="primary" @click="save(1)">发布</el-button> <el-button type="primary"
@click="save(1)">发布</el-button>
<el-button @click="back">放弃编辑</el-button> <el-button @click="back">放弃编辑</el-button>
</div> </div>
</div> </div>
<div class="modules"> <div class="modules">
<div class="relative"> <div class="relative">
<el-carousel height="480px" :indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'"> <el-carousel height="480px"
:indicator-position="modules[0].list.filter(e => e.isEnable).length > 1 ? '' : 'none'">
<template v-for="(item, i) in modules[0].list"> <template v-for="(item, i) in modules[0].list">
<el-carousel-item v-if="item.pic && item.isEnable" :key="i"> <el-carousel-item v-if="item.pic && item.isEnable"
<img width="100%" height="100%" :src="item.pic" alt=""> :key="i">
<img width="100%"
height="100%"
:src="item.pic"
alt="">
</el-carousel-item> </el-carousel-item>
</template> </template>
</el-carousel> </el-carousel>
<div class="cover" @click="toSet(0)">点击更换banner与链接</div> <div class="cover"
@click="toSet(0)">点击更换banner与链接</div>
</div> </div>
<div class="block share"> <div class="block share">
<div class="inner"> <div class="inner">
<div class="c-wrap"> <div class="c-wrap">
<h6>{{ modules[1].form.title }}</h6> <h6>{{ modules[1].form.title }}</h6>
<p class="en" v-html="modules[1].form.des"></p> <p class="en"
<div class="cover" @click="toSet(1)">点击更改标题与描述</div> v-html="modules[1].form.des"></p>
<div class="cover"
@click="toSet(1)">点击更改标题与描述</div>
</div> </div>
<div class="c-wrap"> <div class="c-wrap">
<div class="sum">{{ modules[2].form.title }}</div> <div class="sum">{{ modules[2].form.title }}</div>
<div class="flex"> <div class="flex">
<div class="left"> <div class="left">
<div class="des" v-html="modules[2].form.des"></div> <div class="des"
v-html="modules[2].form.des"></div>
</div> </div>
<img class="pic" :src="modules[2].form.pic" alt=""> <img class="pic"
:src="modules[2].form.pic"
alt="">
</div> </div>
<div class="cover" @click="toSet(2)">点击更改标题、描述与图片</div> <div class="cover"
@click="toSet(2)">点击更改标题、描述与图片</div>
</div> </div>
</div> </div>
</div> </div>
<div class="intro"> <div class="intro">
<img class="pic" src="http://10.10.11.7/images/device/2.png" alt=""> <div class="intro-inner c-wrap">
<div class="des" v-html="modules[3].form.des"></div> <img class="pic"
<div class="cover" @click="toSet(3)">点击更改描述</div> :src="modules[3].form.pic"
alt="">
<div class="des"
v-html="modules[3].form.des"></div>
<div class="cover"
@click="toSet(3)">点击更改描述</div>
</div>
</div> </div>
<div class="unit"> <div class="unit">
<h6>{{ modules[4].form.title }}</h6> <h6>{{ modules[4].form.title }}</h6>
<img class="pic" :src="modules[4].form.pic" alt=""> <img class="pic"
<div class="cover" @click="toSet(4)">点击更改标题与图片</div> :src="modules[4].form.pic"
alt="">
<div class="cover"
@click="toSet(4)">点击更改标题与图片</div>
</div> </div>
</div> </div>
<Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" /> <Module ref="module"
:data.sync="curData"
:visible.sync="diaVisible"
@moduleSubmit="moduleSubmit" />
</div> </div>
</template> </template>
@ -95,7 +121,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "../../../styles/page/page.scss"; @import '../../../styles/page/page.scss';
.wrap { .wrap {
background: url(http://10.10.11.7/images/device/4.png) (100% 1363px) / auto no-repeat; background: url(http://10.10.11.7/images/device/4.png) (100% 1363px) / auto no-repeat;
} }
@ -123,7 +149,7 @@ export default {
font-size: 48px; font-size: 48px;
font-family: PingFangSC-Light, PingFang SC; font-family: PingFangSC-Light, PingFang SC;
font-weight: 300; font-weight: 300;
color: #E3E3E3; color: #e3e3e3;
} }
.sum { .sum {
margin-top: 60px; margin-top: 60px;
@ -148,24 +174,28 @@ export default {
} }
} }
.intro { .intro {
position: relative; width: 80%;
height: 19.65rem;
padding-left: 14%;
margin-bottom: 67px;
background-color: #2e4984;
.intro-inner {
display: flex; display: flex;
align-items: center; align-items: center;
max-width: 1490px; height: 100%;
width: 90%; }
height: 393px;
margin-bottom: 67px;
.pic { .pic {
width: 60%; width: 50%;
height: 100%; height: 100%;
} }
.des { .des {
height: 100%; width: 50%;
padding: 57px 60px 20px 60px; height: 19.65rem;
font-size: 22px; padding: 2.85rem 3rem 1rem 3rem;
font-size: 0.96rem;
color: #fff; color: #fff;
line-height: 40px; line-height: 2rem;
background: #2E4984; -webkit-line-clamp: 7;
} }
} }
.unit { .unit {
@ -179,8 +209,8 @@ export default {
font-size: 20px; font-size: 20px;
font-family: PingFangSC-Medium, PingFang SC; font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500; font-weight: 500;
color: #2A2A2A; color: #2a2a2a;
border-left: 4px solid #1583FF; border-left: 4px solid #1583ff;
} }
} }
</style> </style>

2
src/pages/column/page/deviceIntroLinear.vue
Unescape View File

@ -33,7 +33,7 @@
<div class="left c-wrap"> <div class="left c-wrap">
<h6>{{ modules[2].form.title }}</h6> <h6>{{ modules[2].form.title }}</h6>
<div class="line"></div> <div class="line"></div>
<div class="des">{{ modules[2].form.des }}</div> <div class="des" v-html="modules[2].form.des"></div>
<div class="cover" @click="toSet(2)">点击更改标题与概述</div> <div class="cover" @click="toSet(2)">点击更改标题与概述</div>
</div> </div>
<img class="bg" src="http://10.10.11.7/images/device/10.png" alt=""> <img class="bg" src="http://10.10.11.7/images/device/10.png" alt="">

2
src/pages/column/page/estate/survey/index.vue
Unescape View File

@ -113,7 +113,7 @@ export default {
.survey { .survey {
width: 1294px; width: 1294px;
min-height: 500px; min-height: 500px;
padding: 80px 86px 29px 37%; padding: 80px 86px 29px 597px;
margin: 0 auto 200px; margin: 0 auto 200px;
background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat; background: url(http://10.10.11.7/images/estate/2.png) 0 0/100% 100% no-repeat;
border-radius: 160px; border-radius: 160px;

6
src/pages/column/page/exp.vue
Unescape View File

@ -24,8 +24,8 @@
<div class="block station"> <div class="block station">
<div class="inner c-wrap"> <div class="inner c-wrap">
<h6>实验线站</h6> <h6>{{ modules[1].form.title }}</h6>
<p class="en">EXPERIMENT STATIONS</p> <p class="en">{{ modules[1].form.subTitle }}</p>
<template v-if="modules[1].form.pic"> <template v-if="modules[1].form.pic">
<video v-if="Util.isVideo(modules[1].form.mediaType)" class="pic" ref="video" autoplay controls loop> <video v-if="Util.isVideo(modules[1].form.mediaType)" class="pic" ref="video" autoplay controls loop>
<source :src="modules[1].form.pic" type="video/mp4"> <source :src="modules[1].form.pic" type="video/mp4">
@ -33,7 +33,7 @@
</video> </video>
<img v-else class="pic" :src="modules[1].form.pic" alt=""> <img v-else class="pic" :src="modules[1].form.pic" alt="">
</template> </template>
<div class="des">{{ modules[1].form.des }}</div> <div class="des" v-html="modules[1].form.des"></div>
<div class="cover" @click="toSet(1)">点击更改图片与概述</div> <div class="cover" @click="toSet(1)">点击更改图片与概述</div>
</div> </div>
</div> </div>

2
src/plugins/requests/index.js
Unescape View File

@ -5,7 +5,7 @@ import store from '@/store'
const service = axios.create({ const service = axios.create({
baseURL: Setting.apiBaseURL, baseURL: Setting.apiBaseURL,
timeout: 10000000 timeout: 1000 * 60 * 60 * 6
}); });
// post请求头 // post请求头
service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8' service.defaults.headers.post['Content-Type'] = 'application/json;charset=UTF-8'

Write Preview
Loading…
Cancel
Save