diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index 44e2955..092f720 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -77,7 +77,7 @@
             align="center"
             v-for="(item, index) in dataList"
             :key="index"
-            :label="item.schoolName"
+            :label="item.schoolName||item.gradeName"
           >
             <template>
               <el-table-column
@@ -219,13 +219,13 @@ 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") {
+      //   if (this.query.regionId == "") {
+      //     this.type = 1;
+      //   } else {
+      //     this.type = 2;
+      //   }
+      // }
       const Contrast =
         this.role != "ROLE_JITUAN"
           ? this.$request.gradeContrast
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index b59bb67..83b95bb 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -499,6 +499,7 @@ export default {
       diaAnswerEqu: false,
       gradeList: [],
       gradeListAll: [],
+      schoolAll:[],
       props: { multiple: true, checkStrictly: true },
       type: 1,
       query: {
@@ -558,6 +559,7 @@ export default {
     this.stationReport();
     this._QueryGradeList();
     this._QueryData();
+    this.showSchool()
   },
   methods: {
     edit() {},
@@ -612,6 +614,24 @@ export default {
       this.page = page;
       this._QueryData(false);
     },
+     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]
+      } else {
+        this.$message.error(info);
+      }
+    },
     async autoUpDate(id) {
       if (!this.selectionTabIds.length && !id) {
         this.$message.warning("请选择授课端~");
@@ -721,6 +741,7 @@ export default {
                   }) || [];
                 return gradeList;
               }) || [];
+              this.gradeList = [...this.schoolAll,...this.gradeList]
           }
         }
       } else {
@@ -744,11 +765,11 @@ export default {
                   : item.onlineStatus == 0
                   ? "离线"
                   : "异常",
-              value: item.rate,
-              count: item.count,
+              value: item.total,
+              rate: item.rate,
             };
           }) || [];
-        this.total = data.total || 0;
+        // this.total = data.total || 0;
       } else {
         this.$message.error(info);
       }
@@ -780,7 +801,7 @@ export default {
               rate: item.rate,
             };
           }) || [];
-        this.total = data.total || 0;
+        // this.total = data.total || 0;
       } else {
         this.$message.error(info);
       }
@@ -857,6 +878,7 @@ export default {
       this.loading = false;
       if (status == 0) {
         this.tableData = data?.list || [];
+        this.total = data.count
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index 5a6372e..a0acc89 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -337,6 +337,7 @@ export default {
       tenantRoleList: [],
       regionList: [],
       schoolList: [],
+      schoolAll:[],
       props: { multiple: true, checkStrictly: true },
       roleList: [],
       query: {
@@ -392,6 +393,7 @@ export default {
     if (this.role == "ROLE_JITUAN") {
       this._TenantRoleList();
       this._RegionList();
+      this.showSchool()
     } else {
       this._RoleList();
     }
@@ -491,6 +493,24 @@ 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]
+      } else {
+        this.$message.error(info);
+      }
+    },
     async updateUser(obj, type) {
       let query = {
         userId: obj.id,
@@ -549,6 +569,7 @@ export default {
             children: children,
           };
         });
+        this.schoolList = [...this.schoolAll,...this.schoolList]
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/setUp/conglomerate.vue b/src/views/setUp/conglomerate.vue
index b49362a..a1215ce 100644
--- a/src/views/setUp/conglomerate.vue
+++ b/src/views/setUp/conglomerate.vue
@@ -325,9 +325,9 @@ export default {
     },
     addSchool() {
       //添加学校
-      this.formSchool.name = "";
-      this.formSchool.grade = [];
-      this.formSchool.quyu = "";
+      this.formSchool.schoolName = "";
+      this.formSchool.sections = [];
+      this.formSchool.regionId = "";
       this.diaSchool = true;
     },
     setRegion(obj) {
@@ -404,8 +404,10 @@ export default {
       this.$refs["formSchool"].validate(async (valid) => {
         // 验证通过：保存
         if (valid) {
+          let query = {...this.formSchool}
+          query.sections = query.sections.join(',')
           const { data, status, info } = await this.$request.saveSchool({
-            ...this.formSchool,
+            ...query,
           });
           if (status === 0) {
             this.$message.success(info);