diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 2e00b37..f120f12 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1,247 +1,393 @@
-
-import service from "../axios"
-import setUpUrls from "../urls/apis"
+import service from "../axios";
+import setUpUrls from "../urls/apis";
 
 export default {
-  // 学校管理员首页数据
+  // 教师首页数据
   teacherIndex(data) {
     return service({
       url: setUpUrls.teacherIndex,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   // 学校管理员首页数据
   schoolIndex(data) {
     return service({
       url: setUpUrls.schoolIndex,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
+  },
+  // 集团管理员首页数据
+  tenantIndex(data) {
+    return service({
+      url: setUpUrls.tenantIndex,
+      method: "POST",
+      data,
+    });
   },
   // 查询角色列表
   roleList(data) {
     return service({
       url: setUpUrls.roleList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   // 分页查询账号
   userPage(data) {
     return service({
       url: setUpUrls.userPage,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改账号 禁用账号、修改账号密码等
   updateUser(data) {
     return service({
       url: setUpUrls.updateUser,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询学校详情
   schoolDetail(data) {
     return service({
       url: setUpUrls.schoolDetail,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改学校信息
   updateSchool(data) {
     return service({
       url: setUpUrls.updateSchool,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  学校年级管理
   gradeList(data) {
     return service({
       url: setUpUrls.gradeList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询学校所有科目
   subjectList(data) {
     return service({
       url: setUpUrls.subjectList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改年级信息
   updateGrade(data) {
     return service({
       url: setUpUrls.updateGrade,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询学校班级列表
   schoolClassList(data) {
     return service({
       url: setUpUrls.classList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询学生列表
   studentList(data) {
     return service({
       url: setUpUrls.studentList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改班级信息
   updateClass(data) {
     return service({
       url: setUpUrls.updateClass,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  增加学生
   addStudent(data) {
     return service({
       url: setUpUrls.addStudent,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  删除学生
   delStudent(data) {
     return service({
       url: setUpUrls.delStudent,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询学校教师列表
   teacherList(data) {
     return service({
       url: setUpUrls.teacherList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  新增教师
   addTeacher(data) {
     return service({
       url: setUpUrls.addTeacher,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改教师信息
   updateTeacher(data) {
     return service({
       url: setUpUrls.updateTeacher,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  删除教师管理班级或年级
   delTeacherManager(data) {
     return service({
       url: setUpUrls.delTeacherManager,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询基站统计数据
   stationReport(data) {
     return service({
       url: setUpUrls.stationReport,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询答题器统计数据
   keyboardReport(data) {
     return service({
       url: setUpUrls.keyboardReport,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  分页查询设备列表
   deviceList(data) {
     return service({
       url: setUpUrls.deviceList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改设备自动升级状态
   modifyUpgradeFlag(data) {
     return service({
       url: setUpUrls.modifyUpgradeFlag,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改基站信息
   updateDevice(data) {
     return service({
       url: setUpUrls.updateDevice,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询下载配置列表
   appConfigList(data) {
     return service({
       url: setUpUrls.appConfigList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  查询最新的授课端应用版本
   latestVersion(data) {
     return service({
       url: setUpUrls.latestVersion,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  下载指定配置的最新版本授课端
   getAppDownloadUrl(data) {
     return service({
       url: setUpUrls.getAppDownloadUrl,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  新增授课端应用配置
   addAppConfig(data) {
     return service({
       url: setUpUrls.addAppConfig,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  修改授课端应用配置
   updateAppConfig(data) {
     return service({
       url: setUpUrls.updateAppConfig,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
   },
   //  发卡记录
   cardList(data) {
     return service({
       url: setUpUrls.cardList,
-      method: 'POST',
-      data
-    })
+      method: "POST",
+      data,
+    });
+  },
+
+  /**
+   * 集团管理员-学校管理
+   */
+  //  区域列表
+  regionList(data) {
+    return service({
+      url: setUpUrls.regionList,
+      method: "POST",
+      data,
+    });
+  },
+  //  学校列表
+  schoolList(data) {
+    return service({
+      url: setUpUrls.schoolList,
+      method: "POST",
+      data,
+    });
+  },
+  //  新增或修改学校
+  saveSchool(data) {
+    return service({
+      url: setUpUrls.saveSchool,
+      method: "POST",
+      data,
+    });
+  },
+  //  删除学校
+  removeSchool(data) {
+    return service({
+      url: setUpUrls.removeSchool,
+      method: "POST",
+      data,
+    });
+  },
+  //  新增或修改区域
+  saveRegion(data) {
+    return service({
+      url: setUpUrls.saveRegion,
+      method: "POST",
+      data,
+    });
+  },
+  //  新增学校管理员
+  addSchoolManager(data) {
+    return service({
+      url: setUpUrls.addSchoolManager,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询角色列表
+  tenantRoleList(data) {
+    return service({
+      url: setUpUrls.tenantRoleList,
+      method: "POST",
+      data,
+    });
+  },
+  //  账号列表
+  tenantUserPage(data) {
+    return service({
+      url: setUpUrls.tenantUserPage,
+      method: "POST",
+      data,
+    });
+  },
+  //  新增账号
+  addUser(data) {
+    return service({
+      url: setUpUrls.addUser,
+      method: "POST",
+      data,
+    });
+  },
+  //  禁用账号、修改账号密码等
+  tenantUpdateUser(data) {
+    return service({
+      url: setUpUrls.tenantUpdateUser,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询基站统计数据
+  tenantStationReport(data) {
+    return service({
+      url: setUpUrls.tenantStationReport,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询答题器统计数据
+  tenantKeyboardReport(data) {
+    return service({
+      url: setUpUrls.tenantKeyboardReport,
+      method: "POST",
+      data,
+    });
+  },
+  //  分页查询设备列表
+  tenantDeviceList(data) {
+    return service({
+      url: setUpUrls.tenantDeviceList,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询学校年级
+  tenantGradeList(data) {
+    return service({
+      url: setUpUrls.tenantGradeList,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询学校班级
+  tenantClassList(data) {
+    return service({
+      url: setUpUrls.tenantClassList,
+      method: "POST",
+      data,
+    });
+  },
+  //  学校使用对比
+  schoolContrast(data) {
+    return service({
+      url: setUpUrls.schoolContrast,
+      method: "POST",
+      data,
+    });
+  },
+  //  年级使用对比
+  gradeContrast(data) {
+    return service({
+      url: setUpUrls.gradeContrast,
+      method: "POST",
+      data,
+    });
   },
-  
-}
+};
diff --git a/src/api/axios.js b/src/api/axios.js
index a9cf526..cfa258f 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -42,7 +42,7 @@ service.interceptors.response.use(
       // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       // console.log(response.status)
       if (res.status == 999) {
-        // if (!location.href.includes("localhost")) {
+        if (!location.href.includes("localhost")) {
           if (res.data) {
             window.location.href = res.data;
           } else {
@@ -55,7 +55,7 @@ service.interceptors.response.use(
               });
             }
           }
-        // }
+        }
       } else {
         // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       }
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 6b5ef80..79b1088 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -4,6 +4,8 @@ export default {
   teacherIndex: "/api_html/teaching/index",
   // 学校管理员首页数据
   schoolIndex: "/api_html/school/manager/index",
+  // 学校管理员首页数据
+  tenantIndex: "/api_html/tenant/index",
   // 查询角色列表
   roleList: "/api_html/school/manager/roleList",
   //  分页查询账号
@@ -60,4 +62,41 @@ export default {
   updateAppConfig: "/api_html/school/manager/updateAppConfig",
   // 发卡记录
   cardList: "/api_html/school/manager/cardList",
+  
+  
+  // 查询区域列表
+  regionList: "/api_html/tenant/regionList",
+  // 查询学校列表
+  schoolList: "/api_html/tenant/schoolList",
+  // 新增或修改区域
+  saveRegion: "/api_html/tenant/saveRegion",
+  // 新增或修改学校
+  saveSchool: "/api_html/tenant/saveSchool",
+  // 删除学校
+  removeSchool: "/api_html/tenant/delSchool",
+  // 新增学校管理员
+  addSchoolManager: "/api_html/tenant/addSchoolManager",
+  // 查询角色列表
+  tenantRoleList: "/api_html/tenant/roleList",
+  // 账号列表
+  tenantUserPage: "/api_html/tenant/userPage",
+  // 新增账号
+  addUser: "/api_html/tenant/addUser",
+  // 禁用账号、修改账号密码等
+  tenantUpdateUser: "/api_html/tenant/updateUser",
+  // 查询基站统计数据
+  tenantStationReport: "/api_html/tenant/stationReport",
+  // 查询答题器统计数据
+  tenantKeyboardReport: "/api_html/tenant/keyboardReport",
+  // 分页查询设备列表
+  tenantDeviceList: "/api_html/tenant/deviceList",
+  // 查询学校年级
+  tenantGradeList: "/api_html/tenant/gradeList",
+  // 查询学校班级
+  tenantClassList: "/api_html/tenant/classList",
+  
+  //  学校使用对比
+  schoolContrast: "/api_html/tenant/schoolContrast",
+  //  年级使用对比
+  gradeContrast: "/api_html/tenant/gradeContrast",
 }
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index bf5a183..c093253 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -42,7 +42,7 @@
       border-radius: 20px;
       border: 1px solid #e2e2e2;
       box-sizing: border-box;
-
+      background: #fff;
       .el-input__inner {
         border-radius: 20px;
         border: none;
diff --git a/src/router/index.js b/src/router/index.js
index 9303689..ad82ca6 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -68,22 +68,6 @@ let defaultRouter = [
       }
     ]
   },
-  // {
-  //   path: "/setUpConglomerate",
-  //   iconCls: "fa fa-building", // 图标样式class
-  //   name: "学校管理",
-  //   component: Layout,
-  //   alone: true,
-  //   children: [
-  //     {
-  //       path: "/setUpConglomerate",
-  //       iconCls: "fa fa-building",
-  //       name: '集团管理',
-  //       component: SetUpConglomerate,
-  //       children: []
-  //     },
-  //   ]
-  // },
   {
     path: "/404",
     component: NotFound,
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 434205b..c0828e1 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -12,7 +12,7 @@
             class="sel"
             v-model="query.gradeName"
             placeholder="选择年级"
-            @change="_QueryData(1)"
+            @change="_QueryData"
           >
             <el-option
               v-for="item in gradeList"
@@ -55,15 +55,15 @@
               >本季度</span
             >
           </p>
-          <el-button type="primary" round @click="_QueryData()">筛选</el-button>
+          <el-button type="primary" round @click="_QueryData">筛选</el-button>
         </div>
       </div>
       <div class="table-box">
         <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
           <el-radio-group v-model="type" @change="changeType">
-          <el-radio-button :label="1">学校使用对比</el-radio-button>
-          <el-radio-button :label="2">学段使用对比</el-radio-button>
-        </el-radio-group>
+            <el-radio-button :label="1">学校使用对比</el-radio-button>
+            <el-radio-button :label="2">学段使用对比</el-radio-button>
+          </el-radio-group>
         </div>
         <el-table
           :data="tableData"
@@ -93,10 +93,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <p
-          class="down"
-          v-if="role != 'ROLE_JITUAN'"
-        >
+        <p class="down" v-if="role != 'ROLE_JITUAN'">
           <el-button plain round icon="fa fa-cloud-download"
             >导出报表</el-button
           >
@@ -111,9 +108,9 @@ import { formatDate } from "@/utils";
 export default {
   data() {
     return {
-      role:"",
+      role: "",
       date: "", //今天-本周-本月-本季度
-      type:1, //集团管理员 表格切换
+      type: 1, //集团管理员 表格切换
       query: {
         //搜索条件
         gradeName: "",
@@ -157,7 +154,7 @@ export default {
     this.role = this.$store.getters.info.permissions.find(
       (item) => item.roleName == this.$store.getters.info.showRoleName
     )?.role;
-    this._QueryDataGrade();
+    this._QueryGradeList();
     // this.setDate(1);
     let startDay = this.query?.startDay;
     if (!startDay) {
@@ -166,8 +163,11 @@ export default {
     }
   },
   methods: {
-    changeType(val){
-      // this._QueryData(val)
+    changeType(val) {
+      if(val==1){
+        this.query.gradeName = ""
+      }
+      this._QueryData(val)
     },
     setDate(index) {
       const that = this;
@@ -246,32 +246,63 @@ export default {
           query[key] = this.query[key];
         }
       }
-      const { data, status, info } = await this.$request.fetchQuizList({
+      if (this.role == "ROLE_JITUAN") {
+        if (this.query.gradeName == "") {
+          this.type = 1;
+        } else {
+          this.type = 2;
+        }
+      }
+      const Contrast =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeContrast
+          : this.type == 1
+          ? this.$request.schoolContrast
+          : this.$request.gradeContrast;
+      const { data, status, info } = await Contrast({
         ...query,
       });
       this.loading = false;
       if (status === 0) {
+        this.tableData = [...data.list] || [];
       } else {
         this.$message.error(info);
       }
     },
-    async _QueryDataGrade() {
-      //年级数据
-      const { data, status, info } = await this.$request.gradeList();
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeList
+          : this.$request.regionList;
+      const { data, status, info } = await gradeList();
       if (status === 0) {
-        this.gradeList =
-          data.list?.map((item) => {
-            return {
-              value: item.gradeName,
-              label: item.gradeName,
-              id: item.grade,
-            };
-          }) || [];
-        this.gradeList.unshift({
-          value: "",
-          label: "全部",
-        });
-        this.query.gradeName = this.gradeList[0]?.value;
+        if (!!data.list) {
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.grade,
+                  label: item.gradeName,
+                };
+                return gradeList;
+              }) || [];
+          } else {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.id,
+                  label: item.regionName,
+                };
+                return gradeList;
+              }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
+          }
+        }
       } else {
         this.$message.error(info);
       }
@@ -284,8 +315,8 @@ export default {
 .table-box {
   padding: 0 20px;
 }
-.radio-box{
-  padding-bottom:12px;
+.radio-box {
+  padding-bottom: 12px;
 }
 .down {
   padding-top: 20px;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 1a7afe2..6590087 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -296,7 +296,9 @@
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
-                <span class="sel">共选择{{selectionTabIds.length}}个授课端</span>
+                <span class="sel"
+                  >共选择{{ selectionTabIds.length }}个授课端</span
+                >
                 <el-button plan round @click="autoUpDate(false)"
                   >开启自动更新</el-button
                 >
@@ -485,6 +487,7 @@ export default {
   },
   data() {
     return {
+      role: "",
       school: "",
       loading: false,
       url: "/web/upLoadDevice",
@@ -541,6 +544,13 @@ export default {
     };
   },
   created() {
+    let role = "";
+    this.$store.getters.info.permissions.map((item) => {
+      if (item.roleName == this.$store.getters.info.showRoleName) {
+        role = item.role;
+      }
+    });
+    this.role = role ? role : this.$store.getters.info.permissions[0].role;
     this.stationReport();
     this._QueryGradeList();
     this._QueryData();
@@ -612,7 +622,7 @@ export default {
       this.loadingUpDate = false;
       if (data && !data.code) {
         this._QueryData(false);
-        this.selectionTabIds = []
+        this.selectionTabIds = [];
         this.$message.success("开启自动更新成功");
       } else {
         this.$message.error(data.message);
@@ -631,7 +641,7 @@ export default {
       });
       this.loadingUpDate = false;
       if (data && !data.code) {
-        this.selectionTabIds = []
+        this.selectionTabIds = [];
         this._QueryData(false);
         this.$message.success("关闭自动更新成功");
       } else {
@@ -668,25 +678,47 @@ export default {
     // 查找班级
     async _QueryGradeList() {
       this.loading = true;
-      const { data, status, info } = await this.$request.gradeList();
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeList
+          : this.$request.regionList;
+      const { data, status, info } = await gradeList();
       console.log(status);
       if (status === 0) {
         if (!!data.list) {
-          this.gradeList =
-            data.list?.map((item) => {
-              let gradeList = {
-                value: item.grade,
-                label: item.gradeName,
-              };
-              gradeList.children =
-                item.classList?.map((items) => {
-                  return {
-                    value: items.classCode,
-                    label: items.className,
-                  };
-                }) || [];
-              return gradeList;
-            }) || [];
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.grade,
+                  label: item.gradeName,
+                };
+                gradeList.children =
+                  item.classList?.map((items) => {
+                    return {
+                      value: items.classCode,
+                      label: items.className,
+                    };
+                  }) || [];
+                return gradeList;
+              }) || [];
+          } else {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.id,
+                  label: item.regionName,
+                };
+                gradeList.children =
+                  item.schoolList?.map((items) => {
+                    return {
+                      value: items.id,
+                      label: items.schoolName,
+                    };
+                  }) || [];
+                return gradeList;
+              }) || [];
+          }
         }
       } else {
         this.$message.error(info);
@@ -694,13 +726,21 @@ export default {
     },
     // 基站统计数据
     async stationReport() {
-      const { data, status, info } = await this.$request.stationReport();
+      const stationReport =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.stationReport
+          : this.$request.tenantStationReport;
+      const { data, status, info } = await stationReport();
       if (status === 0) {
         this.chartData =
           data.list?.map((item) => {
             return {
               name:
-                item.onlineStatus == "1" ? "在线" : item.onlineStatus == 0 ? "离线" : "异常",
+                item.onlineStatus == "1"
+                  ? "在线"
+                  : item.onlineStatus == 0
+                  ? "离线"
+                  : "异常",
               value: item.rate,
               count: item.count,
             };
@@ -712,7 +752,11 @@ export default {
     },
     // 答题器统计数据
     async keyboardReport() {
-      const { data, status, info } = await this.$request.keyboardReport();
+      const keyboardReport =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.keyboardReport
+          : this.$request.tenantKeyboardReport;
+      const { data, status, info } = await keyboardReport();
       if (status === 0) {
         this.chartData2 =
           data.list?.map((item) => {
@@ -765,16 +809,19 @@ export default {
       }
 
       this.loading = true;
-      const { data, status, info } = await this.$request.deviceList({
+      const deviceList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.deviceList
+          : this.$request.tenantDeviceList;
+      const { data, status, info } = await deviceList({
         ...query,
         deviceType: this.type,
         page: this.page,
         size: this.size,
       });
       this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.tableData = data.list || [];
+      if (status == 0) {
+        this.tableData = data?.list || [];
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index 23acb2d..370ea26 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -53,12 +53,19 @@
         <div class="back-l" @click="dialogVis = false">
           <i class="fa fa-mail-reply-all"></i>
           <p>
-            {{ `${type == 1 ? "参数设置" : formData.configName + "-修改入口"}` }}
+            {{
+              `${type == 1 ? "参数设置" : formData.configName + "-修改入口"}`
+            }}
           </p>
         </div>
       </div>
       <div class="form-box">
-        <el-form :model="formData" :rules="ruleForm" label-width="180px">
+        <el-form
+          ref="forms"
+          :model="formData"
+          :rules="ruleForm"
+          label-width="180px"
+        >
           <el-form-item label="主菜单设置：" prop="configName" v-if="type == 1">
             <el-col :span="12">
               <el-input
@@ -401,7 +408,7 @@ export default {
     setConfigForm(obj) {
       let content = JSON.parse(obj.content);
       console.log(content);
-       this.formData.configName = obj.configName
+      this.formData.configName = obj.configName;
       for (let key in this.formData) {
         content[key] ? (this.formData[key] = content[key]) : "";
       }
@@ -441,18 +448,24 @@ export default {
         }
       }
       content.examsDuration = content.examsDuration * 60;
-
-      if (this.type == 1) {
-        this.addAppConfig({
-          configName: this.formData.configName,
-          content: { ...content },
-        });
-      } else {
-        this.updateAppConfig({
-          configId: this.configId,
-          content: { ...content },
-        });
-      }
+      this.$refs.forms.validate((valid) => {
+        if (valid) {
+          if (this.type == 1) {
+            this.addAppConfig({
+              configName: this.formData.configName,
+              content: { ...content },
+            });
+          } else {
+            this.updateAppConfig({
+              configId: this.configId,
+              content: { ...content },
+            });
+          }
+        } else {
+          this.$message.warning("配置名称输入有误请检查！");
+          return false;
+        }
+      });
     },
 
     async addAppConfig(params) {
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 619ea64..7e2aa94 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -25,6 +25,7 @@
         >
           <el-form-item label="答题卡名称：" prop="title">
             <el-input
+            class="sel2"
               type="text"
               placeholder="请输入答题卡名称"
               v-model.trim="form.title"
@@ -955,6 +956,9 @@ export default {
 .red {
   color: #f30;
 }
+.sel2{
+  width:480px;
+}
 .content-box{
   width:100%;
   height:100%;
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index eff53b9..719a7a8 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -6,9 +6,9 @@
         <div class="text">
           <p class="p1">账号管理</p>
           <p class="p2">
-            管理{{ schoolInfo.teacherCourseCount }}个任课教师，{{
-              schoolInfo.classManagerCount
-            }}个班主任，{{ schoolInfo.teacherGradeCount }}个备课组长账号信息。
+            管理{{ dataInfo.teacherCourseCount }}个任课教师，{{
+              dataInfo.classManagerCount
+            }}个班主任，{{ dataInfo.teacherGradeCount }}个备课组长账号信息。
           </p>
         </div>
       </li>
@@ -17,9 +17,9 @@
         <div class="text">
           <p class="p1">学校管理</p>
           <p class="p2">
-            管理{{ schoolInfo.gradeCount }}个年级，{{
-              schoolInfo.classCount
-            }}个班级，{{ schoolInfo.studentCount }}名学生信息。
+            管理{{ dataInfo.gradeCount }}个年级，{{
+              dataInfo.classCount
+            }}个班级，{{ dataInfo.studentCount }}名学生信息。
           </p>
         </div>
       </li>
@@ -28,8 +28,8 @@
         <div class="text">
           <p class="p1">设备状态</p>
           <p class="p2">
-            管理{{ schoolInfo.stationCount }}个基站，{{
-              schoolInfo.keyboardCount
+            管理{{ dataInfo.stationCount }}个基站，{{
+              dataInfo.keyboardCount
             }}套答题器设备。
           </p>
         </div>
@@ -44,7 +44,7 @@
         </div>
         <div class="nav-item item1 item-child2" @click="links('/card')">
           <img class="icon" src="../../assets/nav/card.png" alt="" />
-          <p class="p1">发卡补卡</p>
+          <p class="p1">发卡记录</p>
           <p class="p2">查看发卡、换卡记录信息。</p>
         </div>
         <div class="nav-item item1 item-child2" @click="links('/down')">
@@ -65,15 +65,15 @@
           <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/setUpConglomerate'">
             <p class="p1">学校管理</p>
-            <p class="p2">管理3个区域，14个学校。</p>
+            <p class="p2">管理{{dataInfo.regionCount}}个区域，{{dataInfo.schoolCount}}个学校。</p>
           </div>
           <div class="text" v-else-if="item.path == '/setUpAccount'">
             <p class="p1">账号管理</p>
-            <p class="p2">共35个各层级管理员账号。</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">管理14个基站，396套答题器设备。</p>
+            <p class="p2">管理{{dataInfo.stationCount}}个基站，{{dataInfo.keyboardCount}}套答题器设备。</p>
           </div>
           <div class="text" v-else-if="item.path == '/analysis'">
             <p class="p1">使用分析</p>
@@ -96,22 +96,22 @@
           <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/examinationPaper'">
             <p class="p1">备题组卷</p>
-            <p class="p2">管理{{ schoolInfo.paperCount }}套答题卡。</p>
+            <p class="p2">管理{{ dataInfo.paperCount }}套答题卡。</p>
           </div>
           <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
-            <!-- <p class="p2">共分析{{ schoolInfo.imagesCount }}名学生成绩。</p> -->
+            <!-- <p class="p2">共分析{{ dataInfo.imagesCount }}名学生成绩。</p> -->
             <p class="p2">功能开发中。</p>
           </div>
           <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
             <p class="p2">
-              对{{ schoolInfo.classPeriodCount }}套随堂问答题记录分析。
+              对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析。
             </p>
           </div>
           <div class="text" v-else-if="item.path == '/test'">
             <p class="p1">即时测报表</p>
-            <p class="p2">对{{ schoolInfo.examCount }}套即时测答题记录分析。</p>
+            <p class="p2">对{{ dataInfo.examCount }}套即时测答题记录分析。</p>
           </div>
         </li>
       </template>
@@ -126,7 +126,7 @@ export default {
     return {
       type: "",
       navList: [],
-      schoolInfo: {},
+      dataInfo: {},
     };
   },
   watch: {
@@ -164,6 +164,8 @@ export default {
       this.schoolIndex();
     } else if (this.type == "ROLE_JIAOSHI" || this.type == "ROLE_BANZHUREN") {
       this.teacherIndex();
+    }else if (this.type == "ROLE_JITUAN") {
+      this.tenantIndex();
     }
   },
   methods: {
@@ -178,7 +180,7 @@ export default {
     async teacherIndex() {
       const { data, status, info } = await this.$request.teacherIndex();
       if (status === 0) {
-        this.schoolInfo = { ...data };
+        this.dataInfo = { ...data };
       } else {
         this.$message.error(info);
       }
@@ -186,7 +188,15 @@ export default {
     async schoolIndex() {
       const { data, status, info } = await this.$request.schoolIndex();
       if (status === 0) {
-        this.schoolInfo = { ...data };
+        this.dataInfo = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async tenantIndex() {
+      const { data, status, info } = await this.$request.tenantIndex();
+      if (status === 0) {
+        this.dataInfo = { ...data };
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a1f7b38..3a8158e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,12 +90,14 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        username: "13610050254",
-        password: "Pw050254#",
+        // 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 470361a..0306e77 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -4,10 +4,44 @@
       <template slot="title">
         <span>账号管理</span>
       </template>
+      <template slot="btns" v-if="role == 'ROLE_JITUAN'">
+        <el-tooltip effect="dark" content="导入账号" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            circle
+            @click="diaUp = true"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="添加账号" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            plain
+            circle
+            @click="openAddDia"
+          ></el-button>
+        </el-tooltip>
+      </template>
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
+        <el-cascader
+          v-if="role == 'ROLE_JITUAN'"
+          class="sel"
+          collapse-tags
+          clearable
+          placeholder="选择学校"
+          v-model="query.schoolId"
+          :options="schoolList"
+          :props="props"
+          :show-all-levels="false"
+        ></el-cascader>
         <el-select
+          v-else
           class="sel"
           v-model="query.roleId"
           placeholder="选择账号角色"
@@ -31,7 +65,9 @@
           <el-option label="禁用" :value="1"></el-option>
         </el-select>
         <el-input
-          placeholder="请输入老师账号"
+          :placeholder="
+            role != 'ROLE_JITUAN' ? '请输入老师账号' : '请输入账号名称'
+          "
           v-model="query.loginName"
           class="input-with-select"
           @keyup.enter.native="(page = 1), _QueryData(2)"
@@ -43,6 +79,7 @@
           ></el-button>
         </el-input>
         <el-input
+          v-if="role != 'ROLE_JITUAN'"
           placeholder="请输入老师姓名"
           v-model="query.realName"
           class="input-with-select"
@@ -54,6 +91,13 @@
             @click="(page = 1), _QueryData(3)"
           ></el-button>
         </el-input>
+        <el-button
+          v-if="role == 'ROLE_JITUAN'"
+          type="primary"
+          round
+          @click="_QueryData(4)"
+          >筛选</el-button
+        >
       </div>
     </div>
     <div class="table-box">
@@ -82,6 +126,18 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column
+          v-if="role == 'ROLE_JITUAN'"
+          prop="regionList"
+          label="管辖范围"
+          align="center"
+        >
+          <template slot-scope="scoped" v-if="scoped.row.regionList">
+            <span v-for="item in scoped.row.regionList" :key="item.id">{{
+              item.regionName
+            }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="available" label="状态" align="center"
           ><template slot-scope="scoped">{{
             `${scoped.row.available == 0 ? "正常" : "禁用"}`
@@ -177,15 +233,123 @@
         <el-button @click="diaCount = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="添加账号" :visible.sync="diaAdd" width="400">
+      <el-form
+        class="form-box"
+        :model="formAddCount"
+        :rules="ruleAddCount"
+        ref="formAddCount"
+        label-width="160px"
+      >
+        <el-form-item label="手机号码：" prop="phone">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入联系电话"
+              v-model.trim="formAddCount.phone"
+              maxlength="11"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="密码：" prop="password">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入密码"
+              v-model.trim="formAddCount.password"
+              maxlength="18"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="realName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入姓名"
+              v-model.trim="formAddCount.realName"
+              maxlength="30"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="选择角色：" prop="roleId">
+          <el-col :span="12">
+            <el-select
+              class="sel"
+              v-model="formAddCount.roleId"
+              placeholder="选择角色"
+            >
+              <el-option
+                v-for="item in tenantRoleList"
+                :key="item.id"
+                :label="item.roleName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="选择管辖范围：" prop="regionId">
+          <el-col :span="12">
+            <el-select
+              class="sel"
+              v-model="formAddCount.regionId"
+              placeholder="选择管辖范围"
+            >
+              <el-option
+                v-for="item in regionList"
+                :key="item.id"
+                :label="item.regionName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveAddCount">确 定</el-button>
+        <el-button @click="diaAdd = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog title="导入账号名单" :visible.sync="diaUp" width="600">
+      <up-load id="downTeacher" :url="url" fileName="教师名单">
+        <p class="down-txt" slot="down">
+          通过Excel名单导入账号名单，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { encryptLoginPassword } from "@/utils";
 export default {
   data() {
     return {
+      role: "",
+      diaUp: false,
+      diaAdd: false,
+      url: "", //上传地址
       loading: false,
       diaCount: false,
+      tenantRoleList: [],
+      regionList: [],
+      schoolList: [],
+      props: { multiple: true, checkStrictly: false },
+      roleList: [],
+      query: {
+        schoolId: [],
+        roleId: "",
+        available: "",
+        loginName: "",
+        realName: "",
+      },
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
       formCount: {
         userId: "",
         loginName: "",
@@ -199,24 +363,82 @@ export default {
           { required: true, message: "请输入教师姓名", trigger: "blur" },
         ],
       },
-      roleList: [],
-      query: {
-        roleId: "",
-        available: "",
-        loginName: "",
+      formAddCount: {
+        phone: "",
         realName: "",
+        password: "",
+        roleId: "",
+        regionId: "",
+      },
+      ruleAddCount: {
+        phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+        roleId: [{ required: true, message: "请选择角色", trigger: "blur" }],
+        regionId: [
+          { required: true, message: "请选择权限区域", trigger: "blur" },
+        ],
       },
-      tableData: [],
-      total: 0,
-      page: 1,
-      size: 20,
     };
   },
   created() {
+    let role = "";
+    this.$store.getters.info.permissions.map((item) => {
+      if (item.roleName == this.$store.getters.info.showRoleName) {
+        role = item.role;
+      }
+    });
+    this.role = role ? role : this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_JITUAN") {
+      this._TenantRoleList();
+      this._RegionList();
+    } else {
+      this._RoleList();
+    }
     this._QueryData(4);
-    this._RoleList();
   },
   methods: {
+    async downExcel() {
+      let data = await this.$request.downDevice();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`账号信息.xlsx`, blob);
+      } else {
+        this.$message.error(data.message);
+      }
+    },
+    openAddDia() {
+      //添加账号
+      this.formAddCount.phone = "";
+      this.formAddCount.realName = "";
+      this.formAddCount.password = "";
+      this.formAddCount.roleId = "";
+      this.formAddCount.regionId = "";
+      this.diaAdd = true;
+    },
+    saveAddCount() {
+      this.$refs.formAddCount.validate(async (valid) => {
+        if (valid) {
+          let params = { ...this.formAddCount };
+          params.password = encryptLoginPassword(params.password);
+          const { data, status, info } = await this.$request.addUser({
+            ...params,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this._QueryData(4);
+            this.diaAdd = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
     setCount(obj) {
       this.formCount.userId = obj.userId;
       this.formCount.loginName = obj.loginName;
@@ -224,6 +446,7 @@ export default {
       this.diaCount = true;
     },
     handleDropdownClick(value, item) {
+      console.log(item);
       //更多
       if (value == 2) {
         this.$confirm("确定要删除这条账号信息吗？", "提示", {
@@ -246,10 +469,16 @@ export default {
     saveCount() {
       this.$refs.formCount.validate(async (valid) => {
         if (valid) {
-          const { data, status, info } = await this.$request.updateUser({
-            type: 3,
-            ...this.formCount,
-          });
+          const { data, status, info } =
+            this.role != "ROLE_JITUAN"
+              ? await this.$request.updateUser({
+                  type: 3,
+                  ...this.formCount,
+                })
+              : await this.$request.tenantUpdateUser({
+                  type: 3,
+                  ...this.formCount,
+                });
           if (status === 0) {
             this.$message.success(info);
             this._QueryData(4);
@@ -257,22 +486,27 @@ export default {
             this.$message.error(info);
           }
         } else {
-          console.log("输入有误请检查！");
+          this.$message.warning("输入有误请检查！");
           return false;
         }
       });
     },
     async updateUser(obj, type) {
       let query = {
-        userId: obj.userId,
+        userId: obj.id,
         type: type,
       };
       if (type == 1) {
         query.available = obj.available == 0 ? 1 : 0;
       }
-      const { data, status, info } = await this.$request.updateUser({
-        ...query,
-      });
+      const { data, status, info } =
+        this.role != "ROLE_JITUAN"
+          ? await this.$request.updateUser({
+              ...query,
+            })
+          : await this.$request.tenantUpdateUser({
+              ...query,
+            });
       if (status === 0) {
         this.$message.success(info);
         this._QueryData(4);
@@ -288,6 +522,37 @@ export default {
         this.$message.error(info);
       }
     },
+    async _TenantRoleList() {
+      //集团-添加账号权限
+      const { data, status, info } = await this.$request.tenantRoleList();
+      if (status === 0) {
+        this.tenantRoleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _RegionList() {
+      //集团-区域列表
+      const { data, status, info } = await this.$request.regionList();
+      if (status === 0) {
+        this.regionList = [...data.list] || [];
+        this.schoolList = data.list?.map((item) => {
+          let children = item.schoolList?.map((items) => {
+            return {
+              value: items.id,
+              label: items.schoolName,
+            };
+          });
+          return {
+            value: item.id,
+            label: item.regionName,
+            children: children,
+          };
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData(type) {
       let query = {};
       if (type == 1) {
@@ -298,6 +563,7 @@ export default {
       } else if (type == 2) {
         this.query.roleId = "";
         this.query.available = "";
+        this.query.schoolId = [];
         query.loginName = this.query.loginName;
         this.query.realName = "";
       } else if (type == 3) {
@@ -308,13 +574,35 @@ export default {
       } else {
         query = { ...this.query };
       }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.realName;
+        query.regionIds = [];
+        query.schoolIds = [];
+        query.schoolId?.map((item) => {
+          if (!query.regionIds.includes(item[0])) {
+            query.regionIds.push(item[0]);
+          }
+          if (!query.schoolIds.includes(item[1])) {
+            query.schoolIds.push(item[1]);
+          }
+        });
+        delete query.schoolId;
+      }
       this.loading = true;
       this.tableData = [];
-      const { data, status, info } = await this.$request.userPage({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
+      const { data, status, info } =
+        this.role != "ROLE_JITUAN"
+          ? await this.$request.userPage({
+              ...query,
+              page: this.page,
+              size: this.size,
+            })
+          : await this.$request.tenantUserPage({
+              ...query,
+              page: this.page,
+              size: this.size,
+            });
+
       this.loading = false;
       if (status === 0) {
         this.tableData = data.list || [];
diff --git a/src/views/setUp/conglomerate.vue b/src/views/setUp/conglomerate.vue
index 911224e..b49362a 100644
--- a/src/views/setUp/conglomerate.vue
+++ b/src/views/setUp/conglomerate.vue
@@ -6,85 +6,79 @@
       </template>
     </back-box>
     <div class="page-content">
-      <el-empty
-        :image-size="100"
-        v-if="!tableList.length && loading == false"
-        description="没有更多数据"
-      ></el-empty>
-      <div v-else class="content-box" v-loading="loading">
+      <div class="content-box" v-loading="loading">
         <div class="left-box">
           <p class="h-title">
-            <span class="tog-type" @click="setType">{{
-              `${type == 1 ? "集团列表" : "区域列表"}`
-            }}</span>
+            <span class="tog-type">集团列表</span>
             <i class="icon el-icon-circle-plus-outline" @click="edit"></i>
           </p>
           <ul class="school-ul">
             <li
               class="school-item"
+              :class="showId == '' ? 'active' : ''"
+              @click="(showId = ''), showSchool(false)"
+            >
+              全部（{{ schoolTotal }}）
+            </li>
+            <li
+              class="school-item"
               v-for="item in tableList"
               :key="item.id"
               :class="showId == item.id ? 'active' : ''"
-              @click="showSchool(item)"
+              @click="(showId = item.id), showSchool()"
             >
-              {{ item.name }}（{{ item.num }}）
-              <!-- <i class="el-icon-edit-outline" @click.stop="setSchool(item)"></i> -->
+              {{ item.regionName }}（{{ item.schoolCount }}）
+              <i class="el-icon-edit-outline" @click.stop="setRegion(item)"></i>
             </li>
           </ul>
         </div>
         <div class="content-detail">
           <div class="title-box">
-            <span>管辖的学校（5）</span>
+            <span>管辖的学校（{{schoolData.num}}）</span>
             <i class="icon el-icon-circle-plus-outline" @click="addSchool"></i>
           </div>
-          <ul class="detail-list">
+          <el-empty
+            :image-size="100"
+            v-if="!schoolData.list.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+          <ul v-else class="detail-list">
             <li
               class="detail-item"
               v-for="item in schoolData.list"
               :key="item.id"
             >
               <p class="item-tit">
-                <span class="name" :class="type == 1 ? 'active' : ''">{{
-                  item.name
+                <span class="name active" @click="setSchool(item)">{{
+                  item.schoolName
                 }}</span>
-                <i
-                  @click="addAdmin(item)"
-                  v-if="type == 1"
-                  class="icon el-icon-user-solid"
-                ></i>
-                <el-popconfirm
-                  v-if="type == 2"
-                  title="确定删除吗？"
-                  @confirm="removeSchool(item)"
-                >
-                  <i slot="reference" class="icon el-icon-delete"></i>
-                </el-popconfirm>
+                <i @click="addAdmin(item)" class="icon el-icon-user-solid"></i>
               </p>
               <div class="info">
                 <p class="info-item">
                   <span class="txt">基站</span>
                   <img class="pic" src="../../assets/images/jizhan.png" />
-                  <span>49</span>
+                  <span>{{ item.stationCount }}</span>
                 </p>
                 <p class="info-item">
                   <span class="txt">键盘</span>
                   <img class="pic" src="../../assets/images/jianpan.png" />
-                  <span>49</span>
+                  <span>{{ item.keyboardCount }}</span>
                 </p>
                 <p class="info-item">
                   <span class="txt">班级</span>
                   <img class="pic" src="../../assets/images/banji.png" />
-                  <span>49</span>
+                  <span>{{ item.classCount }}</span>
                 </p>
                 <p class="info-item">
                   <span class="txt">学生</span>
                   <img class="pic" src="../../assets/images/xuesheng.png" />
-                  <span>49</span>
+                  <span>{{ item.studentCount }}</span>
                 </p>
                 <p class="info-item">
                   <span class="txt">老师</span>
                   <img class="pic" src="../../assets/images/laoshi.png" />
-                  <span>49</span>
+                  <span>{{ item.teacherCount }}</span>
                 </p>
               </div>
             </li>
@@ -92,7 +86,11 @@
         </div>
       </div>
     </div>
-    <el-dialog title="添加区域/集团" :visible.sync="diaCL" width="400">
+    <el-dialog
+      :title="isAdd ? '添加区域/集团' : '修改区域/集团'"
+      :visible.sync="diaCL"
+      width="400"
+    >
       <el-form
         class="form-box"
         ref="formCL"
@@ -100,11 +98,11 @@
         :rules="rulesCL"
         label-width="160px"
       >
-        <el-form-item label="区域/集团名称：" prop="name">
+        <el-form-item label="区域/集团名称：" prop="regionName">
           <el-col :span="10">
             <el-input
               maxlength="30"
-              v-model.trim="formCL.name"
+              v-model.trim="formCL.regionName"
               placeholder="请输入区域/集团名称"
             />
           </el-col>
@@ -124,7 +122,7 @@
         label-width="160px"
       >
         <el-form-item label="学校名称：">
-          <span>{{ schoolData.name + formAdmin.name }}</span>
+          <span>{{ formAdmin.schoolName }}</span>
         </el-form-item>
         <el-form-item label="手机号码：" prop="phone">
           <el-col :span="10">
@@ -139,7 +137,8 @@
           <el-col :span="10">
             <el-input
               maxlength="18"
-              v-model.trim="formAdmin.phone"
+              v-model.trim="formAdmin.password"
+              show-password
               placeholder="请输入密码"
             />
           </el-col>
@@ -167,11 +166,11 @@
         :rules="rulesSchool"
         label-width="160px"
       >
-        <el-form-item label="学校名称：" prop="name">
+        <el-form-item label="学校名称：" prop="schoolName">
           <el-col :span="10">
             <el-input
-              maxlength="11"
-              v-model.trim="formSchool.name"
+              maxlength="30"
+              v-model.trim="formSchool.schoolName"
               placeholder="请输入学校名称"
             />
           </el-col>
@@ -179,24 +178,25 @@
         <el-form-item label="所属区域/集团：">
           <el-select
             class="sel"
-            v-model="formSchool.quyu"
+            v-model="formSchool.regionId"
             placeholder="选择所属区域/集团"
           >
             <el-option
               v-for="item in tableList"
               :key="item.id"
-              :label="item.name"
+              :label="item.regionName"
               :value="item.id"
             >
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="学段：" prop="grade">
-          <el-checkbox-group v-model="formSchool.grade">
+        <el-form-item label="学段：">
+          <el-checkbox-group v-model="formSchool.sections">
             <el-checkbox :label="1">小学</el-checkbox>
             <el-checkbox :label="2">初中</el-checkbox>
             <el-checkbox :label="3">高中</el-checkbox>
             <el-checkbox :label="4">本科</el-checkbox>
+            <el-checkbox :label="7">高补</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
       </el-form>
@@ -207,47 +207,73 @@
         <el-button round @click="diaSchool = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="学校信息修改" :visible.sync="diaSchool2" width="400">
+      <el-form
+        class="form-box"
+        ref="formSchool2"
+        :model="setFormSchool"
+        :rules="rulesSchool"
+        label-width="160px"
+      >
+        <el-form-item label="学校名称：" prop="schoolName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              v-model.trim="setFormSchool.schoolName"
+              placeholder="请输入学校名称"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" round @click="saveSetFormSchool"
+          >确 定</el-button
+        >
+        <el-button round @click="diaSchool2 = false">取 消</el-button>
+        <el-button round @click="removeSchool">删除学校</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { encryptLoginPassword } from "@/utils";
 export default {
   data() {
     return {
+      isAdd: true,
       diaCL: false,
       diaAdmin: false,
       diaSchool: false,
+      diaSchool2: false,
       loading: false,
-      type: 1, //集团列表-1 区域列表-2
-      showId: 1, //显示学校Id
+      showId: "", //显示学校Id
+      schoolTotal: 0,
       tableList: [
         // 集团列表/区域列表
         {
           id: 1,
-          name: "云南衡水实验中学",
-          num: 5,
+          regionName: "云南衡水实验中学",
+          schoolCount: 5,
         },
       ],
       schoolData: {
         //学校信息
-        num: 5,
-        name: "云南衡水实验中学",
-        list: [
-          { id: 1, name: "曲靖校区" },
-          { id: 2, name: "玉溪校区" },
-        ],
+        num: 0,
+        list: [{ id: 1, schoolName: "曲靖校区" }],
       },
       formCL: {
-        name: "",
+        regionId: "",
+        regionName: "",
       },
       rulesCL: {
-        name: [
+        regionName: [
           { required: true, message: "请输入区域/集团名称", trigger: "blur" },
         ],
       },
       formAdmin: {
-        id: "",
-        name: "",
+        schoolId: "",
+        schoolName: "",
         phone: "",
         password: "",
         realName: "",
@@ -258,125 +284,185 @@ export default {
         realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
       },
       formSchool: {
-        name: "",
-        grade: [],
-        quyu: "",
+        schoolName: "",
+        regionId: "",
+        sections: [],
       },
       rulesSchool: {
-        name: [{ required: true, message: "请输入学校名称", trigger: "blur" }],
-        grade: [{ required: true, message: "请选择学段", trigger: "blur" }],
+        schoolName: [
+          { required: true, message: "请输入学校名称", trigger: "blur" },
+        ],
+        // sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
+      },
+      setFormSchool: {
+        schoolId: "",
+        schoolName: "",
       },
     };
   },
+  created() {
+    this._QueryData();
+    this.showSchool();
+  },
   methods: {
     edit() {
       //添加区域/集团
-      this.formCL.name = "";
+      this.isAdd = true;
+      this.formCL.regionId = "";
+      this.formCL.regionName = "";
       this.diaCL = true;
     },
     addAdmin(obj) {
       //添加管理员
-      this.formAdmin = { ...obj };
+      this.formAdmin.schoolId = obj.id;
+      this.formAdmin.schoolName = obj.schoolName;
+      this.formAdmin.phone = "";
+      this.formAdmin.password = "";
+      this.formAdmin.realName = "";
+
+
       this.diaAdmin = true;
     },
-    addSchool(obj) {
+    addSchool() {
       //添加学校
-      this.formSchool = {
-        name: "",
-        grade: [],
-        quyu: "",
-      };
+      this.formSchool.name = "";
+      this.formSchool.grade = [];
+      this.formSchool.quyu = "";
       this.diaSchool = true;
     },
-    setSchool() {
-      //
+    setRegion(obj) {
+      this.isAdd = false;
+      this.formCL.regionId = obj.id;
+      this.formCL.regionName = obj.regionName;
+      this.diaCL = true;
     },
-    setType() {
-      //集团列表、区域列表切换
-      this.type = this.type == 1 ? 2 : 1;
-      this._QueryData();
+    setSchool(obj) {
+      this.setFormSchool.schoolId = obj.id;
+      this.setFormSchool.schoolName = obj.schoolName;
+      this.diaSchool2 = true;
     },
-    removeSchool(obj) {
-      // const { data, status, info } = await this.$request.xxx({
-      //   id: obj.id,
-      // });
-      // if (status === 0) {
-      //   this.$message.success(info);
-      // } else {
-      //   this.$message.error(info);
-      // }
+    async removeSchool() {
+      const { data, status, info } = await this.$request.removeSchool({
+        schoolId: this.setFormSchool.schoolId,
+      });
+      if (status === 0) {
+        this._QueryData()
+        this.showSchool()
+        this.$message.success(info);
+        this.diaSchool2 = false
+      } else {
+        this.$message.error(info);
+      }
     },
     saveFormCL() {
       //保存添加区域/集团
-      // this.$refs["formCL"].validate(async (valid) => {
-      //   // 验证通过：保存
-      //   if (valid) {
-      //     const { data, status, info } = await this.$request.xxx({
-      //       name: this.formCL.name,
-      //     });
-      //     if (status === 0) {
-      //       this.$message.success(info);
-      this.diaCL = false;
-      //     } else {
-      //       this.$message.error(info);
-      //     }
-      //   } else {
-      //     this.$message.error("区域/集团名称数据有误，请检查！");
-      //     return false;
-      //   }
-      // });
+      this.$refs["formCL"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          const { data, status, info } = await this.$request.saveRegion({
+            regionId: this.formCL.regionId,
+            regionName: this.formCL.regionName,
+          });
+          if (status === 0) {
+            this._QueryData()
+            this.$message.success(info);
+            this.diaCL = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("区域/集团名称数据有误，请检查！");
+          return false;
+        }
+      });
     },
     saveFormAdmin() {
       //保存管理员
-      // this.$refs["formAdmin"].validate(async (valid) => {
-      //   // 验证通过：保存
-      //   if (valid) {
-      //     const { data, status, info } = await this.$request.xxx({...formAdmin});
-      //     if (status === 0) {
-      //       this.$message.success(info);
-      this.diaAdmin = false;
-      //     } else {
-      //       this.$message.error(info);
-      //     }
-      //   } else {
-      //     this.$message.error("区域/集团名称数据有误，请检查！");
-      //     return false;
-      //   }
-      // });
+      this.$refs["formAdmin"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          let params = { ...this.formAdmin };
+          params.password = encryptLoginPassword(this.formAdmin.password);
+          delete params.schoolName;
+          const { data, status, info } = await this.$request.addSchoolManager({
+            ...params,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaAdmin = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+          return false;
+        }
+      });
     },
     saveFormSchool() {
       //保存学校
-      // this.$refs["formAdmin"].validate(async (valid) => {
-      //   // 验证通过：保存
-      //   if (valid) {
-      //     const { data, status, info } = await this.$request.xxx({...formAdmin});
-      //     if (status === 0) {
-      //       this.$message.success(info);
-      this.diaSchool = false;
-      //     } else {
-      //       this.$message.error(info);
-      //     }
-      //   } else {
-      //     this.$message.error("区域/集团名称数据有误，请检查！");
-      //     return false;
-      //   }
-      // });
+      this.$refs["formSchool"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          const { data, status, info } = await this.$request.saveSchool({
+            ...this.formSchool,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaSchool = false;
+            this._QueryData();
+            this.showSchool();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("学校名称数据有误，请检查！");
+          return false;
+        }
+      });
     },
-    async showSchool(obj) {
-      // const { data, status, info } = await this.$request.xxx();
-      // if (status === 0) {
-      //   this.$message.success(info);
-      // } else {
-      //   this.$message.error(info);
-      // }
+    saveSetFormSchool() {
+      //保存学校
+      this.$refs["formSchool2"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          const { data, status, info } = await this.$request.saveSchool({
+            ...this.setFormSchool,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaSchool2 = false;
+            this.showSchool();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("学校名称数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    async showSchool() {
+      this.loading = true
+      const { data, status, info } = await this.$request.schoolList({
+        regionId: this.showId,
+      });
+      this.loading = false
+      if (status === 0) {
+        this.schoolData.list = [...data.list] || [];
+        this.schoolData.num = data.count;
+      } else {
+        this.$message.error(info);
+      }
     },
     async _QueryData() {
-      // const { data, status, info } = await this.$request.xxx();
-      // if (status === 0) {
-      //   this.$message.success(info);
-      // } else {
-      //   this.$message.error(info);
-      // }
+      const { data, status, info } = await this.$request.regionList();
+      if (status === 0) {
+        this.tableList = [...data.list] || [];
+        this.schoolTotal = data.schoolCount;
+      } else {
+        this.$message.error(info);
+      }
     },
   },
 };
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index 2e039d6..78033e0 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -174,8 +174,8 @@
         <el-form-item label="手机号码：" prop="contactPhone"
           ><el-col :span="10"
             ><el-input
-              type="number"
               v-model="formSchool.contactPhone"
+              type="number"
               oninput="if(value.length > 11) value = value.slice(0,11)"
               placeholder="请输入联系人手机号码"
             ></el-input></el-col
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index 12b0009..669ecef 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -284,7 +284,7 @@ export default {
             this.$message.error(info);
           }
         } else {
-          console.log("输入有误请检查！");
+          this.$message.warning("输入有误请检查！");
           return false;
         }
       });
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index 8b989cf..633e18d 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -59,9 +59,9 @@
         </el-input>
         <el-input
           type="number"
+          oninput="if(value.length > 11) value = value.slice(0,11)"
           placeholder="请输入老师手机号"
           v-model="query.phone"
-          maxlength="11"
           class="input-with-select"
           @keyup.enter.native="_QueryData(3)"
         >
@@ -216,7 +216,9 @@
       </div>
     </el-dialog>
     <el-dialog
-      :title="isAdd ? '添加教师' : setTercherType==1?'编辑教师信息':'管理班级'"
+      :title="
+        isAdd ? '添加教师' : setTercherType == 1 ? '编辑教师信息' : '管理班级'
+      "
       :visible.sync="diaTeacher"
       width="400"
     >
@@ -227,8 +229,8 @@
         :rules="rulesTeacher"
         label-width="160px"
       >
-       <el-form-item v-show="!isAdd && setTercherType == 2" label="教师姓名：">
-          <span>{{formTeacher.teacherName}}</span>
+        <el-form-item v-show="!isAdd && setTercherType == 2" label="教师姓名：">
+          <span>{{ formTeacher.teacherName }}</span>
         </el-form-item>
         <el-form-item
           v-show="isAdd || (!isAdd && setTercherType == 1)"
@@ -236,21 +238,37 @@
           prop="loginName"
         >
           <el-col :span="10">
-            <el-input type="number" moninput="if(value.length > 11) value = value.slice(0,11)"  v-model.trim="formTeacher.loginName" />
+            <el-input
+              type="number"
+              moninput="if(value.length > 11) value = value.slice(0,11)"
+              v-model.trim="formTeacher.loginName"
+            />
           </el-col>
         </el-form-item>
-        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 1)" label="教师姓名：" prop="teacherName">
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="教师姓名："
+          prop="teacherName"
+        >
           <el-col :span="10">
             <el-input maxlength="30" v-model.trim="formTeacher.teacherName" />
           </el-col>
         </el-form-item>
-        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 1)" label="性别：" prop="sex">
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="性别："
+          prop="sex"
+        >
           <el-radio-group v-model="formTeacher.sex">
             <el-radio :label="1">男</el-radio>
             <el-radio :label="2">女</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 2)" label="教师角色：" prop="roleList">
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 2)"
+          label="教师角色："
+          prop="roleList"
+        >
           <div
             class="role-list"
             v-for="(item, index) in formTeacher.roleList"
@@ -429,7 +447,7 @@ export default {
     },
     editTeacher(type) {
       this.diaTeacher = true;
-      this.setTercherType = type
+      this.setTercherType = type;
       this.isAdd = false;
       for (let key in this.teacherDetail) {
         if (key == "realName") {
@@ -474,7 +492,7 @@ export default {
             this.$message.error(res.info);
           }
         } else {
-          console.log("输入有误请检查！");
+          this.$message.warning("输入有误请检查！");
           return false;
         }
       });
@@ -493,24 +511,24 @@ export default {
           if (item.roleId == 6) {
             managerList.push({
               classId: item.classId[1],
-              className: this.classList.find(
-                (items) => items.value == item.classId[1]
-              )?.label||"",
+              className:
+                this.classList.find((items) => items.value == item.classId[1])
+                  ?.label || "",
             });
           } else if (item.roleId == 7) {
             teacherCourseList.push({
               classId: item.classId[0],
-              className: this.classList.find(
-                (items) => items.value == item.classId[0]
-              )?.label||"",
+              className:
+                this.classList.find((items) => items.value == item.classId[0])
+                  ?.label || "",
               subjectName: item.classId[1],
             });
           } else {
             gradeGroupList.push({
               grade: item.classId[0],
-              gradeName: this.gradeList.find(
-                (items) => items.id == item.classId[0]
-              )?.label||"",
+              gradeName:
+                this.gradeList.find((items) => items.id == item.classId[0])
+                  ?.label || "",
               subjectName: item.classId[1],
             });
           }
@@ -580,22 +598,21 @@ export default {
         this.query.teacherName = "";
         this.query.phone = "";
       } else if (type == 2) {
-         if(this.query.teacherName == ""){
-          this.$message.warning('请输入老师姓名')
-          return
+        if (this.query.teacherName == "") {
+          this.$message.warning("请输入老师姓名");
+          return;
         }
         query.teacherName = this.query.teacherName;
         this.query.gradeName = "";
         this.query.phone = "";
       } else if (type == 3) {
-        if(this.query.phone == ""){
-          this.$message.warning('请输入老师手机')
-          return
+        if (this.query.phone == "") {
+          this.$message.warning("请输入老师手机");
+          return;
         }
         query.phone = this.query.phone;
         this.query.teacherName = "";
         this.query.gradeName = "";
-        
       } else if (type == 10) {
         query = { ...this.query };
       }