Merge branch 'dev_product' of https://git.cloud.tencent.com/joylink/jl-nclient into dev_product

This commit is contained in:
fan 2019-09-25 13:05:10 +08:00
commit 5f7fe163d5
3 changed files with 9 additions and 97 deletions

View File

@ -28,7 +28,7 @@ export default {
.titleInner{ .titleInner{
display:inline-block; display:inline-block;
color: #fff; color: #fff;
font-size:30px; font-size:24px;
font-weight:bold; font-weight:bold;
} }
.logo{ .logo{

View File

@ -367,6 +367,7 @@ export const asyncRouter = [
path: '/design/home', path: '/design/home',
redirect: '/design/home/index', redirect: '/design/home/index',
component: Layout, component: Layout,
hidden: true,
meta: { meta: {
roles: [admin, user, userDesign] roles: [admin, user, userDesign]
}, },
@ -436,6 +437,7 @@ export const asyncRouter = [
i18n: 'router.mapManage', i18n: 'router.mapManage',
roles: [admin, mapCreater, userDesign] roles: [admin, mapCreater, userDesign]
}, },
hidden: true,
component: Layout, component: Layout,
children: [ children: [
{ {
@ -497,6 +499,7 @@ export const asyncRouter = [
{ {
path: '/lesson', path: '/lesson',
component: Layout, component: Layout,
hidden: true,
meta: { meta: {
i18n: 'router.lessaonManage', i18n: 'router.lessaonManage',
roles: [admin, lessonCreater, userDesign] roles: [admin, lessonCreater, userDesign]
@ -557,6 +560,7 @@ export const asyncRouter = [
{ {
path: '/script', path: '/script',
component: Layout, component: Layout,
hidden: true,
meta: { meta: {
roles: [admin, lessonCreater, user, userDesign] roles: [admin, lessonCreater, user, userDesign]
}, },
@ -835,6 +839,7 @@ export const asyncRouter = [
path: '/plan', path: '/plan',
redirect: '/plan/home', redirect: '/plan/home',
component: PlanMonitor, component: PlanMonitor,
hidden: true,
meta: { meta: {
roles: [admin, user, userDesign] roles: [admin, user, userDesign]
}, },
@ -862,6 +867,7 @@ export const asyncRouter = [
{ {
path: '/replay', path: '/replay',
component: Layout, component: Layout,
hidden: true,
meta: { meta: {
roles: [admin, userDesign] roles: [admin, userDesign]
}, },

View File

@ -1,97 +1,3 @@
<template> <template>
<el-card :style="{height: height+'px'}">
<div class="home-box" :style="{height: height+'px'}"> </template>
<el-scrollbar wrap-class="scrollbar-wrapper">
<h1 class="title">
城市轨道交通设计平台
<img :src="logo" alt="" class="logo-img">
</h1>
<div class="card-box">
<el-carousel :interval="4000" type="card" height="380px">
<el-carousel-item v-for="(item, index) in listImg" :key="index">
<img :src="item.src" alt="" height="100%" width="100%">
</el-carousel-item>
</el-carousel>
</div>
<div class="brief-box">{{ $t('demonstration.simulationSystemDescription') }}</div>
</el-scrollbar>
</div>
</el-card>
</template>
<script>
import logo from '@/assets/logo.png';
import home1 from '@/assets/home/home1.png';
import home2 from '@/assets/home/home2.png';
import home3 from '@/assets/home/demon1.jpg';
import home4 from '@/assets/home/tring1.png';
import home5 from '@/assets/home/tring4.jpg';
import home6 from '@/assets/home/demon2.jpg';
export default {
name: 'Home',
data() {
return {
listImg: [
{ src: home1 },
{ src: home2 },
{ src: home3 },
{ src: home4 },
{ src: home5 },
{ src: home6 }
],
logo: logo
};
},
computed: {
height() {
return this.$store.state.app.height - 50;
}
}
};
</script>
<style rel="stylesheet/scss" lang="scss" scoped>
@import "src/styles/mixin.scss";
/deep/ .el-carousel {
overflow: hidden;
}
.home-box {
padding: 15px 100px;
float: left;
width: 100%;
font-family: 'Microsoft YaHei';
.title {
font-size: 35px;
width: 100%;
text-align: center;
font-weight: 400;
margin-top: 55px;
border-bottom: 2px dashed #333;
padding-bottom: 15px;
margin-bottom: 70px;
position: relative;
.logo-img {
position: absolute;
right: 0;
top: 0;
width: 55px;
}
}
.card-box {
width: 100%;
padding: 0 50px;
}
.brief-box {
font-size: 18px;
text-indent: 2em;
line-height: 32px;
padding: 40px 20px 0;
font-family: unset;
}
}
</style>