From 86e478200d0788a40a0cd84aac84bf344a655361 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 7 Jun 2023 10:33:43 +0800
Subject: [PATCH] 科目添加删除操作,教师角色选择。学生班级信息

---
 src/assets/css/index.scss            | 13 +++++++++++++
 src/views/index/mainIndex.vue        |  3 +++
 src/views/standard/setUp/clazz.vue   |  2 ++
 src/views/standard/setUp/student.vue | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 src/views/standard/setUp/teacher.vue |  4 +++-
 5 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index 69c5286..6c688a4 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -179,6 +179,19 @@ ul {
   }
 }
 
+.cascader-clazz {
+  .el-cascader-menu{
+    .el-checkbox {
+      display: none;
+    }
+  }
+  .el-cascader-menu:nth-child(3){
+    .el-checkbox {
+      display: block;
+    }
+  }
+}
+
 @media screen and (max-width: 1500px) {
   .answer-box {
     .answer-s {
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 0fbbd39..e0337cd 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -158,6 +158,9 @@
               对{{ dataInfo.examCount }}套即时测答题记录分析。
             </p>
           </div>
+          <div class="text" v-else-if="item.path == '/down'">
+            <p class="p1">软件下载</p>
+          </div>
         </li>
       </template>
     </ul>
diff --git a/src/views/standard/setUp/clazz.vue b/src/views/standard/setUp/clazz.vue
index 779c330..31639d6 100644
--- a/src/views/standard/setUp/clazz.vue
+++ b/src/views/standard/setUp/clazz.vue
@@ -373,6 +373,7 @@ export default {
         value: this.subjectName,
         checked: false,
       });
+      this.subjects.push(this.subjectName);
       this.subjectNames.push(this.subjectName);
       this.subjectName = "";
     },
@@ -411,6 +412,7 @@ export default {
         this.$message.success(info);
         this.subjectList.splice(index, 1);
         this.subjects.splice(index, 1);
+        this.subjectNames.splice(index, 1);
         this._QueryData();
       } else {
         this.$message.error(info);
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index be611e1..d4c17fb 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -150,7 +150,22 @@
                   {{ item.studentName }}
                 </p>
                 <p class="p2" v-if="!query.classId">
-                  {{ item.gradeName }}﹒{{ item.className }}
+                  <template v-if="item.classList && item.classList.length">
+                    <template v-for="(clazz, index) in item.classList">
+                      <span v-if="index == 0">
+                        {{ clazz.gradeName }}﹒{{ clazz.className }}</span
+                      >
+                    </template></template
+                  >
+                  <template v-else>
+                    {{
+                      item.status == 0
+                        ? "未分配"
+                        : item.status == 2
+                        ? "已毕业"
+                        : ""
+                    }}
+                  </template>
                 </p>
                 <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
                 <p class="p1">长学号：{{ item.studentCode }}</p>
@@ -166,7 +181,12 @@
         </div>
       </div>
     </div>
-    <el-dialog :close-on-click-modal="false" title="学生调班" :visible.sync="diaChangeClass" width="400">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="学生调班"
+      :visible.sync="diaChangeClass"
+      width="400"
+    >
       <el-form
         class="form-box"
         ref="formStuCla"
@@ -213,7 +233,12 @@
         <el-button @click="diaChangeClass = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="调班轨迹" :visible.sync="diaChangeClassTrack" width="400">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="调班轨迹"
+      :visible.sync="diaChangeClassTrack"
+      width="400"
+    >
       <el-form
         :model="formClassTrack"
         label-width="160px"
@@ -235,7 +260,12 @@
         <el-button @click="diaChangeClassTrack = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="添加学生" :visible.sync="diaStu" width="400">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="添加学生"
+      :visible.sync="diaStu"
+      width="400"
+    >
       <el-form
         ref="formBox"
         class="form-box"
@@ -286,7 +316,12 @@
         <el-button @click="diaStu = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="学生答题器绑定" :visible.sync="diaUp" width="600">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="学生答题器绑定"
+      :visible.sync="diaUp"
+      width="600"
+    >
       <up-load
         id="downTeacher"
         :url="url"
@@ -578,8 +613,10 @@ export default {
         this.query.studentName = "";
         this.query.studentCode = "";
         if (this.query.grade == 80) {
+          this.query.classId = "";
           query.status = -1;
         } else if (this.query.grade == 81) {
+          this.query.classId = "";
           query.status = 2;
         } else {
           query.grade = this.query.grade;
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index aa16912..462ca27 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -279,6 +279,7 @@
       "
       :visible.sync="diaTeacher"
       width="400"
+      append-to-body
     >
       <el-form
         class="form-box"
@@ -360,13 +361,14 @@
             <el-cascader
               size="small"
               v-if="item.roleId == 7"
-              class="sel-t"
+              class="sel-t teacher-cascader"
               collapse
               clearable
               placeholder="选择年级-科目-班级"
               v-model="item.classId"
               :options="gradeSubListClass"
               :props="{ expandTrigger: 'hover', multiple: true }"
+              popperClass="cascader-clazz"
             ></el-cascader>
             <el-cascader
               size="small"
--
libgit2 0.21.4