Commit 86e478200d0788a40a0cd84aac84bf344a655361

Authored by 梁保满
1 parent 848333df

科目添加删除操作,教师角色选择。学生班级信息

src/assets/css/index.scss
@@ -179,6 +179,19 @@ ul { @@ -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 @media screen and (max-width: 1500px) { 195 @media screen and (max-width: 1500px) {
183 .answer-box { 196 .answer-box {
184 .answer-s { 197 .answer-s {
src/views/index/mainIndex.vue
@@ -158,6 +158,9 @@ @@ -158,6 +158,9 @@
158 对{{ dataInfo.examCount }}套即时测答题记录分析。 158 对{{ dataInfo.examCount }}套即时测答题记录分析。
159 </p> 159 </p>
160 </div> 160 </div>
  161 + <div class="text" v-else-if="item.path == '/down'">
  162 + <p class="p1">软件下载</p>
  163 + </div>
161 </li> 164 </li>
162 </template> 165 </template>
163 </ul> 166 </ul>
src/views/standard/setUp/clazz.vue
@@ -373,6 +373,7 @@ export default { @@ -373,6 +373,7 @@ export default {
373 value: this.subjectName, 373 value: this.subjectName,
374 checked: false, 374 checked: false,
375 }); 375 });
  376 + this.subjects.push(this.subjectName);
376 this.subjectNames.push(this.subjectName); 377 this.subjectNames.push(this.subjectName);
377 this.subjectName = ""; 378 this.subjectName = "";
378 }, 379 },
@@ -411,6 +412,7 @@ export default { @@ -411,6 +412,7 @@ export default {
411 this.$message.success(info); 412 this.$message.success(info);
412 this.subjectList.splice(index, 1); 413 this.subjectList.splice(index, 1);
413 this.subjects.splice(index, 1); 414 this.subjects.splice(index, 1);
  415 + this.subjectNames.splice(index, 1);
414 this._QueryData(); 416 this._QueryData();
415 } else { 417 } else {
416 this.$message.error(info); 418 this.$message.error(info);
src/views/standard/setUp/student.vue
@@ -150,7 +150,22 @@ @@ -150,7 +150,22 @@
150 {{ item.studentName }} 150 {{ item.studentName }}
151 </p> 151 </p>
152 <p class="p2" v-if="!query.classId"> 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 </p> 169 </p>
155 <p class="p1">答题器:{{ item.clickerSn || "--" }}</p> 170 <p class="p1">答题器:{{ item.clickerSn || "--" }}</p>
156 <p class="p1">长学号:{{ item.studentCode }}</p> 171 <p class="p1">长学号:{{ item.studentCode }}</p>
@@ -166,7 +181,12 @@ @@ -166,7 +181,12 @@
166 </div> 181 </div>
167 </div> 182 </div>
168 </div> 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 <el-form 190 <el-form
171 class="form-box" 191 class="form-box"
172 ref="formStuCla" 192 ref="formStuCla"
@@ -213,7 +233,12 @@ @@ -213,7 +233,12 @@
213 <el-button @click="diaChangeClass = false">取 消</el-button> 233 <el-button @click="diaChangeClass = false">取 消</el-button>
214 </div> 234 </div>
215 </el-dialog> 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 <el-form 242 <el-form
218 :model="formClassTrack" 243 :model="formClassTrack"
219 label-width="160px" 244 label-width="160px"
@@ -235,7 +260,12 @@ @@ -235,7 +260,12 @@
235 <el-button @click="diaChangeClassTrack = false">关 闭</el-button> 260 <el-button @click="diaChangeClassTrack = false">关 闭</el-button>
236 </div> 261 </div>
237 </el-dialog> 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 <el-form 269 <el-form
240 ref="formBox" 270 ref="formBox"
241 class="form-box" 271 class="form-box"
@@ -286,7 +316,12 @@ @@ -286,7 +316,12 @@
286 <el-button @click="diaStu = false">取 消</el-button> 316 <el-button @click="diaStu = false">取 消</el-button>
287 </div> 317 </div>
288 </el-dialog> 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 <up-load 325 <up-load
291 id="downTeacher" 326 id="downTeacher"
292 :url="url" 327 :url="url"
@@ -578,8 +613,10 @@ export default { @@ -578,8 +613,10 @@ export default {
578 this.query.studentName = ""; 613 this.query.studentName = "";
579 this.query.studentCode = ""; 614 this.query.studentCode = "";
580 if (this.query.grade == 80) { 615 if (this.query.grade == 80) {
  616 + this.query.classId = "";
581 query.status = -1; 617 query.status = -1;
582 } else if (this.query.grade == 81) { 618 } else if (this.query.grade == 81) {
  619 + this.query.classId = "";
583 query.status = 2; 620 query.status = 2;
584 } else { 621 } else {
585 query.grade = this.query.grade; 622 query.grade = this.query.grade;
src/views/standard/setUp/teacher.vue
@@ -279,6 +279,7 @@ @@ -279,6 +279,7 @@
279 " 279 "
280 :visible.sync="diaTeacher" 280 :visible.sync="diaTeacher"
281 width="400" 281 width="400"
  282 + append-to-body
282 > 283 >
283 <el-form 284 <el-form
284 class="form-box" 285 class="form-box"
@@ -360,13 +361,14 @@ @@ -360,13 +361,14 @@
360 <el-cascader 361 <el-cascader
361 size="small" 362 size="small"
362 v-if="item.roleId == 7" 363 v-if="item.roleId == 7"
363 - class="sel-t" 364 + class="sel-t teacher-cascader"
364 collapse 365 collapse
365 clearable 366 clearable
366 placeholder="选择年级-科目-班级" 367 placeholder="选择年级-科目-班级"
367 v-model="item.classId" 368 v-model="item.classId"
368 :options="gradeSubListClass" 369 :options="gradeSubListClass"
369 :props="{ expandTrigger: 'hover', multiple: true }" 370 :props="{ expandTrigger: 'hover', multiple: true }"
  371 + popperClass="cascader-clazz"
370 ></el-cascader> 372 ></el-cascader>
371 <el-cascader 373 <el-cascader
372 size="small" 374 size="small"