From 99713685c8210a66c35ae3c033d5ed58c200d0ba Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 31 May 2023 15:44:19 +0800
Subject: [PATCH] 学生调班，班级数据重新请求，使用过分析参数

---
 src/views/standard/analysis/index.vue | 23 +++++++++++++++++------
 src/views/standard/device/error.vue   |  2 +-
 src/views/standard/setUp/student.vue  | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
 src/views/standard/setUp/teacher.vue  |  8 ++++++++
 4 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/src/views/standard/analysis/index.vue b/src/views/standard/analysis/index.vue
index e6ebbbe..14ab168 100644
--- a/src/views/standard/analysis/index.vue
+++ b/src/views/standard/analysis/index.vue
@@ -55,7 +55,7 @@
             </p>
           </div>
         </li>
-        <li class="item" v-for="(item, index) in query.secGraClaSub">
+        <li class="item item2" v-for="(item, index) in query.secGraClaSub">
           <span class="s-txt">对比项{{ setBigNum(index) }}：</span>
           <div class="sel-box">
             <el-cascader
@@ -177,7 +177,7 @@ export default {
       this.query.startDay = formatDate(new Date(), "yyyy-MM-dd");
       this.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
     }
-    this.setDate(4)
+    this.setDate(4);
     this._QueryData();
   },
   methods: {
@@ -331,7 +331,7 @@ export default {
         this.$message.error(info);
       }
     },
-    // 查找班级
+    // 查找nian级
     async _QueryGradeList() {
       this.loading = true;
       const gradeList =
@@ -348,9 +348,6 @@ export default {
                 let gradeIds = [];
                 let children = item.gradeList.map((items) => {
                   gradeIds.push(items.grade);
-                  if (this.query.secGraClaSub.length < 10) {
-                    this.query.secGraClaSub.push([item.section, items.grade]);
-                  }
                   return {
                     value: items.grade,
                     label: items.gradeName,
@@ -399,6 +396,7 @@ export default {
       if (status === 0) {
         if (!!data.list) {
           if (this.role == "ROLE_XUEXIAO") {
+            this.query.secGraClaSub = [];
             data.list?.map((item) => {
               let subList = item.subjectNames?.map((items) => {
                 return {
@@ -422,6 +420,13 @@ export default {
                 }
               });
             }) || [];
+            this.gradeList.map((sec) => {
+              sec.gradeIds.map((items) => {
+                if (this.query.secGraClaSub.length < 10) {
+                  this.query.secGraClaSub.push([sec.value, items]);
+                }
+              });
+            });
           }
         }
       } else {
@@ -506,7 +511,10 @@ div::-webkit-scrollbar-thumb {
   }
 }
 .params-box {
+  display: flex;
+  flex-wrap: wrap;
   .item {
+    width: 100%;
     display: flex;
     align-items: center;
     margin-bottom: 20px;
@@ -533,6 +541,9 @@ div::-webkit-scrollbar-thumb {
       }
     }
   }
+  .item2 {
+    width: 50%;
+  }
 }
 .chart-box {
   height: 600px;
diff --git a/src/views/standard/device/error.vue b/src/views/standard/device/error.vue
index cde51c6..32aae1f 100644
--- a/src/views/standard/device/error.vue
+++ b/src/views/standard/device/error.vue
@@ -75,7 +75,7 @@
         <el-table-column label="操作" align="center" width="100"
           ><template slot-scope="scoped">
             <el-link
-              :disabled="scoped.row.abnormalRemark"
+              :disabled="!!scoped.row.abnormalRemark"
               @click="openDia(scoped.row)"
               >处理</el-link
             ></template
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index c68a4b8..57b41b6 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -56,7 +56,7 @@
           placeholder="学生状态"
         >
           <el-option label="正常" :value="0"></el-option>
-          <el-option label="未分配" :value="1"></el-option>
+          <el-option label="未分配" :value="-1"></el-option>
           <el-option label="已毕业" :value="2"></el-option>
         </el-select>
         <el-input
@@ -85,6 +85,12 @@
         </el-input>
       </div>
     </div>
+    <p class="total" v-if="studentList.length && !query.grade">
+      共筛选出{{ studentList.length }}名学生。
+    </p>
+    <p class="total" v-if="getStuTotal && query.grade">
+      共筛选出{{ getStuTotal }}名学生。
+    </p>
     <div class="page-content">
       <div class="stu-box">
         <div class="stu-list" v-show="query.grade">
@@ -102,18 +108,10 @@
           </ul>
         </div>
         <div class="stu-detail" v-loading="loading">
-          <div class="stu-detail-tit">
-            <p class="total" v-if="studentList.length">
-              共筛选出{{ studentList.length }}名学生。
-            </p>
-            <div
-              class="clazz-detail"
-              v-if="clazzDetail.stationSn && query.grade"
-            >
-              <p>基站SN：{{ clazzDetail.stationSn }}</p>
-              <p>配对码：{{ clazzDetail.pairingCode }}</p>
-              <p>频点：{{ clazzDetail.frequency }}</p>
-            </div>
+          <div class="clazz-detail" v-if="clazzDetail.stationSn && query.grade">
+            <p>基站SN：{{ clazzDetail.stationSn }}</p>
+            <p>配对码：{{ clazzDetail.pairingCode }}</p>
+            <p>频点：{{ clazzDetail.frequency }}</p>
           </div>
           <ul class="s-ul">
             <li
@@ -210,7 +208,7 @@
           <span>{{ formClassTrack.studentName }}</span>
         </el-form-item>
         <el-form-item label="当前班级：">
-           <span>{{ formClassTrack.className }}</span>
+          <span>{{ formClassTrack.className }}</span>
         </el-form-item>
         <el-form-item label="历史班级：">
           <p v-for="item in formClassTrack.classList">
@@ -368,6 +366,14 @@ export default {
       },
     };
   },
+  computed: {
+    getStuTotal: function () {
+      let num = this.classList.reduce((pre, cur) => {
+        return (pre += cur.studentCount);
+      }, 0);
+      return num;
+    },
+  },
   async created() {
     this.code = localStorage.getItem("csCode") || "";
     this.role =
@@ -458,11 +464,17 @@ export default {
     },
     //学生调班弹窗
     openChangeClazz(obj) {
+      if (!this.query.grade) {
+        this._QueryClazz(obj.grade);
+        this.formStuCla.classId = "";
+      } else {
+        this.formStuCla.classId = this.classList[0].id;
+      }
+
       this.formStuCla.studentId = obj.id;
-      this.formStuCla.className = obj.className
+      this.formStuCla.className = obj.className;
       this.formStuCla.studentName = obj.studentName;
       this.formStuCla.studentCode = obj.studentCode;
-      this.formStuCla.classId = obj.classId;
       this.formStuCla.oldClassId = obj.classId;
       this.diaChangeClass = true;
     },
@@ -526,8 +538,6 @@ export default {
       this.query.classId = "";
       this.query.studentName = "";
       this.query.studentCode = "";
-      this.classList = [];
-      this.studentList = [];
       await this._QueryClass(val);
       this._QueryData(3);
     },
@@ -581,6 +591,7 @@ export default {
     async _QueryData(type) {
       let query = this.serQuery(type);
       this.loading = true;
+      this.studentList = [];
       const { data, status, info } = await this.$request.studentList({
         ...query,
       });
@@ -609,6 +620,7 @@ export default {
     },
     async _QueryClass(value) {
       this.loading = true;
+      this.classList = [];
       const { data, status, info } = await this.$request.schoolClassList({
         grade: value || this.query.grade,
       });
@@ -623,6 +635,18 @@ export default {
         this.$message.error(info);
       }
     },
+    async _QueryClazz(value) {
+      this.classList = [];
+      const { data, status, info } = await this.$request.schoolClassList({
+        grade: value,
+      });
+      if (status === 0) {
+        this.classList = (data.list && [...data?.list]) || [];
+        this.formStuCla.classId = this.classList[0].id;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downExcel() {
       this.loadingDown = true;
       let { data, info, status } =
@@ -653,6 +677,11 @@ export default {
   color: #999;
   margin-bottom: 10px;
 }
+.total {
+  padding: 0 20px 10px;
+  font-size: 14px;
+  color: #666;
+}
 .stu-box {
   display: flex;
   background: #f8f8f8;
@@ -732,15 +761,11 @@ export default {
       display: flex;
       justify-content: space-between;
     }
-    .total {
-      padding: 15px 12px;
-      font-size: 14px;
-      color: #666;
-    }
+
     .s-ul {
       display: flex;
       flex-wrap: wrap;
-      padding-left: 20px;
+      padding: 12px 0 0 20px;
       .s-li {
         position: relative;
         box-shadow: 2px 2px 5px #7f7f7f;
@@ -806,7 +831,7 @@ export default {
   }
   .clazz-detail {
     display: flex;
-    padding: 12px 12px 12px 20px;
+    padding: 12px 12px 0 20px;
     p {
       margin-right: 16px;
       color: #666;
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index 1106931..4ae9123 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -98,6 +98,9 @@
         >
       </div>
     </div>
+    <p class="total" v-if="teacherList.length">
+      共筛选出{{ teacherList.length }}名教师。
+    </p>
     <div class="page-content">
       <el-empty
         :image-size="100"
@@ -921,6 +924,11 @@ export default {
 .page-content {
   padding: 0 20px 20px;
 }
+.total {
+  padding: 0 20px 10px;
+  font-size: 14px;
+  color: #666;
+}
 .teacher-box {
   display: flex;
   background: #f8f8f8;
--
libgit2 0.21.4