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/axios.js b/src/api/axios.js
index cfa258f..81268de 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -63,6 +63,8 @@ service.interceptors.response.use(
     return Promise.resolve(res);
   },
   (error) => {
+    const { data, status } = error.response;
+
     Message({
       message: error,
       type: "error",
@@ -71,14 +73,31 @@ service.interceptors.response.use(
     if (error.response == undefined) {
       return Promise.reject(error);
     }
-    const { data, status } = error.response;
+
     if (status === 403 || status === 401) {
+      if (data.status === 999) {
+        if (!location.href.includes("localhost")) {
+          if (data.data) {
+            window.location.href = data.data;
+          } else {
+            router.push({ path: "/login" });
+            if (res.message.includes("不存在")) {
+              Message({
+                message: res.message,
+                type: "error",
+                duration: 3 * 1000,
+              });
+            }
+          }
+        }
+      }
       Message.closeAll();
       Message({
         message: data.info || "未登录或登录超时，即将跳转到登录页面",
         type: "error",
         duration: 3 * 1000,
       });
+
       if (!window.location.href.includes("login")) {
         router.push({
           path: "/login",
@@ -86,6 +105,7 @@ service.interceptors.response.use(
             url: window.location.href,
           },
         });
+
       }
       return;
     }
diff --git a/src/store/index.js b/src/store/index.js
index caf1f87..3bfbade 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -86,7 +86,6 @@ const store = new Vuex.Store({
                 hidden: true,
                 children: [],
               });
-              console.log(Cookies.get("ZT_YIJIAO_TOKEN"));
               if (params.url) {
                 window.location.href = params.url;
               } else {
@@ -109,6 +108,49 @@ const store = new Vuex.Store({
         })
         .catch(() => {});
     },
+    CSLogin({ state, commit }, code) {
+      request
+        .ssoLogin({ code:code})
+        .then((res) => {
+          let response = res;
+          if (response.status == 0) {
+            const userInfo = { ...response.data };
+            if (userInfo.permissions && userInfo.permissions.length) {
+              userInfo.showRoleName = response.data.permissions[0]?.roleName;
+              commit("setToken", "isLogin");
+              commit("setCode", code);
+              commit("setInfo", { ...userInfo });
+              commit("setRouters", [
+                ...userInfo.permissions[0]?.authorityRouter,
+              ]);
+              state.addRouters.forEach((res) => {
+                router.addRoute(res);
+              });
+              router.addRoute({
+                path: "*",
+                redirect: "/404",
+                hidden: true,
+                children: [],
+              });
+                router.push({ path: "/" });
+              
+            } else {
+              Message({
+                message: "该账号暂无权限，请联系管理员~",
+                type: "error",
+                duration: 3 * 1000,
+              });
+            }
+          } else {
+            Message({
+              message: response.info,
+              type: "error",
+              duration: 3 * 1000,
+            });
+          }
+        })
+        .catch(() => {});
+    },
     permissions({ state, commit }, role) {
       commit("setToken", "isLogin");
       let userInfo = state.info;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index 6590087..3c5d1d0 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -62,13 +62,12 @@
                   :options="gradeList"
                   :props="props"
                   :show-all-levels="false"
-                  @change="_QueryData(false)"
                 ></el-cascader>
                 <el-select
                   class="sel"
                   v-model="query.onlineStatus"
                   placeholder="选择状态"
-                  @change="_QueryData(false)"
+                  @change="_QueryData(true)"
                 >
                   <el-option
                     v-for="item in statusList"
@@ -91,6 +90,12 @@
                     @click="_QueryData(true)"
                   ></el-button>
                 </el-input>
+                <el-button
+                  class="serach-box"
+                  round
+                  @click="_QueryData(true)"
+                  >筛选</el-button
+                >
               </div>
             </div>
             <el-table :data="tableData" border style="width: 100%">
@@ -192,13 +197,12 @@
                   :options="gradeList"
                   :props="props"
                   :show-all-levels="false"
-                  @change="_QueryData(false)"
                 ></el-cascader>
                 <el-select
                   class="sel"
                   v-model="query.type"
                   placeholder="选择状态"
-                  @change="_QueryData(false)"
+                  @change="_QueryData(true)"
                 >
                   <el-option
                     v-for="item in typeList"
@@ -221,6 +225,12 @@
                     @click="_QueryData(true)"
                   ></el-button>
                 </el-input>
+                <el-button
+                  class="serach-box"
+                  round
+                  @click="_QueryData(true)"
+                  >筛选</el-button
+                >ƒ
               </div>
             </div>
             <el-table :data="tableData" border style="width: 100%">
@@ -571,7 +581,7 @@ export default {
         obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2;
       this.query.sn = "";
       this.page = 1;
-      this._QueryData();
+      this._QueryData(false);
     },
     clickScatterChart(obj) {
       this.query.type =
@@ -588,7 +598,7 @@ export default {
           : 6;
       this.query.sn = "";
       this.page = 1;
-      this._QueryData();
+      this._QueryData(false);
     },
     handleSelectionChange(val) {
       console.log(val);
@@ -606,7 +616,7 @@ export default {
     }, 800),
     changePage(page) {
       this.page = page;
-      this._QueryData();
+      this._QueryData(false);
     },
     async autoUpDate(id) {
       if (!this.selectionTabIds.length && !id) {
@@ -783,7 +793,7 @@ export default {
       }
     },
     // 设备列表信息
-    async _QueryData() {
+    async _QueryData(isRef) {
       this.loading = true;
       let query = {};
       let gradeNames = [];
@@ -807,7 +817,9 @@ export default {
           this.query.type !== "" ? (query.type = this.query.type) : "";
         }
       }
-
+      if(isRef){
+        this.page= 1
+      }
       this.loading = true;
       const deviceList =
         this.role != "ROLE_JITUAN"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3a8158e..5fec8c9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -84,20 +84,21 @@
   </div>
 </template>
 <script>
+import { getURLParams } from "@/utils";
 export default {
   data() {
     return {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        // username: "13610050254",
-        // password: "Pw050254#",
+        username: "13610050254",
+        password: "Pw050254#",
         // username: "18946034886",
         // password: "Pw034886#",
         // username: "18332123505",
         // password: "Pw123505#",
-        username: "15911715665",
-        password: "Csiy88888",
+        // username: "15911715665",
+        // password: "Csiy88888",
       },
       loginRules: {
         username: [
@@ -108,10 +109,17 @@ export default {
         ],
       },
       url: "",
+      code: "",
+      dockkey: "",
     };
   },
   created() {
     this.url = this.$route.query?.url || "";
+    this.code = getURLParams("code") || localStorage.getItem("csCode") || "";
+    this.dockkey = getURLParams("dockkey") || "";
+    if (this.code || this.dockkey) {
+      this._LoginCheck();
+    }
   },
   methods: {
     showPwd() {
@@ -136,6 +144,9 @@ export default {
         this.$store.dispatch("Login", { ...this.loginForm, url: this.url });
       }
     },
+    _LoginCheck() {
+      this.$store.dispatch("CSLogin", this.code || this.dockkey);
+    },
   },
   mounted() {},
 };
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index 78033e0..adc8fc5 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -4,7 +4,7 @@
       <template slot="title">
         <span>学校设置</span>
       </template>
-      <template slot="btns">
+      <template slot="btns" v-if="!code">
         <el-tooltip effect="dark" content="导入学校名单" placement="bottom">
           <el-button
             type="primary"
@@ -226,6 +226,7 @@ export default {
   },
   data() {
     return {
+      code:"",
       loading: false,
       url: "xxx",
       diaUp: false,
@@ -275,6 +276,7 @@ export default {
     };
   },
   created() {
+    this.code = localStorage.getItem("csCode")||""
     this._QueryDataSchool();
     this._QueryDataGrade();
     this._QuerySubject();
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index 633e18d..b2aa6a2 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -4,7 +4,7 @@
       <template slot="title">
         <span>教师管理</span>
       </template>
-      <template slot="btns">
+      <template slot="btns" v-if="!code">
         <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
           <el-button
             type="primary"
@@ -95,7 +95,7 @@
           </ul>
         </div>
         <div class="teacher-detail">
-          <div class="icon-box">
+          <div class="icon-box" v-if="!code">
             <i class="icon el-icon-edit-outline" @click="editTeacher(1)"></i>
             <i
               class="icon el-icon-circle-plus-outline"
@@ -128,7 +128,11 @@
                 v-for="item in teacherDetail.managerList"
                 :key="item.classId"
               >
-                <el-popconfirm title="确定删除吗？" confirm="">
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 1)"
+                  v-if="!code"
+                >
                   <i class="el-icon-delete" slot="reference"></i>
                 </el-popconfirm>
                 <div class="grade-item">
@@ -158,7 +162,11 @@
                 v-for="item in teacherDetail.teacherCourseList"
                 :key="item.classId"
               >
-                <el-popconfirm title="确定删除吗？" confirm="">
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 2)"
+                  v-if="!code"
+                >
                   <i class="el-icon-delete" slot="reference"></i>
                 </el-popconfirm>
                 <div class="grade-item">
@@ -190,7 +198,11 @@
               :key="item.grade"
             >
               <li class="grade-li">
-                <el-popconfirm title="确定删除吗？" confirm="">
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 3)"
+                  v-if="!code"
+                >
                   <i class="el-icon-delete" slot="reference"></i>
                 </el-popconfirm>
                 <div class="grade-item">
@@ -338,6 +350,7 @@ import { downloadFile, formatGradeClass, randomWord } from "@/utils";
 export default {
   data() {
     return {
+      code: "",
       loading: false,
       url: "",
       diaUp: false,
@@ -402,6 +415,7 @@ export default {
     };
   },
   async created() {
+    this.code = localStorage.getItem("csCode") || "";
     await this._QueryDataGrade();
     this._QueryData(1);
     this._RoleList();
@@ -582,6 +596,39 @@ export default {
         });
       });
     },
+    async delTeacherManager(obj, type) {
+      let query;
+      switch (type) {
+        case 1:
+          query = {
+            classId: obj.classId,
+          };
+          break;
+        case 2:
+          query = {
+            classId: obj.classId,
+            subjectName: obj.subjectName,
+          };
+          break;
+        case 3:
+          query = {
+            classId: obj.classId,
+            grade: obj.grade,
+            subjectName: obj.subjectName,
+          };
+          break;
+      }
+      //角色
+      const { data, status, info } = await this.$request.delTeacherManager({
+        teacherId: obj.teacherId,
+        ...query
+      });
+      if (status === 0) {
+        this._QueryData(10);
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _RoleList() {
       //角色
       const { data, status, info } = await this.$request.roleList();
@@ -730,7 +777,7 @@ export default {
   overflow: hidden;
   min-height: 400px;
   .teacher-ul {
-    max-height: 70vh;
+    max-height: 60vh;
     overflow-y: scroll;
   }
   .teacher-list {