Commit 0ca11cc2a71fe5e9156943cac1d7cba8851a9c08

Authored by 梁保满
1 parent ec6394d1

学段参数调整,发卡记录类型增加

src/utils/index.js
... ... @@ -618,8 +618,35 @@ export function setGradeName(num) {
618 618 case 16:
619 619 txt = "大四";
620 620 break;
  621 + case 51:
  622 + txt = "一年级";
  623 + break;
  624 + case 52:
  625 + txt = "二年级";
  626 + break;
  627 + case 53:
  628 + txt = "三年级";
  629 + break;
  630 + case 54:
  631 + txt = "四年级";
  632 + break;
  633 + case 55:
  634 + txt = "五年级";
  635 + break;
  636 + case 56:
  637 + txt = "六年级";
  638 + break;
  639 + case 57:
  640 + txt = "七年级";
  641 + break;
  642 + case 58:
  643 + txt = "八年级";
  644 + break;
  645 + case 59:
  646 + txt = "九年级";
  647 + break;
621 648 default:
622   - txt = "未知";
  649 + txt = "其他";
623 650 break;
624 651 }
625 652 return txt;
... ...
src/views/standard/card/index.vue
... ... @@ -47,6 +47,7 @@
47 47 <el-option label="全部" value=""></el-option>
48 48 <el-option label="发卡" :value="0"></el-option>
49 49 <el-option label="补卡" :value="1"></el-option>
  50 + <el-option label="换班" :value="2"></el-option>
50 51 </el-select>
51 52 <div class="d1">
52 53 <el-date-picker
... ... @@ -136,7 +137,13 @@
136 137 ></el-table-column>
137 138 <el-table-column align="center" label="类型">
138 139 <template slot-scope="scope">
139   - {{ scope.row.operationType == 0 ? "发卡" : "补卡" }}
  140 + {{
  141 + scope.row.operationType == 0
  142 + ? "发卡"
  143 + : scope.row.operationType == 1
  144 + ? "补卡"
  145 + : "换班"
  146 + }}
140 147 </template></el-table-column
141 148 >
142 149 <el-table-column align="center" label="描述">
... ... @@ -303,14 +310,14 @@ export default {
303 310 if (type == 1) {
304 311 this.query.studentCode = "";
305 312 this.query.studentName = "";
306   - query = {...this.query}
  313 + query = { ...this.query };
307 314 query.classId = this.query.classId[1] ? this.query.classId[1] : "";
308 315 } else if (type == 2) {
309   - this.query = {...defauleQuery,studentName:this.query.studentName}
310   - query = { ...this.query }
  316 + this.query = { ...defauleQuery, studentName: this.query.studentName };
  317 + query = { ...this.query };
311 318 } else if (type == 3) {
312   - this.query = {...defauleQuery,studentCode:this.query.studentCode}
313   - query = { ...this.query }
  319 + this.query = { ...defauleQuery, studentCode: this.query.studentCode };
  320 + query = { ...this.query };
314 321 } else {
315 322 query = { ...this.query };
316 323 query.classId = this.query.classId[1] ? this.query.classId[1] : "";
... ...
src/views/standard/setUp/student.vue
... ... @@ -143,7 +143,7 @@
143 143 {{ item.studentName }}
144 144 </p>
145 145 <p class="p2" v-if="!query.classId">
146   - {{ getGradeName(item.grade) }}﹒{{ item.className }}
  146 + {{ item.gradeName }}﹒{{ item.className }}
147 147 </p>
148 148 <p class="p1">答题器:{{ item.clickerSn || "--" }}</p>
149 149 <p class="p1">长学号:{{ item.studentCode }}</p>
... ...
src/views/standard/setUp/teacher.vue
... ... @@ -148,7 +148,7 @@
148 148 </el-popconfirm>
149 149 <div class="grade-item">
150 150 <p class="grade-name">
151   - {{ gradeName(item.grade) }}-{{ item.className }}
  151 + {{ item.gradeName }}-{{ item.className }}
152 152 </p>
153 153 <div class="grade-class">
154 154 <p>
... ... @@ -184,7 +184,7 @@
184 184 </el-popconfirm>
185 185 <div class="grade-item">
186 186 <p class="grade-name">
187   - {{ gradeName(item.grade) }}-{{ item.className }}({{
  187 + {{ item.gradeName }}-{{ item.className }}({{
188 188 item.subjectName
189 189 }})
190 190 </p>
... ... @@ -222,7 +222,7 @@
222 222 </el-popconfirm>
223 223 <div class="grade-item">
224 224 <p class="grade-name">
225   - {{ gradeName(item.grade) }}-{{ item.gradeName }}({{
  225 + {{ item.gradeName }}({{
226 226 item.subjectName
227 227 }})
228 228 </p>
... ...