Skip to content

JuyuanPrimarySchool
JuyuanPrimarySchool
Commit 680a981f by yuwen
Options

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

parents 96c88be1 84859b5f
Showing with 57 additions and 21 deletions
index.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>菊园小学</title> <title>上海市洋泾菊园实验学校</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
......
package.json
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"lint": "eslint --ext .js --ext .jsx --ext .vue client/", "lint": "eslint --ext .js --ext .jsx --ext .vue client/",
"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/ widgets/ runner/", "lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/ widgets/ runner/",
"precommit": "npm run lint-fix", "precommit": "npm run lint-fix",
"init": "git submodule update --init --recursive && npm run update && npm install", "init": "git submodule update --init --recursive && npm run update",
"update": "git submodule update --recursive --remote --merge --force && npm install" "update": "git submodule update --recursive --remote --merge --force && npm install"
}, },
"author": "", "author": "",
......
src/pages/class3.vue
...@@ -31,11 +31,18 @@ ...@@ -31,11 +31,18 @@
/> />
</div> </div>
<div class="select-item student-name"> <div class="select-item student-name">
<input <select-list
placeholder="学生姓名" class="input"
title="学生姓名"
:list="studentNameList"
v-model="studentName" v-model="studentName"
@keyup.enter="Search" @keyup.enter="Search"
/> />
<!-- <input
placeholder="学生姓名"
v-model="studentName"
@keyup.enter="Search"
/> -->
</div> </div>
<div <div
class="search" class="search"
...@@ -106,8 +113,14 @@ export default { ...@@ -106,8 +113,14 @@ export default {
{name: '男'}, {name: '男'},
{name: '女'} {name: '女'}
], ],
// 老师姓名 // 学生姓名
studentName: '' studentName: {
name: ''
},
// 学科性别结果
studentNameList: [
{name: '顾雨辰'}
]
} }
}, },
methods: { methods: {
...@@ -224,20 +237,25 @@ export default { ...@@ -224,20 +237,25 @@ export default {
width: 222px; width: 222px;
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;
} // }
// }
.input{
margin:-2px 0px 0px -10px;
width: 224px;
height: 32px;
} }
} }
} }
......
src/pages/progress.vue
...@@ -12,13 +12,21 @@ ...@@ -12,13 +12,21 @@
</div> </div>
<!-- 老师姓名 --> <!-- 老师姓名 -->
<input class="teacher-name" placeholder="教师姓名" v-model="teacherName" /> <div class="select-item">
<select-item
placeholder="教师姓名"
:list="teacherList"
v-model="teacherName"
ref="teacherRef"
/>
</div>
<!-- 学科 --> <!-- 学科 -->
<div class="select-item"> <div class="select-item">
<select-item <select-item
placeholder="学科" placeholder="学科"
:list="currSubjectList" :list="currSubjectList"
v-model="currSubject"
ref="subject" ref="subject"
/> />
</div> </div>
...@@ -27,6 +35,7 @@ ...@@ -27,6 +35,7 @@
<select-item <select-item
placeholder="年级" placeholder="年级"
:list="currGradeList" :list="currGradeList"
v-model="currGrade"
ref="grade" ref="grade"
/> />
</div> </div>
...@@ -91,8 +100,13 @@ export default { ...@@ -91,8 +100,13 @@ export default {
teacherName: '', teacherName: '',
teacherList: [{
name: '陈涛'
}],
currSubjectList: [], currSubjectList: [],
currGradeList: [], currGradeList: [],
currGrade: '',
// 学科列表 // 学科列表
selectLists: [{ selectLists: [{
...@@ -164,6 +178,7 @@ export default { ...@@ -164,6 +178,7 @@ export default {
name: '九年级' name: '九年级'
}] }]
}], }],
currSubject: '',
visible: false, visible: false,
...@@ -243,6 +258,7 @@ export default { ...@@ -243,6 +258,7 @@ export default {
chooseSchool (index = 0) { chooseSchool (index = 0) {
this.$refs.subject.currText = '' this.$refs.subject.currText = ''
this.$refs.grade.currText = '' this.$refs.grade.currText = ''
this.$refs.teacherRef.currText = ''
this.currTypesIndex = index this.currTypesIndex = index
const { subject = [], grade = [] } = this.selectLists[index] || {} const { subject = [], grade = [] } = this.selectLists[index] || {}
...@@ -252,7 +268,8 @@ export default { ...@@ -252,7 +268,8 @@ export default {
}, },
search () { search () {
if (this.teacherName === '陈涛') { // 小学 / 一年级 / 语文 / 陈涛
if (this.currTypesIndex === 0 && this.teacherName === '陈涛' && this.currGrade === '一年级' && this.currSubject === '语文') {
this.visible = true this.visible = true
} else { } else {
this.$message('暂无数据') this.$message('暂无数据')
......
src/pages/sixthFormStudent.vue
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
* @method edit 返回 * @method edit 返回
*/ */
edit () { edit () {
this.$router.push({path: '/growthRecord'}) this.$router.back()
}, },
/** /**
* @method Search 搜索 * @method Search 搜索
...@@ -348,6 +348,7 @@ export default { ...@@ -348,6 +348,7 @@ export default {
position: absolute; position: absolute;
top: 39px; top: 39px;
left: 1822px; left: 1822px;
cursor: pointer;
} }
} }
.bulletImg{ .bulletImg{
......
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