From 5cfb0264c54052a4a0391814b35e832b7cfa961c Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 6 Jun 2023 14:49:51 +0800
Subject: [PATCH] 班级管理交互优化

---
 src/assets/css/index.scss                     | 33 +++++++++++++++++++++++++++++++++
 src/components/setAnswer.vue                  |  3 +--
 src/components/upload.vue                     |  1 +
 src/views/admin/account/index.vue             |  4 ++--
 src/views/admin/clientVersion/index.vue       |  2 +-
 src/views/examinationPaper/add.vue            | 12 +++++-------
 src/views/examinationPaper/edit.vue           |  7 +++----
 src/views/examinationPaper/index.vue          |  2 +-
 src/views/layout/header/header.vue            |  2 +-
 src/views/personal/dataSync/index.vue         |  2 +-
 src/views/personal/setUp/student.vue          |  6 +++---
 src/views/personal/test/analysis.vue          |  2 +-
 src/views/personal/test/index.vue             |  2 +-
 src/views/personal/userInfo/index.vue         |  4 ++--
 src/views/standard/card/index.vue             | 21 +++++++++++++++++++--
 src/views/standard/dataSync/index.vue         |  2 +-
 src/views/standard/device/error.vue           |  2 +-
 src/views/standard/device/index.vue           |  4 ++--
 src/views/standard/examinationPaper/add.vue   |  8 +++-----
 src/views/standard/examinationPaper/edit.vue  |  3 +--
 src/views/standard/examinationPaper/index.vue |  2 +-
 src/views/standard/setUp/account.vue          |  6 +++---
 src/views/standard/setUp/archived.vue         | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 src/views/standard/setUp/clazz.vue            | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
 src/views/standard/setUp/conglomerate.vue     |  8 ++++----
 src/views/standard/setUp/school.vue           |  4 ++--
 src/views/standard/setUp/student.vue          | 27 +++++++++++++++------------
 src/views/standard/setUp/teacher.vue          | 32 +++++++++++++++++++-------------
 src/views/standard/test/analysis.vue          |  2 +-
 src/views/standard/test/index.vue             |  2 +-
 30 files changed, 234 insertions(+), 102 deletions(-)

diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index 4b82c96..69c5286 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -80,6 +80,7 @@
 
 .answer-box {
   padding-top: 12px;
+
   .answer-s {
     display: inline-block;
     width: 30px;
@@ -91,6 +92,7 @@
     color: #333;
     text-align: center;
     line-height: 30px;
+    user-select: none;
 
     &.active {
       background: #5e78fa;
@@ -175,4 +177,35 @@ ul {
   &::-webkit-scrollbar {
     width: 0;
   }
+}
+
+@media screen and (max-width: 1500px) {
+  .answer-box {
+    .answer-s {
+      width: 24px !important;
+      height: 24px !important;
+      line-height: 24px !important;
+      margin: 0 5px 10px !important;
+    }
+  }
+
+  .question-box {
+    .el-button--mini.is-circle {
+      padding: 4px !important;
+    }
+  }
+
+  .sub-questions {
+    .qs-num {
+      width: 50px !important;
+    }
+
+    .qs-score {
+      width: 148px !important;
+    }
+
+    .qs-partScore {
+      width: 148px !important;
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 9e370aa..8292572 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -79,10 +79,9 @@
         >
       </div>
     </div>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="批量设置答案"
       :visible.sync="diaSetAns"
-      :close-on-click-modal="false"
       width="400"
       :modal-append-to-body="false"
     >
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 3c5f1d4..281e99f 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -79,6 +79,7 @@ export default {
       if (res && res.status == 0 ) {
         this.$message.success("上传成功");
         this.$emit("upSuccess",res);
+        this.$refs.upload.clearFiles()
       } else {
         this.$message.error(res.info);
       }
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
index e42994a..b4b4d62 100644
--- a/src/views/admin/account/index.vue
+++ b/src/views/admin/account/index.vue
@@ -161,7 +161,7 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog title="修改账号信息" :visible.sync="diaCount" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改账号信息" :visible.sync="diaCount" width="400">
       <el-form
         class="form-box"
         :model="formCount"
@@ -223,7 +223,7 @@
         <el-button @click="diaCount = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加账号" :visible.sync="diaAdd" width="400">
+    <el-dialog :close-on-click-modal="false" title="添加账号" :visible.sync="diaAdd" width="400">
       <el-form
         class="form-box"
         :model="formAddCount"
diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue
index 65c1b98..87fbe21 100644
--- a/src/views/admin/clientVersion/index.vue
+++ b/src/views/admin/clientVersion/index.vue
@@ -76,7 +76,7 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="添加账号"
       :visible.sync="diaAdd"
       v-if="diaAdd"
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 42bd558..0e3535c 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -114,7 +114,7 @@
           >
           <el-button type="primary" round @click="setStep1">下一步</el-button>
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="设置测验类型"
           :visible.sync="dialogVisible"
           width="500px"
@@ -445,10 +445,9 @@
             >下一步</el-button
           >
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="添加大题"
           :visible.sync="addQuestionVisible"
-          :close-on-click-modal="false"
           width="600px"
         >
           <div class="dia-content">
@@ -765,10 +764,9 @@
             </li>
           </ul>
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="批量设置答案"
           :visible.sync="diaSetAns"
-          :close-on-click-modal="false"
           width="400"
           :modal-append-to-body="false"
         >
@@ -862,7 +860,7 @@
           <el-button type="primary" round @click="save">保存</el-button>
         </div>
       </div>
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
         :visible.sync="dialogStem"
         v-if="dialogStem"
@@ -893,7 +891,7 @@
           <el-button @click="dialogStem = false">关闭弹窗</el-button>
         </div>
       </el-dialog>
-      <el-dialog title="题目打标" :visible.sync="dialogTag" width="500">
+      <el-dialog :close-on-click-modal="false" title="题目打标" :visible.sync="dialogTag" width="500">
         <div>
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="题目难度：">
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 5d8fa13..4a11dbc 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -310,9 +310,8 @@
         <el-button type="danger" plain round @click="linkBack">取消</el-button>
         <el-button type="primary" round @click="save">保存</el-button>
       </div>
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         title="批量设置答案"
-        :close-on-click-modal="false"
         :visible.sync="diaSetAns"
         width="400"
         :modal-append-to-body="false"
@@ -395,7 +394,7 @@
           <el-button @click="diaSetAns = false">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
         :visible.sync="dialogStem"
         v-if="dialogStem"
@@ -428,7 +427,7 @@
           <el-button @click="dialogStem = false">关闭弹窗</el-button>
         </div>
       </el-dialog>
-      <el-dialog title="题目打标" :visible.sync="dialogTag" width="500">
+      <el-dialog :close-on-click-modal="false" title="题目打标" :visible.sync="dialogTag" width="500">
         <div>
           <el-form ref="form" :model="stem" label-width="160px">
             <el-form-item label="题目难度：">
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 7813d32..e68dabe 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -192,7 +192,7 @@
       content="没有更多数据"
       :image-size="100"
     ></el-empty>
-    <el-dialog title="选择分享范围" :visible.sync="dialogVisible" width="400">
+    <el-dialog :close-on-click-modal="false" title="选择分享范围" :visible.sync="dialogVisible" width="400">
       <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
         <el-form-item prop="share" label="分享范围：">
           <el-radio-group v-model="shareForm.sharingType">
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index 24c0ab7..b0c4de8 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -104,7 +104,7 @@
       </ul>
     </el-header>
     <!-- <tabNav></tabNav> -->
-    <el-dialog title="修改密码" :visible.sync="diaPass" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改密码" :visible.sync="diaPass" width="400">
       <el-form
         v-loading="loading"
         ref="formPass"
diff --git a/src/views/personal/dataSync/index.vue b/src/views/personal/dataSync/index.vue
index 24cc1f0..f854cae 100644
--- a/src/views/personal/dataSync/index.vue
+++ b/src/views/personal/dataSync/index.vue
@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="" :visible.sync="dialogVisible" width="300" center>
+    <el-dialog :close-on-click-modal="false" title="" :visible.sync="dialogVisible" width="300" center>
       <el-result icon="success" title="上传成功"> </el-result>
       <el-descriptions title="" :column="1">
         <el-descriptions-item label="导入答题卡数量">{{tipData.paperNum}}</el-descriptions-item>
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
index c10a676..a9eaf35 100644
--- a/src/views/personal/setUp/student.vue
+++ b/src/views/personal/setUp/student.vue
@@ -90,7 +90,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="添加学生" :visible.sync="diaStu" width="400">
+    <el-dialog :close-on-click-modal="false" title="添加学生" :visible.sync="diaStu" width="400">
       <el-form
         ref="formBox"
         :model="formStu"
@@ -140,7 +140,7 @@
         <el-button @click="diaStu = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       :title="formClass.classId ? '修改班级' : '添加班级'"
       :visible.sync="diaClass"
       width="400"
@@ -194,7 +194,7 @@
         >
       </div>
     </el-dialog>
-    <el-dialog title="学生导入" :visible.sync="diaUp" width="600">
+    <el-dialog :close-on-click-modal="false" title="学生导入" :visible.sync="diaUp" width="600">
       <up-load :url="url" @upSuccess="upSuccess" fileName="学生模板">
         <p class="down-txt" slot="down">
           通过Excel名单导入学生模板，点击
diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue
index f8600eb..5f3a427 100644
--- a/src/views/personal/test/analysis.vue
+++ b/src/views/personal/test/analysis.vue
@@ -402,7 +402,7 @@
           >
         </div>
       </div>
-      <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+      <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
         <up-load :url="url" :examId="id" @upSuccess="upSuccess">
           <template slot="down">
             <p class="down-txt">
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index 0c300d3..aa6e0b3 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -412,7 +412,7 @@
         >
       </p>
     </div>
-    <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+    <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
       <up-load
         :url="url"
         :examId="examId"
diff --git a/src/views/personal/userInfo/index.vue b/src/views/personal/userInfo/index.vue
index 38d1ead..ff3de4d 100644
--- a/src/views/personal/userInfo/index.vue
+++ b/src/views/personal/userInfo/index.vue
@@ -25,7 +25,7 @@
         </ul>
       </div>
     </div>
-    <el-dialog title="修改个人信息" :visible.sync="diaSchool" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改个人信息" :visible.sync="diaSchool" width="400">
       <el-form
         ref="formSchool"
         class="form-box"
@@ -64,7 +64,7 @@
         <el-button @click="diaSchool = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="修改密码" :visible.sync="diaPass" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改密码" :visible.sync="diaPass" width="400">
       <el-form
         ref="formPass"
         class="form-box"
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 05320bd..b73c7c5 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -146,8 +146,11 @@
               }}
             </template></el-table-column
           >
-          <el-table-column align="center" label="操作次数" prop="operations"></el-table-column
-          >
+          <el-table-column
+            align="center"
+            label="操作次数"
+            prop="operations"
+          ></el-table-column>
           <el-table-column align="center" label="描述">
             <template slot-scope="scope">
               {{
@@ -163,6 +166,7 @@
             align="center"
             label="操作时间"
             prop="modifiedTime"
+            width="160"
           ></el-table-column>
         </el-table>
         <div class="pagination-box">
@@ -333,6 +337,19 @@ export default {
       return query;
     },
     async _QueryData(type) {
+      if (this.role == "ROLE_XUEXIAO") {
+        if (type == 2) {
+          if (!this.query.studentName) {
+            this.$message.warning("输入学生姓名～");
+            return;
+          }
+        } else if (type == 3) {
+          if (!this.query.studentCode) {
+            this.$message.warning("输入学生学号～");
+            return;
+          }
+        }
+      }
       let query = this.serQuery(type);
       this.loading = true;
       const { data, status, info } = await this.$request.cardList({
diff --git a/src/views/standard/dataSync/index.vue b/src/views/standard/dataSync/index.vue
index 12a50b9..18cb7b1 100644
--- a/src/views/standard/dataSync/index.vue
+++ b/src/views/standard/dataSync/index.vue
@@ -40,7 +40,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="" :visible.sync="dialogVisible" width="300" center>
+    <el-dialog :close-on-click-modal="false" title="" :visible.sync="dialogVisible" width="300" center>
       <el-result icon="success" title="上传成功"> </el-result>
       <el-descriptions title="" :column="1">
         <el-descriptions-item label="导入答题卡数量">{{tipData.paperNum}}</el-descriptions-item>
diff --git a/src/views/standard/device/error.vue b/src/views/standard/device/error.vue
index 32aae1f..cef4cd9 100644
--- a/src/views/standard/device/error.vue
+++ b/src/views/standard/device/error.vue
@@ -95,7 +95,7 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog title="备注" :visible.sync="diaNotes" width="400">
+    <el-dialog :close-on-click-modal="false" title="备注" :visible.sync="diaNotes" width="400">
       <el-form ref="formClass" label-width="100px">
         <el-form-item label="处理备注：" prop="studentName">
           <el-col :span="12">
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 08a0f5e..09a1e31 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -516,7 +516,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
+    <el-dialog :close-on-click-modal="false" title="设备导入" :visible.sync="diaUp" width="400">
       <up-load :url="url" @upSuccess="upSuccess" fileName="设备信息">
         <p class="down-txt" slot="down">
           通过Excel名单导入设备，需要提供设备编码，点击
@@ -527,7 +527,7 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       :title="isAdd ? '添加基站' : '修改基站'"
       :visible.sync="diaAnswerEqu"
       width="400"
diff --git a/src/views/standard/examinationPaper/add.vue b/src/views/standard/examinationPaper/add.vue
index beacbfa..6f3e240 100644
--- a/src/views/standard/examinationPaper/add.vue
+++ b/src/views/standard/examinationPaper/add.vue
@@ -106,7 +106,7 @@
           >
           <el-button type="primary" round @click="setStep1">下一步</el-button>
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="设置测验类型"
           :visible.sync="dialogVisible"
           width="500px"
@@ -413,10 +413,9 @@
             >下一步</el-button
           >
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="添加大题"
           :visible.sync="addQuestionVisible"
-          :close-on-click-modal="false"
           width="600px"
         >
           <div class="dia-content">
@@ -733,10 +732,9 @@
             </li>
           </ul>
         </div>
-        <el-dialog
+        <el-dialog :close-on-click-modal="false"
           title="批量设置答案"
           :visible.sync="diaSetAns"
-          :close-on-click-modal="false"
           width="400"
           :modal-append-to-body="false"
         >
diff --git a/src/views/standard/examinationPaper/edit.vue b/src/views/standard/examinationPaper/edit.vue
index ce8b39d..4736cc5 100644
--- a/src/views/standard/examinationPaper/edit.vue
+++ b/src/views/standard/examinationPaper/edit.vue
@@ -242,9 +242,8 @@
         <el-button type="danger" plain round @click="linkBack">取消</el-button>
         <el-button type="primary" round @click="save">保存</el-button>
       </div>
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         title="批量设置答案"
-        :close-on-click-modal="false"
         :visible.sync="diaSetAns"
         width="400"
         :modal-append-to-body="false"
diff --git a/src/views/standard/examinationPaper/index.vue b/src/views/standard/examinationPaper/index.vue
index 3ae1ffb..6c3fe42 100644
--- a/src/views/standard/examinationPaper/index.vue
+++ b/src/views/standard/examinationPaper/index.vue
@@ -166,7 +166,7 @@
       content="没有更多数据"
       :image-size="100"
     ></el-empty>
-    <el-dialog title="选择分享范围" :visible.sync="dialogVisible" width="400">
+    <el-dialog :close-on-click-modal="false" title="选择分享范围" :visible.sync="dialogVisible" width="400">
       <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
         <el-form-item prop="share" label="分享范围：">
           <el-radio-group v-model="shareForm.sharingType">
diff --git a/src/views/standard/setUp/account.vue b/src/views/standard/setUp/account.vue
index 59438bc..58ed870 100644
--- a/src/views/standard/setUp/account.vue
+++ b/src/views/standard/setUp/account.vue
@@ -213,7 +213,7 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog title="修改账号信息" :visible.sync="diaCount" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改账号信息" :visible.sync="diaCount" width="400">
       <el-form
         class="form-box"
         :model="formCount"
@@ -249,7 +249,7 @@
         <el-button @click="diaCount = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加账号" :visible.sync="diaAdd" width="400">
+    <el-dialog :close-on-click-modal="false" title="添加账号" :visible.sync="diaAdd" width="400">
       <el-form
         class="form-box"
         :model="formAddCount"
@@ -349,7 +349,7 @@
         <el-button @click="diaAdd = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog 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"
diff --git a/src/views/standard/setUp/archived.vue b/src/views/standard/setUp/archived.vue
index d9def7e..89d0b56 100644
--- a/src/views/standard/setUp/archived.vue
+++ b/src/views/standard/setUp/archived.vue
@@ -34,11 +34,24 @@
           <div class="form-item">
             <span class="s-txt">确定班级：</span>
             <i class="el-icon-loading" v-show="loadingClass"></i>
-            <el-checkbox-group v-model="classIds">
-              <el-checkbox v-for="item in classList" :label="item.id">{{
-                item.className
-              }}</el-checkbox>
-            </el-checkbox-group>
+            <div class="check-box" v-if="classList.length && !loadingClass">
+              <p class="all-check">
+                <el-checkbox
+                  :indeterminate="isIndeterminate"
+                  v-model="checkAll"
+                  @change="handleCheckAllChange"
+                  >全选</el-checkbox
+                >
+              </p>
+              <el-checkbox-group
+                v-model="classIds"
+                @change="handleCheckedChange"
+              >
+                <el-checkbox v-for="item in classList" :label="item.id">{{
+                  item.className
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </div>
           </div>
           <div class="form-item">
             <span class="s-txt"></span>
@@ -159,12 +172,28 @@ export default {
       classList: [],
       urlClazz: "/api_html/school/manager/importClassAndStudent",
       urlTeacher: "/api_html/school/manager/importTeacher",
+      checkAll: true,
+      isIndeterminate: false,
     };
   },
   created() {
     this._QueryDataGrade();
   },
   methods: {
+    handleCheckAllChange(val) {
+      this.classIds = val
+        ? this.classList.map((item) => {
+            return item.id;
+          })
+        : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.classList.length;
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.classList.length;
+    },
     toClazz() {
       this.$router.push({
         path: "/setUpClazz",
@@ -268,7 +297,10 @@ export default {
       this.loadingClass = false;
       if (status === 0) {
         this.classList = (data.list && [...data.list]) || [];
-        this.classIds = [];
+        this.classIds = this.classList.map((item) => {
+          return item.id;
+        });
+        this.checkAll = true;
       } else {
         this.$message.error(info);
       }
@@ -290,6 +322,12 @@ export default {
   width: 70%;
   display: flex;
   margin: 0 auto 20px;
+  .check-box {
+    flex: 1;
+  }
+  .all-check {
+    margin-right: 30px;
+  }
   &:first-of-type {
     .s-txt {
       line-height: 40px;
diff --git a/src/views/standard/setUp/clazz.vue b/src/views/standard/setUp/clazz.vue
index f995960..738b8c1 100644
--- a/src/views/standard/setUp/clazz.vue
+++ b/src/views/standard/setUp/clazz.vue
@@ -40,6 +40,9 @@
         <div class="grade-item" v-for="(item, index) in dataList">
           <p class="h-title">
             <span>{{ item.gradeName }}</span>
+            <span class="s-num" v-if="item.classList"
+              >（共{{ item.classList.length }}个班）</span
+            >
             <el-button
               class="sub-btn"
               type="info"
@@ -71,8 +74,8 @@
                   ></i>
                 </p>
                 <div class="clazz-class">
-                  <span>学生：{{ clazz.studentCount }}个</span>
-                  <span>教师：{{ clazz.teacherCount }}个</span>
+                  <p>学生：{{ clazz.studentCount }}个</p>
+                  <p>教师：{{ clazz.teacherCount }}个</p>
                 </div>
               </div>
             </li>
@@ -80,7 +83,12 @@
         </div>
       </div>
     </div>
-    <el-dialog title="导入班级名单" :visible.sync="diaUp" width="600">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="导入班级名单"
+      :visible.sync="diaUp"
+      width="600"
+    >
       <up-load :url="url" @upSuccess="upSuccess" fileName="班级名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入班级名单，点击
@@ -91,7 +99,12 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="修改班级" :visible.sync="diaClass" width="400">
+    <el-dialog
+      :close-on-click-modal="false"
+      title="修改班级"
+      :visible.sync="diaClass"
+      width="400"
+    >
       <el-form
         ref="formClass"
         :model="formClass"
@@ -136,10 +149,14 @@
         </el-popconfirm>
       </div>
     </el-dialog>
-    <el-dialog :visible.sync="diaSubject" width="400">
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="diaSubject"
+      width="400"
+    >
       <p slot="title" class="dia-tit">
         {{ formClass.gradeName }}
-        <span class="tips">（默认科目和已经有任课老师的提示不能删除）</span>
+        <span class="tips">（默认科目和已经有任课老师的科目不能删除）</span>
       </p>
       <el-form class="form-box" label-width="80px" v-loading="loadingSub">
         <el-form-item label="科目：">
@@ -169,11 +186,11 @@
                   v-show="item.checked"
                   @click="_EditSub(item)"
                 ></i>
-                <i
+                <!-- <i
                   class="el-icon el-icon-close"
                   v-show="item.checked"
                   @click="resetSub(item)"
-                ></i>
+                ></i> -->
                 <i
                   v-show="!item.checked"
                   class="el-icon el-icon-delete"
@@ -212,6 +229,13 @@ export default {
   components: {
     draggable,
   },
+  watch: {
+    diaSubject: function (val) {
+      if (!val) {
+        this.subjectName = "";
+      }
+    },
+  },
   data() {
     return {
       code: "",
@@ -272,11 +296,19 @@ export default {
     upSuccess(res) {
       //导入成功
       this.$message.closeAll();
+      let txt = "";
+      if (res.data.errorInfo && res.data.errorInfo.length) {
+        res.data.errorInfo.map((item) => {
+          txt += `<p style="padding-top:5px;">第${item.row}行：${item.error}</p>`;
+        });
+      }
+      let sTxt = `<p>成功（${res.data.success}）</p>`;
       this.$message({
         showClose: true,
-        message: `成功（${res.data.success}）`,
+        dangerouslyUseHTMLString: true,
+        message: sTxt + txt,
         type: "success",
-        duration: 5000,
+        duration: 10000,
       });
       this.diaUp = false;
       this._QueryData();
@@ -492,6 +524,9 @@ export default {
 .h-title {
   display: flex;
   align-items: center;
+  .s-num {
+    font-size: 13px;
+  }
   .sub-btn {
     margin-left: 30px;
   }
@@ -510,10 +545,10 @@ export default {
   .grade-info {
     display: flex;
     flex-wrap: wrap;
-    padding: 20px 20px 0;
+    padding: 10px 20px 0;
     .clazz-li {
-      margin-right: 30px;
-      margin-bottom: 20px;
+      margin-right: 20px;
+      margin-bottom: 18px;
       position: relative;
       background: #fff;
       .el-icon-edit {
@@ -531,22 +566,28 @@ export default {
     }
 
     .clazz-item {
-      width: 220px;
+      min-width: 100px;
       box-sizing: border-box;
-      padding: 16px;
+      padding: 14px 18px 14px 14px;
       border-radius: 10px;
       box-shadow: 1px 1px 3px #888;
     }
     .clazz-name {
       font-size: 16px;
-      font-weight: bold;
+      font-weight: 700;
       line-height: 18px;
-      padding-bottom: 12px;
+      padding-bottom: 6px;
+      position: relative;
+      .el-icon-edit {
+        position: absolute;
+        right: -16px;
+        top: -10px;
+      }
     }
     .clazz-class {
-      display: flex;
-      justify-content: space-between;
-      font-size: 15px;
+      // display: flex;
+      // justify-content: space-between;
+      font-size: 14px;
     }
   }
 }
diff --git a/src/views/standard/setUp/conglomerate.vue b/src/views/standard/setUp/conglomerate.vue
index 717215c..4e13a42 100644
--- a/src/views/standard/setUp/conglomerate.vue
+++ b/src/views/standard/setUp/conglomerate.vue
@@ -86,7 +86,7 @@
         </div>
       </div>
     </div>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       :title="isAdd ? '添加区域/集团' : '修改区域/集团'"
       :visible.sync="diaCL"
       width="400"
@@ -113,7 +113,7 @@
         <el-button round @click="diaCL = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加管理员" :visible.sync="diaAdmin" width="400">
+    <el-dialog :close-on-click-modal="false" title="添加管理员" :visible.sync="diaAdmin" width="400">
       <el-form
         class="form-box"
         ref="formAdmin"
@@ -158,7 +158,7 @@
         <el-button round @click="diaAdmin = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加学校" :visible.sync="diaSchool" width="400">
+    <el-dialog :close-on-click-modal="false" title="添加学校" :visible.sync="diaSchool" width="400">
       <el-form
         class="form-box"
         ref="formSchool"
@@ -208,7 +208,7 @@
         <el-button round @click="diaSchool = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="学校信息修改" :visible.sync="diaSchool2" width="400">
+    <el-dialog :close-on-click-modal="false" title="学校信息修改" :visible.sync="diaSchool2" width="400">
       <el-form
         class="form-box"
         ref="formSchool2"
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index 7a28551..003999e 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -74,7 +74,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="修改学校信息" :visible.sync="diaSchool" width="400">
+    <el-dialog :close-on-click-modal="false" title="修改学校信息" :visible.sync="diaSchool" width="400">
       <el-form
         ref="formSchool"
         class="form-box"
@@ -136,7 +136,7 @@
         <el-button @click="diaSchool = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="班级升级" :visible.sync="diaUpgradeGrade" width="400">
+    <el-dialog :close-on-click-modal="false" title="班级升级" :visible.sync="diaUpgradeGrade" width="400">
       <p>注意该操作会将所有年级升级，请谨慎操作！</p>
       <div class="dialog-footer" slot="footer">
         <el-button type="danger" @click="_UpgradeGrade()">确认升级</el-button>
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index 343556d..be611e1 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -166,7 +166,7 @@
         </div>
       </div>
     </div>
-    <el-dialog 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 +213,7 @@
         <el-button @click="diaChangeClass = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog 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 +235,7 @@
         <el-button @click="diaChangeClassTrack = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <el-dialog 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 +286,7 @@
         <el-button @click="diaStu = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog 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"
@@ -563,20 +563,12 @@ export default {
     serQuery(type) {
       let query = {};
       if (type == 1) {
-        if (!this.query.studentName) {
-          this.$message.warning("输入学生姓名～");
-          return;
-        }
         this.query.classId = "";
         this.query.studentCode = "";
         this.query.grade = "";
         query.studentName = this.query.studentName;
         query.status = 9;
       } else if (type == 2) {
-        if (!this.query.studentCode) {
-          this.$message.warning("输入学生学号～");
-          return;
-        }
         this.query.classId = "";
         this.query.studentName = "";
         this.query.grade = "";
@@ -599,6 +591,17 @@ export default {
       return query;
     },
     async _QueryData(type) {
+      if (type == 1) {
+        if (!this.query.studentName) {
+          this.$message.warning("输入学生姓名～");
+          return;
+        }
+      } else if (type == 2) {
+        if (!this.query.studentCode) {
+          this.$message.warning("输入学生学号～");
+          return;
+        }
+      }
       let query = this.serQuery(type);
       this.loading = true;
       this.studentList = [];
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index cd5118f..cdd4c2d 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -60,7 +60,7 @@
           @change="_QueryData(4)"
           placeholder="选择类型"
         >
-          <el-option disabled label="请选择" :value=9></el-option>
+          <el-option disabled label="请选择" :value="9"></el-option>
           <el-option label="已分配教师" :value="0"></el-option>
           <el-option label="未分配教师" :value="1"></el-option>
         </el-select>
@@ -118,7 +118,10 @@
               :class="showTId == item.id ? 'active' : ''"
               @click="showTeacher(item)"
             >
-              {{ item.realName }}<template v-if="setClass(item)">（{{ setClass(item) }}）</template>
+              {{ item.realName
+              }}<template v-if="setClass(item)"
+                >（{{ setClass(item) }}）</template
+              >
             </li>
           </ul>
         </div>
@@ -248,7 +251,7 @@
         </div>
       </div>
     </div>
-    <el-dialog 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"
@@ -264,7 +267,7 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       :title="
         isAdd ? '添加教师' : setTercherType == 1 ? '编辑教师信息' : '管理班级'
       "
@@ -741,21 +744,13 @@ export default {
         this.query.teacherName = "";
         this.query.phone = "";
         this.query.type = 0;
-      }else if (type == 2) {
-        if (this.query.teacherName == "") {
-          this.$message.warning("请输入老师姓名");
-          return;
-        }
+      } else if (type == 2) {
         this.query.type = 9;
         this.query.phone = "";
         this.query.gradeClassSub = [];
         query.teacherName = this.query.teacherName;
         query.type = this.query.type;
       } else if (type == 3) {
-        if (this.query.phone == "") {
-          this.$message.warning("请输入老师手机");
-          return;
-        }
         this.query.type = 9;
         this.query.teacherName = "";
         this.query.gradeClassSub = [];
@@ -802,6 +797,17 @@ export default {
     },
     async _QueryData(type) {
       if (this.loading) return;
+      if (type == 2) {
+        if (this.query.teacherName == "") {
+          this.$message.warning("请输入老师姓名");
+          return;
+        }
+      } else if (type == 3) {
+        if (this.query.phone == "") {
+          this.$message.warning("请输入老师手机");
+          return;
+        }
+      }
       this.loading = true;
       let query = this.setQuery(type);
       this.teacherList = [];
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
index a8ff20d..bc84cc3 100644
--- a/src/views/standard/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
@@ -444,7 +444,7 @@
           >
         </div>
       </div>
-      <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+      <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
         <up-load :url="url" :examId="id" @upSuccess="upSuccess">
           <template slot="down">
             <p class="down-txt">
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index 16654ce..4a99ebd 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -480,7 +480,7 @@
         >
       </p>
     </div>
-    <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+    <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
       <up-load
         :url="url"
         :examId="examId"
--
libgit2 0.21.4