From 225a00b6da1e0b3d38b5af796a70e130ca59e828 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Fri, 30 Dec 2022 17:08:30 +0800
Subject: [PATCH] 飞书问题解决

---
 src/api/apis/apis.js                   |   8 ++++++++
 src/api/axios.js                       |   2 +-
 src/api/urls/apis.js                   |   2 ++
 src/assets/css/index.scss              |   2 +-
 src/components/charts/pieChart.vue     |   5 +++--
 src/components/charts/scatterChart.vue |   7 -------
 src/views/analysis/index.vue           | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
 src/views/ask/index.vue                |   1 -
 src/views/card/index.vue               |   3 +--
 src/views/device/index.vue             |  94 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 src/views/down/client.vue              |   4 ++--
 src/views/examinationPaper/recycle.vue |   2 +-
 src/views/index/mainIndex.vue          |  74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
 src/views/login/index.vue              |   9 +++++----
 src/views/setUp/account.vue            |  55 +++++++++++++++++++++++++++++++++++++++----------------
 src/views/setUp/conglomerate.vue       |  31 +++++++++++++++++++------------
 src/views/setUp/school.vue             |  85 +++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 src/views/setUp/student.vue            |  45 ++++++++++++++++++++++++++-------------------
 src/views/setUp/teacher.vue            |   6 +++---
 src/views/test/index.vue               |   1 -
 20 files changed, 376 insertions(+), 178 deletions(-)

diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 3169355..8943bb9 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -266,6 +266,14 @@ export default {
       data,
     });
   },
+  //  设备使用分析
+  usageAnalysis(data) {
+    return service({
+      url: setUpUrls.usageAnalysis,
+      method: "POST",
+      data,
+    });
+  },
 
   /**
    * 集团管理员-学校管理
diff --git a/src/api/axios.js b/src/api/axios.js
index 81268de..85c8842 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -83,7 +83,7 @@ service.interceptors.response.use(
             router.push({ path: "/login" });
             if (res.message.includes("不存在")) {
               Message({
-                message: res.message,
+                message: data.info,
                 type: "error",
                 duration: 3 * 1000,
               });
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index cf0b885..7ca92d8 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -64,6 +64,8 @@ export default {
   addAppConfig: "/api_html/school/manager/addAppConfig",
   //    修改授课端应用配置
   updateAppConfig: "/api_html/school/manager/updateAppConfig",
+  //    设备使用分析
+  usageAnalysis: "/api_html/school/manager/usageAnalysis",
   // 发卡记录
   cardList: "/api_html/school/manager/cardList",
   
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index c093253..fee026d 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -22,7 +22,7 @@
     .el-input__inner {
       border-radius: 20px;
       border: 1px solid #e2e2e2;
-      height: 36px!important;
+      height: 36px;
       line-height: 34px;
     }
 
diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index f63c6bd..180fa97 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -38,7 +38,7 @@ export default {
           trigger: "item",
           confine: true,
           formatter(v) {
-            return `${v.marker} ${v.name}-${v.value}`
+            return `${v.marker} ${v.name}：${v.value}`
           },
         },
         legend: {
@@ -65,7 +65,8 @@ export default {
             normal: {
               formatter(v) {
                 console.log(v)
-                return v.name + v.data.rate + "%";
+                let rate = v.data.rate*100
+                return v.name + rate + "%";
               },
             },
           },
diff --git a/src/components/charts/scatterChart.vue b/src/components/charts/scatterChart.vue
index 0e076c9..3e5de90 100644
--- a/src/components/charts/scatterChart.vue
+++ b/src/components/charts/scatterChart.vue
@@ -99,13 +99,6 @@ export default {
             shadowColor: "rgba(25, 100, 150, 0.5)",
             shadowOffsetY: 5,
           },
-          label: {
-            show: true,
-            position: "top",
-            formatter: function (params) {
-              return params.data.count ? params.data.count : "";
-            },
-          },
           selectedMode: true,
           hoverAnimation: true,
           avoidLabelOverlap: true,
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 092f720..e0c9319 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -13,6 +13,7 @@
             v-model="query.regionId"
             placeholder="选择区域"
             @change="_QueryData"
+            v-if="role == 'ROLE_JITUAN'"
           >
             <el-option
               v-for="item in gradeList"
@@ -22,6 +23,21 @@
             >
             </el-option>
           </el-select>
+          <el-select
+            v-else
+            class="sel"
+            v-model="query.gradeName"
+            placeholder="选择年级"
+            @change="_QueryData"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.label"
+              :label="item.label"
+              :value="item.label"
+            >
+            </el-option>
+          </el-select>
           <div class="d1">
             <el-date-picker
               v-model="query.startDay"
@@ -77,7 +93,13 @@
             align="center"
             v-for="(item, index) in dataList"
             :key="index"
-            :label="item.schoolName||item.gradeName"
+            :label="
+              role == 'ROLE_JITUAN'
+                ? item.schoolName || item.gradeName
+                : query.gradeName == ''
+                ? item.gradeName
+                : item.className
+            "
           >
             <template>
               <el-table-column
@@ -114,6 +136,7 @@ export default {
       query: {
         //搜索条件
         regionId: "",
+        gradeName: "",
         startDay: "",
         endDay: "",
         day: "",
@@ -219,16 +242,15 @@ export default {
           query[key] = this.query[key];
         }
       }
-      // if (this.role == "ROLE_JITUAN") {
-      //   if (this.query.regionId == "") {
-      //     this.type = 1;
-      //   } else {
-      //     this.type = 2;
-      //   }
-      // }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.tableData=[]
       const Contrast =
         this.role != "ROLE_JITUAN"
-          ? this.$request.gradeContrast
+          ? this.$request.usageAnalysis
           : this.type == 1
           ? this.$request.schoolContrast
           : this.$request.gradeContrast;
@@ -237,18 +259,78 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = data.map((item)=>{
-          let params={}
-          item.dataList.map((items,index)=>{
-            params['examCount'+index] = items.examCount
-            params['periodCount'+index] = items.periodCount
-          })
+        let dataIdsList = [],
+          dataList = [];
+
+        data.map((item) => {
+          item.dataList.map((items) => {
+            if (this.role == "ROLE_JITUAN") {
+              if (this.type == 1) {
+                if (!dataIdsList.includes(items.schoolId)) {
+                  dataIdsList.push(items.schoolId);
+                  dataList.push(items);
+                }
+              } else if (this.type == 2) {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              }
+            } else {
+              if (this.query.gradeName == "") {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              } else if (this.query.gradeName) {
+                if (!dataIdsList.includes(items.classId)) {
+                  dataIdsList.push(items.classId);
+                  dataList.push(items);
+                }
+              }
+            }
+          });
+        });
+        console.log(dataList);
+        this.tableData = data.map((item) => {
+          let params = {};
+          dataIdsList.map((ids, index) => {
+            params["examCount" + index] = "--";
+            params["periodCount" + index] = "--";
+            item.dataList.map((items) => {
+              if (this.role == "ROLE_JITUAN") {
+                if (this.type == 1) {
+                  if (items.schoolId == ids) {
+                    params["examCount" + index] = items.examCount;
+                    params["periodCount" + index] = items.periodCount;
+                  }
+                } else if (this.type == 2) {
+                  if (items.grade == ids) {
+                    params["examCount" + index] = items.examCount;
+                    params["periodCount" + index] = items.periodCount;
+                  }
+                }
+              } else {
+                if (this.query.gradeName == "") {
+                  if (items.grade == ids) {
+                    params["examCount" + index] = items.examCount;
+                    params["periodCount" + index] = items.periodCount;
+                  }
+                } else if (this.query.gradeName) {
+                  if (items.classId == ids) {
+                    params["examCount" + index] = items.examCount;
+                    params["periodCount" + index] = items.periodCount;
+                  }
+                }
+              }
+            });
+          });
           return {
-            subjectName:item.subjectName,
+            subjectName: item.subjectName,
             ...params,
-          }
+          };
         });
-        this.dataList = data[0]?.dataList
+        this.dataList = dataList;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 76e8fb9..8f55324 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -25,7 +25,6 @@
           v-if="role == 'ROLE_BANZHUREN'"
           class="sel"
           multiple
-          collapse-tags
           v-model="query.subjectId"
           placeholder="选择科目"
           @change="_QueryData"
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index f553d11..2d29146 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -8,9 +8,8 @@
     <div class="page-content">
       <div class="answer-header">
         <div class="sel-box">
-          <el-cascader
+          <el-cascader size="small"
             class="sel"
-            collapse-tags
             clearable
             placeholder="选择班级"
             v-model="query.classId"
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 83b95bb..1f9277d 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -4,7 +4,10 @@
       <template slot="title">
         <span>设备管理</span>
       </template>
-      <template slot="btns" v-if="type == 1 && school !== '长水'">
+      <template
+        slot="btns"
+        v-if="role != 'ROLE_JITUAN' && type == 1 && school !== '长水'"
+      >
         <el-tooltip effect="dark" content="设备导入" placement="bottom">
           <el-button
             type="primary"
@@ -37,9 +40,9 @@
       </div>
       <div class="content">
         <div v-if="type == 1">
-          <div class="chart-box">
+          <div class="chart-box" v-if="count">
             <div class="device-num">
-              <p class="p1">{{ total }}</p>
+              <p class="p1">{{ count }}</p>
               <p class="p2">基站数量</p>
             </div>
             <div class="chart">
@@ -54,8 +57,8 @@
             <div class="answer-header">
               <div class="sel-box">
                 <el-cascader
+                  size="small"
                   class="sel"
-                  collapse-tags
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
@@ -78,7 +81,6 @@
                   </el-option>
                 </el-select>
                 <el-input
-                  type="number"
                   placeholder="请输入设备编码"
                   v-model="query.sn"
                   class="input-with-select"
@@ -146,7 +148,12 @@
               >
               <el-table-column label="操作" align="center"
                 ><template slot-scope="scoped">
-                  <el-tooltip effect="dark" content="修改基站" placement="top">
+                  <el-tooltip
+                    effect="dark"
+                    v-if="role != 'ROLE_JITUAN'"
+                    content="修改基站"
+                    placement="top"
+                  >
                     <el-button
                       type="primary"
                       circle
@@ -169,9 +176,9 @@
           </div>
         </div>
         <div v-if="type == 2">
-          <div class="chart-box">
+          <div class="chart-box" v-if="count">
             <div class="device-num">
-              <p class="p1">{{ total }}</p>
+              <p class="p1">{{ count }}</p>
               <p class="p2">答题器数量</p>
             </div>
             <div class="chart">
@@ -186,8 +193,8 @@
             <div class="answer-header">
               <div class="sel-box">
                 <el-cascader
+                  size="small"
                   class="sel"
-                  collapse-tags
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
@@ -210,7 +217,6 @@
                   </el-option>
                 </el-select>
                 <el-input
-                  type="number"
                   placeholder="请输入设备编码"
                   v-model="query.sn"
                   class="input-with-select"
@@ -290,8 +296,8 @@
             <div class="answer-header">
               <div class="sel-box">
                 <el-cascader
+                  size="small"
                   class="sel"
-                  collapse-tags
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
@@ -436,6 +442,7 @@
         <el-form-item label="选择班级：" prop="classId">
           <el-col :span="10">
             <el-cascader
+              size="small"
               clearable
               v-model="form.classId"
               :options="gradeList"
@@ -477,6 +484,7 @@ export default {
     type: function (val) {
       this.page = 1;
       this.total = 0;
+      this.count = 0;
       this.query.classId = [];
       this.query.onlineStatus = "";
       this.query.sn = "";
@@ -499,7 +507,7 @@ export default {
       diaAnswerEqu: false,
       gradeList: [],
       gradeListAll: [],
-      schoolAll:[],
+      schoolAll: [],
       props: { multiple: true, checkStrictly: true },
       type: 1,
       query: {
@@ -541,6 +549,7 @@ export default {
       },
       tableData: [],
       total: 0,
+      count: 0,
       chartData: [],
       chartData2: [],
       selectionTabIds: [],
@@ -559,7 +568,9 @@ export default {
     this.stationReport();
     this._QueryGradeList();
     this._QueryData();
-    this.showSchool()
+    if (role == "ROLE_JITUAN") {
+      this.showSchool();
+    }
   },
   methods: {
     edit() {},
@@ -614,20 +625,22 @@ export default {
       this.page = page;
       this._QueryData(false);
     },
-     async showSchool() {
+    async showSchool() {
       const { data, status, info } = await this.$request.schoolList();
       if (status === 0) {
-        this.schoolAll= [{
-          value:0,
-          label:"全部",
-          children:data.list?.map(item=>{
-            return {
-              value:item.id,
-              label:item.schoolName,
-            }
-          })
-        }]
-        this.gradeList = [...this.schoolAll,...this.gradeList]
+        this.schoolAll = [
+          {
+            value: 0,
+            label: "全部",
+            children: data.list?.map((item) => {
+              return {
+                value: item.id,
+                label: item.schoolName,
+              };
+            }),
+          },
+        ];
+        this.gradeList = [...this.schoolAll, ...this.gradeList];
       } else {
         this.$message.error(info);
       }
@@ -741,7 +754,7 @@ export default {
                   }) || [];
                 return gradeList;
               }) || [];
-              this.gradeList = [...this.schoolAll,...this.gradeList]
+            this.gradeList = [...this.schoolAll, ...this.gradeList];
           }
         }
       } else {
@@ -769,7 +782,7 @@ export default {
               rate: item.rate,
             };
           }) || [];
-        // this.total = data.total || 0;
+        this.count = data.total || 0;
       } else {
         this.$message.error(info);
       }
@@ -797,17 +810,18 @@ export default {
                   : item.type == 5
                   ? "3月内"
                   : "3月以上",
-              value: item.total,
-              rate: item.rate,
+              count: item.total,
+              value: item.rate * 100,
             };
           }) || [];
-        // this.total = data.total || 0;
+        this.count = data.total || 0;
       } else {
         this.$message.error(info);
       }
     },
-    setQuery(){//整理传参
-      let query = {}
+    setQuery() {
+      //整理传参
+      let query = {};
       if (this.query.sn) {
         query.sn = this.query.sn;
       } else {
@@ -823,7 +837,7 @@ export default {
           query.schoolIds = [];
           this.query.classId?.map((item) => {
             if (item.length == 1) {
-              if(!query.regionIds.includes(item[0])){
+              if (!query.regionIds.includes(item[0])) {
                 query.regionIds.push(item[0]);
               }
             } else {
@@ -840,7 +854,7 @@ export default {
           query.classIds = [];
           this.query.classId?.map((item) => {
             if (item.length == 1) {
-              if(!query.gradeNames.includes(item[0])){
+              if (!query.gradeNames.includes(item[0])) {
                 query.gradeNames.push(item[0]);
               }
             } else {
@@ -855,12 +869,12 @@ export default {
         }
         delete query.classId;
       }
-      return query
+      return query;
     },
     // 设备列表信息
     async _QueryData(isRef) {
       this.loading = true;
-      let query = this.setQuery()
+      let query = this.setQuery();
       if (isRef) {
         this.page = 1;
       }
@@ -877,8 +891,12 @@ export default {
       });
       this.loading = false;
       if (status == 0) {
-        this.tableData = data?.list || [];
-        this.total = data.count
+        this.tableData =
+          data?.list.map((item) => {
+            item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
+            return item;
+          }) || [];
+        this.total = data.count;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index 370ea26..d4c4756 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -162,7 +162,7 @@
               <el-radio :label="2">老师选择</el-radio>
             </el-radio-group>
             <el-input-number
-              v-show="formData.viesAnswerSet != 2"
+              v-show="formData.viesAnswerSet === 0"
               size="small"
               class="count-down"
               v-model="formData.countdown"
@@ -287,7 +287,7 @@ const defaultForm = {
   multipleChoiceNum: 4,
   singleTypeNum: 25,
   askCountdown: 30,
-  examsDuration: 5400,
+  examsDuration: 90,
   displayModel: 0,
   languageSet: 0,
   otherSet: [],
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index c2bca16..110986a 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -7,7 +7,7 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <!-- <el-cascader
+        <!-- <el-cascader size="small"
           class="sel sel2"
           :options="options"
           :props="props"
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 719a7a8..ab37fbd 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -6,9 +6,16 @@
         <div class="text">
           <p class="p1">账号管理</p>
           <p class="p2">
-            管理{{ dataInfo.teacherCourseCount }}个任课教师，{{
-              dataInfo.classManagerCount
-            }}个班主任，{{ dataInfo.teacherGradeCount }}个备课组长账号信息。
+            管理
+            <template v-if="dataInfo.teacherCourseCount">
+              {{ dataInfo.teacherCourseCount }}个任课教师，
+            </template>
+            <template v-if="dataInfo.classManagerCount">
+              {{ dataInfo.classManagerCount }}个班主任，
+            </template>
+            <template v-if="dataInfo.teacherGradeCount">
+              {{ dataInfo.teacherGradeCount }}个备课组长账号信息。
+            </template>
           </p>
         </div>
       </li>
@@ -17,9 +24,16 @@
         <div class="text">
           <p class="p1">学校管理</p>
           <p class="p2">
-            管理{{ dataInfo.gradeCount }}个年级，{{
-              dataInfo.classCount
-            }}个班级，{{ dataInfo.studentCount }}名学生信息。
+            管理
+            <template v-if="dataInfo.gradeCount"
+              >{{ dataInfo.gradeCount }}个年级，
+            </template>
+            <template v-if="dataInfo.classCount">
+              {{ dataInfo.classCount }}个班级，
+            </template>
+            <template v-if="dataInfo.studentCount">
+              {{ dataInfo.studentCount }}名学生信息。
+            </template>
           </p>
         </div>
       </li>
@@ -28,9 +42,13 @@
         <div class="text">
           <p class="p1">设备状态</p>
           <p class="p2">
-            管理{{ dataInfo.stationCount }}个基站，{{
-              dataInfo.keyboardCount
-            }}套答题器设备。
+            管理
+            <template v-if="dataInfo.stationCount"
+              >{{ dataInfo.stationCount }}个基站，</template
+            >
+            <template v-if="dataInfo.keyboardCount">
+              {{ dataInfo.keyboardCount }}套答题器设备。</template
+            >
           </p>
         </div>
       </li>
@@ -65,15 +83,35 @@
           <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/setUpConglomerate'">
             <p class="p1">学校管理</p>
-            <p class="p2">管理{{dataInfo.regionCount}}个区域，{{dataInfo.schoolCount}}个学校。</p>
+            <p class="p2">
+              管理
+              <template v-if="dataInfo.regionCount"
+                >{{ dataInfo.regionCount }}个区域，</template
+              >
+              <template v-if="dataInfo.schoolCount"
+                >{{ dataInfo.schoolCount }}个学校。</template
+              >
+            </p>
           </div>
           <div class="text" v-else-if="item.path == '/setUpAccount'">
             <p class="p1">账号管理</p>
-            <p class="p2">共{{dataInfo.regionManagerCount+dataInfo.schoolManagerCount}}个各层级管理员账号。</p>
+            <p class="p2">
+              共{{
+                dataInfo.regionManagerCount + dataInfo.schoolManagerCount
+              }}个各层级管理员账号。
+            </p>
           </div>
           <div class="text" v-else-if="item.path == '/device'">
             <p class="p1">设备状态</p>
-            <p class="p2">管理{{dataInfo.stationCount}}个基站，{{dataInfo.keyboardCount}}套答题器设备。</p>
+            <p class="p2">
+              管理
+              <template v-if="dataInfo.stationCount"
+                >{{ dataInfo.stationCount }}个基站，</template
+              >
+              <template v-if="dataInfo.keyboardCount">
+                {{ dataInfo.keyboardCount }}套答题器设备。</template
+              >
+            </p>
           </div>
           <div class="text" v-else-if="item.path == '/analysis'">
             <p class="p1">使用分析</p>
@@ -96,7 +134,9 @@
           <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/examinationPaper'">
             <p class="p1">备题组卷</p>
-            <p class="p2">管理{{ dataInfo.paperCount }}套答题卡。</p>
+            <p class="p2" v-if="dataInfo.paperCount">
+              {{ dataInfo.paperCount }}套答题卡。
+            </p>
           </div>
           <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
@@ -105,13 +145,15 @@
           </div>
           <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
-            <p class="p2">
+            <p class="p2" v-if="dataInfo.classPeriodCount">
               对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析。
             </p>
           </div>
           <div class="text" v-else-if="item.path == '/test'">
             <p class="p1">即时测报表</p>
-            <p class="p2">对{{ dataInfo.examCount }}套即时测答题记录分析。</p>
+            <p class="p2" v-if="dataInfo.examCount">
+              对{{ dataInfo.examCount }}套即时测答题记录分析。
+            </p>
           </div>
         </li>
       </template>
@@ -164,7 +206,7 @@ export default {
       this.schoolIndex();
     } else if (this.type == "ROLE_JIAOSHI" || this.type == "ROLE_BANZHUREN") {
       this.teacherIndex();
-    }else if (this.type == "ROLE_JITUAN") {
+    } else if (this.type == "ROLE_JITUAN") {
       this.tenantIndex();
     }
   },
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c2ca3fc..73d86fe 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -91,14 +91,15 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        // username: "13610050254",
-        // password: "Pw050254#",
+        // username: "15911715665",
+        // password: "Csiy88888",
+        username: "13610050254",
+        password: "Pw050254#",
         // username: "18946034886",
         // password: "Pw034886#",
         // username: "18332123505",
         // password: "Pw123505#",
-        username: "15911715665",
-        password: "Csiy88888",
+        
       },
       loginRules: {
         username: [
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index a0acc89..c42ad15 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -30,9 +30,9 @@
     <div class="answer-header">
       <div class="sel-box">
         <el-cascader
+          size="small"
           v-if="role == 'ROLE_JITUAN'"
           class="sel"
-          collapse-tags
           clearable
           placeholder="选择学校"
           v-model="query.schoolId"
@@ -147,6 +147,7 @@
           prop="createdTime"
           label="创建时间"
           align="center"
+          width="200"
         ></el-table-column>
         <el-table-column label="操作" align="center" width="160">
           <template slot-scope="scoped">
@@ -290,6 +291,7 @@
         <el-form-item label="选择管辖范围：" prop="regionId">
           <el-col :span="12">
             <el-select
+              v-show="formAddCount.roleId == 3"
               class="sel"
               v-model="formAddCount.regionId"
               placeholder="选择管辖范围"
@@ -301,6 +303,19 @@
                 :value="item.id"
               ></el-option>
             </el-select>
+            <el-select
+              v-show="formAddCount.roleId == 4"
+              class="sel"
+              v-model="formAddCount.schoolId"
+              placeholder="选择管辖范围"
+            >
+              <el-option
+                v-for="item in addSelectSchoolList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
           </el-col>
         </el-form-item>
       </el-form>
@@ -337,7 +352,7 @@ export default {
       tenantRoleList: [],
       regionList: [],
       schoolList: [],
-      schoolAll:[],
+      schoolAll: [],
       props: { multiple: true, checkStrictly: true },
       roleList: [],
       query: {
@@ -370,7 +385,9 @@ export default {
         password: "",
         roleId: "",
         regionId: "",
+        schoolId:""
       },
+      addSelectSchoolList: [],
       ruleAddCount: {
         phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
         realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
@@ -393,7 +410,7 @@ export default {
     if (this.role == "ROLE_JITUAN") {
       this._TenantRoleList();
       this._RegionList();
-      this.showSchool()
+      this.showSchool();
     } else {
       this._RoleList();
     }
@@ -418,6 +435,7 @@ export default {
       this.formAddCount.password = "";
       this.formAddCount.roleId = "";
       this.formAddCount.regionId = "";
+      this.formAddCount.schoolId = "";
       this.diaAdd = true;
     },
     saveAddCount() {
@@ -496,17 +514,20 @@ export default {
     async showSchool() {
       const { data, status, info } = await this.$request.schoolList();
       if (status === 0) {
-        this.schoolAll= [{
-          value:0,
-          label:"全部",
-          children:data.list?.map(item=>{
-            return {
-              value:item.id,
-              label:item.schoolName,
-            }
-          })
-        }]
-        this.schoolList = [...this.schoolAll,...this.schoolList]
+        (this.addSelectSchoolList = data.list?.map((item) => {
+          return {
+            value: item.id,
+            label: item.schoolName,
+          };
+        })),
+          (this.schoolAll = [
+            {
+              value: 0,
+              label: "全部",
+              children: [...this.addSelectSchoolList],
+            },
+          ]);
+        this.schoolList = [...this.schoolAll, ...this.schoolList];
       } else {
         this.$message.error(info);
       }
@@ -569,12 +590,13 @@ export default {
             children: children,
           };
         });
-        this.schoolList = [...this.schoolAll,...this.schoolList]
+        this.schoolList = [...this.schoolAll, ...this.schoolList];
       } else {
         this.$message.error(info);
       }
     },
-    setQuery(type) {//整理请求参数
+    setQuery(type) {
+      //整理请求参数
       let query = {};
       if (type == 1) {
         query.roleId = this.query.roleId;
@@ -621,6 +643,7 @@ export default {
       let query = this.setQuery(type);
       this.loading = true;
       this.tableData = [];
+      this.total = 0;
       const { data, status, info } =
         this.role != "ROLE_JITUAN"
           ? await this.$request.userPage({
diff --git a/src/views/setUp/conglomerate.vue b/src/views/setUp/conglomerate.vue
index a1215ce..1635a35 100644
--- a/src/views/setUp/conglomerate.vue
+++ b/src/views/setUp/conglomerate.vue
@@ -34,7 +34,7 @@
         </div>
         <div class="content-detail">
           <div class="title-box">
-            <span>管辖的学校（{{schoolData.num}}）</span>
+            <span>管辖的学校（{{ schoolData.num }}）</span>
             <i class="icon el-icon-circle-plus-outline" @click="addSchool"></i>
           </div>
           <el-empty
@@ -230,7 +230,7 @@
           >确 定</el-button
         >
         <el-button round @click="diaSchool2 = false">取 消</el-button>
-        <el-button round @click="removeSchool">删除学校</el-button>
+        <el-button round v-if="showDelSclBtn" @click="removeSchool">删除学校</el-button>
       </div>
     </el-dialog>
   </div>
@@ -292,12 +292,13 @@ export default {
         schoolName: [
           { required: true, message: "请输入学校名称", trigger: "blur" },
         ],
-        // sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
+        sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
       },
       setFormSchool: {
         schoolId: "",
         schoolName: "",
       },
+      showDelSclBtn: false,
     };
   },
   created() {
@@ -320,7 +321,6 @@ export default {
       this.formAdmin.password = "";
       this.formAdmin.realName = "";
 
-
       this.diaAdmin = true;
     },
     addSchool() {
@@ -339,6 +339,13 @@ export default {
     setSchool(obj) {
       this.setFormSchool.schoolId = obj.id;
       this.setFormSchool.schoolName = obj.schoolName;
+      let num =
+        obj.stationCount +
+        obj.keyboardCount +
+        obj.classCount +
+        obj.studentCount +
+        obj.teacherCount;
+      this.showDelSclBtn = num == 0 ? true : false;
       this.diaSchool2 = true;
     },
     async removeSchool() {
@@ -346,10 +353,10 @@ export default {
         schoolId: this.setFormSchool.schoolId,
       });
       if (status === 0) {
-        this._QueryData()
-        this.showSchool()
+        this._QueryData();
+        this.showSchool();
         this.$message.success(info);
-        this.diaSchool2 = false
+        this.diaSchool2 = false;
       } else {
         this.$message.error(info);
       }
@@ -364,7 +371,7 @@ export default {
             regionName: this.formCL.regionName,
           });
           if (status === 0) {
-            this._QueryData()
+            this._QueryData();
             this.$message.success(info);
             this.diaCL = false;
           } else {
@@ -404,8 +411,8 @@ export default {
       this.$refs["formSchool"].validate(async (valid) => {
         // 验证通过：保存
         if (valid) {
-          let query = {...this.formSchool}
-          query.sections = query.sections.join(',')
+          let query = { ...this.formSchool };
+          query.sections = query.sections.join(",");
           const { data, status, info } = await this.$request.saveSchool({
             ...query,
           });
@@ -445,11 +452,11 @@ export default {
       });
     },
     async showSchool() {
-      this.loading = true
+      this.loading = true;
       const { data, status, info } = await this.$request.schoolList({
         regionId: this.showId,
       });
-      this.loading = false
+      this.loading = false;
       if (status === 0) {
         this.schoolData.list = [...data.list] || [];
         this.schoolData.num = data.count;
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index adc8fc5..d9baef1 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -99,8 +99,10 @@
         label-width="160px"
       >
         <el-form-item label="科目：" prop="subjectNames">
-          <div class="subject-box" :class="showAll?'active':''">
-            <span class="showAll" @click="showAll = true" v-if="!showAll">更多...</span>
+          <div class="subject-box" :class="showAll ? 'active' : ''">
+            <span class="showAll" @click="showAll = !showAll">{{
+              showAll ? "收起" : "更多..."
+            }}</span>
             <el-checkbox-group v-model="formGrade.subjectNames">
               <el-checkbox
                 v-for="item in subjectList"
@@ -139,6 +141,7 @@
     </el-dialog>
     <el-dialog title="修改学校信息" :visible.sync="diaSchool" width="400">
       <el-form
+        ref="formSchool"
         class="form-box"
         :model="formSchool"
         :rules="rulesSchool"
@@ -157,8 +160,9 @@
         <el-form-item label="授课端管理密码：" prop="managePwd">
           <el-col :span="10">
             <el-input
-              maxlength="30"
+              maxlength="20"
               v-model="formSchool.managePwd"
+              show-password
               placeholder="请输入授课端管理密码"
             ></el-input>
           </el-col>
@@ -226,13 +230,13 @@ export default {
   },
   data() {
     return {
-      code:"",
+      code: "",
       loading: false,
       url: "xxx",
       diaUp: false,
       diaSchool: false,
       diaGrade: false,
-      showAll:false,//修改年级科目显示
+      showAll: false, //修改年级科目显示
       school: {
         schoolName: "",
         managePwd: "",
@@ -252,6 +256,12 @@ export default {
         sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
         managePwd: [
           { required: true, message: "请填写管理密码", trigger: "blur" },
+          {
+            min: 8,
+            max: 20,
+            message: "长度在 8 到 20 个字符",
+            trigger: "blur",
+          },
         ],
       },
       formGrade: {
@@ -276,7 +286,7 @@ export default {
     };
   },
   created() {
-    this.code = localStorage.getItem("csCode")||""
+    this.code = localStorage.getItem("csCode") || "";
     this._QueryDataSchool();
     this._QueryDataGrade();
     this._QuerySubject();
@@ -286,6 +296,7 @@ export default {
       this.formGrade.subjectNames = obj.subjectNames;
       this.formGrade.classList = obj.classList;
       this.formGrade.gradeName = obj.gradeName;
+      this.showAll = false;
       this.diaGrade = true;
     },
     addSubjectName() {
@@ -297,7 +308,7 @@ export default {
       this.formGrade.subjectNames.push(this.subjectName);
       this.subjectName = "";
     },
-    async editSchool() {
+    editSchool() {
       if (!this.formSchool.sections.length) {
         this.$message.error("请选择学段！");
         return;
@@ -309,20 +320,26 @@ export default {
       if (this.loading) {
         return;
       }
-      this.loading = true;
-      let form = { ...this.formSchool };
-      form.sections = this.formSchool.sections.join(",");
-      const { data, status, info } = await this.$request.updateSchool({
-        ...form,
+      this.$refs.formSchool.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let form = { ...this.formSchool };
+          form.sections = this.formSchool.sections.join(",");
+          const { data, status, info } = await this.$request.updateSchool({
+            ...form,
+          });
+          this.loading = false;
+          if (status === 0) {
+            this.$message.success("修改成功~");
+            this.diaSchool = false;
+            this._QueryDataSchool();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
       });
-      this.loading = false;
-      if (status === 0) {
-        this.$message.success("修改成功~");
-        this.diaSchool = false;
-        this._QueryDataSchool();
-      } else {
-        this.$message.error(info);
-      }
     },
     async editGrade() {
       if (!this.formGrade.subjectNames.length) {
@@ -486,24 +503,24 @@ export default {
 }
 .form-box {
   margin: 0 20px;
-  .subject-box{
-    height:90px;
-    overflow:hidden;
-    position:relative;
-    &.active{
-      height:auto;
-      overflow:auto;
+  .subject-box {
+    height: 90px;
+    overflow: hidden;
+    position: relative;
+    &.active {
+      height: auto;
+      overflow: auto;
     }
-    .showAll{
-      position:absolute;
-      bottom:0;
-      right:10px;
+    .showAll {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
       font-size: 12px;
       color: #7f7f7f;
       cursor: pointer;
-      padding:2px;
-      &:hover{
-        color:#667ffd
+      padding: 2px;
+      &:hover {
+        color: #667ffd;
       }
     }
   }
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index 669ecef..c922546 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -111,6 +111,7 @@
     </div>
     <el-dialog title="添加学生" :visible.sync="diaStu" width="400">
       <el-form
+        ref="formBox"
         class="form-box"
         :model="formStu"
         :rules="rulesStu"
@@ -121,12 +122,12 @@
         </el-form-item>
         <el-form-item label="学生姓名：" prop="studentName">
           <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formStu.studentName" />
+            <el-input maxlength="30" placeholder="输入学生姓名" v-model.trim="formStu.studentName" />
           </el-col>
         </el-form-item>
         <el-form-item label="长学号：" prop="studentCode">
           <el-col :span="10">
-            <el-input maxlength="12" v-model.trim="formStu.studentCode" />
+            <el-input maxlength="12" placeholder="输入学生长学号" v-model.trim="formStu.studentCode" />
           </el-col>
         </el-form-item>
         <el-form-item label="短学号：">
@@ -296,7 +297,7 @@ export default {
       if (status === 0) {
         this.$message.success("删除成功");
         this.studentList.splice(index, 1);
-        this._QueryClass()
+        this._QueryClass();
       } else {
         this.$message.error(info);
       }
@@ -306,7 +307,7 @@ export default {
       await this._QueryClass(val);
       this._QueryData(3);
     },
-    async addStu() {
+    addStu() {
       let query = {};
       for (let key in this.formStu) {
         if (key != "className" && this.formStu[key]) {
@@ -314,20 +315,26 @@ export default {
         }
       }
       this.loading = true;
-      const { data, status, info } = await this.$request.addStudent({
-        classId: this.query.classId,
-        ...query,
+      this.$refs.formBox.validate(async (valid) => {
+        if (valid) {
+          const { data, status, info } = await this.$request.addStudent({
+            classId: this.query.classId,
+            ...query,
+          });
+          this.loading = false;
+          console.log(status);
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaStu = false;
+            this._QueryClass();
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
       });
-      this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.$message.success(info);
-        this.diaStu = false;
-        this._QueryClass()
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
     },
     async _QueryData(type) {
       let query = {};
@@ -342,8 +349,8 @@ export default {
       } else if (type == 3) {
         this.query.studentName = "";
         this.query.studentCode = "";
-      }else{
-        query = this.query
+      } else {
+        query = this.query;
       }
       this.loading = true;
       const { data, status, info } = await this.$request.studentList({
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index b2aa6a2..41e3739 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -300,7 +300,7 @@
               >
               </el-option>
             </el-select>
-            <el-cascader
+            <el-cascader size="small"
               v-if="item.roleId == 6"
               class="sel-t"
               collapse
@@ -310,7 +310,7 @@
               :options="gradeClassList"
               :props="{ expandTrigger: 'hover' }"
             ></el-cascader>
-            <el-cascader
+            <el-cascader size="small"
               v-if="item.roleId == 7"
               class="sel-t"
               collapse
@@ -320,7 +320,7 @@
               :options="classList"
               :props="{ expandTrigger: 'hover' }"
             ></el-cascader>
-            <el-cascader
+            <el-cascader size="small"
               v-if="item.roleId == 8"
               class="sel-t"
               collapse
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index a53d477..6fed0dd 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -25,7 +25,6 @@
           v-if="role == 'ROLE_BANZHUREN'"
           class="sel"
           multiple
-          collapse-tags
           v-model="query.subjectId"
           placeholder="选择科目"
           @change="_QueryData"
--
libgit2 0.21.4