diff --git a/src/router/index.js b/src/router/index.js
index b7aa358..913a0fe 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -282,9 +282,9 @@ let addrouters = [  //测试用，后续后端获取
         iconCls: "fa fa-dashboard", // 图标样式class
         name: "",
         component: Device,
-        // meta: {
-        //   keepAlive: true,
-        // },
+        meta: {
+          keepAlive: true,
+        },
         children: []
       },
       {
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index a6f79b2..e5b91f7 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -100,6 +100,7 @@
 export default {
   data() {
     return {
+      loading:false,
       props: { multiple: true, checkStrictly: false },
       query: {
         classId: [],
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index c1df4e5..e3a45c2 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -60,12 +60,13 @@
               <div class="sel-box">
                 <el-cascader
                   size="small"
-                  class="sel"
+                  class="sel sel2"
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
                   :options="gradeList"
                   :props="props"
+                  collapse-tags
                   :show-all-levels="false"
                 ></el-cascader>
                 <el-select
@@ -196,12 +197,13 @@
               <div class="sel-box">
                 <el-cascader
                   size="small"
-                  class="sel"
+                  class="sel sel2"
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
                   :options="gradeList"
                   :props="props"
+                  collapse-tags
                   :show-all-levels="false"
                 ></el-cascader>
                 <el-select
@@ -299,12 +301,13 @@
               <div class="sel-box">
                 <el-cascader
                   size="small"
-                  class="sel"
+                  class="sel sel2"
                   clearable
                   placeholder="选择班级"
                   v-model="query.classId"
                   :options="gradeList"
                   :props="props"
+                  collapse-tags
                   :show-all-levels="false"
                   @change="_QueryData(false)"
                 ></el-cascader>
@@ -497,6 +500,7 @@ import scatterChart from "@/components/charts/scatterChart";
 import _ from "lodash";
 import { downloadFile, formatClass, formatGradeNameClass } from "@/utils";
 import api from "@/api/apis/apis";
+import BusEvent from "@/utils/busEvent";
 export default {
   components: { pieChart, scatterChart },
   watch: {
@@ -627,6 +631,21 @@ export default {
       this.showSchool();
     }
   },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.type = 1;
+      that.page = 1;
+      that.total = 0;
+      that.count = 0;
+      that.query.classId = [];
+      that.query.onlineStatus = "";
+      that.query.sn = "";
+      that.query.type = "";
+      that.stationReport();
+      that._QueryData();
+    });
+  },
   methods: {
     upSuccess() {
       //导入成功
@@ -1073,9 +1092,6 @@ export default {
 .tab-box {
   padding: 20px 0 12px;
 }
-.sel {
-  width: 100%;
-}
 .content {
   background: #f8f8f8;
   border: 1px solid #e2e2e2;
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index f158104..4db5ee1 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -139,6 +139,7 @@ export default {
           this.$router.push({
             path: "/login",
           });
+          window.location.reload()
         }
       } else {
         this.$message.error(message);
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index 8dd0604..1d5466a 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -26,6 +26,16 @@
             @click="openAddDia"
           ></el-button>
         </el-tooltip>
+        <el-tooltip effect="dark" content="账号同步" placement="bottom" v-else>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            size="mini"
+            plain
+            circle
+            @click="refreshAcc"
+          ></el-button>
+        </el-tooltip>
       </template>
     </back-box>
     <div class="answer-header">
@@ -429,6 +439,14 @@ export default {
     this._QueryData(4);
   },
   methods: {
+    async refreshAcc(){//长水账号同步
+      const { data, status, info } = await this.$request.roleList();
+      if (status === 0) {
+        this._QueryData(4);
+      } else {
+        this.$message.error(info);
+      }
+    },
     upSuccess() {
       //导入成功
       this.diaUp = false;
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index bb5c2d5..b4dd171 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -96,12 +96,7 @@
                 <i class="el-icon-delete" slot="reference"></i>
               </el-popconfirm>
               <p class="name">{{ item.studentName }}</p>
-              <p class="p1">
-                答题器：{{
-                  (item.clickerList.length && item.clickerList[0].clickerSn) ||
-                  "--"
-                }}
-              </p>
+              <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
               <p class="p1">长学号：{{ item.studentCode }}</p>
               <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
             </li>