diff --git a/router b/router
index 24f40e7..d0b6f85 100644
--- a/router
+++ b/router
@@ -1,258 +1,22 @@
-[  //测试用，后续后端获取
-  {
-    path: "/examinationPaper",
-    iconCls: "fa fa-file-text", // 图标样式class
-    name: "备题组卷",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/examinationPaper",
-        iconCls: "fa fa-file-text", // 图标样式class
-        name: "",
-        component: ExaminationPaper,
-        children: []
-      },
-      {
-        path: "/examinationPaperAdd",
-        iconCls: "", // 图标样式class
-        name: "添加答题卡",
-        component: ExaminationPaperAdd,
-        children: []
-      },
-      {
-        path: "/examinationPaperEdit",
-        iconCls: "", // 图标样式class
-        name: "修改答题卡",
-        component: ExaminationPaperEdit,
-        children: []
-      },
-      {
-        path: "/examinationPaperRecycle",
-        iconCls: "", // 图标样式class
-        name: "已归档答题卡",
-        component: ExaminationPaperRecycle,
-        children: []
-      },
-    ]
-  },
-  {
-    path: "/ask",
-    iconCls: "fa fa-bar-chart", // 图标样式class
-    name: "随堂问报表",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/ask",
-        iconCls: "fa fa-bar-chart", // 图标样式class
-        name: "",
-        component: Ask,
-        children: []
-
-      },
-      {
-        path: "/askAnalysis",
-        iconCls: "", // 图标样式class
-        name: "随堂问报表分析",
-        component: AskAnalysis,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "/test",
-    iconCls: "fa fa-pie-chart", // 图标样式class
-    name: "即时测报表",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/test",
-        iconCls: "fa fa-pie-chart", // 图标样式class
-        name: "",
-        component: Test,
-        children: []
-      },
-      {
-        path: "/testAnalysis",
-        iconCls: "", // 图标样式class
-        name: "即时测报表分析",
-        component: TestAnalysis,
-        children: []
-      }
-
-    ]
-  },
-  {
-    path: "/portrait",
-    iconCls: "fa fa-users", // 图标样式class
-    name: "学生画像",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/portrait",
-        iconCls: "fa fa-users", // 图标样式class
-        name: "",
-        component: Portrait,
-        children: []
-      }
-    ]
-  },
-  
-  {
-    path: "/setUpConglomerate",
-    iconCls: "fa fa-building", // 图标样式class
-    name: "学校管理",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/setUpConglomerate",
-        iconCls: "fa fa-building",
-        name: '集团管理',
-        component: SetUpConglomerate,
-        children: []
-      },
-    ]
-  },
-  {
-    path: "/setUpAccount",
-    iconCls: "fa fa-id-card-o", // 图标样式class
-    name: "账号管理",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/setUpAccount",
-        iconCls: "fa fa-id-card-o",
-        name: '',
-        component: SetUpAccount,
-        children: []
-      },
-    ]
-  },
-  {
-    path: "/",
-    iconCls: "fa fa-cog",
-    name: '学校设置',
-    component: Layout,
-    children: [
-      {
-        path: "/setUpSchool",
-        iconCls: "fa fa-calculator",
-        name: '学校设置',
-        component: SetUpSchool,
-        children: []
-      },
-      {
-        path: "/setUpTeacher",
-        iconCls: "fa fa-male",
-        name: '教师管理',
-        component: SetUpTeacher,
-        children: []
-      },
-      {
-        path: "/setUpStudent",
-        iconCls: "fa fa-mortar-board",
-        name: '学生管理',
-        component: SetUpStudent,
-        children: []
-      },
-    ]
-  },
-  {
-    path: "/card",
-    iconCls: "fa fa-id-card", // 图标样式class
-    name: "发卡记录",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/card",
-        iconCls: "fa fa-id-card", // 图标样式class
-        name: "",
-        component: Card,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "/device",
-    iconCls: "fa fa-dashboard", // 图标样式class
-    name: "设备状态",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/device",
-        iconCls: "fa fa-dashboard", // 图标样式class
-        name: "",
-        component: Device,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "/analysis",
-    iconCls: "fa fa-area-chart", // 图标样式class
-    name: "使用分析",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/analysis",
-        iconCls: "fa fa-area-chart", // 图标样式class
-        name: "",
-        component: Analysis,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "/down",
-    iconCls: "fa fa-download", // 图标样式class
-    name: "软件下载",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/down",
-        iconCls: "fa fa-download", // 图标样式class
-        name: "发卡软件",
-        component: Down,
-        children: []
-      },
-      {
-        path: "/downClient",
-        iconCls: "", // 图标样式class
-        name: "授课端软件",
-        component: DownClient,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "/dataSync",
-    iconCls: "fa fa-random", // 图标样式class
-    name: "数据同步",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/dataSync",
-        iconCls: "fa fa-random", // 图标样式class
-        name: "",
-        component: DataSync,
-        children: []
-      }
-    ]
-  },
-  {
-    path: "*",
-    redirect: "/404",
-    hidden: true,
-    children: []
-  }
+[
+  "examinationPaper",
+  "examinationPaperAdd",
+  "examinationPaperEdit",
+  "examinationPaperRecycle",
+  "ask",
+  "askAnalysis",
+  "test",
+  "testAnalysis",
+  "portrait",
+  "setUpConglomerate",
+  "setUpAccount",
+  "setUpSchool",
+  "setUpTeacher",
+  "setUpStudent",
+  "card",
+  "device",
+  "analysis",
+  "down",
+  "downClient",
+  "dataSync"
 ]
\ No newline at end of file
diff --git a/src/api/apis/answerSheet.js b/src/api/apis/answerSheet.js
index 698f09b..d25ecd6 100644
--- a/src/api/apis/answerSheet.js
+++ b/src/api/apis/answerSheet.js
@@ -1,11 +1,11 @@
 
-import axios from "../axios"
+import service from "../axios"
 import answerSheet from "../urls/answerSheet"
 
 export default {
   // 答题卡列表
   fetchAnswerList(data) {
-    return axios({
+    return service({
       url: answerSheet.answerList,
       method: 'POST',
       data
@@ -13,7 +13,7 @@ export default {
   },
   // 测验类型
   fetchTypeNames(data) {
-    return axios({
+    return service({
       url: answerSheet.typeNames,
       method: 'POST',
       data
@@ -21,7 +21,7 @@ export default {
   },
   // 班级列表
   fetchClassList(data) {
-    return axios({
+    return service({
       url: answerSheet.classList,
       method: 'POST',
       data
@@ -29,7 +29,7 @@ export default {
   },
   // 科目列表
   fetchSubjectList(data) {
-    return axios({
+    return service({
       url: answerSheet.subjectList,
       method: 'POST',
       data
@@ -37,7 +37,7 @@ export default {
   },
   // 年级列表
   fetchGradeList(data) {
-    return axios({
+    return service({
       url: answerSheet.gradeList,
       method: 'POST',
       data
@@ -45,7 +45,7 @@ export default {
   },
   // 添加测验类型
   addAnswerTypeName(data) {
-    return axios({
+    return service({
       url: answerSheet.addAnswerTypeName,
       method: 'POST',
       data
@@ -53,7 +53,7 @@ export default {
   },
   // 保存答题卡
   saveAnswerSheet(data) {
-    return axios({
+    return service({
       url: answerSheet.saveAnswerSheet,
       method: 'POST',
       data
@@ -61,7 +61,7 @@ export default {
   },
   // 删除答题卡
   removeAnswerSheet(data) {
-    return axios({
+    return service({
       url: answerSheet.removeAnswerSheet,
       method: 'POST',
       data
@@ -69,7 +69,7 @@ export default {
   },
   // 恢复答题卡
   useAnswerSheet(data) {
-    return axios({
+    return service({
       url: answerSheet.useAnswerSheet,
       method: 'POST',
       data
@@ -77,7 +77,7 @@ export default {
   },
   // 恢复答题卡
   updateAnswerSheet(data) {
-    return axios({
+    return service({
       url: answerSheet.updateAnswerSheet,
       method: 'POST',
       data
diff --git a/src/api/apis/ask.js b/src/api/apis/ask.js
new file mode 100644
index 0000000..445bfd1
--- /dev/null
+++ b/src/api/apis/ask.js
@@ -0,0 +1,14 @@
+
+import service from "../axios"
+import askUrls from "../urls/login"
+
+export default {
+  // 账号密码登陆
+  fetchQuizList(data) {
+    return service({
+      url: askUrls.quizList,
+      method: 'POST',
+      data
+    })
+  },
+}
diff --git a/src/api/apis/login.js b/src/api/apis/login.js
index 5d3eb16..32add82 100644
--- a/src/api/apis/login.js
+++ b/src/api/apis/login.js
@@ -1,11 +1,11 @@
 
-import axios from "../axios"
+import service from "../axios"
 import loginUrls from "../urls/login"
 
 export default {
   // 账号密码登陆
   fetchLogin(data) {
-    return axios({
+    return service({
       url: loginUrls.login,
       method: 'POST',
       data
diff --git a/src/api/apis/role.js b/src/api/apis/role.js
index 4c9ba1e..c7422b3 100644
--- a/src/api/apis/role.js
+++ b/src/api/apis/role.js
@@ -1,11 +1,11 @@
 
-import axios from "../axios"
+import service from "../axios"
 import roleUrls from "../urls/role"
 
 export default {
   // 获取权限列表
   fetchGetRoleList () {
-    return axios.post(roleUrls.getRoleList)
+    return service.post(roleUrls.getRoleList)
   },
 }
 
diff --git a/src/api/axios.js b/src/api/axios.js
index c322633..5b714b9 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -6,11 +6,13 @@ import router from "@/router/index"
 import store from "@/store"
 import conf from "../config/index"; // 路径配置
 // axios默认配置
-axios.defaults.timeout = 1000000000 // 超时时间
-axios.defaults.baseURL = conf.baseURL
-
+const service = axios.create({
+  baseURL: conf.baseURL, // api的base_url
+  timeout: 600000000000000, // 请求超时时间
+  withCredentials: true,
+});
 // http request 拦截器
-axios.interceptors.request.use(config => {
+service.interceptors.request.use(config => {
   NProgress.start()
   config.headers["Content-Type"] = "application/json;charset=UTF-8"
 
@@ -27,16 +29,16 @@ axios.interceptors.request.use(config => {
   })
 
 // http response 拦截器
-axios.interceptors.response.use(
+service.interceptors.response.use(
   response => {
-    const res = respones.data;
+    const res = response.data;
     NProgress.done()
-    if (respones.config.cancelToken) {
-      store.commit('delTokenSources', respones.config.cancelToken)
+    if (response.config.cancelToken) {
+      store.commit('delTokenSources', response.config.cancelToken)
     }
-    if (respones.status == 200) {
+    if (response.status == 200) {
       Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
-      // console.log(respones.status)
+      // console.log(response.status)
       if (res.code == 999) {
         if (!location.href.includes('localhost')) {
           if (res.data) {
@@ -88,4 +90,4 @@ axios.interceptors.response.use(
     }
     return Promise.reject(error.response) // 返回接口返回的错误信息
   })
-export default axios
+export default service
diff --git a/src/api/urls/ask.js b/src/api/urls/ask.js
new file mode 100644
index 0000000..2b54532
--- /dev/null
+++ b/src/api/urls/ask.js
@@ -0,0 +1,5 @@
+
+export default {
+  // 账号密码登陆
+  quizList: "/web/quizList",
+}
diff --git a/src/api/urls/login.js b/src/api/urls/login.js
index 1b687d9..27b3e13 100644
--- a/src/api/urls/login.js
+++ b/src/api/urls/login.js
@@ -1,5 +1,6 @@
 
 export default {
   // 账号密码登陆
-  login: "/admin/user/login"
+  login: "/web/login",
+  ssoLogin: "/sso/login"
 }
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index 39663b3..e5a25ee 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -3,65 +3,113 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+
   .btn-box {
     display: flex;
   }
+
   .sel-box {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-  .sel {
-    width: 8%;
-    min-width: 90px;
-    margin-right: 20px;
-  }
-  .el-input__inner{
-    border-radius: 20px;
-    border: 1px solid #e2e2e2;
-    height: 36px;
-    line-height: 34px;
-  }
-  .el-input__icon {
-    line-height: 34px;
-  }
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
-    width: 200px;
-  }
-  .input-with-select {
-    width: 200px;
-    height: 36px;
-    margin-right: 50px;
-    border-radius: 20px;
-    border: 1px solid #e2e2e2;
-    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    flex-wrap: nowrap;
+
+    .sel {
+      width: 8%;
+      min-width: 160px;
+      margin-right: 20px;
+    }
+
     .el-input__inner {
       border-radius: 20px;
-      border: none;
-      height: 34px;
+      border: 1px solid #e2e2e2;
+      height: 36px;
       line-height: 34px;
     }
-    .el-input-group__append, .el-input-group__prepend {
-      border: none;
-      background: transparent;
+
+    .el-input__icon {
+      line-height: 34px;
     }
-  }
-  .d1 {
-    margin-left: 30px;
-  }
-  .p1 {
-    flex: 1;
-    .s1 {
-      margin-left: 36px;
-      cursor: pointer;
-      color: #7f7f7f;
-      &:hover {
-        color: #409eff;
+
+    .el-date-editor.el-input,
+    .el-date-editor.el-input__inner {
+      width: 160px;
+    }
+
+    .input-with-select {
+      width: 200px;
+      height: 36px;
+      margin-right: 50px;
+      border-radius: 20px;
+      border: 1px solid #e2e2e2;
+      box-sizing: border-box;
+
+      .el-input__inner {
+        border-radius: 20px;
+        border: none;
+        height: 34px;
+        line-height: 34px;
       }
-      &.active {
-        color: #667ffd;
+
+      .el-input-group__append,
+      .el-input-group__prepend {
+        border: none;
+        background: transparent;
       }
     }
+
+    .p1 {
+      flex: 1;
+
+      .s1 {
+        margin-left: 36px;
+        cursor: pointer;
+        color: #7f7f7f;
+
+        &:hover {
+          color: #409eff;
+        }
+
+        &.active {
+          color: #667ffd;
+        }
+      }
+    }
+  }
+}
+.answer-box {
+  .answer-s {
+    display: inline-block;
+    width: 30px;
+    height: 30px;
+    border: 1px solid #e2e2e2;
+    border-radius: 3px;
+    margin: 0 6px;
+    font-size: 16px;
+    color: #333;
+    text-align: center;
+    line-height: 30px;
+    &.active {
+      background: #5e78fa;
+      border-color: #5e78fa;
+      color: #fff;
+    }
   }
 }
+.el-menu-item i {
+  width: 12px;
+  text-align: center;
+  margin-right: 8px;
+}
+
+.el-table thead th.el-table__cell {
+  background: #f5f7fa;
+}
+
+.el-menu--popup {
+  min-width: 160px;
+}
+.ellipsis {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
\ No newline at end of file
diff --git a/src/assets/images/arrow.png b/src/assets/images/arrow.png
new file mode 100644
index 0000000..1302220
--- /dev/null
+++ b/src/assets/images/arrow.png
diff --git a/src/assets/nav/dataSync.png b/src/assets/nav/dataSync.png
new file mode 100644
index 0000000..5fd7b09
--- /dev/null
+++ b/src/assets/nav/dataSync.png
diff --git a/src/main.js b/src/main.js
index fc8e568..7d2d5f4 100755
--- a/src/main.js
+++ b/src/main.js
@@ -14,8 +14,8 @@ import '@/components/globalComponents.js'
 
 
 import "nprogress/nprogress.css"
-import "element-ui/lib/theme-chalk/index.css"
 import "font-awesome/css/font-awesome.css"
+import "element-ui/lib/theme-chalk/index.css"
 import "@/router/permission"
 import "@/assets/css/base.css"
 import "@/assets/css/index.scss"
diff --git a/src/router/index.js b/src/router/index.js
index 5386c20..f11d9c0 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -327,12 +327,6 @@ let addrouters = [  //测试用，后续后端获取
       }
     ]
   },
-  {
-    path: "*",
-    redirect: "/404",
-    hidden: true,
-    children: []
-  }
 ]
 
 export default new Router({
diff --git a/src/router/permission.js b/src/router/permission.js
index 9c6b56e..ffe662f 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -1,54 +1,98 @@
 import NProgress from "nprogress"
 import router from "./index"
 import store from "../store"
-import {addrouters} from "./index"
 
 //  获取角色信息，根据用户权限动态加载路由
 router.beforeEach((to, from, next) => {
   NProgress.start()
   if (store.getters.token) {
-    if (to.path === "/login") {
-      next()
-    } else {
-      if (!store.getters.info.permissions) {
-        !(async function getAddRouters() {
-          // 省略 axios 请求代码 通过 token 向后台请求用户权限等信息，这里用假数据赋值
-          await store.commit("setInfo", {
-            permissions: [
-              {
-                role: "superAdmin",
-                roleName: "超级管理员"
-              }
-            ],
-            name: "李老师",
-            // avatar: data.avatar ? data.avatar : "",
-            // uid: data.id,
-            // authorityRouter:[],
+    // if (to.path === "/login") {
+    next()
+    // } else {
+    // if (!store.getters.info.permissions) {
+    // (async function getAddRouters() {
+    //   // 省略 axios 请求代码 通过 token 向后台请求用户权限等信息，这里用假数据赋值
+    //   const userInfo = {
+    //     permissions: [
+    //       {
+    //         role: "superAdmin",
+    //         roleName: "超级管理员"
+    //       }
+    //     ],
+    //     name: "李老师",
+    //     // avatar: data.avatar ? data.avatar : "",
+    //     // uid: data.id,
+    //     authorityRouter: ["examinationPaper",
+    //       "examinationPaperAdd",
+    //       "examinationPaperEdit",
+    //       "examinationPaperRecycle", "ask",
+    //       "askAnalysis",
+    //       "test",
+    //       "testAnalysis", "portrait"],
 
-          })
-          await store.commit("setRouters", addrouters)
-          let newAddRouters = store.getters.addRouters
-          newAddRouters.forEach(res => {
-            router.addRoute(res)
-          })
-          next({path: to.fullPath})
-        }())
-      } else {
+    //   }
+    //   await store.commit("setInfo", { ...userInfo })
+    //   await store.commit("setRouters", userInfo.authorityRouter)
+    //   let newAddRouters = store.getters.addRouters
+    //   newAddRouters.forEach(res => {
+    //     router.addRoute(res)
+    //   })
+    //   router.addRoute({
+    //     path: "*",
+    //     redirect: "/404",
+    //     hidden: true,
+    //     children: []
+    //   })
+    //   next({ path: to.fullPath })
+    // }())
+    // } else {
+    // next()
+    // }
+    // }
+  } else {
+    if (store.getters.info && store.getters.addRouters) {
+      console.log(store.getters.addRouters)
+      store.commit("setToken", "isLogin");
+      store.commit(
+        "setRouters",
+        store.getters.info.authorityRouter
+      );
+
+      let newAddRouters = store.getters.addRouters;
+      newAddRouters.forEach((res) => {
+        router.addRoute(res);
+      });
+      router.addRoute({
+        path: "*",
+        redirect: "/404",
+        hidden: true,
+        children: [],
+      });
+      next({ path: to.fullPath })
+    } else {
+      if (store.getters.code) {
         next()
+      } else {
+        if (to.path === "/login") {
+          next()
+        } else {
+          next({ path: "/login" })
+        }
       }
     }
-  } else {
-    if (to.path === "/login") {
-      next()
-    }
-    next({ path: "/login" })
-
   }
 })
 
 router.afterEach(() => {
   NProgress.done()
 })
+router.onError((error) => {
+  const pattern = /Loading chunk (\d)+ failed/g;
+  const isChunkLoadFailed = error.message.match(pattern);
+  const targetPath = router.history.pending.fullPath;
+  if (isChunkLoadFailed) { router.replace(targetPath); }
+});
+
 
 
 // //  真实使用 
diff --git a/src/store/index.js b/src/store/index.js
index cdea525..3ec6c73 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,25 +4,28 @@ import Cookies from "js-cookie"
 import layoutStore from "./modules/layout/index"
 import { defaultRouter } from "@/router/index"
 import { encryptLoginPassword } from "@/utils";
-import { b64DecodeUnicode } from "@/utils";
 
 import request from "@/api/index"
 import router from "@/router/index"
-import {addrouters} from "@/router/index"
+import { addrouters } from "@/router/index"
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
   state: {
-    token: Cookies.get("token"),
-    info: "", // 每次刷新都要通过token请求个人信息来筛选动态路由
-    routers: [],
-    addRouters: [],
-    tokenSources:new Map(),
+    token: "",
+    csCode: localStorage.getItem("csCode") || "",
+    info: sessionStorage.getItem("info") ? JSON.parse(sessionStorage.getItem("info")) : "", // 每次刷新都要通过token请求个人信息来筛选动态路由
+    routers: [],//左侧菜单
+    addRouters: sessionStorage.getItem("addRouters") ? JSON.parse(sessionStorage.getItem("addRouters")) : [],//动态路由
+    tokenSources: new Map(),//正在请求接口（切换取消请求）
   },
   mutations: {
     setToken(state, token) {
       state.token = token
-      Cookies.set("token", token, { expires: 1 / 24 })
+    },
+    setCode(state, code) {
+      state.csCode = code;
+      localStorage.setItem("csCode", code)
     },
     setInfo(state, data) {
       state.info = {
@@ -33,58 +36,62 @@ const store = new Vuex.Store({
         avatar: data.avatar ? data.avatar : "",
         uid: data.uid
       }
-      localStorage.setItem("info", JSON.stringify(store.getters.info))
+      sessionStorage.setItem("info", JSON.stringify(state.info))
     },
     setRouters: (state, routers) => {
-      state.addRouters = routers // 保存动态路由用来addRouter
-      state.routers = defaultRouter.concat(routers) // 所有有权限的路由表，用来生成菜单列表
+      let aRouters = addrouters.filter(item => {
+        let path = item.children[0]?.path.replace("/", "")
+        return routers?.includes(path)
+      })
+
+      state.addRouters = aRouters // 保存动态路由用来addRouter
+      state.routers = defaultRouter.concat(aRouters) // 所有有权限的路由表，用来生成菜单列表
+      sessionStorage.setItem("addRouters", JSON.stringify(routers))
     },
-    setTokenSources(state,data){
-      if(data instanceof Array){
+    setTokenSources(state, data) {
+      if (data instanceof Array) {
         state.tokenSources.set(data[0], data[1])
-      }else{
+      } else {
         state.tokenSources = new Map()
       }
     },
-    delTokenSources(state,data){
+    delTokenSources(state, data) {
       state.tokenSources.delete(data)
     },
   },
   actions: {
-    Login({ state,commit }, params) {
-      let loginForm={}
+    Login({ state, commit }, params) {
+      let loginForm = {}
       loginForm.username = params.username;
       loginForm.password = encryptLoginPassword(params.password);
-      // request.fetchLogin(loginForm).then(res => {
-      // if (res.status == 200) {
-        // const dataJSON = JSON.parse(b64DecodeUnicode(res.data));
-      commit("setToken", "xxxx")
-      commit("setInfo", {
-        permissions: [
-          {
-            role: "superAdmin",
-            roleName: "超级管理员",
-          },
-        ],
-        name: "张老师",
-        // avatar: data.avatar ? data.avatar : "",
-        // uid: data.id,
-        // authorityRouter:[],
-      });
-      commit("setRouters", addrouters)
-      state.addRouters.forEach((res) => {
-        router.addRoute(res);
-      });
-      console.log()
-      if (params.url) {
-        window.location.href = params.url;
-      } else {
-        router.push({ path: "/" })
-      }
-      // }
-      // })
+      request.fetchLogin({ ...loginForm }).then(res => {
+        let response = res.data
+        if (response.status == 0) {
+          const userInfo = { ...response.data }
+          commit("setToken", "isLogin");
+          commit("setInfo", { ...userInfo });
+          commit("setRouters", [...userInfo.authorityRouter])
+          state.addRouters.forEach((res) => {
+            router.addRoute(res);
+          });
+          router.addRoute({
+            path: "*",
+            redirect: "/404",
+            hidden: true,
+            children: []
+          })
+          console.log()
+          if (params.url) {
+            window.location.href = params.url;
+          } else {
+            router.push({ path: "/" })
+          }
+        }
+      }).catch(() => {
+        // commit("setToken", Cookies.get("JSESSIONID"));
+      })
     },
-    permissions({ state,commit }, that) {
+    permissions({ state, commit }, that) {
       // request.fetchLogin(that.loginForm).then(res => {
       // if (res.status == 200) {
       commit("setToken", "xxxx")
@@ -98,13 +105,39 @@ const store = new Vuex.Store({
         name: "李老师",
         // avatar: data.avatar ? data.avatar : "",
         // uid: data.id,
-        // authorityRouter:[],
+        authorityRouter:[
+          "examinationPaper",
+          "examinationPaperAdd",
+          "examinationPaperEdit",
+          "examinationPaperRecycle",
+          "ask",
+          "askAnalysis",
+          "test",
+          "testAnalysis",
+          "portrait",
+          "setUpConglomerate",
+          "setUpAccount",
+          "setUpSchool",
+          "setUpTeacher",
+          "setUpStudent",
+          "card",
+          "device",
+          "analysis",
+          "down",
+          "downClient",
+          "dataSync"
+        ],
       });
-      commit("setRouters", addrouters)
+      commit("setRouters", authorityRouter)
       state.addRouters.forEach((res) => {
-        that.$router.addRoute(res);
+        router.addRoute(res);
       });
-      that.$router.push({ path: "/" })
+      router.addRoute({
+        path: "*",
+        redirect: "/404",
+        hidden: true,
+        children: []
+      })
       // }
       // })
     }
@@ -112,6 +145,7 @@ const store = new Vuex.Store({
   getters: {
     addRouters: state => state.addRouters,
     token: state => state.token,
+    code: state => state.csCode,
     info: state => state.info,
     routers: state => state.routers,
     logoShow: state => state.layoutStore.logoShow,
diff --git a/src/utils/index.js b/src/utils/index.js
index 20688b9..9d072e1 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -9,7 +9,7 @@ const encryptIV = "D076D35C"
  * @param data： 待加密数据
  * @returns 加密结果
  */
-export function encryptLoginPassword(data){
+export function encryptLoginPassword(data) {
   const secret = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjh2ei17z5k2r4VzbqoSCE6RmYzWySJTgVQYulgfVM+vqcDoUE4cFB4XCFA2lHWjjpsuJP1EtwKlvUgxo5okr3x/a88o8eERxBynnVQZbEYpKteW5aqSEb/g1yPLWnKV88b/ED445ITYbZZuInRo5lkCvd6QEjL6d2Fch6mEo5awYXC4/S4BJf9YlYRhGzR7wpiXCLvyBHQ4iSIIDNpmrPBPQzGP0rx09aDu54kz/42CR6SX2OqXSi4ZoieqkPFl/iuX4RoD/NKKR+haDn1UzoD3k1WzHSTBFFs27rxRpxfBUZzfXQeskgKyw/Slcl3jUFizczsY4CLgTRrfey48Q6QIDAQAB';
   // 新建JSEncrypt对象
   let encryptor = new JSEncrypt();
@@ -25,7 +25,7 @@ export function encryptLoginPassword(data){
 * @param data： 待加密数据
 * @returns 加密结果
 */
-export function encryptData(secret, data){
+export function encryptData(secret, data) {
   // 新建JSEncrypt对象
   let encryptor = new JSEncrypt();
   // 设置公钥
@@ -35,7 +35,7 @@ export function encryptData(secret, data){
 }
 
 // 深度复制
-export function deepClone (obj) {
+export function deepClone(obj) {
   let result = Array.isArray(obj) ? [] : {}
   for (let key in obj) {
     if (obj.hasOwnProperty(key)) {
@@ -74,7 +74,7 @@ export function deepClone (obj) {
 // }
 
 // 随机生成由字母+数字的字符串
-export function randomWord (randomFlag, min, max) {
+export function randomWord(randomFlag, min, max) {
   // randomFlag: Boolean 是否随机个数
   // min 最少个数
   // max 最大个数
@@ -94,7 +94,7 @@ export function randomWord (randomFlag, min, max) {
 }
 
 // 判断数组中是否存在相同值
-export function hasRepeatValue (arr, key = null) {
+export function hasRepeatValue(arr, key = null) {
   if (key) arr = arr.map(d => d[key])
   if (arr.length) {
     let nameNum = arr.reduce((pre, cur) => {
@@ -111,7 +111,7 @@ export function hasRepeatValue (arr, key = null) {
 }
 
 // 获取cookie值
-export function getCookie (name, defaultValue) {
+export function getCookie(name, defaultValue) {
   const result = new RegExp("(^| )" + name + "=([^;]*)(;|$)")
   return result[0] === document.cookie.match(result[1]) ? unescape(result[0][2]) : defaultValue
 }
@@ -120,19 +120,19 @@ export function getCookie (name, defaultValue) {
 /**
  * base64转化unicode
  */
- export function b64DecodeUnicode(str) {
+export function b64DecodeUnicode(str) {
   let uni;
   try {
     // atob 经过 base-64 编码的字符串进行解码
     uni = decodeURIComponent(atob(str).split('').map(function (c) {
       return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
     }).join(''));
-  } catch (e) {}
+  } catch (e) { }
   return uni;
 }
 
 // base64ToFile
-export function base64ToFile (base64Data, tempfilename, contentType) {
+export function base64ToFile(base64Data, tempfilename, contentType) {
   contentType = contentType || ""
   var sliceSize = 1024
   var byteCharacters = atob(base64Data)
@@ -155,7 +155,7 @@ export function base64ToFile (base64Data, tempfilename, contentType) {
 }
 
 // 将base64转换为文件
-export function dataURLtoFile (dataurl, filename) {
+export function dataURLtoFile(dataurl, filename) {
   var arr = dataurl.split(",")
   var mime = arr[0].match(/:(.*?);/)[1]
   var bstr = atob(arr[1])
@@ -168,7 +168,7 @@ export function dataURLtoFile (dataurl, filename) {
 }
 
 // 将图片转换为Base64
-export function getImgToBase64 (url, callback, outputFormat) {
+export function getImgToBase64(url, callback, outputFormat) {
   var canvas = document.createElement("canvas")
   var ctx = canvas.getContext("2d")
   var img = new Image()
@@ -185,7 +185,7 @@ export function getImgToBase64 (url, callback, outputFormat) {
 }
 
 // 转换级联下拉数据
-export function loopOptions (list, option = {}) {
+export function loopOptions(list, option = {}) {
   option = {
     value: "id",
     label: "name",
@@ -206,7 +206,7 @@ export function loopOptions (list, option = {}) {
 }
 
 // 通过Id获取级联数据id数组
-export function getTreeIds (tree, currentId, key = "id") {
+export function getTreeIds(tree, currentId, key = "id") {
   let parent = {}
   let pid = {}
   const loop = (list, level) => {
@@ -233,16 +233,40 @@ export function getTreeIds (tree, currentId, key = "id") {
   return result
 }
 
-// 秒转换时分秒
-export function transverterMss (result) {
-  var h = Math.floor(result / 3600) < 10 ? "0" + Math.floor(result / 3600) : Math.floor(result / 3600)
-  var m = Math.floor((result / 60 % 60)) < 10 ? "0" + Math.floor((result / 60 % 60)) : Math.floor((result / 60 % 60))
-  var s = Math.floor((result % 60)) < 10 ? "0" + Math.floor((result % 60)) : Math.floor((result % 60))
-  return h + ":" + m + ":" + s
+/*
+ * 格式化时间
+ * yyyy-MM-dd hh:mm:ss
+ * */
+export function formatDate(date, fmt) {
+  if (!date || date == null) return null;
+  if (isNaN(date)) {
+    return date;
+  }
+  let format = fmt || "yyyy-MM-dd hh:mm:ss";
+
+  let dates = new Date(Number(date));
+
+  let formatObj = {
+    y: dates.getFullYear(),
+    M: dates.getMonth() + 1,
+    d: dates.getDate(),
+    h: dates.getHours(),
+    m: dates.getMinutes(),
+    s: dates.getSeconds(),
+  };
+  let time_str = format.replace(/(y|M|d|h|m|s)+/g, (result, key) => {
+    let value = formatObj[key];
+    if (result.length > 0 && value < 10) {
+      value = "0" + value;
+    }
+    return value || 0;
+  });
+  return time_str;
 }
 
+
 // 获取日期时间戳
-export function getTime (dayNum) {
+export function getTime(dayNum) {
   var myDate = new Date()
   var lw = new Date(myDate - 1000 * 60 * 60 * 24 * dayNum)// 最后一个数字多少天前的意思
   var lastY = lw.getFullYear()
@@ -256,7 +280,7 @@ export function getTime (dayNum) {
 }
 
 // 获取几天之前日期
-export function getData (dayNum) {
+export function getData(dayNum) {
   var myDate = new Date()
   var lw = new Date(myDate - 1000 * 60 * 60 * 24 * dayNum)// 最后一个数字多少天前的意思
   var lastY = lw.getFullYear()
@@ -267,7 +291,7 @@ export function getData (dayNum) {
 }
 
 // 日期转换时间戳
-export function getNewTime (dayNum) {
+export function getNewTime(dayNum) {
   var b = dayNum.split(/\D/)
   var date = new Date(b[0], b[1] - 1, b[2])
   var time = date.getTime()
@@ -297,4 +321,75 @@ export function getURLParams(variable) {
     }
   }
   return variable ? data : obj
-}
\ No newline at end of file
+}
+
+/**
+ * 校验答案
+ * @param {*} s 源字符串
+ * @param {*} questionType 题型，2单选 3多选
+ * @param {*} optionCount 选项数目
+ * @param {*} questionCount 题目数目
+ */
+function filtterChar(s, b, optionCount) {
+  const ms = "ABCDEFG";
+  let rs = "";
+  for (let i = 0; i < s.length; i++) {
+    let c = s[i];
+    if (c == ',' || c == ' ' || c == '，') {
+      if (!b) {
+        continue;
+      }
+      c = ',';
+    }
+    else if (c < 'A' || c >= ms[optionCount]) {
+      continue;
+    }
+    rs += c;
+  }
+  return rs;
+}
+
+function removeDup(s) {
+  const ms = "ABCDEFG";
+  let rs = "";
+  for (let i = 0; i < ms.length; i++) {
+    if (s.indexOf(ms[i]) >= 0) {
+      rs += ms[i];
+    }
+  }
+  return rs;
+}
+export function checkAnswer(s, questionType, optionCount = 4, questionCount = 1) {
+  if (optionCount > 10 || questionCount < 1) {
+    return null;
+  }
+  let pre = s;
+  s = s.toUpperCase();
+  s = filtterChar(s, questionType == 3 && questionCount > 1, optionCount);
+  if (questionType == 2) {//单选
+    console.log(s.length + " " + questionCount);
+    if (s.length > questionCount) {
+      s = s.substring(s.length - questionCount, s.length);
+    }
+  }
+  else if (questionType == 3) {//多选
+    //允许逗号
+    let ss = s.split(",");
+    let len = questionCount;
+    if (len > ss.length) {
+      len = ss.length;
+    }
+    let rs = "";
+    for (let i = 0; i < len; i++) {
+      rs += removeDup(ss[i]);
+      if (i < len - 1) {
+        rs += ',';
+      }
+    }
+    s = rs;
+  }
+  else {
+    return null;
+  }
+  return s;
+}
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index 89c9741..83e3776 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -1,13 +1,44 @@
 <template>
-  <div>报表分析</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>单课分析</span>
+      </template>
+    </back-box>
+    <div class="tab-box">
+      <span class="tab-item active">答题表现</span>
+      <span class="tab-item">学生问答表现</span>
+      <span class="tab-item">学生互动表现</span>
+      <span class="tab-item">签到明细</span>
+    </div>
+  </div>
 </template>
 
 <script>
-export default {
-
-}
+export default {};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.tab-box {
+  width: 800px;
+  margin: 20px auto;
+  background: #f8f8f8;
+  border-radius: 20px;
+  display: flex;
+  .tab-item {
+    flex: 1;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    font-size: 16px;
+    color: #666;
+    font-weight: 500;
+    background: transparent;
+    border-radius: 20px;
+    &.active {
+      background: #667ffd;
+      color: #fff;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index aa7cb81..abc3f30 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -1,16 +1,970 @@
 <template>
-  <div>随堂问报表
-  <router-link to="/askAnalysis">报表分析</router-link>
-
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>问答-数据报表</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.clazzId"
+          placeholder=""
+          @change="changClazz"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+            >{{ item.label }}
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == '班主任'"
+          class="sel"
+          multiple
+          collapse-tags
+          v-model="query.subjectId"
+          placeholder=""
+          @change="_QueryData"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-else
+          class="sel"
+          v-model="query.subjectId"
+          placeholder=""
+          @change="_QueryData"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <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
+          >
+        </p>
+        <el-button type="primary" round @click="_QueryData()">筛选</el-button>
+      </div>
+    </div>
+    <div class="table-box">
+      <el-radio-group v-model="tabIndex" style="margin-bottom: 20px">
+        <el-radio-button :label="1">单课时报表</el-radio-button>
+        <el-radio-button :label="2" v-if="this.role != '班主任'"
+          >阶段问答报表</el-radio-button
+        >
+        <el-radio-button :label="3">阶段互动报表</el-radio-button>
+      </el-radio-group>
+      <p class="table-tit" v-if="tabIndex != 1">
+        <span>总课时数：10</span>
+        <span>互动总数：22</span>
+      </p>
+      <div v-if="tabIndex == 1">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'canyudu', order: 'descending' }"
+        >
+          <el-table-column
+            prop="keshi"
+            label="课时"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="zongshu"
+            label="题目总数"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="shijian"
+            label="上课时间"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="canyudu"
+            label="参与度"
+            sortable
+            align="center"
+          > <template slot-scope="scoped">{{scoped.row.canyudu}}%</template></el-table-column>
+          <el-table-column
+            prop="zhengque"
+            label="已答总正确率"
+            sortable
+            align="center"
+          >
+          <template slot-scope="scoped">{{scoped.row.zhengque}}%</template>
+          </el-table-column>
+          <el-table-column
+            prop="allzheng"
+            label="班级总正确率"
+            sortable
+            align="center"
+          ><template slot-scope="scoped">{{scoped.row.allzheng}}%</template></el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip effect="dark" content="详情" placement="left">
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"
+                ></el-button>
+              </el-tooltip>
+              <el-tooltip effect="dark" content="修改答案" placement="right">
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-file-text"
+                  @click="edit(scoped.row)"
+                ></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div v-if="tabIndex == 2">
+        <el-table
+          :data="tableAsk"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'cishu', order: 'descending' }"
+        >
+          <el-table-column
+            prop="xuehao"
+            label="学号"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="xingming"
+            label="姓名"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="cishu"
+            label="累计答题次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="dadui"
+            label="累计答对次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="canyudu"
+            label="总参与度"
+            sortable
+            align="center"
+          > <template slot-scope="scoped">{{scoped.row.canyudu}}%</template></el-table-column>
+          <el-table-column
+            prop="allzheng"
+            label="总正确率"
+            sortable
+            align="center"
+          > <template slot-scope="scoped">{{scoped.row.allzheng}}%</template></el-table-column>
+          <el-table-column
+            prop="yidazheng"
+            label="已答总正确率"
+            sortable
+            align="center"
+          >
+          <template slot-scope="scoped">{{scoped.row.yidazheng}}%</template>
+          </el-table-column>
+          <el-table-column
+            prop="zongpaiming"
+            label="总正确率班排名"
+            sortable
+            align="center"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <div v-if="tabIndex == 3">
+        <el-table
+          :data="tableAsk"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'cishu', order: 'descending' }"
+        >
+          <el-table-column
+            prop="xuehao"
+            label="学号"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="xingming"
+            label="姓名"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column
+            prop="cishu"
+            label="抢答成功次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="dadui"
+            label="答对次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="chouda"
+            label="抽答次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="choudadui"
+            label="抽答答对次数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="canyu"
+            label="参与得分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="duicuo"
+            label="对错得分"
+            sortable
+            align="center"
+          ></el-table-column>
+        </el-table>
+      </div>
+      <p class="down" v-if="tabIndex == 3||tabIndex == 2">
+        <el-button type="info" plain round icon="fa fa-cloud-download">导出报表</el-button>
+      </p>
+    </div>
+    <el-dialog :visible.sync="dialogVisible" width="400" center>
+      <div slot="title">
+        <p>
+          <!-- 设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i> -->
+          设置答案
+        </p>
+      </div>
+      <div v-show="editType">
+        <div v-for="(item, index) in form.questionList" :key="index">
+          <template v-for="(subQuestions, indexs) in item.subQuestions">
+            <div
+              class="sub-questions"
+              :key="indexs"
+              v-if="subQuestions.correctAnswer"
+            >
+              <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
+              <div class="qs-options qs-options2">
+                <p v-if="subQuestions.questionType == 4" class="answer-box">
+                  <span
+                    class="answer-s"
+                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                    @click="subQuestions.correctAnswer = 1"
+                    >✓</span
+                  >
+                  <span
+                    class="answer-s"
+                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                    @click="subQuestions.correctAnswer = 2"
+                    >✗</span
+                  >
+                </p>
+                <p v-if="subQuestions.questionType == 3" class="answer-box">
+                  <span
+                    class="answer-s"
+                    v-for="option in subQuestions.answerOptions"
+                    :class="
+                      subQuestions.correctAnswer.includes(option)
+                        ? 'active'
+                        : ''
+                    "
+                    :key="option"
+                    @click="changAnswer(subQuestions, option)"
+                    >{{ option }}</span
+                  >
+                </p>
+                <p v-if="subQuestions.questionType == 2" class="answer-box">
+                  <span
+                    class="answer-s"
+                    v-for="option in subQuestions.answerOptions"
+                    :class="
+                      subQuestions.correctAnswer == option ? 'active' : ''
+                    "
+                    :key="option"
+                    @click="subQuestions.correctAnswer = option"
+                    >{{ option }}</span
+                  >
+                </p>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+      <!-- <div v-show="!editType">
+        <p class="dia-tips">
+            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+          </p>
+        <div class="dia-question-box">
+          <div v-for="(item, index) in form2.questionList" :key="index">
+            <template v-for="(items, indexs) in item.subQuestions">
+              <div class="set-questions" :key="indexs">
+                <div class="qs-num">
+                  <p>{{ items.name }}</p>
+                  <p>共{{ items.list.length }}题</p>
+                </div>
+                <div class="qs-options">
+                  <p class="ipt">
+                    <el-input
+                      v-model="items.answerList"
+                      @keydown.native="keydownAnswer($event)"
+                    ></el-input>
+                  </p>
+                  <p class="answer-box">
+                    <template v-if="items.list[0].questionType == 4">
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += '✓')
+                            : ''
+                        "
+                        >✓</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += '✗')
+                            : ''
+                        "
+                        >✗</span
+                      >
+                    </template>
+                    <template v-if="items.list[0].questionType == 3">
+                      <span
+                        class="answer-s active"
+                        v-for="option in items.list[0].answerOptions"
+                        :key="option"
+                        @click="setAnswer(items,option)"
+                        >{{ option }}</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          items.answerList.split(',').length < items.list.length
+                            ? (items.answerList += ',')
+                            : ''
+                        "
+                        >,</span
+                      >
+                    </template>
+                    <template
+                      v-if="items.list[0].questionType == 2"
+                      class="answer-box"
+                    >
+                      <span
+                        class="answer-s active"
+                        v-for="option in items.list[0].answerOptions"
+                        :key="option"
+                        @click="
+                          items.answerList.length < items.list.length
+                            ? (items.answerList += option)
+                            : ''
+                        "
+                        >{{ option }}</span
+                      >
+                    </template>
+                    <span
+                      class="answer-s delButton"
+                      @click="items.answerList = items.answerList.slice(0, -1)"
+                      >x</span
+                    >
+                    <span
+                      class="answer-s ac"
+                      @click="items.answerList = ''"
+                      >AC</span
+                    >
+                  </p>
+                </div>
+              </div>
+            </template>
+          </div>
+        </div>
+      </div> -->
+      <div slot="footer">
+        <el-button class="dia-btn" type="primary" @click="saveAnswer"
+          >确 定</el-button
+        >
+        <el-button class="dia-btn" type="danger" @click="dialogVisible = false"
+          >取 消</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import { formatDate, deepClone,checkAnswer } from "utils";
 export default {
-
-}
+  data() {
+    return {
+      role: "",
+      loading: false,
+      dialogVisible: false, //修改答案
+      editType: true, //修改答案模式
+      editId: "",
+      form: { questionList: [] },
+      form2: { questionList: [] },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        clazzId: "",
+        subjectId: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [
+        //单课时报表
+        {
+          id: 1,
+          keshi: "课时一",
+          zongshu: 10,
+          shijian: "2022-11-9 21:30至22:30",
+          canyudu: 60,
+          zhengque: 90,
+          allzheng: 80,
+          questionList: [
+            {
+              questionTitle: "f",
+              score: 1,
+              subQuestions: [
+                {
+                  questionIndex: 1,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D"],
+                  correctAnswer: "B",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "A",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 3,
+                  questionType: 4,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 0,
+                  answerOptions: [],
+                  correctAnswer: "1",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          id: 2,
+          keshi: "课时二",
+          zongshu: 8,
+          shijian: "2022-11-10 21:30至22:30",
+          canyudu: 70,
+          zhengque: 80,
+          allzheng: 60,
+          questionList: [
+            {
+              questionTitle: "a",
+              score: 1,
+              subQuestions: [
+                {
+                  questionIndex: 2,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D"],
+                  correctAnswer: "A,C",
+                },
+              ],
+            },
+          ],
+        },
+      ],
+      tableAsk:[
+        {
+          xuehao: 1,
+          xingming: "丁芳菲",
+          cishu: 5,
+          dadui: 60,
+          canyudu: 90,
+          allzheng: 80,
+          yidazheng:50,
+          zongpaiming:5
+        },
+        {
+          xuehao: 1,
+          xingming: "丁芳菲2",
+          cishu: 3,
+          dadui: 20,
+          canyudu: 80,
+          allzheng: 60,
+          yidazheng:65,
+          zongpaiming:4
+        }
+      ],
+      tableStage:[
+        {
+          xuehao: 1,
+          xingming: "丁芳菲",
+          cishu: 5,
+          dadui: 60,
+          chouda: 90,
+          choudadui: 80,
+          canyu:50,
+          duicuo:5
+        }
+      ]
+    };
+  },
+  async created() {
+    this.role = this.$store.getters.info.permissions[0]?.roleName;
+    if (this.role == "班主任") {
+      this.query.subjectId = [];
+    }
+    // await this._QueryClassList();
+    // await this._QuerySubjectList();
+    // await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: obj.id,
+        },
+      });
+    },
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    edit(item) {
+      this.form = deepClone(item);
+      // this.form2 = deepClone(item);
+      // //组合每道大题中的相同题目
+      // let questionList = deepClone(item.questionList);
+      // for (let i = 0; i < questionList.length; i++) {
+      //   let jsons = {};
+      //   let answerOptions = [];
+      //   questionList[i].subQuestions.map((items) => {
+      //     let txt = this.setSubPro(items.questionType);
+      //     if (jsons[txt]) {
+      //       jsons[txt].push(items);
+      //     } else {
+      //       jsons[txt] = [items];
+      //     }
+      //     if (items.questionType == 2 || items.questionType == 3) {
+      //       if (items.answerOptions.length > answerOptions.length) {
+      //         answerOptions = items.answerOptions;
+      //       }
+      //       jsons[txt][0].answerOptions = answerOptions;
+      //     }
+      //   });
+      //   this.form2.questionList[i].subQuestions = Object.keys(jsons).map(
+      //     (item) => {
+      //       return {
+      //         name: item,
+      //         list: jsons[item],
+      //         answerList: "",
+      //       };
+      //     }
+      //   );
+      // }
+      this.dialogVisible = true;
+    },
+    keydownAnswer(event) {//快速答案设置禁止输入
+      if (
+        event.key == "Meta" ||
+        event.key == "CapsLock" ||
+        event.key == "Shift" ||
+        event.key == "Enter" ||
+        event.key == "Alt" ||
+        event.key == "Backspace" ||
+        event.key == "Delete" ||
+        event.key == "ArrowUp" ||
+        event.key == "ArrowDown" ||
+        event.key == "ArrowLeft" ||
+        event.key == "v" ||
+        event.key == "V" ||
+        event.key == "ArrowRight"
+      ) {
+        return;
+      } else {
+        event.returnValue = "";
+      }
+    },
+    setAnswer(obj,answer){//多选答案设置
+      obj.answerList+=answer
+       let str = obj.answerList;
+      let str2 = checkAnswer(
+        str,
+        3,
+        obj.list[0].answerOptions,
+        obj.list.length
+      );
+      obj.answerList = str2;
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      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 times = new Date().getTime() - 24 * 60 * 60 * 1000;
+          that.query.day = formatDate(new Date(times), "yyyy-MM-dd");
+          that.query.startDay = that.query.day;
+          that.query.endDay = that.query.day;
+          break;
+        }
+        case 3: {
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          let times1 = new Date().getTime() - 24 * 60 * 60 * 1000 * (day - 1);
+          let times2 = new Date().getTime() - 24 * 60 * 60 * 1000 * (day - 7);
+          that.query.startDay = formatDate(new Date(times1), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(times2), "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 = "";
+        }
+      }
+    },
+    changAnswer(sub, option) {
+      //设置多选答案
+      let str = new RegExp(option, "g");
+      if (sub.correctAnswer?.includes(option)) {
+        sub.correctAnswer = sub.correctAnswer.replace(str, "");
+      } else {
+        let arrs = (sub.correctAnswer && sub.correctAnswer.split("")) || [];
+        arrs.push(option);
+        sub.correctAnswer = arrs.sort().join("");
+      }
+    },
+    async saveAnswer(){
+       // const { data, code, message } = await this.$request.updateAnswerSheet({...this.form});
+      // if (code == 0) {
+       this.dialogVisible = false
+      // } else {
+      //   this.$message.error(message);
+      // }
+    },
+    async changClazz() {
+      await this._QuerySubjectList();
+      await this.setDate(1);
+    },
+    async _QueryClassList() {
+      const { data, code, message } = await this.$request.fetchClassList();
+      if (code === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.clazzId,
+            label: item.clazzName,
+          };
+        });
+        this.query.clazzId = this.classList[0].value;
+      } else {
+        this.$message.error(message);
+      }
+    },
+    async _QuerySubjectList() {
+      const datas = this.query.clazzId
+        ? {
+            clazzId: this.query.clazzId,
+          }
+        : {};
+      const { data, code, message } = await this.$request.fetchSubjectList(
+        datas
+      );
+      if (code === 0) {
+        this.subjectList = data.list.map((item) => {
+          return {
+            value: item.subjectId,
+            label: item.subjectName,
+          };
+        });
+        if (this.role == "班主任") {
+          this.subjectList.unshift({
+            value: "",
+            label: "全部",
+          });
+        }
+        this.query.subjectId = this.subjectList[0].value;
+      } else {
+        this.$message.error(message);
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      const { data, code, message } = await this.$request.fetchQuizList({
+        ...query,
+      });
+      this.loading = false;
+      if (code === 0) {
+      } else {
+        this.$message.error(message);
+      }
+    },
+  },
+};
 </script>
 
-<style>
+<style lang="scss" scoped>
+.table-box {
+  margin: 0 20px;
+  padding: 16px;
+  background: #f8f8f8;
+  border-radius: 5px;
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
 
+.sub-questions {
+  width: 100%;
+  display: flex;
+  &:hover {
+    background: #f8f8f8;
+  }
+  & > div {
+    min-height: 40px;
+    padding: 5px;
+    flex-shrink: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .qs-num {
+    width: 80px;
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-options2 {
+    text-align: left;
+    justify-content: flex-start;
+    padding-left: 20px;
+    .answer-s {
+      cursor: pointer;
+      border-color: #667ffd;
+      color: #667ffd;
+      margin: 0 15px;
+      &.active {
+        color: #fff;
+      }
+    }
+  }
+  :deep(.el-select) {
+    .el-input__inner {
+      border-radius: 20px;
+      border-color: #667ffd;
+      width: 150px;
+      height: 32px;
+      line-height: 32px;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+    .el-input__icon {
+      line-height: 32px;
+    }
+  }
+}
+.fa-exchange {
+  color: #667ffd;
+  cursor: pointer;
+  font-size: 16px;
+  margin-left: 10px;
+}
+.dia-btn {
+  border-radius: 20px;
+  margin: 0 20px;
+  padding: 10px 20px;
+}
+.dia-tips{
+    padding-bottom:10px;
+  }
+.dia-question-box {
+  padding: 16px 16px 1px;
+  background: #f8f8f8;
+  border-radius: 10px;
+  
+  .answer-s {
+    width: 36px;
+    height: 28px;
+    cursor: pointer;
+  }
+}
+.set-questions {
+  display: flex;
+  margin-bottom: 12px;
+  width: 100%;
+  .qs-num {
+    flex-shrink: 0;
+    margin-right: 10px;
+  }
+  .qs-options {
+    flex: 1;
+    .ipt {
+      margin-bottom: 5px;
+    }
+  }
+  .delButton {
+    border-color: #ff6868;
+    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    color: transparent;
+  }
+  .ac{
+    border-color: #ff6868;
+    background: #ff6868;
+    color:#fff
+  }
+}
+.down{
+padding-top:16px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/detail.vue b/src/views/examinationPaper/detail.vue
new file mode 100644
index 0000000..4611414
--- /dev/null
+++ b/src/views/examinationPaper/detail.vue
@@ -0,0 +1,190 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>修改答案</span>
+      </template>
+    </back-box>
+    <div class="content">
+      <p class="tips">
+        <i class="fa fa-bell-o"></i> 2022-11-24 14:30张老师修改了答案。
+      </p>
+      <div class="answer-title">
+        <p class="name">{{ form.title }}</p>
+        <p class="totals">卷面总分：{{ allScore }}分</p>
+      </div>
+      <div v-for="(question, index) in form.questionList" :key="index">
+        <p class="question-title">
+          <span>{{ setBigNum(index) }}、</span>
+          <span class="title-txt">{{ question.questionTitle }}</span>
+          <span>共 {{ question.score }} 分</span>
+        </p>
+        <ul class="questions-ul">
+          <li class="sub-questions">
+            <div class="qs-num">题号</div>
+            <div class="qs-type">题型</div>
+            <div class="qs-score">分数</div>
+            <div class="qs-partScore">部分分值</div>
+            <div class="qs-answer">答案</div>
+          </li>
+          <li
+            class="sub-questions"
+            v-for="(subQuestions, indexs) in question.subQuestions"
+            :key="indexs"
+          >
+            <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+            <div class="qs-type">
+              {{ setSubPro(subQuestions.questionType) }}
+            </div>
+            <div class="qs-score">
+              {{ subQuestions.score }}
+            </div>
+            <div class="qs-partScore">
+              {{ subQuestions.partScore }}
+            </div>
+            <div class="qs-answer">
+              {{ setAns(subQuestions.correctAnswer) }}
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="btn-box">
+        <el-button type="danger" plain round @click="linkBack">取消</el-button>
+        <el-button type="primary" round @click="save">保存</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = [
+        "一",
+        "二",
+        "三",
+        "四",
+        "五",
+        "六",
+        "七",
+        "八",
+        "九",
+        "十",
+        "十一",
+        "十二",
+        "十三",
+        "十四",
+        "十五",
+        "十六",
+        "十七",
+        "十八",
+        "十九",
+        "二十",
+      ];
+      txt = bigNum[num];
+
+      return txt;
+    },
+    setAns(answer) {
+      let txt;
+      switch (answer) {
+        case 1:
+        case "1":
+          txt = "✓";
+          break;
+        case 2:
+        case "2":
+          txt = "✗";
+          break;
+        case "":
+          txt = "--";
+          break;
+        default:
+          txt = answer;
+      }
+      return txt
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 50px;
+  .ml-20 {
+    margin-left: 20px;
+  }
+  .btn-box {
+    text-align: right;
+    margin-left: 140px;
+  }
+  .tips {
+    height: 48px;
+    line-height: 48px;
+    padding: 0 16px;
+    border: 1px solid #fac7cc;
+    background-color: #ffebec;
+    font-size: 14px;
+    color: #fd9795;
+    margin: 10px 0 20px 0;
+    .fa-bell-o {
+      font-size: 18px;
+      margin-right: 5px;
+    }
+  }
+}
+.answer-title {
+  text-align: center;
+  font-size: 20px;
+  color: #333;
+  font-weight: 700;
+  padding-bottom: 20px;
+  .totals {
+    font-size: 16px;
+    color: #888;
+    font-weight: normal;
+  }
+}
+.question-title {
+  line-height: 40px;
+  .ipt {
+    width: 300px;
+    margin: 0 16px 0 10px;
+    :deep(.el-input__inner) {
+      border-radius: 20px;
+      border-color: #667ffd;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+  }
+  .delete {
+    margin-right: 8px;
+  }
+  .title-txt {
+    margin-right: 20px;
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index a01cebf..cf564d1 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -26,6 +26,7 @@
         <ul class="questions-ul">
           <li class="sub-questions">
             <div class="qs-num">题号</div>
+            <div class="qs-type">题型</div>
             <div class="qs-score">分数</div>
             <div class="qs-options qs-options2">选项设置</div>
           </li>
@@ -245,7 +246,7 @@ export default {
   font-size: 20px;
   color: #333;
   font-weight: 700;
-  padding: 20px 0 0 0;
+  padding-bottom: 20px;
   .totals {
     font-size: 16px;
     color: #888;
@@ -275,25 +276,7 @@ export default {
 .el-input-number {
   width: 140px;
 }
-.answer-box {
-  .answer-s {
-    display: inline-block;
-    width: 30px;
-    height: 30px;
-    border: 1px solid #e2e2e2;
-    border-radius: 3px;
-    margin: 0 6px;
-    font-size: 16px;
-    color: #333;
-    text-align: center;
-    line-height: 30px;
-    &.active {
-      background: #5e78fa;
-      border-color: #5e78fa;
-      color: #fff;
-    }
-  }
-}
+
 .questions-ul {
   border-left: 1px solid #e2e2e2;
   border-top: 1px solid #e2e2e2;
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 79dfdf3..17184ce 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -19,20 +19,20 @@
 
     <div class="answer-header">
       <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.clazzId"
-          placeholder="选择班级"
-          @change="changClazz"
+        <el-cascader
+          class="sel sel2"
+          :options="options"
+          :props="props"
+          collapse-tags
+          clearable
+          placeholder="选择年级-班级"
+          v-model="query.gradeClass"
+          @change="changeGrade"
+          ><template slot-scope="{ node, data }">
+            <span>{{ data.label }}</span>
+            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+          </template></el-cascader
         >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-            >{{ item.label }}
-          </el-option>
-        </el-select>
         <el-select
           class="sel"
           v-model="query.subjectId"
@@ -134,10 +134,9 @@
               icon="el-icon-more"
             ></el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="1">授课端同步</el-dropdown-item>
-              <el-dropdown-item :command="2">修改分享范围</el-dropdown-item>
-              <el-dropdown-item :command="3">复制</el-dropdown-item>
-              <el-dropdown-item :command="4">归档</el-dropdown-item>
+              <el-dropdown-item :command="1" v-if="this.$store.info.id == item.id">修改分享范围</el-dropdown-item>
+              <el-dropdown-item :command="2">复制</el-dropdown-item>
+              <el-dropdown-item :command="3">归档</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
@@ -170,9 +169,40 @@ export default {
   name: "examinationPaper",
   data() {
     return {
+      props: { multiple: true, checkStrictly: true },
+      options: [
+        {
+          value: 1,
+          label: "一年级",
+          children: [
+            {
+              value: 2,
+              label: "二班",
+            },
+            {
+              value: 3,
+              label: "三班",
+            },
+          ],
+        },
+        {
+          value: 4,
+          label: "二年级",
+          children: [
+            {
+              value: 5,
+              label: "二班",
+            },
+            {
+              value: 6,
+              label: "三班",
+            },
+          ],
+        },
+      ],
       dialogVisible: false,
       query: {
-        clazzId: "2003",
+        gradeClass: [],
         subjectId: "0",
         typeName: "周测",
         title: "",
@@ -202,9 +232,9 @@ export default {
           date: "2022-11-04 18:09:49",
           share: 1,
           score: 100,
-          gradeName:"二年级",
-          subjectId:1,
-          examsDuration:4800,
+          gradeName: "二年级",
+          subjectId: 1,
+          examsDuration: 4800,
           questionList: [
             {
               questionTitle: "f",
@@ -234,9 +264,9 @@ export default {
           date: "2022-11-04 18:09:49",
           share: 1,
           score: 100,
-          gradeName:"二年级",
-          subjectId:1,
-          examsDuration:3000,
+          gradeName: "二年级",
+          subjectId: 1,
+          examsDuration: 3000,
           questionList: [
             {
               questionTitle: "f",
@@ -287,38 +317,22 @@ export default {
       const that = this;
       switch (value) {
         case 1:
-          //授课端同步
-          that.syncMeg(item);
-          break;
-        case 2:
           //修改分享范围
           that.shareForm.id = item.id;
           that.shareForm.grade = item.grade;
           that.shareForm.share = item.share || 1;
           that.dialogVisible = true;
           break;
-        case 3:
+        case 2:
           //复制
-          that.toAdd({ type: 2, form: JSON.stringify(item), });
+          that.toAdd({ type: 2, form: JSON.stringify(item) });
           break;
-        case 4:
+        case 3:
           //归档
           that.recovery(item);
           break;
       }
     },
-    async syncMeg() {
-      //同步
-      // const { data, code, message } = await this.$request.fetchAnswerList({
-      //   ...this.shareForm,
-      // });
-      // this.loading = false;
-      // if (code === 0) {
-      this.$message.success("已同步");
-      // } else {
-      //   this.$message.error(message);
-      // }
-    },
     async saveShare() {
       //修改分享范围
       // const { data, code, message } = await this.$request.fetchAnswerList({
@@ -347,12 +361,12 @@ export default {
       //   this.$message.error(message);
       // }
     },
-
-    async changClazz() {
+    async changeGrade() {
       //切换班级
       await this._QuerySubjectList();
       this._QueryData();
     },
+    async changClazz() {},
     // 查找答题卡类型
     async _QueryTypeList() {
       const { data, code, message } = await this.$request.fetchTypeNames();
@@ -534,6 +548,16 @@ export default {
     }
   }
 }
+.answer-header {
+  .sel-box {
+    .sel {
+      min-width: 160px;
+    }
+    :deep(.el-cascader__tags) {
+      flex-wrap: nowrap;
+    }
+  }
+}
 .dialog-footer {
   text-align: center;
   :deep(.el-button) {
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index b0c6486..39a994a 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -7,50 +7,51 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.gradeName"
-          placeholder=""
+        <el-cascader
+          class="sel sel2"
+          :options="options"
+          :props="props"
+          collapse-tags
+          clearable
+          placeholder="选择年级-班级"
+          v-model="query.gradeClass"
           @change="changeGrade"
+          ><template slot-scope="{ node, data }">
+            <span>{{ data.label }}</span>
+            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+          </template></el-cascader
         >
-          <el-option
-            v-for="item in gradeList"
-            :key="item"
-            :label="item"
-            :value="item"
-          >
-          </el-option>
-        </el-select>
         <el-select
           class="sel"
-          v-model="query.type"
-          placeholder="选择类型"
+          v-model="query.subjectId"
+          placeholder="选择科目"
           @change="_QueryData()"
         >
           <el-option label="全部" value=""></el-option>
           <el-option
-            v-for="item in typeList"
+            v-for="item in subjectList"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            >{{ item.label }}
+          >
           </el-option>
         </el-select>
         <el-select
           class="sel"
-          v-model="query.subjectId"
-          placeholder="选择科目"
+          v-model="query.type"
+          placeholder="选择类型"
           @change="_QueryData()"
         >
           <el-option label="全部" value=""></el-option>
           <el-option
-            v-for="item in subjectList"
+            v-for="item in typeList"
             :key="item.value"
             :label="item.label"
             :value="item.value"
-          >
+            >{{ item.label }}
           </el-option>
         </el-select>
+
         <el-input
           placeholder="输入试卷名称"
           v-model="query.title"
@@ -89,7 +90,7 @@
           </p>
         </div>
         <div class="btn-box">
-          <el-tooltip effect="dark" content="使用" placement="bottom">
+          <el-tooltip effect="dark" content="恢复" placement="bottom">
             <el-button
               class="edit"
               type="info"
@@ -119,16 +120,47 @@
 export default {
   data() {
     return {
+      props: { multiple: true, checkStrictly: true },
+      options: [
+        {
+          value: 1,
+          label: "一年级",
+          children: [
+            {
+              value: 2,
+              label: "二班",
+            },
+            {
+              value: 3,
+              label: "三班",
+            },
+          ],
+        },
+        {
+          value: 4,
+          label: "二年级",
+          children: [
+            {
+              value: 5,
+              label: "二班",
+            },
+            {
+              value: 6,
+              label: "三班",
+            },
+          ],
+        },
+      ],
       query: {
-        gradeName: "二年级",
+        gradeClass: [],
         type: "",
         subjectId: "",
         title: "",
       },
       gradeList: ["二年级"],
       typeList: [
-        { label: "随堂问", value: 1 },
-        { label: "即使测", value: 2 },
+        { label: "周测", value: 1 },
+        { label: "月测", value: 2 },
       ],
       subjectList: [],
       tableData: [
@@ -165,9 +197,9 @@ export default {
       //删除答题卡
       // const { data, code, message } = await this.$request.useAnswerSheet();
       // if (code == 0) {
-        this.tableData = this.tableData.filter(item=>{
-          return obj.if != item.id
-        })
+      this.tableData = this.tableData.filter((item) => {
+        return obj.if != item.id;
+      });
       // } else {
       //   this.$message.error(message);
       // }
@@ -176,9 +208,9 @@ export default {
       //删除答题卡
       // const { data, code, message } = await this.$request.removeAnswerSheet();
       // if (code == 0) {
-        this.tableData = this.tableData.filter(item=>{
-          return obj.if != item.id
-        })
+      this.tableData = this.tableData.filter((item) => {
+        return obj.if != item.id;
+      });
       // } else {
       //   this.$message.error(message);
       // }
@@ -211,10 +243,19 @@ export default {
         this.$message.error(message);
       }
     },
+    // 查找答题卡类型
+    async _QueryTypeList() {
+      const { data, code, message } = await this.$request.fetchTypeNames();
+      if (code === 0) {
+        this.typeList = [...data.typeNames] || [];
+      } else {
+        this.$message.error(message);
+      }
+    },
     async changeGrade() {
-      this._QueryData();
-      this._GradeList();
-      this._QuerySubjectList();
+      // this._QueryData();
+      // this._GradeList();
+      // this._QuerySubjectList();
     },
     async _GradeList() {
       //查询年级列表
@@ -257,6 +298,9 @@ export default {
     .sel {
       min-width: 160px;
     }
+    :deep(.el-cascader__tags) {
+      flex-wrap: nowrap;
+    }
   }
 }
 .content {
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 2cd695e..1dc53d8 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="container">
     <ul class="nav-list" v-if="type == '学校管理员'">
-      <li class="nav-item item1" @click="links('setUpAccount')">
+      <li class="nav-item item1" @click="links('/setUpAccount')">
         <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
         <div class="text">
           <p class="p1">账号管理</p>
           <p class="p2">管理32个任课教师，14个班主任，3个备课组长账号信息。</p>
         </div>
       </li>
-      <li class="nav-item item1" @click="links('setUpSchool')">
+      <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>
         </div>
       </li>
-      <li class="nav-item item2" @click="links('device')">
+      <li class="nav-item item2" @click="links('/device')">
         <img class="icon" src="../../assets/nav/device.png" alt="" />
         <div class="text">
           <p class="p1">设备状态</p>
@@ -23,66 +23,70 @@
         </div>
       </li>
       <li class="item3">
-        <div class="nav-item item1 item-child1" @click="links('analysis')">
+        <div class="nav-item item1 item-child1" @click="links('/analysis')">
           <img class="icon" src="../../assets/nav/analysis.png" alt="" />
           <div class="text">
             <p class="p1">使用分析</p>
             <p class="p2">按班级、科目等维度分析设备使用频率。</p>
           </div>
         </div>
-        <div class="nav-item item1 item-child2" @click="links('card')">
+        <div class="nav-item item1 item-child2" @click="links('/card')">
           <img class="icon" src="../../assets/nav/card.png" alt="" />
           <p class="p1">发卡补卡</p>
           <p class="p2">为学生办理发卡、补卡业务。</p>
         </div>
-        <div class="nav-item item1 item-child2" @click="links('down')">
+        <div class="nav-item item1 item-child2" @click="links('/down')">
           <img class="icon" src="../../assets/nav/down.png" alt="" />
           <p class="p1">软件下载</p>
           <p class="p2">设置参数，下载授课端软件。</p>
         </div>
       </li>
     </ul>
-    <ul class="nav-list" v-if="type == '集团管理员'">
-      <li v-for="item in navList" :key="item.path" class="nav-item item4" @click="links(item.path)">
+    <ul class="nav-list" v-if="type == 'ROLE_JITUAN'">
+      <template v-for="item in navList">
+      <li  v-if="item.path!='dataSync'" :key="item.path" class="nav-item item4" @click="links(item.path)">
         <img class="icon" :src="getImgs(item.path)" alt="" />
-          <div class="text" v-if="item.path == 'setUpConglomerate'">
+          <div class="text" v-if="item.path == '/setUpConglomerate'">
             <p class="p1">学校管理</p>
             <p class="p2">管理3个区域，14个学校。</p>
           </div>
-          <div class="text" v-else-if="item.path == 'setUpAccount'">
+          <div class="text" v-else-if="item.path == '/setUpAccount'">
             <p class="p1">账号管理</p>
             <p class="p2">共35个各层级管理员账号。</p>
           </div>
-          <div class="text" v-else-if="item.path == 'device'">
+          <div class="text" v-else-if="item.path == '/device'">
             <p class="p1">设备状态</p>
             <p class="p2">管理14个基站，396套答题器设备。</p>
           </div>
-          <div class="text" v-else>
+          <div class="text" v-else-if="item.path == '/analysis'">
             <p class="p1">使用分析</p>
             <p class="p2">按软件功能、题型统计使用频率。</p>
           </div>
       </li>
+      </template>
     </ul>
-    <ul class="nav-list" v-if="type == '班主任' || type == '任课老师' ">
-      <li v-for="item in navList" :key="item.path" class="nav-item item4" @click="links(item.path)">
+    <ul class="nav-list" v-if="type == 'superAdmin' || type == '任课老师' ">
+      <template v-for="item in navList">
+      <li v-if="item.path!='dataSync'" :key="item.path" class="nav-item item4" @click="links(item.path)">
         <img class="icon" :src="getImgs(item.path)" alt="" />
-          <div class="text" v-if="item.path == 'examinationPaper'">
+          <div class="text" v-if="item.path == '/examinationPaper'">
             <p class="p1">备题组卷</p>
             <p class="p2">管理32套答题卡。</p>
           </div>
-          <div class="text" v-else-if="item.path == 'portrait'">
+          <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
             <p class="p2">共分析532名学生成绩。</p>
           </div>
-          <div class="text" v-else-if="item.path == 'ask'">
+          <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
             <p class="p2">对41套随堂问答题记录分析。</p>
           </div>
-          <div class="text" v-else>
+          <div class="text" v-else-if="item.path == '/test'">
             <p class="p1">即时测报表</p>
             <p class="p2">对28套即时测答题记录分析。</p>
           </div>
       </li>
+      </template>
     </ul>
   </div>
 </template>
@@ -92,54 +96,26 @@ export default {
   name: "mainIndex",
   data() {
     return {
-      // type: "学校管理员",
-      // type: "集团管理员",
-      // type: "班主任",
-      type: "任课老师",
-      navList: [
-        // {
-        //   name: "学校管理",
-        //   path: "setUpConglomerate",
-        // },
-        // {
-        //   name: "账号管理",
-        //   path: "setUpAccount",
-        // },
-        // {
-        //   name: "设备状态",
-        //   path: "device",
-        // },
-        // {
-        //   name: "使用分析",
-        //   path: "analysis",
-        // },
-        {
-          name: "备题组卷",
-          path: "examinationPaper",
-        },
-        {
-          name: "学生画像",
-          path: "portrait",
-        },
-        {
-          name: "随堂问报表",
-          path: "ask",
-        },
-        {
-          name: "即时测报表",
-          path: "test",
-        },
-      ],
+      type: "",
+      navList: [],
     };
   },
-  mounted() {},
+  created() {
+    this.type = this.$store.getters.info.permissions[0].role
+    this.navList = this.$store.getters.addRouters.map(item=>{
+      return {
+        name:item.name,
+        path:item.children[0].path,
+      }
+    })
+  },
   methods: {
     getImgs(path) {
-      return require(`@/assets/nav/${path}.png`)
+      return require(`@/assets/nav${path}.png`)
     },
     links(path) {
       this.$router.push({
-        path: `/${path}`,
+        path: path,
       });
     },
   },
diff --git a/src/views/layout/aside/aside.vue b/src/views/layout/aside/aside.vue
index 42ea568..361df4d 100644
--- a/src/views/layout/aside/aside.vue
+++ b/src/views/layout/aside/aside.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="aside-box">
     <el-aside id="asideNav">
       <div class="logo-name">
         <img
@@ -10,7 +10,7 @@
         />
         <template v-else>
           <img class="logo" src="../../../assets/images/logo.png" alt="" />
-          <p>中天易教</p>
+          <p class="ellipsis">中天易教中天易教中天易教</p>
         </template>
       </div>
       <el-menu
@@ -116,7 +116,9 @@ $right: right;
     #{$side}-#{$prop}: $value;
   }
 }
-
+.aside-box{
+  max-width:200px;
+}
 #asideNav {
   width: auto !important;
   display: flex;
@@ -135,7 +137,8 @@ $right: right;
       height: 24px;
       margin-right: 10px;
     }
-    p {
+    .ellipsis {
+      overflow: hidden;
       line-height: 50px;
       text-align: center;
       font-size: 16px;
diff --git a/src/views/layout/layout.vue b/src/views/layout/layout.vue
index b9395a0..eb3982d 100644
--- a/src/views/layout/layout.vue
+++ b/src/views/layout/layout.vue
@@ -38,13 +38,16 @@ export default {
     };
   },
   created() {
-    this.code = getURLParams("code") || "";
-    if (this.code) {
-      localStorage.setItem("code",this.code)
-      this._LoginCheck();
-    }
+    this.initRouter();
   },
   methods: {
+    initRouter() {
+      this.code = getURLParams("code") || this.$store.getters.code;
+      if (this.code) {
+        this.$store.commit("setCode", this.code);
+        this._LoginCheck();
+      }
+    },
     async _LoginCheck() {
       let params = {};
       if (this.code) {
@@ -52,17 +55,46 @@ export default {
           code: this.code,
         };
       }
-      const { data = {}, message, code } = await loginCheck(params);
-      if (code === 0) {
-        if (data) {
-          this.school = data.schoolName;
-          this.user.name = data.realName;
-          this.user.id = data.id;
-          this.user.tx = data.smallHeaderImgPath;
-        }
-      } else {
-        this.$message.error(message);
-      }
+      // 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);
+      // }
     },
   },
 };
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8c0df5a..f05139a 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: "admin",
-        password: "123456",
+        username: "15911715665",
+        password: "Csiy88888",
       },
       loginRules: {
         username: [
diff --git a/vue.config.js b/vue.config.js
index d3e1888..f7fc2f3 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -12,7 +12,7 @@ module.exports = {
   productionSourceMap: false, // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   devServer: {
     hot:true,
-    port: 8080, // 端口
+    port: 8081, // 端口
     open: false, // 启动后打开浏览器
     compress: true,
     overlay: {
@@ -20,13 +20,13 @@ module.exports = {
       warnings: false,
       errors: true,
     },
-    proxy: {
-      "/": {
-        target:"http://lead.xc.com:32269",
-        changeOrigin: true,
-        ws:true,
-      },
-    },
+    // proxy: {
+    //   "/": {
+        // target:"http://192.168.3.29:8080",
+      //   changeOrigin: true,
+      //   ws:true,
+      // },
+    // },
     disableHostCheck: true
   },
   css: {