Commit 86e478200d0788a40a0cd84aac84bf344a655361
1 parent
848333df
科目添加删除操作,教师角色选择。学生班级信息
Showing
5 changed files
with
63 additions
and
6 deletions
src/assets/css/index.scss
... | ... | @@ -179,6 +179,19 @@ ul { |
179 | 179 | } |
180 | 180 | } |
181 | 181 | |
182 | +.cascader-clazz { | |
183 | + .el-cascader-menu{ | |
184 | + .el-checkbox { | |
185 | + display: none; | |
186 | + } | |
187 | + } | |
188 | + .el-cascader-menu:nth-child(3){ | |
189 | + .el-checkbox { | |
190 | + display: block; | |
191 | + } | |
192 | + } | |
193 | +} | |
194 | + | |
182 | 195 | @media screen and (max-width: 1500px) { |
183 | 196 | .answer-box { |
184 | 197 | .answer-s { | ... | ... |
src/views/index/mainIndex.vue
src/views/standard/setUp/clazz.vue
... | ... | @@ -373,6 +373,7 @@ export default { |
373 | 373 | value: this.subjectName, |
374 | 374 | checked: false, |
375 | 375 | }); |
376 | + this.subjects.push(this.subjectName); | |
376 | 377 | this.subjectNames.push(this.subjectName); |
377 | 378 | this.subjectName = ""; |
378 | 379 | }, |
... | ... | @@ -411,6 +412,7 @@ export default { |
411 | 412 | this.$message.success(info); |
412 | 413 | this.subjectList.splice(index, 1); |
413 | 414 | this.subjects.splice(index, 1); |
415 | + this.subjectNames.splice(index, 1); | |
414 | 416 | this._QueryData(); |
415 | 417 | } else { |
416 | 418 | this.$message.error(info); | ... | ... |
src/views/standard/setUp/student.vue
... | ... | @@ -150,7 +150,22 @@ |
150 | 150 | {{ item.studentName }} |
151 | 151 | </p> |
152 | 152 | <p class="p2" v-if="!query.classId"> |
153 | - {{ item.gradeName }}﹒{{ item.className }} | |
153 | + <template v-if="item.classList && item.classList.length"> | |
154 | + <template v-for="(clazz, index) in item.classList"> | |
155 | + <span v-if="index == 0"> | |
156 | + {{ clazz.gradeName }}﹒{{ clazz.className }}</span | |
157 | + > | |
158 | + </template></template | |
159 | + > | |
160 | + <template v-else> | |
161 | + {{ | |
162 | + item.status == 0 | |
163 | + ? "未分配" | |
164 | + : item.status == 2 | |
165 | + ? "已毕业" | |
166 | + : "" | |
167 | + }} | |
168 | + </template> | |
154 | 169 | </p> |
155 | 170 | <p class="p1">答题器:{{ item.clickerSn || "--" }}</p> |
156 | 171 | <p class="p1">长学号:{{ item.studentCode }}</p> |
... | ... | @@ -166,7 +181,12 @@ |
166 | 181 | </div> |
167 | 182 | </div> |
168 | 183 | </div> |
169 | - <el-dialog :close-on-click-modal="false" title="学生调班" :visible.sync="diaChangeClass" width="400"> | |
184 | + <el-dialog | |
185 | + :close-on-click-modal="false" | |
186 | + title="学生调班" | |
187 | + :visible.sync="diaChangeClass" | |
188 | + width="400" | |
189 | + > | |
170 | 190 | <el-form |
171 | 191 | class="form-box" |
172 | 192 | ref="formStuCla" |
... | ... | @@ -213,7 +233,12 @@ |
213 | 233 | <el-button @click="diaChangeClass = false">取 消</el-button> |
214 | 234 | </div> |
215 | 235 | </el-dialog> |
216 | - <el-dialog :close-on-click-modal="false" title="调班轨迹" :visible.sync="diaChangeClassTrack" width="400"> | |
236 | + <el-dialog | |
237 | + :close-on-click-modal="false" | |
238 | + title="调班轨迹" | |
239 | + :visible.sync="diaChangeClassTrack" | |
240 | + width="400" | |
241 | + > | |
217 | 242 | <el-form |
218 | 243 | :model="formClassTrack" |
219 | 244 | label-width="160px" |
... | ... | @@ -235,7 +260,12 @@ |
235 | 260 | <el-button @click="diaChangeClassTrack = false">关 闭</el-button> |
236 | 261 | </div> |
237 | 262 | </el-dialog> |
238 | - <el-dialog :close-on-click-modal="false" title="添加学生" :visible.sync="diaStu" width="400"> | |
263 | + <el-dialog | |
264 | + :close-on-click-modal="false" | |
265 | + title="添加学生" | |
266 | + :visible.sync="diaStu" | |
267 | + width="400" | |
268 | + > | |
239 | 269 | <el-form |
240 | 270 | ref="formBox" |
241 | 271 | class="form-box" |
... | ... | @@ -286,7 +316,12 @@ |
286 | 316 | <el-button @click="diaStu = false">取 消</el-button> |
287 | 317 | </div> |
288 | 318 | </el-dialog> |
289 | - <el-dialog :close-on-click-modal="false" title="学生答题器绑定" :visible.sync="diaUp" width="600"> | |
319 | + <el-dialog | |
320 | + :close-on-click-modal="false" | |
321 | + title="学生答题器绑定" | |
322 | + :visible.sync="diaUp" | |
323 | + width="600" | |
324 | + > | |
290 | 325 | <up-load |
291 | 326 | id="downTeacher" |
292 | 327 | :url="url" |
... | ... | @@ -578,8 +613,10 @@ export default { |
578 | 613 | this.query.studentName = ""; |
579 | 614 | this.query.studentCode = ""; |
580 | 615 | if (this.query.grade == 80) { |
616 | + this.query.classId = ""; | |
581 | 617 | query.status = -1; |
582 | 618 | } else if (this.query.grade == 81) { |
619 | + this.query.classId = ""; | |
583 | 620 | query.status = 2; |
584 | 621 | } else { |
585 | 622 | query.grade = this.query.grade; | ... | ... |
src/views/standard/setUp/teacher.vue
... | ... | @@ -279,6 +279,7 @@ |
279 | 279 | " |
280 | 280 | :visible.sync="diaTeacher" |
281 | 281 | width="400" |
282 | + append-to-body | |
282 | 283 | > |
283 | 284 | <el-form |
284 | 285 | class="form-box" |
... | ... | @@ -360,13 +361,14 @@ |
360 | 361 | <el-cascader |
361 | 362 | size="small" |
362 | 363 | v-if="item.roleId == 7" |
363 | - class="sel-t" | |
364 | + class="sel-t teacher-cascader" | |
364 | 365 | collapse |
365 | 366 | clearable |
366 | 367 | placeholder="选择年级-科目-班级" |
367 | 368 | v-model="item.classId" |
368 | 369 | :options="gradeSubListClass" |
369 | 370 | :props="{ expandTrigger: 'hover', multiple: true }" |
371 | + popperClass="cascader-clazz" | |
370 | 372 | ></el-cascader> |
371 | 373 | <el-cascader |
372 | 374 | size="small" | ... | ... |