长页联调

master
yujialong 2 years ago
parent d794b179f0
commit 676542f494
  1. BIN
      src/assets/images/userSharing/1.png
  2. BIN
      src/assets/images/userSharing/2.png
  3. BIN
      src/assets/images/userSharing/3.png
  4. BIN
      src/assets/images/userSharing/4.png
  5. 181
      src/const/modules.js
  6. 3
      src/mixins/page/index.js
  7. 8
      src/pages/column/page/science.vue
  8. 31
      src/pages/column/page/talent.vue
  9. 198
      src/pages/column/page/userSharing.vue
  10. 12
      src/router/modules/column.js
  11. 2
      src/setting.js

Binary file not shown.

After

Width:  |  Height:  |  Size: 962 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

@ -4004,4 +4004,185 @@ export default {
}
},
],
userSharing: [
{
type: 'introduce',
forms: [
{
type: 'upload',
prop: 'pic',
label: '图片',
required: true,
crop: false
},
{
type: 'input',
prop: 'title',
label: '标题',
required: true
},
{
type: 'link',
prop: 'link',
label: '链接'
}
],
form: {
pic: '',
title: '',
link: {
linkName: '无',
connectionType: 1,
columnId: [],
articleId: '',
linkAddress : '',
site: '',
otherColumnId: [],
otherArticleId: '',
isOpen: 1
},
isEnable: 1
},
list: [
{
pic: 'http://10.10.11.7/images/talent/1.png',
title: 'EDUCATION & COLLABORATION',
link: {
linkName: '无',
connectionType: 1,
columnId: [],
articleId: '',
linkAddress : '',
site: '',
otherColumnId: [],
otherArticleId: '',
isOpen: 1
},
isEnable: 1
}
]
},
{
type: 'form',
forms: [
{
type: 'textarea',
prop: 'des',
label: '描述'
}
],
form: {
des: `S³FEL是由深圳市政府投资建设的新一代自由电子激光大科学装置,将成为世界上顶级的先进光源大科学装置,是支撑深圳社会主义先行示范区和大湾区综合性国家科学中心建设的大型公共科技创新平台,对提升我国的科技影响力、集聚顶尖科技人才、推动科技创新具有非常重要的意义。 S³FEL以“高效运行、分类开放”为共享理念,向全世界科技界实行开放共享,促进信息、材料、能源、生物化学等多个基础科学领域的极速发展。`
}
},
{
type: 'form',
forms: [
{
type: 'input',
prop: 'title',
label: '标题',
required: true
},
{
type: 'link',
prop: 'link',
label: '链接'
},
{
type: 'textarea',
prop: 'des',
label: '描述'
}
],
form: {
title: '机时申请',
link: {
linkName: '无',
connectionType: 1,
columnId: [],
articleId: '',
linkAddress : '',
site: '',
otherColumnId: [],
otherArticleId: '',
isOpen: 1
},
des: `向全世界科技界实行开放共享,多个基础科学领域的极速发展。
`
}
},
{
type: 'form',
forms: [
{
type: 'input',
prop: 'title',
label: '标题',
required: true
},
{
type: 'link',
prop: 'link',
label: '链接'
},
{
type: 'textarea',
prop: 'des',
label: '描述'
}
],
form: {
title: '实时运行动态',
link: {
linkName: '无',
connectionType: 1,
columnId: [],
articleId: '',
linkAddress : '',
site: '',
otherColumnId: [],
otherArticleId: '',
isOpen: 1
},
des: `促进信息、材料、能源、生物、环境、化学等多个基础科学领域的极速发展。 `
}
},
{
type: 'form',
forms: [
{
type: 'input',
prop: 'title',
label: '标题',
required: true
},
{
type: 'link',
prop: 'link',
label: '链接'
},
{
type: 'textarea',
prop: 'des',
label: '描述'
}
],
form: {
title: '用户常见问题',
link: {
linkName: '无',
connectionType: 1,
columnId: [],
articleId: '',
linkAddress : '',
site: '',
otherColumnId: [],
otherArticleId: '',
isOpen: 1
},
des: `常见问题答案,也能提问由深圳市政府投资建设的新一代自由`
}
},
],
}

@ -68,13 +68,14 @@ export default {
this.id = json.id
const str = json[json.state ? 'theEditedJson' : 'jsonBeforeEditing']
this.originModules = str // 原始json,用以页面离开的时候判断是否需要提示保存
this.modules = JSON.parse(str)
// this.modules = JSON.parse(str)
console.log("🚀 ~ file: index.js ~ line 53 ~ this.$post ~ this.modules", this.modules)
}
}).catch(err => {})
},
// 展开模块设置
toSet(i, listIndex) {
console.log("🚀 ~ file: index.js:78 ~ toSet ~ i", i,this.modules)
this.curModule = i
this.curData = JSON.parse(JSON.stringify(this.modules[i]))
const { type } = this.curData

@ -30,7 +30,7 @@
<h6>{{ modules[1].form.title }}</h6>
<div class="des">{{ modules[1].form.des }}</div>
</div>
<div class="cover" style="left: -35px" @click="toSet(1)">点击更改图片标题概述与链接</div>
<div class="cover" style="left: -35px" @click="toSet(1)">点击更改标题概述与链接</div>
</div>
<div class="item">
<img src="@/assets/images/science/2.png" alt="">
@ -38,7 +38,7 @@
<h6>{{ modules[2].form.title }}</h6>
<div class="des">{{ modules[2].form.des }}</div>
</div>
<div class="cover" style="right: -35px" @click="toSet(2)">点击更改图片标题概述与链接</div>
<div class="cover" style="right: -35px" @click="toSet(2)">点击更改标题概述与链接</div>
</div>
<div class="item">
<img src="@/assets/images/science/3.png" alt="">
@ -46,11 +46,13 @@
<h6>{{ modules[3].form.title }}</h6>
<div class="des">{{ modules[3].form.des }}</div>
</div>
<div class="cover" style="left: -35px" @click="toSet(3)">点击更改图片标题概述与链接</div>
<div class="cover" style="left: -35px" @click="toSet(3)">点击更改标题概述与链接</div>
</div>
</div>
</div>
</div>
<Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
</div>
</template>

@ -25,26 +25,30 @@
<div class="block talent">
<div class="inner">
<div class="item">
<img src="@/assets/images/about/12.png" alt="">
<img class="pic" :src="modules[1].form.pic" alt="">
<div class="texts">
<h6>{{ modules[1].form.title }}</h6>
<div class="des">{{ modules[1].form.des }}</div>
</div>
<div class="cover" @click="toSet(1)">点击更改图片标题概述与链接</div>
</div>
<div class="item">
<img src="@/assets/images/about/12.png" alt="">
<img class="pic" :src="modules[2].form.pic" alt="">
<div class="texts">
<h6>{{ modules[2].form.title }}</h6>
<div class="des">{{ modules[2].form.des }}</div>
</div>
<div class="cover" @click="toSet(2)">点击更改图片标题概述与链接</div>
</div>
</div>
</div>
<div class="style">
<div class="style c-wrap">
<div class="c-wrap">
<h6>{{ modules[3].form.title }}</h6>
<ul class="members">
<li>
<div class="cover" @click="toSet(3)">点击更换标题</div>
</div>
<div class="c-wrap">
<el-carousel :interval="4000" type="card" height="510px">
<template v-for="(item, i) in modules[4].list">
<el-carousel-item v-if="item.isEnable" :key="i">
@ -55,33 +59,37 @@
</el-carousel-item>
</template>
</el-carousel>
</li>
</ul>
<div class="cover" @click="toSet(4)">点击更改图片标题概述与链接</div>
</div>
</div>
<div class="block intro">
<div class="inner">
<div class="item">
<img :src="modules[5].form.pic" alt="">
<img class="pic" :src="modules[5].form.pic" alt="">
<div class="texts">
<p class="type">{{ modules[5].form.subTitle }}</p>
<h6>{{ modules[5].form.title }}</h6>
<div class="des">{{ modules[5].form.des }}</div>
<el-button type="primary">查看更多</el-button>
</div>
<div class="cover" @click="toSet(5)">点击更改图片标题小标题概述与链接</div>
</div>
<div class="item">
<img :src="modules[6].form.pic" alt="">
<img class="pic" :src="modules[6].form.pic" alt="">
<div class="texts">
<p class="type">{{ modules[6].form.subTitle }}</p>
<h6>{{ modules[6].form.title }}</h6>
<div class="des">{{ modules[6].form.des }}</div>
<el-button type="primary">查看更多</el-button>
</div>
<div class="cover" @click="toSet(6)">点击更改图片标题小标题概述与链接</div>
</div>
</div>
</div>
</div>
<Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
</div>
</template>
@ -92,7 +100,7 @@ export default {
mixins: [mixins],
data() {
return {
modules: Modules.research
modules: Modules.talent
}
},
mounted() {
@ -130,8 +138,8 @@ export default {
width: 1504px;
}
.item {
position: relative;
display: flex;
justify-content: space-between;
padding: 42px;
margin-bottom: 36px;
background: #fff;
@ -195,6 +203,7 @@ export default {
width: 1504px;
}
.item {
position: relative;
display: flex;
align-items: center;
margin-bottom: 36px;

@ -0,0 +1,198 @@
<template>
<div class="wrap">
<div class="actions">
<p class="page-name">页面设置/RESEARCH</p>
<div>
<el-button type="primary" @click="preview">预览</el-button>
<el-button @click="save(0)">保存为草稿</el-button>
<el-button type="primary" @click="save(1)">发布</el-button>
<el-button @click="back">放弃编辑</el-button>
</div>
</div>
<div class="modules">
<div class="relative">
<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">
<el-carousel-item v-if="item.pic && item.isEnable" :key="i">
<img width="100%" height="100%" :src="item.pic" alt="">
</el-carousel-item>
</template>
</el-carousel>
<div class="cover" @click="toSet(0)">点击更换banner与链接</div>
</div>
<div class="block share">
<div class="inner c-wrap">
<div class="left">
<h6>用户共享</h6>
<p class="en">USERS SHARE</p>
<div class="des">{{ modules[1].form.des }}</div>
</div>
<div class="cover" @click="toSet(1)">点击更换描述</div>
<img class="pic" src="@/assets/images/userSharing/1.png" alt="">
<div class="card">
<p class="title">高效运行分类开放</p>
<p class="en-text">EFFICIENT OPERATION, CLASSIFICATION OPEN</p>
</div>
</div>
</div>
<div class="block gray">
<ul class="group">
<li>
<img src="@/assets/images/userSharing/2.png" alt="">
<h6>{{ modules[2].form.title }}</h6>
<div class="des">{{ modules[2].form.des }}</div>
<div class="cover" @click="toSet(2)">点击更换标题描述与链接</div>
</li>
<li>
<img src="@/assets/images/userSharing/3.png" alt="">
<h6>{{ modules[3].form.title }}</h6>
<div class="des">{{ modules[3].form.des }}</div>
<div class="cover" @click="toSet(3)">点击更换标题描述与链接</div>
</li>
<li>
<img src="@/assets/images/userSharing/4.png" alt="">
<h6>{{ modules[4].form.title }}</h6>
<div class="des">{{ modules[4].form.des }}</div>
<div class="cover" @click="toSet(4)">点击更换标题描述与链接</div>
</li>
</ul>
</div>
</div>
<Module ref="module" :data.sync="curData" :visible.sync="diaVisible" @moduleSubmit="moduleSubmit" />
</div>
</template>
<script>
import mixins from '@/mixins/page'
import Modules from '@/const/modules'
export default {
mixins: [mixins],
data() {
return {
modules: Modules.userSharing
}
},
mounted() {
this.$store.commit('user/setCrumbs', [
{
name: '站点管理',
route: '/site'
},
{
name: '内容管理',
route: '/column'
},
{
name: '栏目管理',
route: '/column'
},
{
name: '用户共享'
}
])
},
methods: {
}
};
</script>
<style lang="scss" scoped>
@import "../../../styles/page/page.scss";
.share {
position: relative;
.inner {
display: flex;
width: 1476px;
}
.left {
width: 509px;
}
h6 {
position: relative;
font-size: 48px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #333333;
}
.en {
margin-top: -35px;
font-size: 45px;
font-family: AppleSystemUIFont;
color: #E4E4E4;
}
.des {
margin-top: 25px;
font-size: 18px;
color: #333;
line-height: 37px;
overflow: visible;
}
.pic {
width: 944px;
height: 568px;
border-top-left-radius: 20px;
}
.card {
position: absolute;
bottom: 29px;
left: 0;
width: 1068px;
height: 145px;
padding: 20px 0 0 11%;
background: #7BACC4;
border-radius: 0px 100px 0px 0px;
opacity: 0.88;
}
.title {
margin-bottom: 10px;
font-size: 40px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #fff;
}
.en-text {
font-size: 28px;
font-family: AppleSystemUIFont;
color: #fff;
letter-spacing: 2px;
}
}
.group {
display: flex;
justify-content: center;
li {
position: relative;
width: 420px;
height: 390px;
padding: 195px 0 0 32px;
margin-right: 20px;
color: #fff;
}
img {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
h6 {
position: relative;
font-size: 36px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
}
.des {
position: relative;
margin-top: 16px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
line-height: 31px;
}
}
</style>

@ -84,6 +84,18 @@ export default {
path: `science`,
component: () => import('@/pages/column/page/science'),
meta: { title: '科普之窗' }
},
{
name: `${pre}talent`,
path: `talent`,
component: () => import('@/pages/column/page/talent'),
meta: { title: '人才队伍' }
},
{
name: `${pre}userSharing`,
path: `userSharing`,
component: () => import('@/pages/column/page/userSharing'),
meta: { title: '用户共享' }
}
]
}

@ -6,7 +6,7 @@ const isDev = process.env.NODE_ENV === 'development' // 开发环境
let host = `${location.origin}/`
if (isDev) {
host = 'http://192.168.31.136:10000/' // 测试服
host = 'http://192.168.31.51:10000/' // 榕
// host = 'http://192.168.31.51:10000/' // 榕
// host = 'http://192.168.31.116:10000/' // 赓
}

Loading…
Cancel
Save