Merge branch 'yuwen' into '1a86cad6'

Yuwen

See merge request !33

src/pages/sixthFormStudent.vue

@@ -27,11 +27,11 @@
                     v-model="sexRes"
                 />
             </div>
-            <div class="select-item student-name">
-                <input
-                    placeholder="学生姓名"
-                    v-model="studentName"
-                    @keyup.enter="Search"
+            <div class="select-item">
+                <select-list
+                    title="学生姓名"
+                    :list="studentlist"
+                    v-model="nameRes"
                 />
             </div>
             <div
@@ -86,12 +86,10 @@ export default {
             },
             // 年级选择结果
             gradeList: [
-                {name: '一年级'},
-                {name: '二年级'},
-                {name: '三年级'},
-                {name: '四年级'},
-                {name: '五年级'},
-                {name: '六年级'}
+                {name: '六年级'},
+                {name: '七年级'},
+                {name: '八年级'},
+                {name: '九年级'}
             ],
             // 选择班级
             classRes: {
@@ -115,8 +113,14 @@ export default {
                 {name: '男'},
                 {name: '女'}
             ],
-            // 老师姓名
-            studentName: '',
+            // 选择学生
+            nameRes: {
+                name: ''
+            },
+            // 学生姓名选择结果
+            studentlist: [
+                {name: '沈凡婷'}
+            ],
             visible: false,
             currIndex: 999,
             pics: [
@@ -195,13 +199,13 @@ export default {
         * @method edit 返回
         */
         edit () {
-            this.$router.back()
+            this.$router.push({path: '/growthRecord'})
         },
         /**
         * @method Search  搜索
         */
         Search () {
-            if (this.gradeRes.name === '六年级' && this.classRes.name === '六班' && this.sexRes.name === '女' && this.studentName === '沈凡婷') {
+            if (this.gradeRes.name === '六年级' && this.classRes.name === '六班' && this.sexRes.name === '女' && this.nameRes.name === '沈凡婷') {
                 this.$router.push({path: '/growthPer'})
             } else {
                 this.$message('暂无数据')
@@ -345,7 +349,6 @@ export default {
         position: absolute;
         top: 39px;
         left: 1822px;
-        cursor: pointer;
     }
 }
 .bulletImg{