Commit b55a01af by yuwen

Merge remote-tracking branch 'origin/1a86cad6' into yuwen

parents abcf2659 7e1bfb26
......@@ -67,10 +67,10 @@ export default {
.close {
cursor: pointer;
position: fixed;
top: 180px;
right: 330px;
width: 35px;
height: 33px;
top: 155px;
right: 315px;
width: 40px;
height: 40px;
z-index: 1;
// background: url('../../../static/images/close.png') no-repeat left top;
}
......@@ -78,9 +78,10 @@ export default {
.content {
position: relative;
width: 100%;
height: 100%;
width: 1352px;
height: 792px;
z-index: 0;
overflow: hidden;
}
}
}
......
<template>
<div class="student">
<img src='../../static/images/classStudent/1.png' />
<img class="img1" src='../../static/images/classStudent/1.png' />
<img class="img2" @click="change" src="../../static/images/class3/back.png" />
</div>
</template>
<script>
export default {
methods: {
change () {
this.$router.back(-1)
}
}
}
</script>
<style>
<style lang="less" scoped>
.student{
width: 1920px;
height: 1080px;
margin:0 auto;
position: relative;
.img1{
position: absolute;
width: 100%;
height: 100%;
}
.img2{
position: absolute;
top:50px;
right:25px;
width: 83px;
height: 35px;
cursor: pointer;
}
}
</style>
\ No newline at end of file
......@@ -48,10 +48,9 @@
<bullet-frame
:visible="visible"
@beforeClose="closePopup"
:layout="{width: '1102px', height: '792px'}"
>
<div>
<img :src="pics[currIndex]" />
<img class='bulletImg' :src="pics[currIndex]" />
</div>
</bullet-frame>
</div>
......@@ -147,6 +146,9 @@ export default {
* @method Search 查询更多
*/
Search () {
// if (this.studentName === '小王') {
// this.$router.push({path: '/student'})
// }
this.$router.push({path: '/student'})
}
}
......@@ -205,18 +207,18 @@ export default {
width: 830px;
height: 70px;
display: flex;
padding:16px 0px 0px 19px;
background: url('@{imagePath}kuang.png') no-repeat center;
background-size: 100% 100%;
border: springgreen 1px solid;
.select-item {
position: relative;
width: 140px;
width: 130px;
height: 32px;
margin-right: 16px;
margin-right: 13px;
&.student-name {
width: 162px;
width: 222px;
padding: 2px 10px 5px;
background: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, 0.6);
......@@ -238,7 +240,7 @@ export default {
}
.search {
width: 73px;
width: 125px;
height: 32px;
background-color: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, .6);
......@@ -252,5 +254,10 @@ export default {
}
}
}
.bulletImg{
width: 1428px;
height: 870px;
margin:-27px 0px 0px -40px;
}
</style>
\ No newline at end of file
<template>
<div class="growthRecord">
<div class="content">
<div class="growthRecord-top">
<div class="loge" @click="loge"></div>
<div class="tab">
<div class="item">
<img src="../../static/images/growthRecord/growactive.png" alt="">
</div>
<div class="item" @click="progress">
<img src="../../static/images/growthRecord/progress.png" alt="">
</div>
<div class="item" @click="safety">
<img src="../../static/images/growthRecord/safety.png" alt="">
</div>
</div>
</div>
<div class="growthRecord-center">
<div class="grade">
<swiper :options="swiperOption" class="swipers" ref="goodSwiper">
<swiper-slide v-for="(item, l) in monitoringData" :key="l">
<div class="items" >
<img :src="item" alt="">
</div>
</swiper-slide>
</swiper>
</div>
<div class="grades">
<div class="gradethree" @click="threegrade"></div>
<div class="gradesix" @click="sixgrade"></div>
</div>
</div>
<div class="growthRecord-bottom">
<div class="item" @click="primary">
<img src="../../static/images/growthRecord/primary.png" alt="">
</div>
<div class="item" @click="junior">
<img src="../../static/images/growthRecord/junior.png" alt="">
</div>
</div>
</div>
</div>
</template>
<script>
import grade1 from '../../static/images/growthRecord/1.png'
import grade2 from '../../static/images/growthRecord/2.png'
import grade3 from '../../static/images/growthRecord/3.png'
import grade4 from '../../static/images/growthRecord/4.png'
import grade5 from '../../static/images/growthRecord/5.png'
import grade6 from '../../static/images/growthRecord/6.png'
import grade7 from '../../static/images/growthRecord/7.png'
import grade8 from '../../static/images/growthRecord/8.png'
import grade9 from '../../static/images/growthRecord/9.png'
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import 'swiper/dist/css/swiper.css'
export default {
data () {
return {
monitoringData: [grade1, grade2, grade3, grade4, grade5, grade6, grade7, grade8, grade9],
swiperOption: {
autoplay: {
delay: 5000,
disableOnInteraction: false
},
spaceBetween: 10,
loop: true,
speed: 500
}
}
},
components: {
swiper,
swiperSlide
},
methods: {
loge () {
},
// 教师发展
progress () {
},
// 安全场景
safety () {
this.$router.push('/safety')
},
// 三年级
threegrade () {
this.$router.push('/class3')
},
// 六年级
sixgrade () {
this.$router.push('/sixthForm')
},
// 小学
primary () {
this.$router.push('/primary')
},
// 初中
junior () {
this.$router.push('/junior')
}
}
}
</script>
<style lang="less" scoped>
.growthRecord{
width: 1920px;
height: 1080px;
margin:0 auto;
background: url('../../static/images/growthRecord/backurl.jpg') no-repeat left top;
.content{
.growthRecord-top{
width: 100%;
height: 77px;
display: flex;
justify-content: space-between;
.loge{
cursor: pointer;
width: 377px;
height: 76px;
}
.tab{
display: flex;
justify-content: flex-end;
.item{
cursor: pointer;
padding-top: 41px;
width: 126px;
height: 37px;
margin-right: 16px;
margin-left: 12px;
img{
width: 126px;
height: 37px;
}
&:nth-child(1){
padding-top: 0px;
width: 167px;
height: 71px;
margin-top: 25px;
margin-right: 0px;
img{
width: 100%;
height: 100%;
}
}
}
}
}
.growthRecord-center{
width: 100%;
height: 924px;
padding: 26px 0 0 46px;
.grade{
width: 334px;
height: 431px;
.swipers{
width: 334px;
height: 431px;
.items{
img{
width: 334px;
height: 431px;
}
}
}
}
.grades{
width: 100%;
height: 418px;
display: flex;
.gradethree{
width: 120px;
height: 100%;
margin-left: 457px;
cursor: pointer;
}
.gradesix{
cursor: pointer;
width: 120px;
height: 100%;
margin-left: 465px;
}
}
}
.growthRecord-bottom{
width: 100%;
height: 50px;
text-align: center;
display: flex;
align-items: center;
justify-content: center;
.item{
cursor: pointer;
width: 225px;
height: 50px;
img{
width: 225px;
height: 50px;
}
&:nth-child(1){
margin-right: 297px;
}
}
}
}
}
</style>
<template>
<div class="junior-page">
<div class="header">
<div class="loge"></div>
<div class="back" @click="back"></div>
</div>
</div>
</template>
<script>
export default {
methods: {
back () {
this.$router.push('/growth')
}
}
}
</script>
<style lang="less" scoped>
.junior-page{
width: 1920px;
height: 1080px;
margin: 0 auto;
background: url('../../static/images/junior.png') no-repeat left top;
.header{
width: 100%;
height: 77px;
display: flex;
justify-content: space-between;
.loge{
width: 377px;
height: 76px;
}
.back{
cursor: pointer;
display: flex;
justify-content: flex-end;
height: 35px;
width: 83px;
margin: 15px;
margin-top: 63px;
background: url('../../static/images/back.png') no-repeat left top;
}
}
}
</style>
<template>
<div class="primary-page">
<div class="header">
<div class="loge"></div>
<div class="back" @click="back"></div>
</div>
</div>
</template>
<script>
export default {
methods: {
back () {
this.$router.push('/growth')
}
}
}
</script>
<style lang="less" scoped>
.primary-page{
width: 1920px;
height: 1080px;
margin:0 auto;
background: url('../../static/images/primary.png') no-repeat left top;
.header{
width: 100%;
height: 77px;
display: flex;
justify-content: space-between;
.loge{
width: 377px;
height: 76px;
}
.back{
cursor: pointer;
display: flex;
justify-content: flex-end;
height: 35px;
width: 83px;
margin: 15px;
margin-top: 63px;
background: url('../../static/images/back.png') no-repeat left top;
}
}
}
</style>
<template>
<div class="safety-page">
<div class="header">
<div class="loge" @click="loge"></div>
<div class="tab">
<div class="item" @click="grow">
<img src="../../static/images/growthRecord/grow.png" alt="">
</div>
<div class="item" @click="progress">
<img src="../../static/images/growthRecord/progress.png" alt="">
</div>
<div class="item" @click="safety">
<img src="../../static/images/growthRecord/safetyactive.png" alt="">
</div>
</div>
</div>
</div>
</template>
<script>
export default {
methods: {
loge () {
},
grow () {
this.$router.push('/growth')
},
// 教师发展
progress () {
},
// 安全场景
safety () {
}
}
}
</script>
<style lang="less" scoped>
.safety-page{
width: 1920px;
height: 1080px;
margin:0 auto;
background: url('../../static/images/safety/backurl.png') no-repeat left top;
.header{
width: 100%;
height: 77px;
background: url('../../static/images/safety/header.png') no-repeat left 12px;
display: flex;
justify-content: space-between;
.loge{
cursor: pointer;
width: 377px;
height: 76px;
margin-left: 16px;
background: url('../../static/images/safety/loge.png') no-repeat left bottom;
}
.tab{
display: flex;
justify-content: flex-end;
.item{
cursor: pointer;
padding-top: 41px;
width: 126px;
height: 37px;
margin-right: 16px;
margin-left: 12px;
img{
width: 126px;
height: 37px;
}
&:nth-child(2){
margin-right: 10px;
}
&:nth-child(3){
padding-top: 0px;
width: 167px;
height: 71px;
margin-top: 25px;
margin-left: 0px;
margin-right: 0px;
img{
width: 100%;
height: 100%;
}
}
}
}
}
}
</style>
// 导入页面名称
import Index from '@/pages/index.vue'
// 菊宝成长记
import growthRecord from '@/pages/growthRecord.vue'
// 初中教学课程
import safety from '@/pages/safety.vue'
// 小学教学课程
import primary from '@/pages/primary.vue'
// 初中教学课程
import junior from '@/pages/junior.vue'
// 三年级菊宝
import class3 from '@/pages/class3.vue'
// 三年级菊宝个人
......@@ -18,6 +26,22 @@ export default [
component: Index
},
{
path: '/growth',
component: growthRecord
},
{
path: '/safety',
component: safety
},
{
path: '/primary',
component: primary
},
{
path: '/junior',
component: junior
},
{
path: '/class3',
component: class3
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment