diff --git a/public/331icon.ico b/public/331icon.ico
new file mode 100644
index 0000000..8e282e1
--- /dev/null
+++ b/public/331icon.ico
diff --git a/public/index.html b/public/index.html
index aa5038b..9b1b7ec 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,13 +5,21 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
   <title>
     <%= htmlWebpackPlugin.options.title %>
   </title>
 </head>
 
 <body>
+  <script>
+    var link = document.querySelector("link[rel*='icon']") || document.createElement('link');
+    link.type = 'image/x-icon';
+    link.rel = 'shortcut icon';
+    var csCode = localStorage.getItem("csCode")||""
+    link.href = csCode?"./331icon.ico":"./favicon.ico";
+    document.getElementsByTagName('head')[0].appendChild(link);
+  </script>
   <noscript>
     <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
         Please enable it to continue.</strong>
diff --git a/src/api/axios.js b/src/api/axios.js
index 85c8842..dcaea45 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -56,6 +56,7 @@ service.interceptors.response.use(
             }
           }
         }
+        return
       } else {
         // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       }
@@ -64,32 +65,25 @@ service.interceptors.response.use(
   },
   (error) => {
     const { data, status } = error.response;
-
-    Message({
-      message: error,
-      type: "error",
-      duration: 3 * 1000,
-    });
     if (error.response == undefined) {
       return Promise.reject(error);
     }
 
     if (status === 403 || status === 401) {
       if (data.status === 999) {
-        if (!location.href.includes("localhost")) {
-          if (data.data) {
+        debugger
+        console.log(data.data)
+        if (data.data) {
             window.location.href = data.data;
-          } else {
-            router.push({ path: "/login" });
-            if (res.message.includes("不存在")) {
-              Message({
-                message: data.info,
-                type: "error",
-                duration: 3 * 1000,
-              });
-            }
-          }
+        } else {
+          Message({
+            message: data.info,
+            type: "error",
+            duration: 3 * 1000,
+          });
+          router.push({ path: "/login" });
         }
+        return
       }
       Message.closeAll();
       Message({
@@ -109,6 +103,11 @@ service.interceptors.response.use(
       }
       return;
     }
+    Message({
+      message: data.info || error,
+      type: "error",
+      duration: 3 * 1000,
+    });
     return Promise.reject(error.response); // 返回接口返回的错误信息
   }
 );
diff --git a/src/assets/images/331logo.png b/src/assets/images/331logo.png
new file mode 100644
index 0000000..8e282e1
--- /dev/null
+++ b/src/assets/images/331logo.png
diff --git a/src/assets/images/E/photo_cache/98d71c21c679eccd804eab61885fe378713eb851.dat b/src/assets/images/E/photo_cache/98d71c21c679eccd804eab61885fe378713eb851.dat
deleted file mode 100644
index be19d6d..0000000
--- a/src/assets/images/E/photo_cache/98d71c21c679eccd804eab61885fe378713eb851.dat
+++ /dev/null
diff --git a/src/router/index.js b/src/router/index.js
index ad82ca6..2f2ac75 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -220,7 +220,7 @@ let addrouters = [  //测试用，后续后端获取
   {
     path: "/",
     iconCls: "fa fa-cog",
-    name: '学校设置',
+    name: '学校管理',
     component: Layout,
     children: [
       {
diff --git a/src/store/index.js b/src/store/index.js
index 3bfbade..d7ab593 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -36,7 +36,7 @@ const store = new Vuex.Store({
     },
     setInfo(state, data) {
       state.info = { ...data };
-      sessionStorage.setItem("info", JSON.stringify(state.info));
+      sessionStorage.setItem("info", JSON.stringify(data));
     },
     setRouters: (state, routers) => {
       let aRouters = addrouters.filter((item) => {
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index e0c9319..9638fbd 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -136,7 +136,7 @@ export default {
       query: {
         //搜索条件
         regionId: "",
-        gradeName: "",
+        gradeName: "全部",
         startDay: "",
         endDay: "",
         day: "",
@@ -195,7 +195,7 @@ export default {
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
         case 4:
-          if (aMonth > 1 && aMonth < 4) {
+          if (aMonth > 0 && aMonth < 4) {
             aMonth = "01";
           } else if (aMonth > 3 && aMonth < 7) {
             aMonth = "04";
@@ -239,7 +239,11 @@ export default {
       let query = {};
       for (let key in this.query) {
         if (this.query[key] != "") {
-          query[key] = this.query[key];
+          if (key == gradeName) {
+            query[key] = this.query[key]=="全部"?"":this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
         }
       }
       if (this.role == "ROLE_JITUAN") {
@@ -247,7 +251,7 @@ export default {
       } else {
         delete query.regionId;
       }
-      this.tableData=[]
+      this.tableData = [];
       const Contrast =
         this.role != "ROLE_JITUAN"
           ? this.$request.usageAnalysis
@@ -354,6 +358,10 @@ export default {
                 };
                 return gradeList;
               }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
           } else {
             this.gradeList =
               data.list?.map((item) => {
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index af7b4c1..06a0890 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -341,7 +341,7 @@ export default {
       if (this.editLoading) return;
       this.editLoading = true;
       const { data, status, info } = await this.$request.periodQuestionList({
-        examId: this.id,
+        periodId: this.id,
       });
       this.editLoading = false;
       if (status === 0) {
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index 2d29146..44e5ab9 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -100,17 +100,7 @@ export default {
         studentCode: "",
       },
       gradeList: [],
-      tableData: [
-        {
-          sn: 2543641,
-          className: "xxx",
-          studentName: "xxxx",
-          studentId: 563456,
-          type: "换卡",
-          desc: "xxxxx",
-          time: "20:00:00",
-        },
-      ],
+      tableData: [],
     };
   },
   created() {
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 1f9277d..2f0ca54 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -99,7 +99,7 @@
             </div>
             <el-table :data="tableData" border style="width: 100%">
               <el-table-column
-                prop="deviceId"
+                prop="sn"
                 label="设备编码"
                 align="center"
               ></el-table-column>
@@ -126,23 +126,23 @@
                 </template>
               </el-table-column>
               <el-table-column
-                prop="otaVersionNumber"
+                prop="otaVersionName"
                 label="固件版本号"
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="latestReportTime"
+                prop="onlineTime"
                 label="最近上报"
                 align="center"
               ></el-table-column>
               <el-table-column label="状态" align="center"
                 ><template slot-scope="scope">
                   {{
-                    scope.row.status == 1
+                    scope.row.onlineStatus == 1
                       ? "在线"
-                      : scope.row.status == 0
-                      ? "离线"
-                      : "异常"
+                      : scope.row.onlineStatus == 2
+                      ? "异常"
+                      : "离线"
                   }}
                 </template></el-table-column
               >
@@ -175,7 +175,7 @@
             </el-table>
           </div>
         </div>
-        <div v-if="type == 2">
+        <div v-else-if="type == 2">
           <div class="chart-box" v-if="count">
             <div class="device-num">
               <p class="p1">{{ count }}</p>
@@ -235,15 +235,15 @@
             </div>
             <el-table :data="tableData" border style="width: 100%">
               <el-table-column
-                prop="deviceId"
+                prop="sn"
                 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"
+                    v-for="(item, index) in scoped.row.studentList"
+                    :key="index"
                   >
                     {{ item.studentName }}
                   </p></template
@@ -256,7 +256,7 @@
               ></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">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
                   </p>
                 </template></el-table-column
@@ -291,7 +291,7 @@
             </el-table>
           </div>
         </div>
-        <div v-if="type == 3">
+        <div v-else-if="type == 3">
           <div class="table-box">
             <div class="answer-header">
               <div class="sel-box">
@@ -323,10 +323,10 @@
               style="width: 100%"
               @selection-change="handleSelectionChange"
             >
-              <el-table-column type="selection" width="55"> </el-table-column>
+              <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">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
                     {{ item.className }}
                   </p>
                 </template></el-table-column
@@ -354,11 +354,11 @@
               <el-table-column label="状态" align="center"
                 ><template slot-scope="scope">
                   {{
-                    scope.row.status == 1
+                    scope.row.onlineStatus == 1
                       ? "在线"
-                      : scope.row.status == 2
-                      ? "离线"
-                      : "异常"
+                      : scope.row.onlineStatus == 2
+                      ? "异常"
+                      : "离线"
                   }}
                 </template></el-table-column
               >
@@ -398,14 +398,14 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加答题器" :visible.sync="diaAnswerEqu" width="400">
+    <el-dialog title="修改基站" :visible.sync="diaAnswerEqu" width="400">
       <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
-        <el-form-item label="设备编码：" prop="number">
-          <el-col :span="10"
+        <el-form-item label="设备编码：" prop="deviceId">
+          <el-col :span="16"
             ><el-input
               type="text"
               placeholder="输入设备编码"
-              v-model.trim="form.number"
+              v-model.trim="form.deviceId"
               maxlength="30"
               size="45"
               show-word-limit
@@ -414,7 +414,7 @@
           ></el-col>
         </el-form-item>
         <el-form-item label="频点：" prop="frequency">
-          <el-col :span="10"
+          <el-col :span="16"
             ><el-input
               type="text"
               placeholder="输入频点"
@@ -427,7 +427,7 @@
           ></el-col>
         </el-form-item>
         <el-form-item label="配对码：" prop="pairingCode">
-          <el-col :span="10"
+          <el-col :span="16"
             ><el-input
               type="text"
               placeholder="输入配对码"
@@ -439,20 +439,20 @@
             </el-input
           ></el-col>
         </el-form-item>
-        <el-form-item label="选择班级：" prop="classId">
-          <el-col :span="10">
+        <el-form-item label="选择班级：" prop="classIds">
+          <el-col :span="16">
             <el-cascader
-              size="small"
+              class="sel"
               clearable
-              v-model="form.classId"
+              v-model="form.classIds"
               :options="gradeList"
-              :props="{ expandTrigger: 'hover' }"
+              :props="{ expandTrigger: 'hover',checkStrictly: true }"
               :show-all-levels="false"
             ></el-cascader>
           </el-col>
         </el-form-item>
         <el-form-item label="所在教室：">
-          <el-col :span="10"
+          <el-col :span="16"
             ><el-input
               type="text"
               placeholder="输入所在教室"
@@ -531,21 +531,21 @@ export default {
         { label: "3月以上", value: 6 },
       ],
       form: {
-        number: "",
+        deviceId:"",
         frequency: "",
         pairingCode: "",
-        classId: "",
+        classIds: [],
         roomName: "",
       },
       formRules: {
-        number: [
+        deviceId: [
           { required: true, message: "请输入设备编码", trigger: "blur" },
         ],
         frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
         pairingCode: [
           { required: true, message: "请输入配对码", trigger: "blur" },
         ],
-        classId: [{ required: true, message: "请选择班级", trigger: "blur" }],
+        classIds: [{ required: true, message: "请选择班级", trigger: "blur" }],
       },
       tableData: [],
       total: 0,
@@ -573,7 +573,19 @@ export default {
     }
   },
   methods: {
-    edit() {},
+    edit(obj) {
+      for(let key in this.form){
+        if(key=="classIds"){
+          this.form[key] = obj.classList?.map(item=>{
+            return [item.classId]
+          })
+        }else{
+          this.form[key] = obj[key]
+
+        }
+      }
+      this.diaAnswerEqu=true
+    },
     linkTo(obj, type) {
       this.$router.push({
         path: "/deviceLog",
@@ -700,17 +712,28 @@ export default {
     },
 
     // 添加设备
-    async addAnswerEqu() {
-      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);
-      }
+    addAnswerEqu() {
+      this.$refs.forms.validate(async (valid) => {
+        if (valid) {
+          if (this.loadingAnswerEqu) return;
+          this.loadingAnswerEqu = true;
+          let query = {...this.form}
+          query.classIds = query.classIds.map(item=>{
+            return item[1]
+          })
+          const { data, status, info } = await this.$request.updateDevice({...query});
+          this.loadingAnswerEqu = false;
+          console.log(status);
+          if (status === 0) {
+            this.diaAnswerEqu=false
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("数据有误，请检查！");
+        }
+      });
     },
     // 查找班级
     async _QueryGradeList() {
@@ -883,6 +906,7 @@ export default {
         this.role != "ROLE_JITUAN"
           ? this.$request.deviceList
           : this.$request.tenantDeviceList;
+      this.tableData = [];
       const { data, status, info } = await deviceList({
         ...query,
         deviceType: this.type,
@@ -912,6 +936,9 @@ export default {
 .tab-box {
   margin-bottom: 12px;
 }
+.sel{
+  width:100%;
+}
 .content {
   background: #f8f8f8;
   border: 1px solid #e2e2e2;
diff --git a/src/views/device/log.vue b/src/views/device/log.vue
index 0bfee2c..ad1a947 100644
--- a/src/views/device/log.vue
+++ b/src/views/device/log.vue
@@ -203,7 +203,7 @@ export default {
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
         case 4:
-          if (aMonth > 1 && aMonth < 4) {
+          if (aMonth > 0 && aMonth < 4) {
             aMonth = "01";
           } else if (aMonth > 3 && aMonth < 7) {
             aMonth = "04";
diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index e515d65..831bafb 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -2,15 +2,12 @@
   <div class="aside-box">
     <el-aside id="asideNav">
       <div class="logo-name">
-        <img
-          v-if="$store.getters.logoShow"
-          class="logo"
-          src="../../../assets/images/logo.png"
-          alt=""
-        />
+        <img v-if="$store.getters.logoShow" class="logo" :src="code?csLogo:logo" alt="" />
         <template v-else>
-          <img class="logo" src="../../../assets/images/logo.png" alt="" />
-          <p class="ellipsis">中天易教中天易教中天易教</p>
+          <img class="logo" :src="code?csLogo:logo" alt="" />
+          <p class="ellipsis">
+            {{ code ? "331互动课堂云平台" : "中天易教云平台" }}
+          </p>
         </template>
       </div>
       <el-menu
@@ -39,7 +36,12 @@
 
               <menu-tree :menuData="item.children"></menu-tree>
             </el-submenu>
-            <el-menu-item :index="item.path" v-else :key="item.path" :class="path.includes(item.path)?'is-active':''">
+            <el-menu-item
+              :index="item.path"
+              v-else
+              :key="item.path"
+              :class="path.includes(item.path) ? 'is-active' : ''"
+            >
               <i :class="item.iconCls ? item.iconCls : [fa, fa - file]" />
               <span slot="title">{{ item.name }}</span>
             </el-menu-item>
@@ -52,7 +54,9 @@
 
 <script>
 import menuTree from "./menuTree";
-
+import { getURLParams } from "@/utils";
+const logo = require('../../../assets/images/logo.png')
+const csLogo = require('../../../assets/images/331logo.png')
 export default {
   name: "asideNav",
   components: {
@@ -62,16 +66,20 @@ export default {
     // 监听浏览器直接输入路由，将此路由添加到tabnavBox
     "$route.path": function (val) {
       // this.selectmenu(val);
-      this.path = val
+      this.path = val;
     },
   },
-  data(){
+  data() {
     return {
-      path:""
-    }
+      path: "",
+      code: "",
+      logo:logo,
+      csLogo:csLogo,
+    };
   },
-  created(){
-    this.path = this.$route.path
+  created() {
+    this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
+    this.path = this.$route.path;
   },
   methods: {
     selectmenu(key, indexpath) {
@@ -125,8 +133,8 @@ $right: right;
     #{$side}-#{$prop}: $value;
   }
 }
-.aside-box{
-  max-width:200px;
+.aside-box {
+  max-width: 200px;
 }
 #asideNav {
   width: auto !important;
@@ -192,7 +200,7 @@ $right: right;
     }
   }
 }
-:deep(.is-active){
-  color:#fff
+:deep(.is-active) {
+  color: #fff;
 }
 </style>
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index eb3982d..05cf1a2 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -38,7 +38,7 @@ export default {
     };
   },
   created() {
-    this.initRouter();
+    // this.initRouter();
   },
   methods: {
     initRouter() {
@@ -55,46 +55,7 @@ export default {
           code: this.code,
         };
       }
-      // const { data = {}, message, code } = await loginCheck(params);
-      // if (code === 0) {
-      //   if (data) {
-      const userInfo = {
-        permissions: [
-          {
-            role: "superAdmin",
-            roleName: "超级管理员",
-          },
-        ],
-        name: "李老师",
-        // avatar: data.avatar ? data.avatar : "",
-        // uid: data.id,
-        authorityRouter: [
-          "examinationPaper",
-          "examinationPaperAdd",
-          "examinationPaperEdit",
-          "examinationPaperRecycle",
-          "ask",
-          "askAnalysis",
-          "test",
-          "testAnalysis",
-        ],
-      };
-      await this.$store.commit("setInfo", { ...userInfo });
-      await this.$store.commit("setRouters", userInfo.authorityRouter);
-      let newAddRouters = this.$store.getters.addRouters;
-      newAddRouters.forEach((res) => {
-        this.$router.addRoute(res);
-      });
-      this.$router.addRoute({
-        path: "*",
-        redirect: "/404",
-        hidden: true,
-        children: [],
-      });
-      // }
-      // } else {
-      //   this.$message.error(message);
-      // }
+      this.$store.dispatch("CSLogin", this.code);
     },
   },
 };
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 09fe3ba..6a9a118 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,6 +1,7 @@
-<template>
-  <div class="login-container">
+// <template>
+  <div class="login-container" v-loading="loading" element-loading-text="努力加载中...">
     <el-form
+      v-if="!code && !dockkey"
       ref="loginForm"
       :model="loginForm"
       :rules="loginRules"
@@ -88,22 +89,26 @@ import { getURLParams } from "@/utils";
 export default {
   data() {
     return {
+      loading:false,
       disableClick: true,
       passwordType: "password",
       loginForm: {
         // username: "15911715665",
         // password: "Csiy88888",
-        // username: "13610050254",
-        // password: "Pw050254#",
+        username: "13610050254",
+        password: "Pw050254#",
         // username: "18332123505",
         // password: "Pw123505#",
+        // username: "18687826606",
+        // password: "Pw826606#",
         // username: "18946034886",
         // password: "Pw034886#",
         // username: "18893712576",
         // password: "Pw712576#",
-        username: "13247726488",
-        password: "726488",
-        
+        // username: "13247726488",
+        // password: "726488",
+        // username: "13319607658",
+        // password: "Pw607658#",
       },
       loginRules: {
         username: [
@@ -123,7 +128,8 @@ export default {
     this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
     this.dockkey = getURLParams("dockkey") || "";
     if (this.code || this.dockkey) {
-      this._LoginCheck();
+      this.loading = true
+      // this._LoginCheck();
     }
   },
   methods: {
@@ -188,7 +194,7 @@ $cursor: #000;
       border-radius: 0px;
       font-size: 16px;
       color: $light_gray;
-      height:48px;
+      height: 48px;
       line-height: 48px;
       caret-color: $cursor;
       &:-webkit-autofill {
diff --git a/src/views/setUp/conglomerate.vue b/src/views/setUp/conglomerate.vue
index 1635a35..f6ad2fc 100644
--- a/src/views/setUp/conglomerate.vue
+++ b/src/views/setUp/conglomerate.vue
@@ -190,7 +190,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="学段：">
+        <el-form-item label="学段：" prop="sections">
           <el-checkbox-group v-model="formSchool.sections">
             <el-checkbox :label="1">小学</el-checkbox>
             <el-checkbox :label="2">初中</el-checkbox>
@@ -446,7 +446,7 @@ export default {
             this.$message.error(info);
           }
         } else {
-          this.$message.error("学校名称数据有误，请检查！");
+          this.$message.error("数据有误，请检查！");
           return false;
         }
       });
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index 7851c16..b7c776f 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -422,7 +422,6 @@ export default {
     max-height: 80vh;
     .h-title {
       height: 40px;
-      overflow-y: scroll;
       line-height: 40px;
       background: #eee;
     }
@@ -451,6 +450,7 @@ export default {
       }
       &.active {
         color: #667ffd;
+        background: #eee;
       }
     }
     .sel {
