Commit 4c88497e by wdc147

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

parents c249b74b 56d1aee9
<template> <template>
<div class="grow"></div> <div class="grow">
<div class="edit" @click="edit1"></div>
</div>
</template> </template>
<script> <script>
export default { export default {
data () {
return {
}
},
methods: {
/**
* @method edit1 返回
*/
edit1 () {
this.$router.back('/sixthForm')
}
}
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
...@@ -12,5 +26,14 @@ export default { ...@@ -12,5 +26,14 @@ export default {
height: 1080px; height: 1080px;
background: url('../../static/images/sixthForm/grow.png') no-repeat center; background: url('../../static/images/sixthForm/grow.png') no-repeat center;
margin: 0 auto; margin: 0 auto;
overflow: hidden;
.edit{
width: 83px;
height: 35px;
background: url('../../static/images/sixthForm/return.png') no-repeat;
position: absolute;
top: 39px;
left: 1822px;
}
} }
</style> </style>
<template> <template>
<div class="sixth-page"> <div class="sixth-page">
<div class="left"> <!-- 身心健康 -->
<!-- 身心健康 --> <img class="left-top" @click="healthy" src="../../static/images/sixthForm/btn.png" alt="">
<div class="left-top" @click="healthy"></div> <!-- 学业分析 -->
<!-- 学业分析 --> <img class="left-bottom" @click="study" src="../../static/images/sixthForm/btn.png" alt="">
<div class="left-bottom" @click="study"></div> <!-- 搜索 -->
</div> <div class="research">
<div class="center"> <div class="select-item">
<!-- 搜索 --> <select-list
<div class="research"> title="年级"
<div class="select-item"> :list="gradeList"
<select-list v-model="gradeRes"
title="年级" />
:list="gradeList" </div>
v-model="gradeRes" <div class="select-item">
/> <select-list
</div> title="班级"
<div class="select-item"> :list="classList"
<select-list v-model="classRes"
title="班级" />
:list="classList" </div>
v-model="classRes" <div class="select-item">
/> <select-list
</div> title="性别"
<div class="select-item"> :list="sexList"
<select-list v-model="sexRes"
title="性别" />
:list="sexList" </div>
v-model="sexRes" <div class="select-item student-name">
/> <input
</div> placeholder="学生姓名"
<div class="select-item student-name"> v-model="studentName"
<input @keyup.enter="Search"
placeholder="学生姓名" />
v-model="studentName" </div>
@keyup.enter="Search" <div
/> class="search"
</div> @click="Search"
<div >
class="search" 搜索
@click="Search"
>
搜索
</div>
</div> </div>
</div> </div>
<div class="right"> <div class="right-top" @click="integration"></div>
<div class="right-top" @click="integration"></div> <div class="right-bottom">
<div class="right-bottom"> <div class="title"></div>
<div class="title"></div> <div class="swiper1">
<div class="swiper1"> <!-- 轮播图 -->
<!-- 轮播图 --> <swiper :options="swiperOption" v-if="activeImgs.length">
<swiper :options="swiperOption" v-if="activeImgs.length"> <swiper-slide class="swiper-slide" v-for="(item, key) in activeImgs" :key="key" >
<swiper-slide class="swiper-slide" v-for="(item, key) in activeImgs" :key="key" > <img :src=item />
<img :src=item /> </swiper-slide>
</swiper-slide> </swiper>
</swiper>
</div>
</div> </div>
<div class="edit" @click="edit"></div>
</div> </div>
<bullet-frame <div class="edit" @click="edit"></div>
<bullet-frame
:visible="visible" :visible="visible"
@beforeClose="closePopup" @beforeClose="closePopup"
:layout="{width: '1102px', height: '792px'}" :layout="{width: '1102px', height: '792px'}"
...@@ -107,7 +101,10 @@ export default { ...@@ -107,7 +101,10 @@ export default {
classList: [ classList: [
{name: '一班'}, {name: '一班'},
{name: '二班'}, {name: '二班'},
{name: '三班'} {name: '三班'},
{name: '四班'},
{name: '五班'},
{name: '六班'}
], ],
// 选择性别 // 选择性别
sexRes: { sexRes: {
...@@ -204,21 +201,23 @@ export default { ...@@ -204,21 +201,23 @@ export default {
* @method Search 搜索 * @method Search 搜索
*/ */
Search () { Search () {
this.$router.push({path: '/growth'}) if (this.gradeRes.name === '六年级' && this.classRes.name === '六班' && this.sexRes.name === '女' && this.studentName === '沈凡婷') {
this.$router.push({path: '/growthPer'})
} else {
this.$message('暂无数据')
}
} }
} }
} }
</script> </script>
<style lang="less"> <style lang="less">
#swiper1 { #swiper1 {
widows: 500px; widows: 450px;
height: 208px; height: 258px;
.swiper-container { .swiper-container {
padding-top: 20px; padding-top: 20px;
width: 100%; width: 100%;
height: 100%; height: 100%;
.swiper-slide { .swiper-slide {
width: 393px !important; width: 393px !important;
height: 208px; height: 208px;
...@@ -246,107 +245,100 @@ export default { ...@@ -246,107 +245,100 @@ export default {
.sixth-page{ .sixth-page{
width: 1920px; width: 1920px;
height: 1080px; height: 1080px;
background: url('@{imagePath}bg.png') no-repeat center; background: url('@{imagePath}bg.png') no-repeat left top;
margin: 0 auto; margin: 0 auto;
verflow: hidden; overflow: hidden;
.left{ .left-top{
.left-top{ width: 96px;
width: 96px; height: 22px;
height: 22px; position: absolute;
background: url('@{imagePath}btn.png') no-repeat; top: 111px;
position: absolute; left: 408px;
top: 111px; }
left: 408px; .left-bottom{
} width: 96px;
.left-bottom{ height: 22px;
width: 96px; background: url('@{imagePath}btn.png') no-repeat;
height: 22px; position: absolute;
background: url('@{imagePath}btn.png') no-repeat; bottom: 271px;
position: absolute; left: 408px;
bottom: 271px;
left: 408px;
}
} }
.center{ .research{
.research{ width: 828px;
width: 828px; height: 70px;
height: 70px; background: url('@{imagePath}research.png') no-repeat;
background: url('@{imagePath}research.png') no-repeat; position: absolute;
position: absolute; top: 736px;
top: 736px; left: 546px;
left: 546px; display: flex;
display: flex; .select-item {
.select-item { position: relative;
position: relative; width: 140px;
width: 140px; height: 32px;
height: 32px; margin: 20px 16px 0 20px;
margin: 20px 16px 0 20px; &.student-name {
&.student-name { width: 162px;
width: 162px; padding: 2px 10px 5px;
padding: 2px 10px 5px; background: rgba(7, 32, 65, 0.3);
background: rgba(7, 32, 65, 0.3); border: 1px solid rgba(73, 133, 217, 0.6);
border: 1px solid rgba(73, 133, 217, 0.6);
> input { > input {
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #7AC6FA; color: #7AC6FA;
background: none; background: none;
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: #7AC6FA; color: #7AC6FA;
}
} }
} }
} }
}
.search { .search {
width: 73px; width: 73px;
height: 32px; height: 32px;
background-color: rgba(7, 32, 65, 0.3); background-color: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, .6); border: 1px solid rgba(73, 133, 217, .6);
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
font-weight: 400; font-weight: 400;
color: #7AC6FA; color: #7AC6FA;
line-height: 30px; line-height: 30px;
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
margin-top: 20px; margin-top: 20px;
}
} }
} }
.right{ .right-top{
.right-top{ width: 96px;
width: 96px; height: 22px;
height: 22px; background: url('@{imagePath}btn.png') no-repeat;
background: url('@{imagePath}btn.png') no-repeat; position: absolute;
position: absolute; top: 110px;
top: 110px; left: 1798px;
left: 1798px; }
} .right-bottom{
.right-bottom{ position: absolute;
position: absolute; top: 821px;
top: 821px; left: 1406px;
left: 1406px; .title{
.title{ width: 152px;
width: 152px; height: 18px;
height: 18px; background: url('@{imagePath}title.png');
background: url('@{imagePath}title.png');
}
}
.edit{
width: 83px;
height: 35px;
background: url('@{imagePath}return.png');
position: absolute;
top: 39px;
left: 1822px;
} }
} }
.edit{
width: 83px;
height: 35px;
background: url('@{imagePath}return.png');
position: absolute;
top: 39px;
left: 1822px;
}
} }
.bulletImg{ .bulletImg{
width: 1428px; width: 1428px;
......
...@@ -15,7 +15,7 @@ import student from '@/pages/class3-student.vue' ...@@ -15,7 +15,7 @@ import student from '@/pages/class3-student.vue'
// 六年级菊园学子 // 六年级菊园学子
import sixthForm from '@/pages/sixthFormStudent.vue' import sixthForm from '@/pages/sixthFormStudent.vue'
// 六年级菊园个人 // 六年级菊园个人
import growth from '@/pages/growth.vue' import growthPer from '@/pages/growth.vue'
export default [ export default [
{ {
path: '/', path: '/',
...@@ -54,7 +54,7 @@ export default [ ...@@ -54,7 +54,7 @@ export default [
component: sixthForm component: sixthForm
}, },
{ {
path: '/growth', path: '/growthPer',
component: growth component: growthPer
} }
] ]
static/images/sixthForm/grow.png

744 KB | W: | H:

static/images/sixthForm/grow.png

743 KB | W: | H:

static/images/sixthForm/grow.png
static/images/sixthForm/grow.png
static/images/sixthForm/grow.png
static/images/sixthForm/grow.png
  • 2-up
  • Swipe
  • Onion skin
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