From 5e2e009a1f43917949cb40255c7b67160e5d9251 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Wed, 19 Apr 2023 15:36:05 +0800
Subject: [PATCH] 基站筛选条件显示问题，归档文本替换

---
 src/views/standard/card/index.vue    |  4 ++--
 src/views/standard/device/index.vue  | 10 ++++++++++
 src/views/standard/setUp/school.vue  |  3 +++
 src/views/standard/setUp/student.vue |  2 +-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 18de83c..cd7fc63 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -9,7 +9,7 @@
     <div class="page-content">
       <div class="answer-header">
         <div class="sel-box">
-          <template v-if="role == 'ROLE_XUEXIAO'">
+          <!-- <template v-if="role == 'ROLE_XUEXIAO'">
             <el-cascader
               @change="(page = 1), _QueryData(1)"
               size="small"
@@ -21,7 +21,7 @@
               :props="props"
               :show-all-levels="false"
             ></el-cascader>
-          </template>
+          </template> -->
           <template v-if="role == 'ROLE_JITUAN'">
             <el-select
               class="sel2"
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 70c8bc6..8bbf6cb 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -261,6 +261,7 @@
                   v-model="query.sn"
                   class="input-with-select"
                   clearable
+                  @input.native="query.studentName=''"
                   @keyup.enter.native="_QueryData(true)"
                 >
                   <el-button
@@ -274,6 +275,7 @@
                   v-model="query.studentName"
                   class="input-with-select"
                   clearable
+                  @input.native="query.sn=''"
                   @keyup.enter.native="_QueryData(true)"
                 >
                   <el-button
@@ -1092,8 +1094,16 @@ export default {
       //整理传参
       let query = {};
       if (this.query.sn) {
+        this.query.classId = [];
+        this.query.onlineStatus = "";
+        this.query.type = "";
+        this.query.studentName = "";
         query.sn = this.query.sn;
       } else if (this.query.studentName) {
+        this.query.classId = [];
+        this.query.onlineStatus = "";
+        this.query.type = "";
+        this.query.sn = "";
         query.studentName = this.query.studentName;
       } else {
         if (this.type == 1) {
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index 7a34821..88745f8 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -636,6 +636,9 @@ export default {
         color: #667ffd;
       }
     }
+    .el-checkbox:last-of-type {
+      margin-right: 30px;
+    }
   }
 }
 .el-icon-plus {
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index d6d7141..b6cf311 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -296,7 +296,7 @@
       </div>
     </el-dialog>
     <el-dialog title="班级归档" :visible.sync="diaArchiving" width="400">
-      <p>注意该操作会将该班级进行归档操作，且不可撤销，请谨慎操作！</p>
+      <p>注意班级归档后，学生解除班级关系且相关老师任课信息将不存在，确认要将班级归档吗？</p>
       <div class="dialog-footer" slot="footer">
         <el-button type="danger" @click="archivingClass">确认归档</el-button>
         <el-button type="primary" @click="diaArchiving = false"
--
libgit2 0.21.4