Skip to content

JuyuanPrimarySchool
JuyuanPrimarySchool
Commit cc4c54b7 by zsh
Options

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

parents b628b848 56d1aee9
Showing with 183 additions and 120 deletions
src/components/BulletFrame/index.vue
......@@ -58,7 +58,7 @@ export default {
top: 0px;
right: 0px;
bottom: 0px;
background-color: rgba(0, 0, 0, 0.3);
background-color: rgba(0, 0, 0, 0.6);
display: flex;
justify-content: center;
align-items: center;
......@@ -68,16 +68,16 @@ export default {
// padding: 90px 30px 30px 30px;
position: relative;
background: radial-gradient(circle, #0D375F, #091F33);
border: 3px solid;
border-image: linear-gradient(0deg, #71BEF9, #1E5D92, #002D52, #1F5E93, #71BEF8) 3 3;
// border: 3px solid;
// border-image: linear-gradient(0deg, #71BEF9, #1E5D92, #002D52, #1F5E93, #71BEF8) 3 3;
.close {
cursor: pointer;
position: fixed;
top: 155px;
right: 315px;
width: 40px;
height: 40px;
top: 145px;
right: 395px;
width: 80px;
height: 80px;
z-index: 1;
// background: url('../../../static/images/close.png') no-repeat left top;
}
......@@ -88,7 +88,7 @@ export default {
width: 1352px;
height: 792px;
z-index: 0;
overflow: hidden;
// overflow: hidden;
}
}
}
......
src/pages/class3.vue
......@@ -148,10 +148,10 @@ export default {
* @method Search 查询更多
*/
Search () {
// if (this.studentName === '小王') {
// this.$router.push({path: '/student'})
// }
this.$router.push({path: '/student'})
if (this.studentName === '顾雨辰' && this.gradeRes.name === '三年级' && this.classRes.name === '四班' && this.sexRes.name === '女') {
this.$router.push({path: '/student'})
}
this.$message('暂无数据')
}
}
......
src/pages/growth.vue
<template>
<div class="grow"></div>
<div class="grow">
<div class="edit" @click="edit1"></div>
</div>
</template>
<script>
export default {
data () {
return {
}
},
methods: {
/**
* @method edit1 返回
*/
edit1 () {
this.$router.back('/sixthForm')
}
}
}
</script>
<style lang="less" scoped>
......@@ -12,5 +26,14 @@ export default {
height: 1080px;
background: url('../../static/images/sixthForm/grow.png') no-repeat center;
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>
src/pages/junior.vue
......@@ -39,7 +39,7 @@ export default {
height: 35px;
width: 83px;
margin: 15px;
margin-top: 63px;
margin-top: 45px;
background: url('../../static/images/back.png') no-repeat left top;
}
}
......
src/pages/primary.vue
......@@ -39,7 +39,7 @@ export default {
height: 35px;
width: 83px;
margin: 15px;
margin-top: 63px;
margin-top: 45px;
background: url('../../static/images/back.png') no-repeat left top;
}
}
......
src/pages/sixthFormStudent.vue
......@@ -45,23 +45,60 @@
>
搜索
</div>
<!-- 身心健康 -->
<img class="left-top" @click="healthy" src="../../static/images/sixthForm/btn.png" alt="">
<!-- 学业分析 -->
<img class="left-bottom" @click="study" src="../../static/images/sixthForm/btn.png" alt="">
<!-- 搜索 -->
<div class="research">
<div class="select-item">
<select-list
title="年级"
:list="gradeList"
v-model="gradeRes"
/>
</div>
<div class="select-item">
<select-list
title="班级"
:list="classList"
v-model="classRes"
/>
</div>
<div class="select-item">
<select-list
title="性别"
:list="sexList"
v-model="sexRes"
/>
</div>
<div class="select-item student-name">
<input
placeholder="学生姓名"
v-model="studentName"
@keyup.enter="Search"
/>
</div>
<div
class="search"
@click="Search"
>
搜索
</div>
</div>
<div class="right">
<div class="right-top" @click="integration"></div>
<div class="right-bottom">
<div class="title"></div>
<div class="swiper1">
<!-- 轮播图 -->
<swiper :options="swiperOption" v-if="activeImgs.length">
<swiper-slide class="swiper-slide" v-for="(item, key) in activeImgs" :key="key" >
<img :src=item />
</swiper-slide>
</swiper>
</div>
<div class="right-top" @click="integration"></div>
<div class="right-bottom">
<div class="title"></div>
<div class="swiper1">
<!-- 轮播图 -->
<swiper :options="swiperOption" v-if="activeImgs.length">
<swiper-slide class="swiper-slide" v-for="(item, key) in activeImgs" :key="key" >
<img :src=item />
</swiper-slide>
</swiper>
</div>
<div class="edit" @click="edit"></div>
</div>
<div class="edit" @click="edit"></div>
<bullet-frame
:visible="visible"
@beforeClose="closePopup"
......@@ -109,7 +146,10 @@ export default {
classList: [
{name: '一班'},
{name: '二班'},
{name: '三班'}
{name: '三班'},
{name: '四班'},
{name: '五班'},
{name: '六班'}
],
// 选择性别
sexRes: {
......@@ -206,7 +246,11 @@ export default {
* @method 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('暂无数据')
}
}
}
}
......@@ -220,7 +264,6 @@ export default {
padding-top: 20px;
width: 100%;
height: 100%;
.swiper-slide {
width: 393px !important;
height: 208px;
......@@ -250,108 +293,100 @@ export default {
.sixth-page{
width: 1920px;
height: 1080px;
overflow: hidden;
background: url('@{imagePath}bg.png') no-repeat center;
background: url('@{imagePath}bg.png') no-repeat left top;
margin: 0 auto;
overflow: hidden;
.left{
.left-top{
width: 96px;
height: 22px;
background: url('@{imagePath}btn.png') no-repeat;
position: absolute;
top: 111px;
left: 408px;
}
.left-bottom{
width: 96px;
height: 22px;
background: url('@{imagePath}btn.png') no-repeat;
position: absolute;
bottom: 271px;
left: 408px;
}
.left-top{
width: 96px;
height: 22px;
position: absolute;
top: 111px;
left: 408px;
}
.left-bottom{
width: 96px;
height: 22px;
background: url('@{imagePath}btn.png') no-repeat;
position: absolute;
bottom: 271px;
left: 408px;
}
.center{
.research{
width: 828px;
height: 70px;
background: url('@{imagePath}research.png') no-repeat;
position: absolute;
top: 736px;
left: 546px;
display: flex;
.select-item {
position: relative;
width: 140px;
height: 32px;
margin: 20px 16px 0 20px;
&.student-name {
width: 162px;
padding: 2px 10px 5px;
background: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, 0.6);
.research{
width: 828px;
height: 70px;
background: url('@{imagePath}research.png') no-repeat;
position: absolute;
top: 736px;
left: 546px;
display: flex;
.select-item {
position: relative;
width: 140px;
height: 32px;
margin: 20px 16px 0 20px;
&.student-name {
width: 162px;
padding: 2px 10px 5px;
background: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, 0.6);
> input {
width: 100%;
height: 100%;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #7AC6FA;
background: none;
> input {
width: 100%;
height: 100%;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #7AC6FA;
background: none;
&::-webkit-input-placeholder {
color: #7AC6FA;
}
&::-webkit-input-placeholder {
color: #7AC6FA;
}
}
}
}
.search {
width: 73px;
height: 32px;
background-color: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, .6);
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #7AC6FA;
line-height: 30px;
text-align: center;
cursor: pointer;
margin-top: 20px;
}
.search {
width: 73px;
height: 32px;
background-color: rgba(7, 32, 65, 0.3);
border: 1px solid rgba(73, 133, 217, .6);
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #7AC6FA;
line-height: 30px;
text-align: center;
cursor: pointer;
margin-top: 20px;
}
}
.right{
.right-top{
width: 96px;
height: 22px;
background: url('@{imagePath}btn.png') no-repeat;
position: absolute;
top: 110px;
left: 1798px;
}
.right-bottom{
position: absolute;
top: 821px;
left: 1406px;
.title{
width: 152px;
height: 18px;
background: url('@{imagePath}title.png');
}
}
.edit{
width: 83px;
height: 35px;
background: url('@{imagePath}return.png');
position: absolute;
top: 39px;
left: 1822px;
.right-top{
width: 96px;
height: 22px;
background: url('@{imagePath}btn.png') no-repeat;
position: absolute;
top: 110px;
left: 1798px;
}
.right-bottom{
position: absolute;
top: 821px;
left: 1406px;
.title{
width: 152px;
height: 18px;
background: url('@{imagePath}title.png');
}
}
.edit{
width: 83px;
height: 35px;
background: url('@{imagePath}return.png');
position: absolute;
top: 39px;
left: 1822px;
}
}
.bulletImg{
width: 1428px;
......
src/router/routes.js
......@@ -21,6 +21,7 @@ import situation from '@/pages/situation.vue'
// 教师发展
import progress from '@/pages/progress.vue'
import growthPer from '@/pages/growth.vue'
export default [
{
path: '/',
......@@ -69,5 +70,9 @@ export default [
{
path: '/progress',
component: progress
},
{
path: '/growthPer',
component: growthPer
}
]
static/images/junior.png
static/images/junior.png

535 KB | W: | H:

static/images/junior.png

211 KB | W: | H:

static/images/junior.png
static/images/junior.png
static/images/junior.png
static/images/junior.png
  • 2-up
  • Swipe
  • Onion skin
static/images/safety/backurl.png
static/images/safety/backurl.png

763 KB | W: | H:

static/images/safety/backurl.png

219 KB | W: | H:

static/images/safety/backurl.png
static/images/safety/backurl.png
static/images/safety/backurl.png
static/images/safety/backurl.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