diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index 2eefeb4..642efb3 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -149,10 +149,10 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="duration"
+            prop="consumingDuration"
             label="答题耗时"
             align="center"
-          ><template slot-scope="scoped">{{setDuration(scoped.row.duration)}}</template></el-table-column>
+          ><template slot-scope="scoped">{{setDuration(scoped.row.consumingDuration)}}</template></el-table-column>
           <el-table-column
             prop="correctAnswerTimes"
             label="答对次数"
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 00a9e43..8bc4602 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -375,7 +375,13 @@
               align="center"
             ></el-table-column>
           </el-table>
-          <el-table v-else :max-height="tableMaxHeight" :data="tableData" border style="width: 100%">
+          <el-table
+            v-else
+            :max-height="tableMaxHeight"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
             <el-table-column
               prop="studentCode"
               label="学号"
@@ -465,6 +471,7 @@
 
 <script>
 import { formatDate, deepClone, downloadFile } from "utils";
+import BusEvent  from "@/utils/busEvent";
 export default {
   data() {
     return {
@@ -512,6 +519,20 @@ export default {
       this.query.endDay = new Date();
     }
   },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
   methods: {
     changeSub(val) {
       let sub;
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index ebc3970..c1df4e5 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -327,6 +327,11 @@
               @selection-change="handleSelectionChange"
             >
               <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column
+                prop="sn"
+                label="设备编码"
+                align="center"
+              ></el-table-column>
               <el-table-column prop="class" label="关联班级" align="center"
                 ><template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index 0367faa..7a9c48a 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -2,9 +2,14 @@
   <div class="aside-box">
     <el-aside id="asideNav">
       <div class="logo-name">
-        <img v-if="$store.getters.logoShow" class="logo" :src="code?csLogo:logo" alt="" />
+        <img
+          v-if="$store.getters.logoShow"
+          class="logo"
+          :src="code ? csLogo : logo"
+          alt=""
+        />
         <template v-else>
-          <img class="logo" :src="code?csLogo:logo" alt="" />
+          <img class="logo" :src="code ? csLogo : logo" alt="" />
           <p class="ellipsis">
             {{ code ? "331互动课堂云平台" : "中天易教云平台" }}
           </p>
@@ -56,8 +61,9 @@
 <script>
 import menuTree from "./menuTree";
 import { getURLParams } from "@/utils";
-const logo = require('../../../assets/images/logo.png')
-const csLogo = require('../../../assets/images/331logo.png')
+import BusEvent from "@/utils/busEvent";
+const logo = require("../../../assets/images/logo.png");
+const csLogo = require("../../../assets/images/331logo.png");
 export default {
   name: "asideNav",
   components: {
@@ -68,14 +74,15 @@ export default {
     "$route.path": function (val) {
       // this.selectmenu(val);
       this.path = val;
+      BusEvent.$off("keepAlive");
     },
   },
   data() {
     return {
       path: "",
       code: "",
-      logo:logo,
-      csLogo:csLogo,
+      logo: logo,
+      csLogo: csLogo,
     };
   },
   created() {
@@ -83,6 +90,9 @@ export default {
     this.path = this.$route.path;
   },
   methods: {
+    isKeep() {
+      BusEvent.$emit("keepAlive");
+    },
     selectmenu(key, indexpath) {
       // 如果不使用 elemenUI 菜单的 vue-router 的模式将用以下方式进行页面跳转 el-menu的router设置为false
       // this.$router.push(indexpath.join("/"))
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index dd1b0c4..c2cb379 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -5,17 +5,17 @@
       <el-container>
         <layoutHeader></layoutHeader>
         <el-main id="elmain">
-          <!-- <transition name="main" mode="out-in">
+          <transition name="main" mode="out-in">
             <keep-alive key="keepAlive">
               <router-view v-if="$route.meta.keepAlive" ></router-view>
             </keep-alive>
           </transition>
           <transition name="main" mode="out-in">
             <router-view v-if="!$route.meta.keepAlive" key="not-keepAlive"></router-view>
-          </transition> -->
-          <transition name="main" mode="out-in">
-            <router-view key="not-keepAlive"></router-view>
           </transition>
+          <!-- <transition name="main" mode="out-in">
+            <router-view key="not-keepAlive"></router-view>
+          </transition> -->
         </el-main>
         <el-footer height="28px">
           <Bottom></Bottom>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index c723022..e93f95e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,14 +95,14 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "715665",
-        username: "18314340313",
-        password: "Pw340313#",
+        // username: "18314340313",
+        // password: "Pw340313#",
         // username: "18687826606",
         // password: "Pw826606#",
         // username: "18893712576",
         // password: "712576",
-        // username: "13247726488",
-        // password: "726488",
+        username: "13247726488",
+        password: "726488",
       },
       loginRules: {
         username: [
diff --git a/src/views/test/analysis.vue b/src/views/test/analysis.vue
index eed270b..3d304e0 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/test/analysis.vue
@@ -341,7 +341,7 @@
           >
             <template slot-scope="scope">
               <span
-                v-if="tableData[index].questionType==5"
+                v-if="tableData[index]?.questionType==5"
               >*</span>
               <span
                 v-else-if="scope.row['answer' + item.id]"
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index e09f152..adcdb1e 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -122,7 +122,7 @@
           <el-table-column
             prop="examStartTime"
             label="测验时间"
-            width="160"
+            width="100"
             align="center"
           ></el-table-column>
           <el-table-column prop="avgScore" label="班平均分" align="center"
@@ -467,6 +467,7 @@
 <script>
 import { formatDate, downloadFile } from "utils";
 import editAnswer from "./editAnswer.vue";
+import BusEvent from "@/utils/busEvent";
 export default {
   components: { editAnswer },
   data() {
@@ -517,6 +518,19 @@ export default {
       this.query.endDay = new Date();
     }
   },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      await that._QueryClassList();
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
   methods: {
     changeSub(val) {
       let sub;