diff --git a/src/api/apis/answerSheet.js b/src/api/apis/answerSheet.js
index d25ecd6..9208541 100644
--- a/src/api/apis/answerSheet.js
+++ b/src/api/apis/answerSheet.js
@@ -4,9 +4,17 @@ import answerSheet from "../urls/answerSheet"
 
 export default {
   // 答题卡列表
-  fetchAnswerList(data) {
+  fetchPaperList(data) {
     return service({
-      url: answerSheet.answerList,
+      url: answerSheet.paperList,
+      method: 'POST',
+      data
+    })
+  },
+  // 答题卡详情
+  fetchPaperDetail(data) {
+    return service({
+      url: answerSheet.paperDetail,
       method: 'POST',
       data
     })
@@ -44,41 +52,33 @@ export default {
     })
   },
   // 添加测验类型
-  addAnswerTypeName(data) {
+  addPaperType(data) {
     return service({
-      url: answerSheet.addAnswerTypeName,
+      url: answerSheet.addPaperType,
       method: 'POST',
       data
     })
   },
   // 保存答题卡
-  saveAnswerSheet(data) {
+  addPaper(data) {
     return service({
-      url: answerSheet.saveAnswerSheet,
+      url: answerSheet.addPaper,
       method: 'POST',
       data
     })
   },
   // 删除答题卡
-  removeAnswerSheet(data) {
-    return service({
-      url: answerSheet.removeAnswerSheet,
-      method: 'POST',
-      data
-    })
-  },
-  // 恢复答题卡
-  useAnswerSheet(data) {
+  delPaper(data) {
     return service({
-      url: answerSheet.useAnswerSheet,
+      url: answerSheet.delPaper,
       method: 'POST',
       data
     })
   },
-  // 恢复答题卡
-  updateAnswerSheet(data) {
+  // 修改答题卡
+  modifyPaper(data) {
     return service({
-      url: answerSheet.updateAnswerSheet,
+      url: answerSheet.modifyPaper,
       method: 'POST',
       data
     })
diff --git a/src/api/apis/ask.js b/src/api/apis/ask.js
index 445bfd1..345d578 100644
--- a/src/api/apis/ask.js
+++ b/src/api/apis/ask.js
@@ -3,7 +3,7 @@ import service from "../axios"
 import askUrls from "../urls/login"
 
 export default {
-  // 账号密码登陆
+  // 随堂问列表
   fetchQuizList(data) {
     return service({
       url: askUrls.quizList,
@@ -11,4 +11,12 @@ export default {
       data
     })
   },
+  // 随堂问详情
+  quizDetail(data) {
+    return service({
+      url: askUrls.quizDetail,
+      method: 'POST',
+      data
+    })
+  },
 }
diff --git a/src/api/apis/login.js b/src/api/apis/login.js
index 32add82..c806b1c 100644
--- a/src/api/apis/login.js
+++ b/src/api/apis/login.js
@@ -4,11 +4,25 @@ import loginUrls from "../urls/login"
 
 export default {
   // 账号密码登陆
-  fetchLogin(data) {
+  login(data) {
     return service({
       url: loginUrls.login,
       method: 'POST',
       data
     })
   },
+  ssoLogin(data) {
+    return service({
+      url: loginUrls.ssoLogin,
+      method: 'POST',
+      data
+    })
+  },
+  logout(data) {
+    return service({
+      url: loginUrls.logout,
+      method: 'POST',
+      data
+    })
+  },
 }
diff --git a/src/api/axios.js b/src/api/axios.js
index 5b714b9..03f3de2 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -37,7 +37,7 @@ service.interceptors.response.use(
       store.commit('delTokenSources', response.config.cancelToken)
     }
     if (response.status == 200) {
-      Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
+      // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       // console.log(response.status)
       if (res.code == 999) {
         if (!location.href.includes('localhost')) {
@@ -56,7 +56,7 @@ service.interceptors.response.use(
         }
         return
       } else {
-        Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
+        // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       }
     }
     return Promise.resolve(response)
@@ -72,20 +72,23 @@ service.interceptors.response.use(
     }
     Message.closeAll()
     const {
+      data,
       status
     } = error.response
     if (status === 403 || status === 401) {
       Message({
-        message: "未登录或登录超时，即将跳转到登录页面",
+        message: data.info||"未登录或登录超时，即将跳转到登录页面",
         type: 'error',
         duration: 3 * 1000
       })
-      router.push({
-        path: '/login',
-        query: {
-          url: window.location.href
-        }
-      })
+      if (!window.location.href.includes('login')) {
+        router.push({
+          path: '/login',
+          query: {
+            url: window.location.href
+          }
+        })
+      }
       return
     }
     return Promise.reject(error.response) // 返回接口返回的错误信息
diff --git a/src/api/urls/answerSheet.js b/src/api/urls/answerSheet.js
index 62c18b2..6fd30a2 100644
--- a/src/api/urls/answerSheet.js
+++ b/src/api/urls/answerSheet.js
@@ -1,22 +1,22 @@
 export default {
   // 答题卡列表
-  answerList: "/apis/answerList",
-  // 测验类型
-  typeNames: "/apis/typeNames",
+  paperList: "/api_html/teaching/paperList",
+  // 答题卡详情
+  paperList: "/api_html/teaching/paperDetail",
   // 查找年级
-  gradeList: "/apis/gradeList",
+  gradeList: "/api_html/teaching/gradeList",
+  // 测验类型
+  typeNames: "/api_html/teaching/tagList",
   // 查找班级
-  classList: "/apis/classList",
+  classList: "/api_html/teaching/classList",
   // 查找科目
-  subjectList: "/apis/subjectList",
-  // 天假答题卡测验类型
-  addAnswerTypeName: "/apis/addAnswerTypeName",
+  subjectList: "/api_html/teaching/subjectList",
+  // 添加答题卡测验类型
+  addPaperType: "/api_html/teaching/addPaperType",
   // 保存答题卡
-  saveAnswerSheet: "/apis/saveAnswerSheet",
+  addPaper: "/api_html/teaching/addPaper",
   // 删除答题卡
-  removeAnswerSheet: "/apis/removeAnswerSheet",
-  // 恢复使用答题卡
-  useAnswerSheet: "/apis/useAnswerSheet",
+  delPaper: "/api_html/teaching/delPaper",
   // 更新答题卡
-  updateAnswerSheet: "/apis/updateAnswerSheet",
+  modifyPaper: "/api_html/teaching/modifyPaper",
 }
\ No newline at end of file
diff --git a/src/api/urls/ask.js b/src/api/urls/ask.js
index 2b54532..50ce0d2 100644
--- a/src/api/urls/ask.js
+++ b/src/api/urls/ask.js
@@ -1,5 +1,7 @@
 
 export default {
-  // 账号密码登陆
+  // 随堂问列表
   quizList: "/web/quizList",
+  // 随堂问详情
+  quizDetail: "/web/quizDetail",
 }
diff --git a/src/api/urls/login.js b/src/api/urls/login.js
index 27b3e13..5710a7c 100644
--- a/src/api/urls/login.js
+++ b/src/api/urls/login.js
@@ -2,5 +2,6 @@
 export default {
   // 账号密码登陆
   login: "/web/login",
-  ssoLogin: "/sso/login"
+  ssoLogin: "/sso/login",
+  logout: "/api_html/logout"
 }
diff --git a/src/components/userForm/editPassword.vue b/src/components/userForm/editPassword.vue
deleted file mode 100644
index 33c6577..0000000
--- a/src/components/userForm/editPassword.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <el-dialog title="修改密码" width="700px" :visible.sync="visible" destroy-on-close @close="closeCallback">
-    <div class="card">
-      <p class="title"><i class="fa fa-th-large fa-lg"></i>修改密码</p>
-      <el-form :model="ruleForm2" status-icon :rules="rules2" ref="ruleForm2" label-width="100px" class="demo-ruleForm">
-        <el-form-item label="原密码" prop="oldPassword">
-          <el-input type="password" v-model="ruleForm2.oldPassword" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="密码" prop="password">
-          <el-input type="password" v-model="ruleForm2.password" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="确认密码" prop="checkPass">
-          <el-input type="password" v-model="ruleForm2.checkPass" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="submitForm('ruleForm2')">提交</el-button>
-          <el-button @click="resetForm('ruleForm2')">重置</el-button>
-        </el-form-item>
-      </el-form>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import Cookies from "js-cookie"
-export default {
-  name: "editPassword",
-  props: {
-    dialogVisible: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data () {
-    var validatePass = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请输入密码"))
-      } else if (value.toString().length < 6) {
-        callback(new Error("密码长度不能低于6位"))
-      } else {
-        if (this.ruleForm2.checkPass !== "") {
-          this.$refs.ruleForm2.validateField("checkPass")
-        }
-        callback()
-      }
-    }
-    var validatePass2 = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("请再次输入密码"))
-      } else if (value.toString().length < 6) {
-        callback(new Error("密码长度不能低于6位"))
-      } else if (value !== this.ruleForm2.password) {
-        callback(new Error("两次输入密码不一致!"))
-      } else {
-        callback()
-      }
-    }
-    return {
-      visible: this.dialogVisible,
-      ruleForm2: {
-        oldPassword: "",
-        password: "",
-        checkPass: ""
-      },
-      rules2: {
-        oldPassword: [
-          {required: true, validator: validatePass, trigger: "blur"}
-        ],
-        password: [
-          {required: true, validator: validatePass, trigger: "blur"}
-        ],
-        checkPass: [
-          {required: true, validator: validatePass2, trigger: "blur"}
-        ]
-      }
-    }
-  },
-  methods: {
-    closeCallback () {
-      this.$emit("editPwdCallback")
-    },
-    submitForm (formName) {
-      let that = this
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.$request.fetchEditPassword({
-            oldPassword: that.ruleForm2.oldPassword,
-            newPassword: that.ruleForm2.password
-          }).then((res) => {
-            that.$message({
-              showClose: true,
-              message: res.data.message,
-              type: "success"
-            })
-            setTimeout(function () {
-              Cookies.remove("access_token")
-              location.reload()
-            }, 3000)
-          }).catch((err) => {
-            that.$message({
-              showClose: true,
-              message: err.data.message,
-              type: "error"
-            })
-          })
-        } else {
-          console.log("error submit!!")
-          return false
-        }
-      })
-    },
-    resetForm (formName) {
-      this.$refs[formName].resetFields()
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .demo-ruleForm {
-    width: 460px;
-    padding-top: 25px;
-  }
-
-  .card {
-    width: 560px;
-    padding-bottom: 15px;
-    margin: 0px auto;
-  }
-</style>
diff --git a/src/router/permission.js b/src/router/permission.js
index ffe662f..2d5feeb 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -92,47 +92,3 @@ router.onError((error) => {
   const targetPath = router.history.pending.fullPath;
   if (isChunkLoadFailed) { router.replace(targetPath); }
 });
-
-
-
-// //  真实使用 
-// import fetchUser from "@/api/apis/user"
-//
-// router.beforeEach((to, from, next) => {
-//   if (store.getters.token && store.getters.token !== "undefined") {
-//     // store.dispatch('setToken', store.getters.token)
-//     if (to.path === "/login") {
-//       next({path: "/"})
-//     } else {
-//       if (!store.getters.info) {
-//         (async function getAddRouters () {
-//           fetchUser.fetchGetUserInfo().then(async function (response) {
-//             await store.dispatch("setInfo", response.data)
-            // await store.dispatch("newRoutes", store.getters.info.authorityRouter)
-//             await router.addRoutes(store.getters.addRouters)
-//             next({path: "/index"})
-//           }).catch(function (error) {
-//             console.log(error)
-//           })
-//         }())
-//       } else {
-//         let is404 = to.matched.some(record => {
-//           console.log(record)
-//           if (record.meta.role) {
-//             return store.getters.info.authorityRouter === -1
-//           }
-//         })
-//         if (is404) {
-//           next({path: "/404"})
-//           return false
-//         }
-//         next()
-//       }
-//     }
-//   } else {
-//     if (to.path === "/login") {
-//       next()
-//     }
-//     next({path: "/login"})
-//   }
-// })
diff --git a/src/store/index.js b/src/store/index.js
index 3ec6c73..3a115b3 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -64,7 +64,7 @@ const store = new Vuex.Store({
       let loginForm = {}
       loginForm.username = params.username;
       loginForm.password = encryptLoginPassword(params.password);
-      request.fetchLogin({ ...loginForm }).then(res => {
+      request.login({ ...loginForm }).then(res => {
         let response = res.data
         if (response.status == 0) {
           const userInfo = { ...response.data }
@@ -92,7 +92,7 @@ const store = new Vuex.Store({
       })
     },
     permissions({ state, commit }, that) {
-      // request.fetchLogin(that.loginForm).then(res => {
+      // request.login(that.loginForm).then(res => {
       // if (res.status == 200) {
       commit("setToken", "xxxx")
       commit("setInfo", {
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index 83e3776..e2bf2e6 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -5,23 +5,161 @@
         <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 class="page-content">
+      <div class="tab-box">
+        <span
+          class="tab-item"
+          :class="type == 1 ? 'active' : ''"
+          @click="type = 1"
+          >答题表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 2 ? 'active' : ''"
+          @click="type = 2"
+          >学生问答表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 3 ? 'active' : ''"
+          @click="type = 3"
+          >学生互动表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 4 ? 'active' : ''"
+          @click="type = 4"
+          >签到明细</span
+        >
+      </div>
+      <ul class="info">
+        <li class="info-item">科目：语文</li>
+        <li class="info-item">课时：课时1</li>
+        <li class="info-item">上课时间：2022-11-9 21:30</li>
+        <li class="info-item">下课时间：2022-11-9 21:30</li>
+        <li class="info-item">签到人数：45</li>
+        <li class="info-item">题目总数：8</li>
+        <li class="info-item">答题总数：8</li>
+        <li class="info-item">课时时长：45分钟</li>
+        <li class="info-item">总参与度：：80%</li>
+        <li class="info-item">班级总正确率：82%</li>
+        <li class="info-item">已答总正确率：89%</li>
+        <li class="info-item">反馈时长：15分钟</li>
+      </ul>
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        :default-sort="{ prop: 'dadui', order: 'descending' }"
+      >
+        <el-table-column
+          prop="questionIndex"
+          label="题号"
+          align="center"
+        ><template slot-scope="scoped">Q{{scoped.row.questionIndex}}</template></el-table-column>
+        <el-table-column
+          prop="questionType"
+          label="题型"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dati"
+          label="答题人数"
+          sortable
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="dadui"
+          label="答对人数"
+          sortable
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="canyu"
+          label="班级参与度"
+          sortable
+          align="center"
+        ><template slot-scope="scoped">{{scoped.row.canyu}}%</template></el-table-column>
+        <el-table-column
+          prop="banjidadui"
+          label="班级正确率"
+          sortable
+          align="center"
+        ><template slot-scope="scoped">{{scoped.row.banjidadui}}%</template></el-table-column>
+        <el-table-column
+          prop="yida"
+          label="已答正确率"
+          sortable
+          align="center"
+        ><template slot-scope="scoped">{{scoped.row.yida}}%</template></el-table-column>
+        <el-table-column
+          prop="correctAnswer"
+          label="正确答案"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="ganrao"
+          label="干扰答案"
+          align="center"
+        ></el-table-column>
+      </el-table>
     </div>
   </div>
 </template>
 
 <script>
-export default {};
+export default {
+  data() {
+    return {
+      id: "",
+      type: 1,
+      tableData: [
+        {
+          questionIndex: 1,
+          questionType: "单选题",
+          dati: 5,
+          dadui: 60,
+          canyu: 50,
+          banjidadui: 80,
+          yida: 90,
+          correctAnswer:"A",
+          ganrao:"C"
+        },
+        {
+          questionIndex: 2,
+          questionType: "单选题",
+          dati: 6,
+          dadui: 80,
+          canyu: 60,
+          banjidadui: 90,
+          yida: 100,
+          correctAnswer:"B",
+          ganrao:"D"
+        },
+      ],
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+    // this._QueryData()
+  },
+  methods: {
+    async _QueryData() {
+      let { data, info, status } = this.$request.quizDetail({
+        id: this.id,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
+.page-content {
+  padding: 20px 20px 0;
+}
 .tab-box {
   width: 800px;
-  margin: 20px auto;
+  margin: 0 auto 12px;
   background: #f8f8f8;
   border-radius: 20px;
   display: flex;
@@ -35,10 +173,29 @@ export default {};
     font-weight: 500;
     background: transparent;
     border-radius: 20px;
+    cursor: pointer;
     &.active {
       background: #667ffd;
       color: #fff;
     }
   }
 }
+.info {
+  display: flex;
+  flex-wrap: wrap;
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
+  margin-bottom: 12px;
+  .info-item {
+    width: 25%;
+    height: 50px;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    background: #f8f8f8;
+    border-right: 1px solid #e2e2e2;
+    border-bottom: 1px solid #e2e2e2;
+    line-height: 50px;
+    text-align: center;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index abc3f30..8b80103 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -774,7 +774,7 @@ export default {
       }
     },
     async saveAnswer(){
-       // const { data, code, message } = await this.$request.updateAnswerSheet({...this.form});
+       // const { data, code, message } = await this.$request.modifyPaper({...this.form});
       // if (code == 0) {
        this.dialogVisible = false
       // } else {
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index ae24573..d420b68 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -37,7 +37,7 @@
             ></el-col>
           </el-form-item>
           <el-form-item label="测验类型：">
-            <el-select v-model="form.tag" placeholder="选择测验类型">
+            <el-select v-model="form.tagId" placeholder="选择测验类型">
               <el-option
                 v-for="item in answerTypeList"
                 :key="item.id"
@@ -71,8 +71,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="科目：" prop="subjectId">
-            <el-select class="sel" v-model="form.subjectId" placeholder="">
+          <el-form-item label="科目：" prop="subjectName">
+            <el-select class="sel" v-model="form.subjectName" placeholder="">
               <el-option
                 v-for="item in subjectList"
                 :key="item.value"
@@ -91,8 +91,8 @@
               label="考试时长"
             ></el-input-number>
           </el-form-item>
-          <el-form-item label="分享范围：" prop="share">
-            <el-radio-group v-model="form.share">
+          <el-form-item label="分享范围：" prop="sharingType">
+            <el-radio-group v-model="form.sharingType">
               <el-radio :label="1">任课班级分享</el-radio>
               <el-radio :label="2">全年级分享</el-radio>
             </el-radio-group>
@@ -105,7 +105,7 @@
           <el-button type="primary" round @click="setStep1">下一步</el-button>
         </div>
         <el-dialog
-          title="天假测验类型"
+          title="添加测验类型"
           :visible.sync="dialogVisible"
           width="500px"
         >
@@ -122,9 +122,7 @@
             </p>
           </div>
           <div class="" slot="footer">
-            <el-button type="primary" @click="addAnswerTypeName"
-              >确 定</el-button
-            >
+            <el-button type="primary" @click="addPaperType">确 定</el-button>
             <el-button @click="dialogVisible = false">取 消</el-button>
           </div>
         </el-dialog>
@@ -218,7 +216,7 @@
                 <p v-else class="answer-box">
                   <span
                     class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
+                    v-for="option in subQuestions.answerOptions.split(',')"
                     :key="option"
                     >{{ option }}</span
                   >
@@ -394,7 +392,7 @@
                 <p v-if="subQuestions.questionType == 3" class="answer-box">
                   <span
                     class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
+                    v-for="option in subQuestions.answerOptions.split(',')"
                     :class="
                       subQuestions.correctAnswer.includes(option)
                         ? 'active'
@@ -408,7 +406,7 @@
                 <p v-if="subQuestions.questionType == 2" class="answer-box">
                   <span
                     class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
+                    v-for="option in subQuestions.answerOptions.split(',')"
                     :class="
                       subQuestions.correctAnswer == option ? 'active' : ''
                     "
@@ -434,6 +432,8 @@
 </template>
 
 <script>
+import { formatDate, deepClone } from "utils";
+import { number } from "echarts";
 const questionForm = {
   questionTitle: "",
   questionType: 2,
@@ -444,7 +444,7 @@ const subQuesOptions = {
   score: 1,
   partScore: 0,
   selectNum: 4,
-  answerOptions: ["A", "B", "C", "D"],
+  answerOptions: "A,B,C,D",
   correctAnswer: "",
 };
 export default {
@@ -471,7 +471,7 @@ export default {
         { label: "判断题", value: 4 },
         { label: "主观题", value: 5 },
       ],
-      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
+      rightOptions: ["A","B","C","D","E","F","G"],
       addSubQuestionsType: "",
       step: 0, //步骤
       gradeList: [], //年级
@@ -481,11 +481,11 @@ export default {
       form: {
         //答题卡详情
         title: "",
-        tag: "",
-        subjectId: "",
-        examsDuration: 0,
+        tagId: "",
         gradeName: "",
-        share: 1,
+        subjectName: "",
+        examsDuration: 0,
+        sharingType: 1,
         questionList: [],
       },
       formRules: {
@@ -500,7 +500,9 @@ export default {
           },
         ],
         gradeName: [{ required: true, message: "请选择年级", trigger: "blur" }],
-        subjectId: [{ required: true, message: "请选择科目", trigger: "blur" }],
+        subjectName: [
+          { required: true, message: "请选择科目", trigger: "blur" },
+        ],
         examsDuration: [
           { required: true, message: "请设置考试时长", trigger: "blur" },
         ],
@@ -510,9 +512,7 @@ export default {
   created() {
     this.type = this.$route.query.type ? this.$route.query.type : 1;
     if (this.type == 2) {
-      this.form = this.$route.query.form && JSON.parse(this.$route.query.form);
-      console.log(this.form.examsDuration)
-      this.form.examsDuration = Number(this.form.examsDuration)/60
+      this._QueryDetail();
     }
   },
   methods: {
@@ -632,13 +632,13 @@ export default {
           questionsOptions.answerOptions = this.rightOptions.slice(
             0,
             questionsOptions.selectNum
-          );
+          ).join(',');
           break;
         case 3:
           questionsOptions.answerOptions = this.rightOptions.slice(
             0,
             questionsOptions.selectNum
-          );
+          ).join(',');
           questionsOptions.partScore = 0.5;
           break;
         case 4:
@@ -667,7 +667,7 @@ export default {
       let score = question.subQuestions.reduce((a, b) => {
         return a + b.score;
       }, 0);
-      return score;
+      return Number(score).toFixed(2);
     },
     changeAddSubQuestions(val, question) {
       if (val) {
@@ -680,13 +680,13 @@ export default {
             questionsOptions.answerOptions = this.rightOptions.slice(
               0,
               questionsOptions.selectNum
-            );
+            ).join(',');
             break;
           case 3:
             questionsOptions.answerOptions = this.rightOptions.slice(
               0,
               questionsOptions.selectNum
-            );
+            ).join(',');
             questionsOptions.partScore = 0.5;
             break;
           case 4:
@@ -710,13 +710,13 @@ export default {
           subQuestions.answerOptions = that.rightOptions.slice(
             0,
             subQuestions.selectNum
-          );
+          ).join(',');
           break;
         case 3:
           subQuestions.answerOptions = that.rightOptions.slice(
             0,
             subQuestions.selectNum
-          );
+          ).join(',');
           subQuestions.partScore = 0.5;
           break;
         case 4:
@@ -727,23 +727,23 @@ export default {
     },
     addOptions(subQuestions) {
       //添加选项
-      let length = subQuestions.answerOptions.length;
+      let length = subQuestions.answerOptions.split(',').length;
       if (length > 6) return;
       subQuestions.selectNum = length + 1;
       subQuestions.answerOptions = this.rightOptions.slice(
         0,
         subQuestions.selectNum
-      );
+      ).join(',');
     },
     removeOptions(subQuestions) {
       //删除选项
-      let length = subQuestions.answerOptions.length;
+      let length = subQuestions.answerOptions.split(',').length;
       if (length < 2) return;
       subQuestions.selectNum = length - 1;
       subQuestions.answerOptions = this.rightOptions.slice(
         0,
         subQuestions.selectNum
-      );
+      ).join(',');
     },
     changAnswer(sub, option) {
       //设置多选答案
@@ -756,17 +756,17 @@ export default {
         sub.correctAnswer = arrs.sort().join("");
       }
     },
-    async addAnswerTypeName() {
+    async addPaperType() {
       //保存测验类型
       if (!this.answerTypeName) {
         this.$message.error("请填写测验名称！");
         return;
       }
       //添加测验类型
-      const { data, code, message } = await this.$request.addAnswerTypeName({
+      const { data, status, message } = await this.$request.addPaperType({
         typeName: this.answerTypeName,
       });
-      if (code == 0) {
+      if (status == 0) {
         this._CreatedTypeList();
         this.dialogVisible = false;
         this.answerTypeName = "";
@@ -778,14 +778,24 @@ export default {
     async save() {
       if (this.saceLoading) return;
       this.saceLoading = true;
-      const { data, code, message } = await this.$request.saveAnswerSheet({
+      //添加题目ID、序号
+      this.form.questionList.map((item, index) => {
+        item.questionId = index + 1;
+        item.questionIndex = index + 1;
+        item.questionType = 0;
+        item.subQuestions.map((items, indexs) => {
+          items.questionId = indexs + 1;
+          items.questionIndex = indexs + 1;
+        });
+      });
+      const { data, status, message } = await this.$request.addPaper({
         ...this.form,
       });
       this.saceLoading = false;
-      if (code == 0) {
+      if (status == 0) {
         this.$router.push({
-          path:"/examinationPaper"
-        })
+          path: "/examinationPaper",
+        });
       } else {
         this.$message.error(message);
       }
@@ -796,15 +806,15 @@ export default {
     },
     async _CreatedTypeList() {
       //测验类型查询
-      const { data, code, message } = await this.$request.fetchTypeNames();
-      if (code == 0) {
+      const { data, status, message } = await this.$request.fetchTypeNames();
+      if (status == 0) {
         this.answerTypeList = [...data.list] || [];
         this.answerTypeList.unshift({
-          typeName: "--",
+          typeName: "",
           id: "",
         });
         if (this.type != 2) {
-          this.form.tag = this.answerTypeList[0].id || "";
+          this.form.tagId = this.answerTypeList[0].id || "";
         }
       } else {
         this.$message.error(message);
@@ -812,8 +822,8 @@ export default {
     },
     async _GradeList() {
       //查询年级列表
-      const { data, code, message } = await this.$request.fetchGradeList();
-      if (code == 0) {
+      const { data, status, message } = await this.$request.fetchGradeList();
+      if (status == 0) {
         this.gradeList = [...data.gradeNames] || [];
         if (this.type != 2) {
           this.form.gradeName = this.gradeList[0];
@@ -829,38 +839,56 @@ export default {
       if (grade) {
         param.gradeName = grade;
       }
-      const { data, code, message } = await this.$request.fetchSubjectList(
+      const { data, status, message } = await this.$request.fetchSubjectList(
         param
       );
-      if (code === 0) {
+      if (status === 0) {
         this.subjectList = data.list.map((item) => {
           return {
-            value: item.subjectId,
+            value: item.subjectName,
             label: item.subjectName,
           };
         });
-        if (this.subjectList.length > 1) {
-          let isTeachingCourse = false;
-          this.subjectList.map((item) => {
-            if (item.isTeachingCourse) {
-              isTeachingCourse = true;
-            }
-          });
-          if (this.type != 2) {
-            !isTeachingCourse && !dont
-              ? (this.form.subjectId = this.subjectList[0].value)
-              : "";
-          }
-        }
-        if (this.subjectList.length > 0 && !dont) {
-          this.form.subjectId = this.subjectList[0].value;
+        if (this.subjectList.length) {
+          this.form.subjectName = this.subjectList[0].value;
         }
       } else {
         this.$message.error(message);
       }
     },
-
-    
+    async _QueryDetail() {
+      //查询年级列表
+      const { data, status, message } = await this.$request.fetchPaperDetail({
+        paperId: this.$route.query.paperId,
+      });
+      if (status == 0) {
+        this.form.title = data.title;
+        this.form.tagId = data.tagId;
+        this.form.subjectName = data.subjectName;
+        this.form.gradeName = data.gradeName;
+        this.form.examsDuration = data.examsDuration;
+        this.form.sharingType = data.sharingType;
+        this.form.questionList = data.questionList?.map((item) => {
+          let subQuestions =
+            item.subQuestions?.map((items) => {
+              return {
+                questionType: items.questionType,
+                score: items.score,
+                partScore: items.partScore,
+                selectNum: items.answerOptions.split(',').length,
+                answerOptions: [...items.answerOptions],
+                correctAnswer: items.correctAnswer,
+              };
+            }) || [];
+          return {
+            questionTitle: item.questionTitle,
+            subQuestions: subQuestions,
+          };
+        });
+      } else {
+        this.$message.error(message);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index cf564d1..40a078b 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -104,6 +104,7 @@
 export default {
   data() {
     return {
+      questionList:[],
       form: {
         //答题卡详情
         title: "",
@@ -128,7 +129,7 @@ export default {
     },
   },
   created() {
-    this.form = this.$route.query.form && JSON.parse(this.$route.query.form);
+    this._QueryDetail()
   },
   methods: {
     linkBack() {
@@ -199,17 +200,36 @@ export default {
         sub.correctAnswer = arrs.sort().join("");
       }
     },
-    save(){
-       //删除答题卡
-      // const { data, code, message } = await this.$request.updateAnswerSheet({...this.form});
-      // if (code == 0) {
+    async save(){
+      let questionList = []
+       //更新答题卡
+      const { data, status, message } = await this.$request.modifyPaper({
+        paperId:this.form.id,
+        questionList:questionList
+        });
+      if (status == 0) {
         this.$router.push({
           path:"/examinationPaper"
         })
-      // } else {
-      //   this.$message.error(message);
-      // }
-    }
+      } else {
+        this.$message.error(message);
+      }
+    },
+    async _QueryDetail() {
+      //查询年级列表
+      const { data, status, message } = await this.$request.fetchPaperDetail({
+        paperId:this.$route.query.paperId
+      });
+      if (status == 0) {
+        this.form = deepClone(data)
+        this.questionList = deepClone(data.questionList)
+        this.form.questionList.map(item=>{
+          item.score = ""
+        })
+      } else {
+        this.$message.error(message);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 17184ce..1715c7c 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -19,23 +19,23 @@
 
     <div class="answer-header">
       <div class="sel-box">
-        <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-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changClazz"
         >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
         <el-select
           class="sel"
-          v-model="query.subjectId"
+          v-model="query.subjectName"
           placeholder="选择科目"
           @change="_QueryData()"
         >
@@ -49,15 +49,15 @@
         </el-select>
         <el-select
           class="sel"
-          v-model="query.typeName"
+          v-model="query.tagId"
           placeholder="选择类型"
           @change="_QueryData()"
         >
           <el-option
             v-for="item in typeList"
             :key="item"
-            :label="item"
-            :value="item"
+            :label="item.label"
+            :value="item.value"
             >{{ item }}
           </el-option>
         </el-select>
@@ -76,7 +76,7 @@
       </div>
     </div>
     <p class="tips">
-      <span>另有25份已经归档的答题卡,</span>
+      <span>另有{{ archivedTotal }}份已经归档的答题卡,</span>
       <router-link to="/examinationPaperRecycle">点击查看&gt;&gt;</router-link>
     </p>
     <ul class="content">
@@ -87,29 +87,29 @@
         </div>
         <div class="info">
           <p class="title">
-            {{ item.title }} <span class="label">{{ item.typeName }}</span>
+            {{ item.title }} <span class="label">{{ item.tag }}</span>
           </p>
           <p class="num">
-            总题数：{{ item.answerNum }}
+            总题数：{{ item.questionNum }}
             <em class="s-line">|</em>
-            预计时长：{{ item.time }}
+            预计时长：{{ item.examsDuration }}
             <em class="s-line">|</em>
             授课端同步：
             <span
               class="clazz"
-              v-for="(clazzChild, indexs) in item.aboutClazz"
-              :key="clazzChild"
+              v-for="(clazzChild, indexs) in item.classList"
+              :key="clazzChild.classId"
               >{{
-                `${clazzChild}班${
+                `${clazzChild.className}班${
                   indexs != item.aboutClazz.length - 1 ? "、" : ""
                 }`
               }}
-              <i class="el-icon-success"></i
+              <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
             ></span>
           </p>
           <p class="person">
-            {{ item.teacher }}<em class="s-line">|</em
-            ><span class="date">{{ item.date }}</span>
+            {{ item.realName }}<em class="s-line">|</em
+            ><span class="date">{{ item.modifiedTime }}</span>
           </p>
         </div>
         <div class="btn-box">
@@ -134,7 +134,9 @@
               icon="el-icon-more"
             ></el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="1" v-if="this.$store.info.id == item.id">修改分享范围</el-dropdown-item>
+              <el-dropdown-item :command="1" v-if="userId == item.id"
+                >修改分享范围</el-dropdown-item
+              >
               <el-dropdown-item :command="2">复制</el-dropdown-item>
               <el-dropdown-item :command="3">归档</el-dropdown-item>
             </el-dropdown-menu>
@@ -144,11 +146,6 @@
     </ul>
     <el-dialog title="选择分享范围" :visible.sync="dialogVisible" width="400">
       <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
-        <el-form-item label="适用年级：">
-          <el-col :span="11">
-            <el-input v-model="shareForm.grade"></el-input>
-          </el-col>
-        </el-form-item>
         <el-form-item prop="share" label="分享范围：">
           <el-radio-group v-model="shareForm.share">
             <el-radio :label="1">任课班级分享</el-radio>
@@ -169,62 +166,23 @@ 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: "三班",
-            },
-          ],
-        },
-      ],
+      userId: "",
       dialogVisible: false,
       query: {
-        gradeClass: [],
-        subjectId: "0",
-        typeName: "周测",
+        classId: "",
+        subjectName: "",
+        tagId: "",
         title: "",
       },
-      classList: [
-        {
-          label: "2003班",
-          value: "2003",
-        },
-      ],
-      subjectList: [
-        {
-          label: "语文",
-          value: "0",
-        },
-      ],
-      typeList: ["周测"],
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      archivedTotal: 0, //已归档答题卡数量
       tableData: [
         {
           title: "数学样例试卷202211-324654",
           id: "1062837",
-          typeName: "周测",
+          tag: "周测",
           answerNum: 45,
           time: 90,
           aboutClazz: [203, 204],
@@ -246,7 +204,7 @@ export default {
                   score: 1,
                   partScore: 0,
                   selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D"],
+                  answerOptions: "A,B,C,D",
                   correctAnswer: "B",
                 },
               ],
@@ -256,7 +214,7 @@ export default {
         {
           title: "数学样例试卷202211-4180949",
           id: "1062838",
-          typeName: "周测",
+          tag: "周测",
           answerNum: 45,
           time: 90,
           aboutClazz: [203, 204],
@@ -288,14 +246,22 @@ export default {
       ],
       shareForm: {
         id: "",
-        grade: "",
         share: 1,
       },
       shareRulesForm: {
         share: [{ required: true, message: "选择分享范围", trigger: "blur" }],
       },
+      page: 1,
+      size: 20,
     };
   },
+  async created() {
+    this.userId = this.$store.getters.info.uid || "";
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    this._QueryData();
+    this._QueryTypeList();
+  },
   methods: {
     toAdd(query) {
       let routerItem = {
@@ -308,7 +274,7 @@ export default {
       this.$router.push({
         path: "/examinationPaperEdit",
         query: {
-          form: JSON.stringify(item),
+          paperId: item.id,
         },
       });
     },
@@ -319,13 +285,12 @@ export default {
         case 1:
           //修改分享范围
           that.shareForm.id = item.id;
-          that.shareForm.grade = item.grade;
           that.shareForm.share = item.share || 1;
           that.dialogVisible = true;
           break;
         case 2:
           //复制
-          that.toAdd({ type: 2, form: JSON.stringify(item) });
+          that.toAdd({ type: 2, paperId: item.id });
           break;
         case 3:
           //归档
@@ -335,51 +300,61 @@ export default {
     },
     async saveShare() {
       //修改分享范围
-      // const { data, code, message } = await this.$request.fetchAnswerList({
-      //   ...this.shareForm,
-      // });
-      // this.loading = false;
-      // if (code === 0) {
-      this.shareForm.id = "";
-      this.shareForm.grade = "";
-      this.shareForm.share = 1;
-      dialogVisible = false;
-      // } else {
-      //   this.$message.error(message);
-      // }
+      const { data, status, message } = await this.$request.modifyPaper({
+        paperId: that.shareForm.id,
+        sharingType: that.shareForm.share,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.shareForm.id = "";
+        this.shareForm.share = 1;
+        dialogVisible = false;
+      } else {
+        this.$message.error(message);
+      }
     },
     async recovery(item) {
       //归档
-      // const { data, code, message } = await this.$request.fetchAnswerList({
-      //   ...this.shareForm,
-      // });
-      // if (code === 0) {
-      this.tableData = this.tableData.filter((items) => {
-        return items.id != item.id;
+      const { data, status, message } = await this.$request.modifyPaper({
+        paperId: item.id,
+        status: 2,
       });
-      // } else {
-      //   this.$message.error(message);
-      // }
+      if (status === 0) {
+        let type = this.query.title ? 1 : 0;
+        this.page = 1;
+        this._QueryData(type);
+      } else {
+        this.$message.error(message);
+      }
     },
-    async changeGrade() {
-      //切换班级
+    //切换班级
+    async changClazz() {
       await this._QuerySubjectList();
-      this._QueryData();
+      this._QueryData(false);
     },
-    async changClazz() {},
     // 查找答题卡类型
     async _QueryTypeList() {
-      const { data, code, message } = await this.$request.fetchTypeNames();
-      if (code === 0) {
-        this.typeList = [...data.typeNames] || [];
+      const { data, status, message } = await this.$request.fetchTypeNames();
+      if (status === 0) {
+        this.typeList =
+          data.subjectNames.map((item) => {
+            return {
+              value: item.tagId,
+              label: item.tag,
+            };
+          }) || [];
+        this.subjectNames.unshift({
+          value: "",
+          label: "--",
+        });
       } else {
         this.$message.error(message);
       }
     },
     // 查找班级
     async _QueryClassList() {
-      const { data, code, message } = await this.$request.fetchClassList();
-      if (code === 0) {
+      const { data, status, message } = await this.$request.fetchClassList();
+      if (status === 0) {
         if (!!data.list) {
           this.classList = data.list.map((item) => {
             return {
@@ -395,14 +370,14 @@ export default {
     },
     // 查找科目
     async _QuerySubjectList() {
-      const { data, code, message } = await this.$request.fetchSubjectList({
+      const { data, status, message } = await this.$request.fetchSubjectList({
         clazzId: this.query.clazzId,
       });
-      if (code === 0) {
-        this.subjectList = data.list.map((item) => {
+      if (status === 0) {
+        this.subjectList = data.subjectNames.map((item) => {
           return {
-            value: item.subjectId,
-            label: item.subjectName,
+            value: item,
+            label: item,
           };
         });
         this.query.clazzId = this.subjectList[0]?.value;
@@ -418,8 +393,8 @@ export default {
         query = { ...this.query };
       } else {
         query = { title: this.query.title };
-        this.query.typeName = "";
-        this.query.subjectId = "";
+        this.query.tagId = "";
+        this.query.subjectName = "";
       }
       query.clazzId = this.query.clazzId;
       for (let key in query) {
@@ -434,11 +409,14 @@ export default {
         return;
       }
       this.loading = true;
-      const { data, code, message } = await this.$request.fetchAnswerList({
+      const { data, status, message } = await this.$request.fetchPaperList({
         ...query,
+        status: 1,
+        page: this.page,
+        size: this.size,
       });
       this.loading = false;
-      if (code === 0) {
+      if (status === 0) {
         this.total = data.total;
         this.tableData = (data.list && [...data.list]) || [];
       } else {
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index 39a994a..07f0953 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -7,7 +7,7 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-cascader
+        <!-- <el-cascader
           class="sel sel2"
           :options="options"
           :props="props"
@@ -20,14 +20,27 @@
             <span>{{ data.label }}</span>
             <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
           </template></el-cascader
+        > -->
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changClazz"
         >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
         <el-select
           class="sel"
-          v-model="query.subjectId"
+          v-model="query.subjectName"
           placeholder="选择科目"
           @change="_QueryData()"
         >
-          <el-option label="全部" value=""></el-option>
           <el-option
             v-for="item in subjectList"
             :key="item.value"
@@ -38,17 +51,16 @@
         </el-select>
         <el-select
           class="sel"
-          v-model="query.type"
+          v-model="query.tagId"
           placeholder="选择类型"
           @change="_QueryData()"
         >
-          <el-option label="全部" value=""></el-option>
           <el-option
             v-for="item in typeList"
-            :key="item.value"
+            :key="item"
             :label="item.label"
             :value="item.value"
-            >{{ item.label }}
+            >{{ item }}
           </el-option>
         </el-select>
 
@@ -74,19 +86,18 @@
         </div>
         <div class="info">
           <p class="title">
-            {{ item.title }} <span class="label">{{ item.typeName }}</span>
+            {{ item.title }} <span class="label">{{ item.tag }}</span>
           </p>
           <p class="num">
             {{ item.gradeName }}
             <em class="s-line">|</em>
-            总题数：{{ item.answerNum }}
-            <em class="s-line">|</em>
-            预计时长：{{ item.time }}
+            总题数：{{ item.questionNum }}
             <em class="s-line">|</em>
+            预计时长：{{ item.examsDuration }}
           </p>
           <p class="person">
-            {{ item.teacher }}<em class="s-line">|</em
-            ><span class="date">{{ item.date }}</span>
+            {{ item.realName }}<em class="s-line">|</em
+            ><span class="date">{{ item.modifiedTime }}</span>
           </p>
         </div>
         <div class="btn-box">
@@ -97,7 +108,7 @@
               size="mini"
               circle
               icon="fa fa-mail-reply"
-              @click="have(item)"
+              @click="modify(item)"
             ></el-button>
           </el-tooltip>
           <el-popconfirm title="确定删除这张答题卡吗？" @confirm="remove(item)">
@@ -152,17 +163,29 @@ export default {
         },
       ],
       query: {
-        gradeClass: [],
-        type: "",
-        subjectId: "",
+        classId: 2003,
+        subjectName: "语文",
+        tagId: 1,
         title: "",
       },
-      gradeList: ["二年级"],
+      classList: [
+        {
+          label: "2003班",
+          value: 2003,
+        },
+      ],
+      subjectList: [
+        {
+          label: "语文",
+          value: "语文",
+        },
+      ],
       typeList: [
-        { label: "周测", value: 1 },
-        { label: "月测", value: 2 },
+        {
+          label: "周测",
+          value: 1,
+        },
       ],
-      subjectList: [],
       tableData: [
         {
           title: "数学样例试卷202211-324654",
@@ -192,28 +215,42 @@ export default {
       total: 0,
     };
   },
+  async created() {
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    this._QueryTypeList();
+    this._QueryData(false);
+  },
   methods: {
-    have(obj) {
-      //删除答题卡
-      // const { data, code, message } = await this.$request.useAnswerSheet();
-      // if (code == 0) {
-      this.tableData = this.tableData.filter((item) => {
-        return obj.if != item.id;
+    async modify(obj) {
+      //恢复答题卡
+      const { data, status, message } = await this.$request.modifyPaper({
+        paperId: obj.id,
+        status: 2,
       });
-      // } else {
-      //   this.$message.error(message);
-      // }
+      if (status == 0) {
+        let type = this.query.title ? 1 : 0;
+        this._QueryData(type);
+      } else {
+        this.$message.error(message);
+      }
     },
-    remove(obj) {
+    async remove(obj) {
       //删除答题卡
-      // const { data, code, message } = await this.$request.removeAnswerSheet();
-      // if (code == 0) {
-      this.tableData = this.tableData.filter((item) => {
-        return obj.if != item.id;
+      const { data, status, message } = await this.$request.delPaper({
+        paperId: obj.id,
       });
-      // } else {
-      //   this.$message.error(message);
-      // }
+      if (status == 0) {
+        let type = this.query.title ? 1 : 0;
+        this._QueryData(type);
+      } else {
+        this.$message.error(message);
+      }
+    },
+    //切换班级
+    async changClazz() {
+      await this._QuerySubjectList();
+      this._QueryData(false);
     },
     async _QueryData(type) {
       //获取答题卡列表
@@ -232,58 +269,62 @@ export default {
         }
       }
       this.loading = true;
-      const { data, code, message } = await this.$request.fetchAnswerList({
+      const { data, status, message } = await this.$request.fetchAnswerList({
         ...query,
       });
       this.loading = false;
-      if (code === 0) {
+      if (status === 0) {
         this.total = data.total;
         this.tableData = (data.list && [...data.list]) || [];
       } else {
         this.$message.error(message);
       }
     },
-    // 查找答题卡类型
-    async _QueryTypeList() {
-      const { data, code, message } = await this.$request.fetchTypeNames();
-      if (code === 0) {
-        this.typeList = [...data.typeNames] || [];
+    // 查找班级
+    async _QueryClassList() {
+      const { data, status, message } = await this.$request.fetchClassList();
+      if (status === 0) {
+        if (!!data.list) {
+          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 changeGrade() {
-      // this._QueryData();
-      // this._GradeList();
-      // this._QuerySubjectList();
-    },
-    async _GradeList() {
-      //查询年级列表
-      const { data, code, message } = await this.$request.fetchGradeList();
-      if (code == 0) {
-        this.gradeList = [...data.gradeNames] || [];
-        this.query.gradeName = this.gradeList[0];
-        this._QuerySubjectList(this.gradeList[0]);
+    // 查找科目
+    async _QuerySubjectList() {
+      const { data, status, message } = await this.$request.fetchSubjectList({
+        clazzId: this.query.clazzId,
+      });
+      if (status === 0) {
+        this.subjectList = data.subjectNames.map((item) => {
+          return {
+            value: item,
+            label: item,
+          };
+        });
+        this.query.clazzId = this.subjectList[0]?.value;
       } else {
         this.$message.error(message);
       }
     },
-    async _QuerySubjectList(grade, dont) {
-      //查询科目列表
-      let param = {};
-      if (grade) {
-        param.gradeName = grade;
-      }
-      const { data, code, message } = await this.$request.fetchSubjectList(
-        param
-      );
-      if (code === 0) {
-        this.subjectList = data.list.map((item) => {
-          return {
-            value: item.subjectId,
-            label: item.subjectName,
-          };
-        });
+    // 查找答题卡类型
+    async _QueryTypeList() {
+      const { data, status, message } = await this.$request.fetchTypeNames();
+      if (status === 0) {
+        this.typeList =
+          data.subjectNames.map((item) => {
+            return {
+              value: item.tagId,
+              label: item.tag,
+            };
+          }) || [];
       } else {
         this.$message.error(message);
       }
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 1dc53d8..b5bb9c2 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <ul class="nav-list" v-if="type == '学校管理员'">
+    <ul class="nav-list" v-if="type == 'ROLE_XUEXIAO'">
       <li class="nav-item item1" @click="links('/setUpAccount')">
         <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
         <div class="text">
@@ -44,7 +44,7 @@
     </ul>
     <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)">
+      <li  v-if="!item.path.includes('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'">
             <p class="p1">学校管理</p>
@@ -65,9 +65,9 @@
       </li>
       </template>
     </ul>
-    <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)">
+    <ul class="nav-list" v-if="type == 'ROLE_JIAOSHI' || type == 'ROLE_BANZHUREN' ">
+      <template v-for="(item) in navList">
+      <li v-if="!item.path.includes('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'">
             <p class="p1">备题组卷</p>
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index 40c1168..d8094c5 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -3,7 +3,8 @@
     <el-header id="header">
       <span class="hideAside" @click="collapse"
         ><i class="el-icon-s-fold" v-show="!isCollapse"></i>
-        <i class="el-icon-s-unfold" v-show="isCollapse"></i></span>
+        <i class="el-icon-s-unfold" v-show="isCollapse"></i
+      ></span>
       <ul class="personal">
         <!-- <li>
           <langSelect></langSelect>
@@ -63,11 +64,10 @@ import Cookies from "js-cookie";
 import langSelect from "../../../components/lang/langSelect";
 import tabNav from "./tabNav";
 import UserInfo from "../../../components/userForm/userInfo";
-import EditPassword from "../../../components/userForm/editPassword";
 
 export default {
   name: "Header",
-  components: { EditPassword, tabNav, langSelect, UserInfo },
+  components: { tabNav, langSelect, UserInfo },
   computed: {
     permissions: function () {
       return this.$store.getters.info.permissions || [];
@@ -81,15 +81,15 @@ export default {
       dialogPassVisible: false,
       title: "",
       userId: "",
-      isCollapse:false,
+      isCollapse: false,
     };
   },
-  created(){
-    this.isCollapse = this.$store.getters.isCollapse
+  created() {
+    this.isCollapse = this.$store.getters.isCollapse;
   },
   methods: {
     collapse() {
-      this.isCollapse = !this.isCollapse
+      this.isCollapse = !this.isCollapse;
       this.$store.dispatch("collapse");
     },
     successCallback() {
@@ -128,10 +128,19 @@ export default {
       //刷新权限跳转首页
       this.$store.dispatch("permissions", this);
     },
-    logOut() {
-      this.$router.push({
-        path: "/login",
-      });
+    async logOut() {
+      const { data } = await this.$request.logout();
+      if (data.status == 0) {
+        if (data.data) {
+          window.location.href = data;
+        } else {
+          this.$router.push({
+            path: "/login",
+          });
+        }
+      } else {
+        this.$message.error(message);
+      }
     },
   },
 };
@@ -178,11 +187,11 @@ ul.el-menu {
   display: flex;
   justify-content: space-between;
   color: #fff;
-  padding:0 20px 0 10px;
+  padding: 0 20px 0 10px;
   .hideAside {
     @extend %cursor;
-    i{
-      font-size:24px;
+    i {
+      font-size: 24px;
       line-height: 50px;
     }
   }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f05139a..05b7cea 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,16 +90,16 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        username: "15911715665",
-        password: "Csiy88888",
+        username: "13028102196",
+        password: "Pw102196#",
       },
       loginRules: {
         username: [
-          { required: true, message: "请输入用户账号",trigger: "blur" }
+          { required: true, message: "请输入用户账号", trigger: "blur" },
         ],
         password: [
-          { required: true,  message: "请输入账号密码",trigger: "blur" }
-        ]
+          { required: true, message: "请输入账号密码", trigger: "blur" },
+        ],
       },
       url: "",
     };
@@ -127,7 +127,7 @@ export default {
         });
         return false;
       } else {
-        this.$store.dispatch("Login",{...this.loginForm,url:this.url})
+        this.$store.dispatch("Login", { ...this.loginForm, url: this.url });
       }
     },
   },
@@ -140,10 +140,8 @@ $dark_gray: #889aa4;
 $light_gray: #000;
 $cursor: #000;
 
-@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-  .login-container .el-input input {
-    color: $cursor;
-  }
+.login-container .el-input input {
+  color: $cursor;
 }
 .login-container {
   width: 100%;
@@ -166,7 +164,7 @@ $cursor: #000;
       border: 0px;
       -webkit-appearance: none;
       border-radius: 0px;
-      font-size:16px;
+      font-size: 16px;
       color: $light_gray;
       height: 52px;
       caret-color: $cursor;
diff --git a/vue.config.js b/vue.config.js
index f7fc2f3..84ef096 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -20,13 +20,13 @@ module.exports = {
       warnings: false,
       errors: true,
     },
-    // proxy: {
-    //   "/": {
-        // target:"http://192.168.3.29:8080",
-      //   changeOrigin: true,
-      //   ws:true,
-      // },
-    // },
+    proxy: {
+      "/": {
+        target:"http://192.168.3.29:8080",
+        changeOrigin: true,
+        ws:true,
+      },
+    },
     disableHostCheck: true
   },
   css: {