diff --git a/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null b/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null
deleted file mode 100644
index 821db7c..0000000
--- a/E/system-commandline-sentinel-files/dotnet-suggest-registration-git-credential-manager-core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=null
+++ /dev/null
@@ -1,6 +0,0 @@
-Exception during registration:
-System.ComponentModel.Win32Exception (0x80004005): 系统找不到指定的文件。
-   在 System.Diagnostics.Process.StartWithCreateProcess(ProcessStartInfo startInfo)
-   在 System.Diagnostics.Process.Start()
-   在 System.CommandLine.Invocation.Process.StartProcess(String command, String args, String workingDir, Action`1 stdOut, Action`1 stdErr, ValueTuple`2[] environmentVariables)
-   在 System.CommandLine.Builder.CommandLineBuilderExtensions.<>c.<<RegisterWithDotnetSuggest>b__10_1>d.MoveNext()
\ No newline at end of file
diff --git a/src/api/apis/setUp.js b/src/api/apis/setUp.js
new file mode 100644
index 0000000..f4ce1f5
--- /dev/null
+++ b/src/api/apis/setUp.js
@@ -0,0 +1,231 @@
+
+import service from "../axios"
+import setUpUrls from "../urls/setUp"
+
+export default {
+  // 学校管理员首页数据
+  schoolIndex(data) {
+    return service({
+      url: setUpUrls.schoolIndex,
+      method: 'POST',
+      data
+    })
+  },
+  // 查询角色列表
+  roleList(data) {
+    return service({
+      url: setUpUrls.roleList,
+      method: 'POST',
+      data
+    })
+  },
+  // 分页查询账号
+  deviceList(data) {
+    return service({
+      url: setUpUrls.deviceList,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改账号 禁用账号、修改账号密码等
+  updateUser(data) {
+    return service({
+      url: setUpUrls.updateUser,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询学校详情
+  schoolDetail(data) {
+    return service({
+      url: setUpUrls.schoolDetail,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改学校信息
+  updateSchool(data) {
+    return service({
+      url: setUpUrls.updateSchool,
+      method: 'POST',
+      data
+    })
+  },
+  //  学校年级管理
+  gradeList(data) {
+    return service({
+      url: setUpUrls.gradeList,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询学校所有科目
+  subjectList(data) {
+    return service({
+      url: setUpUrls.subjectList,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改年级信息
+  updateGrade(data) {
+    return service({
+      url: setUpUrls.updateGrade,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询学校班级列表
+  schoolClassList(data) {
+    return service({
+      url: setUpUrls.classList,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询学生列表
+  studentList(data) {
+    return service({
+      url: setUpUrls.studentList,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改班级信息
+  updateClass(data) {
+    return service({
+      url: setUpUrls.updateClass,
+      method: 'POST',
+      data
+    })
+  },
+  //  增加学生
+  addStudent(data) {
+    return service({
+      url: setUpUrls.addStudent,
+      method: 'POST',
+      data
+    })
+  },
+  //  删除学生
+  delStudent(data) {
+    return service({
+      url: setUpUrls.delStudent,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询学校教师列表
+  teacherList(data) {
+    return service({
+      url: setUpUrls.teacherList,
+      method: 'POST',
+      data
+    })
+  },
+  //  新增教师
+  addTeacher(data) {
+    return service({
+      url: setUpUrls.addTeacher,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改教师信息
+  updateTeacher(data) {
+    return service({
+      url: setUpUrls.updateTeacher,
+      method: 'POST',
+      data
+    })
+  },
+  //  删除教师管理班级或年级
+  delTeacherManager(data) {
+    return service({
+      url: setUpUrls.delTeacherManager,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询基站统计数据
+  stationReport(data) {
+    return service({
+      url: setUpUrls.stationReport,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询答题器统计数据
+  keyboardReport(data) {
+    return service({
+      url: setUpUrls.keyboardReport,
+      method: 'POST',
+      data
+    })
+  },
+  //  分页查询设备列表
+  deviceList(data) {
+    return service({
+      url: setUpUrls.deviceList,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改设备自动升级状态
+  modifyUpgradeFlag(data) {
+    return service({
+      url: setUpUrls.modifyUpgradeFlag,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改基站信息
+  updateDevice(data) {
+    return service({
+      url: setUpUrls.updateDevice,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询下载配置列表
+  appConfigList(data) {
+    return service({
+      url: setUpUrls.appConfigList,
+      method: 'POST',
+      data
+    })
+  },
+  //  查询最新的授课端应用版本
+  latestVersion(data) {
+    return service({
+      url: setUpUrls.latestVersion,
+      method: 'POST',
+      data
+    })
+  },
+  //  下载指定配置的最新版本授课端
+  getAppDownloadUrl(data) {
+    return service({
+      url: setUpUrls.getAppDownloadUrl,
+      method: 'POST',
+      data
+    })
+  },
+  //  新增授课端应用配置
+  addAppConfig(data) {
+    return service({
+      url: setUpUrls.addAppConfig,
+      method: 'POST',
+      data
+    })
+  },
+  //  修改授课端应用配置
+  updateAppConfig(data) {
+    return service({
+      url: setUpUrls.updateAppConfig,
+      method: 'POST',
+      data
+    })
+  },
+  
+}
diff --git a/src/api/urls/setUp.js b/src/api/urls/setUp.js
new file mode 100644
index 0000000..a478a49
--- /dev/null
+++ b/src/api/urls/setUp.js
@@ -0,0 +1,59 @@
+
+export default {
+  // 学校管理员首页数据
+  schoolIndex: "/api_html/school/manager/index",
+  // 查询角色列表
+  roleList: "/api_html/school/manager/roleList",
+  //  分页查询账号
+  deviceList: "/api_html/school/manager/userPage",
+  // 修改账号 禁用账号、修改账号密码等
+  updateUser: "/api_html/school/manager/updateUser",
+  // 查询学校详情
+  schoolDetail: "/api_html/school/manager/schoolDetail",
+  // 修改学校信息
+  updateSchool: "/api_html/school/manager/updateSchool",
+  // 学校年级管理
+  gradeList: "/api_html/school/manager/gradeList",
+  // 查询学校所有科目
+  subjectList: "/api_html/school/manager/subjectList",
+  //  修改年级信息
+  updateGrade: "/api_html/school/manager/updateGrade",
+  //  查询学校班级列表
+  classList: "/api_html/school/manager/classList",
+  //  查询学生列表
+  studentList: "/api_html/school/manager/studentList",
+  //  修改班级信息
+  updateClass: "/api_html/school/manager/updateClass",
+  //  增加学生
+  addStudent: "/api_html/school/manager/addStudent",
+  //  删除学生
+  delStudent: "/api_html/school/manager/delStudent",
+  //  查询学校教师列表
+  teacherList: "/api_html/school/manager/teacherList",
+  //  新增教师
+  addTeacher: "/api_html/school/manager/addTeacher",
+  //  修改教师信息
+  updateTeacher: "/api_html/school/manager/updateTeacher",
+  //  删除教师管理班级或年级
+  delTeacherManager: "/api_html/school/manager/delTeacherManager",
+  //  查询基站统计数据
+  stationReport: "/api_html/school/manager/stationReport",
+  //  查询答题器统计数据
+  keyboardReport: "/api_html/school/manager/keyboardReport",
+  //  分页查询设备列表
+  deviceList: "/api_html/school/manager/deviceList",
+  //   修改设备自动升级状态
+  modifyUpgradeFlag: "/api_html/school/manager/modifyUpgradeFlag",
+  //   修改基站信息
+  updateDevice: "/api_html/school/manager/updateDevice",
+  //   查询下载配置列表
+  appConfigList: "/api_html/school/manager/appConfigList",
+  //   查询最新的授课端应用版本
+  latestVersion: "/api_html/school/manager/latestVersion",
+  //   下载指定配置的最新版本授课端
+  getAppDownloadUrl: "/api_html/school/manager/getAppDownloadUrl",
+  //   新增授课端应用配置
+  addAppConfig: "/api_html/school/manager/addAppConfig",
+  //    修改授课端应用配置
+  updateAppConfig: "/api_html/school/manager/updateAppConfig",
+}
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index a5b5f05..bf5a183 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -136,4 +136,9 @@
     height:16px;
     background: #2e9afe;
   }
+}
+div,ul{
+  &::-webkit-scrollbar{
+    width:0;
+  }
 }
\ No newline at end of file
diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index 9dd5e84..f63c6bd 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -31,16 +31,6 @@ export default {
   methods: {
     setOption() {
       const that = this;
-      let barStyle = {
-        barGap: 0,
-        barWidth: 16,
-        emphasis: {
-          focus: "series",
-        },
-        itemStyle: {
-          borderRadius: [8, 8, 0, 0],
-        },
-      };
       const options = {
         color: this.colors || ["#ff80db", "#c8cc00", "#67c6b5"],
         backgroundColor: "#f8f8f8",
@@ -48,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: {
@@ -74,7 +64,8 @@ export default {
           label: {
             normal: {
               formatter(v) {
-                return v.name + v.value + "%";
+                console.log(v)
+                return v.name + v.data.rate + "%";
               },
             },
           },
diff --git a/src/store/index.js b/src/store/index.js
index 5d93702..f659823 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -68,10 +68,6 @@ const store = new Vuex.Store({
         let response = res
         if (response.status == 0) {
           const userInfo = { ...response.data }
-          userInfo.permissions.push({
-            role: "ROLE_XUEXIAO",
-            roleName: "学校管理员",
-          },)
           commit("setToken", Cookies.get("ZT_YIJIAO_TOKEN"));
           commit("setInfo", { ...userInfo });
 
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 37c908c..ebd6756 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -59,14 +59,14 @@
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
-                  :options="classList"
+                  :options="gradeList"
                   :props="props"
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
                 <el-select
                   class="sel"
-                  v-model="query.status"
+                  v-model="query.onlineStatus"
                   placeholder="选择状态"
                   @change="_QueryData(false)"
                 >
@@ -81,7 +81,7 @@
                 <el-input
                   type="number"
                   placeholder="请输入设备编码"
-                  v-model="query.number"
+                  v-model="query.sn"
                   class="input-with-select"
                   @keyup.enter.native="_QueryData(true)"
                 >
@@ -95,46 +95,48 @@
             </div>
             <el-table :data="tableData" border style="width: 100%">
               <el-table-column
-                prop="number"
+                prop="deviceId"
                 label="设备编码"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="pindian"
+                prop="frequency"
                 label="频点"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="peidui"
+                prop="pairingCode"
                 label="配对码"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="jiaoshi"
+                prop="roomName"
                 label="所在教室"
                 align="center"
               ></el-table-column>
+              <el-table-column label="关联班级" align="center">
+                <template slot-scope="scoped">
+                  <p v-for="item in scoped.row.classList" :key="item.classId">
+                    {{ item.className }}
+                  </p>
+                </template>
+              </el-table-column>
               <el-table-column
-                prop="class"
-                label="关联班级"
+                prop="otaVersionNumber"
+                label="固件版本号"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="version"
-                label="固件版本号"
+                prop="latestReportTime"
+                label="最近上报"
                 align="center"
               ></el-table-column>
-              <el-table-column prop="datiqi" label="配对答题器" align="center"
-                ><template slot-scope="scope"
-                  >{{ scope.row.datiqi }}个</template
-                ></el-table-column
-              >
               <el-table-column label="状态" align="center"
                 ><template slot-scope="scope">
                   {{
                     scope.row.status == 1
                       ? "在线"
-                      : scope.row.status == 2
+                      : scope.row.status == 0
                       ? "离线"
                       : "异常"
                   }}
@@ -187,19 +189,19 @@
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
-                  :options="classList"
+                  :options="gradeList"
                   :props="props"
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
                 <el-select
                   class="sel"
-                  v-model="query.status"
+                  v-model="query.type"
                   placeholder="选择状态"
                   @change="_QueryData(false)"
                 >
                   <el-option
-                    v-for="item in statusList"
+                    v-for="item in typeList"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -209,7 +211,7 @@
                 <el-input
                   type="number"
                   placeholder="请输入设备编码"
-                  v-model="query.number"
+                  v-model="query.sn"
                   class="input-with-select"
                   @keyup.enter.native="_QueryData(true)"
                 >
@@ -223,37 +225,44 @@
             </div>
             <el-table :data="tableData" border style="width: 100%">
               <el-table-column
-                prop="number"
+                prop="deviceId"
                 label="设备编码"
                 align="center"
               ></el-table-column>
+              <el-table-column label="学生信息" align="center"
+                ><template slot-scope="scoped"
+                  ><p
+                    v-for="item in scoped.row.studentList"
+                    :key="item.studentId"
+                  >
+                    {{ item.studentName }}
+                  </p></template
+                ></el-table-column
+              >
               <el-table-column
-                prop="xuesheng"
-                label="学生信息"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="dianliang"
+                prop="electricity"
                 label="电量"
                 align="center"
               ></el-table-column>
+              <el-table-column prop="class" label="关联班级" align="center">
+                <template slot-scope="scoped">
+                  <p v-for="item in scoped.row.classList" :key="item.classId">
+                    {{ item.className }}
+                  </p>
+                </template></el-table-column
+              >
               <el-table-column
-                prop="class"
-                label="关联班级"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="peidui"
+                prop="pairingCode"
                 label="配对码"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="cishu"
+                prop="answerTimes"
                 label="答题次数"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="time"
+                prop="latestReportTime"
                 label="最后答题时间"
                 align="center"
               ></el-table-column>
@@ -282,16 +291,16 @@
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
-                  :options="classList"
+                  :options="gradeList"
                   :props="props"
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
                 <span class="sel">共选择5个授课端</span>
-                <el-button plan round @click="autoUpDate"
+                <el-button plan round @click="autoUpDate(false)"
                   >开启自动更新</el-button
                 >
-                <el-button plan round @click="stopUpdate"
+                <el-button plan round @click="stopUpdate(false)"
                   >停止自动更新</el-button
                 >
               </div>
@@ -303,28 +312,30 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="55"> </el-table-column>
+              <el-table-column prop="class" label="关联班级" align="center"
+                ><template slot-scope="scoped">
+                  <p v-for="item in scoped.row.classList" :key="item.classId">
+                    {{ item.className }}
+                  </p>
+                </template></el-table-column
+              >
               <el-table-column
-                prop="class"
-                label="关联班级"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="gengxin"
+                prop="lastUpdateTime"
                 label="最近更新"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="xitong"
+                prop="osInfo"
                 label="软件系统"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="yingjian"
+                prop="hardwareInfo"
                 label="硬件环境"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="version"
+                prop="otaVersionNumber"
                 label="版本号"
                 align="center"
               ></el-table-column>
@@ -342,7 +353,7 @@
               <el-table-column label="自动更新" align="center"
                 ><template slot-scope="scoped">
                   <el-switch
-                    v-model="scoped.row.isUp"
+                    v-model="scoped.row.upgradeFlag"
                     @change="changeUpdate($event, scoped.row, this)"
                   >
                   </el-switch> </template
@@ -350,13 +361,25 @@
             </el-table>
           </div>
         </div>
+        <div class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
       <up-load id="downDevice" :url="url" fileName="设备信息">
         <p class="down-txt" slot="down">
           通过Excel名单导入设备，需要提供设备编码，点击
-          <el-link  type="danger" @click="downExcel">模板下载</el-link> 。
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
         </p>
       </up-load>
       <div class="dialog-footer" slot="footer">
@@ -378,12 +401,12 @@
             </el-input
           ></el-col>
         </el-form-item>
-        <el-form-item label="频点：" prop="pindian">
+        <el-form-item label="频点：" prop="frequency">
           <el-col :span="10"
             ><el-input
               type="text"
               placeholder="输入频点"
-              v-model.trim="form.pindian"
+              v-model.trim="form.frequency"
               maxlength="30"
               size="45"
               show-word-limit
@@ -391,12 +414,12 @@
             </el-input
           ></el-col>
         </el-form-item>
-        <el-form-item label="配对码：" prop="peidui">
+        <el-form-item label="配对码：" prop="pairingCode">
           <el-col :span="10"
             ><el-input
               type="text"
               placeholder="输入配对码"
-              v-model.trim="form.peidui"
+              v-model.trim="form.pairingCode"
               maxlength="30"
               size="45"
               show-word-limit
@@ -409,7 +432,7 @@
             <el-cascader
               clearable
               v-model="form.classId"
-              :options="classList"
+              :options="gradeList"
               :props="{ expandTrigger: 'hover' }"
               :show-all-levels="false"
             ></el-cascader>
@@ -420,7 +443,7 @@
             ><el-input
               type="text"
               placeholder="输入所在教室"
-              v-model.trim="form.jiaoshi"
+              v-model.trim="form.roomName"
               maxlength="30"
               size="45"
               show-word-limit
@@ -444,6 +467,22 @@ import _ from "lodash";
 import { downloadFile, formatClass } from "@/utils";
 export default {
   components: { pieChart, scatterChart },
+  watch: {
+    type: function (val) {
+      this.page = 1;
+      this.total = 0;
+      this.query.classId = [];
+      this.query.onlineStatus = "";
+      this.query.sn = "";
+      this.query.type = "";
+      if (val == 1) {
+        this.stationReport();
+      } else if (val == 2) {
+        this.keyboardReport();
+      }
+      this._QueryData();
+    },
+  },
   data() {
     return {
       school: "",
@@ -451,75 +490,60 @@ export default {
       url: "/web/upLoadDevice",
       diaUp: false,
       diaAnswerEqu: false,
-      classList: [],
-      classListAll: [],
+      gradeList: [],
+      gradeListAll: [],
       props: { multiple: true, checkStrictly: false },
       type: 1,
       query: {
         classId: [],
-        status: 0,
-        number: "",
+        onlineStatus: "",
+        sn: "",
+        type: "",
       },
       statusList: [
-        { label: "全部", value: 0 },
+        { label: "离线", value: 0 },
         { label: "在线", value: 1 },
-        { label: "离线", value: 2 },
-        { label: "异常", value: 3 },
+        { label: "异常", value: 2 },
+      ],
+      typeList: [
+        { label: "全部", value: 0 },
+        { label: "1日内", value: 1 },
+        { label: "3日内", value: 2 },
+        { label: "7日内", value: 3 },
+        { label: "1月内", value: 4 },
+        { label: "3月内", value: 5 },
+        { label: "3月以上", value: 6 },
       ],
       form: {
         number: "",
-        pindian: "",
-        peidui: "",
+        frequency: "",
+        pairingCode: "",
         classId: "",
-        jiaoshi: "",
+        roomName: "",
       },
       formRules: {
         number: [
           { required: true, message: "请输入设备编码", trigger: "blur" },
         ],
-        pindian: [{ required: true, message: "请输入频点", trigger: "blur" }],
-        peidui: [{ required: true, message: "请输入配对码", trigger: "blur" }],
+        frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
+        pairingCode: [
+          { required: true, message: "请输入配对码", trigger: "blur" },
+        ],
         classId: [{ required: true, message: "请选择班级", trigger: "blur" }],
       },
-      tableData: [
-        {
-          number: 32456,
-          pindian: 12,
-          peidui: 100123,
-          jiaoshi: " 13号教室",
-          class: "21班",
-          version: "2.13",
-          datiqi: 50,
-          status: 1,
-          xuesheng: "sss",
-          dianliang: "25",
-          cishu: "10",
-          time: "10:00:00",
-          gengxin: "10:00:00",
-          xitong: "window7",
-          yingjian: "cpu:i7，4G内存，160G硬盘",
-          isUp: true,
-        },
-      ],
-      total: 35,
-      chartData: [
-        { name: "在线", value: "65" },
-        { name: "离线", value: "18" },
-        { name: "异常", value: "17" },
-      ],
-      chartData2: [
-        { name: "1日内", value: "8.6", count: 12 },
-        { name: "3日内", value: "18", count: 30 },
-        { name: "7日内", value: "36", count: 60 },
-        { name: "1月内", value: "80", count: 138 },
-        { name: "3月内", value: "20", count: 36 },
-        { name: "3月以上", value: "8", count: 9 },
-      ],
+      tableData: [],
+      total: 0,
+      chartData: [],
+      chartData2: [],
       selectionTabIds: [],
+      page: 1,
+      size: 20,
     };
   },
   created() {
-    this._QueryClassList();
+    this.stationReport();
+    this._QueryGradeList();
+    this._QueryData();
   },
   methods: {
     edit() {},
@@ -533,12 +557,28 @@ export default {
       });
     },
     clickPieChart(obj) {
-      this.query.status = obj.name == "在线" ? 1 : obj.name == "离线" ? 2 : 3;
-      this._QueryData(false);
+      this.query.onlineStatus =
+        obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2;
+      this.query.sn = "";
+      this.page = 1;
+      this._QueryData();
     },
     clickScatterChart(obj) {
-      console.log(obj);
-      // this._QueryData(false)
+      this.query.type =
+        obj.name == "1日内"
+          ? 1
+          : obj.name == "3日内"
+          ? 2
+          : obj.name == "7日内"
+          ? 3
+          : obj.name == "1月内"
+          ? 4
+          : obj.name == "3月内"
+          ? 5
+          : 6;
+      this.query.sn = "";
+      this.page = 1;
+      this._QueryData();
     },
     handleSelectionChange(val) {
       console.log(val);
@@ -554,6 +594,10 @@ export default {
         this.stopUpdate(obj.id);
       }
     }, 800),
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
     async autoUpDate(id) {
       if (!this.selectionTabIds.length && !id) {
         this.$message.warning("请选择授课端~");
@@ -561,8 +605,9 @@ export default {
       }
       if (this.loadingUpDate) return;
       this.loadingUpDate = true;
-      let data = await this.$request.autoUpDate({
-        id: id ? id : this.selectionTabIds,
+      let data = await this.$request.modifyUpgradeFlag({
+        deviceId: id ? id : this.selectionTabIds,
+        upgradeFlag: 1,
       });
       this.loadingUpDate = false;
       if (data && !data.code) {
@@ -579,8 +624,9 @@ export default {
       }
       if (this.loadingUpDate) return;
       this.loadingUpDate = true;
-      let data = await this.$request.stopUpdate({
-        id: id ? id : this.selectionTabIds,
+      let data = await this.$request.modifyUpgradeFlag({
+        deviceId: id ? id : this.selectionTabIds,
+        upgradeFlag: 0,
       });
       this.loadingUpDate = false;
       if (data && !data.code) {
@@ -606,90 +652,130 @@ export default {
 
     // 添加设备
     async addAnswerEqu() {
-      // if(this.loadingAnswerEqu)return
-      //  this.loadingAnswerEqu = true;
-      // const { data, status, info } = await this.$request.fetchClassList();
-      //  this.loadingAnswerEqu = false;
-      // console.log(status);
-      // if (status === 0) {
-      //   this._QueryData();
-      // } else {
-      //   this.$message.error(info);
-      // }
+      if (this.loadingAnswerEqu) return;
+      this.loadingAnswerEqu = true;
+      const { data, status, info } = await this.$request.fetchgradeList();
+      this.loadingAnswerEqu = false;
+      console.log(status);
+      if (status === 0) {
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
     },
     // 查找班级
-    async _QueryClassList() {
-      // this.loading = true;
-      // const { data, status, info } = await this.$request.fetchClassList();
-      // console.log(status);
-      // if (status === 0) {
-      //   if (!!data.list) {
-      //     this.classList =
-      //       data.list?.map((item) => {
-      //         return {
-      //           value: item.classId,
-      //           label: item.className,
-      //         };
-      //       }) || [];
-      //   }
-      // } else {
-      //   this.$message.error(info);
-      // }
-      let data = [
-        {
-          classId: 1,
-          className: 1001,
-          sectionName: 1,
-          gradeName: 1,
-        },
-        {
-          classId: 1,
-          className: 1001,
-          sectionName: 2,
-          gradeName: 7,
-        },
-        {
-          classId: 1,
-          className: 1001,
-          sectionName: 3,
-          gradeName: 10,
-        },
-        {
-          classId: 1,
-          className: 1001,
-          sectionName: 4,
-          gradeName: 12,
-        },
-      ];
-      this.classList = formatClass(data);
+    async _QueryGradeList() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.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;
+            }) || [];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 基站统计数据
+    async stationReport() {
+      const { data, status, info } = await this.$request.stationReport();
+      if (status === 0) {
+        this.chartData =
+          data.list?.map((item) => {
+            return {
+              name:
+                item.onlineStatus == "1" ? "在线" : item.onlineStatus == 0 ? "离线" : "异常",
+              value: item.rate,
+              count: item.count,
+            };
+          }) || [];
+        this.total = data.total || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 答题器统计数据
+    async keyboardReport() {
+      const { data, status, info } = await this.$request.keyboardReport();
+      if (status === 0) {
+        this.chartData2 =
+          data.list?.map((item) => {
+            return {
+              name:
+                item.type == 1
+                  ? "1日内"
+                  : item.type == 2
+                  ? "3日内"
+                  : item.type == 3
+                  ? "7日内"
+                  : item.type == 4
+                  ? "1月内"
+                  : item.type == 5
+                  ? "3月内"
+                  : "3月以上",
+              value: item.total,
+              rate: item.rate,
+            };
+          }) || [];
+        this.total = data.total || 0;
+      } else {
+        this.$message.error(info);
+      }
     },
     // 设备列表信息
-    async _QueryData(type) {
-      console.log(1);
-      // this.loading = true;
-      // let query = {};
-      // if (!type) {
-      //   this.query.title = "";
-      //   query = { ...this.query };
-      // } else {
-      //   query = { title: this.query.title };
-      //   this.query.status = "";
-      //   this.query.classId = [];
-      // }
-      // for (let key in query) {
-      //   if (!query[key] || query[key].length == 0) {
-      //     query[key] = null;
-      //   }
-      // }
-      // this.loading = true;
-      // const { data, status, info } = await this.$request.fetchDeviceList();
-      // this.loading = false;
-      // console.log(status);
-      // if (status === 0) {
-      //   this.tableData = data.list || [];
-      // } else {
-      //   this.$message.error(info);
-      // }
+    async _QueryData() {
+      this.loading = true;
+      let query = {};
+      let gradeNames = [];
+      let classIds = [];
+      this.query.classId.map((item) => {
+        if (!gradeNames.includes(item[0])) {
+          gradeNames.push(item[0]);
+        }
+        classIds.push(item[1]);
+      });
+      if (this.query.sn) {
+        query.sn = this.query.sn;
+      } else {
+        gradeNames.length ? (query.gradeNames = gradeNames) : "";
+        classIds.length ? (query.classIds = classIds) : "";
+        if (this.type == 1) {
+          this.query.onlineStatus !== ""
+            ? (query.onlineStatus = this.query.onlineStatus)
+            : "";
+        } else if (this.type == 2) {
+          this.query.type !== "" ? (query.type = this.query.type) : "";
+        }
+      }
+
+      this.loading = true;
+      const { data, status, info } = await this.$request.deviceList({
+        ...query,
+        deviceType: this.type,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.tableData = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
     },
   },
 };
diff --git a/src/views/device/log.vue b/src/views/device/log.vue
index 7081b7d..39bf65a 100644
--- a/src/views/device/log.vue
+++ b/src/views/device/log.vue
@@ -4,32 +4,183 @@
       <template slot="title">
         <span>设备日志</span>
       </template>
-      <template slot="btns">
-        <el-tooltip effect="dark" content="基站配置信息导出" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            size="mini"
-            plain
-            circle
-            @click="down = true"
-          ></el-button>
-        </el-tooltip>
-      </template>
     </back-box>
+    <div class="page-content">
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="设备编码"
+          >kooriookami</el-descriptions-item
+        >
+        <el-descriptions-item label="电量">18100000000</el-descriptions-item>
+        <el-descriptions-item label="配对码">苏州市</el-descriptions-item>
+        <el-descriptions-item label="关联班级"
+          >江苏省苏州市吴中区</el-descriptions-item
+        >
+        <el-descriptions-item label="最后答题时间"
+          >江苏省苏州市吴中区</el-descriptions-item
+        >
+        <el-descriptions-item label="答题次数"
+          >江苏省苏州市吴中区</el-descriptions-item
+        >
+      </el-descriptions>
+    </div>
+    <div class="answer-header">
+      <div class="sel-box">
+        <div class="d1">
+          <el-date-picker
+            v-model="query.startDay"
+            type="date"
+            @change="handleChangeTimeStart"
+            placeholder="选择日期时间"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+          ~
+          <el-date-picker
+            v-model="query.endDay"
+            type="date"
+            placeholder="选择日期时间"
+            @change="handleChangeTimeEnd"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </div>
+        <p class="p1">
+          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+            >今天</span
+          >
+          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+            >本周</span
+          >
+          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+            >本月</span
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+            >本季度</span
+          >
+        </p>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
+import { formatDate } from "utils";
 export default {
   data() {
     return {
-      down: false,
+      id:'',
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
     };
   },
-  methods: {},
+  created() {
+    this.id = this.$route.query.id
+    // await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      that.query.day = "";
+      that.query.startDay = "";
+      that.query.endDay = "";
+      switch (index) {
+        case 1:
+          that.query.day = formatDate(new Date(), "yyyy-MM-dd");
+          that.query.startDay = that.query.day;
+          that.query.endDay = that.query.day;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 1 && aMonth < 4) {
+            aMonth = "01";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "04";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "07";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+      }
+      this.page = 1;
+      this._QueryData();
+    },
+    handleChangeTimeStart(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.endDay) {
+        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      const { data, status, info } = await this.$request.fetchQuizList({
+        ...query,
+        id:this.id
+      });
+      this.loading = false;
+      if (status === 0) {
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/down/index.vue b/src/views/down/index.vue
index bc17f2f..a906de2 100644
--- a/src/views/down/index.vue
+++ b/src/views/down/index.vue
@@ -1,6 +1,12 @@
 <template>
-  <div>下载软件
+  <div>
     <router-link to="/downClient">授课端下载</router-link>
+     <back-box>
+      <template slot="title">
+        <span>软件下载</span>
+      </template>
+    </back-box>
+    <div class=""></div>
   </div>
 </template>
 
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 5964b2b..225f2d7 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -5,21 +5,21 @@
         <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
         <div class="text">
           <p class="p1">账号管理</p>
-          <p class="p2">管理32个任课教师，14个班主任，3个备课组长账号信息。</p>
+          <p class="p2">管理{{schoolInfo.teacherCourseCount}}个任课教师，{{schoolInfo.classManagerCount}}个班主任，{{schoolInfo.teacherGradeCount}}个备课组长账号信息。</p>
         </div>
       </li>
       <li class="nav-item item1" @click="links('/setUpSchool')">
         <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
         <div class="text">
           <p class="p1">学校管理</p>
-          <p class="p2">管理6个年级，3个班级，397名学生信息。</p>
+          <p class="p2">管理{{schoolInfo.gradeCount}}个年级，{{schoolInfo.classCount}}个班级，{{schoolInfo.studentCount}}名学生信息。</p>
         </div>
       </li>
       <li class="nav-item item2" @click="links('/device')">
         <img class="icon" src="../../assets/nav/device.png" alt="" />
         <div class="text">
           <p class="p1">设备状态</p>
-          <p class="p2">管理14个基站，396套答题器设备。</p>
+          <p class="p2">管理{{schoolInfo.stationCount}}个基站，{{schoolInfo.keyboardCount}}套答题器设备。</p>
         </div>
       </li>
       <li class="item3">
@@ -98,6 +98,7 @@ export default {
     return {
       type: "",
       navList: [],
+      schoolInfo:{}
     };
   },
   watch:{
@@ -113,6 +114,9 @@ export default {
         path:item.children[0].path,
       }
     })
+    if(this.type == "ROLE_XUEXIAO"){
+      this.schoolIndex()
+    }
   },
   methods: {
     getImgs(path) {
@@ -123,6 +127,14 @@ export default {
         path: path,
       });
     },
+    async schoolIndex() {
+      const { data, status, info } = await this.$request.schoolIndex();
+      if (status === 0) {
+        this.schoolInfo = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
@@ -170,7 +182,7 @@ export default {
       margin-right: 20px;
       margin-bottom: 20px;
       box-sizing: border-box;
-      padding: 40px 80px;
+      padding: 40px 20px 40px 80px;
       &:nth-child(2) {
         margin-right: 0;
       }
@@ -201,7 +213,7 @@ export default {
         height: calc(50% - 8px);
         margin-right: 20px;
         flex-wrap: wrap;
-        padding: 12px 30px;
+        padding: 12px 0 12px 30px;
         .icon {
           width: 60px;
           height: 60px;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 05b7cea..17ae6c8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,8 +90,8 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        username: "13028102196",
-        password: "Pw102196#",
+        username: "13610050254",
+        password: "Pw050254#",
       },
       loginRules: {
         username: [
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index fb94b87..deb083e 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -23,47 +23,67 @@
         <ul class="school-info">
           <li class="school-item">
             <span class="s1">学校名称：</span>
-            <span class="s2">{{ school.title }}</span>
+            <span class="s2">{{ school.schoolName || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">授课端管理密码：</span>
-            <span class="s2">{{ school.password }}</span>
+            <span class="s2">{{ school.managePwd || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">联系人：</span>
-            <span class="s2">{{ school.lianxiren }}</span>
+            <span class="s2">{{ school.contactPerson || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">手机号码：</span>
-            <span class="s2">{{ school.phone }}</span>
+            <span class="s2">{{ school.contactPhone || "--" }}</span>
           </li>
           <li class="school-item">
             <span class="s1">学段：</span>
-            <span class="s2">{{ school.xueduan }}</span>
+            <span class="s2">{{
+              school.sections | getSections(school.sections)
+            }}</span>
           </li>
           <li class="school-item">
             <span class="s1">所属集团：</span>
-            <span class="s2">{{ school.jituan }}</span>
+            <span class="s2">{{ school.tenantName || "--" }}</span>
           </li>
         </ul>
         <div class="grade-box">
           <p class="h-title">年级管理</p>
           <ul class="grade-info">
-            <li class="grade-item">
-              <p class="grade-name">一年级</p>
+            <li
+              class="grade-item"
+              v-for="item in tableData"
+              :key="item.grade"
+              @click="setGrade(item)"
+            >
+              <p class="grade-name">{{ item.gradeName }}</p>
               <div class="grade-class">
-                <p><i class="fa fa-building"></i>班级：10个</p>
-                <p><i class="fa fa-book"></i>科目：10个</p>
+                <p>
+                  <i class="fa fa-building"></i>班级：{{
+                    item.classList.length
+                  }}个
+                </p>
+                <p>
+                  <i class="fa fa-book"></i>科目：{{
+                    item.subjectNames.length
+                  }}个
+                </p>
               </div>
             </li>
           </ul>
+          <el-empty
+            :image-size="100"
+            v-if="!tableData.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
         </div>
       </div>
     </div>
     <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
       <up-load id="downDevice" :url="url" fileName="学校名单">
         <p class="down-txt" slot="down">
-          通过Excel名单导入学校名单，需要提供设备编码，点击
+          通过Excel名单导入学校名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
         </p>
       </up-load>
@@ -77,21 +97,82 @@
 <script>
 import { downloadFile } from "@/utils";
 export default {
+  filters: {
+    getSections(val) {
+      let arr = val.split(",");
+      let sections = arr.map((item) => {
+        let txt;
+        switch (item) {
+          case "0":
+            txt = "未知";
+            break;
+          case "1":
+            txt = "小学";
+            break;
+          case "2":
+            txt = "初中";
+            break;
+          case "3":
+            txt = "高中";
+            break;
+          case "4":
+            txt = "大学";
+            break;
+          case "7":
+            txt = "未知";
+            break;
+          default:
+            txt = "未知";
+        }
+        return txt;
+      });
+      return sections.join(",");
+    },
+  },
   data() {
     return {
       url: "xxx",
       diaUp: false,
+      loading: false,
       school: {
-        title: "长水实验中学",
-        password: "123456",
-        lianxiren: "张老师",
-        phone: "13548645321",
-        xueduan: "初中",
-        jituan: "长水集团",
+        schoolName: "长水实验中学",
+        managePwd: "123456",
+        contactPerson: "张老师",
+        contactPhone: "13548645321",
+        sections: "初中",
+        tenantName: "长水集团",
       },
+      tableData: [],
     };
   },
+  created() {
+    this._QueryDataSchool();
+    this._QueryDataGrade();
+  },
   methods: {
+    setGrade(obj) {},
+    async _QueryDataSchool() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolDetail();
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.school = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.tableData = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downExcel() {
       let data = await this.$request.downDevice({
         id: this.id,
@@ -120,11 +201,11 @@ export default {
       position: absolute;
       top: 12px;
       right: 12px;
-      padding:5px;
-      font-size:18px;
+      padding: 5px;
+      font-size: 18px;
       cursor: pointer;
-      &:hover{
-        color:#36f
+      &:hover {
+        color: #36f;
       }
     }
   }
@@ -132,7 +213,7 @@ export default {
     display: flex;
     flex-wrap: wrap;
     padding: 16px 0;
-    border-bottom:.5px solid #f2f2f2;
+    border-bottom: 0.5px solid #f2f2f2;
     .school-item {
       width: 50%;
       line-height: 48px;
@@ -151,37 +232,43 @@ export default {
   }
   .grade-box {
     padding: 20px;
-    .grade-info{
+    .grade-info {
       display: flex;
-      flex-wrap:wrap;
-      padding:20px;
-      .grade-item{
-        width:300px;
-        margin-right:50px;
-        margin-bottom:40px;
+      flex-wrap: wrap;
+      padding: 20px;
+      .grade-item {
+        width: 300px;
+        margin-right: 50px;
+        margin-bottom: 40px;
         box-sizing: border-box;
-        padding:12px 16px;
-        border-radius:10px;
+        padding: 12px 16px;
+        border-radius: 10px;
         box-shadow: 1px 1px 3px #888;
+        cursor: pointer;
+        transition: all .5s;
+        &:hover{
+          transform: translate(-2px,-5px);
+          box-shadow: 5px 5px 10px #888;
+        }
       }
-      .grade-name{
-        font-size:16px;
+      .grade-name {
+        font-size: 16px;
         font-weight: bold;
         line-height: 18px;
-        padding-bottom:12px;
+        padding-bottom: 12px;
       }
-      .grade-class{
+      .grade-class {
         display: flex;
         justify-content: space-between;
-        font-size:15px;
-        padding-right:20px;
-        .fa{
-          font-size:18px;
-          margin-right:5px;
-          color:#a4a4a4
+        font-size: 15px;
+        padding-right: 20px;
+        .fa {
+          font-size: 18px;
+          margin-right: 5px;
+          color: #a4a4a4;
         }
-        .fa-book{
-           font-size:20px;
+        .fa-book {
+          font-size: 20px;
         }
       }
     }
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index d4fbe5f..4c037e5 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -1,13 +1,329 @@
 <template>
-  <div>学生管理</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>教师管理</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip effect="dark" content="添加学生" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            plain
+            circle
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="stu-box">
+        <div class="stu-list">
+          <div class="h-title">
+            <el-select
+              class="sel"
+              v-model="query.gradeName"
+              placeholder="选择年级"
+              @change="changeGrade"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <ul class="stu-ul">
+            <li
+              class="stu-item"
+              v-for="item in classList"
+              :key="item.classCode"
+              :class="query.classId == item.classCode ? 'avtive' : ''"
+              @click="classDetail(item.classCode)"
+            >
+              <i class="el-icon-edit-outline"></i>
+              {{ item.className }}（{{ item.studentCount }}）
+            </li>
+          </ul>
+        </div>
+        <div class="stu-detail">
+          <div class="answer-header">
+            <div class="sel-box">
+              <el-input
+                placeholder="请输入学生姓名"
+                v-model="query.studentName"
+                class="input-with-select"
+                @keyup.enter.native="_QueryData(1)"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="_QueryData(1)"
+                ></el-button>
+              </el-input>
+              <el-input
+                placeholder="请输入学生学号"
+                v-model="query.studentCode"
+                class="input-with-select"
+                @keyup.enter.native="_QueryData(2)"
+              >
+                <el-button
+                  slot="append"
+                  icon="el-icon-search"
+                  @click="_QueryData(2)"
+                ></el-button>
+              </el-input>
+            </div>
+          </div>
+          <ul class="s-ul" v-loading="loading">
+            <li class="s-li" v-for="item in studentList" :key="item.id">
+              <i class="el-icon-delete"></i>
+              <p class="name">{{ item.studentName }}</p>
+              <p class="p1">
+                答题器：{{ (item.clickerList.length && item.clickerList[0].clickerSn) || "--" }}
+              </p>
+              <p class="p1">长学号：{{ item.studentCode }}</p>
+              <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
+            </li>
+          </ul>
+          <el-empty
+            :image-size="100"
+            v-if="!studentList.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+        </div>
+      </div>
+    </div>
+    <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
+      <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 { downloadFile } from "@/utils";
 export default {
-
-}
+  data() {
+    return {
+      url: "",
+      diaUp: false,
+      query: {
+        gradeName: "",
+        classId: "",
+        studentCode: "",
+        studentName: "",
+      },
+      gradeName: "",
+      gradeList: [],
+      classList: [],
+      studentList: [],
+      teacherDetail: {
+        teacherName: "",
+        loginName: "",
+        sex: "",
+        available: "",
+        managerList: [],
+        teacherCourseList: [],
+        teacherGradeList: [],
+      },
+    };
+  },
+  async created() {
+    await this._QueryDataGrade();
+    this._QueryClass();
+    this._QueryData(3);
+  },
+  methods: {
+    changeGrade(val) {
+      this.query.classId = "";
+      this._QueryClass(val);
+      this._QueryData(3);
+    },
+    classDetail(id) {
+      this.query.classId = id;
+      this._QueryData(3);
+    },
+    async _QueryData(type) {
+      let query = {};
+      query.gradeName = this.query.gradeName;
+      query.classId = this.query.classId;
+      if (type == 1) {
+        query.studentName = this.query.studentName;
+        this.query.studentCode = "";
+      } else if (type == 2) {
+        query.studentCode = this.query.studentCode;
+        this.query.studentName = "";
+      } else if (type == 3) {
+        this.query.studentName = "";
+        this.query.studentCode = "";
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.studentList({
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.studentList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            return {
+              value: item.gradeName,
+              label: item.gradeName,
+            };
+          }) || [];
+        this.query.gradeName = this.gradeList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClass(value) {
+      const { data, status, info } = await this.$request.schoolClassList({
+        gradeName: value || this.query.gradeName,
+      });
+      if (status === 0) {
+        this.classList = [...data.list] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.downDevice({
+        id: this.id,
+      });
+      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);
+      }
+    },
+  },
+};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+.stu-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  .stu-list {
+    max-height: 80vh;
+    .h-title {
+      height: 40px;
+      overflow-y: scroll;
+      line-height: 40px;
+      background: #eee;
+    }
+    .stu-item {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 36px;
+      cursor: pointer;
+      padding-left: 12px;
+      position: relative;
+      .el-icon-edit-outline {
+        position: absolute;
+        top: 8px;
+        right: 12px;
+        font-size: 20px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      &:hover {
+        background: #eee;
+        .el-icon-edit-outline {
+          display: block;
+        }
+      }
+      &.active {
+        color: #667ffd;
+      }
+    }
+    .sel {
+      width: 180px;
+      :deep(.el-input__inner) {
+        font-size: 16px;
+        padding-left: 0;
+        border: none;
+        background: transparent;
+      }
+      :deep(.el-icon-arrow-up:before) {
+        content: "\e78f";
+      }
+    }
+  }
+  .stu-detail {
+    flex: 1;
+    border-left: 0.5px solid #eee;
+    .s-ul {
+      display: flex;
+      flex-wrap: wrap;
+      padding-left: 20px;
+      .s-li {
+        width: 180px;
+        height: 120px;
+        box-shadow: 2px 2px 5px #7f7f7f;
+        border-radius: 10px;
+        margin: 0 20px 20px 0;
+        padding: 0 12px 5px;
+        position: relative;
+        .el-icon-delete {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          font-size: 18px;
+          padding: 2px;
+          display: none;
+          cursor: pointer;
+          &:hover {
+            color: #667ffd;
+          }
+        }
+        &:hover {
+          .el-icon-delete {
+            display: block;
+          }
+        }
+        .name {
+          text-align: center;
+          font-size: 16px;
+          line-height: 18px;
+          padding: 10px 0;
+        }
+        .p1 {
+          color: #7f7f7f;
+          line-height: 20px;
+          padding-bottom: 5px;
+        }
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index 7390e44..a69a070 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -1,13 +1,438 @@
 <template>
-  <div>老师管理</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>教师管理</span>
+      </template>
+      <template slot="btns">
+        <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
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.gradeName"
+          placeholder="选择年级"
+          @change="_QueryData(1)"
+        >
+          <el-option
+            v-for="item in gradeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-input
+          placeholder="请输入老师姓名"
+          v-model="query.teacherName"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(2)"
+          ></el-button>
+        </el-input>
+        <el-input
+          type="number"
+          placeholder="请输入老师手机号"
+          v-model="query.phone"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(3)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(3)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <div class="page-content">
+      <el-empty
+        :image-size="100"
+        v-if="!teacherList.length && loading == false"
+        description="没有更多数据"
+      ></el-empty>
+      <div class="teacher-box" v-loading="loading" v-else>
+        <div class="teacher-list">
+          <p class="h-title">教师列表</p>
+          <ul class="teacher-ul">
+            <li
+              class="teacher-item"
+              v-for="item in teacherList"
+              :key="item.id"
+              :class="showTId == item.id ? 'active' : ''"
+              @click="showTeacher(item)"
+            >
+              {{ item.realName }}（{{ setClass(item) }}）
+            </li>
+          </ul>
+        </div>
+        <div class="teacher-detail">
+          <div class="icon-box">
+            <i class="icon el-icon-edit-outline"></i>
+            <i class="icon el-icon-circle-plus-outline"></i>
+          </div>
+          <div class="detail-top">
+            <p class="p-item">手机号码：{{ teacherDetail.loginName }}</p>
+            <p class="p-item">
+              状态：{{ teacherDetail.available == 1 ? "正常" : "不可用" }}
+            </p>
+            <p class="p-item">
+              性别：{{
+                teacherDetail.sex == 1
+                  ? "男"
+                  : teacherDetail.sex == 2
+                  ? "女"
+                  : "未知"
+              }}
+            </p>
+          </div>
+          <div
+            class="grade-box"
+            v-if="teacherDetail.managerList && teacherDetail.managerList.length"
+          >
+            <p class="h-title">班主任</p>
+            <ul class="grade-info">
+              <li
+                class="grade-li"
+                v-for="item in teacherDetail.managerList"
+                :key="item.classId"
+              >
+                <i class="el-icon-delete"></i>
+                <div class="grade-item">
+                  <p class="grade-name">{{ item.className }}</p>
+                  <div class="grade-class">
+                    <p>
+                      <i class="fa fa-address-book-o"></i>学生：{{
+                        item.studentCount
+                      }}个
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div
+            class="grade-box"
+            v-if="
+              teacherDetail.teacherCourseList &&
+              teacherDetail.teacherCourseList.length
+            "
+          >
+            <p class="h-title">任课老师</p>
+            <ul class="grade-info">
+              <li
+                class="grade-li"
+                v-for="item in teacherDetail.teacherCourseList"
+                :key="item.classId"
+              >
+                <i class="el-icon-delete"></i>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.className }}（{{ item.subjectName }}）
+                  </p>
+                  <div class="grade-class">
+                    <p>
+                      <i class="fa fa-address-book-o"></i>学生：{{
+                        item.studentCount
+                      }}个
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div
+            class="grade-box"
+            v-if="
+              teacherDetail.teacherGradeList &&
+              teacherDetail.teacherGradeList.length
+            "
+          >
+            <p class="h-title">备课组长</p>
+            <ul
+              class="grade-info"
+              v-for="item in teacherDetail.teacherGradeList"
+              :key="item.grade"
+            >
+              <li class="grade-li">
+                <i class="el-icon-delete"></i>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.gradeName }}（{{ item.subjectName }}）
+                  </p>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
+      <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 { downloadFile } from "@/utils";
 export default {
+  data() {
+    return {
+      loading:false,
+      url: "",
+      diaUp: false,
+      query: {
+        gradeName: "",
+        teacherName: "",
+        phone: "",
+      },
+      gradeList: [],
+      teacherList: [ ],
+      teacherDetail: {
+        teacherName: "",
+        loginName: "",
+        sex: "",
+        available: "",
+        managerList: [],
+        teacherCourseList: [],
+        teacherGradeList: [],
+      },
+      showTId: "", //显示详情 教师ID
+    };
+  },
+  async created() {
+    await this._QueryDataGrade();
+    this._QueryData(1);
+  },
+  methods: {
+    setClass(obj) {
+      return (
+        obj.managerList?.length +
+        obj.teacherCourseList?.length +
+        obj.teacherGradeList?.length
+      );
+    },
+    showTeacher(obj) {
+      this.showTId = obj.id;
+      this.teacherDetail = { ...obj };
+    },
+    async _QueryData(type) {
+      let query = {};
+      if (type == 1) {
+        query.gradeName = this.query.gradeName;
+        this.query.teacherName = "";
+        this.query.phone = "";
+      } else if (type == 2) {
+        query.teacherName = this.query.teacherName;
+        this.query.gradeName = "";
+        this.query.phone = "";
+      } else if (type == 3) {
+        query.phone = this.query.phone;
+        this.query.teacherName = "";
+        this.query.gradeName = "";
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.teacherList({
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.teacherList = data.list || [];
+        this.teacherDetail = { ...this.teacherList[0] };
+        this.showTId = this.teacherList[0]?.id;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            return {
+              value: item.gradeName,
+              label: item.gradeName,
+            };
+          }) || [];
+        console.log(this.gradeList);
+        this.query.gradeName = this.gradeList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.downDevice({
+        id: this.id,
+      });
+      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);
+      }
+    },
+  },
+};
+</script>
 
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px 20px;
 }
-</script>
+.teacher-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  min-height: 400px;
+  .teacher-ul {
+    max-height: 70vh;
+    overflow-y: scroll;
+  }
+  .teacher-list {
+    width: 240px;
 
-<style>
+    .h-title {
+      height: 40px;
+      line-height: 40px;
+      background: #eee;
+      border-radius: 10px 10px 0 0;
+    }
+    .teacher-item {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 36px;
+      cursor: pointer;
+      padding-left: 12px;
+      &:hover {
+        background: #eee;
+      }
+      &.active {
+        color: #667ffd;
+      }
+    }
+  }
 
+  .teacher-detail {
+    flex: 1;
+    position: relative;
+    .icon-box {
+      position: absolute;
+      top: 12px;
+      right: 20px;
+      .icon {
+        font-size: 24px;
+        color: #7f7f7f;
+        cursor: pointer;
+      }
+      .el-icon-circle-plus-outline {
+        margin-left: 10px;
+      }
+    }
+    .detail-top {
+      padding: 12px 20px;
+      box-sizing: border-box;
+      display: flex;
+      flex-wrap: wrap;
+      font-size: 14px;
+      color: #7f7f7f;
+      .p-item {
+        width: 40%;
+        line-height: 28px;
+      }
+    }
+    .grade-box {
+      .grade-info {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 20px 20px 0;
+        & > li {
+          margin-right: 20px;
+          margin-bottom: 20px;
+          position: relative;
+          .el-icon-delete {
+            position: absolute;
+            top: 8px;
+            right: 8px;
+            padding: 2px;
+            cursor: pointer;
+            display: none;
+            &:hover {
+              color: #667ffd;
+            }
+          }
+          &:hover {
+            .el-icon-delete {
+              display: block;
+            }
+          }
+        }
+
+        .grade-item {
+          width: 200px;
+          box-sizing: border-box;
+          padding: 12px 16px;
+          border-radius: 10px;
+          box-shadow: 1px 1px 3px #888;
+        }
+        .grade-name {
+          font-size: 16px;
+          font-weight: bold;
+          line-height: 18px;
+          padding-bottom: 12px;
+        }
+        .grade-class {
+          display: flex;
+          justify-content: space-between;
+          font-size: 15px;
+          padding-right: 20px;
+          .fa {
+            font-size: 18px;
+            margin-right: 5px;
+            color: #a4a4a4;
+          }
+          .fa-book {
+            font-size: 20px;
+          }
+        }
+      }
+    }
+  }
+}
 </style>
\ No newline at end of file