From 6dc19f4796d89e2c4a9cd28ca77ab4d38cde3471 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Fri, 15 Dec 2023 11:25:11 +0800
Subject: [PATCH] 路由及文件名调整

---
 src/router/index.js                             |   68 ++++++++++++++++++++++++++++++++------------------------------------
 src/views/basic/analysis/index.vue              |  685 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/analysis/indexOld.vue           |  463 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/ask/analysis.vue                |  587 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/ask/archiving.vue               | 1055 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/ask/index.vue                   | 1119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/card/index.vue                  |  345 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/dataSync/index.vue              |  188 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/device/error.vue                |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/device/index.vue                | 1355 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/device/log.vue                  |  327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/down/client.vue                 |  715 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/down/index.vue                  |  115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/examinationPaper/add.vue        | 2005 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/examinationPaper/detail.vue     |  190 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/examinationPaper/edit.vue       |  997 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/examinationPaper/index.vue      |  537 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/examinationPaper/recycle.vue    |  411 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/account.vue               |  764 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/archived.vue              |  395 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/archivedClazz.vue         |   90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/clazz.vue                 |  662 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/conglomerate.vue          |  661 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/school.vue                |  461 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/student.vue               |  892 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/setUp/teacher.vue               | 1132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/test/analysis.vue               |  878 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/test/archiving.vue              |  876 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basic/test/index.vue                  | 1067 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/standard/analysis/index.vue           |  685 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/analysis/indexOld.vue        |  463 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/ask/analysis.vue             |  587 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/ask/archiving.vue            | 1055 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/ask/index.vue                | 1119 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/card/index.vue               |  345 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/dataSync/index.vue           |  188 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/device/error.vue             |  214 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/device/index.vue             | 1355 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/device/log.vue               |  327 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/down/client.vue              |  715 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/down/index.vue               |  115 -------------------------------------------------------------------------------------------------------------------
 src/views/standard/examinationPaper/add.vue     | 2005 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/examinationPaper/detail.vue  |  190 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/examinationPaper/edit.vue    |  997 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/examinationPaper/index.vue   |  537 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/examinationPaper/recycle.vue |  411 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/account.vue            |  764 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/archived.vue           |  395 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/archivedClazz.vue      |   90 ------------------------------------------------------------------------------------------
 src/views/standard/setUp/clazz.vue              |  662 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/conglomerate.vue       |  661 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/school.vue             |  461 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/student.vue            |  892 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/setUp/teacher.vue            | 1132 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/test/analysis.vue            |  878 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/test/archiving.vue           |  876 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/standard/test/index.vue               | 1067 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 57 files changed, 19218 insertions(+), 19222 deletions(-)
 create mode 100644 src/views/basic/analysis/index.vue
 create mode 100644 src/views/basic/analysis/indexOld.vue
 create mode 100644 src/views/basic/ask/analysis.vue
 create mode 100644 src/views/basic/ask/archiving.vue
 create mode 100644 src/views/basic/ask/index.vue
 create mode 100644 src/views/basic/card/index.vue
 create mode 100644 src/views/basic/dataSync/index.vue
 create mode 100644 src/views/basic/device/error.vue
 create mode 100644 src/views/basic/device/index.vue
 create mode 100644 src/views/basic/device/log.vue
 create mode 100644 src/views/basic/down/client.vue
 create mode 100644 src/views/basic/down/index.vue
 create mode 100644 src/views/basic/examinationPaper/add.vue
 create mode 100644 src/views/basic/examinationPaper/detail.vue
 create mode 100644 src/views/basic/examinationPaper/edit.vue
 create mode 100644 src/views/basic/examinationPaper/index.vue
 create mode 100644 src/views/basic/examinationPaper/recycle.vue
 create mode 100644 src/views/basic/setUp/account.vue
 create mode 100644 src/views/basic/setUp/archived.vue
 create mode 100644 src/views/basic/setUp/archivedClazz.vue
 create mode 100644 src/views/basic/setUp/clazz.vue
 create mode 100644 src/views/basic/setUp/conglomerate.vue
 create mode 100644 src/views/basic/setUp/school.vue
 create mode 100644 src/views/basic/setUp/student.vue
 create mode 100644 src/views/basic/setUp/teacher.vue
 create mode 100644 src/views/basic/test/analysis.vue
 create mode 100644 src/views/basic/test/archiving.vue
 create mode 100644 src/views/basic/test/index.vue
 delete mode 100644 src/views/standard/analysis/index.vue
 delete mode 100644 src/views/standard/analysis/indexOld.vue
 delete mode 100644 src/views/standard/ask/analysis.vue
 delete mode 100644 src/views/standard/ask/archiving.vue
 delete mode 100644 src/views/standard/ask/index.vue
 delete mode 100644 src/views/standard/card/index.vue
 delete mode 100644 src/views/standard/dataSync/index.vue
 delete mode 100644 src/views/standard/device/error.vue
 delete mode 100644 src/views/standard/device/index.vue
 delete mode 100644 src/views/standard/device/log.vue
 delete mode 100644 src/views/standard/down/client.vue
 delete mode 100644 src/views/standard/down/index.vue
 delete mode 100644 src/views/standard/examinationPaper/add.vue
 delete mode 100644 src/views/standard/examinationPaper/detail.vue
 delete mode 100644 src/views/standard/examinationPaper/edit.vue
 delete mode 100644 src/views/standard/examinationPaper/index.vue
 delete mode 100644 src/views/standard/examinationPaper/recycle.vue
 delete mode 100644 src/views/standard/setUp/account.vue
 delete mode 100644 src/views/standard/setUp/archived.vue
 delete mode 100644 src/views/standard/setUp/archivedClazz.vue
 delete mode 100644 src/views/standard/setUp/clazz.vue
 delete mode 100644 src/views/standard/setUp/conglomerate.vue
 delete mode 100644 src/views/standard/setUp/school.vue
 delete mode 100644 src/views/standard/setUp/student.vue
 delete mode 100644 src/views/standard/setUp/teacher.vue
 delete mode 100644 src/views/standard/test/analysis.vue
 delete mode 100644 src/views/standard/test/archiving.vue
 delete mode 100644 src/views/standard/test/index.vue

diff --git a/src/router/index.js b/src/router/index.js
index 73ad9e9..1235392 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,36 +15,29 @@ const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
 const ExaminationPaperArchiving = () => import("@/views/examinationPaper/archiving")
 const Portrait = () => import("@/views/portrait/index")
 const PortraitDetail = () => import("@/views/portrait/detail")
-const CSExaminationPaper = () => import("@/views/examinationPaper/index")
-// const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
-// const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
-// const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
-const CSExaminationPaperAdd = () => import("@/views/examinationPaper/add")
-const CSExaminationPaperEdit = () => import("@/views/examinationPaper/edit")
-const CSExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
 
 
-const Ask = () => import("@/views/standard/ask/index")
-const AskAnalysis = () => import("@/views/standard/ask/analysis")
-const AskArchiving = () => import("@/views/standard/ask/archiving")
-const Test = () => import("@/views/standard/test/index")
-const TestAnalysis = () => import("@/views/standard/test/analysis")
-const TestArchiving = () => import("@/views/standard/test/archiving")
-const DataSync = () => import("@/views/standard/dataSync/index")
-const Card = () => import("@/views/standard/card/index")
-const Analysis = () => import("@/views/standard/analysis/index")
-const Device = () => import("@/views/standard/device/index")
-const DeviceLog = () => import("@/views/standard/device/log")
-const Down = () => import("@/views/standard/down/index")
-const DownClient = () => import("@/views/standard/down/client")
-const SetUpAccount = () => import("@/views/standard/setUp/account")
-const SetUpConglomerate = () => import("@/views/standard/setUp/conglomerate")
-const SetUpSchool = () => import("@/views/standard/setUp/school")
-const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
-const SetUpStudent = () => import("@/views/standard/setUp/student")
-const ArchivedClazz = () => import("@/views/standard/setUp/archivedClazz")
-
+const Ask = () => import("@/views/basic/ask/index")
+const AskAnalysis = () => import("@/views/basic/ask/analysis")
+const AskArchiving = () => import("@/views/basic/ask/archiving")
+const Test = () => import("@/views/basic/test/index")
+const TestAnalysis = () => import("@/views/basic/test/analysis")
+const TestArchiving = () => import("@/views/basic/test/archiving")
+const DataSync = () => import("@/views/basic/dataSync/index")
+const Card = () => import("@/views/basic/card/index")
+const Analysis = () => import("@/views/basic/analysis/index")
+const Device = () => import("@/views/basic/device/index")
+const DeviceLog = () => import("@/views/basic/device/log")
+const Down = () => import("@/views/basic/down/index")
+const DownClient = () => import("@/views/basic/down/client")
+const SetUpAccount = () => import("@/views/basic/setUp/account")
+const SetUpConglomerate = () => import("@/views/basic/setUp/conglomerate")
+const SetUpSchool = () => import("@/views/basic/setUp/school")
+const SetUpTeacher = () => import("@/views/basic/setUp/teacher")
+const SetUpStudent = () => import("@/views/basic/setUp/student")
+const ArchivedClazz = () => import("@/views/basic/setUp/archivedClazz")
 
+// 个人版
 const PersonalAsk = () => import("@/views/personal/ask/index")
 const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
 const PersonalArchiving = () => import("@/views/personal/ask/archiving")
@@ -56,6 +49,7 @@ const PersonalSetUpStudent = () => import("@/views/personal/setUp/student")
 const PersonalDown = () => import("@/views/personal/down/index")
 const PersonalUserInfo = () => import("@/views/personal/userInfo/index")
 
+// 超级管理员
 const AdminDevice = () => import("@/views/admin/device/index")
 const AdminDeviceLog = () => import("@/views/admin/device/log")
 const AdminAccount = () => import("@/views/admin/account/index")
@@ -64,9 +58,9 @@ const AdminClientVersion = () => import("@/views/admin/clientVersion/index")
 /**
  * v1.4 
  */
-const SetUpClazz = () => import("@/views/standard/setUp/clazz")
-const Archived = () => import("@/views/standard/setUp/archived")
-const DeviceError = () => import("@/views/standard/device/error")
+const SetUpClazz = () => import("@/views/basic/setUp/clazz")
+const Archived = () => import("@/views/basic/setUp/archived")
+const DeviceError = () => import("@/views/basic/device/error")
 
 /**
  * 重写路由的push方法
@@ -76,7 +70,6 @@ Router.prototype.push = function push(location) {
   return routerPush.call(this, location).catch(error => error)
 }
 Vue.use(Router)
-let routeName = en.routeName
 let defaultRouter = [
   {
     path: "/",
@@ -146,7 +139,7 @@ let defaultRouter = [
     children: []
   }
 ]
-
+//标准版路由表
 let addrouters = [
   {
     path: "/examinationPaper",
@@ -483,6 +476,7 @@ let addrouters = [
   //   ]
   // },
 ]
+//长水版路由表
 let csAddrouters = [
   {
     path: "/examinationPaper",
@@ -495,14 +489,14 @@ let csAddrouters = [
         path: "/examinationPaper",
         iconCls: "fa fa-file-text", // 图标样式class
         name: "examinationPaper",
-        component: CSExaminationPaper,
+        component: ExaminationPaper,
         children: []
       },
       {
         path: "/examinationPaperAdd",
         iconCls: "", // 图标样式class
         name: "examinationPaperAdd",
-        component: CSExaminationPaperAdd,
+        component: ExaminationPaperAdd,
         parent: "examinationPaper",
         children: []
       },
@@ -510,7 +504,7 @@ let csAddrouters = [
         path: "/examinationPaperEdit",
         iconCls: "", // 图标样式class
         name: "修改答题卡",
-        component: CSExaminationPaperEdit,
+        component: ExaminationPaperEdit,
         parent: "examinationPaper",
         children: []
       },
@@ -518,7 +512,7 @@ let csAddrouters = [
         path: "/examinationPaperRecycle",
         iconCls: "", // 图标样式class
         name: "回收站答题卡",
-        component: CSExaminationPaperRecycle,
+        component: ExaminationPaperRecycle,
         parent: "examinationPaper",
         children: []
       },
@@ -752,6 +746,7 @@ let csAddrouters = [
   },
 ]
 
+//个人版版路由表
 const addroutersPersonal = [
   {
     path: "/setUpStudent",
@@ -954,6 +949,7 @@ const addroutersPersonal = [
   },
 ]
 
+// 超级管理员路由表
 const addRoutersAdmin = [
   {
     path: "/account",
diff --git a/src/views/basic/analysis/index.vue b/src/views/basic/analysis/index.vue
new file mode 100644
index 0000000..0ab8b3e
--- /dev/null
+++ b/src/views/basic/analysis/index.vue
@@ -0,0 +1,685 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>使用分析</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip effect="dark" content="导出更多数据" placement="bottom">
+          <el-button
+            type="primary"
+            icon="fa fa-cloud-download"
+            size="mini"
+            plain
+            circle
+            @click="downExc"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <ul class="params-box">
+        <li class="item item3">
+          <span class="s-txt">时间段：</span>
+          <div class="sel-box">
+            <div class="d1">
+              <el-date-picker
+                v-model="query.startDay"
+                type="date"
+                @change="handleChangeTimeStart"
+                placeholder="选择日期时间"
+                value-format="yyyy-MM-dd"
+                size="mini"
+              >
+              </el-date-picker>
+              ~
+              <el-date-picker
+                v-model="query.endDay"
+                type="date"
+                placeholder="选择日期时间"
+                @change="handleChangeTimeEnd"
+                value-format="yyyy-MM-dd"
+                size="mini"
+              >
+              </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
+              >
+              <span
+                @click="setDate(4)"
+                :class="[date == 4 ? 'active' : '', 's1']"
+                >本季度</span
+              >
+            </p>
+          </div>
+          <el-button
+            class="btn"
+            v-if="role == 'ROLE_JITUAN'"
+            type="primary"
+            round
+            size="small"
+            @click="resetRank"
+            >使用频率前十</el-button
+          >
+        </li>
+        <li class="item item2" v-for="(item, index) in query.secGraClaSub">
+          <span class="s-txt">对比项{{ setBigNum(index) }}：</span>
+          <div class="sel-box">
+            <el-cascader
+              :ref="'cascader' + index"
+              size="small"
+              class="sel sel2"
+              clearable
+              placeholder="选择范围"
+              @change="secGraClaSubChange($event, index)"
+              v-model="query.secGraClaSub[index]"
+              :options="gradeList"
+              :props="props"
+            ></el-cascader>
+          </div>
+          <i class="el-icon-delete" @click="removeQuery(index)"></i>
+        </li>
+        <li class="item">
+          <span class="s-txt"></span>
+          <div class="disflex-b">
+            <el-button
+              class="btn btn-none"
+              :class="query.secGraClaSub.length < 10 ? '' : 'active'"
+              icon="el-icon-plus"
+              size="small"
+              round
+              @click="addQuery"
+              >添加对比项</el-button
+            >
+            <el-button
+              v-show="query.secGraClaSub.length"
+              class="btn"
+              type="primary"
+              round
+              size="small"
+              @click="getData"
+              >多项对比</el-button
+            >
+          </div>
+        </li>
+      </ul>
+      <div class="chart-box">
+        <barChart id="barChart" ref="barChart" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import barChart from "@/components/charts/barChart";
+import { formatDate, downloadFile } from "@/utils";
+export default {
+  components: {
+    barChart,
+  },
+  data() {
+    return {
+      role: "",
+      loading: false,
+      date: "", //今天-本周-本月-本季度
+      type: 1, //集团管理员 表格切换
+      query: {
+        //搜索条件
+        startDay: "",
+        endDay: "",
+        day: "",
+        secGraClaSub: [],
+        secGraClaSubName: [],
+      },
+      props: {
+        multiple: false,
+        checkStrictly: true,
+      },
+      params: [],
+      gradeList: [],
+      chartData: [
+        {
+          name: "课时数",
+          value: [],
+        },
+        {
+          name: "测练数",
+          value: [],
+        },
+      ],
+      xAxis: [],
+    };
+  },
+  async created() {
+    let that = this;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_JITUAN") {
+      (this.props.lazy = true),
+        (this.props.lazyLoad = function (node, resolve) {
+          const { level } = node;
+          if (level == 3) {
+            console.log(node);
+            that.$request
+              .tenantSubjectList({
+                schoolId: node.path[0],
+                grade: node.value,
+              })
+              .then((res) => {
+                let children = res.data?.subjectNames.map((item) => {
+                  return {
+                    label: item,
+                    value: item,
+                    leaf: true,
+                  };
+                });
+                const nodes = [...children];
+                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+                resolve(nodes);
+              });
+          } else {
+            resolve(node);
+          }
+        });
+      await this._QuerySchool();
+    }
+    await this._QueryGradeList();
+    if (this.role == "ROLE_XUEXIAO") {
+      await this._QueryClassList();
+    }
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = formatDate(new Date(), "yyyy-MM-dd");
+      this.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+    }
+    this.setDate(3);
+    this._QueryData();
+  },
+  methods: {
+    async downExc() {
+      if (this.exportLoading == true) return;
+      let query = {
+        //搜索条件
+        startDay: this.query.startDay,
+        endDay: this.query.endDay,
+        day: this.query.day,
+      };
+      this.exportLoading = true;
+
+      const exportUsageAnalysis =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.exportUsageAnalysis
+          : this.$request.exportSchoolContrast;
+      const data = await exportUsageAnalysis({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("使用分析.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    addQuery() {
+      this.query.secGraClaSub.push([]);
+      this.query.secGraClaSubName.push("");
+    },
+    filterObj(arr, value) {
+      return arr.filter((item) => {
+        return value == item.value;
+      })[0];
+    },
+    secGraClaSubChange(event, index) {
+      console.log(event);
+      let txt = "";
+      let xx = this.filterObj(this.gradeList, event[0]);
+      txt += xx.label;
+      if (event.length > 1) {
+        let grade = this.filterObj(xx.children, event[1]);
+        txt += "/" + grade.label;
+        if (event.length > 2) {
+          let clazz = this.filterObj(grade.children, event[2]);
+          txt += "/" + clazz.label;
+          if (event.length > 3) {
+            txt += "/" + event[3];
+          }
+        }
+      }
+      this.query.secGraClaSubName[index] = txt;
+    },
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"];
+      txt = bigNum[num];
+
+      return txt;
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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 day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+      }
+    },
+    removeQuery(index) {
+      let secGraClaSubLen = this.query.secGraClaSub.length;
+      let xAxisLen = this.xAxis.length;
+      this.query.secGraClaSub.splice(index, 1);
+      this.query.secGraClaSubName.splice(index, 1);
+      this.xAxis.splice(index, 1);
+      if (
+        secGraClaSubLen == xAxisLen ||
+        (secGraClaSubLen > xAxisLen && index < xAxisLen)
+      ) {
+        this.chartData[0].value.splice(index, 1);
+        this.chartData[1].value.splice(index, 1);
+        this.$refs.barChart.initData(this.xAxis, this.chartData);
+      }
+    },
+    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 = "";
+        }
+      }
+    },
+    getData() {
+      if (!this.query.secGraClaSub.length) {
+        this.$message.warning("请添加对比项，并选择对比条件！");
+        return;
+      }
+      let hasSpace = null;
+      for (let i = 0; i < this.query.secGraClaSub.length; i++) {
+        if (!this.query.secGraClaSub[i].length) {
+          hasSpace = i;
+          break;
+        }
+      }
+      if (hasSpace !== null) {
+        this.$message.warning(
+          `对比项${this.setBigNum(hasSpace)}对比条件不能为空请检查！`
+        );
+        return;
+      }
+      this.xAxis = [...this.query.secGraClaSubName];
+      this._QueryData();
+    },
+    setQuery() {
+      let query = { ...this.query };
+      delete query.secGraClaSub;
+      if (this.role != "ROLE_JITUAN") {
+        query.params = this.query.secGraClaSub.map((item) => {
+          let jsons = {};
+          jsons.section = item[0];
+          item.length > 1 ? (jsons.grade = item[1]) : "";
+          item.length > 2 ? (jsons.classId = item[2]) : "";
+          item.length == 4 ? (jsons.subjectName = item[3]) : "";
+          return jsons;
+        });
+      } else {
+        query.params = this.query.secGraClaSub.map((item) => {
+          let jsons = {};
+          jsons.schoolId = item[0];
+          item.length > 1 ? (jsons.section = item[1]) : "";
+          item.length > 2 ? (jsons.grade = item[2]) : "";
+          item.length == 4 ? (jsons.subjectName = item[3]) : "";
+          return jsons;
+        });
+      }
+      delete query.secGraClaSubName;
+      return query;
+    },
+    async resetRank() {
+      this.query.secGraClaSub = [];
+      this.query.secGraClaSubName = [];
+      this.chartData[0].value = [];
+      this.chartData[1].value = [];
+      this.xAxis = [];
+      this.$refs.barChart.clearChart();
+      await this._QuerySchool();
+      await this._QueryGradeList();
+      this._QueryData();
+    },
+    async _QueryData() {
+      this.loading = true;
+      let query = this.setQuery();
+      const usageStatistics =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.usageStatistics
+          : this.$request.tenantUsageStatistics;
+      const { data, status, info } = await usageStatistics({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.chartData[0].value = [];
+        this.chartData[1].value = [];
+        this.xAxis = this.query.secGraClaSubName.map((item) => {
+          let arr = item.split("/");
+          return arr[0] + "\n" + arr.slice(1, arr.length).join("/");
+        });
+        data?.list.map((item, index) => {
+          this.chartData[0].value.push(item.periodCount);
+          this.chartData[1].value.push(item.examCount);
+        });
+        this.$refs.barChart.initData(this.xAxis, this.chartData);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找nian级
+    async _QueryGradeList() {
+      this.loading = true;
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.sectionAndGradeList
+          : this.$request.tenantSectionAndGradeList;
+      const { data, status, info } = await gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          this.query.secGraClaSub = [];
+          this.query.secGraClaSubName = [];
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeIds = [];
+                let children = item.gradeList.map((items) => {
+                  gradeIds.push(items.grade);
+                  return {
+                    value: items.grade,
+                    label: items.gradeName,
+                  };
+                });
+                return {
+                  value: item.section,
+                  label: item.sectionName,
+                  gradeIds: [...gradeIds],
+                  children: [...children],
+                };
+              }) || [];
+          } else {
+            let children = data.list?.map((item) => {
+              let children = item.gradeList.map((items) => {
+                return {
+                  value: items.grade,
+                  label: items.gradeName,
+                };
+              });
+              return {
+                value: item.section,
+                label: item.sectionName,
+                children: [...children],
+              };
+            });
+            this.gradeList = this.schoolList.map((item) => {
+              if (this.query.secGraClaSub.length < 10) {
+                this.query.secGraClaSub.push([item.id]);
+                this.query.secGraClaSubName.push(item.schoolName);
+              }
+              return {
+                value: item.id,
+                label: item.schoolName,
+                children: [...children],
+              };
+            });
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          if (this.role == "ROLE_XUEXIAO") {
+            this.query.secGraClaSub = [];
+            this.query.secGraClaSubName = [];
+            data.list?.map((item) => {
+              let subList = item.subjectNames?.map((items) => {
+                return {
+                  value: items,
+                  label: items,
+                };
+              });
+              let children = item.classList.map((clazz) => {
+                return {
+                  value: clazz.id,
+                  label: clazz.className,
+                  id: clazz.id,
+                  children: [...subList],
+                };
+              });
+              this.gradeList.map((sec) => {
+                if (sec.gradeIds.includes(item.grade)) {
+                  sec.children[sec.gradeIds.indexOf(item.grade)].children = [
+                    ...children,
+                  ];
+                }
+              });
+            }) || [];
+            this.gradeList.map((sec) => {
+              sec.children.map((items) => {
+                if (this.query.secGraClaSub.length < 10) {
+                  this.query.secGraClaSub.push([sec.value, items.value]);
+                  this.query.secGraClaSubName.push(
+                    `${sec.label}/${items.label}`
+                  );
+                }
+              });
+            });
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySchool() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolList({
+        needSort: 1,
+        day: this.query.day,
+        startDay: this.query.startDay,
+        endDay: this.query.endDay,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.schoolList = [...data.list] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px 40px;
+}
+.disflex-b {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .btn-none {
+    border: none;
+    background: none;
+  }
+  .active {
+    transform: translateX(-999999px);
+  }
+}
+.item3 {
+  .sel-box {
+    flex: 1;
+  }
+}
+.sel-box {
+  display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  .btn {
+    margin-left: 100px;
+  }
+  .sel {
+    width: 8%;
+    min-width: 160px;
+    margin-right: 20px;
+  }
+  :deep(.el-input__inner) {
+    border: 1px solid #e2e2e2;
+    border-radius: 20px;
+    height: 32px;
+    line-height: 30px;
+  }
+
+  .el-input__icon {
+    line-height: 34px;
+  }
+  .el-date-editor.el-input,
+  .el-date-editor.el-input__inner {
+    width: 160px;
+  }
+
+  .p1 {
+    flex: 1;
+
+    .s1 {
+      margin-left: 36px;
+      cursor: pointer;
+      color: #7f7f7f;
+
+      &:hover {
+        color: #409eff;
+      }
+
+      &.active {
+        color: #667ffd;
+      }
+    }
+  }
+  .sel2 {
+    width: 240px;
+  }
+}
+.params-box {
+  display: flex;
+  flex-wrap: wrap;
+  .item {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    margin-bottom: 20px;
+    .s-txt {
+      width: 120px;
+    }
+    .btn {
+      font-size: 14px;
+    }
+    .disflex-b {
+      flex: 1;
+      padding-right: 100px;
+    }
+    &:hover {
+      .el-icon-delete {
+        display: block;
+      }
+    }
+    .el-icon-delete {
+      cursor: pointer;
+      display: none;
+      &:hover {
+        color: #667ffd;
+      }
+    }
+  }
+  .item2 {
+    width: 50%;
+  }
+  .item3 {
+    padding-right: 100px;
+  }
+}
+.chart-box {
+  height: 400px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/analysis/indexOld.vue b/src/views/basic/analysis/indexOld.vue
new file mode 100644
index 0000000..cb85746
--- /dev/null
+++ b/src/views/basic/analysis/indexOld.vue
@@ -0,0 +1,463 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>使用分析</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="answer-header">
+        <div class="sel-box">
+          <el-select
+            class="sel"
+            v-model="query.regionId"
+            placeholder="选择区域"
+            @change="_QueryData"
+            v-if="role == 'ROLE_JITUAN'"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+          <el-select
+            v-else
+            class="sel"
+            v-model="query.gradeName"
+            placeholder="选择年级"
+            @change="_QueryData"
+          >
+            <el-option
+              v-for="item in gradeList"
+              :key="item.label"
+              :label="item.label"
+              :value="item.label"
+            >
+            </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
+            >
+            <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+              >本季度</span
+            >
+          </p>
+          <el-button type="primary" round @click="_QueryData">筛选</el-button>
+        </div>
+      </div>
+      <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
+        <el-radio-group v-model="type" @change="changeType">
+          <el-radio-button :label="1">学校使用对比</el-radio-button>
+          <el-radio-button :label="2">学段使用对比</el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && !loading"
+          description="没有更多数据"
+        ></el-empty>
+        <el-table
+          v-else
+          :data="tableData"
+          :border="false"
+          style="width: 100%"
+          show-summary
+        >
+          <el-table-column align="center" fixed label="科目" prop="subjectName">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in dataList"
+            :key="index"
+            :label="
+              role == 'ROLE_JITUAN'
+                ? item.schoolName || item.gradeName
+                : item.gradeName || item.className
+            "
+          >
+            <template v-if="role == 'ROLE_JITUAN'">
+              <el-table-column
+                :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)"
+                label="课时数"
+                align="center"
+              >
+              <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template>
+              </el-table-column>
+              <el-table-column
+                :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)"
+                label="测练数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column>
+            </template>
+            <template v-else>
+              <el-table-column
+                :prop="'periodCount' + (item.grade || item.classId)"
+                label="课时数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
+              <el-table-column
+                :prop="'examCount' + (item.grade || item.classId)"
+                label="测练数"
+                align="center"
+              ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
+            </template>
+          </el-table-column>
+        </el-table>
+        <p class="down" v-if="tableData.length">
+          <el-button
+            @click="downExc"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile } from "@/utils";
+export default {
+  data() {
+    return {
+      loading: false,
+      exportLoading: false,
+      role: "",
+      date: "", //今天-本周-本月-本季度
+      type: 1, //集团管理员 表格切换
+      query: {
+        //搜索条件
+        regionId: "",
+        gradeName: "全部",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      gradeList: [],
+      tableData: [],
+      dataList: [],
+    };
+  },
+  created() {
+    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this._QueryGradeList();
+    this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    async downExc() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "gradeName") {
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.exportLoading = true;
+
+      const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
+      this.$request.exportSchoolContrast
+      const data = await exportUsageAnalysis({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("使用分析.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    changeType(val) {
+      if (val == 1) {
+        this.query.regionId = "";
+      }
+      this._QueryData(val);
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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 day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "gradeName") {
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.tableData = [];
+      const Contrast =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.usageAnalysis
+          : this.type == 1
+          ? this.$request.schoolContrast
+          : this.$request.gradeContrast;
+      const { data, status, info } = await Contrast({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let dataIdsList = [],
+          dataList = [];
+
+        data.map((item) => {
+          item.dataList.map((items) => {
+            if (this.role == "ROLE_JITUAN") {
+              if (this.type == 1) {
+                if (!dataIdsList.includes(items.schoolId)) {
+                  dataIdsList.push(items.schoolId);
+                  dataList.push(items);
+                }
+              } else if (this.type == 2) {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              }
+            } else {
+              if (this.query.gradeName == "全部") {
+                if (!dataIdsList.includes(items.grade)) {
+                  dataIdsList.push(items.grade);
+                  dataList.push(items);
+                }
+              } else {
+                if (!dataIdsList.includes(items.classId)) {
+                  dataIdsList.push(items.classId);
+                  dataList.push(items);
+                }
+              }
+            }
+          });
+        });
+        console.log(dataList);
+        this.tableData = data.map((item) => {
+          let params = {};
+          dataIdsList.map((ids, index) => {
+            item.dataList.map((items) => {
+              if (this.role == "ROLE_JITUAN") {
+                if (this.type == 1) {
+                  if (items.schoolId == ids) {
+                    params["examCount" + items.schoolId] = items.examCount;
+                    params["periodCount" + items.schoolId] = items.periodCount;
+                  }
+                } else if (this.type == 2) {
+                  if (items.grade == ids) {
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
+                  }
+                }
+              } else {
+                if (this.query.gradeName == "全部") {
+                  if (items.grade == ids) {
+                    params["examCount" + items.grade] = items.examCount;
+                    params["periodCount" + items.grade] = items.periodCount;
+                  }
+                } else if (this.query.gradeName) {
+                  if (items.classId == ids) {
+                    params["examCount" + items.classId] = items.examCount;
+                    params["periodCount" + items.classId] = items.periodCount;
+                  }
+                }
+              }
+            });
+          });
+          return {
+            subjectName: item.subjectName,
+            ...params,
+          };
+        });
+        this.dataList = dataList.sort((a, b) => {
+          return a.grade - b.grade;
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeList
+          : this.$request.regionList;
+      const { data, status, info } = await gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.grade,
+                  label: item.gradeName,
+                };
+                return gradeList;
+              }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
+          } else {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.id,
+                  label: item.regionName,
+                };
+                return gradeList;
+              }) || [];
+            this.gradeList.unshift({
+              value: "",
+              label: "全部",
+            });
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.table-box {
+  padding: 0 20px;
+}
+.radio-box {
+  padding: 0 20px 12px;
+}
+.down {
+  padding-top: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
new file mode 100644
index 0000000..a83b49f
--- /dev/null
+++ b/src/views/basic/ask/analysis.vue
@@ -0,0 +1,587 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>单课分析</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="tab-box">
+        <span
+          class="tab-item"
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="type == index + 1 ? 'active' : ''"
+          @click="setType(index + 1)"
+          >{{ item }}</span
+        >
+      </div>
+      <div v-loading="loading">
+        <div id="print-content">
+          <ul class="info" v-if="type == 1">
+            <li class="info-item">科目：{{ detail.subjectName }}</li>
+            <li class="info-item">课时：{{ detail.title }}</li>
+            <li class="info-item">上课时间：{{ detail.startTime }}</li>
+            <li class="info-item">下课时间：{{ detail.endTime }}</li>
+            <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
+            <li class="info-item">题目总数：{{ detail.questionNum }}</li>
+            <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
+            <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+            <li class="info-item">
+              总参与度：：{{ detail.participationRate }}%
+            </li>
+            <li class="info-item">
+              班级总正确率：{{ detail.classCorrectRate }}%
+            </li>
+            <li class="info-item">
+              已答总正确率：{{ detail.answerCorrectRate }}%
+            </li>
+            <li class="info-item">
+              反馈时长：{{ setDuration(detail.consumingDuration) }}
+            </li>
+          </ul>
+          <el-table
+            v-if="type == 1"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <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">
+              <template slot-scope="scoped">{{
+                setSubPro(scoped.row.questionType)
+              }}</template>
+            </el-table-column>
+            <el-table-column
+              prop="answeredNum"
+              label="答题人数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="correctAnswerNum"
+              label="答对人数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="班级参与度"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="classCorrectRate"
+              label="班级正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.classCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="answerCorrectRate"
+              label="已答正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="correctAnswer"
+              label="正确答案"
+              align="center"
+            >
+              <template slot-scope="scoped">{{
+                scoped.row.correctAnswer == 1
+                  ? "✓"
+                  : scoped.row.correctAnswer == 2
+                  ? "✗"
+                  : scoped.row.correctAnswer
+              }}</template></el-table-column
+            >
+            <el-table-column prop="fallible" label="干扰答案" align="center"
+              ><template slot-scope="scoped">{{
+                scoped.row.fallible == 1
+                  ? "✓"
+                  : scoped.row.fallible == 2
+                  ? "✗"
+                  : scoped.row.fallible
+              }}</template></el-table-column
+            >
+            <!-- <el-table-column prop="screenshot" label="题干" align="center">
+            <template slot-scope="scoped">
+              <el-image
+                v-if="scoped.row.screenshot"
+                style="width: 60px; height: 40px"
+                :src="scoped.row.screenshot"
+                :preview-src-list="[scoped.row.screenshot]"
+              >
+              </el-image><span v-else>暂无</span></template
+          ></el-table-column> -->
+          </el-table>
+          <el-table
+            v-if="type == 2"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="answerTimes"
+              label="答题次数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="consumingDuration"
+              label="答题耗时"
+              align="center"
+              ><template slot-scope="scoped">{{
+                setDuration(scoped.row.consumingDuration)
+              }}</template></el-table-column
+            >
+            <el-table-column
+              prop="correctAnswerTimes"
+              label="答对次数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="参与度"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="correctRate"
+              label="正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.correctRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="answerCorrectRate"
+              label="已答正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              v-for="(item, index) in optionsList"
+              :key="index"
+              :label="'Q' + (index + 1)"
+              align="center"
+              ><template slot-scope="scoped">
+                <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
+                  scoped.row["answer" + index]
+                }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table
+            v-if="type == 3"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="rushAnswerTimes"
+              label="抢答成功次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="rushAnswerCorrectTimes"
+              label="答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerTimes"
+              label="抽答次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerCorrectTimes"
+              label="抽答答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsNum"
+              label="参与得分"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsCorrectNum"
+              label="对错得分"
+              sortable
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-table
+            v-if="type == 4"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkInTime"
+              label="签到时间"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="makeUpTime"
+              label="补签时间"
+              sortable
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </div>
+        <div class="pagination-box" v-show="type == 1">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+        <p class="down">
+          <el-button
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            v-if="!this.$store.getters.code"
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+          <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
+        </p>
+      </div>
+    </div>
+
+    <set-answer
+      :diaVisible="dialogVisible"
+      :questionList="form.questionList"
+      :paperId="form.id"
+      @saveSuccess="handleSuccess"
+      @cancel="cancel"
+    />
+  </div>
+</template>
+
+<script>
+import { downloadFile, tablePrint } from "@/utils";
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      loading: false,
+      id: "",
+      type: 1,
+      form: {
+        id: "",
+        questionList: [],
+      },
+      tabList: ["答题表现", "学生问答表现", "学生互动表现", "签到明细"],
+      detail: {},
+      tableData: [],
+      optionsList: [],
+      page: 1,
+      size: 20,
+      total: 0,
+      status: 0,
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
+    this._QueryData();
+    this.periodDetail();
+  },
+  methods: {
+    print() {
+      tablePrint(
+        "print-content",
+        this.detail.title + "_" + this.tabList[this.type - 1]
+      );
+    },
+    setType(type) {
+      this.type = type;
+      this.page = 1;
+      this._QueryData();
+    },
+    setDuration(times) {
+      let m = parseInt(times / 1000 / 60);
+      let s = parseInt((times / 1000) % 60);
+      let ms = times;
+      let aTime;
+      if (times == 0) {
+        aTime = `0`;
+      } else {
+        if (m == 0 && s == 0) {
+          aTime = `${ms}毫秒`;
+        } else if (m == 0 && s != 0) {
+          aTime = `${s}秒`;
+        } else if (m != 0 && s != 0) {
+          aTime = `${m}分${s}秒`;
+        }
+      }
+      return aTime;
+    },
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+        default:
+          tit = "其他";
+      }
+      return tit;
+    },
+    cancel() {
+      this.dialogVisible = false;
+    },
+    handleSuccess() {
+      this.dialogVisible = false;
+      this._QueryData();
+    },
+    async edit() {
+      if (this.editLoading) return;
+      this.editLoading = true;
+      const { data, status, info } = await this.$request.periodQuestionList({
+        periodId: this.id,
+      });
+      this.editLoading = false;
+      if (status === 0) {
+        this.form.id = this.id;
+        this.form.questionList = (data.list && [...data.list]) || [];
+        this.dialogVisible = true;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async periodDetail() {
+      let { data, info, status } = await this.$request.periodDetail({
+        periodId: this.id,
+      });
+      if (status == 0) {
+        this.detail = { ...data };
+        this.detail.duration = this.detail.duration
+          ? (this.detail.duration / 60).toFixed(2)
+          : 0;
+        this.detail.consumingDuration = this.detail.consumingDuration
+          ? (this.detail.consumingDuration / 60).toFixed(2)
+          : 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      const queryData =
+        this.type == 1
+          ? this.$request.periodQuestionReport
+          : this.$request.periodStudentReport;
+      let query = {};
+      if (this.type == 2) {
+        query.type = 1;
+      } else if (this.type == 3) {
+        query.type = 2;
+      } else if (this.type == 4) {
+        query.type = 3;
+      }
+      this.loading = true;
+      let { data, info, status } = await queryData({
+        periodId: this.id,
+        page: this.page,
+        size: this.size,
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (this.type == 2) {
+          let optionsList = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            const detail = JSON.parse(item.detail);
+            if (detail.length > optionsList.length) {
+              optionsList = [...detail];
+            }
+            detail.map((items, index) => {
+              params["isRight" + index] = items.isRight;
+              params["answer" + index] =
+                items.answer == 1
+                  ? "✓"
+                  : items.answer == 2
+                  ? "✗"
+                  : items.answer;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.optionsList = [...optionsList];
+        } else {
+          this.tableData = data?.list.sort((a, b) => {
+            return a.questionIndex - b.questionIndex;
+          });
+        }
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      this.exportLoading = true;
+      const data = await this.$request.exportPeriodReport({
+        periodId: this.id,
+      });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(this.status?"随堂问-已归档单课时报表.xlsx":"随堂问-单课时报表.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.down {
+  padding-top: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.red {
+  color: #f30;
+}
+.page-content {
+  padding: 20px 20px 0;
+}
+.tab-box {
+  width: 800px;
+  margin: 0 auto 12px;
+  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;
+    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/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue
new file mode 100644
index 0000000..5e3d438
--- /dev/null
+++ b/src/views/basic/ask/archiving.vue
@@ -0,0 +1,1055 @@
+<template>
+  <div class="main" ref="main">
+    <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.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == 'ROLE_BANZHUREN' || role == 'ROLE_PERSONAL'"
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          @change="changeSub"
+        >
+          <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.subjectNames"
+          placeholder="选择科目"
+        >
+          <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
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? '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"
+        @change="tabChange"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div class="table-cont" v-loading="loading">
+        <div id="print-content">
+          <div v-show="tabIndex == 1">
+            <el-table
+              :data="tableData"
+              border
+              style="width: 100%"
+              @sort-change="sortChange"
+            >
+              <el-table-column
+                prop="title"
+                label="课时"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="questionNum"
+                label="题目总数"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="startTime"
+                label="上课时间"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="participationRate"
+                label="参与度"
+                sortable="custom"
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable="custom"
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
+                >
+              </el-table-column>
+              <el-table-column
+                prop="classCorrectRate"
+                label="班级总正确率"
+                sortable="custom"
+                align="center"
+                ><template slot-scope="scoped"
+                  >{{ scoped.row.classCorrectRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scoped">
+                  <el-tooltip effect="dark" content="详情" placement="top">
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-arrow-right"
+                      @click="linkTo(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-show="tabIndex == 2">
+            <el-table
+              id="print-content2"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="answerTimes"
+                label="累计答题次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="correctAnswerTimes"
+                label="累计答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="participationRate"
+                label="总参与度"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="correctRate"
+                label="总正确率"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.correctRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
+                >
+              </el-table-column>
+              <el-table-column
+                prop="classRank"
+                label="总正确率班排名"
+                sortable
+                align="center"
+              ></el-table-column>
+            </el-table>
+            <el-table
+              id="print-content2"
+              :max-height="tableMaxHeight"
+              v-else
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                align="center"
+                fixed
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                v-for="(item, index) in phaseOption"
+                :key="index"
+                :label="item"
+                align="center"
+              >
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总课时数' : '课时数'"
+                  :prop="'periodCount' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总出题数' : '出题数'"
+                  :prop="'questionNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总参与度' : '参与度'"
+                  :prop="'participationRate' + item"
+                  ><template slot-scope="scoped"
+                    >{{ scoped.row["participationRate" + item] }}%</template
+                  >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总正确率' : '正确率'"
+                  :prop="'correctRate' + item"
+                  ><template slot-scope="scoped"
+                    >{{ scoped.row["correctRate" + item] }}%</template
+                  >
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-show="tabIndex == 3">
+            <el-table
+              id="print-content3"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="rushAnswerTimes"
+                label="抢答成功次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="rushAnswerCorrectTimes"
+                label="抢答答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="checkAnswerTimes"
+                label="抽答次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="checkAnswerCorrectTimes"
+                label="抽答答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="interactionsNum"
+                label="参与得分"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="interactionsCorrectNum"
+                label="对错得分"
+                sortable
+                align="center"
+              ></el-table-column>
+            </el-table>
+            <el-table
+              id="print-content3"
+              v-else
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                v-for="(item, index) in phaseInter"
+                :key="index"
+                :label="item"
+                align="center"
+              >
+                <el-table-column
+                  align="center"
+                  v-if="index == 0"
+                  label="参与分"
+                  sortable
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="互动数"
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-if="index == 0"
+                  align="center"
+                  label="对错分"
+                  sortable
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="参与数"
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div class="pagination-box" v-show="tabIndex == 1">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+        <p
+          class="down"
+          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
+        >
+          <el-button
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            v-if="!this.$store.getters.code"
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      tableMaxHeight: 300,
+      code: "",
+      role: "",
+      loading: false,
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint(
+        "print-content",
+        "随堂问-已归档" + this.tabList[this.tabIndex - 1]
+      );
+    },
+    changeSub(val) {
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val);
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: obj.id,
+          status: 1,
+        },
+      });
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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;
+          that.tabIndex = 1;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    tabChange() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this.tableData = [];
+      this._QueryData();
+    },
+    sortChange(obj) {
+      this.custom.orderField =
+        obj.prop == "participationRate"
+          ? 1
+          : obj.prop == "answerCorrectRate"
+          ? 2
+          : 3;
+      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
+      this.page = 1;
+      this._QueryData();
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      await this._QuerySubjectList();
+      // await this.setDate(1);
+      this._QueryData();
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
+      if (this.tabIndex == 1) {
+        this.periodReportList();
+      } else if (this.tabIndex == 2) {
+        this.phaseAnswerReport();
+      } else if (this.tabIndex == 3) {
+        this.phaseInteractiveReport();
+      }
+    },
+    //分页查询课时报表列表
+    async periodReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      if (this.custom.orderField !== null) {
+        query = { ...query, ...this.custom };
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const { data, status, info } = await this.$request.periodReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段问答报表
+    async phaseAnswerReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const phaseAnswerReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseAnswerReport
+          : this.$request.phaseAnswerReport;
+
+      const { data, status, info } = await phaseAnswerReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          let tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["answerCorrectRate" + items.subjectName] =
+                items.answerCorrectRate;
+              params["correctRate" + items.subjectName] = items.correctRate;
+              params["participationRate" + items.subjectName] =
+                items.participationRate;
+              params["periodCount" + items.subjectName] = items.periodCount;
+              params["questionNum" + items.subjectName] = items.questionNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseOption = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
+        } else {
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
+        }
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段互动报表
+    async phaseInteractiveReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const phaseInteractiveReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseInteractiveReport
+          : this.$request.phaseInteractiveReport;
+
+      const { data, status, info } = await phaseInteractiveReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          let tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["interactionsNum" + items.subjectName] =
+                items.interactionsNum;
+              params["interactionsCorrectNum" + items.subjectName] =
+                items.interactionsCorrectNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseInter = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
+        } else {
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
+        }
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      this.exportLoading = true;
+      let exportData;
+      if (this.role == "ROLE_BANZHUREN") {
+        exportData =
+          this.tabIndex == 2
+            ? this.$request.cTExportPhaseAnswerReport
+            : this.$request.cTExportPhaseInteractiveReport;
+      } else {
+        exportData =
+          this.tabIndex == 2
+            ? this.$request.exportPhaseAnswerReport
+            : this.$request.exportPhaseInteractiveReport;
+      }
+      const data = await exportData({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("随堂问-已归档阶段报表.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+}
+.table-box {
+  margin: 0 20px;
+  padding: 16px;
+  background: #f8f8f8;
+  border-radius: 5px;
+  .table-cont {
+    min-height: 300px;
+  }
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+
+.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/basic/ask/index.vue b/src/views/basic/ask/index.vue
new file mode 100644
index 0000000..71b1053
--- /dev/null
+++ b/src/views/basic/ask/index.vue
@@ -0,0 +1,1119 @@
+<template>
+  <div class="main" ref="main">
+    <back-box>
+      <template slot="title">
+        <span>问答-数据报表</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code && gdClass"
+          effect="dark"
+          content="已归档试卷"
+          placement="bottom"
+        >
+          <el-button
+            type="primary"
+            icon="fa fa-archive"
+            size="mini"
+            plain
+            circle
+            @click="toArchiving"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == 'ROLE_BANZHUREN' || role == 'ROLE_PERSONAL'"
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          @change="changeSub"
+        >
+          <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.subjectNames"
+          placeholder="选择科目"
+        >
+          <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
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? '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"
+        @change="tabChange"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div class="table-cont" v-loading="loading">
+        <div id="print-content">
+          <div v-show="tabIndex == 1">
+            <el-table
+              :data="tableData"
+              border
+              style="width: 100%"
+              @sort-change="sortChange"
+            >
+              <el-table-column
+                prop="title"
+                label="课时"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="questionNum"
+                label="题目总数"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="startTime"
+                label="上课时间"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="participationRate"
+                label="参与度"
+                sortable="custom"
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable="custom"
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
+                >
+              </el-table-column>
+              <el-table-column
+                prop="classCorrectRate"
+                label="班级总正确率"
+                sortable="custom"
+                align="center"
+                ><template slot-scope="scoped"
+                  >{{ scoped.row.classCorrectRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scoped">
+                  <template v-if="scoped.row.answerNum == 0">
+                    <el-tooltip
+                      v-if="role == 'ROLE_JIAOSHI'"
+                      effect="dark"
+                      content="设置答案"
+                      placement="top"
+                    >
+                      <el-button
+                        type="primary"
+                        circle
+                        size="mini"
+                        icon="fa fa-file-text"
+                        @click="edit(scoped.row)"
+                      ></el-button>
+                    </el-tooltip>
+                    <template v-else>未设置答案</template>
+                  </template>
+                  <el-tooltip
+                    v-else
+                    effect="dark"
+                    content="详情"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-arrow-right"
+                      @click="linkTo(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-show="tabIndex == 2">
+            <el-table
+              id="print-content2"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="answerTimes"
+                label="累计答题次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="correctAnswerTimes"
+                label="累计答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="participationRate"
+                label="总参与度"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="correctRate"
+                label="总正确率"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.correctRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
+                >
+              </el-table-column>
+              <el-table-column
+                prop="classRank"
+                label="总正确率班排名"
+                sortable
+                align="center"
+              ></el-table-column>
+            </el-table>
+            <el-table
+              id="print-content2"
+              :max-height="tableMaxHeight"
+              v-else
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                align="center"
+                fixed
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                v-for="(item, index) in phaseOption"
+                :key="index"
+                :label="item"
+                align="center"
+              >
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总课时数' : '课时数'"
+                  :prop="'periodCount' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总出题数' : '出题数'"
+                  :prop="'questionNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总参与度' : '参与度'"
+                  :prop="'participationRate' + item"
+                  ><template slot-scope="scoped"
+                    >{{ scoped.row["participationRate" + item] }}%</template
+                  >
+                </el-table-column>
+                <el-table-column
+                  align="center"
+                  :label="index == 0 ? '总正确率' : '正确率'"
+                  :prop="'correctRate' + item"
+                  ><template slot-scope="scoped"
+                    >{{ scoped.row["correctRate" + item] }}%</template
+                  >
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-show="tabIndex == 3">
+            <el-table
+              id="print-content3"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="rushAnswerTimes"
+                label="抢答成功次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="rushAnswerCorrectTimes"
+                label="抢答答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="checkAnswerTimes"
+                label="抽答次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="checkAnswerCorrectTimes"
+                label="抽答答对次数"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="interactionsNum"
+                label="参与得分"
+                sortable
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="interactionsCorrectNum"
+                label="对错得分"
+                sortable
+                align="center"
+              ></el-table-column>
+            </el-table>
+            <el-table
+              id="print-content3"
+              v-else
+              :max-height="tableMaxHeight"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                v-for="(item, index) in phaseInter"
+                :key="index"
+                :label="item"
+                align="center"
+              >
+                <el-table-column
+                  align="center"
+                  v-if="index == 0"
+                  label="参与分"
+                  sortable
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="互动数"
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-if="index == 0"
+                  align="center"
+                  label="对错分"
+                  sortable
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="参与数"
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div class="pagination-box" v-show="tabIndex == 1">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+        <p
+          class="down"
+          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
+        >
+          <el-button
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            v-if="!this.$store.getters.code"
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, deepClone, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      gdClass: 0, //已归档班级数量
+      tableMaxHeight: 300,
+      code: "",
+      role: "",
+      loading: false,
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
+    this._QueryClassList2();
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      that._QueryClassList2();
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+    toArchiving() {
+      this.$router.push({
+        path: "/askArchiving",
+      });
+    },
+    print() {
+      tablePrint("print-content", "随堂问-" + this.tabList[this.tabIndex - 1]);
+    },
+    changeSub(val) {
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val);
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: obj.id,
+        },
+      });
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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;
+          that.tabIndex = 1;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    async edit(item) {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 3,
+        },
+      });
+    },
+    tabChange() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this.tableData = [];
+      this._QueryData();
+    },
+    sortChange(obj) {
+      this.custom.orderField =
+        obj.prop == "participationRate"
+          ? 1
+          : obj.prop == "answerCorrectRate"
+          ? 2
+          : 3;
+      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
+      this.page = 1;
+      this._QueryData();
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      await this._QuerySubjectList();
+      // await this.setDate(1);
+      this._QueryData();
+    },
+    async _QueryClassList2() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList();
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
+      if (this.tabIndex == 1) {
+        this.periodReportList();
+      } else if (this.tabIndex == 2) {
+        this.phaseAnswerReport();
+      } else if (this.tabIndex == 3) {
+        this.phaseInteractiveReport();
+      }
+    },
+    //分页查询课时报表列表
+    async periodReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      if (this.custom.orderField !== null) {
+        query = { ...query, ...this.custom };
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const { data, status, info } = await this.$request.periodReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段问答报表
+    async phaseAnswerReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const phaseAnswerReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseAnswerReport
+          : this.$request.phaseAnswerReport;
+
+      const { data, status, info } = await phaseAnswerReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          let tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["answerCorrectRate" + items.subjectName] =
+                items.answerCorrectRate;
+              params["correctRate" + items.subjectName] = items.correctRate;
+              params["participationRate" + items.subjectName] =
+                items.participationRate;
+              params["periodCount" + items.subjectName] = items.periodCount;
+              params["questionNum" + items.subjectName] = items.questionNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseOption = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
+        } else {
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
+        }
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段互动报表
+    async phaseInteractiveReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const phaseInteractiveReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseInteractiveReport
+          : this.$request.phaseInteractiveReport;
+
+      const { data, status, info } = await phaseInteractiveReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          let tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["interactionsNum" + items.subjectName] =
+                items.interactionsNum;
+              params["interactionsCorrectNum" + items.subjectName] =
+                items.interactionsCorrectNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseInter = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
+        } else {
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
+        }
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      this.exportLoading = true;
+      let exportData;
+      if (this.role == "ROLE_BANZHUREN") {
+        exportData =
+          this.tabIndex == 2
+            ? this.$request.cTExportPhaseAnswerReport
+            : this.$request.cTExportPhaseInteractiveReport;
+      } else {
+        exportData =
+          this.tabIndex == 2
+            ? this.$request.exportPhaseAnswerReport
+            : this.$request.exportPhaseInteractiveReport;
+      }
+      const data = await exportData({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("随堂问-阶段报表.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+}
+.table-box {
+  margin: 0 20px;
+  padding: 16px;
+  background: #f8f8f8;
+  border-radius: 5px;
+  .table-cont {
+    min-height: 300px;
+  }
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+
+.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/basic/card/index.vue b/src/views/basic/card/index.vue
new file mode 100644
index 0000000..d1b5553
--- /dev/null
+++ b/src/views/basic/card/index.vue
@@ -0,0 +1,345 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>发卡记录</span>
+      </template>
+    </back-box>
+
+    <div class="page-content">
+      <div class="answer-header">
+        <div class="sel-box">
+          <!-- <template v-if="role == 'ROLE_XUEXIAO'">
+            <el-cascader
+              @change="(page = 1), _QueryData(1)"
+              size="small"
+              class="sel"
+              clearable
+              placeholder="选择班级"
+              v-model="query.classId"
+              :options="gradeList"
+              :props="props"
+              :show-all-levels="false"
+            ></el-cascader>
+          </template> -->
+          <template v-if="role == 'ROLE_JITUAN'">
+            <el-select class="sel2" v-model="query.schoolId" placeholder="选择学校" @change="(page = 1), _QueryData(1)">
+              <el-option v-for="item in schoolList" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </template>
+          <el-select class="sel sel3" v-model="query.operationType" placeholder="选择类型"
+            @change="(page = 1), _QueryData(1)">
+            <el-option label="全部" value=""></el-option>
+            <el-option label="发卡" :value="0"></el-option>
+            <el-option label="补卡" :value="1"></el-option>
+            <el-option label="换班" :value="2"></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>
+          <template v-if="role == 'ROLE_XUEXIAO'">
+            <el-input placeholder="请输入学生姓名" v-model="query.studentName" class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(2)">
+              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(2)"></el-button>
+            </el-input>
+            <el-input placeholder="请输入学生学号" v-model="query.studentCode" class="input-with-select sel"
+              @keyup.enter.native="(page = 1), _QueryData(3)">
+              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(3)"></el-button>
+            </el-input>
+          </template>
+          <el-button type="primary" round @click="(page = 1), _QueryData(4)">筛选</el-button>
+        </div>
+      </div>
+      <el-empty :image-size="100" v-if="!tableData.length && !loading" description="暂无数据"></el-empty>
+      <div v-else class="table-box" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column align="center" label="答题器编码" prop="clickerSn"></el-table-column>
+          <el-table-column align="center" label="年级">
+            <template slot-scope="scope">
+              <span>{{ scope.row.classList[0]?.gradeName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="班级">
+            <template slot-scope="scope">
+              <span v-for="(item, index) in scope.row.classList" :key="item.classCode">{{ (index == 0 ? "" : "、") +
+                item.className }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="学生姓名" prop="studentName"></el-table-column>
+          <el-table-column align="center" label="学号" prop="studentCode"></el-table-column>
+          <el-table-column align="center" label="类型">
+            <template slot-scope="scope">
+              {{
+                scope.row.operationType == 0
+                ? "发卡"
+                : scope.row.operationType == 1
+                  ? "补卡"
+                  : "换班"
+              }}
+            </template></el-table-column>
+          <el-table-column align="center" label="操作次数" prop="operations"></el-table-column>
+          <el-table-column align="center" label="描述">
+            <template slot-scope="scope">
+              {{
+                scope.row.operationType == 0
+                ? "--"
+                : scope.row.reason == 0
+                  ? "丢失"
+                  : scope.row.reason == 1 ? "损坏" : "换班"
+              }}
+            </template></el-table-column>
+          <el-table-column align="center" label="操作时间" prop="modifiedTime" width="160"></el-table-column>
+        </el-table>
+        <div class="pagination-box">
+          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
+            @current-change="changePage" :current-page="page" :page-size="size">
+          </el-pagination>
+        </div>
+      </div>
+      <p class="down" v-if="tableData.length">
+        <el-button type="primary" plain round icon="fa fa-cloud-download" @click="downExl">导出报表</el-button>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { downloadFile, formatDate } from "utils";
+const defauleQuery = {
+  classId: "",
+  studentName: "",
+  studentCode: "",
+  operationType: "",
+  startDay: "",
+  endDay: "",
+};
+export default {
+  data() {
+    return {
+      role: "",
+      loading: false,
+      props: { multiple: false },
+      query: {
+        classId: "",
+        studentName: "",
+        studentCode: "",
+        operationType: "",
+        schoolId: "",
+        startDay: "",
+        endDay: "",
+      },
+      schoolList: [],
+      gradeList: [],
+      tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.loading = true;
+    if (this.role == "ROLE_XUEXIAO") {
+      this._QueryGradeList();
+    } else if (this.role == "ROLE_JITUAN") {
+      await this._QuerySchool();
+    }
+
+    this._QueryData();
+  },
+  methods: {
+    handleChangeTimeStart(val) {
+      if (this.query.endDay) {
+        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      console.log(status);
+      if (status === 0) {
+        if (!!data.list) {
+          this.gradeList =
+            data.list?.map((item) => {
+              let gradeList = {
+                value: item.grade,
+                label: item.gradeName,
+              };
+              gradeList.children =
+                item.classList?.map((items) => {
+                  return {
+                    value: items.id,
+                    label: items.className,
+                  };
+                }) || [];
+              return gradeList;
+            }) || [];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(4);
+    },
+    async _QuerySchool() {
+      const { data, status, info } = await this.$request.schoolList();
+      if (status === 0) {
+        this.schoolList =
+          data.list?.map((item) => {
+            return {
+              label: item.schoolName,
+              value: item.id,
+            };
+          }) || [];
+        this.schoolList.unshift({
+          label: "全部",
+          value: "",
+        });
+        this.query.schoolId = this.schoolList[0].value || "";
+      } else {
+        this.$message.error(info);
+      }
+    },
+    serQuery(type) {
+      let query = {};
+      if (this.role == "ROLE_XUEXIAO") {
+        delete query.schoolId;
+        if (type == 1) {
+          this.query.studentCode = "";
+          this.query.studentName = "";
+          query = { ...this.query };
+          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+        } else if (type == 2) {
+          this.query = { ...defauleQuery, studentName: this.query.studentName };
+          query = { ...this.query };
+        } else if (type == 3) {
+          this.query = { ...defauleQuery, studentCode: this.query.studentCode };
+          query = { ...this.query };
+        } else {
+          query = { ...this.query };
+          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+        }
+      } else if (this.role == "ROLE_JITUAN") {
+        query.schoolId = this.query.schoolId;
+        query.operationType = this.query.operationType;
+        query.startDay = this.query.startDay;
+        query.endDay = this.query.endDay;
+      }
+      return query;
+    },
+    async _QueryData(type) {
+      if (this.role == "ROLE_XUEXIAO") {
+        if (type == 2) {
+          if (!this.query.studentName) {
+            this.$message.warning("输入学生姓名～");
+            return;
+          }
+        } else if (type == 3) {
+          if (!this.query.studentCode) {
+            this.$message.warning("输入学生学号～");
+            return;
+          }
+        }
+      }
+      let query = this.serQuery(type);
+      this.loading = true;
+      const { data, status, info } = await this.$request.cardList({
+        ...query,
+        page: this.page,
+        size: 20,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.tableData = data.list || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      let query = { ...this.query };
+      if (this.role == "ROLE_XUEXIAO") {
+        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+        delete query.schoolId;
+      } else if (this.role == "ROLE_JITUAN") {
+        delete query.classId;
+        delete query.studentName;
+        delete query.studentCode;
+      }
+      //报表导出
+      if (this.exportLoading == true) return;
+      this.exportLoading = true;
+      const data = await this.$request.exportClickersLog({
+        ...query,
+      });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let date = formatDate(new Date().getTime(), "yyyy-MM-dd");
+        let name = `发卡记录_${date}.xlsx`;
+        downloadFile(name, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.table-box {
+  padding: 0 20px;
+}
+
+.down {
+  padding: 16px 20px;
+}
+
+.answer-header {
+  .sel-box {
+    .sel {
+      margin-right: 20px;
+      min-width: 120px;
+    }
+
+    .sel2 {
+      width: 200px;
+      margin-right: 20px;
+    }
+
+    .sel3 {
+      min-width: 80px;
+    }
+
+    .d1 {
+      margin-right: 20px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue
new file mode 100644
index 0000000..18cb7b1
--- /dev/null
+++ b/src/views/basic/dataSync/index.vue
@@ -0,0 +1,188 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>数据同步</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="down-item">
+        <p class="h-title">从U盘上传</p>
+        <p class="txt">
+          本功能帮助无法上网的授课端软件，将本地数据同步到云平台。
+        </p>
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          :action="url"
+          :multiple="false"
+          :with-credentials="true"
+          :limit="1"
+          :on-change="change"
+          :on-success="upSuccess"
+          :on-error="upError"
+        >
+          <div class="btn-box">
+            <i class="fa fa-cloud-upload"></i>
+            <el-button type="primary" round>选择文件</el-button>
+          </div>
+        </el-upload>
+      </div>
+
+      <div class="down-item">
+        <p class="h-title">数据导出至U盘</p>
+        <p class="txt">本功能将云平台的数据导出到U盘。</p>
+        <div class="btn-box btn-box2" v-loading="downLoading">
+          <i class="fa fa-cloud-download" @click="downloadFile"></i>
+          <el-button type="primary" round @click="downloadFile"
+            >文件下载</el-button
+          >
+        </div>
+      </div>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="" :visible.sync="dialogVisible" width="300" center>
+      <el-result icon="success" title="上传成功"> </el-result>
+      <el-descriptions title="" :column="1">
+        <el-descriptions-item label="导入答题卡数量">{{tipData.paperNum}}</el-descriptions-item>
+        <el-descriptions-item label="导入随堂问报表数量">{{tipData.periodNum}}</el-descriptions-item>
+        <el-descriptions-item label="导入即时测报表数量">{{tipData.examNum}}</el-descriptions-item>
+      </el-descriptions>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogVisible = false"
+          >确 定</el-button
+        >
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { formatDate } from "@/utils";
+export default {
+  data() {
+    return {
+      downLoading: false,
+      url: "/api_html/teaching/importData",
+      file: {},
+      dialogVisible: false,
+      tipData: {
+        paperNum: 0,
+        periodNum: 0,
+        examNum: 0,
+      },
+    };
+  },
+  methods: {
+    async downloadFile() {
+      if (this.downLoading) return;
+      this.downLoading = true;
+      const data = await this.$request.exportData();
+      this.downLoading = false;
+      console.log(data);
+      if (data) {
+        let blob = new Blob([data], { type: "application/octet-stream" });
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        document.body.appendChild(link);
+        link.download =
+          this.$store.getters.info.name +
+          formatDate(new Date(), "yyyy_MM_dd_hh_mm_ss") +
+          "文件.json";
+        link.href = url;
+        link.click();
+        document.body.removeChild(link);
+        URL.revokeObjectURL(url);
+      } else {
+        this.$message.error("下载失败，请重试");
+      }
+    },
+    async submitUpload() {
+      this.$refs.upload.submit();
+
+      // const formData = new FormData()
+      // formData.append('id',this.componentId)
+      // formData.append('file',new File(this.file.raw))
+      // let {status,info} = await uploadExcel(formData);
+      // if(status===0){
+      //   this.$message.success(info);
+      //   this.$emit("upSuccess")
+      // } else {
+      //   this.$message.error(info);
+      // }
+    },
+    upSuccess(res) {
+      if (res && res.status == 0) {
+        this.tipData = res.data
+        this.dialogVisible = true
+      } else {
+        this.$message.error(res.info);
+      }
+    },
+    upError(res) {
+      debugger;
+      if (res && res.status == 0) {
+        this.$message.error("上传失败");
+      } else {
+        this.$message.error(res.message);
+      }
+    },
+    change(file) {
+      this.file = file;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 50px;
+  display: flex;
+  justify-content: center;
+  .down-item {
+    width: 400px;
+    height:330px;
+    border-radius: 20px;
+    margin: 20px;
+    background: #f8f8f8;
+    box-shadow: 2px 2px 5px #ccc;
+    .h-title {
+      font-size: 16px;
+      color: #667ffd;
+      padding: 16px 0 16px 12px;
+    }
+    .txt {
+      height: 80px;
+      padding: 0 20px;
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 24px;
+      text-align: center;
+    }
+  }
+  .upload-demo {
+    padding:0 20px 20px;
+    :deep(.el-upload--text){
+      display: block;
+    }
+  }
+  :deep(.el-upload) {
+    margin: 0 auto;
+  }
+  .btn-box {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: 10px;
+    .fa {
+      font-size: 80px;
+      color: #aeaeae;
+      padding-bottom: 10px;
+      cursor: pointer;
+    }
+  }
+  .btn-box {
+    width: 100%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/device/error.vue b/src/views/basic/device/error.vue
new file mode 100644
index 0000000..a2e0579
--- /dev/null
+++ b/src/views/basic/device/error.vue
@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>异常设备信息</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column
+          prop="sn"
+          label="设备编码"
+          align="center"
+          width="160"
+        ></el-table-column>
+        <el-table-column prop="deviceType" label="设备类型" align="center">
+          <template slot-scope="scoped">
+            {{
+              scoped.row.deviceType == 1
+                ? "基站"
+                : scoped.row.deviceType == 2
+                ? "键盘"
+                : "PC"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="异常类型" align="center">
+          <template slot-scope="scoped">
+            {{
+              scoped.row.status == 0
+                ? "正常"
+                : scoped.row.status == 1
+                ? "低电量异常"
+                : scoped.row.status == 2
+                ? "配对码异常"
+                : "关联班级异常"
+            }}
+          </template></el-table-column
+        >
+        <template v-if="type == 1">
+          <el-table-column
+            prop="pairingCode"
+            label="配对码"
+            align="center"
+          ></el-table-column>
+          <el-table-column label="关联班级" align="center">
+            <template slot-scope="scoped">
+              <p v-for="(item, index) in scoped.row.classList" :key="index">
+                {{ item.className }}
+              </p>
+            </template>
+          </el-table-column>
+        </template>
+        <el-table-column
+          prop="modifiedTime"
+          label="最早发现时间"
+          align="center"
+          width="200"
+        ></el-table-column>
+        <el-table-column
+          v-if="type == 2"
+          prop="answerTimes"
+          label="答题次数"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="abnormalRemark"
+          label="状态"
+          align="center"
+        ></el-table-column>
+        <el-table-column prop="abnormalSource" label="信息来源" align="center">
+          <template slot-scope="scoped">
+            {{
+              scoped.row.abnormalSource == 0
+                ? "无"
+                : scoped.row.abnormalSource == 1
+                ? "云平台"
+                : scoped.row.abnormalSource == 2
+                ? "授课端"
+                : scoped.row.abnormalSource == 3
+                ? "出厂工具"
+                : "发卡工具"
+            }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100"
+          ><template slot-scope="scoped">
+            <el-link
+              :disabled="!!scoped.row.abnormalRemark"
+              @click="openDia(scoped.row)"
+              >处理</el-link
+            ></template
+          ></el-table-column
+        >
+      </el-table>
+      <div class="pagination-box">
+        <el-pagination
+          small=""
+          layout="total,prev, pager, next"
+          :hide-on-single-page="true"
+          :total="total"
+          @current-change="changePage"
+          :current-page="page"
+          :page-size="size"
+        >
+        </el-pagination>
+      </div>
+    </div>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="备注"
+      :visible.sync="diaNotes"
+      width="400"
+    >
+      <el-form ref="formClass" label-width="100px">
+        <el-form-item label="处理备注：" prop="studentName">
+          <el-col :span="12">
+            <el-input
+              type="textarea"
+              :rows="3"
+              maxlength="200"
+              v-model="ntoes"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="_SaveNotes" type="primary">确 定</el-button>
+        <el-button @click="diaNotes = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      role: "",
+      loading: false,
+      diaNotes: false,
+      ntoes: "",
+      deviceId: "",
+      type: 1,
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  created() {
+    this.type = this.$route.query.type;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this._QueryData();
+  },
+  methods: {
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    openDia(obj) {
+      this.diaNotes = true;
+      this.deviceId = obj.id;
+      this.ntoes = "";
+    },
+    async _SaveNotes() {
+      if (!this.ntoes.trim()) {
+        this.$message.warning("请填写备注内容！");
+        return;
+      }
+      const { status, info } = await this.$request.abnormalRemark({
+        deviceId: this.deviceId,
+        abnormalRemark: this.ntoes,
+      });
+      if (status === 0) {
+        this.ntoes = "";
+        this.diaNotes = false;
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      const deviceList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.deviceList
+          : this.$request.tenantDeviceList;
+      this.tableData = [];
+      const { data, status, info } = await deviceList({
+        status: 1,
+        deviceType: this.type,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue
new file mode 100644
index 0000000..07fbf45
--- /dev/null
+++ b/src/views/basic/device/index.vue
@@ -0,0 +1,1355 @@
+<template>
+  <div ref="main" class="page-content">
+    <back-box>
+      <template slot="title">
+        <span>设备管理</span>
+      </template>
+      <template slot="btns">
+        <template v-if="tableData.length">
+          <el-tooltip effect="dark" content="设备导出" placement="bottom">
+            <el-button
+              type="primary"
+              icon="fa fa-cloud-download"
+              size="mini"
+              plain
+              circle
+              @click="downExl"
+            ></el-button>
+          </el-tooltip>
+        </template>
+        <template v-if="role == 'ROLE_XUEXIAO' && type == 1">
+          <el-tooltip effect="dark" content="设备导入" placement="bottom">
+            <el-button
+              type="primary"
+              icon="el-icon-upload2"
+              size="mini"
+              plain
+              circle
+              @click="diaUp = true"
+            ></el-button>
+          </el-tooltip>
+          <el-tooltip effect="dark" content="添加基站" placement="bottom">
+            <el-button
+              type="primary"
+              icon="el-icon-receiving"
+              size="mini"
+              plain
+              circle
+              @click="addDev"
+            ></el-button> </el-tooltip
+        ></template>
+      </template>
+    </back-box>
+    <div>
+      <div class="tab-box">
+        <el-radio-group v-model="type">
+          <el-radio-button :label="1">基站管理</el-radio-button>
+          <el-radio-button :label="2">答题器管理</el-radio-button>
+          <el-radio-button :label="3">授课端管理</el-radio-button>
+        </el-radio-group>
+      </div>
+      <p
+        v-show="(type == 1 && stationCount) || (type == 2 && clickerCount)"
+        class="error-tips"
+      >
+        有{{
+          type == 1 ? stationCount : clickerCount
+        }}条设备异常信息，<router-link
+          :to="{ path: '/deviceError', query: { type: type } }"
+          >点击查看&gt;&gt;</router-link
+        >
+      </p>
+      <div class="content">
+        <div v-show="type == 1">
+          <div class="chart-box" v-if="count">
+            <div class="device-num">
+              <p class="p1">{{ count }}</p>
+              <p class="p2">基站数量</p>
+            </div>
+            <div class="chart">
+              <pie-chart
+                id="pieChart"
+                :params="chartData"
+                @clickPieChart="clickPieChart"
+              ></pie-chart>
+            </div>
+          </div>
+          <div class="table-box">
+            <div class="answer-header">
+              <div class="sel-box">
+                <el-cascader
+                  size="small"
+                  class="sel sel2"
+                  clearable
+                  placeholder="选择班级"
+                  v-model="query.classId"
+                  :options="gradeList"
+                  :props="props"
+                  collapse-tags
+                  :show-all-levels="false"
+                ></el-cascader>
+                <el-select
+                  class="sel"
+                  v-model="query.onlineStatus"
+                  placeholder="选择状态"
+                  @change="_QueryData(true)"
+                >
+                  <el-option
+                    v-for="item in statusList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-input
+                  placeholder="请输入设备编码"
+                  v-model="query.sn"
+                  class="input-with-select"
+                  clearable
+                  @keyup.enter.native="_QueryData(true)"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="_QueryData(true)"
+                  ></el-button>
+                </el-input>
+                <el-button class="serach-box" round @click="_QueryData(true)"
+                  >筛选</el-button
+                >
+              </div>
+            </div>
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
+            <el-table v-else :data="tableData" border style="width: 100%">
+              <el-table-column
+                prop="sn"
+                label="设备编码"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="frequency"
+                label="频点"
+                align="center"
+                width="60"
+              ></el-table-column>
+              <el-table-column
+                prop="pairingCode"
+                label="配对码"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
+                prop="roomName"
+                label="所在教室"
+                align="center"
+              ></el-table-column>
+              <el-table-column label="关联班级" align="center">
+                <template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.className }}
+                  </p>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="otaVersionName"
+                label="固件版本号"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="onlineTime"
+                label="最近上报"
+                align="center"
+                width="160"
+              ></el-table-column>
+              <el-table-column
+                prop="createdTime"
+                label="创建时间"
+                align="center"
+                width="160"
+              ></el-table-column>
+              <el-table-column label="状态" align="center" width="60"
+                ><template slot-scope="scope">
+                  {{
+                    scope.row.onlineStatus == 1
+                      ? "在线"
+                      : scope.row.onlineStatus == 2
+                      ? "异常"
+                      : "离线"
+                  }}
+                </template></el-table-column
+              >
+              <el-table-column label="操作" align="center"
+                ><template slot-scope="scoped">
+                  <el-tooltip
+                    effect="dark"
+                    v-if="role != 'ROLE_JITUAN'"
+                    content="修改基站"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-edit"
+                      @click="edit(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip effect="dark" content="日志" placement="top">
+                    <el-button
+                      type="warning"
+                      circle
+                      size="mini"
+                      icon="fa fa-eye"
+                      @click="linkTo(scoped.row, 1)"
+                    ></el-button>
+                  </el-tooltip> </template
+              ></el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div v-show="type == 2">
+          <div class="chart-box" v-if="count">
+            <div class="device-num">
+              <p class="p1">{{ count }}</p>
+              <p class="p2">答题器数量</p>
+            </div>
+            <div class="chart">
+              <scatter-chart
+                id="scatterChart"
+                :params="chartData2"
+                @clickScatterChart="clickScatterChart"
+              ></scatter-chart>
+            </div>
+          </div>
+          <div class="table-box">
+            <div class="answer-header">
+              <div class="sel-box">
+                <el-cascader
+                  size="small"
+                  class="sel sel2"
+                  clearable
+                  placeholder="选择班级"
+                  v-model="query.classId"
+                  :options="gradeList"
+                  :props="props"
+                  collapse-tags
+                  :show-all-levels="false"
+                ></el-cascader>
+                <el-select
+                  class="sel"
+                  v-model="query.type"
+                  placeholder="选择状态"
+                  @change="_QueryData(true)"
+                >
+                  <el-option
+                    v-for="item in typeList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-input
+                  placeholder="请输入设备编码"
+                  v-model="query.sn"
+                  class="input-with-select"
+                  clearable
+                  @input.native="query.studentName = ''"
+                  @keyup.enter.native="_QueryData(true)"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="_QueryData(true)"
+                  ></el-button>
+                </el-input>
+                <el-input
+                  placeholder="学生姓名"
+                  v-model="query.studentName"
+                  class="input-with-select"
+                  clearable
+                  @input.native="query.sn = ''"
+                  @keyup.enter.native="_QueryData(true)"
+                >
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="_QueryData(true)"
+                  ></el-button>
+                </el-input>
+                <el-button class="serach-box" round @click="_QueryData(true)"
+                  >筛选</el-button
+                >
+              </div>
+            </div>
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
+            <el-table v-else :data="tableData" border style="width: 100%">
+              <el-table-column
+                prop="sn"
+                label="设备编码"
+                align="center"
+              ></el-table-column>
+              <el-table-column label="学生信息" align="center"
+                ><template slot-scope="scoped"
+                  ><p
+                    v-for="(item, index) in scoped.row.studentList"
+                    :key="index"
+                  >
+                    {{ item.studentName }}
+                  </p></template
+                ></el-table-column
+              >
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                width="120"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
+                prop="class"
+                label="关联班级"
+                align="center"
+                width="160"
+              >
+                <template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.className }}
+                  </p>
+                </template></el-table-column
+              >
+              <!-- <el-table-column
+                prop="pairingCode"
+                label="配对码"
+                align="center"
+              ></el-table-column> -->
+              <!-- <el-table-column
+                prop="answerTimes"
+                label="答题次数"
+                align="center"
+              ></el-table-column> -->
+              <el-table-column
+                prop="latestReportTime"
+                label="最后答题时间"
+                align="center"
+                width="160"
+              ></el-table-column>
+              <el-table-column label="操作" align="center" width="80"
+                ><template slot-scope="scoped">
+                  <el-tooltip effect="dark" content="日志" placement="top">
+                    <el-button
+                      type="warning"
+                      circle
+                      size="mini"
+                      icon="fa fa-eye"
+                      @click="linkTo(scoped.row, 2)"
+                    ></el-button>
+                  </el-tooltip> </template
+              ></el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div v-show="type == 3">
+          <div class="table-box">
+            <div class="answer-header">
+              <div class="sel-box">
+                <el-cascader
+                  size="small"
+                  class="sel sel2"
+                  clearable
+                  placeholder="选择班级"
+                  v-model="query.classId"
+                  :options="gradeList"
+                  :props="props"
+                  collapse-tags
+                  :show-all-levels="false"
+                  @change="_QueryData(false)"
+                ></el-cascader>
+                <span class="sel"
+                  >共选择{{ selectionTabIds.length }}个授课端</span
+                >
+                <el-button plan round @click="autoUpDate(false)"
+                  >开启自动更新</el-button
+                >
+                <el-button plan round @click="stopUpdate(false)"
+                  >停止自动更新</el-button
+                >
+              </div>
+              <p class="upgrade-all" v-if="this.role == 'ROLE_XUEXIAO'">
+                <span>全校更新：</span>
+                <el-switch v-model="upgradeFlag" @change="changeUpdateBySchool">
+                </el-switch>
+              </p>
+            </div>
+            <p class="loading" v-if="!tableData.length && loading">
+              加载中<i class="el-icon-loading"></i>
+            </p>
+            <el-table
+              v-else
+              ref="multipleTable"
+              :data="tableData"
+              border
+              style="width: 100%"
+              @selection-change="handleSelectionChange"
+            >
+              <el-table-column type="selection" width="55"></el-table-column>
+              <el-table-column
+                prop="sn"
+                label="设备编码"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="class"
+                label="关联班级"
+                align="center"
+                width="100"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.className }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                width="80"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
+                prop="lastUpdateTime"
+                label="最近更新"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="osInfo"
+                label="软件系统"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="hardwareInfo"
+                label="硬件环境"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="otaVersionName"
+                label="版本号"
+                align="center"
+                width="80"
+              ></el-table-column>
+              <el-table-column label="状态" align="center" width="80"
+                ><template slot-scope="scope">
+                  {{
+                    scope.row.onlineStatus == 1
+                      ? "在线"
+                      : scope.row.onlineStatus == 2
+                      ? "异常"
+                      : "离线"
+                  }}
+                </template></el-table-column
+              >
+              <el-table-column label="自动更新" align="center" width="100"
+                ><template slot-scope="scoped">
+                  <el-switch
+                    v-model="scoped.row.upgradeFlag"
+                    @change="changeUpdate($event, scoped.row, this)"
+                  >
+                  </el-switch> </template
+              ></el-table-column>
+            </el-table>
+          </div>
+        </div>
+        <div class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="设备导入" :visible.sync="diaUp" width="400">
+      <up-load :url="url" @upSuccess="upSuccess" fileName="设备信息">
+        <p class="down-txt" slot="down">
+          通过Excel名单导入设备，需要提供设备编码，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :close-on-click-modal="false"
+      :title="isAdd ? '添加基站' : '修改基站'"
+      :visible.sync="diaAnswerEqu"
+      width="400"
+    >
+      <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
+        <el-form-item label="设备编码：" prop="sn">
+          <el-col :span="16"
+            ><el-input
+              type="text"
+              placeholder="输入设备编码"
+              v-model.trim="form.sn"
+              maxlength="30"
+              size="45"
+              show-word-limit
+              :disabled="!isAdd"
+            >
+            </el-input
+          ></el-col>
+        </el-form-item>
+        <el-form-item label="频点：" prop="frequency">
+          <el-col :span="16"
+            ><el-input
+              type="text"
+              placeholder="输入频点"
+              v-model.trim="form.frequency"
+              maxlength="30"
+              size="45"
+              show-word-limit
+            >
+            </el-input
+          ></el-col>
+        </el-form-item>
+        <el-form-item label="配对码：" prop="pairingCode">
+          <el-col :span="16"
+            ><el-input
+              type="text"
+              placeholder="输入配对码"
+              v-model.trim="form.pairingCode"
+              maxlength="30"
+              size="45"
+              show-word-limit
+            >
+            </el-input
+          ></el-col>
+        </el-form-item>
+        <el-form-item label="选择班级：" prop="classIds">
+          <el-col :span="16">
+            <el-cascader
+              class="sel"
+              clearable
+              v-model="form.classIds"
+              :options="gradeList"
+              :show-all-levels="false"
+            ></el-cascader>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="所在教室：">
+          <el-col :span="16"
+            ><el-input
+              type="text"
+              placeholder="输入所在教室"
+              v-model.trim="form.roomName"
+              maxlength="30"
+              size="45"
+              show-word-limit
+            >
+            </el-input
+          ></el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="setAnswerEqu">确 定</el-button>
+        <el-button @click="diaAnswerEqu = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import pieChart from "@/components/charts/pieChart";
+import scatterChart from "@/components/charts/scatterChart";
+import _ from "lodash";
+import { downloadFile, getBlob, formatGradeNameClass } from "@/utils";
+import api from "@/api/apis/apis";
+export default {
+  components: { pieChart, scatterChart },
+  watch: {
+    type: function (val) {
+      this.page = 1;
+      this.total = 0;
+      this.count = 0;
+      this.query.classId = [];
+      this.query.onlineStatus = "";
+      this.query.sn = "";
+      this.query.studentName = "";
+      this.query.type = "";
+      if (val == 1) {
+        this.stationReport();
+      } else if (val == 2) {
+        this.keyboardReport();
+      }
+      this._QueryData();
+    },
+  },
+  data() {
+    return {
+      code: "",
+      role: "",
+      loading: false,
+      exportLoading: false,
+      isAdd: false, //添加还是修改基站
+      url: "/api_html/school/manager/importStation",
+      diaUp: false,
+      diaAnswerEqu: false,
+      gradeList: [], //年级列表
+      schoolAll: [], //所有学校刘表
+      school: {}, //校园账号所属学校信息
+      props: {
+        multiple: true,
+        checkStrictly: true,
+      },
+      type: 1,
+      query: {
+        classId: [],
+        onlineStatus: "",
+        sn: "",
+        type: "",
+        studentName: "",
+      },
+      statusList: [
+        { label: "全部", value: "" },
+        { label: "离线", value: 0 },
+        { label: "在线", value: 1 },
+        { label: "异常", value: 2 },
+      ],
+      typeList: [
+        { label: "全部", value: 0 },
+        { label: "1日内", value: 1 },
+        { label: "3日内", value: 2 },
+        { label: "7日内", value: 3 },
+        { label: "1月内", value: 4 },
+        { label: "3月内", value: 5 },
+        { label: "3月以上", value: 6 },
+      ],
+      form: {
+        //修改/添加基站信息
+        deviceId: "",
+        sn: "",
+        frequency: "",
+        pairingCode: "",
+        classIds: [],
+        roomName: "",
+      },
+      formRules: {
+        sn: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
+        frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
+        pairingCode: [
+          { required: true, message: "请输入配对码", trigger: "blur" },
+        ],
+        // classIds: [{ required: true, message: "请选择班级", trigger: "blur" }],
+      },
+      tableData: [],
+      total: 0,
+      count: 0,
+      chartData: [],
+      chartData2: [],
+      selectionTabIds: [], //已选择授课段
+      page: 1,
+      size: 20,
+      isBack: false, //是否是日志页面回来
+      upgradeFlag: false,
+      stationCount: 0, //异常基站数量
+      clickerCount: 0, //异常答题器数量
+    };
+  },
+  created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this._QueryErrorTotal();
+    if (this.role == "ROLE_JITUAN") {
+      (this.props.lazy = true),
+        (this.props.lazyLoad = function (node, resolve) {
+          const { level } = node;
+          if (level == 2) {
+            api
+              .tenantClassList({
+                schoolId: node.data.value,
+              })
+              .then((res) => {
+                let children = formatGradeNameClass(res.data?.list).sort(
+                  (a, b) => {
+                    return a.grade - b.grade;
+                  }
+                );
+                const nodes = [...children];
+                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+                resolve(nodes);
+              });
+          } else {
+            resolve(node);
+          }
+        });
+    }
+    if (this.role == "ROLE_XUEXIAO") {
+      this._QueryDataSchool();
+    }
+    this._QueryGradeList();
+    if (this.role == "ROLE_JITUAN") {
+      this.showSchool();
+    }
+  },
+  activated() {
+    const that = this;
+    this.isBack = this.$route.query.back ? this.$route.query.back : false;
+    if (!this.isBack) {
+      that.type = 1;
+      that.page = 1;
+      that.total = 0;
+      that.count = 0;
+      that.query.classId = [];
+      that.query.onlineStatus = "";
+      that.query.sn = "";
+      that.query.type = "";
+      if (this.role == "ROLE_XUEXIAO") {
+        this._QueryDataSchool();
+      }
+      this._QueryGradeList();
+      that.stationReport();
+      that._QueryData();
+    }
+  },
+  methods: {
+    upSuccess(res) {
+      //导入成功
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 5000,
+      });
+      this.diaUp = false;
+      this.page = 1;
+      this._QueryData();
+    },
+    edit(obj) {
+      //修改设备
+      this.isAdd = false;
+      for (let key in this.form) {
+        if (key == "classIds") {
+          this.form[key] = obj.classList.length
+            ? [obj.classList[0].gradeName, obj.classList[0].classId]
+            : [];
+        } else {
+          this.form[key] = obj[key];
+        }
+      }
+      delete this.form.schoolId;
+      this.form.deviceId = obj.id;
+      this.diaAnswerEqu = true;
+    },
+    linkTo(obj, type) {
+      this.$router.push({
+        path: "/deviceLog",
+        query: {
+          id: obj.id,
+          type: type,
+        },
+      });
+    },
+    clickPieChart(obj) {
+      this.query.onlineStatus =
+        obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2;
+      this.query.sn = "";
+      this.query.classId = [];
+      this.page = 1;
+      this._QueryData(false);
+    },
+    clickScatterChart(obj) {
+      this.query.type =
+        obj.name == "1日内"
+          ? 1
+          : obj.name == "3日内"
+          ? 2
+          : obj.name == "7日内"
+          ? 3
+          : obj.name == "1月内"
+          ? 4
+          : obj.name == "3月内"
+          ? 5
+          : 6;
+      this.query.sn = "";
+      this.query.classId = [];
+      this.page = 1;
+      this._QueryData(false);
+    },
+    handleSelectionChange(val) {
+      console.log(val);
+      this.selectionTabIds = val.map((item) => {
+        return item.id;
+      });
+    },
+    changeUpdateBySchool: _.debounce(function (event) {
+      this._ModifyUpgradeFlagBySchool();
+    }, 800),
+    changeUpdate: _.debounce(function (event, obj) {
+      console.log(this);
+      if (event) {
+        this.autoUpDate(obj.id);
+      } else {
+        this.stopUpdate(obj.id);
+      }
+    }, 800),
+    changePage(page) {
+      this.page = page;
+      this._QueryData(false);
+    },
+    addDev() {
+      this.form.sn = "";
+      this.form.frequency = "";
+      this.form.pairingCode = "";
+      this.form.classIds = [];
+      this.form.roomName = "";
+      this.form.schoolId = this.school.id;
+      delete this.form.deviceId;
+      this.isAdd = true;
+      this.diaAnswerEqu = true;
+    },
+    _ModifyUpgradeFlagBySchool() {
+      let data = this.$request.modifyUpgradeFlagBySchool({
+        upgradeFlag: this.upgradeFlag ? 1 : 0,
+      });
+      if (data && !data.code) {
+        this._QueryData(false);
+        this.selectionTabIds = [];
+        this.$message.success(this.upgradeFlag?"开启自动更新成功":"关闭/停止自动更新成功");
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async showSchool() {
+      const { data, status, info } = await this.$request.schoolList();
+      if (status === 0) {
+        let gradeListAll = data.list?.map((item) => {
+          return {
+            value: item.id,
+            label: item.schoolName,
+          };
+        });
+        this.schoolAll = [
+          {
+            value: 0,
+            label: "全部",
+            children: [...gradeListAll],
+          },
+        ];
+        this.gradeList = [...this.schoolAll, ...this.gradeList];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async autoUpDate(id) {
+      if (!this.selectionTabIds.length && !id) {
+        this.$message.warning("请选择授课端~");
+        return;
+      }
+      if (this.loadingUpDate) return;
+      this.loadingUpDate = true;
+      let data = await this.$request.modifyUpgradeFlag({
+        deviceIds: id ? [id] : this.selectionTabIds,
+        upgradeFlag: 1,
+      });
+      this.loadingUpDate = false;
+      if (data && !data.code) {
+        this._QueryData(false);
+        this.selectionTabIds = [];
+        this.$message.success("开启自动更新成功");
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async stopUpdate(id) {
+      if (!this.selectionTabIds.length && !id) {
+        this.$message.warning("请选择授课端~");
+        return;
+      }
+      if (this.loadingUpDate) return;
+      this.loadingUpDate = true;
+      let data = await this.$request.modifyUpgradeFlag({
+        deviceIds: id ? [id] : this.selectionTabIds,
+        upgradeFlag: 0,
+      });
+      this.loadingUpDate = false;
+      if (data && !data.code) {
+        this.selectionTabIds = [];
+        this._QueryData(false);
+        this.$message.success("关闭自动更新成功");
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.stationTemplate({
+        id: this.id,
+      });
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`基站模版.xlsx`, blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    async downExl() {
+      //报表导出
+      if (this.exportLoading == true) return;
+      let query = this.setQuery();
+      const exportDevice =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.exportDevice
+          : this.$request.tenantExportDevice;
+
+      this.exportLoading = true;
+      const data = await exportDevice({
+        ...query,
+        deviceType: this.type,
+      });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        let txt =
+          this.type == 1
+            ? "基站管理报表.xlsx"
+            : this.type == 2
+            ? "答题器报表.xlsx"
+            : "授课端报表.xlsx";
+        downloadFile(txt, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+
+    // 修改基站
+    setAnswerEqu() {
+      this.$refs.forms.validate(async (valid) => {
+        if (valid) {
+          if (this.loadingAnswerEqu) return;
+          this.loadingAnswerEqu = true;
+          let query = { ...this.form };
+
+          query.classIds = query.classIds.length ? [query.classIds[1]] : [];
+          let deviceApi = this.isAdd
+            ? this.$request.addStation
+            : this.$request.updateDevice;
+          const { data, status, info } = await deviceApi({
+            ...query,
+          });
+          this.loadingAnswerEqu = false;
+          console.log(status);
+          if (status === 0) {
+            this.diaAnswerEqu = false;
+            this.$message.success(info);
+            this._QueryData();
+            if (this.isAdd) {
+              this.stationReport();
+            }
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("数据有误，请检查！");
+        }
+      });
+    },
+    async _QueryDataSchool() {
+      const { data, status, info } = await this.$request.schoolDetail();
+      if (status === 0) {
+        this.school = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryGradeList() {
+      this.loading = true;
+      const gradeList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.gradeList
+          : this.$request.regionList;
+      const { data, status, info } = await gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          if (this.role != "ROLE_JITUAN") {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.gradeName,
+                  label: item.gradeName,
+                };
+                gradeList.children =
+                  item.classList?.map((items) => {
+                    return {
+                      value: Number(items.id),
+                      label: items.className,
+                    };
+                  }) || [];
+                return gradeList;
+              }) || [];
+          } else {
+            this.gradeList =
+              data.list?.map((item) => {
+                let gradeList = {
+                  value: item.id,
+                  label: item.regionName,
+                };
+                gradeList.children =
+                  item.schoolList?.map((items) => {
+                    return {
+                      value: items.id,
+                      label: items.schoolName,
+                    };
+                  }) || [];
+                return gradeList;
+              }) || [];
+            this.gradeList = [...this.schoolAll, ...this.gradeList];
+          }
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 基站统计数据
+    async stationReport() {
+      const stationReport =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.stationReport
+          : this.$request.tenantStationReport;
+      const { data, status, info } = await stationReport();
+      if (status === 0) {
+        this.chartData =
+          data.list?.map((item) => {
+            return {
+              name:
+                item.onlineStatus == "1"
+                  ? "在线"
+                  : item.onlineStatus == 0
+                  ? "离线"
+                  : "异常",
+              value: item.total,
+              rate: item.rate,
+            };
+          }) || [];
+        this.count = data.total || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 答题器统计数据
+    async keyboardReport() {
+      const keyboardReport =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.keyboardReport
+          : this.$request.tenantKeyboardReport;
+      const { data, status, info } = await keyboardReport();
+      if (status === 0) {
+        this.chartData2 =
+          data.list?.map((item) => {
+            return {
+              name:
+                item.type == 1
+                  ? "1日内"
+                  : item.type == 2
+                  ? "3日内"
+                  : item.type == 3
+                  ? "7日内"
+                  : item.type == 4
+                  ? "1月内"
+                  : item.type == 5
+                  ? "3月内"
+                  : "3月以上",
+              count: item.total,
+              value: item.rate * 100,
+            };
+          }) || [];
+        this.count = data.total || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    setQuery() {
+      //整理传参
+      let query = {};
+      if (this.query.sn) {
+        this.query.classId = [];
+        this.query.onlineStatus = "";
+        this.query.type = "";
+        this.query.studentName = "";
+        query.sn = this.query.sn;
+      } else if (this.query.studentName) {
+        this.query.classId = [];
+        this.query.onlineStatus = "";
+        this.query.type = "";
+        this.query.sn = "";
+        query.studentName = this.query.studentName;
+      } else {
+        if (this.type == 1) {
+          this.query.onlineStatus !== ""
+            ? (query.onlineStatus = this.query.onlineStatus)
+            : "";
+        } else if (this.type == 2) {
+          this.query.type !== "" ? (query.type = this.query.type) : "";
+        }
+        if (this.role == "ROLE_JITUAN") {
+          query.regionIds = [];
+          query.schoolIds = [];
+          query.gradeNames = [];
+          query.classIds = [];
+          this.query.classId?.map((item) => {
+            if (item.length == 1) {
+              if (!query.regionIds.includes(item[0])) {
+                query.regionIds.push(item[0]);
+              }
+            } else if (item.length == 2) {
+              if (!query.schoolIds.includes(item[1])) {
+                query.schoolIds.push(item[1]);
+              }
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+            } else if (item.length == 3) {
+              if (!query.schoolIds.includes(item[1])) {
+                query.schoolIds.push(item[1]);
+              }
+              if (!query.gradeNames.includes(item[2])) {
+                query.gradeNames.push(item[2]);
+              }
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+            } else if (item.length == 4) {
+              if (!query.classIds.includes(item[3])) {
+                query.classIds.push(item[3]);
+              }
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+              query.schoolIds.includes(item[1])
+                ? query.schoolIds.remove(item[1])
+                : "";
+              query.gradeNames.includes(item[2])
+                ? query.gradeNames.remove(item[2])
+                : "";
+            }
+          });
+        } else {
+          query.gradeNames = [];
+          query.classIds = [];
+          this.query.classId?.map((item) => {
+            if (item.length == 1) {
+              if (!query.gradeNames.includes(item[0])) {
+                query.gradeNames.push(item[0]);
+              }
+            } else {
+              if (!query.classIds.includes(item[1])) {
+                query.classIds.push(item[1]);
+              }
+              if (query.gradeNames.includes(item[0])) {
+                query.gradeNames.remove(item[0]);
+              }
+            }
+          });
+        }
+        delete query.classId;
+      }
+      return query;
+    },
+    // 设备列表信息
+    async _QueryData(isRef) {
+      let query = this.setQuery();
+      if (isRef) {
+        this.page = 1;
+      }
+      this.loading = true;
+      const deviceList =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.deviceList
+          : this.$request.tenantDeviceList;
+      this.tableData = [];
+      const { data, status, info } = await deviceList({
+        ...query,
+        deviceType: this.type,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status == 0) {
+        this.tableData =
+          (data?.list &&
+            data?.list.map((item) => {
+              item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
+              return item;
+            })) ||
+          [];
+
+        this.total = data.count;
+        this.$nextTick(function () {
+          this.$refs.main.scrollTop = 0;
+          if (this.query.classId.length) {
+            this.selectionTabIds = this.tableData.map((item) => {
+              this.$refs.multipleTable.toggleRowSelection(item);
+              return item.id;
+            });
+          }
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 异常设备数量
+    async _QueryErrorTotal() {
+      const abnormalDeviceCount =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.abnormalDeviceCount
+          : this.$request.tenantAbnormalDeviceCount;
+      this.tableData = [];
+      const { data, status, info } = await abnormalDeviceCount();
+      if (status == 0) {
+        this.stationCount = data?.stationCount;
+        this.clickerCount = data?.clickerCount;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px;
+  height: 100%;
+  overflow-y: auto;
+}
+.tab-box {
+  padding: 20px 0 12px;
+}
+.down {
+  padding: 0 0 16px 20px;
+}
+.error-tips {
+  margin-bottom: 12px;
+}
+.content {
+  background: #f8f8f8;
+  border: 1px solid #e2e2e2;
+  border-radius: 10px;
+  overflow: hidden;
+  :deep(.fa-edit) {
+    width: 12px;
+    height: 12px;
+    &::before {
+      margin-left: 2px;
+    }
+  }
+  :deep(.fa-eye) {
+    width: 12px;
+    height: 12px;
+    &::before {
+      margin-left: 1px;
+    }
+  }
+  .chart-box {
+    display: flex;
+    overflow: hidden;
+    height: 240px;
+    border-bottom: 0.5px solid #e2e2e2;
+    .device-num {
+      width: 280px;
+      border-right: 0.5px solid #e2e2e2;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      .p1 {
+        font-size: 28px;
+      }
+    }
+    .chart {
+      flex: 1;
+      height: 100%;
+    }
+  }
+  .table-box {
+    padding: 20px 20px 0;
+    .loading {
+      text-align: center;
+      line-height: 36px;
+      font-size: 16px;
+      color: #666;
+    }
+    .answer-header {
+      padding: 0;
+      margin-bottom: 12px;
+      .upgrade-all {
+        display: flex;
+        align-items: center;
+      }
+    }
+  }
+}
+.answer-header .sel-box .input-with-select {
+  margin-right: 20px;
+  :deep(.el-input__suffix) {
+    right: -5px;
+  }
+  :deep(.el-button) {
+    padding: 12px 16px 12px 10px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/device/log.vue b/src/views/basic/device/log.vue
new file mode 100644
index 0000000..eb6ecea
--- /dev/null
+++ b/src/views/basic/device/log.vue
@@ -0,0 +1,327 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>设备日志</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <el-descriptions :column="3" border>
+        <el-descriptions-item label="设备编码">{{
+          device.sn
+        }}</el-descriptions-item>
+        <el-descriptions-item label="配对码">{{
+          device.pairingCode
+        }}</el-descriptions-item>
+        <el-descriptions-item label="关联班级">
+          <span v-for="item in device.classList" :key="item.classId">{{
+            item.className
+          }}</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="操作时间">{{
+          device.modifiedTime
+        }}</el-descriptions-item>
+        <el-descriptions-item v-if="type == 1" label="所在教室">{{
+          device.roomName
+        }}</el-descriptions-item>
+        <el-descriptions-item v-if="type == 1" label="固件版本号">{{
+          device.otaVersionName
+        }}</el-descriptions-item>
+        <!-- <el-descriptions-item v-if="type == 2" label="电量">{{
+          device.electricity
+        }}</el-descriptions-item> -->
+        <el-descriptions-item v-if="type == 2" label="答题次数">{{
+          device.answerTimes
+        }}</el-descriptions-item>
+      </el-descriptions>
+    </div>
+    <div class="answer-header">
+      <div class="sel-box">
+        <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
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+            >本季度</span
+          >
+        </p>
+        <el-button type="primary" class="serach-box" round @click="_QueryData"
+          >筛选</el-button
+        >
+      </div>
+    </div>
+    <div class="table-box">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column
+          prop="operationType"
+          label="请求类型"
+          align="center"
+          width="160"
+          ><template slot-scope="scoped">{{
+            setOperationType(scoped.row.operationType)
+          }}</template></el-table-column
+        >
+        <!-- <el-table-column
+          v-if="type == 2"
+          prop="electricity"
+          width="100"
+          label="电量"
+          align="center"
+        ></el-table-column> -->
+        <el-table-column
+          prop="operationTime"
+          label="时间"
+          align="center"
+          width="200"
+        ></el-table-column>
+        <el-table-column prop="content" label="日志内容" align="center"
+          ><template slot-scope="scoped">
+            <p style="text-align: left">{{ scoped.row.content }}</p></template
+          ></el-table-column
+        >
+      </el-table>
+    </div>
+    <div class="pagination-box">
+      <el-pagination
+        small=""
+        layout="total,prev, pager, next"
+        :hide-on-single-page="true"
+        :total="total"
+        @current-change="changePage"
+        :current-page="page"
+        :page-size="size"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from "utils";
+export default {
+  data() {
+    return {
+      type: 1,
+      id: "",
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tableData: [],
+      device: {
+        sn: "",
+        electricity: "",
+        pairingCode: "",
+        classList: [],
+        modifiedTime: "",
+        answerTimes: "",
+        roomName: "",
+        otaVersionName: "",
+      },
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+    this.type = this.$route.query.type;
+    this._QueryDetail();
+    this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    setOperationType(type) {
+      let txt;
+      switch (type) {
+        case 0:
+          txt = "连接异常";
+          break;
+        case 1:
+          txt = "问";
+          break;
+        case 2:
+          txt = "测";
+          break;
+        case 3:
+          txt = "考";
+          break;
+        case 4:
+          txt = "抢答";
+          break;
+        case 5:
+          txt = "抽答";
+          break;
+        case 6:
+          txt = "再答";
+          break;
+        case 7:
+          txt = "签到";
+          break;
+      }
+      return txt;
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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 day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async _QueryDetail() {
+      const { data, status, info } = await this.$request.deviceDetail({
+        deviceId: this.id,
+      });
+      if (status === 0) {
+        this.device = { ...data };
+        for (let key in this.device) {
+          this.device[key] = data[key];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      //多课时对比
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "day" || key == "startDay" || key == "endDay") {
+            query[key] = this.query[key].split("-").join("");
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      const {
+        data = {},
+        status,
+        info,
+      } = await this.$request.deviceLogList({
+        ...query,
+        deviceId: Number(this.id),
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+.table-box {
+  padding: 0 20px;
+}
+.serach-box {
+  margin-left: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/down/client.vue b/src/views/basic/down/client.vue
new file mode 100644
index 0000000..4077096
--- /dev/null
+++ b/src/views/basic/down/client.vue
@@ -0,0 +1,715 @@
+<template>
+  <div class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>授课端下载</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="content-top">
+        <div class="cont-info">
+          <img v-if="info.appImage" class="logo" :src="info.appImage" alt="" />
+          <div>
+            <p class="name">
+              {{ `${info.appName || ""} ${info.versionName || ""}` }}
+            </p>
+            <p class="txt">文件大小：{{ `${info.fileSize}` }}M</p>
+            <p class="txt">最近更新：{{ info.modifiedTime }}</p>
+          </div>
+        </div>
+        <div class="down-box">
+          <p class="txt">默认参数配置</p>
+          <el-button
+            class="down-btn"
+            type="primary"
+            @click="getAppDownloadUrl(false)"
+            >立即下载</el-button
+          >
+        </div>
+      </div>
+      <!-- <ul class="down-ul">
+        <li class="down-li" v-for="item in tableData" :key="item.id">
+          <span class="p1 ellipsis" @click="setConfigForm(item)">{{
+            item.configName
+          }}</span>
+          <el-button plan round @click="getAppDownloadUrl(item.id)"
+            >下载</el-button
+          >
+        </li>
+        <li class="down-li">
+          <span>自定义软件功能</span>
+          <el-button
+            plan
+            round
+            icon="el-icon-plus"
+            @click="setDefaultForm(), (dialogVis = true), (type = 1)"
+            >参数设置</el-button
+          >
+        </li>
+      </ul> -->
+    </div>
+    <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%">
+      <div class="back">
+        <div class="back-l" @click="dialogVis = false">
+          <i class="fa fa-mail-reply-all"></i>
+          <p>
+            {{
+              `${type == 1 ? "参数设置" : formData.configName}`
+            }}
+          </p>
+        </div>
+      </div>
+      <div class="form-box">
+        <el-form
+          ref="forms"
+          :model="formData"
+          :rules="ruleForm"
+          label-width="180px"
+        >
+          <el-form-item label="配置名称：" prop="configName" v-if="type == 1">
+            <el-col :span="12">
+              <el-input
+                v-model.trim="formData.configName"
+                placeholder="请填写配置名称"
+              ></el-input>
+            </el-col>
+          </el-form-item>
+          <el-form-item label="主菜单设置：" prop="mainMenu">
+            <el-checkbox-group v-model="formData.mainMenu" :max="4">
+              <el-checkbox v-for="item in menuList" :label="item" :key="item">{{
+                item
+              }}</el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label="弹出菜单组：" prop="popupMenu">
+            <el-radio-group v-model="formData.popupMenu">
+              <p class="popup-menu">
+                <el-radio :label="1"
+                  ><span>1：签到点名</span> <span> 2：导入导出</span>
+                  <span>3：班级管理</span> <span>4：系统设置</span></el-radio
+                >
+              </p>
+              <p class="popup-menu popup-menu1">
+                <el-radio :label="2">
+                  <span>1：签到点名</span> <span> 2：导入导出</span>
+                  <span>3：考试任务</span> <span>4：系统设置</span></el-radio
+                >
+              </p>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="成绩等级设置：">
+            <el-col :span="12">
+              <div class="silde-box">
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.failedSet + '%' }"
+                    >{{ formData.failedSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.failedSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.failedSet + '%' }"
+                    >不及格</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.passSet + '%' }"
+                    >{{ formData.passSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.passSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.passSet + '%' }"
+                    >及格</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span class="num" :style="{ left: formData.goodSet + '%' }"
+                    >{{ formData.goodSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.goodSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span class="txt" :style="{ left: formData.goodSet + '%' }"
+                    >良好</span
+                  >
+                </p>
+                <p class="silde-p">
+                  <span
+                    class="num"
+                    :style="{ left: formData.excellenSet + '%' }"
+                    >{{ formData.excellenSet }}%</span
+                  >
+                  <el-slider
+                    v-model="formData.excellenSet"
+                    :show-tooltip="false"
+                  ></el-slider
+                  ><span
+                    class="txt"
+                    :style="{ left: formData.excellenSet + '%' }"
+                    >优秀</span
+                  >
+                </p>
+              </div>
+            </el-col>
+          </el-form-item>
+          <el-form-item label="抢答设置：" prop="viesAnswerSet">
+            <el-radio-group v-model="formData.viesAnswerSet">
+              <el-radio :label="0">倒计时抢答</el-radio>
+              <el-radio :label="1">即时抢答</el-radio>
+              <el-radio :label="2">老师选择</el-radio>
+            </el-radio-group>
+            <el-input-number
+              v-show="formData.viesAnswerSet === 0"
+              size="small"
+              class="count-down"
+              v-model="formData.countdown"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number>
+            <span v-show="formData.viesAnswerSet == 0">秒</span>
+          </el-form-item>
+          <el-form-item label="抽答设置：" prop="ballotAnswerSet">
+            <el-radio-group v-model="formData.ballotAnswerSet">
+              <el-radio :label="0">点名抽答</el-radio>
+              <el-radio :label="1">随机抽答</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="单选题选项默认个数：" prop="singleChoiceNum">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.singleChoiceNum"
+              :min="2"
+              :max="7"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="多选题选项默认个数：" prop="multipleChoiceNum">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.multipleChoiceNum"
+              :min="2"
+              :max="7"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="测—单题型默认题数：" prop="singleTypeNum">
+            <el-input-number
+              size="small"
+              class="count-down count-down2"
+              v-model="formData.singleTypeNum"
+              :min="2"
+              :max="25"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number
+            >个
+          </el-form-item>
+          <el-form-item label="问—倒计时：" prop="askCountdown">
+            <el-switch v-model="askCount" @change="askCountChange"> </el-switch>
+            <el-input-number
+              v-show="askCount"
+              size="small"
+              class="count-down"
+              v-model="formData.askCountdown"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number>
+            {{ askCount ? "秒" : "" }}
+          </el-form-item>
+          <el-form-item label="测—倒计时：" prop="viesAnswerSet">
+            <el-switch v-model="examsDuration" @change="examsDurationChange">
+            </el-switch>
+            <el-input-number
+              v-show="examsDuration"
+              size="small"
+              class="count-down"
+              v-model="formData.examsDuration"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+            ></el-input-number>
+            {{ examsDuration ? "分" : "" }}
+          </el-form-item>
+          <el-form-item label="答题结构展示：" prop="displayModel">
+            <el-radio-group v-model="formData.displayModel">
+              <el-radio :label="0">极简模式</el-radio>
+              <el-radio :label="1">全屏模式</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="语言设置：" prop="languageSet">
+            <el-radio-group v-model="formData.languageSet">
+              <el-radio :label="0">中文</el-radio>
+              <el-radio :label="1">英文</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="其他设置：">
+            <el-checkbox-group v-model="formData.otherSet">
+              <p>
+                <el-checkbox :label="0">答题结束自动显示答题统计</el-checkbox>
+              </p>
+              <p><el-checkbox :label="1">答题结束自动保存截屏</el-checkbox></p>
+            </el-checkbox-group>
+          </el-form-item>
+          <el-form-item label=" ">
+            <el-button type="primary" round @click="saveForm">保存</el-button>
+            <el-button round @click="setDefaultForm">恢复默认设置</el-button>
+            <el-button round @click="dialogVis = false">取消</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+const defaultForm = {
+  configName: "",
+  mainMenu: ["问"],
+  popupMenu: 1,
+  failedSet: 60,
+  passSet: 80,
+  goodSet: 90,
+  excellenSet: 98,
+  viesAnswerSet: 0,
+  countdown: 5,
+  ballotAnswerSet: 0,
+  singleChoiceNum: 4,
+  multipleChoiceNum: 4,
+  singleTypeNum: 25,
+  askCountdown: 30,
+  examsDuration: 90,
+  displayModel: 0,
+  languageSet: 0,
+  otherSet: [],
+};
+export default {
+  watch: {
+    "formData.askCountdown": function (val) {
+      if (val == 0) {
+        this.askCount = false;
+      }
+    },
+    "formData.examsDuration": function (val) {
+      if (val == 0) {
+        this.examsDuration = false;
+      }
+    },
+  },
+  data() {
+    return {
+      page: 1,
+      size: 20,
+      type: 1, //1-添加；2-修改
+      info: {
+        appName: "",
+        appImage: "",
+        versionName: "",
+        fileSize: "",
+        modifiedTime: "",
+      },
+      tableData: [],
+      dialogVis: false,
+      askCount: true,
+      examsDuration: true,
+      configId: "",
+      formData: {
+        configName: "",
+        mainMenu: ["问"],
+        popupMenu: 1,
+        failedSet: 60,
+        passSet: 80,
+        goodSet: 90,
+        excellenSet: 98,
+        viesAnswerSet: 0,
+        countdown: 5,
+        ballotAnswerSet: 0,
+        singleChoiceNum: 4,
+        multipleChoiceNum: 4,
+        singleTypeNum: 25,
+        askCountdown: 30,
+        examsDuration: 90,
+        displayModel: 0,
+        languageSet: 0,
+        otherSet: [],
+      },
+      ruleForm: {
+        configName: [
+          { required: true, message: "请填写配置名称", trigger: "blur" },
+        ],
+        // mainMenu: [
+        //   { required: true, message: "请选择主菜单", trigger: "blur" },
+        // ],
+        // popupMenu: [
+        //   { required: true, message: "请选择弹出菜单", trigger: "blur" },
+        // ],
+        // viesAnswerSet: [
+        //   { required: true, message: "请选择抢答类型", trigger: "blur" },
+        // ],
+        // countdown: [
+        //   { required: true, message: "请输入抢答倒计时", trigger: "blur" },
+        // ],
+        // ballotAnswerSet: [
+        //   { required: true, message: "请选择抽答类型", trigger: "blur" },
+        // ],
+        // singleChoiceNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入单选题选项默认个数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // multipleChoiceNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入多选题选项默认个数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // singleTypeNum: [
+        //   {
+        //     required: true,
+        //     message: "请输入测—单题型默认题数",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // displayModel: [
+        //   {
+        //     required: true,
+        //     message: "请选择答题结构",
+        //     trigger: "blur",
+        //   },
+        // ],
+        // languageSet: [
+        //   {
+        //     required: true,
+        //     message: "请选择语言",
+        //     trigger: "blur",
+        //   },
+        // ],
+      },
+      menuList: ["问", "测", "析"],
+    };
+  },
+  created() {
+    this.latestVersion();
+    // this.appConfigList();
+  },
+  methods: {
+    setConfigForm(obj) {
+      let content = JSON.parse(obj.content);
+      console.log(content);
+      this.formData.configName = obj.configName;
+      for (let key in this.formData) {
+        content[key] ? (this.formData[key] = content[key]) : "";
+      }
+      this.formData.examsDuration = (this.formData.examsDuration / 60).toFixed(
+        0
+      );
+      this.type = 2;
+      (this.configId = obj.id), (this.dialogVis = true);
+      this.$nextTick(function () {
+        this.$refs.editDia.scrollTop = 0;
+      });
+    },
+    setDefaultForm() {
+      for (let key in this.formData) {
+        this.formData[key] = defaultForm[key];
+      }
+    },
+    askCountChange(val) {
+      if (val) {
+        this.formData.askCountdown = 30;
+      } else {
+        this.formData.askCountdown = 0;
+      }
+    },
+    examsDurationChange(val) {
+      if (val) {
+        this.formData.examsDuration = 90;
+      } else {
+        this.formData.examsDuration = 0;
+      }
+    },
+    async saveForm() {
+      let content = {};
+      for (let key in this.formData) {
+        if (key != "configName") {
+          content[key] = this.formData[key];
+        }
+      }
+      content.examsDuration = content.examsDuration * 60;
+      this.$refs.forms.validate((valid) => {
+        if (valid) {
+          if (this.type == 1) {
+            this.addAppConfig({
+              configName: this.formData.configName,
+              content: { ...content },
+            });
+          } else {
+            this.updateAppConfig({
+              configId: this.configId,
+              content: { ...content },
+            });
+          }
+        } else {
+          this.$message.warning("配置名称输入有误请检查！");
+          return false;
+        }
+      });
+    },
+
+    async addAppConfig(params) {
+      const { data, status, info } = await this.$request.addAppConfig({
+        ...params,
+      });
+      if (status == 0) {
+        this.$message.success("配置成功");
+        this.dialogVis = false;
+        this.appConfigList();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async updateAppConfig(params) {
+      const { data, status, info } = await this.$request.updateAppConfig({
+        ...params,
+      });
+      if (status == 0) {
+        this.$message.success("配置成功");
+        this.dialogVis = false;
+        this.appConfigList();
+      } else {
+        this.$message.error(info);
+      }
+    },
+
+    async latestVersion() {
+      const { data, status, info } = await this.$request.latestVersion();
+      if (status == 0) {
+        this.info = { ...data };
+        this.info.fileSize =
+          (this.info.fileSize &&
+            (this.info.fileSize / 1024 / 1024).toFixed(2)) ||
+          "--";
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async appConfigList() {
+      const { data, status, info } = await this.$request.appConfigList({
+        page: this.page,
+        size: this.size,
+      });
+      if (status == 0) {
+        this.tableData = [...data.list] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async getAppDownloadUrl(configId) {
+      const { data, status, info } = await this.$request.getAppDownloadUrl({
+        configId: configId || "",
+      });
+      if (status == 0) {
+        // this.tableData = [...data.list] || [];
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-container {
+  width: 100%;
+  position: relative;
+}
+.page-content {
+  padding: 30px;
+  .content-top {
+    padding: 20px 50px 20px 20px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    .cont-info {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      .logo {
+        width: 140px;
+        margin-right: 16px;
+      }
+      .name {
+        font-size: 20px;
+        color: #333;
+        line-height: 24px;
+        padding-bottom: 12px;
+      }
+      .txt {
+        font-size: 15px;
+        color: #7f7f7f;
+        line-height: 25px;
+      }
+    }
+    .down-box {
+      width: 200px;
+      text-align: center;
+      .txt {
+        font-size: 16px;
+        padding-bottom: 8px;
+      }
+      .down-btn {
+        font-size: 20px;
+      }
+    }
+  }
+  .down-ul {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0 20px;
+    .down-li {
+      width: calc(50% - 12px);
+      height: 72px;
+      padding: 0 16px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      margin: 0 24px 30px 0;
+      border-radius: 10px;
+      background: #f8f8f8;
+      box-shadow: 2px 2px 5px #ccc;
+      &:nth-child(2n) {
+        margin-right: 0;
+      }
+      font-size: 16px;
+      color: #667ffd;
+      .p1 {
+        cursor: pointer;
+      }
+    }
+  }
+}
+:deep(.el-button.is-round) {
+  width: 120px;
+  text-align: center;
+  padding: 10px 0;
+}
+.edit-dia {
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  width: 100%;
+  height: calc(100vh - 80px);
+  background: #fff;
+  overflow-y: auto;
+  .back {
+    width: 100%;
+    height: 56px;
+    border-bottom: 1px solid #e2e2e2;
+    display: flex;
+    align-items: center;
+    padding: 0 20px;
+    box-sizing: border-box;
+    .back-l {
+      display: flex;
+      align-items: center;
+      cursor: pointer;
+      flex-shrink: 0;
+      font-size: 18px;
+      font-weight: 500;
+    }
+    .fa-mail-reply-all {
+      font-size: 28px;
+      color: #b3b3b3;
+      margin-right: 12px;
+    }
+  }
+  .form-box {
+    padding: 20px;
+    .popup-menu {
+      padding-bottom: 16px;
+      span {
+        padding-right: 12px;
+      }
+    }
+    .popup-menu1 {
+      padding-bottom: 0;
+    }
+    .count-down {
+      width: 48px;
+      margin: 0 8px 0 20px;
+      :deep(.el-input__inner) {
+        width: 48px;
+        height: 32px;
+        line-height: 32px;
+        border-radius: 20px;
+        border-color: #667ffd;
+        padding: 0;
+      }
+      :deep(.el-input-number__decrease) {
+        display: none;
+      }
+      :deep(.el-input-number__increase) {
+        display: none;
+      }
+    }
+    .count-down2 {
+      margin-left: 0;
+    }
+    .silde-box {
+      position: relative;
+      width: 100%;
+      height: 60px;
+      .silde-p {
+        width: 100%;
+        position: absolute;
+        padding-top: 20px;
+        & > span {
+          position: absolute;
+          width: 48px;
+          text-align: center;
+          line-height: 18px;
+          flex-shrink: 0;
+          font-size: 12px;
+        }
+        :deep(.el-slider) {
+          flex: 1;
+        }
+        :deep(.el-slider__runway) {
+          margin: 5px 0;
+        }
+        :deep(.el-slider__runway) {
+          background-color: #409eff;
+        }
+        .num {
+          top: 0;
+          transform: translateX(-24px);
+        }
+        .txt {
+          bottom: -20px;
+          transform: translateX(-24px);
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/down/index.vue b/src/views/basic/down/index.vue
new file mode 100644
index 0000000..3b64cef
--- /dev/null
+++ b/src/views/basic/down/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="content-box">
+    <back-box>
+      <template slot="title">
+        <span>软件下载</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="down-item">
+        <p class="txt">
+          K12公私立学校、高等院校、教育培训机构的课堂互动教学、即时课堂测验。
+        </p>
+        <el-button plan round @click="links">授课端下载</el-button>
+      </div>
+      <div class="down-item" v-loading="loading" v-if="role == 'ROLE_XUEXIAO'">
+        <p class="txt">
+          配合发卡器硬件，方便学校管理员进行发卡补卡操作的软件。
+        </p>
+        <el-button plan round @click="downCard">发卡软件下载</el-button>
+      </div>
+      <div class="down-item" v-loading="loading">
+        <p class="txt">
+          电脑缺少.NET Framework环境时，请下载安装.NET Framework
+          4.5.2，以便于授课端可正常使用。
+        </p>
+        <el-button plan round @click="downNet">.Net环境下载</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      role: "",
+      loading: false,
+      loadingNet: false,
+    };
+  },
+  created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+  },
+  methods: {
+    links() {
+      this.$router.push({
+        path: "/downClient",
+      });
+    },
+    async downCard() {
+      if (this.loading == true) return;
+      this.loading = true;
+      const { data, status, info } = await this.$request.latestClickersApp();
+      this.loading = false;
+      if (status == 0) {
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        a.download = data.appName;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downNet() {
+      if (this.loadingNet == true) return;
+      this.loadingNet = true;
+      const { data, status, info } = await this.$request.runtimeEnvFileUrl();
+      this.loadingNet = false;
+      if (status == 0) {
+        const a = document.createElement("a");
+        a.href = data;
+        // a.download = data.appName;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content-box {
+  width: 100%;
+}
+.page-content {
+  display: flex;
+  padding-top: 50px;
+  margin-left: 160px;
+  .down-item {
+    width: 200px;
+    padding: 50px 20px;
+    border-radius: 20px;
+    margin: 20px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    background: #f8f8f8;
+    box-shadow: 2px 2px 5px #ccc;
+    .txt {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 24px;
+      height: 120px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/examinationPaper/add.vue b/src/views/basic/examinationPaper/add.vue
new file mode 100644
index 0000000..6f3e240
--- /dev/null
+++ b/src/views/basic/examinationPaper/add.vue
@@ -0,0 +1,2005 @@
+<template>
+  <div ref="content" class="content-box">
+    <back-box>
+      <template slot="title">
+        <span>{{ "创建答题卡" }}</span>
+      </template>
+    </back-box>
+    <div class="content">
+      <el-steps
+        :active="step"
+        finish-status="success"
+        simple
+        style="margin: 20px 0"
+      >
+        <el-step title="基础信息" icon="el-icon-edit"></el-step>
+        <el-step title="题目编辑" icon="el-icon-tickets"></el-step>
+        <el-step title="设置答案" icon="el-icon-edit-outline"></el-step>
+      </el-steps>
+      <div v-show="step == 0">
+        <el-form
+          ref="forms"
+          :model="form"
+          :rules="formRules"
+          label-width="140px"
+        >
+          <el-form-item label="答题卡名称：" prop="title">
+            <el-input
+              class="sel2"
+              type="text"
+              placeholder="请输入答题卡名称"
+              v-model.trim="form.title"
+              maxlength="30"
+              size="45"
+              show-word-limit
+            >
+            </el-input>
+          </el-form-item>
+          <el-form-item label="测验类型：">
+            <el-select v-model="form.tagId" placeholder="选择测验类型">
+              <el-option label="--" value=""> </el-option>
+              <el-option
+                v-for="item in answerTypeList"
+                :key="item.id"
+                :label="item.typeName"
+                :value="item.id"
+                >{{ item.typeName }}</el-option
+              >
+            </el-select>
+            <el-button
+              class="ml-20"
+              type="primary"
+              round
+              circle
+              icon="el-icon-edit"
+              @click="openTagDia"
+            ></el-button>
+          </el-form-item>
+          <el-form-item label="年级：" prop="gradeName">
+            <el-select
+              class="sel"
+              v-model="form.gradeName"
+              placeholder=""
+              @change="changeGrade"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <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"
+                :label="item.label"
+                :value="item.value"
+                >{{ item.label }}
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="考试时长：">
+            <el-input-number
+              size="medium"
+              :min="1"
+              :max="140"
+              :step-strictly="true"
+              :step="1"
+              v-model="form.examsDuration"
+              label="考试时长"
+            ></el-input-number>
+          </el-form-item>
+          <el-form-item label="分享范围：" prop="sharingType">
+            <el-radio-group v-model="form.sharingType">
+              <el-radio :label="0">任课班级分享</el-radio>
+              <el-radio :label="1">全年级分享</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+        <div class="btn-box">
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
+          <el-button type="primary" round @click="setStep1">下一步</el-button>
+        </div>
+        <el-dialog :close-on-click-modal="false"
+          title="设置测验类型"
+          :visible.sync="dialogVisible"
+          width="500px"
+        >
+          <div class="dia-content">
+            <p class="add-type" v-for="item in tagList" :key="item.id">
+              <el-row :gutter="10">
+                <el-col :span="18"
+                  ><el-input
+                    v-model="item.typeName"
+                    :maxlength="10"
+                    placeholder="请输入答题卡类型名称"
+                  ></el-input
+                ></el-col>
+                <el-col :span="6">
+                  <el-tooltip effect="dark" content="保存" placement="top">
+                    <el-button
+                      class="js-set"
+                      type="primary"
+                      size="small"
+                      round
+                      circle
+                      icon="el-icon-check"
+                      @click="editTypeName(item)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip effect="dark" content="删除" placement="right">
+                    <el-popconfirm
+                      title="确定删除这道大题吗？"
+                      @confirm="removeTypeName(item)"
+                    >
+                      <el-button
+                        class="js-set"
+                        type="danger"
+                        size="small"
+                        round
+                        circle
+                        icon="el-icon-delete"
+                        slot="reference"
+                      ></el-button>
+                    </el-popconfirm>
+                  </el-tooltip>
+                </el-col>
+              </el-row>
+            </p>
+            <p class="add-type">
+              <el-row :gutter="10">
+                <el-col :span="18">
+                  <el-input
+                    type="text"
+                    placeholder="请输入答题卡类型名称"
+                    v-model.trim="answerTypeName"
+                    :maxlength="10"
+                  >
+                  </el-input>
+                </el-col>
+                <el-col :span="6">
+                  <el-tooltip effect="dark" content="添加" placement="right">
+                    <el-button
+                      class="js-set"
+                      type="primary"
+                      size="small"
+                      round
+                      circle
+                      icon="el-icon-plus"
+                      @click="addPaperType"
+                    ></el-button>
+                  </el-tooltip>
+                </el-col>
+              </el-row>
+            </p>
+          </div>
+          <div class="" slot="footer">
+            <el-button @click="dialogVisible = false">关 闭</el-button>
+          </div>
+        </el-dialog>
+      </div>
+      <div v-show="step == 1">
+        <div
+          class="question-box"
+          v-for="(question, index) in form.questionList"
+          :key="index"
+        >
+          <p class="question-title">
+            <el-tooltip
+              effect="dark"
+              :content="question.show ? '收起' : '展开'"
+              placement="left"
+            >
+              <i
+                class="el-icon-caret-right"
+                :class="question.show ? 'active' : ''"
+                @click="question.show = !question.show"
+              ></i>
+            </el-tooltip>
+            <span>{{ setBigNum(index) }}、</span>
+            <el-input
+              class="ipt"
+              v-model.trim="question.questionTitle"
+              maxlength="30"
+              placeholder="填写大题名称"
+            ></el-input>
+            <el-popconfirm
+              title="确定删除这道大题吗？"
+              @confirm="form.questionList.splice(index, 1)"
+            >
+              <el-button
+                slot="reference"
+                class="delete"
+                type="danger"
+                size="mini"
+                circle
+                icon="el-icon-delete"
+              ></el-button>
+            </el-popconfirm>
+            <template v-if="equalScore(question)">
+              <span class="m20"
+                >每题{{
+                  question.subQuestions && question.subQuestions[0].score
+                }}分</span
+              >
+            </template>
+            <span class="m20">共：{{ question.subQuestions.length }}题</span>
+            <span class="m20">共：{{ setScore(question) }}分</span>
+          </p>
+          <transition name="el-zoom-in-top">
+            <ul v-show="question.show" 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-options">选项设置</div>
+                <div class="qs-set">操作</div>
+              </li>
+              <li
+                class="sub-questions"
+                v-for="(subQuestions, indexs) in question.subQuestions"
+                :key="indexs"
+              >
+                <div class="qs-num">{{ setNum(index, indexs) }}</div>
+                <div class="qs-type">
+                  <el-select
+                    v-model="subQuestions.questionType"
+                    placeholder="选择题目类型"
+                    @change="changeSubQuestions($event, subQuestions)"
+                  >
+                    <el-option label="单选题" :value="2"></el-option>
+                    <el-option label="多选题" :value="3"></el-option>
+                    <el-option label="判断题" :value="4"></el-option>
+                    <el-option label="主观题" :value="5"></el-option>
+                  </el-select>
+                </div>
+                <div class="qs-score">
+                  <el-input-number
+                    class="number-ipt"
+                    size="medium"
+                    :min="1"
+                    :max="200"
+                    :precision="2"
+                    :step="1"
+                    v-model="subQuestions.score"
+                    label="单题分值"
+                  ></el-input-number>
+                </div>
+                <div class="qs-partScore">
+                  <p v-if="subQuestions.questionType != 3">--</p>
+                  <el-input-number
+                    class="number-ipt"
+                    v-else
+                    size="medium"
+                    :min="0"
+                    :precision="2"
+                    :max="subQuestions.score"
+                    :step="0.5"
+                    v-model="subQuestions.partScore"
+                    label="漏选得分"
+                  ></el-input-number>
+                </div>
+                <div class="qs-options">
+                  <p v-if="subQuestions.questionType == 5">--</p>
+                  <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.split(',')"
+                      :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.split(',')"
+                      :class="
+                        subQuestions.correctAnswer == option ? 'active' : ''
+                      "
+                      :key="option"
+                      @click="subQuestions.correctAnswer = option"
+                      >{{ option }}</span
+                    >
+                  </p>
+                  <p
+                    v-if="
+                      subQuestions.questionType == 3 ||
+                      subQuestions.questionType == 2
+                    "
+                    class="answer-box"
+                  >
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-plus"
+                      circle
+                      @click="addOptions(subQuestions)"
+                    ></el-button>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-minus"
+                      round
+                      circle
+                      @click="removeOptions(subQuestions)"
+                    ></el-button>
+                  </p>
+                </div>
+                <div class="qs-set">
+                  <el-popconfirm
+                    title="确定删除这道题吗？"
+                    @confirm="delTabData(indexs, index)"
+                  >
+                    <el-button
+                      slot="reference"
+                      class="delete"
+                      type="danger"
+                      size="mini"
+                      circle
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </el-popconfirm>
+                </div>
+              </li>
+              <li class="sub-questions">
+                <div class="qs-num">添加</div>
+                <div class="qs-type">
+                  <el-select
+                    v-model="addSubQuestionsType"
+                    placeholder="选择题目类型"
+                    @change="changeAddSubQuestions($event, question)"
+                  >
+                    <el-option label="单选题" :value="2"></el-option>
+                    <el-option label="多选题" :value="3"></el-option>
+                    <el-option label="判断题" :value="4"></el-option>
+                    <el-option label="主观题" :value="5"></el-option>
+                  </el-select>
+                </div>
+                <div class="qs-score"></div>
+                <div class="qs-partScore"></div>
+                <div class="qs-options"></div>
+                <div class="qs-set"></div>
+              </li>
+            </ul>
+          </transition>
+        </div>
+        <div class="add-box">
+          <p class="add-question" @click="openQuestion">
+            <el-button
+              size="mini"
+              type="primary"
+              icon="el-icon-plus"
+              circle
+            ></el-button>
+            <span class="s1">添加大题</span>
+          </p>
+        </div>
+        <div class="btn-box">
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
+          <el-button round @click="step = 0">上一步</el-button>
+          <el-button
+            :type="form.questionList.length == 0 ? 'info' : 'primary'"
+            round
+            @click="setStep2"
+            >下一步</el-button
+          >
+        </div>
+        <el-dialog :close-on-click-modal="false"
+          title="添加大题"
+          :visible.sync="addQuestionVisible"
+          width="600px"
+        >
+          <div class="dia-content">
+            <el-form
+              ref="form"
+              :model="questionForm"
+              :rules="questionFormRules"
+              label-width="100px"
+            >
+              <el-form-item label="标题：">
+                <el-col :span="20">
+                  <el-input
+                    v-model.trim="questionForm.questionTitle"
+                    maxlength="30"
+                    placeholder="输入大题名称"
+                  ></el-input>
+                </el-col>
+              </el-form-item>
+              <el-form-item label="选择题型：">
+                <el-select
+                  v-model="questionForm.questionType"
+                  placeholder=""
+                  @change="setQuestionForm"
+                >
+                  <el-option
+                    v-for="item in questionOptions"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                  <el-option label="混合题" :value="6"> </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="题数：">
+                <el-input-number
+                  v-model="questionForm.number"
+                  @change="changeQesNum"
+                  :min="1"
+                  :max="100"
+                  :step-strictly="true"
+                  :step="1"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item
+                label="选项个数："
+                v-show="
+                  questionForm.questionType != 4 &&
+                  questionForm.questionType != 5
+                "
+              >
+                <el-input-number
+                  v-model="questionForm.selectNum"
+                  :min="3"
+                  :max="7"
+                  :step-strictly="true"
+                  :step="1"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item label="单题分数：">
+                <el-input-number
+                  v-model="questionForm.score"
+                  :min="1"
+                  :max="200"
+                  :precision="2"
+                  :step="1"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item
+                label="漏选得分："
+                v-if="questionForm.questionType == 3"
+              >
+                <el-input-number
+                  v-model="questionForm.partScore"
+                  :min="0"
+                  :max="questionForm.score"
+                  :precision="2"
+                  :step="0.5"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item
+                label="设置答案："
+                v-show="
+                  questionForm.questionType != 5 &&
+                  questionForm.questionType != 6
+                "
+              >
+                <div class="qs-options">
+                  <p class="ipt">
+                    <el-input
+                      v-if="
+                        questionForm.questionType == 2 ||
+                        questionForm.questionType == 3 ||
+                        questionForm.questionType == 6
+                      "
+                      ref="formAnsIpt2"
+                      v-model="questionForm.answerList"
+                      @keydown.native="
+                        keydownAnswer($event, questionForm.questionType, 1)
+                      "
+                      @input="
+                        setAllAnswer($event, questionForm.questionType, 1)
+                      "
+                    ></el-input>
+                    <el-input
+                      v-if="questionForm.questionType == 4"
+                      v-model="questionForm.answerList"
+                      readonly=""
+                    ></el-input>
+                  </p>
+                  <p class="answer-box">
+                    <template v-if="questionForm.questionType == 4">
+                      <span
+                        class="answer-s active"
+                        @click="
+                          questionForm.answerList.length < questionForm.number
+                            ? (questionForm.answerList += '✓')
+                            : ''
+                        "
+                        >✓</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          questionForm.answerList.length < questionForm.number
+                            ? (questionForm.answerList += '✗')
+                            : ''
+                        "
+                        >✗</span
+                      >
+                    </template>
+                    <template v-if="questionForm.questionType == 3">
+                      <template v-for="(option, opIdx) in rightOptions">
+                        <span
+                          v-if="opIdx < questionForm.selectNum"
+                          class="answer-s active"
+                          :key="option"
+                          @click="setMultiple(questionForm, option, 1)"
+                          >{{ option }}</span
+                        >
+                      </template>
+                      <span
+                        class="answer-s active"
+                        @click="setMultiple(questionForm, ',', 1)"
+                        >,</span
+                      >
+                    </template>
+                    <template
+                      v-if="
+                        questionForm.questionType == 2 ||
+                        questionForm.questionType == 6
+                      "
+                    >
+                      <template v-for="(option, opIdx) in rightOptions">
+                        <span
+                          v-if="opIdx < questionForm.selectNum"
+                          class="answer-s active"
+                          :key="option"
+                          @click="
+                            questionForm.answerList.length < questionForm.number
+                              ? (questionForm.answerList += option)
+                              : ''
+                          "
+                          >{{ option }}</span
+                        >
+                      </template>
+                    </template>
+                    <span
+                      class="answer-s delButton"
+                      @click="
+                        questionForm.answerList = questionForm.answerList.slice(
+                          0,
+                          -1
+                        )
+                      "
+                      >x</span
+                    >
+                    <span
+                      class="answer-s ac"
+                      @click="questionForm.answerList = ''"
+                      >ac</span
+                    >
+                  </p>
+                </div>
+              </el-form-item>
+            </el-form>
+          </div>
+          <div class="dialog-footer" slot="footer">
+            <el-button type="primary" @click="addQuestion">确 定</el-button>
+            <el-button @click="addQuestionVisible = false">取 消</el-button>
+          </div>
+        </el-dialog>
+      </div>
+      <div v-show="step == 2">
+        <div class="answer-title">
+          <p class="name">{{ form.title }}</p>
+          <p class="totals">卷面总分：{{ allScore }}分</p>
+        </div>
+        <div
+          class="question-box"
+          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 class="m20">共：{{ setNums(question.subQuestions) }}题</span>
+            <span class="m20">共：{{ setScore(question) }} 分</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-options qs-options2">选项设置</div>
+            </li>
+            <li
+              v-for="(subQuestions, indexs) in question.subQuestions"
+              :key="indexs"
+            >
+              <p
+                class="set-ans-btn"
+                v-if="
+                  subQuestions.qusType &&
+                  subQuestions.subNum &&
+                  subQuestions.subNum > 4
+                "
+              >
+                <el-button type="primary" @click="setFormAns(indexs, index)"
+                  >批量设置答案</el-button
+                >
+              </p>
+              <div v-else class="sub-questions">
+                <div class="qs-num">
+                  {{ setNum(index, indexs, subQuestions) }}
+                </div>
+                <div class="qs-type">
+                  {{ setSubPro(subQuestions.questionType) }}
+                </div>
+                <div class="qs-score">
+                  <el-input-number
+                    class="number-ipt"
+                    size="medium"
+                    :min="1"
+                    :max="200"
+                    :precision="2"
+                    v-model="subQuestions.score"
+                    label="单题分值"
+                  ></el-input-number>
+                </div>
+                <div class="qs-partScore">
+                  <p v-if="subQuestions.questionType != 3">--</p>
+                  <el-input-number
+                    class="number-ipt"
+                    v-else
+                    size="medium"
+                    :min="0"
+                    :precision="2"
+                    :max="subQuestions.score"
+                    :step="0.5"
+                    v-model="subQuestions.partScore"
+                    label="漏选得分"
+                  ></el-input-number>
+                </div>
+                <div class="qs-options qs-options2">
+                  <p v-if="subQuestions.questionType == 5">--</p>
+                  <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.split(',')"
+                      :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.split(',')"
+                      :class="
+                        subQuestions.correctAnswer == option ? 'active' : ''
+                      "
+                      :key="option"
+                      @click="subQuestions.correctAnswer = option"
+                      >{{ option }}</span
+                    >
+                  </p>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </div>
+        <el-dialog :close-on-click-modal="false"
+          title="批量设置答案"
+          :visible.sync="diaSetAns"
+          width="400"
+          :modal-append-to-body="false"
+        >
+          <div class="qs-options">
+            <p class="dia-tips">
+              请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+            </p>
+            <p>{{ setSubPro(formAns.qusType) }}：</p>
+            <p class="ipt">
+              <el-input
+                v-if="formAns.qusType == 2 || formAns.qusType == 3"
+                ref="formAnsIpt"
+                v-model="formAns.answerList"
+                @keydown.native="keydownAnswer($event, formAns.qusType)"
+                @input="setAllAnswer($event, formAns.qusType)"
+              ></el-input>
+              <el-input
+                v-if="formAns.qusType == 4"
+                v-model="formAns.answerList"
+                readonly=""
+              ></el-input>
+            </p>
+            <p class="answer-box">
+              <template v-if="formAns.qusType == 4">
+                <span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✓')
+                      : ''
+                  "
+                  >✓</span
+                >
+                <span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✗')
+                      : ''
+                  "
+                  >✗</span
+                >
+              </template>
+              <template v-if="formAns.qusType == 3">
+                <span
+                  class="answer-s active"
+                  v-for="option in formAns.answerOptions.split(',')"
+                  :key="option"
+                  @click="setMultiple(formAns, option, 2)"
+                  >{{ option }}</span
+                >
+                <span
+                  class="answer-s active"
+                  @click="setMultiple(formAns, ',', 2)"
+                  >,</span
+                >
+              </template>
+              <template v-if="formAns.qusType == 2">
+                <span
+                  class="answer-s active"
+                  v-for="option in formAns.answerOptions.split(',')"
+                  :key="option"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += option)
+                      : ''
+                  "
+                  >{{ option }}</span
+                >
+              </template>
+              <span
+                class="answer-s delButton"
+                @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+                >x</span
+              >
+              <span class="answer-s ac" @click="formAns.answerList = ''"
+                >ac</span
+              >
+            </p>
+          </div>
+          <div class="dialog-footer" slot="footer">
+            <el-button @click="saveFormAns">确 定</el-button>
+            <el-button @click="diaSetAns = false">取 消</el-button>
+          </div>
+        </el-dialog>
+        <div class="btn-box">
+          <el-button type="danger" plain round @click="linkBack"
+            >取消</el-button
+          >
+          <el-button round @click="backStep1">上一步</el-button>
+          <el-button type="primary" round @click="save">保存</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { deepClone, checkAnswer } from "utils";
+const questionForm = {
+  questionTitle: "",
+  questionType: 2,
+  number: 10,
+  selectNum: 4,
+  score: 1,
+  partScore: 0,
+  answerList: "",
+};
+const subQuesOptions = {
+  questionType: 2,
+  score: 1,
+  partScore: 0,
+  selectNum: 4,
+  answerOptions: "A,B,C,D",
+  correctAnswer: "",
+};
+export default {
+  computed: {
+    allScore: function () {
+      let score = 0;
+      this.form.questionList.map((item) => {
+        score += item.subQuestions.reduce((a, b) => {
+          return a + Number(b.score ? b.score : 0);
+        }, 0);
+      }, 0);
+      return Number(score).toFixed(2);
+    },
+  },
+  watch: {
+    step: function () {
+      this.$nextTick(function () {
+        this.$refs.content.scrollTop = 0;
+      });
+    },
+  },
+  data() {
+    return {
+      type: 1, //1-创建，2-复制答题卡
+      dialogVisible: false, //测验类型设置弹窗
+      addQuestionVisible: false, //添加大题弹窗
+      questionForm: { ...questionForm },
+      questionFormRules: {
+        questionTitle: [
+          { required: true, message: "请输入大题名称", trigger: "blur" },
+          {
+            min: 1,
+            max: 30,
+            message: "长度在 1 到 30 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      questionOptions: [
+        { label: "单选题", value: 2 },
+        { label: "多选题", value: 3 },
+        { label: "判断题", value: 4 },
+        { label: "主观题", value: 5 },
+      ],
+      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
+      addSubQuestionsType: "",
+      step: 0, //步骤
+      gradeList: [], //年级
+      subjectList: [], //科目
+      answerTypeList: [], //测验类型
+      answerTypeName: "", //测验类型名称
+      form: {
+        //答题卡详情
+        title: "",
+        tagId: "",
+        gradeName: "",
+        subjectName: "",
+        examsDuration: 90,
+        sharingType: 0,
+        questionList: [],
+      },
+      formRules: {
+        //答题卡验证
+        title: [
+          { required: true, message: "请输入答题卡名称", trigger: "blur" },
+          {
+            min: 1,
+            max: 30,
+            message: "长度在 1 到 30 个字符",
+            trigger: "blur",
+          },
+        ],
+        gradeName: [{ required: true, message: "请选择年级", trigger: "blur" }],
+        subjectName: [
+          { required: true, message: "请选择科目", trigger: "blur" },
+        ],
+        examsDuration: [
+          { required: true, message: "请设置考试时长", trigger: "blur" },
+        ],
+      },
+      tagList: [],
+      diaSetAns: false,
+      formAns: {
+        listIndex: 0, //大题位置
+        endIndex: 0, //相同题目最后一位题目的questionIndex
+        index: 0, //相同题目最后一位题目的位置
+        qusType: "", //题目类型
+        subNum: 0, //数量
+        answerOptions: [], //答案选项
+        answerList: "", //答案列表-字符串
+      },
+    };
+  },
+  async created() {
+    this.type = this.$route.query.type ? this.$route.query.type : 1;
+    await this._GradeList();
+    await this._QuerySubjectList(this.gradeList[0]);
+    await this._TypeList();
+    if (this.type == 2) {
+      this._QueryDetail();
+    }
+  },
+  methods: {
+    linkBack() {
+      this.$confirm(
+        (this.type == 2 ? "修改复制的" : "组建的") +
+          "答题卡未保存，确认退出吗？",
+        "提示",
+        {
+          confirmButtonText: "取消",
+          cancelButtonText: "确定",
+          confirmButtonClass: "el-button--danger1",
+          cancelButtonClass: "el-button--primary",
+          showClose: false,
+          roundButton: true,
+          center: true,
+          type: "warning",
+        }
+      )
+        .then(() => {})
+        .catch(() => {
+          this.$router.push({
+            path: "/examinationPaper",
+          });
+        });
+    },
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    setNum(index, indexs, sub) {
+      let lengths = 0;
+      let subIndex = 0;
+      for (let i = 0; i < index; i++) {
+        let subArr = this.form.questionList[i].subQuestions.filter((item) => {
+          return !!item.questionType;
+        });
+        lengths += subArr.length;
+      }
+
+      for (let i = 0; i < indexs; i++) {
+        if (!!this.form.questionList[index].subQuestions[i].questionType) {
+          subIndex += 1;
+        }
+      }
+      return lengths + subIndex + 1;
+    },
+    setNums(ques) {
+      let lengths = 0;
+      let subArr = ques.filter((item) => {
+        return !!item.questionType;
+      });
+      lengths = subArr.length;
+      return lengths;
+    },
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = [
+        "一",
+        "二",
+        "三",
+        "四",
+        "五",
+        "六",
+        "七",
+        "八",
+        "九",
+        "十",
+        "十一",
+        "十二",
+        "十三",
+        "十四",
+        "十五",
+        "十六",
+        "十七",
+        "十八",
+        "十九",
+        "二十",
+      ];
+      txt = bigNum[num];
+
+      return txt;
+    },
+    setQuestionForm(val) {
+      //切换题型清空答案
+      this.questionForm.answerList = "";
+    },
+    changeQesNum(val) {
+      //减少题数设置答案
+      if (
+        this.questionForm.questionType == 2 ||
+        this.questionForm.questionType == 4
+      ) {
+        this.questionForm.answerList = this.questionForm.answerList.substring(
+          0,
+          val
+        );
+      } else {
+        console.log(this.questionForm.answerList.split(","));
+        this.questionForm.answerList = this.questionForm.answerList
+          .split(",")
+          .splice(0, val)
+          .join(",");
+      }
+    },
+    setFormAns(indexs, index) {
+      //初始化要修改的答案
+      this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
+      this.formAns.listIndex = index;
+      let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
+      this.formAns.answerList = [];
+      let answerList = "";
+      this.form.questionList[index].subQuestions.map((item, subIdx) => {
+        if (subIdx >= startIndex) {
+          answerList += this.setAnswer(item.questionType, item.correctAnswer);
+          if (subIdx != indexs) {
+            if (!!item.qusType) {
+              answerList = "";
+            }
+          } else {
+            if (item.qusType == 3) {
+              answerList = answerList.slice(0, -1);
+            }
+            this.formAns.answerList = answerList;
+          }
+        }
+      });
+
+      this.diaSetAns = true;
+    },
+    insertTxtAndSetcursor(element, answerList, str) {
+      let startPos = element.selectionStart; // 获取光标开始的位置
+      if (startPos === undefined) {
+        // 如果没有光标位置 不操作
+        return answerList;
+      } else {
+        return {
+          text:
+            answerList.substring(0, startPos) +
+            str +
+            answerList.substring(startPos), // 将文本插入
+          startPos: startPos + str.length,
+        };
+      }
+    },
+    setMultiple(obj, answer, type) {
+      //多选答案设置
+      let elements =
+        type == 1
+          ? this.$refs["formAnsIpt2"].$el.children[0]
+          : this.$refs["formAnsIpt"].$el.children[0];
+      let resault = this.insertTxtAndSetcursor(
+        elements,
+        obj.answerList || "",
+        answer
+      );
+      obj.answerList = resault.text;
+      let str = obj.answerList;
+      let str2;
+      if (!!obj.answerOptions) {
+        str2 = checkAnswer(
+          str,
+          3,
+          obj.answerOptions.split(",").length,
+          obj.subNum
+        );
+      } else {
+        str2 = checkAnswer(str, 3, obj.selectNum, obj.number);
+      }
+      obj.answerList = str2;
+      elements.focus();
+      elements.selectionStart = resault.startPos;
+    },
+    saveFormAns() {
+      //批量修改答案
+      let EndIndex;
+      let subNum = this.formAns.subNum - 1;
+      this.form.questionList[this.formAns.listIndex].subQuestions.some(
+        (item, index) => {
+          if (this.formAns.endIndex == item.questionIndex) {
+            EndIndex = index;
+            return;
+          }
+        }
+      );
+
+      for (let i = 0; i <= subNum; i++) {
+        let correctAnswer = "";
+        if (this.formAns.qusType == 2) {
+          correctAnswer = this.formAns.answerList[subNum - i] || "";
+        } else if (this.formAns.qusType == 3) {
+          correctAnswer = this.formAns.answerList.split(",")[subNum - i] || "";
+        } else if (this.formAns.qusType == 4) {
+          correctAnswer =
+            this.formAns.answerList[subNum - i] == "✓"
+              ? 1
+              : this.formAns.answerList[subNum - i] == "✗"
+              ? 2
+              : "";
+        }
+        this.form.questionList[this.formAns.listIndex].subQuestions[
+          EndIndex - i
+        ].correctAnswer = correctAnswer;
+      }
+      this.diaSetAns = false;
+    },
+    // 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 = "";
+    //   }
+    // },
+    keydownAnswer(event, type, isAddBig) {
+      let answerA = "ABCDEFG";
+      let answer_a = "abcdefg";
+      if (isAddBig) {
+        answerA = answerA.substring(0, this.questionForm.selectNum);
+        answer_a = answer_a.substring(0, this.questionForm.selectNum);
+      } else {
+        answerA = answerA.substring(0, this.formAns.subNum);
+        answer_a = answer_a.substring(0, this.formAns.subNum);
+      }
+      answerA += answer_a;
+      answerA = type == 2 ? answerA : answerA + ",";
+      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;
+      if (!answerA.includes(event.key)) {
+        event.returnValue = "";
+      }
+    },
+    setAllAnswer(event, type, isAddBig) {
+      if (isAddBig) {
+        let str = this.questionForm.answerList;
+        let str2 = checkAnswer(
+          str,
+          type,
+          this.questionForm.selectNum,
+          this.questionForm.number
+        );
+        this.questionForm.answerList = str2;
+      } else {
+        let str = this.formAns.answerList;
+        let str2 = checkAnswer(
+          str,
+          type,
+          this.formAns.answerOptions.split(",").length,
+          this.formAns.subNum
+        );
+        this.formAns.answerList = str2;
+      }
+    },
+    setAnswer(type, ans) {
+      let txt = "";
+      if (type == 2) {
+        txt = ans;
+      } else if (type == 3) {
+        txt = ans + ",";
+      } else if (type == 4) {
+        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
+      }
+      return txt;
+    },
+    backStep1() {
+      this.formatQuestionList();
+      this.step = 1;
+    },
+    setStep1() {
+      this.$refs["forms"].validate((valid) => {
+        // 验证通过：保存
+        if (valid) {
+          this.step = 1;
+        } else {
+          this.$message.error("数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    setStep2() {
+      if (!this.form.questionList.length) {
+        this.$message.warning("请添加题目！");
+        return;
+      }
+      // let valid = "";
+      // this.form.questionList.map((item, index) => {
+      //   if (!item.questionTitle) {
+      //     valid += index + 1 + "、";
+      //   }
+      // });
+      // if (!valid) {
+      //添加题目ID、序号
+      this.form.questionList.map((item, index) => {
+        item.questionType = 0;
+        item.subQuestions.map((items, indexs) => {
+          items.questionId = this.setNum(index, indexs);
+          items.questionIndex = this.setNum(index, indexs);
+        });
+      });
+      //整理问题
+      this.form.questionList?.map((item) => {
+        let types = [{}];
+        let addndex = 0;
+        item.subQuestions.map((sub, index) => {
+          if (!!sub.questionType) {
+            if (
+              sub.questionType == types[addndex].qusType &&
+              sub.questionType != 5
+            ) {
+              //同类型批量答案+1
+              types[addndex].subNum += 1;
+              if (
+                types[addndex].answerOptions.length < sub.answerOptions.length
+              ) {
+                types[addndex].answerOptions = sub.answerOptions;
+              }
+
+              // types[addndex].answerList += this.setAnswer(
+              //   sub.questionType,
+              //   sub.correctAnswer
+              // );
+              types[addndex].answerList = "";
+              if (index == item.subQuestions.length - 1) {
+                //循环最后类型数量大于等于5，保存批量答案
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  types[addndex].endIndex = sub.questionIndex;
+                  types[addndex].index = index;
+                }
+              }
+            } else {
+              if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                //不同类型时如果原有类型数量大于等于5，保存批量答案
+                types[addndex].endIndex =
+                  item.subQuestions[index - 1].questionIndex;
+                types[addndex].index = index - 1;
+                addndex += 1;
+                types[addndex] = {};
+              }
+              //不同类型初始化批量答案
+              types[addndex].qusType = sub.questionType;
+              types[addndex].subNum = 1;
+              types[addndex].answerOptions = sub.answerOptions;
+              types[addndex].answerList = "";
+            }
+          }
+        });
+        for (let i = 0; i < types.length; i++) {
+          if (types[i].subNum >= 5) {
+            item.subQuestions.splice(
+              types[i].index + i + 1,
+              0,
+              deepClone(types[i])
+            );
+          }
+        }
+        console.log(types);
+      });
+      this.step = 2;
+      return;
+      // } else {
+      //   this.$message.error(
+      //     `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
+      //   );
+      // }
+    },
+    formatQuestionList() {
+      for (let i = 0; i < this.form.questionList.length; i++) {
+        for (
+          let j = 0;
+          j < this.form.questionList[i].subQuestions.length;
+          j++
+        ) {
+          if (this.form.questionList[i].subQuestions[j].qusType) {
+            this.form.questionList[i].subQuestions.splice(j, 1);
+          }
+        }
+      }
+    },
+    openQuestion() {
+      this.questionForm = { ...questionForm };
+      this.addQuestionVisible = true;
+    },
+    addQuestion() {
+      //添加大题
+      let subQuestions = [];
+      let questionsOptions = {
+        ...subQuesOptions,
+        selectNum: this.questionForm.selectNum,
+        score: this.questionForm.score,
+        partScore: this.questionForm.partScore,
+        questionType:
+          this.questionForm.questionType == 6
+            ? 2
+            : this.questionForm.questionType,
+      };
+      switch (questionsOptions.questionType) {
+        case 2:
+          questionsOptions.answerOptions = this.rightOptions
+            .slice(0, questionsOptions.selectNum)
+            .join(",");
+          break;
+        case 3:
+          questionsOptions.answerOptions = this.rightOptions
+            .slice(0, questionsOptions.selectNum)
+            .join(",");
+          break;
+        case 4:
+          questionsOptions.selectNum = 0;
+          questionsOptions.answerOptions = "1,2";
+          break;
+        case 5:
+          questionsOptions.selectNum = 0;
+          break;
+      }
+      for (let i = 0; i < this.questionForm.number; i++) {
+        let answer = "";
+        if (questionsOptions.questionType == 4) {
+          answer =
+            this.questionForm.answerList[i] == "✓"
+              ? 1
+              : this.questionForm.answerList[i] == "✗"
+              ? 2
+              : "";
+        } else if (questionsOptions.questionType == 3) {
+          answer = this.questionForm.answerList.split(",")[i] || "";
+        } else if (questionsOptions.questionType == 2) {
+          answer = this.questionForm.answerList[i] || "";
+        }
+        questionsOptions.correctAnswer = answer;
+        subQuestions.push({ ...questionsOptions });
+      }
+      this.form.questionList.push({
+        questionTitle: this.questionForm.questionTitle,
+        number: this.questionForm.number,
+        source: 10,
+        subQuestions: [...subQuestions],
+        show: false,
+      });
+      this.addQuestionVisible = false;
+    },
+    delTabData(subIndex, index) {
+      //删除小题
+      console.log(subIndex);
+      console.log(index);
+      this.form.questionList[index].subQuestions.splice(subIndex, 1);
+    },
+    setScore(question) {
+      let score = question.subQuestions.reduce((a, b) => {
+        return a + (b.score ? b.score : 0);
+      }, 0);
+      return Number(score).toFixed(2);
+    },
+    equalScore(question) {
+      let score = 0;
+      let bools = true;
+      for (let i = 0; i < question.subQuestions.length; i++) {
+        if (i == 0) {
+          score = question.subQuestions[i].score;
+        } else {
+          if (score != question.subQuestions[i].score) {
+            bools = false;
+            break;
+          }
+        }
+      }
+      return bools;
+    },
+    changeAddSubQuestions(val, question) {
+      if (val) {
+        let questionsOptions = {
+          ...subQuesOptions,
+          questionType: val,
+        };
+        switch (questionsOptions.questionType) {
+          case 2:
+            questionsOptions.answerOptions = this.rightOptions
+              .slice(0, questionsOptions.selectNum)
+              .join(",");
+            break;
+          case 3:
+            questionsOptions.answerOptions = this.rightOptions
+              .slice(0, questionsOptions.selectNum)
+              .join(",");
+            questionsOptions.partScore = 0;
+            break;
+          case 4:
+            questionsOptions.selectNum = 0;
+            questionsOptions.answerOptions = "1,2";
+            break;
+          case 5:
+            questionsOptions.selectNum = 0;
+            break;
+        }
+        question.subQuestions.push(questionsOptions);
+        this.addSubQuestionsType = "";
+      }
+    },
+    changeSubQuestions(val, subQuestions) {
+      //切换多题型-小题题型
+      const that = this;
+      subQuestions.score = 1;
+      subQuestions.partScore = 0;
+      subQuestions.correctAnswer = "";
+      subQuestions.selectNum = 4;
+      switch (val) {
+        case 2:
+          subQuestions.answerOptions = that.rightOptions
+            .slice(0, subQuestions.selectNum)
+            .join(",");
+          break;
+        case 3:
+          subQuestions.answerOptions = that.rightOptions
+            .slice(0, subQuestions.selectNum)
+            .join(",");
+          break;
+        case 4:
+          subQuestions.selectNum = 0;
+          subQuestions.answerOptions = "1,2";
+          break;
+        case 5:
+          subQuestions.selectNum = 0;
+          break;
+      }
+    },
+    addOptions(subQuestions) {
+      //添加选项
+      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.split(",").length;
+      if (length < 3) return;
+      subQuestions.selectNum = length - 1;
+      subQuestions.answerOptions = this.rightOptions
+        .slice(0, subQuestions.selectNum)
+        .join(",");
+      subQuestions.correctAnswer = subQuestions.correctAnswer.slice(
+        0,
+        subQuestions.selectNum
+      );
+    },
+    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("");
+      }
+    },
+    openTagDia() {
+      this.tagList = deepClone(this.answerTypeList);
+      this.dialogVisible = true;
+    },
+    async editTypeName(obj) {
+      let isRepeat = false;
+      this.answerTypeList.map((item) => {
+        if (item.typeName == obj.typeName) {
+          isRepeat = true;
+        }
+      });
+      if (isRepeat) {
+        this.$message.error("类型已存在请重新填写！");
+        return;
+      }
+      //修改测验类型
+      const { data, status, info } = await this.$request.editPaperType({
+        tagId: obj.id,
+        tag: obj.typeName,
+      });
+      if (status == 0) {
+        await this._TypeList();
+        this.tagList = deepClone(this.answerTypeList);
+        this.$message.success("修改成功");
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async removeTypeName(obj) {
+      //删除测验类型
+      const { data, status, info } = await this.$request.delPaperType({
+        tagId: obj.id,
+      });
+      if (status == 0) {
+        await this._TypeList();
+        this.tagList = deepClone(this.answerTypeList);
+        this.$message.success("删除成功");
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async addPaperType() {
+      //保存测验类型
+      if (!this.answerTypeName) {
+        this.$message.error("请填写测验名称！");
+        return;
+      }
+      let isRepeat = false;
+      this.answerTypeList.map((item) => {
+        if (item.typeName == this.answerTypeName) {
+          isRepeat = true;
+        }
+      });
+      if (isRepeat) {
+        this.$message.error("类型已存在请重新填写！");
+        return;
+      }
+      //添加测验类型
+      const { data, status, info } = await this.$request.addPaperType({
+        tag: this.answerTypeName,
+      });
+      if (status == 0) {
+        await this._TypeList();
+        this.tagList = deepClone(this.answerTypeList);
+        this.form.tagId = data || "";
+        this.answerTypeName = "";
+        this.$message.success("添加成功");
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async save() {
+      if (this.saveLoading) return;
+      this.saveLoading = true;
+      this.formatQuestionList();
+      let formDatas = deepClone(this.form);
+      for (let i = 0; i < formDatas.questionList.length; i++) {
+        delete formDatas.questionList[i].show;
+      }
+      const { data, status, info } = await this.$request.addPaper({
+        ...formDatas,
+      });
+      this.saveLoading = false;
+      if (status == 0) {
+        this.$router.push({
+          path: "/examinationPaper",
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async changeGrade() {
+      //切换年级查询科目
+      this._QuerySubjectList(this.form.gradeName);
+    },
+    async _TypeList() {
+      //测验类型查询
+      const { data, status, info } = await this.$request.fetchTypeNames({
+        gradeName: this.form.gradeName,
+        type: 1,
+      });
+      if (status == 0) {
+        this.answerTypeList =
+          data.list?.map((item) => {
+            return {
+              typeName: item.tag,
+              id: item.tagId,
+            };
+          }) || [];
+        if (this.type != 2) {
+          this.form.tagId = this.answerTypeList[0]?.id || "";
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _GradeList() {
+      //查询年级列表
+      const { data, status, info } = await this.$request.fetchGradeList();
+      if (status == 0) {
+        this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
+        if (this.type != 2) {
+          this.form.gradeName = this.gradeList[0];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList(grade) {
+      //查询科目列表
+      const { data, status, info } = await this.$request.fetchSubjectList({
+        gradeName: grade,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        console.log(this.subjectList);
+        if (this.subjectList.length) {
+          this.form.subjectName = this.subjectList[0].value;
+        }
+        console.log(this.form);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDetail() {
+      //查询答题卡详情
+      const { data, status, info } = await this.$request.fetchPaperDetail({
+        paperId: this.$route.query.paperId,
+      });
+      if (status == 0) {
+        this.form.title = data.title + "_副本";
+        this.form.tagId = data.tagId === 0 ? "" : 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 || "A,B,C,D",
+                correctAnswer: items.correctAnswer,
+              };
+            }) || [];
+          return {
+            questionTitle: item.questionTitle,
+            subQuestions: subQuestions,
+            show: false,
+          };
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.red {
+  color: #f30;
+}
+.qs-options {
+  flex: 1;
+  .ipt {
+    margin-bottom: 5px;
+  }
+  .answer-box {
+    .answer-s {
+      cursor: pointer;
+      user-select: none;
+      &:first-of-type {
+        margin-left: 0;
+      }
+    }
+  }
+  .delButton {
+    text-indent: -9999999px;
+    border-color: #ff6868;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    color: transparent;
+  }
+  .answer-s.ac {
+    border: none;
+  }
+  .ac {
+    border-color: #ff6868;
+    background: #ff6868;
+    color: #fff !important;
+  }
+}
+
+.sel2 {
+  width: 480px;
+}
+.set-ans-btn {
+  width: 100%;
+  padding: 10px 0 10px 630px;
+  box-sizing: border-box;
+  border-right: 1px solid #e2e2e2;
+  border-bottom: 1px solid #e2e2e2;
+}
+.content-box {
+  width: 100%;
+  height: 100%;
+  overflow-y: auto;
+}
+.content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 50px;
+  .ml-20 {
+    margin-left: 20px;
+  }
+  .btn-box {
+    text-align: right;
+    margin-left: 140px;
+  }
+}
+.dia-content {
+  .dia-tit {
+    font-size: 20px;
+    color: #333;
+    font-weight: 700;
+    text-align: center;
+  }
+  .add-type {
+    width: 100%;
+    margin-bottom: 10px;
+    .js-set {
+      margin: 2.5px 10px 0 0;
+      font-size: 14px;
+    }
+  }
+  .add-btn {
+    margin-left: 20px;
+  }
+}
+.el-message-box {
+  :deep(.el-button--default) {
+    color: #fff;
+  }
+}
+.add-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .add-question {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 16px;
+    font-weight: bolder;
+    padding: 2px;
+    cursor: pointer;
+    .s1 {
+      margin-left: 6px;
+    }
+    :deep(.el-icon-plus) {
+      font-size: 24px;
+      font-weight: 900;
+    }
+    :deep(.el-button--mini.is-circle) {
+      padding: 3px;
+    }
+  }
+}
+.dialog-footer {
+  text-align: center;
+  :deep(.el-button) {
+    border-radius: 20px;
+    padding: 8px 20px 7px;
+    margin: 0 12px;
+  }
+}
+.question-box {
+  margin-bottom: 20px;
+}
+.question-title {
+  line-height: 40px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
+  .m20 {
+    margin-left: 20px;
+  }
+  .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;
+  }
+  .el-icon-caret-right {
+    font-size: 24px;
+    color: #888;
+    transition: all 0.4s;
+    margin-right: 12px;
+    cursor: pointer;
+    &.active {
+      transform: rotate(90deg);
+    }
+  }
+}
+.questions-ul {
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
+}
+.el-input-number {
+  width: 140px;
+}
+.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;
+  }
+}
+.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;
+    }
+  }
+}
+.qs-options {
+  .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;
+    cursor: pointer;
+    &.active {
+      background: #5e78fa;
+      border-color: #5e78fa;
+      color: #fff;
+    }
+  }
+}
+.sub-questions {
+  width: 100%;
+  display: flex;
+  border-bottom: 1px solid #e2e2e2;
+  & > div {
+    min-height: 40px;
+    padding: 5px;
+    flex-shrink: 0;
+    border-right: 1px solid #e2e2e2;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .qs-num {
+    width: 80px;
+  }
+  .qs-type {
+    width: 160px;
+  }
+  .qs-score,
+  .qs-partScore {
+    width: 160px;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-set {
+    width: 80px;
+  }
+  .qs-options2 {
+    text-align: left;
+    justify-content: flex-start;
+    padding-left: 20px;
+    .answer-s {
+      cursor: pointer;
+    }
+  }
+  :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;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/examinationPaper/detail.vue b/src/views/basic/examinationPaper/detail.vue
new file mode 100644
index 0000000..4611414
--- /dev/null
+++ b/src/views/basic/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/basic/examinationPaper/edit.vue b/src/views/basic/examinationPaper/edit.vue
new file mode 100644
index 0000000..4736cc5
--- /dev/null
+++ b/src/views/basic/examinationPaper/edit.vue
@@ -0,0 +1,997 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>修改答案</span>
+      </template>
+    </back-box>
+    <div class="content">
+      <template v-if="type == 1"
+        ><p class="tips" v-if="paperModifyLog.modifiedTime">
+          <i class="fa fa-bell-o"></i>
+          {{
+            `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
+          }}老师修改了答案
+        </p></template
+      >
+      <div class="answer-title">
+        <p class="name">{{ form.title || title }}</p>
+        <p class="totals">卷面总分：{{ allScore }}分</p>
+      </div>
+      <template v-if="questionList[0]?.subQuestions">
+        <div v-for="(question, index) in questionList" :key="index">
+          <p class="question-title">
+            <span>{{ setBigNum(index) }}、</span>
+            <el-input
+              class="ipt"
+              v-model.trim="question.questionTitle"
+              maxlength="30"
+              placeholder="填写大题名称"
+            ></el-input>
+            <span>共 {{ setScore(question) }} 分</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-options qs-options2">选项设置</div>
+            </li>
+            <li
+              v-for="(subQuestions, indexs) in question.subQuestions"
+              :key="indexs"
+            >
+              <p
+                class="set-ans-btn"
+                v-if="
+                  subQuestions.qusType &&
+                  subQuestions.subNum &&
+                  subQuestions.subNum > 4
+                "
+              >
+                <el-button type="primary" @click="setFormAns(indexs, index)"
+                  >批量设置答案</el-button
+                >
+              </p>
+              <div v-else class="sub-questions">
+                <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+                <div class="qs-type">
+                  {{ setSubPro(subQuestions.questionType) }}
+                </div>
+                <div class="qs-score">
+                  <el-input-number
+                    class="number-ipt"
+                    size="medium"
+                    :min="1"
+                    :max="200"
+                    :precision="2"
+                    :step="1"
+                    v-model="subQuestions.score"
+                    label="单题分值"
+                  ></el-input-number>
+                </div>
+                <div class="qs-partScore">
+                  <p v-if="subQuestions.questionType != 3">--</p>
+                  <el-input-number
+                    class="number-ipt"
+                    v-else
+                    size="medium"
+                    :min="0"
+                    :precision="2"
+                    :max="subQuestions.score"
+                    :step="0.5"
+                    v-model="subQuestions.partScore"
+                    label="漏选得分"
+                  ></el-input-number>
+                </div>
+                <div class="qs-options qs-options2">
+                  <p v-if="subQuestions.questionType == 5">--</p>
+                  <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">
+                    <template
+                      v-for="option in subQuestions.answerOptions.split(',')"
+                    >
+                      <span
+                        v-if="option"
+                        class="answer-s"
+                        :class="
+                          subQuestions.correctAnswer.includes(option)
+                            ? 'active'
+                            : ''
+                        "
+                        :key="option"
+                        @click="changAnswer(subQuestions, option)"
+                        >{{ option }}</span
+                      >
+                    </template>
+                  </p>
+                  <p v-if="subQuestions.questionType == 2" class="answer-box">
+                    <template
+                      v-for="option in subQuestions.answerOptions.split(',')"
+                    >
+                      <span
+                        class="answer-s"
+                        v-if="option"
+                        :class="
+                          subQuestions.correctAnswer == option ? 'active' : ''
+                        "
+                        :key="option"
+                        @click="subQuestions.correctAnswer = option"
+                        >{{ option }}</span
+                      >
+                    </template>
+                  </p>
+                </div>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </template>
+      <ul class="questions-ul" v-else>
+        <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-options qs-options2">选项设置</div>
+        </li>
+        <li v-for="(subQuestions, indexs) in questionList" :key="indexs">
+          <p
+            class="set-ans-btn"
+            v-if="
+              subQuestions.qusType &&
+              subQuestions.subNum &&
+              subQuestions.subNum > 4
+            "
+          >
+            <el-button type="primary" @click="setFormAns(indexs, index)"
+              >批量设置答案</el-button
+            >
+          </p>
+          <div v-else class="sub-questions">
+            <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">
+              <p v-if="subQuestions.questionType != 3">--</p>
+              <el-input-number
+                class="number-ipt"
+                v-else
+                size="medium"
+                :min="0"
+                :precision="2"
+                :max="subQuestions.score"
+                :step="0.5"
+                v-model="subQuestions.partScore"
+                label="漏选得分"
+              ></el-input-number>
+            </div>
+            <div class="qs-options qs-options2">
+              <p v-if="subQuestions.questionType == 5">--</p>
+              <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">
+                <template
+                  v-for="option in subQuestions.answerOptions.split(',')"
+                >
+                  <span
+                    v-if="option"
+                    class="answer-s"
+                    :class="
+                      subQuestions.correctAnswer.includes(option)
+                        ? 'active'
+                        : ''
+                    "
+                    :key="option"
+                    @click="changAnswer(subQuestions, option)"
+                    >{{ option }}</span
+                  >
+                </template>
+              </p>
+              <p v-if="subQuestions.questionType == 2" class="answer-box">
+                <template
+                  v-for="option in subQuestions.answerOptions.split(',')"
+                >
+                  <span
+                    class="answer-s"
+                    v-if="option"
+                    :class="
+                      subQuestions.correctAnswer == option ? 'active' : ''
+                    "
+                    :key="option"
+                    @click="subQuestions.correctAnswer = option"
+                    >{{ option }}</span
+                  >
+                </template>
+              </p>
+            </div>
+          </div>
+        </li>
+      </ul>
+      <div class="btn-box">
+        <el-button type="danger" plain round @click="linkBack">取消</el-button>
+        <el-button type="primary" round @click="save">保存</el-button>
+      </div>
+      <el-dialog :close-on-click-modal="false"
+        title="批量设置答案"
+        :visible.sync="diaSetAns"
+        width="400"
+        :modal-append-to-body="false"
+      >
+        <div class="qs-options set-questions">
+          <p class="dia-tips">
+            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+          </p>
+          <p>{{ setSubPro(formAns.qusType) }}：</p>
+          <p class="ipt">
+            <el-input
+              ref="formAnsIpt"
+              v-if="formAns.qusType == 2 || formAns.qusType == 3"
+              v-model="formAns.answerList"
+              @keydown.native="keydownAnswer($event, formAns.qusType)"
+              @input="setAllAnswer($event, formAns.qusType)"
+            ></el-input>
+            <el-input
+              v-if="formAns.qusType == 4"
+              v-model="formAns.answerList"
+              readonly=""
+            ></el-input>
+          </p>
+          <p class="answer-box">
+            <template v-if="formAns.qusType == 4">
+              <span
+                class="answer-s active"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += '✓')
+                    : ''
+                "
+                >✓</span
+              >
+              <span
+                class="answer-s active"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += '✗')
+                    : ''
+                "
+                >✗</span
+              >
+            </template>
+            <template v-if="formAns.qusType == 3">
+              <span
+                class="answer-s active"
+                v-for="option in formAns.answerOptions.split(',')"
+                :key="option"
+                @click="setMultiple(formAns, option)"
+                >{{ option }}</span
+              >
+              <span class="answer-s active" @click="setMultiple(formAns, ',')"
+                >,</span
+              >
+            </template>
+            <template v-if="formAns.qusType == 2">
+              <span
+                class="answer-s active"
+                v-for="option in formAns.answerOptions.split(',')"
+                :key="option"
+                @click="
+                  formAns.answerList.length < formAns.subNum
+                    ? (formAns.answerList += option)
+                    : ''
+                "
+                >{{ option }}</span
+              >
+            </template>
+            <span
+              class="answer-s delButton"
+              @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+              >x</span
+            >
+            <span class="answer-s ac" @click="formAns.answerList = ''">ac</span>
+          </p>
+        </div>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="saveFormAns">确 定</el-button>
+          <el-button @click="diaSetAns = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { deepClone, checkAnswer } from "utils";
+export default {
+  data() {
+    return {
+      role: "",
+      questionList: [],
+      form: {
+        //答题卡详情
+        title: "",
+        tag: "",
+        subjectId: "",
+        examsDuration: 90,
+        gradeName: "",
+        share: 1,
+        questionList: [],
+      },
+      title: "",
+      type: 1,
+      paperModifyLog: {
+        realName: "",
+        modifiedTime: "",
+      },
+      diaSetAns: false,
+      formAns: {
+        listIndex: 0, //大题位置
+        endIndex: 0, //相同题目最后一位题目的questionIndex
+        index: 0,
+        qusType: "", //题目类型
+        subNum: 0, //数量
+        answerOptions: [], //答案选项
+        answerList: "", //答案列表-字符串
+      },
+    };
+  },
+  computed: {
+    allScore: function () {
+      let score = 0;
+      this.questionList?.map((item) => {
+        if (item.subQuestions) {
+          score += item.subQuestions.reduce((a, b) => {
+            return a + (Number(b.score) || 0);
+          }, 0);
+        } else {
+          score += item.score;
+        }
+      }, 0);
+      return Number(score).toFixed(2);
+    },
+  },
+  created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.type = this.$route.query.type || 1;
+    this.title = this.$route.query.title || "";
+    this._QueryDetail();
+  },
+  methods: {
+    linkBack() {
+      this.$router.push({
+        path: "/examinationPaper",
+      });
+    },
+    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;
+    },
+    setScore(question) {
+      let score = question.subQuestions.reduce((a, b) => {
+        return a + (b.score || 0);
+      }, 0);
+      return Number(score).toFixed(2);
+    },
+    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("");
+      }
+    },
+    keydownAnswer(event, type) {
+      let answerA = "ABCDEFG";
+      let answer_a = "abcdefg";
+      answerA = answerA.substring(0, this.formAns.subNum);
+      answer_a = answer_a.substring(0, this.formAns.subNum);
+      answerA += answer_a;
+      answerA = type == 2 ? answerA : answerA + ",";
+      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;
+      if (!answerA.includes(event.key)) {
+        event.returnValue = "";
+      }
+    },
+    setAllAnswer(event, type) {
+      let str = this.formAns.answerList;
+      let str2 = checkAnswer(
+        str,
+        type,
+        this.formAns.answerOptions.split(",").length,
+        this.formAns.subNum
+      );
+      this.formAns.answerList = str2;
+    },
+    setAnswer(type, ans) {
+      let txt = "";
+      if (type == 2) {
+        txt = ans;
+      } else if (type == 3) {
+        txt = ans + ",";
+      } else if (type == 4) {
+        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
+      }
+      return txt;
+    },
+    insertTxtAndSetcursor(answerList, str) {
+      let element = this.$refs.formAnsIpt.$el.children[0]; // 获取到指定标签
+      let startPos = element.selectionStart; // 获取光标开始的位置
+      if (startPos === undefined) {
+        // 如果没有光标位置 不操作
+        return answerList;
+      } else {
+        return {
+          text:
+            answerList.substring(0, startPos) +
+            str +
+            answerList.substring(startPos), // 将文本插入
+          startPos: startPos + str.length,
+        };
+      }
+    },
+    setMultiple(obj, answer) {
+      //多选答案设置
+      let resault = this.insertTxtAndSetcursor(obj.answerList || "", answer);
+      obj.answerList = resault.text;
+      let str = obj.answerList;
+      let str2 = checkAnswer(
+        str,
+        3,
+        obj.answerOptions.split(",").length,
+        obj.subNum
+      );
+      obj.answerList = str2;
+      this.$refs.formAnsIpt.$el.children[0].focus();
+      this.$refs.formAnsIpt.$el.children[0].selectionStart = resault.startPos;
+    },
+    setFormAns(indexs, index) {
+      //初始化要修改的答案
+      if (this.questionList[0].subQuestions) {
+        this.formAns = { ...this.questionList[index].subQuestions[indexs] };
+        this.formAns.listIndex = index;
+        let answerList = "";
+        let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
+        this.questionList[index].subQuestions.map((item, subIdx) => {
+          if (subIdx >= startIndex) {
+            answerList += this.setAnswer(item.questionType, item.correctAnswer);
+            if (subIdx != indexs) {
+              if (!!item.qusType) {
+                answerList = "";
+              }
+            } else {
+              if (item.qusType == 3) {
+                answerList = answerList.slice(0, -1);
+              }
+              this.formAns.answerList = answerList;
+            }
+          }
+        });
+      } else {
+        this.formAns = { ...this.questionList[indexs] };
+        let startIndex = this.formAns.endIndex - this.formAns.subNum;
+        this.formAns.listIndex = indexs;
+        let answerList = "";
+        this.questionList[index].map((item, subIdx) => {
+          if (subIdx >= startIndex) {
+            answerList += this.setAnswer(item.questionType, item.correctAnswer);
+            if (subIdx != indexs) {
+              if (!!item.qusType) {
+                answerList = "";
+              }
+            } else {
+              if (item.qusType == 3) {
+                answerList = answerList.slice(0, -1);
+              }
+              this.formAns.answerList = answerList;
+            }
+          }
+        });
+      }
+      this.diaSetAns = true;
+    },
+    saveFormAns() {
+      //批量修改答案
+      let EndIndex;
+      let subNum = this.formAns.subNum - 1;
+      if (this.questionList[this.formAns.listIndex].subQuestions) {
+        this.questionList[this.formAns.listIndex].subQuestions.some(
+          (item, index) => {
+            if (this.formAns.endIndex == item.questionIndex) {
+              EndIndex = index;
+              return;
+            }
+          }
+        );
+      } else {
+        this.questionList.some((item, index) => {
+          if (this.formAns.endIndex == item.questionIndex) {
+            EndIndex = index;
+            return;
+          }
+        });
+      }
+
+      for (let i = 0; i <= subNum; i++) {
+        let correctAnswer = "";
+        if (this.formAns.qusType == 2) {
+          correctAnswer = this.formAns.answerList[subNum - i] || "";
+        } else if (this.formAns.qusType == 3) {
+          correctAnswer = this.formAns.answerList.split(",")[subNum - i] || "";
+        } else if (this.formAns.qusType == 4) {
+          correctAnswer =
+            this.formAns.answerList[subNum - i] == "✓"
+              ? 1
+              : this.formAns.answerList[subNum - i] == "✗"
+              ? 2
+              : "";
+        }
+        if (this.questionList[0].subQuestions) {
+          this.questionList[this.formAns.listIndex].subQuestions[
+            EndIndex - i
+          ].correctAnswer = correctAnswer;
+        } else {
+          this.questionList[EndIndex - i].correctAnswer = correctAnswer;
+        }
+      }
+      this.diaSetAns = false;
+    },
+    async save() {
+      for (let i = 0; i < this.questionList.length; i++) {
+        if (this.questionList[0].subQuestions) {
+          for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
+            if (this.questionList[i].subQuestions[j].qusType) {
+              this.questionList[i].subQuestions.splice(j, 1);
+            }
+          }
+        } else {
+          if (this.questionList[i].qusType) {
+            this.questionList.splice(i, 1);
+            i--;
+          }
+        }
+      }
+      let questionList = this.questionList.map((item) => {
+        item.score = null;
+        // item.questionId = "";
+        // item.questionIndex = "";
+        return item;
+      });
+      //更新答题卡
+      let modifyPaper, params;
+      if (this.type == 1) {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pModifyPaper
+            : this.$request.modifyPaper;
+        params = {
+          paperId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else if (this.type == 2) {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetExamAnswer
+            : this.$request.setExamAnswer;
+        params = {
+          examId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetPeriodAnswer
+            : this.$request.setPeriodAnswer;
+        params = {
+          periodId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      }
+      const { data, status, info } = await modifyPaper(params);
+      if (status == 0) {
+        this.$router.go(-1);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDetail() {
+      //查询详情
+      let detail;
+      if (this.role == "ROLE_PERSONAL") {
+        detail =
+          this.type == 1
+            ? this.$request.pPaperDetail
+            : this.type == 2
+            ? this.$request.pExamQuestionList
+            : this.$request.pPeriodQuestionList;
+      } else {
+        detail =
+          this.type == 1
+            ? this.$request.fetchPaperDetail
+            : this.type == 2
+            ? this.$request.examQuestionList
+            : this.$request.periodQuestionList;
+      }
+      let params =
+        this.type == 1
+          ? { paperId: this.$route.query.paperId }
+          : this.type == 2
+          ? { examId: this.$route.query.paperId }
+          : {
+              periodId: this.$route.query.paperId,
+            };
+      const { data, status, info } = await detail(params);
+      if (status == 0) {
+        this.form = deepClone(data);
+        this.questionList = deepClone(this.form.questionList || data.list);
+        this.paperModifyLog = {
+          ...this.paperModifyLog,
+          ...this.form.paperModifyLog,
+        };
+        if (!!this.questionList[0]?.subQuestions) {
+          this.questionList?.map((item) => {
+            let types = [{}];
+            let addndex = 0;
+            item.subQuestions.map((sub, index) => {
+              if (!!sub.questionType) {
+                if (
+                  sub.questionType == types[addndex].qusType &&
+                  sub.questionType != 5
+                ) {
+                  //同类型批量答案+1
+                  types[addndex].subNum += 1;
+                  if (
+                    types[addndex].answerOptions.length <
+                    sub.answerOptions.length
+                  ) {
+                    types[addndex].answerOptions = sub.answerOptions;
+                  }
+                  types[addndex].answerList += this.setAnswer(
+                    sub.questionType,
+                    sub.correctAnswer
+                  );
+                  if (index == item.subQuestions.length - 1) {
+                    //循环最后类型数量大于等于5，保存批量答案
+                    if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                      types[addndex].endIndex = sub.questionIndex;
+                      types[addndex].index = index;
+                    }
+                  }
+                } else {
+                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                    //不同类型时如果原有类型数量大于等于5，保存批量答案
+                    types[addndex].endIndex =
+                      item.subQuestions[index - 1].questionIndex;
+                    types[addndex].index = index - 1;
+                    addndex += 1;
+                    types[addndex] = {};
+                  }
+                  //不同类型初始化批量答案
+                  types[addndex].qusType = sub.questionType;
+                  types[addndex].subNum = 1;
+                  types[addndex].answerOptions = sub.answerOptions;
+                  types[addndex].answerList = this.setAnswer(
+                    sub.questionType,
+                    sub.correctAnswer
+                  );
+                }
+              }
+            });
+            for (let i = 0; i < types.length; i++) {
+              if (types[i].qusType == 3) {
+                types[i].answerList = types[i].answerList.slice(0, -1);
+              }
+              if (types[i].subNum >= 5) {
+                item.subQuestions.splice(
+                  types[i].index + i + 1,
+                  0,
+                  deepClone(types[i])
+                );
+              }
+            }
+          });
+        } else {
+          let types = [{}];
+          let addndex = 0;
+          this.questionList?.map((sub, index) => {
+            if (!!sub.questionType) {
+              if (
+                sub.questionType == types[addndex].qusType &&
+                sub.questionType != 5
+              ) {
+                //同类型批量答案+1
+                types[addndex].subNum += 1;
+                if (
+                  types[addndex].answerOptions.length < sub.answerOptions.length
+                ) {
+                  types[addndex].answerOptions = sub.answerOptions;
+                }
+                types[addndex].answerList += this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+                if (index == this.questionList.length - 1) {
+                  //循环最后类型数量大于等于5，保存批量答案
+                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                    types[addndex].endIndex = sub.questionIndex;
+                    types[addndex].index = index;
+                  }
+                }
+              } else {
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  //不同类型时如果原有类型数量大于等于5，保存批量答案
+                  types[addndex].endIndex =
+                    this.questionList[index - 1].questionIndex;
+                  types[addndex].index = index - 1;
+                  addndex += 1;
+                  types[addndex] = {};
+                }
+                //不同类型初始化批量答案
+                types[addndex].qusType = sub.questionType;
+                types[addndex].subNum = 1;
+                types[addndex].answerOptions = sub.answerOptions;
+                types[addndex].answerList = this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+              }
+            }
+          });
+          for (let i = 0; i < types.length; i++) {
+            if (types[i].qusType == 3) {
+              types[i].answerList = types[i].answerList.slice(0, -1);
+            }
+            if (types[i].subNum >= 5) {
+              item.subQuestions.splice(
+                types[i].index + i + 1,
+                0,
+                deepClone(types[i])
+              );
+            }
+          }
+        }
+        console.log(this.questionList);
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 50px;
+  .ml-20 {
+    margin-left: 20px;
+  }
+  .btn-box {
+    width: calc(100% - 240px);
+    position: fixed;
+    right: 40px;
+    bottom: 20px;
+    padding: 10px 0 20px;
+    background: #fff;
+    text-align: right;
+    margin-left: 140px;
+    z-index: 10;
+  }
+  .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: 20px 0;
+  .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;
+  }
+}
+.set-ans-btn {
+  width: 100%;
+  padding: 10px 0 10px 630px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #e2e2e2;
+  border-right: 1px solid #e2e2e2;
+}
+.el-input-number {
+  width: 140px;
+}
+
+.questions-ul {
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
+  margin: 12px 0;
+}
+.sub-questions {
+  width: 100%;
+  display: flex;
+  border-bottom: 1px solid #e2e2e2;
+  & > div {
+    min-height: 40px;
+    padding: 5px;
+    flex-shrink: 0;
+    border-right: 1px solid #e2e2e2;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .qs-num {
+    width: 80px;
+  }
+  .qs-type {
+    width: 160px;
+  }
+  .qs-score,
+  .qs-partScore {
+    width: 160px;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-set {
+    width: 80px;
+  }
+  .qs-options2 {
+    text-align: left;
+    justify-content: flex-start;
+    padding-left: 20px;
+  }
+  .answer-s {
+    cursor: pointer;
+  }
+  :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;
+    }
+  }
+}
+.set-questions {
+  .answer-box {
+    .answer-s {
+      cursor: pointer;
+      user-select: none;
+      &:first-of-type {
+        margin-left: 0;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/examinationPaper/index.vue b/src/views/basic/examinationPaper/index.vue
new file mode 100644
index 0000000..6c3fe42
--- /dev/null
+++ b/src/views/basic/examinationPaper/index.vue
@@ -0,0 +1,537 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>备题组卷</span>
+      </template>
+      <template slot="btns">
+        <el-button
+          type="primary"
+          size="mini"
+          icon="el-icon-plus"
+          plain
+          @click="toAdd({})"
+        >
+          添加答题卡</el-button
+        >
+      </template>
+    </back-box>
+
+    <div class="answer-header">
+      <div class="sel-box">
+        <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.subjectName"
+          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
+          class="sel"
+          v-model="query.tagId"
+          placeholder="选择类型"
+          @change="_QueryData()"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            >{{ item.label }}
+          </el-option>
+        </el-select>
+        <el-input
+          placeholder="试卷名称"
+          v-model="query.title"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(true)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(true)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <p class="tips" v-show="archivedTotal">
+      <span>回收站内已有{{ archivedTotal }}份答题卡,</span>
+      <router-link to="/examinationPaperRecycle">点击查看&gt;&gt;</router-link>
+    </p>
+    <ul class="content" v-if="tableData && tableData.length">
+      <li class="item" v-for="item in tableData" :key="item.id">
+        <div class="pic-box">
+          <p class="i-box"><i class="fa fa-map-o"></i></p>
+          <p class="ids">{{ item.id }}</p>
+        </div>
+        <div class="info">
+          <p class="title">
+            {{ item.title }}
+            <span class="label" v-if="!!item.tag">{{ item.tag }}</span>
+          </p>
+          <p class="num">
+            总题数：{{ item.questionNum }}
+            <em class="s-line">|</em>
+            预计时长：{{ item.examsDuration }}
+            <em class="s-line">|</em>
+            授课端同步：
+            <span
+              class="clazz"
+              v-for="(clazzChild, indexs) in item.classList"
+              :key="clazzChild.classId"
+              :class="clazzChild.keepStatus == 1?'active':''"
+              >{{
+                `${clazzChild.className}${
+                  indexs != item.classList.length - 1 ? "、" : ""
+                }`
+              }}
+              <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
+            ></span>
+            <el-tooltip effect="dark" content="刷新同步状态" placement="right">
+              <i class="icon-refresh el-icon-refresh" @click="refreshStic"></i>
+            </el-tooltip>
+          </p>
+          <p class="person">
+            {{ item.realName }}<em class="s-line">|</em
+            ><span class="date">{{ item.modifiedTime }}</span>
+          </p>
+        </div>
+        <div class="btn-box">
+          <el-tooltip effect="dark" content="修改答案" placement="bottom">
+            <el-button
+              class="edit"
+              type="primary"
+              size="mini"
+              circle
+              icon="el-icon-edit"
+              @click="toEdit(item)"
+            ></el-button>
+          </el-tooltip>
+          <el-dropdown
+            trigger="click"
+            @command="handleDropdownClick($event, item)"
+          >
+            <el-button
+              type="info"
+              size="mini"
+              circle
+              icon="el-icon-more"
+            ></el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="1" v-if="userName == item.realName"
+                >修改分享范围</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>
+      </li>
+    </ul>
+    <div class="pagination-box">
+      <el-pagination
+        small=""
+        layout="total,prev, pager, next"
+        :hide-on-single-page="true"
+        :total="total"
+        @current-change="changePage"
+        :current-page="page"
+        :page-size="size"
+      >
+      </el-pagination>
+    </div>
+    <el-empty
+      v-if="!loading && tableData.length == 0"
+      content="没有更多数据"
+      :image-size="100"
+    ></el-empty>
+    <el-dialog :close-on-click-modal="false" title="选择分享范围" :visible.sync="dialogVisible" width="400">
+      <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
+        <el-form-item prop="share" label="分享范围：">
+          <el-radio-group v-model="shareForm.sharingType">
+            <el-radio :label="0">任课班级分享</el-radio>
+            <el-radio :label="1">全年级分享</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveShare">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "examinationPaper",
+  data() {
+    return {
+      loading: false,
+      userName: "",
+      dialogVisible: false,
+      query: {
+        classId: "",
+        subjectName: "",
+        tagId: "",
+        title: "",
+      },
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      archivedTotal: 0, //已归档答题卡数量
+      tableData: null,
+      shareForm: {
+        id: "",
+        sharingType: 0, //0-任课班级/1-全年级
+      },
+      shareRulesForm: {
+        sharingType: [
+          { required: true, message: "选择分享范围", trigger: "blur" },
+        ],
+      },
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  async created() {
+    this.userName = this.$store.getters.info.name || "";
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    this._QueryData();
+    this._QueryTypeList();
+  },
+  methods: {
+    refreshStic(){
+      setTimeout(function(){
+        window.location.reload()
+      },500)
+    },
+    toAdd(query) {
+      let routerItem = {
+        path: "/examinationPaperAdd",
+      };
+      query ? (routerItem["query"] = { ...query }) : "";
+      this.$router.push(routerItem);
+    },
+    toEdit(item) {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+        },
+      });
+    },
+    handleDropdownClick(value, item) {
+      //更多
+      const that = this;
+      switch (value) {
+        case 1:
+          //修改分享范围
+          that.shareForm.id = item.id;
+          that.shareForm.sharingType = item.sharingType;
+          that.dialogVisible = true;
+          break;
+        case 2:
+          //复制
+          that.toAdd({ type: 2, paperId: item.id });
+          break;
+        case 3:
+          //归档
+          that.recovery(item);
+          break;
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
+    },
+    async saveShare() {
+      //修改分享范围
+      const { data, status, info } = await this.$request.modifyPaper({
+        paperId: this.shareForm.id,
+        sharingType: this.shareForm.sharingType,
+      });
+      if (status === 0) {
+        this.shareForm.id = "";
+        this.shareForm.sharingType = 1;
+        this.dialogVisible = false;
+        this.$message.success(info);
+        this._QueryData(this.query.title == "");
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async recovery(item) {
+      //归档
+      const { data, status, info } = await this.$request.modifyPaper({
+        paperId: item.id,
+        status: 2,
+      });
+      if (status === 0) {
+        let type = this.query.title ? 1 : 0;
+        this.page = 1;
+        this._QueryData(type);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //切换班级
+    async changClazz() {
+      await this._QuerySubjectList();
+      this._QueryData(false);
+    },
+    // 查找答题卡类型
+    async _QueryTypeList() {
+      const { data, status, info } = await this.$request.fetchTypeNames({
+        classId: this.query.classId,
+        type: 0,
+      });
+      if (status === 0) {
+        this.typeList =
+          data.list.map((item) => {
+            return {
+              value: item.tagId,
+              label: item.tag,
+            };
+          }) || [];
+        this.typeList.unshift({
+          value: "",
+          label: "请选择标签",
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryClassList() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.fetchClassList();
+      console.log(status);
+      if (status === 0) {
+        if (!!data.list) {
+          this.classList =
+            data.list?.map((item) => {
+              return {
+                value: item.classId,
+                label: item.className,
+              };
+            }) || [];
+          this.query.classId = this.classList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找科目
+    async _QuerySubjectList() {
+      const { data, status, info } = await this.$request.fetchSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.query.subjectName = this.subjectList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData(type) {
+      this.loading = true;
+      //获取答题卡列表
+      let query = {};
+      if (!type) {
+        this.query.title = "";
+        query = { ...this.query };
+      } else {
+        query = { title: this.query.title };
+        this.query.tagId = "";
+        // this.query.subjectName = "";
+      }
+      query.classId = this.query.classId;
+      query.subjectName = this.query.subjectName;
+      for (let key in query) {
+        if (!query[key]) {
+          query[key] = null;
+        }
+      }
+      if (!query.classId) {
+        this.total = 0;
+        this.tableData = [];
+        this.loading = false;
+        return;
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.fetchPaperList({
+        ...query,
+        status: 1,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.archivedTotal = data.archivedTotal;
+        this.total = data.total;
+        this.tableData = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.tips {
+  display: flex;
+  padding-left: 30px;
+  line-height: 16px;
+  font-size: 14px;
+  color: #999;
+  margin-bottom: 10px;
+}
+.content {
+  margin: 0 20px;
+  background: #f8f8f8;
+  padding: 12px;
+  border-radius: 20px;
+  .item {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    padding: 12px;
+    border-radius: 20px;
+    background: #fff;
+    margin-bottom: 12px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+    .pic-box {
+      width: 80px;
+      height: 80px;
+      border-radius: 10px;
+      margin-right: 10px;
+      flex-shrink: 0;
+      background: #667ffd;
+      text-align: center;
+      color: #fff;
+      font-weight: 500;
+      .i-box {
+        padding-top: 10px;
+        font-size: 32px;
+        margin-bottom: 3px;
+      }
+    }
+    .info {
+      min-height: 80px;
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .s-line {
+        padding: 0 5px;
+        color: #e2e2e2;
+      }
+      .title {
+        font-size: 16px;
+        color: #222;
+        font-weight: 500;
+        .label {
+          display: inline-block;
+          font-size: 12px;
+          color: #2e9afe;
+          line-height: 16px;
+          padding: 0 10px;
+          border: 1px solid #2e9afe;
+          border-radius: 10px;
+          transform: translateY(-2px);
+        }
+      }
+      .person {
+        color: #666;
+      }
+    }
+    .clazz {
+      font-size: 14px;
+      font-weight: 500;
+      position: relative;
+      position: relative;
+      &.active {
+        color: #667ffd;
+      }
+      .el-icon-success {
+        position: absolute;
+        right: 0;
+        top: -5px;
+        color: #667ffd;
+      }
+      &:last-of-type {
+        .el-icon-success {
+          right: -18px;
+        }
+      }
+    }
+    .btn-box {
+      flex-shrink: 0;
+      .edit {
+        margin-right: 12px;
+      }
+    }
+    .icon-refresh{
+      margin-left:20px;
+      cursor: pointer;
+      &:hover{
+        color:#2e9afe
+      }
+    }
+  }
+}
+.answer-header {
+  .sel-box {
+    .sel {
+      min-width: 160px;
+    }
+    :deep(.el-cascader__tags) {
+      flex-wrap: nowrap;
+    }
+  }
+}
+.dialog-footer {
+  text-align: center;
+  :deep(.el-button) {
+    border-radius: 20px;
+    padding: 8px 20px 7px;
+    margin: 0 12px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/examinationPaper/recycle.vue b/src/views/basic/examinationPaper/recycle.vue
new file mode 100644
index 0000000..110986a
--- /dev/null
+++ b/src/views/basic/examinationPaper/recycle.vue
@@ -0,0 +1,411 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>已归档答题卡</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <!-- <el-cascader size="small"
+          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.subjectName"
+          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
+          class="sel"
+          v-model="query.tagId"
+          placeholder="选择类型"
+          @change="_QueryData()"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            >{{ item.label }}
+          </el-option>
+        </el-select>
+
+        <el-input
+          placeholder="输入试卷名称"
+          v-model="query.title"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(true)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(true)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <ul class="content" v-loading="loading">
+      <li class="item" v-for="item in tableData" :key="item.id">
+        <div class="pic-box">
+          <p class="i-box"><i class="fa fa-map-o"></i></p>
+          <p class="ids">{{ item.id }}</p>
+        </div>
+        <div class="info">
+          <p class="title">
+            {{ item.title }} <span class="label" v-if="item.tag">{{ item.tag }}</span>
+          </p>
+          <p class="num">
+            {{ item.gradeName }}
+            <em class="s-line">|</em>
+            总题数：{{ item.questionNum }}
+            <em class="s-line">|</em>
+            预计时长：{{ item.examsDuration }}
+          </p>
+          <p class="person">
+            {{ item.realName }}<em class="s-line">|</em
+            ><span class="date">{{ item.modifiedTime }}</span>
+          </p>
+        </div>
+        <div class="btn-box">
+          <el-tooltip effect="dark" content="恢复" placement="bottom">
+            <el-button
+              class="edit"
+              type="info"
+              size="mini"
+              circle
+              icon="fa fa-mail-reply"
+              @click="modify(item)"
+            ></el-button>
+          </el-tooltip>
+          <el-popconfirm title="确定删除这张答题卡吗？" @confirm="remove(item)">
+            <el-button
+              slot="reference"
+              class="delete"
+              type="info"
+              size="mini"
+              circle
+              icon="el-icon-delete"
+            ></el-button>
+          </el-popconfirm>
+        </div>
+      </li>
+    </ul>
+    <div class="pagination-box">
+      <el-pagination
+        small=""
+        layout="total,prev, pager, next"
+        :hide-on-single-page="true"
+        :total="total"
+        @current-change="changePage"
+        :current-page="page"
+        :page-size="size"
+      >
+      </el-pagination>
+    </div>
+    <el-empty :image-size="100" v-if="!tableData.length&&loading==false" description="没有更多数据"></el-empty>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      loading:false,
+      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: {
+        classId: "",
+        subjectName: "",
+        tagId: "",
+        title: "",
+      },
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      tableData: [],
+      total: 0,
+      page:1,
+      size:20
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    this._QueryTypeList();
+    this._QueryData(false);
+  },
+  methods: {
+    async modify(obj) {
+      //恢复答题卡
+      const { data, status, info } = await this.$request.modifyPaper({
+        paperId: obj.id,
+        status: 1,
+      });
+      if (status == 0) {
+        let type = this.query.title ? 1 : 0;
+        this._QueryData(type);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async remove(obj) {
+      //删除答题卡
+      const { data, status, info } = await this.$request.delPaper({
+        paperId: obj.id,
+      });
+      if (status == 0) {
+        let type = this.query.title ? 1 : 0;
+        this._QueryData(type);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //切换班级
+    async changClazz() {
+      await this._QuerySubjectList();
+      this._QueryData(false);
+    },
+    changePage(page){
+      this.page = page
+      this._QueryData(this.query.title)
+    },
+    async _QueryData(type) {
+      //获取答题卡列表
+      this.loading=true
+      let query = {};
+      if (!type) {
+        this.query.title = "";
+        query = { ...this.query };
+      } else {
+        query = { title: this.query.title };
+        this.query.type = "";
+        this.query.subjectId = "";
+      }
+       query.classId = this.query.classId;
+      for (let key in query) {
+        if (!query[key]) {
+          query[key] = null;
+        }
+      }
+      const { data, status, info } = await this.$request.fetchPaperList({
+        ...query,
+        status:2,
+        page:this.page,
+        size:this.size
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.total;
+        this.tableData = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.fetchClassList();
+      console.log(status);
+      if (status === 0) {
+        if (!!data.list) {
+          this.classList = data.list?.map((item) => {
+            return {
+              value: item.classId,
+              label: item.className,
+            };
+          })||[];
+          this.query.classId = this.classList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找科目
+    async _QuerySubjectList() {
+      const { data, status, info } = await this.$request.fetchSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.subjectList = data.subjectNames?.map((item) => {
+          return {
+            value: item,
+            label: item,
+          };
+        })||[];
+        this.query.subjectName = this.subjectList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找答题卡类型
+    async _QueryTypeList() {
+      const { data, status, info } = await this.$request.fetchTypeNames({
+        classId: this.query.classId,
+        tyle:0
+      });
+      if (status === 0) {
+        this.typeList =
+          data.list?.map((item) => {
+            return {
+              value: item.tagId,
+              label: item.tag,
+            };
+          }) || [];
+        this.typeList.unshift({
+          value: "",
+          label: "请选择标签",
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.answer-header {
+  .sel-box {
+    .sel {
+      min-width: 160px;
+    }
+    :deep(.el-cascader__tags) {
+      flex-wrap: nowrap;
+    }
+  }
+}
+.content {
+  margin: 0 20px;
+  background: #f8f8f8;
+  padding: 12px;
+  border-radius: 20px;
+  .item {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    padding: 12px;
+    border-radius: 20px;
+    background: #fff;
+    margin-bottom: 12px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+    .pic-box {
+      width: 80px;
+      height: 80px;
+      border-radius: 10px;
+      margin-right: 10px;
+      flex-shrink: 0;
+      background: #d7d7d7;
+      text-align: center;
+      color: #fff;
+      font-weight: 500;
+      .i-box {
+        padding-top: 10px;
+        font-size: 32px;
+        margin-bottom: 3px;
+      }
+    }
+    .info {
+      height: 80px;
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .s-line {
+        padding: 0 5px;
+        color: #e2e2e2;
+      }
+      .title {
+        font-size: 16px;
+        color: #222;
+        font-weight: 500;
+        .label {
+          display: inline-block;
+          font-size: 12px;
+          color: #2e9afe;
+          line-height: 16px;
+          padding: 0 10px;
+          border: 1px solid #2e9afe;
+          border-radius: 10px;
+          transform: translateY(-2px);
+        }
+      }
+      .person {
+        color: #666;
+      }
+    }
+    .btn-box {
+      flex-shrink: 0;
+      .edit {
+        margin-right: 12px;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/account.vue b/src/views/basic/setUp/account.vue
new file mode 100644
index 0000000..58ed870
--- /dev/null
+++ b/src/views/basic/setUp/account.vue
@@ -0,0 +1,764 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>账号管理</span>
+      </template>
+      <template slot="btns" v-if="role == 'ROLE_JITUAN'">
+        <!-- 暂未有接口 -->
+        <!-- <el-tooltip effect="dark" content="导入账号" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            circle
+            @click="diaUp = true"
+          ></el-button>
+        </el-tooltip> -->
+        <el-tooltip
+          effect="dark"
+          content="添加账号"
+          placement="bottom"
+          v-if="!code"
+        >
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            plain
+            circle
+            @click="openAddDia"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="账号同步" placement="bottom" v-else>
+          <el-button
+            v-loading="syncLoading"
+            type="primary"
+            icon="el-icon-refresh"
+            size="mini"
+            plain
+            circle
+            @click="refreshAcc"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-cascader
+          size="small"
+          v-if="role == 'ROLE_JITUAN'"
+          class="sel"
+          clearable
+          placeholder="选择学校"
+          v-model="query.schoolIds"
+          :options="schoolList"
+          :props="props"
+          :show-all-levels="false"
+        ></el-cascader>
+        <el-select
+          v-else
+          class="sel"
+          v-model="query.roleId"
+          placeholder="选择账号角色"
+          @change="(page = 1), _QueryData(1)"
+        >
+          <el-option
+            v-for="item in roleList"
+            :key="item.id"
+            :label="item.roleName"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          class="sel"
+          v-model="query.available"
+          placeholder="选择账号状态"
+          @change="(page = 1), _QueryData(1)"
+        >
+          <el-option label="正常" :value="0"></el-option>
+          <el-option label="禁用" :value="1"></el-option>
+        </el-select>
+        <el-input
+          :placeholder="role != 'ROLE_JITUAN' ? '请输入老师账号' : '请输入账号'"
+          v-model="query.loginName"
+          class="input-with-select sel"
+          type="number"
+          clearable
+          oninput="if(value.length > 11) value = value.slice(0,11)"
+          @keyup.enter.native="(page = 1), _QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="(page = 1), _QueryData(2)"
+          ></el-button>
+        </el-input>
+        <el-input
+          placeholder="请输入老师姓名"
+          maxlength="30"
+          v-model="query.realName"
+          class="input-with-select"
+          clearable
+          @keyup.enter.native="(page = 1), _QueryData(3)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="(page = 1), _QueryData(3)"
+          ></el-button>
+        </el-input>
+        <el-button
+          v-if="role == 'ROLE_JITUAN'"
+          type="primary"
+          round
+          @click="(page = 1), _QueryData(4)"
+          >筛选</el-button
+        >
+      </div>
+    </div>
+    <div class="table-box">
+      <el-table
+        :data="tableData"
+        border
+        style="width: 100%"
+        v-loading="loading"
+      >
+        <el-table-column
+          prop="loginName"
+          label="账号"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="realName"
+          label="姓名"
+          align="center"
+        ></el-table-column>
+        <el-table-column prop="roleList" label="角色" align="center">
+          <template slot-scope="scoped">
+            <span v-for="(item, index) in scoped.row.roleList" :key="item.id">{{
+              `${item.roleName}${
+                index != scoped.row.roleList.length - 1 ? "、" : ""
+              }`
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="role == 'ROLE_JITUAN'"
+          prop="regionList"
+          label="管辖范围"
+          align="center"
+        >
+          <template slot-scope="scoped" v-if="scoped.row.schoolList.length">
+            <span v-for="item in scoped.row.schoolList" :key="item.id">{{
+              item.schoolName
+            }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="available" label="状态" align="center"
+          ><template slot-scope="scoped">{{
+            `${scoped.row.available == 0 ? "正常" : "禁用"}`
+          }}</template></el-table-column
+        >
+        <el-table-column
+          prop="createdTime"
+          label="创建时间"
+          align="center"
+          width="200"
+        ></el-table-column>
+        <el-table-column label="操作" align="center" width="160" v-if="!code">
+          <template slot-scope="scoped">
+            <el-tooltip content="修改账号" placement="left">
+              <el-button
+                class="set-count"
+                type="primary"
+                circle
+                icon="el-icon-edit-outline"
+                size="mini"
+                @click="setCount(scoped.row)"
+              ></el-button>
+            </el-tooltip>
+            <el-dropdown
+              trigger="hover"
+              @command="handleDropdownClick($event, scoped.row)"
+            >
+              <el-button
+                type="info"
+                size="mini"
+                circle
+                icon="el-icon-more"
+              ></el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="0">重置密码</el-dropdown-item>
+                <el-dropdown-item :command="1">{{
+                  `${scoped.row.available == 0 ? "禁用" : "启用"}`
+                }}</el-dropdown-item>
+                <el-dropdown-item :command="2">删除</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination-box">
+        <el-pagination
+          layout="total,prev, pager, next"
+          :hide-on-single-page="true"
+          :total="total"
+          @current-change="changePage"
+          :current-page="page"
+          :page-size="size"
+        >
+        </el-pagination>
+      </div>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="修改账号信息" :visible.sync="diaCount" width="400">
+      <el-form
+        class="form-box"
+        :model="formCount"
+        :rules="ruleCount"
+        ref="formCount"
+        label-width="160px"
+      >
+        <el-form-item label="手机号码：" prop="loginName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入联系电话"
+              v-model.trim="formCount.loginName"
+              clearable
+              maxlength="11"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="realName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入教师姓名"
+              v-model.trim="formCount.realName"
+              clearable
+              maxlength="11"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveCount">确 定</el-button>
+        <el-button @click="diaCount = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="添加账号" :visible.sync="diaAdd" width="400">
+      <el-form
+        class="form-box"
+        :model="formAddCount"
+        :rules="ruleAddCount"
+        ref="formAddCount"
+        label-width="160px"
+      >
+        <el-form-item label="手机号码：" prop="phone">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入联系电话"
+              v-model.trim="formAddCount.phone"
+              type="number"
+              clearable
+              oninput="if(value.length > 11) value = value.slice(0,11)"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="密码：" prop="password">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入密码"
+              v-model.trim="formAddCount.password"
+              clearable
+              maxlength="18"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="realName">
+          <el-col :span="12">
+            <el-input
+              placeholder="请输入姓名"
+              v-model.trim="formAddCount.realName"
+              clearable
+              maxlength="30"
+            >
+            </el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="选择角色：" prop="roleId">
+          <el-col :span="12">
+            <el-select
+              class="sel"
+              v-model="formAddCount.roleId"
+              placeholder="选择角色"
+            >
+              <el-option
+                v-for="item in tenantRoleList"
+                :key="item.id"
+                :label="item.roleName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+        <el-form-item
+          v-if="permissionLevel(formAddCount.roleId) != 6"
+          label="选择管辖范围："
+          :prop="
+            permissionLevel(formAddCount.roleId) == 5 ? 'regionId' : 'schoolId'
+          "
+        >
+          <el-col :span="12">
+            <el-select
+              v-show="permissionLevel(formAddCount.roleId) == 5"
+              class="sel"
+              v-model="formAddCount.regionId"
+              placeholder="选择管辖范围"
+            >
+              <el-option
+                v-for="item in regionList"
+                :key="item.id"
+                :label="item.regionName"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+            <el-select
+              v-show="permissionLevel(formAddCount.roleId) == 4"
+              class="sel"
+              v-model="formAddCount.schoolId"
+              placeholder="选择管辖范围"
+            >
+              <el-option
+                v-for="item in addSelectSchoolList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveAddCount">确 定</el-button>
+        <el-button @click="diaAdd = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="导入账号名单" :visible.sync="diaUp" width="600">
+      <up-load
+        id="downTeacher"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="教师名单"
+      >
+        <p class="down-txt" slot="down">
+          通过Excel名单导入账号名单，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { encryptLoginPassword } from "@/utils";
+export default {
+  data() {
+    return {
+      code: "",
+      role: "",
+      diaUp: false,
+      diaAdd: false,
+      url: "", //上传地址
+      loading: false,
+      syncLoading: false,
+      diaCount: false,
+      tenantRoleList: [],
+      regionList: [],
+      schoolList: [],
+      schoolAll: [],
+      props: { multiple: true, checkStrictly: true },
+      roleList: [],
+      query: {
+        schoolIds: [],
+        roleId: "",
+        available: "",
+        loginName: "",
+        realName: "",
+      },
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+      formCount: {
+        userId: "",
+        loginName: "",
+        realName: "",
+      },
+      ruleCount: {
+        loginName: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+        ],
+        realName: [
+          { required: true, message: "请输入教师姓名", trigger: "blur" },
+        ],
+      },
+      formAddCount: {
+        phone: "",
+        realName: "",
+        password: "",
+        roleId: "",
+        regionId: "",
+        schoolId: "",
+      },
+      addSelectSchoolList: [],
+      ruleAddCount: {
+        phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
+        realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+        roleId: [{ required: true, message: "请选择角色", trigger: "blur" }],
+        regionId: [
+          { required: true, message: "请选择权限区域", trigger: "blur" },
+        ],
+        schoolId: [
+          { required: true, message: "请选择权限区域", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_JITUAN") {
+      this._TenantRoleList();
+      this._RegionList();
+      this.showSchool();
+    } else {
+      this._RoleList();
+    }
+    this._QueryData(4);
+  },
+  methods: {
+    permissionLevel(id) {
+      let permissionLevel;
+      this.tenantRoleList.map((item) => {
+        if (item.id == id) {
+          permissionLevel = item.permissionLevel;
+        }
+      });
+      return permissionLevel;
+    },
+    async refreshAcc() {
+      //长水账号同步
+      if (this.syncLoading) return;
+      this.syncLoading = true;
+      const { data, status, info } = await this.$request.syncUser();
+      this.syncLoading = false;
+      if (status === 0) {
+        this.$message.success("同步中，请稍后刷新重试～");
+        // this._QueryData(4);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    upSuccess(res) {
+      //导入成功
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 5000,
+      });
+      this.diaUp = false;
+      this._QueryData(4);
+    },
+    async downExcel() {
+      let data = await this.$request.downDevice();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`账号信息.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    openAddDia() {
+      //添加账号
+      this.formAddCount.phone = "";
+      this.formAddCount.realName = "";
+      this.formAddCount.password = "";
+      this.formAddCount.roleId = "";
+      this.formAddCount.regionId = "";
+      this.formAddCount.schoolId = "";
+      this.diaAdd = true;
+    },
+    saveAddCount() {
+      this.$refs.formAddCount.validate(async (valid) => {
+        if (valid) {
+          let params = { ...this.formAddCount };
+          params.password = encryptLoginPassword(params.password);
+          const { data, status, info } = await this.$request.addUser({
+            ...params,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this._QueryData(4);
+            this.diaAdd = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    setCount(obj) {
+      if (this.role != "ROLE_JITUAN") {
+        this.formCount.userId = obj.userId;
+      } else {
+        this.formCount.userId = obj.id;
+      }
+      this.formCount.loginName = obj.loginName;
+      this.formCount.realName = obj.realName;
+      this.diaCount = true;
+    },
+    handleDropdownClick(value, item) {
+      console.log(item);
+      //更多
+      if (value == 2) {
+        this.$confirm("确定要删除这条账号信息吗？", "提示", {
+          customClass: "del-model",
+          cancelButttonText: "取消",
+          confirmButtonText: "确定",
+          type: "warning",
+        }).then(() => {
+          this.updateUser(item, value);
+        });
+      } else {
+        this.updateUser(item, value);
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(4);
+    },
+
+    saveCount() {
+      this.$refs.formCount.validate(async (valid) => {
+        if (valid) {
+          const { data, status, info } =
+            this.role != "ROLE_JITUAN"
+              ? await this.$request.updateUser({
+                  type: 3,
+                  ...this.formCount,
+                })
+              : await this.$request.tenantUpdateUser({
+                  type: 3,
+                  ...this.formCount,
+                });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaCount = false;
+            this._QueryData(4);
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    async showSchool() {
+      const { data, status, info } = await this.$request.schoolList();
+      if (status === 0) {
+        (this.addSelectSchoolList = data.list?.map((item) => {
+          return {
+            value: item.id,
+            label: item.schoolName,
+          };
+        })),
+          (this.schoolAll = [
+            {
+              value: 0,
+              label: "全部",
+              children: [...this.addSelectSchoolList],
+            },
+          ]);
+        this.schoolList = [...this.schoolAll, ...this.schoolList];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async updateUser(obj, type) {
+      let query = {};
+      console.log(query);
+      if (type == 1) {
+        query.available = obj.available == 0 ? 1 : 0;
+      }
+      const { data, status, info } =
+        this.role != "ROLE_JITUAN"
+          ? await this.$request.updateUser({
+              userId: obj.userId,
+              type: type,
+              ...query,
+            })
+          : await this.$request.tenantUpdateUser({
+              userId: obj.id,
+              type: type,
+              ...query,
+            });
+      if (status === 0) {
+        this.$message.success(info);
+        this._QueryData(4);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _RoleList() {
+      const { data, status, info } = await this.$request.roleList();
+      if (status === 0) {
+        this.roleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _TenantRoleList() {
+      //集团-添加账号权限
+      const { data, status, info } = await this.$request.tenantRoleList();
+      if (status === 0) {
+        this.tenantRoleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _RegionList() {
+      //集团-区域列表
+      const { data, status, info } = await this.$request.regionList();
+      if (status === 0) {
+        this.regionList = [...data.list] || [];
+        this.schoolList = data.list?.map((item) => {
+          let children = item.schoolList?.map((items) => {
+            return {
+              value: items.id,
+              label: items.schoolName,
+            };
+          });
+          return {
+            value: item.id,
+            label: item.regionName,
+            children: children,
+          };
+        });
+        this.schoolList = [...this.schoolAll, ...this.schoolList];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    setQuery(type) {
+      //整理请求参数
+      let query = {};
+      if (type == 1) {
+        query.roleId = this.query.roleId;
+        query.available = this.query.available;
+        this.query.loginName = "";
+        this.query.realName = "";
+      } else if (type == 2) {
+        this.query.roleId = "";
+        this.query.available = "";
+        this.query.schoolIds = [];
+        query.loginName = this.query.loginName;
+        this.query.realName = "";
+      } else if (type == 3) {
+        this.query.schoolIds = [];
+        this.query.roleId = "";
+        this.query.available = "";
+        this.query.loginName = "";
+        query.realName = this.query.realName;
+      } else {
+        query = { ...this.query };
+      }
+      if (this.role == "ROLE_JITUAN") {
+        let isAll = false;
+        query.schoolIds?.map((item) => {
+          if (item.length == 1) {
+            isAll = true;
+          }
+        });
+        query.schoolIds = isAll
+          ? null
+          : query.schoolIds?.map((item) => {
+              return item[1];
+            });
+        delete query.roleId;
+      } else {
+        delete query.schoolIds;
+      }
+      return query;
+    },
+    async _QueryData(type) {
+      let query = this.setQuery(type);
+      this.loading = true;
+      this.tableData = [];
+      let userPage =
+        this.role != "ROLE_JITUAN"
+          ? this.$request.userPage
+          : this.$request.tenantUserPage;
+      const { data, status, info } = await userPage({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = data.list || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+<style  lang="scss">
+.del-model {
+  .el-message-box__btns button:nth-child(1) {
+    color: #667ffd;
+  }
+}
+</style>
+<style lang="scss" scoped>
+.el-message-box .el-button--default {
+  color: red;
+}
+.set-count {
+  margin-right: 12px;
+}
+.table-box {
+  padding: 0 20px;
+}
+.answer-header {
+  .sel-box {
+    .sel {
+      margin-right: 20px;
+    }
+  }
+  :deep(.el-input-group__append) {
+    padding: 0 20px 0 12px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/archived.vue b/src/views/basic/setUp/archived.vue
new file mode 100644
index 0000000..89d0b56
--- /dev/null
+++ b/src/views/basic/setUp/archived.vue
@@ -0,0 +1,395 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>分班</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <el-steps :active="step" align-center class="step">
+        <el-step title="1 班级归档"></el-step>
+        <el-step title="2 分班后学生名单"></el-step>
+        <el-step title="3 分班后任课老师"></el-step>
+        <el-step title="4 授课端指引"></el-step>
+      </el-steps>
+      <ul v-loading="loading">
+        <li v-show="step == 0">
+          <div class="form-item">
+            <span class="s-txt">选择分班年级：</span>
+            <el-select
+              class="sel"
+              v-model="grade"
+              placeholder="选择年级"
+              @change="changeGrade"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+          </div>
+          <div class="form-item">
+            <span class="s-txt">确定班级：</span>
+            <i class="el-icon-loading" v-show="loadingClass"></i>
+            <div class="check-box" v-if="classList.length && !loadingClass">
+              <p class="all-check">
+                <el-checkbox
+                  :indeterminate="isIndeterminate"
+                  v-model="checkAll"
+                  @change="handleCheckAllChange"
+                  >全选</el-checkbox
+                >
+              </p>
+              <el-checkbox-group
+                v-model="classIds"
+                @change="handleCheckedChange"
+              >
+                <el-checkbox v-for="item in classList" :label="item.id">{{
+                  item.className
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+          <div class="form-item">
+            <span class="s-txt"></span>
+            <p class="tips">
+              <i class="el-icon-warning"></i
+              >请谨慎操作，班级归档后，学生解除班级关系且相关老师任课信息将不存在。
+            </p>
+          </div>
+          <div class="btn-box">
+            <el-button class="btn" round @click="toClazz">取消</el-button>
+            <el-popconfirm
+              confirm-button-text="确定"
+              cancel-button-text="取消"
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定要将所选班级归档吗？"
+              @confirm="_ClassArchiving"
+            >
+              <el-button class="btn" slot="reference" type="primary" round
+                >归档</el-button
+              >
+            </el-popconfirm>
+          </div>
+        </li>
+        <li v-show="step == 1">
+          <div class="step-item">
+            <up-load
+              id="downTeacher"
+              :url="urlClazz"
+              @upSuccess="upStudentSuccess"
+              fileName="学生名单模板"
+            >
+              <p class="down-txt" slot="down">
+                通过Excel名单导入学生名单模板，点击
+                <el-link type="primary" @click="downStudentExcel"
+                  >导出未分配学生</el-link
+                >
+                。
+              </p>
+            </up-load>
+          </div>
+        </li>
+        <li v-show="step == 2">
+          <div class="step-item">
+            <up-load
+              id="downTeacher"
+              :url="urlTeacher"
+              @upSuccess="upTeacherSuccess"
+              fileName="任课老师名单模板"
+            >
+              <p class="down-txt" slot="down">
+                通过Excel名单导入任课老师名单模板，点击
+                <el-link type="primary" @click="downTeacherExcel"
+                  >导出未分配教师</el-link
+                >。
+              </p>
+            </up-load>
+          </div>
+        </li>
+        <li v-show="step == 3">
+          <div class="step-item2">
+            <p class="p2">
+              <el-button
+                class="btn"
+                type="success"
+                icon="el-icon-check"
+                circle
+                size="small"
+              ></el-button
+              >恭喜您，分班已经完成，分班后老师第一次上课时注意事项：
+            </p>
+            <p class="p1">
+              1、点击授课端的设置—应用设置—初始化设置—重新选择绑定班级。
+            </p>
+            <p class="p1">
+              2、点击授课端的设置—班级名册—基站登录—学生完成基站绑定。
+            </p>
+          </div>
+        </li>
+
+        <li v-show="step != 0">
+          <div class="btn-box">
+            <el-button class="btn" round @click="step -= 1">上一步</el-button>
+            <el-button
+              v-show="step != 3"
+              class="btn"
+              type="primary"
+              round
+              @click="step += 1"
+              >下一步</el-button
+            ><el-button
+              v-show="step == 3"
+              class="btn"
+              type="primary"
+              round
+              @click="toClazz"
+              >完成</el-button
+            >
+          </div>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import { downloadFile } from "utils";
+export default {
+  data() {
+    return {
+      loading: false,
+      loadingClass: false,
+      loadingDown: false,
+      step: 0,
+      grade: "",
+      gradeList: [],
+      classIds: [],
+      classList: [],
+      urlClazz: "/api_html/school/manager/importClassAndStudent",
+      urlTeacher: "/api_html/school/manager/importTeacher",
+      checkAll: true,
+      isIndeterminate: false,
+    };
+  },
+  created() {
+    this._QueryDataGrade();
+  },
+  methods: {
+    handleCheckAllChange(val) {
+      this.classIds = val
+        ? this.classList.map((item) => {
+            return item.id;
+          })
+        : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.classList.length;
+      this.isIndeterminate =
+        checkedCount > 0 && checkedCount < this.classList.length;
+    },
+    toClazz() {
+      this.$router.push({
+        path: "/setUpClazz",
+      });
+    },
+    //切换年级
+    changeGrade() {
+      this._QueryClass();
+    },
+    //学生名单上传成功回调
+    upStudentSuccess(res) {
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 10000,
+      });
+    },
+    //任课老师名单上传成功回调
+    upTeacherSuccess(res) {
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 10000,
+      });
+    },
+    //导出学生名单
+    async downStudentExcel() {
+      this.loadingDown = true;
+      let data = await this.$request.exportNoClassStudent();
+      this.loadingDown = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("未分配学生名单.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    //导出任课老师名单
+    async downTeacherExcel() {
+      this.loadingDown = true;
+      let data = await this.$request.exportNoClassTeacher();
+      this.loadingDown = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("未分配教师 名单.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    //班级归档
+    async _ClassArchiving() {
+      if (!this.classIds.length) {
+        this.$message.warning("班级不能为空，请选择班级～");
+        return;
+      }
+      this.loading = true;
+      const { status, info } = await this.$request.classArchiving({
+        classIds: [...this.classIds],
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success("班级归档成功！");
+        this.step = 1;
+        this._QueryDataGrade();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //年级列表
+    async _QueryDataGrade() {
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            return {
+              value: item.grade,
+              label: item.gradeName,
+            };
+          }) || [];
+        this.grade = this.gradeList[0]?.value;
+        this._QueryClass();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //班级列表
+    async _QueryClass() {
+      this.classList = [];
+      this.loadingClass = true;
+      const { data, status, info } = await this.$request.schoolClassList({
+        grade: this.grade,
+      });
+      this.loadingClass = false;
+      if (status === 0) {
+        this.classList = (data.list && [...data.list]) || [];
+        this.classIds = this.classList.map((item) => {
+          return item.id;
+        });
+        this.checkAll = true;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  width: 100%;
+  padding: 20px;
+  box-sizing: border-box;
+}
+.step {
+  margin-bottom: 40px;
+}
+.form-item {
+  width: 70%;
+  display: flex;
+  margin: 0 auto 20px;
+  .check-box {
+    flex: 1;
+  }
+  .all-check {
+    margin-right: 30px;
+  }
+  &:first-of-type {
+    .s-txt {
+      line-height: 40px;
+    }
+  }
+  .s-txt {
+    width: 160px;
+    flex-shrink: 0;
+  }
+  .sel {
+    :deep(.el-input__inner) {
+      border-radius: 20px;
+    }
+  }
+  :deep(.el-checkbox) {
+    margin-bottom: 12px;
+  }
+  .tips {
+    display: flex;
+    align-items: center;
+    color: #666;
+  }
+  .el-icon-warning {
+    font-size: 20px;
+    color: #ec7f8c;
+    margin-right: 10px;
+  }
+}
+.btn-box {
+  width: 80%;
+  margin: 60px auto 0;
+  display: flex;
+  justify-content: flex-end;
+  .btn {
+    margin: 0 10px;
+  }
+}
+.step-item {
+  text-align: center;
+}
+.step-item2 {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  color: #000;
+  font-weight: 500;
+  .p2 {
+    font-size: 16px;
+    margin: 0 0 20px -68px;
+    .btn {
+      margin-right: 14px;
+    }
+  }
+  .p1 {
+    width: 450px;
+    text-align: left;
+    margin-bottom: 20px;
+  }
+}
+:deep(.down-txt) {
+  justify-content: center;
+  padding-left: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/archivedClazz.vue b/src/views/basic/setUp/archivedClazz.vue
new file mode 100644
index 0000000..1540917
--- /dev/null
+++ b/src/views/basic/setUp/archivedClazz.vue
@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>已归档班级</span>
+      </template>
+    </back-box>
+    <div class="page-content" v-loading="loading">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column
+          prop="gradeName"
+          label="年级"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="className"
+          label="班级名称"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="studentCount"
+          label="学生数量"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="modifiedTime"
+          label="归档时间"
+          fixed
+          align="center"
+        ></el-table-column>
+      </el-table>
+    </div>
+    <!-- <div class="pagination-box">
+      <el-pagination
+        small=""
+        layout="total,prev, pager, next"
+        :hide-on-single-page="true"
+        :total="total"
+        @current-change="changePage"
+        :current-page="page"
+        :page-size="size"
+      >
+      </el-pagination>
+    </div> -->
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      role: "",
+      loading: false,
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  async created() {
+    this._QueryData();
+  },
+  methods: {
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
+    },
+    async _QueryData() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.archivingClassList();
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.total;
+        this.tableData = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue
new file mode 100644
index 0000000..ae01e44
--- /dev/null
+++ b/src/views/basic/setUp/clazz.vue
@@ -0,0 +1,662 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>班级管理</span>
+      </template>
+      <template slot="btns" v-if="!code">
+        <el-tooltip effect="dark" content="导入班级名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            circle
+            @click="diaUp = true"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="导出班级名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            plain
+            circle
+            @click="exportTeacherExl"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="分班" placement="bottom">
+          <img
+            @click="toArchived"
+            src="../../../assets/images/fenban.png"
+            class="fenban"
+            alt=""
+          />
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="grade-box">
+        <div class="grade-item" v-for="(item, index) in dataList">
+          <p class="h-title">
+            <span>{{ item.gradeName }}</span>
+            <span class="s-num" v-if="item.classList"
+              >（共{{ item.classList.length }}个班）</span
+            >
+            <el-button
+              class="sub-btn"
+              type="info"
+              size="mini"
+              round
+              plain
+              @click="openSubject(item)"
+              >科目管理({{ item.subjectNames.length }})</el-button
+            >
+            <span class="txt" v-if="index == 0">拖动班级进行排序</span>
+          </p>
+          <draggable
+            tag="ul"
+            class="grade-info"
+            v-model="item.classList"
+            @start="start"
+            @end="end(item)"
+            v-bind="{
+              animation: 300,
+            }"
+          >
+            <li class="clazz-li" v-for="clazz in item.classList" :key="item.id">
+              <div class="clazz-item">
+                <i
+                  class="el-icon-edit"
+                  @click.stop="setClass(clazz, item.gradeName)"
+                ></i>
+                <p class="clazz-name ellipsis">
+                  {{ clazz.className }}
+                </p>
+                <div class="clazz-class">
+                  <p>学生：{{ clazz.studentCount }}个</p>
+                  <p>教师：{{ clazz.teacherCount }}个</p>
+                </div>
+              </div>
+            </li>
+          </draggable>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="导入班级名单"
+      :visible.sync="diaUp"
+      width="600"
+    >
+      <up-load :url="url" @upSuccess="upSuccess" fileName="班级名单">
+        <p class="down-txt" slot="down">
+          通过Excel名单导入班级名单，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="修改班级"
+      :visible.sync="diaClass"
+      width="400"
+    >
+      <el-form
+        ref="formClass"
+        :model="formClass"
+        :rules="rulesClass"
+        label-width="160px"
+      >
+        <el-form-item label="所在年级：">
+          <span>{{ formClass.gradeName }}</span>
+        </el-form-item>
+        <el-form-item label="班级名称：" prop="studentName">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formClass.className" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="班级编码：">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formClass.classCode" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="入学年份：">
+          <el-col :span="10">
+            <el-date-picker
+              v-model="formClass.intoSchoolYear"
+              type="year"
+              placeholder="选择年"
+            >
+            </el-date-picker>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="_SaveClass" type="primary">确 定</el-button>
+        <el-button @click="diaClass = false">取 消</el-button>
+        <el-popconfirm
+          v-if="!formClass.teacherCount && !formClass.studentCount"
+          title="确定删除该班级吗？"
+          @confirm="_RemoveClass"
+        >
+          <el-button class="el-button-del" slot="reference" type="danger" plain
+            >删 除</el-button
+          >
+        </el-popconfirm>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      :visible.sync="diaSubject"
+      width="400"
+    >
+      <p slot="title" class="dia-tit">
+        {{ formClass.gradeName }}
+        <span class="tips">（默认科目和已经有任课老师的科目不能删除）</span>
+      </p>
+      <el-form class="form-box" label-width="80px" v-loading="loadingSub">
+        <el-form-item label="科目：">
+          <div class="subject-box">
+            <el-checkbox-group v-model="subjectNames">
+              <p
+                class="p1"
+                v-for="(item, index) in subjectList"
+                :key="item.default"
+              >
+                <el-checkbox v-if="!item.checked" :label="item.value">{{
+                  item.value
+                }}</el-checkbox>
+                <el-input
+                  class="sub-ipt"
+                  v-else
+                  v-model="item.value"
+                  @keyup.enter.native="_EditSub(item)"
+                ></el-input>
+                <i
+                  class="el-icon el-icon-edit"
+                  v-show="!item.checked"
+                  @click="item.checked = true"
+                ></i>
+                <i
+                  class="el-icon el-icon-check"
+                  v-show="item.checked"
+                  @click="_EditSub(item)"
+                ></i>
+                <!-- <i
+                  class="el-icon el-icon-close"
+                  v-show="item.checked"
+                  @click="resetSub(item)"
+                ></i> -->
+                <i
+                  v-show="!item.checked"
+                  class="el-icon el-icon-delete"
+                  @click="_DelSubject(item, index)"
+                ></i>
+              </p>
+            </el-checkbox-group>
+          </div>
+          <el-col :span="8">
+            <el-input
+              placeholder="添加科目"
+              v-model.trim="subjectName"
+              maxlength="30"
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-plus"
+                @click="addSubjectName"
+              ></i>
+            </el-input>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="_SaveSubject" type="primary">确 定</el-button>
+        <el-button @click="diaSubject = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { downloadFile, formatDate } from "@/utils";
+import draggable from "vuedraggable";
+export default {
+  components: {
+    draggable,
+  },
+  watch: {
+    diaSubject: function (val) {
+      if (!val) {
+        this.subjectName = "";
+        this.subjectList.map((item) => {
+          item.checked = false;
+        });
+      }
+    },
+  },
+  data() {
+    return {
+      code: "",
+      loading: false,
+      loadingDown: false,
+      loadingSub: false,
+      diaUp: false,
+      diaClass: false,
+      diaSubject: false,
+      subjectLoading: false,
+      url: "/api_html/school/manager/importClassAndStudent",
+      formClass: {
+        //修改班级信息
+        gradeName: "",
+        className: "",
+        classCode: "",
+        intoSchoolYear: "",
+        studentCount: "",
+        teacherCount: "",
+      },
+      rulesClass: {
+        className: [
+          { required: true, message: "请输入班级名称", trigger: "blur" },
+        ],
+      },
+      subjects: [], //科目列表(只有科目)
+      subjectList: [], //科目列表
+      subjectNames: [], //已有科目
+      subjectName: "", //要添加的科目
+      dataList: [],
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this._QueryData();
+    this._QuerySubject();
+  },
+  methods: {
+    toArchived() {
+      this.$router.push({
+        path: "/archived",
+      });
+    },
+    openSubject(obj) {
+      this.formClass.gradeName = obj.gradeName;
+      this.subjectNames = [...obj.subjectNames];
+      this.diaSubject = true;
+    },
+    start(e) {
+      console.log(e);
+    },
+    end(obj) {
+      let classListIds = obj.classList.map((item) => {
+        return item.id;
+      });
+      this._SaveComponents(classListIds);
+    },
+    upSuccess(res) {
+      //导入成功
+      this.$message.closeAll();
+      let txt = "";
+      if (res.data.errorInfo && res.data.errorInfo.length) {
+        res.data.errorInfo.map((item) => {
+          txt += `<p style="padding-top:5px;">第${item.row}行：${item.error}</p>`;
+        });
+      }
+      let sTxt = `<p>成功（${res.data.success}）</p>`;
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message: sTxt + txt,
+        type: "success",
+        duration: 10000,
+      });
+      this.diaUp = false;
+      this._QueryData();
+    },
+    setClass(obj, gradeName) {
+      this.formClass.studentCount = obj.studentCount;
+      this.formClass.teacherCount = obj.teacherCount;
+      this.formClass.gradeName = gradeName;
+      this.formClass.classId = obj.id;
+      this.formClass.className = obj.className;
+      this.formClass.classCode = obj.classCode || "";
+      this.formClass.intoSchoolYear = obj.intoSchoolYear
+        ? obj.intoSchoolYear + ""
+        : "";
+      this.diaClass = true;
+    },
+    async _RemoveClass() {
+      const { data, status, info } = await this.$request.removeClass({
+        classId: this.formClass.classId,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        this.diaClass = false;
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    _SaveClass() {
+      this.$refs.formClass.validate(async (valid) => {
+        if (valid) {
+          const { data, status, info } = await this.$request.updateClass({
+            classId: this.formClass.classId,
+            className: this.formClass.className,
+            classCode: this.formClass.classCode,
+            intoSchoolYear: formatDate(this.formClass.intoSchoolYear, "yyyy"),
+          });
+          if (status === 0) {
+            this.$message.success("修改成功");
+            this.diaClass = false;
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    addSubjectName() {
+      //添加科目
+      if (!this.subjectName) {
+        this.$message.warning("请填写科目名称");
+        return;
+      } else if (this.subjects.includes(this.subjectName)) {
+        this.$message.warning("科目已存在，请重新填写～");
+        return;
+      }
+      this.subjectList.push({
+        default: this.subjectName,
+        value: this.subjectName,
+        checked: false,
+      });
+      this.subjects.push(this.subjectName);
+      this.subjectNames.push(this.subjectName);
+      this.subjectName = "";
+    },
+    resetSub(item) {
+      item.value = item.default;
+      item.checked = false;
+    },
+    async _EditSub(item) {
+      // if (this.subjects.includes(item.value)) {
+      //   this.$message.warning("科目已存在，请重新填写～");
+      //   return;
+      // }
+      let idx = this.subjectNames.findIndex((sub) => item.default == sub);
+      item.checked = false;
+      const { status, info } = await this.$request.updateSubject({
+        subjectName: item.value,
+        oldSubjectName: item.default,
+      });
+      if (status === 0) {
+        this.$message.success(info);
+        this.subjectNames.splice(idx, 1, item.value);
+        item.default = item.value;
+      } else {
+        item.value = item.default
+        this.$message.error(info);
+      }
+    },
+    async _DelSubject(obj, index) {
+      if (this.subjectLoading) return;
+      this.subjectLoading = true;
+      const { status, info } = await this.$request.delSubject({
+        subjectName: obj.default,
+      });
+      this.subjectLoading = false;
+      if (status === 0) {
+        this.$message.success(info);
+        this.subjectList.splice(index, 1);
+        this.subjects.splice(index, 1);
+        this.subjectNames.splice(index, 1);
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _SaveSubject() {
+      //保存修改年级信息
+      if (!this.subjectNames.length) {
+        this.$message.error("请选择科目！");
+        return;
+      }
+      this.loadingSub = true;
+      const { status, info } = await this.$request.updateGrade({
+        gradeName: this.formClass.gradeName,
+        subjectNames: this.subjectNames,
+      });
+      this.loadingSub = false;
+      if (status === 0) {
+        this.$message.success("修改成功~");
+        this.diaSubject = false;
+        this._QueryData();
+        this._QuerySubject();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _SaveComponents(classListIds) {
+      this.loading = true;
+      let { status, info } = await this.$request.classSort({
+        classIds: [...classListIds],
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success("调整成功！");
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      let { data, status, info } = await this.$request.classManager();
+      this.loading = false;
+      if (status === 0) {
+        this.dataList = [...data.list] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubject() {
+      const { data, status, info } = await this.$request.subjectList();
+      if (status === 0) {
+        this.subjects = [...data?.subjectNames] || [];
+        this.subjectList =
+          data?.subjectNames.map((item) => {
+            return {
+              default: item,
+              value: item,
+              checked: false,
+            };
+          }) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.classAndStudentTemplate();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`班级名单模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async exportTeacherExl() {
+      this.loadingDown = true;
+      let data = await this.$request.exportClassAndStudent();
+      this.loadingDown = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`班级名单.xlsx`, blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.fenban {
+  width: 28px;
+  margin-left: 10px;
+  cursor: pointer;
+}
+.page-tit {
+  margin-bottom: 20px;
+}
+.page-content {
+  padding: 20px;
+}
+.grade-box {
+  background: #f8f8f8;
+  padding: 12px 0;
+}
+.el-button-del {
+  margin-left: 10px;
+}
+.h-title {
+  display: flex;
+  align-items: center;
+  .s-num {
+    font-size: 13px;
+  }
+  .sub-btn {
+    margin-left: 30px;
+  }
+  .txt {
+    margin-left: 30px;
+    font-size: 13px;
+    color: #666;
+  }
+}
+.dia-tit {
+  .tips {
+    font-size: 12px;
+  }
+}
+.grade-item {
+  .grade-info {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 10px 20px 0;
+    .clazz-li {
+      margin-right: 20px;
+      margin-bottom: 18px;
+      position: relative;
+      background: #fff;
+      .el-icon-edit {
+        cursor: pointer;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      &:hover {
+        .el-icon-edit {
+          display: inline;
+        }
+      }
+    }
+
+    .clazz-item {
+      width: 96px;
+      padding: 14px 18px 14px 14px;
+      border-radius: 10px;
+      box-shadow: 1px 1px 3px #888;
+      box-sizing: content-box;
+      position: relative;
+    }
+    .el-icon-edit {
+      position: absolute;
+      right: 5px;
+      top: 5px;
+    }
+    .clazz-name {
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 18px;
+      padding-bottom: 6px;
+      position: relative;
+    }
+    .clazz-class {
+      // display: flex;
+      // justify-content: space-between;
+      font-size: 14px;
+    }
+  }
+}
+.subject-box {
+  overflow: hidden;
+  position: relative;
+  .p1 {
+    line-height: 20px;
+    margin-bottom: 10px;
+  }
+}
+:deep(.el-checkbox-group) {
+  display: flex;
+  flex-wrap: wrap;
+  .p1 {
+    padding-right: 50px;
+    position: relative;
+    &:hover {
+      .el-icon {
+        display: block;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      .is-checked ~ .el-icon-delete {
+        display: none;
+      }
+    }
+  }
+  .el-icon {
+    font-size: 14px;
+    color: #999;
+    position: absolute;
+    right: 10px;
+    top: 3px;
+    cursor: pointer;
+    display: none;
+  }
+  .el-icon-check,
+  .el-icon-close {
+    display: block;
+  }
+  .el-icon-edit,
+  .el-icon-check {
+    right: 28px;
+  }
+}
+.sub-ipt {
+  :deep(.el-input__inner) {
+    height: 24px;
+    line-height: 24px;
+  }
+}
+.form-box {
+  :deep(.el-form-item__label) {
+    line-height: 28px;
+  }
+  .el-icon-plus {
+    cursor: pointer;
+    &:hover {
+      color: #667ffd;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/conglomerate.vue b/src/views/basic/setUp/conglomerate.vue
new file mode 100644
index 0000000..cae63c6
--- /dev/null
+++ b/src/views/basic/setUp/conglomerate.vue
@@ -0,0 +1,661 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>学校管理</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="content-box" v-loading="loading">
+        <div class="left-box">
+          <p class="h-title">
+            <span class="tog-type">集团列表</span>
+            <i class="icon el-icon-circle-plus-outline" @click="edit"></i>
+          </p>
+          <ul class="school-ul">
+            <li
+              class="school-item"
+              :class="showId == '' ? 'active' : ''"
+              @click="(showId = ''), showSchool(false)"
+            >
+              全部（{{ schoolTotal }}）
+            </li>
+            <li
+              class="school-item"
+              v-for="item in tableList"
+              :key="item.id"
+              :class="showId == item.id ? 'active' : ''"
+              @click="(showId = item.id), showSchool()"
+            >
+              {{ item.regionName }}（{{ item.schoolCount }}）
+              <i class="el-icon-edit-outline" @click.stop="setRegion(item)"></i>
+            </li>
+          </ul>
+        </div>
+        <div class="content-detail">
+          <div class="title-box">
+            <span>管辖的学校（{{ schoolData.num }}）</span>
+            <i class="icon el-icon-circle-plus-outline" @click="addSchool"></i>
+          </div>
+          <el-empty
+            :image-size="100"
+            v-if="!schoolData.list.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+          <ul v-else class="detail-list">
+            <li
+              class="detail-item"
+              v-for="item in schoolData.list"
+              :key="item.id"
+            >
+              <p class="item-tit">
+                <span class="name active" @click="setSchool(item)">{{
+                  item.schoolName
+                }}</span>
+                <i @click="addAdmin(item)" class="icon el-icon-user-solid"></i>
+              </p>
+              <div class="info">
+                <p class="info-item">
+                  <span class="txt">基站</span>
+                  <img class="pic" src="../../../assets/images/jizhan.png" />
+                  <span>{{ item.stationCount }}</span>
+                </p>
+                <p class="info-item">
+                  <span class="txt">键盘</span>
+                  <img class="pic" src="../../../assets/images/jianpan.png" />
+                  <span>{{ item.keyboardCount }}</span>
+                </p>
+                <p class="info-item">
+                  <span class="txt">班级</span>
+                  <img class="pic" src="../../../assets/images/banji.png" />
+                  <span>{{ item.classCount }}</span>
+                </p>
+                <p class="info-item">
+                  <span class="txt">学生</span>
+                  <img class="pic" src="../../../assets/images/xuesheng.png" />
+                  <span>{{ item.studentCount }}</span>
+                </p>
+                <p class="info-item">
+                  <span class="txt">老师</span>
+                  <img class="pic" src="../../../assets/images/laoshi.png" />
+                  <span>{{ item.teacherCount }}</span>
+                </p>
+              </div>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="isAdd ? '添加区域/集团' : '修改区域/集团'"
+      :visible.sync="diaCL"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formCL"
+        :model="formCL"
+        :rules="rulesCL"
+        label-width="160px"
+      >
+        <el-form-item label="区域/集团名称：" prop="regionName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              v-model.trim="formCL.regionName"
+              placeholder="请输入区域/集团名称"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" round @click="saveFormCL">确 定</el-button>
+        <el-button round @click="diaCL = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="添加管理员"
+      :visible.sync="diaAdmin"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formAdmin"
+        :model="formAdmin"
+        :rules="rulesAdmin"
+        label-width="160px"
+      >
+        <el-form-item label="学校名称：">
+          <span>{{ formAdmin.schoolName }}</span>
+        </el-form-item>
+        <el-form-item label="手机号码：" prop="phone">
+          <el-col :span="10">
+            <el-input
+              maxlength="11"
+              v-model.trim="formAdmin.phone"
+              placeholder="请输入手机号码"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="密码：" prop="password">
+          <el-col :span="10">
+            <el-input
+              maxlength="18"
+              v-model.trim="formAdmin.password"
+              show-password
+              placeholder="请输入密码"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="姓名：" prop="realName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              v-model.trim="formAdmin.realName"
+              placeholder="请输入姓名"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" round @click="saveFormAdmin">确 定</el-button>
+        <el-button round @click="diaAdmin = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="添加学校"
+      :visible.sync="diaSchool"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formSchool"
+        :model="formSchool"
+        :rules="rulesSchool"
+        label-width="160px"
+      >
+        <el-form-item label="学校名称：" prop="schoolName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              v-model.trim="formSchool.schoolName"
+              placeholder="请输入学校名称"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="所属区域/集团：">
+          <el-select
+            class="sel"
+            v-model="formSchool.regionId"
+            placeholder="选择所属区域/集团"
+          >
+            <el-option
+              v-for="item in tableList"
+              :key="item.id"
+              :label="item.regionName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="学段：" prop="sections">
+          <el-checkbox-group v-model="formSchool.sections">
+            <el-checkbox
+              v-for="item in sectionsList"
+              :label="item.code"
+              :key="item.code"
+              >{{ item.name }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" round @click="saveFormSchool"
+          >确 定</el-button
+        >
+        <el-button round @click="diaSchool = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="学校信息修改"
+      :visible.sync="diaSchool2"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formSchool2"
+        :model="setFormSchool"
+        :rules="rulesSchool"
+        label-width="160px"
+      >
+        <el-form-item label="学校名称：" prop="schoolName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              v-model.trim="setFormSchool.schoolName"
+              placeholder="请输入学校名称"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" round @click="saveSetFormSchool"
+          >确 定</el-button
+        >
+        <el-button round @click="diaSchool2 = false">取 消</el-button>
+        <el-button round v-if="showDelSclBtn" @click="removeSchool"
+          >删除学校</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { encryptLoginPassword } from "@/utils";
+export default {
+  data() {
+    return {
+      isAdd: true,
+      diaCL: false,
+      diaAdmin: false,
+      diaSchool: false,
+      diaSchool2: false,
+      loading: false,
+      showId: "", //显示学校Id
+      schoolTotal: 0,
+      sectionsList: [],
+      tableList: [
+        // 集团列表/区域列表
+        {
+          id: 1,
+          regionName: "云南衡水实验中学",
+          schoolCount: 5,
+        },
+      ],
+      schoolData: {
+        //学校信息
+        num: 0,
+        list: [{ id: 1, schoolName: "曲靖校区" }],
+      },
+      formCL: {
+        regionId: "",
+        regionName: "",
+      },
+      rulesCL: {
+        regionName: [
+          { required: true, message: "请输入区域/集团名称", trigger: "blur" },
+        ],
+      },
+      formAdmin: {
+        schoolId: "",
+        schoolName: "",
+        phone: "",
+        password: "",
+        realName: "",
+      },
+      rulesAdmin: {
+        phone: [{ required: true, message: "请输入手机号码", trigger: "blur" }],
+        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
+        realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+      },
+      formSchool: {
+        schoolName: "",
+        regionId: "",
+        sections: [],
+      },
+      rulesSchool: {
+        schoolName: [
+          { required: true, message: "请输入学校名称", trigger: "blur" },
+        ],
+        sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
+      },
+      setFormSchool: {
+        schoolId: "",
+        schoolName: "",
+      },
+      showDelSclBtn: false,
+    };
+  },
+  created() {
+    this._QueryData();
+    this.showSchool();
+    this._QuerySectionList();
+  },
+  methods: {
+    edit() {
+      //添加区域/集团
+      this.isAdd = true;
+      this.formCL.regionId = "";
+      this.formCL.regionName = "";
+      this.diaCL = true;
+    },
+    addAdmin(obj) {
+      //添加管理员
+      this.formAdmin.schoolId = obj.id;
+      this.formAdmin.schoolName = obj.schoolName;
+      this.formAdmin.phone = "";
+      this.formAdmin.password = "";
+      this.formAdmin.realName = "";
+
+      this.diaAdmin = true;
+    },
+    addSchool() {
+      //添加学校
+      this.formSchool.schoolName = "";
+      this.formSchool.sections = [];
+      this.formSchool.regionId = "";
+      this.diaSchool = true;
+    },
+    setRegion(obj) {
+      this.isAdd = false;
+      this.formCL.regionId = obj.id;
+      this.formCL.regionName = obj.regionName;
+      this.diaCL = true;
+    },
+    setSchool(obj) {
+      this.setFormSchool.schoolId = obj.id;
+      this.setFormSchool.schoolName = obj.schoolName;
+      let num =
+        obj.stationCount +
+        obj.keyboardCount +
+        obj.classCount +
+        obj.studentCount +
+        obj.teacherCount;
+      this.showDelSclBtn = num == 0 ? true : false;
+      this.diaSchool2 = true;
+    },
+    async _QuerySectionList() {
+      //学校学段
+      const { data, status, info } = await this.$request.sectionList();
+      console.log(status);
+      if (status === 0) {
+        this.sectionsList = data?.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async removeSchool() {
+      const { data, status, info } = await this.$request.removeSchool({
+        schoolId: this.setFormSchool.schoolId,
+      });
+      if (status === 0) {
+        this._QueryData();
+        this.showSchool();
+        this.$message.success(info);
+        this.diaSchool2 = false;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    saveFormCL() {
+      //保存添加区域/集团
+      this.$refs["formCL"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          const { data, status, info } = await this.$request.saveRegion({
+            regionId: this.formCL.regionId,
+            regionName: this.formCL.regionName,
+          });
+          if (status === 0) {
+            this._QueryData();
+            this.$message.success(info);
+            this.diaCL = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("区域/集团名称数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    saveFormAdmin() {
+      //保存管理员
+      this.$refs["formAdmin"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          let params = { ...this.formAdmin };
+          params.password = encryptLoginPassword(this.formAdmin.password);
+          delete params.schoolName;
+          const { data, status, info } = await this.$request.addSchoolManager({
+            ...params,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaAdmin = false;
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    saveFormSchool() {
+      //保存学校
+      this.$refs["formSchool"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          let query = { ...this.formSchool };
+          query.sections = query.sections.join(",");
+          const { data, status, info } = await this.$request.saveSchool({
+            ...query,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaSchool = false;
+            this._QueryData();
+            this.showSchool();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("学校名称数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    saveSetFormSchool() {
+      //保存学校
+      this.$refs["formSchool2"].validate(async (valid) => {
+        // 验证通过：保存
+        if (valid) {
+          const { data, status, info } = await this.$request.saveSchool({
+            ...this.setFormSchool,
+          });
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaSchool2 = false;
+            this.showSchool();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+          return false;
+        }
+      });
+    },
+    async showSchool() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolList({
+        regionId: this.showId,
+        needCount: 1,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.schoolData.list = [...data.list] || [];
+        this.schoolData.num = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      const { data, status, info } = await this.$request.regionList();
+      if (status === 0) {
+        this.tableList = [...data.list] || [];
+        this.schoolTotal = data.schoolCount;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px 30px;
+}
+.content-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  min-height: 400px;
+
+  .h-title {
+    height: 40px;
+    line-height: 40px;
+    background: #eee;
+    border-radius: 10px 10px 0 0;
+  }
+  .left-box {
+    width: 240px;
+    .h-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding-right: 16px;
+      box-sizing: border-box;
+      .tog-type {
+        cursor: pointer;
+      }
+      .icon {
+        font-size: 20px;
+        color: #7f7f7f;
+        cursor: pointer;
+      }
+    }
+    .school-ul {
+      max-height: 70vh;
+      overflow-y: scroll;
+    }
+    .school-item {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 36px;
+      cursor: pointer;
+      padding-left: 12px;
+      position: relative;
+      &:hover {
+        background: #eee;
+      }
+      &.active {
+        color: #667ffd;
+      }
+      .el-icon-edit-outline {
+        position: absolute;
+        top: 8px;
+        right: 12px;
+        font-size: 20px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      &:hover {
+        background: #eee;
+        .el-icon-edit-outline {
+          display: block;
+        }
+      }
+    }
+  }
+  .content-detail {
+    flex: 1;
+    position: relative;
+    border-left: 0.5px solid #eee;
+    .title-box {
+      display: flex;
+      justify-content: space-between;
+      padding: 10px 20px;
+      .icon {
+        font-size: 24px;
+        color: #7f7f7f;
+        cursor: pointer;
+      }
+      .el-icon-circle-plus-outline {
+        margin-left: 10px;
+      }
+    }
+    .detail-list {
+      padding-left: 20px;
+      display: flex;
+      flex-wrap: wrap;
+    }
+    .detail-item {
+      width: 320px;
+      padding: 12px 16px;
+      border-radius: 10px;
+      box-shadow: 1px 1px 3px #888;
+      box-sizing: border-box;
+      margin: 0 20px 20px 0;
+      .item-tit {
+        font-size: 16px;
+        position: relative;
+        padding-bottom: 10px;
+        .name {
+          cursor: pointer;
+          &.active {
+            color: #667ffd;
+          }
+        }
+        &:hover {
+          .icon {
+            display: block;
+          }
+        }
+        .icon {
+          display: none;
+          position: absolute;
+          right: -5px;
+          top: 0;
+          color: #7f7f7f;
+          cursor: pointer;
+          padding: 2px;
+          &:hover {
+            color: #667ffd;
+          }
+        }
+      }
+      .info {
+        width: 100%;
+        display: flex;
+        .info-item {
+          flex: 1;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+        }
+        .txt {
+          color: #7f7f7f;
+        }
+        .pic {
+          height: 28px;
+          margin: 2px 0 5px;
+        }
+      }
+    }
+  }
+}
+.dialog-footer {
+  text-align: center;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/school.vue b/src/views/basic/setUp/school.vue
new file mode 100644
index 0000000..003999e
--- /dev/null
+++ b/src/views/basic/setUp/school.vue
@@ -0,0 +1,461 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>学校设置</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="content-box">
+        <i class="el-icon-edit" @click="diaSchool = true"></i>
+        <ul class="school-info">
+          <li class="school-item">
+            <span class="s1">学校名称：</span>
+            <span class="s2">{{ school.schoolName || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">授课端管理密码：</span>
+            <span class="s2">{{ school.managePwd || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">联系人：</span>
+            <span class="s2">{{ school.contactPerson || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">手机号码：</span>
+            <span class="s2">{{ school.contactPhone || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">学段：</span>
+            <span class="s2">{{ sections }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">所属集团：</span>
+            <span class="s2">{{ school.tenantName || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">基站登录密码 ：</span>
+            <span class="s2">{{ school.stationPwd || "--" }}</span>
+          </li>
+        </ul>
+        <div class="grade-box">
+          <p class="h-title">
+            年级管理
+            <span v-if="!code" class="popconfirm-box" @click="diaUpgradeGrade = true">
+              年级升级<i class="fa fa-level-up"></i>
+            </span>
+          </p>
+          <ul class="grade-info">
+            <li
+              class="grade-item"
+              v-for="item in tableData"
+              :key="item.grade"
+            >
+              <p class="grade-name">{{ item.gradeName }}</p>
+              <div class="grade-class">
+                <p>
+                  <i class="fa fa-building"></i>班级：{{
+                    item.classList.length
+                  }}个
+                </p>
+                <p>
+                  <i class="fa fa-book"></i>科目：{{
+                    item.subjectNames.length
+                  }}个
+                </p>
+              </div>
+            </li>
+          </ul>
+          <el-empty
+            :image-size="100"
+            v-if="!tableData.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+        </div>
+      </div>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="修改学校信息" :visible.sync="diaSchool" width="400">
+      <el-form
+        ref="formSchool"
+        class="form-box"
+        :model="formSchool"
+        :rules="rulesSchool"
+        label-width="160px"
+      >
+        <el-form-item label="学段：" prop="sections">
+          <el-checkbox-group v-model="formSchool.sections">
+            <el-checkbox
+              v-for="item in sectionsList"
+              :label="item.code"
+              :key="item.code"
+              :disabled="defaultSections.includes(item.code)"
+              >{{ item.name }}</el-checkbox
+            >
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="授课端管理密码：" prop="managePwd">
+          <el-col :span="10">
+            <el-input
+              maxlength="20"
+              v-model="formSchool.managePwd"
+              show-password
+              placeholder="请输入授课端管理密码"
+            ></el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="基站登录密码：" prop="stationPwd">
+          <el-col :span="10">
+            <el-input
+              maxlength="6"
+              v-model="formSchool.stationPwd"
+              show-password
+              placeholder="请输入基站登录密码"
+            ></el-input>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="联系人：" prop="contactPerson"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="formSchool.contactPerson"
+              placeholder="请输入联系人"
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="手机号码：" prop="contactPhone"
+          ><el-col :span="10"
+            ><el-input
+              v-model="formSchool.contactPhone"
+              type="number"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
+              placeholder="请输入联系人手机号码"
+            ></el-input></el-col
+        ></el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="editSchool">确 定</el-button>
+        <el-button @click="diaSchool = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="班级升级" :visible.sync="diaUpgradeGrade" width="400">
+      <p>注意该操作会将所有年级升级，请谨慎操作！</p>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="danger" @click="_UpgradeGrade()">确认升级</el-button>
+        <el-button type="primary" @click="diaUpgradeGrade = false"
+          >取 消</el-button
+        >
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { downloadFile } from "@/utils";
+export default {
+  data() {
+    return {
+      code: "", //长水跳转标志
+      loading: false,
+      url: "/api_html/school/manager/importClassAndStudent",
+      diaSchool: false,
+      school: {
+        schoolName: "",
+        managePwd: "",
+        contactPerson: "",
+        contactPhone: "",
+        sections: "",
+        tenantName: "",
+      },
+      tableData: [],
+      formSchool: {
+        //修改学校
+        sections: "",
+        managePwd: "",
+        stationPwd: "",
+        contactPerson: "",
+        contactPhone: "",
+      },
+      rulesSchool: {
+        sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
+        managePwd: [
+          { required: true, message: "请填写管理密码", trigger: "blur" },
+          {
+            min: 8,
+            max: 20,
+            message: "长度在 8 到 20 个字符",
+            trigger: "blur",
+          },
+        ],
+        stationPwd: [
+          { required: true, message: "请填写基站登陆密码", trigger: "blur" },
+          {
+            min: 6,
+            max: 6,
+            message: "长度为 6 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      subjectName: "",
+      sectionsList: [],
+      diaUpgradeGrade: false, //班级升级
+      defaultSections: [],
+    };
+  },
+  computed: {
+    sections: function () {
+      let arr = this.formSchool.sections || [];
+      let sections = [];
+      this.sectionsList.map((item) => {
+        if (arr.includes(item.code)) {
+          sections.push(item.name);
+        }
+      });
+      return sections.join(",");
+    },
+  },
+  created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this._QueryDataSchool();
+    this._QueryDataGrade();
+    this._QuerySectionList();
+  },
+  methods: {
+   
+    editSchool() {
+      //保存修改学校信息
+      if (!this.formSchool.sections.length) {
+        this.$message.error("请选择学段！");
+        return;
+      }
+      if (!this.formSchool.managePwd) {
+        this.$message.error("请填写密码！");
+        return;
+      }
+      if (!this.formSchool.stationPwd) {
+        this.$message.error("请填写基站登录密码！");
+        return;
+      }
+      if (this.loading) {
+        return;
+      }
+      this.$refs.formSchool.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let form = { ...this.formSchool };
+          form.sections = this.formSchool.sections.join(",");
+          const { data, status, info } = await this.$request.updateSchool({
+            ...form,
+          });
+          this.loading = false;
+          if (status === 0) {
+            this.$message.success("修改成功~");
+            this.diaSchool = false;
+            this._QueryDataSchool();
+            this._QueryDataGrade();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    
+    async _UpgradeGrade() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.upgradeGrade();
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success("升级成功~");
+        this.diaUpgradeGrade = false;
+        this._QueryDataGrade();
+      } else {
+        this.$message.error(info);
+      }
+    },
+
+    async _QuerySectionList() {
+      //学校学段
+      const { data, status, info } = await this.$request.sectionList();
+      console.log(status);
+      if (status === 0) {
+        this.sectionsList = data?.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataSchool() {
+      //学校详情
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolDetail();
+      this.loading = false;
+      if (status === 0) {
+        this.school = { ...data };
+        for (let key in this.formSchool) {
+          if (key == "sections") {
+            this.formSchool.sections = data[key].split(",").map((item) => {
+              console.log(Number(item));
+              return Number(item);
+            });
+          } else {
+            this.formSchool[key] = data[key] || "";
+          }
+        }
+        this.defaultSections = [...this.formSchool.sections];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.tableData = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+  .content-box {
+    background: #f8f8f8;
+    border-radius: 16px;
+    position: relative;
+    .el-icon-edit {
+      position: absolute;
+      top: 12px;
+      right: 12px;
+      padding: 5px;
+      font-size: 18px;
+      cursor: pointer;
+      &:hover {
+        color: #36f;
+      }
+    }
+  }
+  .school-info {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 16px 0;
+    border-bottom: 0.5px solid #f2f2f2;
+    .school-item {
+      width: 50%;
+      line-height: 48px;
+      padding-left: 100px;
+      display: flex;
+      box-sizing: border-box;
+      .s1 {
+        width: 160px;
+        font-size: 15px;
+        color: #888;
+      }
+      .s2 {
+        flex: 1;
+      }
+    }
+  }
+  .grade-box {
+    padding: 20px;
+    .h-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .popconfirm-box {
+        cursor: pointer;
+        font-size: 14px;
+        color: #999;
+        .fa-level-up {
+          font-size: 16px;
+          padding-left: 2px;
+        }
+        &:hover {
+          color: #f30;
+        }
+      }
+    }
+    .grade-info {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 20px;
+      .grade-item {
+        width: calc((100% - 100px) / 3);
+        margin-right: 50px;
+        margin-bottom: 40px;
+        box-sizing: border-box;
+        padding: 12px 16px;
+        border-radius: 10px;
+        box-shadow: 1px 1px 3px #888;
+        transition: all 0.5s;
+        &:hover {
+          transform: translate(-2px, -5px);
+          box-shadow: 5px 5px 10px #888;
+        }
+        &:nth-of-type(3n) {
+          margin-right: 0;
+        }
+      }
+      .grade-name {
+        font-size: 16px;
+        font-weight: bold;
+        line-height: 18px;
+        padding-bottom: 12px;
+      }
+      .grade-class {
+        display: flex;
+        justify-content: space-between;
+        font-size: 15px;
+        padding-right: 20px;
+        .fa {
+          font-size: 18px;
+          margin-right: 5px;
+          color: #a4a4a4;
+        }
+        .fa-book {
+          font-size: 20px;
+        }
+      }
+    }
+  }
+}
+.form-box {
+  margin: 0 20px;
+}
+.el-icon-plus {
+  cursor: pointer;
+  &:hover {
+    color: #667ffd;
+  }
+}
+:deep(.el-checkbox-group) {
+  display: flex;
+  flex-wrap: wrap;
+  .p1 {
+    padding-right: 30px;
+    position: relative;
+    &:hover {
+      .el-icon-delete {
+        display: block;
+      }
+      .is-checked + .el-icon-delete {
+        display: none;
+      }
+    }
+  }
+  .el-icon-delete {
+    font-size: 14px;
+    color: #999;
+    position: absolute;
+    right: 10px;
+    top: 13px;
+    cursor: pointer;
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue
new file mode 100644
index 0000000..c7c5ff0
--- /dev/null
+++ b/src/views/basic/setUp/student.vue
@@ -0,0 +1,892 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>学生管理</span>
+      </template>
+      <template slot="btns" v-if="role == 'ROLE_XUEXIAO'">
+        <el-tooltip effect="dark" content="设置答题器" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            circle
+            @click="diaUp = true"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip
+          v-if="!code"
+          effect="dark"
+          content="添加学生"
+          placement="bottom"
+        >
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            plain
+            circle
+            @click="openAddDia"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.grade"
+          placeholder="选择年级"
+          @change="changeGrade"
+        >
+          <el-option disabled label="全部" value=""></el-option>
+          <el-option
+            v-for="item in gradeList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+          <el-option label="未分配" :value="80"></el-option>
+          <el-option label="已毕业" :value="81"></el-option>
+        </el-select>
+        <el-input
+          placeholder="请输入学生姓名"
+          v-model="query.studentName"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(1)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(1)"
+          ></el-button>
+        </el-input>
+        <el-input
+          placeholder="请输入学生学号"
+          v-model="query.studentCode"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(2)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <p
+      class="total"
+      v-if="
+        studentList.length &&
+        (query.grade == 80 || query.grade == 81 || !query.grade)
+      "
+    >
+      共筛选出{{ studentList.length }}名学生。
+    </p>
+    <p
+      class="total"
+      v-if="
+        getStuTotal && query.grade && query.grade != 80 && query.grade != 81
+      "
+    >
+      共筛选出{{ getStuTotal }}名学生。
+    </p>
+    <div class="page-content">
+      <div class="stu-box">
+        <div
+          class="stu-list"
+          v-show="query.grade && query.grade != 80 && query.grade != 81"
+        >
+          <div class="h-title">班级列表</div>
+          <ul class="stu-ul">
+            <li
+              class="stu-item"
+              v-for="(item, index) in classList"
+              :key="item.id"
+              :class="query.classId == item.id ? 'active' : ''"
+              @click="classDetail(item)"
+            >
+              {{ item.className }}（{{ item.studentCount }}）
+            </li>
+          </ul>
+        </div>
+        <div class="stu-detail" v-loading="loading">
+          <div
+            class="clazz-detail"
+            v-if="
+              clazzDetail.stationSn &&
+              query.grade &&
+              query.grade != 80 &&
+              query.grade != 81
+            "
+          >
+            <p>基站SN：{{ clazzDetail.stationSn }}</p>
+            <p>配对码：{{ clazzDetail.pairingCode }}</p>
+            <p>频点：{{ clazzDetail.frequency }}</p>
+          </div>
+          <ul class="s-ul">
+            <li
+              class="s-li"
+              v-for="(item, index) in studentList"
+              :key="item.id"
+            >
+              <el-popconfirm
+                v-if="!code"
+                title="确定删除吗？"
+                @confirm="removeStu(item, index, $event)"
+              >
+                <i class="el-icon-delete" slot="reference"></i>
+              </el-popconfirm>
+              <i
+                class="el-icon-user-solid"
+                v-if="!code && query.grade != 81"
+                @click.stop="openChangeClazz(item)"
+              ></i>
+              <div class="s-li-box" @click="sayChange(item)">
+                <p class="name">
+                  {{ item.studentName }}
+                </p>
+                <p class="p2" v-if="!query.classId">
+                  <template v-if="item.classList && item.classList.length">
+                    <template v-for="(clazz, index) in item.classList">
+                      <span v-if="index == 0">
+                        {{ clazz.gradeName }}﹒{{ clazz.className }}</span
+                      >
+                    </template></template
+                  >
+                  <template v-else>
+                    {{
+                      item.status == 0
+                        ? "未分配"
+                        : item.status == 2
+                        ? "已毕业"
+                        : ""
+                    }}
+                  </template>
+                </p>
+                <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
+                <p class="p1">长学号：{{ item.studentCode }}</p>
+                <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
+              </div>
+            </li>
+          </ul>
+          <el-empty
+            :image-size="100"
+            v-if="!studentList.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="学生调班"
+      :visible.sync="diaChangeClass"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formStuCla"
+        :model="formStuCla"
+        :rules="rulesStuCla"
+        label-width="160px"
+      >
+        <el-form-item label="学生姓名：">
+          <span>{{ formStuCla.studentName }}</span>
+        </el-form-item>
+        <el-form-item label="当前班级：">
+          <span>{{ formStuCla.className }}</span>
+        </el-form-item>
+        <el-form-item label="调到班级：" prop="classId">
+          <el-col :span="10">
+            <el-select
+              class="sel"
+              v-model="formStuCla.classId"
+              placeholder="选择年级"
+            >
+              <el-option disabled label="请选择" value=""></el-option>
+              <el-option
+                v-for="item in classList"
+                :key="item.id"
+                :label="item.className"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="长学号：" prop="studentCode">
+          <el-col :span="10">
+            <el-input
+              maxlength="12"
+              placeholder="输入学生长学号"
+              v-model.trim="formStuCla.studentCode"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="changeStu">确 定</el-button>
+        <el-button @click="diaChangeClass = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="调班轨迹"
+      :visible.sync="diaChangeClassTrack"
+      width="400"
+    >
+      <el-form
+        :model="formClassTrack"
+        label-width="160px"
+        v-loading="loadingClassLogs"
+      >
+        <el-form-item label="学生姓名：">
+          <span>{{ formClassTrack.studentName }}</span>
+        </el-form-item>
+        <el-form-item label="当前班级：">
+          <span>{{ formClassTrack.className }}</span>
+        </el-form-item>
+        <el-form-item label="历史班级：">
+          <p v-for="item in formClassTrack.classList">
+            {{ `${item.gradeName}-${item.className}：${item.createdTime}` }}
+          </p>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaChangeClassTrack = false">关 闭</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="添加学生"
+      :visible.sync="diaStu"
+      width="400"
+    >
+      <el-form
+        ref="formBox"
+        class="form-box"
+        :model="formStu"
+        :rules="rulesStu"
+        label-width="160px"
+      >
+        <el-form-item label="所在班级：">
+          <span>{{ formStu.className }}</span>
+        </el-form-item>
+        <el-form-item label="学生姓名：" prop="studentName">
+          <el-col :span="10">
+            <el-input
+              maxlength="30"
+              placeholder="输入学生姓名"
+              v-model.trim="formStu.studentName"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="长学号：" prop="studentCode">
+          <el-col :span="10">
+            <el-input
+              maxlength="12"
+              placeholder="输入学生长学号"
+              v-model.trim="formStu.studentCode"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="短学号：">
+          <el-col :span="10">
+            <el-input maxlength="12" v-model.trim="formStu.shortNumber" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="性别：">
+          <el-radio-group v-model="formStu.sex">
+            <el-radio :label="1">男</el-radio>
+            <el-radio :label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="答题器编码：">
+          <el-col :span="10">
+            <el-input v-model.trim="formStu.clickerSn" />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="addStu">确 定</el-button>
+        <el-button @click="diaStu = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="学生答题器绑定"
+      :visible.sync="diaUp"
+      width="600"
+    >
+      <up-load
+        id="downTeacher"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="学生答题器绑定模板"
+      >
+        <p class="down-txt" slot="down">
+          通过Excel名单导入学生答题器绑定模板，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import _ from "lodash";
+import { setGradeName } from "@/utils";
+export default {
+  data() {
+    return {
+      code: "",
+      role: "",
+      loading: false,
+      loadingDown: false,
+      loadingClassLogs: false,
+      diaUp: false,
+      url: "/api_html/school/manager/importStudentClicker",
+      diaStu: false,
+      diaChangeClass: false,
+      diaChangeClassTrack: false,
+      formClassTrack: {
+        studentName: "",
+        className: "",
+        classList: [],
+      },
+      clazzDetail: { stationSn: "", pairingCode: "", frequency: "" },
+      query: {
+        grade: "",
+        classId: "",
+        status: 0,
+        studentCode: "",
+        studentName: "",
+      },
+      formStu: {
+        className: "",
+        studentName: "",
+        studentCode: "",
+        shortNumber: "",
+        sex: 1,
+        clickerSn: "",
+      },
+      rulesStu: {
+        studentName: [
+          { required: true, message: "请输入学生名称", trigger: "blur" },
+        ],
+        studentCode: [
+          { required: true, message: "请输入学生长学号", trigger: "blur" },
+        ],
+      },
+      formStuCla: {
+        studentName: "",
+        studentId: "",
+        oldClassId: "",
+        className: "",
+        classId: "",
+        studentCode: "",
+      },
+      rulesStuCla: {
+        classId: [{ required: true, message: "请选择班级", trigger: "blur" }],
+        studentCode: [
+          { required: true, message: "请输入学生号", trigger: "blur" },
+        ],
+      },
+      gradeName: "",
+      gradeList: [],
+      classList: [],
+      studentList: [],
+      teacherDetail: {
+        teacherName: "",
+        loginName: "",
+        sex: "",
+        available: "",
+        managerList: [],
+        teacherCourseList: [],
+        teacherGradeList: [],
+      },
+    };
+  },
+  computed: {
+    getStuTotal: function () {
+      let num = this.classList.reduce((pre, cur) => {
+        return (pre += cur.studentCount);
+      }, 0);
+      return num;
+    },
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    await this._QueryDataGrade();
+    await this._QueryClass();
+    this._QueryData(3);
+  },
+  methods: {
+    getGradeName(type) {
+      return setGradeName(type);
+    },
+    openAddDia() {
+      if (!this.query.classId) {
+        this.$message.warning("暂无班级信息，请选择或导入班级！");
+        return;
+      }
+      this.formStu.studentName = "";
+      this.formStu.studentCode = "";
+      this.formStu.shortNumber = "";
+      this.formStu.sex = 1;
+      this.formStu.clickerSn = "";
+      this.diaStu = true;
+    },
+    classDetail(obj) {
+      this.clazzDetail.stationSn = obj.stationSn;
+      this.clazzDetail.pairingCode = obj.pairingCode;
+      this.clazzDetail.frequency = obj.frequency;
+      this.query.classId = obj.id;
+      this.formStu.className = obj.className;
+      this._QueryData(3);
+    },
+
+    async upSuccess(res) {
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 5000,
+      });
+      //导入成功
+      this.diaUp = false;
+      await this._QueryClazz(this.query.grade);
+      this._QueryData();
+    },
+    //添加学生
+    addStu() {
+      let query = {};
+      for (let key in this.formStu) {
+        if (key != "className" && this.formStu[key]) {
+          query[key] = this.formStu[key];
+        }
+      }
+      this.loading = true;
+      this.$refs.formBox.validate(async (valid) => {
+        if (valid) {
+          let hasName = this.studentList.find((item) => {
+            return item.studentName == this.formStu.studentName;
+          });
+          console.log(hasName);
+          if (hasName) {
+            this.$message.warning("学生姓名已存在");
+            return;
+          }
+          const { data, status, info } = await this.$request.addStudent({
+            classId: this.query.classId,
+            ...query,
+          });
+          this.loading = false;
+          console.log(status);
+          if (status === 0) {
+            this.$message.success(info);
+            this.diaStu = false;
+            await this._QueryClazz(this.query.grade);
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    //学生调班轨迹
+    sayChange(obj) {
+      this._StudentClassLogs(obj);
+      this.diaChangeClassTrack = true;
+    },
+    //学生调班弹窗
+    openChangeClazz(obj) {
+      console.log(obj);
+      if (this.query.grade == 80 || !this.query.grade) {
+        this._QueryClazz(obj.grade);
+      }
+      this.formStuCla.classId = "";
+      this.formStuCla.studentId = obj.id;
+      this.formStuCla.className = obj.classList && obj.classList[0]?.className;
+      this.formStuCla.studentName = obj.studentName;
+      this.formStuCla.studentCode = obj.studentCode;
+      this.formStuCla.oldClassId = obj.classList && obj.classList[0]?.id;
+      this.diaChangeClass = true;
+    },
+    //学生调班
+    changeStu: _.throttle(
+      function () {
+        this.$refs.formStuCla.validate(async (valid) => {
+          if (valid) {
+            // if (this.formStuCla.classId == this.formStuCla.oldClassId) {
+            //   this.$message.warning("班级无变更～");
+            //   return;
+            // }
+            const { data, status, info } =
+              await this.$request.studentChangeClass({
+                studentId: this.formStuCla.studentId,
+                oldClassId: this.formStuCla.oldClassId,
+                classId: this.formStuCla.classId,
+                studentCode: this.formStuCla.studentCode,
+              });
+            if (status == 0) {
+              this.diaChangeClass = false;
+              this.$message.success(info);
+              await this._QueryClazz(this.query.grade);
+              this._QueryData();
+            } else {
+              this.$message.error(info);
+            }
+          } else {
+            this.$message.error("数据有误请检查！");
+          }
+        });
+      },
+      2000,
+      { leading: true, trailing: false }
+    ),
+
+    //学生调班轨迹
+    async _StudentClassLogs(obj) {
+      this.loadingClassLogs = true;
+      let { data, info, status } = await this.$request.studentClassLogs({
+        studentId: obj.id,
+      });
+      this.loadingClassLogs = false;
+      if (status == 0) {
+        this.formClassTrack.className =
+          (obj.classList && obj.classList[0]?.className) || "";
+        this.formClassTrack.studentName = obj.studentName;
+        this.formClassTrack.classList = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async removeStu(obj, index, $event) {
+      const { data, status, info } = await this.$request.delStudent({
+        studentId: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        await this._QueryClazz(this.query.grade);
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async changeGrade(val) {
+      if (!val) return;
+      this.query.classId = "";
+      this.query.studentName = "";
+      this.query.studentCode = "";
+      if (val != 80 && val != 81) {
+        await this._QueryClass(val);
+      }
+      this._QueryData(3);
+    },
+    serQuery(type) {
+      let query = {};
+      if (type == 1) {
+        this.query.classId = "";
+        this.query.studentCode = "";
+        this.query.grade = "";
+        query.studentName = this.query.studentName;
+        query.status = 9;
+      } else if (type == 2) {
+        this.query.classId = "";
+        this.query.studentName = "";
+        this.query.grade = "";
+        query.studentCode = this.query.studentCode;
+        query.status = 9;
+      } else if (type == 3) {
+        this.query.studentName = "";
+        this.query.studentCode = "";
+        if (this.query.grade == 80) {
+          this.query.classId = "";
+          query.status = -1;
+        } else if (this.query.grade == 81) {
+          this.query.classId = "";
+          query.status = 2;
+        } else {
+          query.grade = this.query.grade;
+          query.classId = this.query.classId;
+        }
+      } else {
+        query = { ...this.query };
+      }
+      return query;
+    },
+    async _QueryData(type) {
+      if (type == 1) {
+        if (!this.query.studentName) {
+          this.$message.warning("输入学生姓名～");
+          return;
+        }
+      } else if (type == 2) {
+        if (!this.query.studentCode) {
+          this.$message.warning("输入学生学号～");
+          return;
+        }
+      }
+      let query = this.serQuery(type);
+      this.loading = true;
+      this.studentList = [];
+      const { data, status, info } = await this.$request.studentList({
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.studentList = (data.list && [...data?.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            return {
+              value: item.grade,
+              label: item.gradeName,
+            };
+          }) || [];
+        this.query.grade = this.gradeList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClass(value) {
+      this.loading = true;
+      this.classList = [];
+      const { data, status, info } = await this.$request.schoolClassList({
+        grade: value || this.query.grade,
+      });
+      if (status === 0) {
+        this.classList = (data.list && [...data?.list]) || [];
+        this.query.classId = this.classList[0]?.id;
+        this.formStu.className = this.classList[0]?.className;
+        this.clazzDetail.stationSn = this.classList[0]?.stationSn;
+        this.clazzDetail.pairingCode = this.classList[0]?.pairingCode;
+        this.clazzDetail.frequency = this.classList[0]?.frequency;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClazz(value) {
+      this.classList = [];
+      const { data, status, info } = await this.$request.schoolClassList({
+        grade: value,
+      });
+      if (status === 0) {
+        this.classList = (data.list && [...data?.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      this.loadingDown = true;
+      let { data, info, status } =
+        await this.$request.studentClickerTemplateUrl();
+      this.loadingDown = false;
+      if (status == 0) {
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px;
+}
+.tips {
+  display: flex;
+  line-height: 16px;
+  font-size: 14px;
+  color: #999;
+  margin-bottom: 10px;
+}
+.total {
+  padding: 0 20px 10px;
+  font-size: 14px;
+  color: #666;
+}
+.stu-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  .answer-header {
+    padding-top: 10px;
+  }
+  .stu-list {
+    min-width: 200px;
+    max-height: 80vh;
+    .h-title {
+      height: 40px;
+      line-height: 40px;
+      background: #eee;
+    }
+    .stu-item {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 36px;
+      cursor: pointer;
+      padding-left: 12px;
+      position: relative;
+      .el-icon-edit-outline {
+        position: absolute;
+        top: 8px;
+        right: 4px;
+        font-size: 20px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      .popconfirm-box {
+        position: absolute;
+        top: 6px;
+        right: 31px;
+        font-size: 17px;
+        line-height: 24px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      &:hover {
+        background: #eee;
+        .el-icon-edit-outline {
+          display: block;
+        }
+        .popconfirm-box {
+          display: block;
+        }
+      }
+      &.active {
+        color: #667ffd;
+        background: #eee;
+      }
+    }
+    .sel {
+      width: 180px;
+      :deep(.el-input__inner) {
+        font-size: 16px;
+        padding-left: 0;
+        border: none;
+        background: transparent;
+      }
+      :deep(.el-icon-arrow-up:before) {
+        content: "\e78f";
+      }
+    }
+  }
+  .stu-detail {
+    flex: 1;
+    border-left: 0.5px solid #eee;
+    min-height: 200px;
+    &-tit {
+      display: flex;
+      justify-content: space-between;
+    }
+
+    .s-ul {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 12px 0 0 20px;
+      .s-li {
+        position: relative;
+        box-shadow: 2px 2px 5px #7f7f7f;
+        margin: 0 20px 20px 0;
+        .s-li-box {
+          width: 160px;
+          border-radius: 10px;
+          min-height: 120px;
+          padding: 0 12px 5px;
+          cursor: pointer;
+        }
+        .el-icon-user-solid {
+          position: absolute;
+          top: 8px;
+          left: 8px;
+          font-size: 18px;
+          color: #666;
+          padding: 2px;
+          display: none;
+          cursor: pointer;
+          &:hover {
+            color: #667ffd;
+          }
+        }
+        .el-icon-delete {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          font-size: 18px;
+          padding: 2px;
+          display: none;
+          cursor: pointer;
+          &:hover {
+            color: #667ffd;
+          }
+        }
+        &:hover {
+          .el-icon-user-solid {
+            display: block;
+          }
+          .el-icon-delete {
+            display: block;
+          }
+        }
+        .name {
+          text-align: center;
+          font-size: 16px;
+          line-height: 18px;
+          padding: 10px 0;
+        }
+        .p1 {
+          color: #7f7f7f;
+          line-height: 20px;
+          padding-bottom: 5px;
+        }
+        .p2 {
+          color: #333;
+          line-height: 20px;
+          padding-bottom: 5px;
+        }
+      }
+    }
+  }
+  .clazz-detail {
+    display: flex;
+    padding: 12px 12px 0 20px;
+    p {
+      margin-right: 16px;
+      color: #666;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue
new file mode 100644
index 0000000..bd9f177
--- /dev/null
+++ b/src/views/basic/setUp/teacher.vue
@@ -0,0 +1,1132 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>教师管理</span>
+      </template>
+      <template slot="btns" v-if="!code">
+        <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-upload2"
+            size="mini"
+            plain
+            circle
+            @click="diaUp = true"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="导出教师名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            plain
+            circle
+            @click="exportTeacherExl"
+          ></el-button>
+        </el-tooltip>
+        <el-tooltip effect="dark" content="添加教师" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            size="mini"
+            plain
+            circle
+            @click="addTeacherDia"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-cascader
+          size="small"
+          class="sel sel2"
+          clearable
+          placeholder="选择范围"
+          @change="_QueryData(1)"
+          v-model="query.gradeClassSub"
+          :options="gradeClassSubList"
+          :props="{
+            multiple: true,
+            checkStrictly: true,
+          }"
+          collapse-tags
+          :show-all-levels="false"
+        ></el-cascader>
+        <el-select
+          class="sel"
+          v-model="query.type"
+          @change="_QueryData(4)"
+          placeholder="选择类型"
+        >
+          <el-option disabled label="请选择" :value="9"></el-option>
+          <el-option label="已分配任课信息" :value="0"></el-option>
+          <el-option label="未分配任课信息" :value="1"></el-option>
+        </el-select>
+        <el-input
+          placeholder="请输入老师姓名"
+          v-model="query.teacherName"
+          class="input-with-select"
+          maxlength="30"
+          clearable
+          @keyup.enter.native="_QueryData(2)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(2)"
+          ></el-button>
+        </el-input>
+        <el-input
+          type="number"
+          oninput="if(value.length > 11) value = value.slice(0,11)"
+          placeholder="请输入老师手机号"
+          v-model="query.phone"
+          clearable
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(3)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(3)"
+          ></el-button>
+        </el-input>
+        <!-- <el-button class="serach-box" round @click="_QueryData(4)"
+          >筛选</el-button
+        > -->
+      </div>
+    </div>
+    <p class="total" v-if="teacherList.length">
+      共筛选出{{ teacherList.length }}名教师。
+    </p>
+    <div class="page-content">
+      <el-empty
+        :image-size="100"
+        v-if="!teacherList.length && loading == false"
+        description="没有更多数据"
+      ></el-empty>
+      <div class="teacher-box" v-loading="loading" v-else>
+        <div class="teacher-list">
+          <p class="h-title">教师列表</p>
+          <ul class="teacher-ul">
+            <li
+              class="teacher-item"
+              v-for="item in teacherList"
+              :key="item.id"
+              :class="showTId == item.id ? 'active' : ''"
+              @click="showTeacher(item)"
+            >
+              {{ item.realName
+              }}<template v-if="setClass(item)"
+                >（{{ setClass(item) }}）</template
+              >
+            </li>
+          </ul>
+        </div>
+        <div class="teacher-detail">
+          <div class="icon-box" v-if="!code">
+            <i class="icon el-icon-edit-outline" @click="editTeacher(1)"></i>
+            <i
+              class="icon el-icon-circle-plus-outline"
+              @click="editTeacher(2)"
+            ></i>
+          </div>
+          <div class="detail-top">
+            <p class="p-item">手机号码：{{ teacherDetail.loginName }}</p>
+            <p class="p-item">
+              状态：{{ teacherDetail.available == 1 ? "不可用" : "正常" }}
+            </p>
+            <p class="p-item">
+              性别：{{
+                teacherDetail.sex == 1
+                  ? "男"
+                  : teacherDetail.sex == 2
+                  ? "女"
+                  : "未知"
+              }}
+            </p>
+          </div>
+          <div
+            class="grade-box"
+            v-if="teacherDetail.managerList && teacherDetail.managerList.length"
+          >
+            <p class="h-title">班主任</p>
+            <ul class="grade-info">
+              <li
+                class="grade-li"
+                v-for="item in teacherDetail.managerList"
+                :key="item.classId"
+              >
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 1)"
+                  v-if="!code"
+                >
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.gradeName }}-{{ item.className }}
+                  </p>
+                  <div class="grade-class">
+                    <p>
+                      <i class="fa fa-address-book-o"></i>学生：{{
+                        item.studentCount
+                      }}个
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div
+            class="grade-box"
+            v-if="
+              teacherDetail.teacherCourseList &&
+              teacherDetail.teacherCourseList.length
+            "
+          >
+            <p class="h-title">任课老师</p>
+            <ul class="grade-info">
+              <li
+                class="grade-li"
+                v-for="item in teacherDetail.teacherCourseList"
+                :key="item.classId+item.subjectName"
+              >
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 2)"
+                  v-if="!code"
+                >
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.gradeName }}-{{ item.className }}（{{
+                      item.subjectName
+                    }}）
+                  </p>
+                  <div class="grade-class">
+                    <p>
+                      <i class="fa fa-address-book-o"></i>学生：{{
+                        item.studentCount
+                      }}个
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+          <div
+            class="grade-box"
+            v-if="
+              teacherDetail.teacherGradeList &&
+              teacherDetail.teacherGradeList.length
+            "
+          >
+            <p class="h-title">备课组长</p>
+            <ul
+              class="grade-info"
+              v-for="item in teacherDetail.teacherGradeList"
+              :key="item.grade"
+            >
+              <li class="grade-li">
+                <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="delTeacherManager(item, 3)"
+                  v-if="!code"
+                >
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.gradeName }}（{{ item.subjectName }}）
+                  </p>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+    <el-dialog
+      :close-on-click-modal="false"
+      title="导入教师名单"
+      :visible.sync="diaUp"
+      width="600"
+    >
+      <up-load
+        id="downTeacher"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="教师名单"
+      >
+        <p class="down-txt" slot="down">
+          通过Excel名单导入教师名单，点击
+          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+        </p>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :close-on-click-modal="false"
+      :title="
+        isAdd ? '添加教师' : setTercherType == 1 ? '编辑教师信息' : '管理班级'
+      "
+      :visible.sync="diaTeacher"
+      width="400"
+      append-to-body
+    >
+      <el-form
+        class="form-box"
+        ref="formTeacher"
+        :model="formTeacher"
+        :rules="rulesTeacher"
+        label-width="160px"
+      >
+        <el-form-item v-show="!isAdd && setTercherType == 2" label="教师姓名：">
+          <span>{{ formTeacher.teacherName }}</span>
+        </el-form-item>
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="手机号码："
+          prop="loginName"
+        >
+          <el-col :span="10">
+            <el-input
+              type="number"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
+              v-model.trim="formTeacher.loginName"
+            />
+          </el-col>
+        </el-form-item>
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="教师姓名："
+          prop="teacherName"
+        >
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formTeacher.teacherName" />
+          </el-col>
+        </el-form-item>
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="性别："
+          prop="sex"
+        >
+          <el-radio-group v-model="formTeacher.sex">
+            <el-radio :label="1">男</el-radio>
+            <el-radio :label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 2)"
+          label="教师角色："
+          prop="roleList"
+        >
+          <div
+            class="role-list"
+            v-for="(item, index) in formTeacher.roleList"
+            :key="item.id"
+          >
+            <el-select
+              class="sel-c"
+              v-model="item.roleId"
+              placeholder="选择角色"
+              @change="item.classId = []"
+            >
+              <el-option
+                v-for="item in teacherRoleList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-cascader
+              size="small"
+              v-if="item.roleId == 6"
+              class="sel-t"
+              collapse
+              clearable
+              placeholder="选择年级-班级"
+              v-model="item.classId"
+              :options="gradeClassList"
+              :props="{ expandTrigger: 'hover' }"
+            ></el-cascader>
+            <el-cascader
+              size="small"
+              v-if="item.roleId == 7"
+              class="sel-t teacher-cascader"
+              collapse
+              clearable
+              placeholder="选择年级-科目-班级"
+              v-model="item.classId"
+              :options="gradeSubListClass"
+              :props="{ expandTrigger: 'hover', multiple: true }"
+              popperClass="cascader-clazz"
+            ></el-cascader>
+            <el-cascader
+              size="small"
+              v-if="item.roleId == 8"
+              class="sel-t"
+              collapse
+              clearable
+              placeholder="选择年级-科目"
+              v-model="item.classId"
+              :options="gradeList"
+              :props="{ expandTrigger: 'hover' }"
+            ></el-cascader>
+            <i class="el-icon-close" @click="removeRoleList(index)"></i>
+          </div>
+          <p class="add-box">
+            <el-button icon="el-icon-plus" @click="addRoleList">添加</el-button>
+          </p>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="addTeacher">确 定</el-button>
+        <el-button @click="diaTeacher = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  downloadFile,
+  formatGradeClass,
+  randomWord,
+  setGradeName,
+} from "@/utils";
+export default {
+  data() {
+    return {
+      code: "",
+      loading: false,
+      url: "/api_html/school/manager/importTeacher",
+      diaUp: false,
+      diaTeacher: false,
+      isAdd: false,
+      setTercherType: 1,
+      query: {
+        gradeClassSub: [],
+        type: 0,
+        teacherName: "",
+        phone: "",
+      },
+      subjectList: [],
+      gradeList: [],
+      classList: [],
+      gradeClassSubList: [],
+      gradeSubListClass: [],
+      teacherList: [],
+      teacherRoleList: [
+        //角色
+        {
+          value: 6,
+          label: "班主任",
+        },
+        {
+          value: 7,
+          label: "任课老师",
+        },
+        {
+          value: 8,
+          label: "备课组长",
+        },
+      ],
+      teacherDetail: {
+        teacherName: "",
+        loginName: "",
+        sex: "",
+        available: "",
+        managerList: [],
+        teacherCourseList: [],
+        teacherGradeList: [],
+      },
+      showTId: "", //显示详情 教师ID
+      roleList: [],
+      formTeacher: {
+        teacherName: "",
+        loginName: "",
+        sex: 1,
+        roleList: [],
+      },
+      rulesTeacher: {
+        teacherName: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+        ],
+        loginName: [
+          { required: true, message: "请输入教师姓名", trigger: "blur" },
+        ],
+        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
+        roleList: [
+          { required: true, message: "请选择角色信息", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this._QueryData(4);
+    await this._QuerySubject();
+    await this._QueryDataGrade();
+    this._RoleList();
+    await this._QueryClass();
+  },
+  methods: {
+    gradeName(type) {
+      return setGradeName(type);
+    },
+    upSuccess(res) {
+      //导入成功
+      this.$message.closeAll();
+      this.$message({
+        showClose: true,
+        message: `成功（${res.data.success}）`,
+        type: "success",
+        duration: 5000,
+      });
+      this.diaUp = false;
+      this._QueryData(5);
+    },
+    addRoleList() {
+      //添加教师角色
+      this.formTeacher.roleList.push({
+        id: randomWord(true, 16, 20),
+        roleId: "",
+        classId: [],
+      });
+    },
+    removeRoleList(index) {
+      //删除教师角色
+      this.formTeacher.roleList.splice(index, 1);
+    },
+    addTeacherDia() {
+      //添加教师弹窗
+      this.isAdd = true;
+      this.formTeacher = {
+        teacherName: "",
+        loginName: "",
+        sex: 1,
+        roleList: [],
+      };
+      this.diaTeacher = true;
+    },
+    setClass(obj) {
+      //教师角色数量
+      return (
+        obj.managerList?.length +
+        obj.teacherCourseList?.length +
+        obj.teacherGradeList?.length
+      );
+    },
+    getClassName(id) {
+      let name;
+      this.classList.map((item) => {
+        if (item.value == id) {
+          name = item.label;
+        }
+      });
+      return name;
+    },
+    showTeacher(obj) {
+      //教师详细数据
+      this.showTId = obj.id;
+      this.teacherDetail = { ...obj };
+    },
+    editTeacher(type) {
+      this.diaTeacher = true;
+      this.setTercherType = type;
+      this.isAdd = false;
+      for (let key in this.teacherDetail) {
+        if (key == "realName") {
+          this.formTeacher.teacherName = this.teacherDetail.realName;
+        } else {
+          this.formTeacher[key] = this.teacherDetail[key];
+        }
+      }
+      this.toTeacherForm();
+    },
+    addTeacher() {
+      //添加教师
+      this.$refs.formTeacher.validate(async (valid) => {
+        if (valid) {
+          let obj = this.setTeacharForm();
+          if (!obj) {
+            this.$message.error("教师角色数据有误请检查！");
+            return;
+          }
+          let res;
+          if (this.isAdd) {
+            res = await this.$request.addTeacher({
+              teacherName: this.formTeacher.teacherName,
+              loginName: this.formTeacher.loginName,
+              sex: this.formTeacher.sex,
+              ...obj,
+            });
+          } else {
+            res = await this.$request.updateTeacher({
+              teacherId: this.formTeacher.id,
+              teacherName: this.formTeacher.teacherName,
+              loginName: this.formTeacher.loginName,
+              sex: this.formTeacher.sex,
+              ...obj,
+            });
+          }
+          if (res.status === 0) {
+            this.$message.success(res.info);
+            this.diaTeacher = false;
+            this._QueryData(5);
+          } else {
+            this.$message.error(res.info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    setTeacharForm() {
+      //转换保存教师数据格式
+      let ERR_OK = true;
+      this.formTeacher.roleList.map((item) => {
+        if (item.classId.length == 0) {
+          ERR_OK = false;
+        }
+      });
+      if (ERR_OK) {
+        let [managerList, teacherCourseList, gradeGroupList] = [[], [], []];
+        this.formTeacher.roleList.map((item) => {
+          if (item.roleId == 6) {
+            managerList.push({
+              classId: item.classId[1],
+              className:
+                this.classList.find((items) => items.value == item.classId[1])
+                  ?.label || "",
+            });
+          } else if (item.roleId == 7) {
+            item.classId.map((clazz) => {
+              teacherCourseList.push({
+                classId: clazz[2],
+                className:
+                  this.classList.find((items) => items.value == clazz[2])
+                    ?.label || "",
+                subjectName: clazz[1],
+              });
+            });
+          } else {
+            gradeGroupList.push({
+              grade: item.classId[0],
+              gradeName:
+                this.gradeList.find((items) => items.id == item.classId[0])
+                  ?.label || "",
+              subjectName: item.classId[1],
+            });
+          }
+        });
+        return {
+          managerList,
+          teacherCourseList,
+          gradeGroupList,
+        };
+      } else {
+        return false;
+      }
+    },
+    toTeacherForm() {
+      //教师角色数据转换为form格式数据
+      this.formTeacher.roleList = [];
+      this.formTeacher.managerList?.map((item) => {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 6,
+          classId: [
+            this.classList.find(
+              (items) =>
+                items.value == item.classId ||
+                items.label.includes(item.className)
+            ).grade,
+            item.classId,
+          ],
+        });
+      });
+      let teacherClassId = [];
+      this.formTeacher.teacherCourseList?.map((item) => {
+        teacherClassId.push([
+          item.grade,
+          item.subjectName,
+          this.classList.find(
+            (items) =>
+              items.value == item.classId ||
+              items.label.includes(item.className)
+          ).value,
+        ]);
+      });
+      if (teacherClassId.length) {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 7,
+          classId: [...teacherClassId],
+        });
+      }
+      this.formTeacher.gradeGroupList?.map((item) => {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 8,
+          classId: [
+            this.gradeList.find((items) => items.id == item.classId[0]).id,
+            item.subjectName,
+          ],
+        });
+      });
+    },
+    async delTeacherManager(obj, type) {
+      let query;
+      switch (type) {
+        case 1:
+          query = {
+            classId: obj.classId,
+          };
+          break;
+        case 2:
+          query = {
+            classId: obj.classId,
+            subjectName: obj.subjectName,
+          };
+          break;
+        case 3:
+          query = {
+            classId: obj.classId,
+            grade: obj.grade,
+            subjectName: obj.subjectName,
+          };
+          break;
+      }
+      //角色
+      const { data, status, info } = await this.$request.delTeacherManager({
+        teacherId: obj.teacherId,
+        ...query,
+      });
+      if (status === 0) {
+        this._QueryData(5);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _RoleList() {
+      //角色
+      const { data, status, info } = await this.$request.roleList();
+      if (status === 0) {
+        this.roleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    setQuery(type) {
+      let query = {};
+      if (type == 1) {
+        query.grades = [];
+        query.classIds = [];
+        query.subjectNames = [];
+        this.query.gradeClassSub?.map((item) => {
+          if (item.length == 1) {
+            if (!query.grades.includes(item[0])) {
+              query.grades.push(item[0]);
+            }
+          } else if (item.length == 2) {
+            if (!query.classIds.includes(item[1])) {
+              query.classIds.push(item[1]);
+            }
+            query.grades.includes(item[0]) && query.grades.remove(item[0]);
+          } else if (item.length == 3) {
+            if (!query.subjectNames.includes(item[2])) {
+              query.subjectNames.push(item[2]);
+            }
+            query.grades.includes(item[0]) && query.grades.remove(item[0]);
+            query.classIds.includes(item[0]) && query.classIds.remove(item[0]);
+          }
+        });
+
+        delete query.gradeClassSub;
+        query.grades.length ? "" : delete query.grades;
+        query.classIds.length ? "" : delete query.classIds;
+        query.subjectNames.length ? "" : delete query.subjectNames;
+        this.query.teacherName = "";
+        this.query.phone = "";
+        this.query.type = 0;
+      } else if (type == 2) {
+        this.query.type = 9;
+        this.query.phone = "";
+        this.query.gradeClassSub = [];
+        query.teacherName = this.query.teacherName;
+        query.type = this.query.type;
+      } else if (type == 3) {
+        this.query.type = 9;
+        this.query.teacherName = "";
+        this.query.gradeClassSub = [];
+        query.phone = this.query.phone;
+        query.type = this.query.type;
+      } else if (type == 4) {
+        this.query.teacherName = "";
+        this.query.phone = "";
+        this.query.gradeClassSub = [];
+        query.type = this.query.type;
+      } else {
+        query = { ...this.query };
+        query.grades = [];
+        query.classIds = [];
+        query.subjectNames = [];
+        this.query.gradeClassSub?.map((item) => {
+          if (item.length == 1) {
+            if (!query.grades.includes(item[0])) {
+              query.grades.push(item[0]);
+            }
+          } else if (item.length == 2) {
+            if (!query.classIds.includes(item[1])) {
+              query.classIds.push(item[1]);
+            }
+            query.grades.includes(item[0]) && query.grades.remove(item[0]);
+          } else if (item.length == 3) {
+            if (!query.subjectNames.includes(item[2])) {
+              query.subjectNames.push(item[2]);
+            }
+            query.grades.includes(item[0]) && query.grades.remove(item[0]);
+            query.classIds.includes(item[0]) && query.classIds.remove(item[0]);
+          }
+        });
+
+        delete query.gradeClassSub;
+        query.grades.length ? "" : delete query.grades;
+        query.classIds.length ? "" : delete query.classIds;
+        query.subjectNames.length ? "" : delete query.subjectNames;
+        query.teacherName.length ? "" : delete query.teacherName;
+        query.phone.length ? "" : delete query.phone;
+      }
+
+      return query;
+    },
+    async _QueryData(type) {
+      if (this.loading) return;
+      if (type == 2) {
+        if (this.query.teacherName == "") {
+          this.$message.warning("请输入老师姓名");
+          return;
+        }
+      } else if (type == 3) {
+        if (this.query.phone == "") {
+          this.$message.warning("请输入老师手机");
+          return;
+        }
+      }
+      this.loading = true;
+      let query = this.setQuery(type);
+      this.teacherList = [];
+      const { data, status, info } = await this.$request.teacherList({
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.teacherList = data.list || [];
+        if (type == 10) {
+          let detailArr =
+            data.list.filter((item) => item.id == this.formTeacher.id) || [];
+          this.teacherDetail = (detailArr.length && detailArr[0]) || {
+            ...data.list[0],
+          };
+        } else {
+          this.teacherDetail = { ...this.teacherList[0] };
+        }
+        this.showTId = this.teacherDetail.id;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubject() {
+      const { data, status, info } = await this.$request.subjectList();
+      if (status === 0) {
+        this.subjectList = [...data?.subjectNames] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryDataGrade() {
+      //年级数据
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        this.gradeList =
+          data.list?.map((item) => {
+            let subList = item.subjectNames?.map((items) => {
+              return {
+                value: items,
+                label: items,
+              };
+            });
+            this.gradeClassSubList.push({
+              value: item.grade,
+              label: item.gradeName,
+              id: item.grade,
+              children: item.classList.map((clazz) => {
+                return {
+                  value: clazz.id,
+                  label: clazz.className,
+                  id: clazz.id,
+                  children: [...subList],
+                };
+              }),
+            });
+            this.gradeSubListClass.push({
+              value: item.grade,
+              label: item.gradeName,
+              id: item.grade,
+              children: item.subjectNames.map((items) => {
+                return {
+                  value: items,
+                  label: items,
+                  children: item.classList.map((clazz) => {
+                    return {
+                      value: clazz.id,
+                      label: clazz.className,
+                    };
+                  }),
+                };
+              }),
+            });
+            return {
+              value: item.grade,
+              label: item.gradeName,
+              id: item.grade,
+              children: [...subList],
+            };
+          }) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClass() {
+      //班级数据
+      const { data, status, info } = await this.$request.schoolClassList();
+      if (status === 0) {
+        let gradeSubList = {};
+        this.gradeList.map((item) => {
+          gradeSubList[item.label] = [...item.children];
+        });
+        this.classList =
+          data.list.map((item) => {
+            return {
+              value: item.id,
+              label: `${item.className}（${item.gradeName}）`,
+              grade: item.grade,
+              gradeName: item.gradeName,
+              children: gradeSubList[item.gradeName],
+            };
+          }) || [];
+        this.gradeClassList = formatGradeClass([...data.list]);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.teacherTemplate();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`教师名单模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async exportTeacherExl() {
+      this.loadingDown = true;
+      let data = await this.$request.exportTeacher();
+      this.loadingDown = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`教师名单.xlsx`, blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px 20px;
+}
+.total {
+  padding: 0 20px 10px;
+  font-size: 14px;
+  color: #666;
+}
+.teacher-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  min-height: 400px;
+  .teacher-ul {
+    max-height: 60vh;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+    &::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background-color: #ccc;
+    }
+  }
+  .teacher-list {
+    width: 240px;
+
+    .h-title {
+      height: 40px;
+      line-height: 40px;
+      background: #eee;
+      // border-radius: 10px 10px 0 0;
+    }
+    .teacher-item {
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 36px;
+      cursor: pointer;
+      padding-left: 12px;
+      &:hover {
+        background: #eee;
+      }
+      &.active {
+        color: #667ffd;
+        background: #eee;
+      }
+    }
+  }
+
+  .teacher-detail {
+    flex: 1;
+    position: relative;
+    padding-left: 10px;
+    .icon-box {
+      position: absolute;
+      top: 12px;
+      right: 20px;
+      .icon {
+        font-size: 24px;
+        color: #7f7f7f;
+        cursor: pointer;
+      }
+      .el-icon-circle-plus-outline {
+        margin-left: 10px;
+      }
+    }
+    .detail-top {
+      padding: 12px 20px;
+      box-sizing: border-box;
+      display: flex;
+      flex-wrap: wrap;
+      font-size: 14px;
+      color: #7f7f7f;
+      .p-item {
+        width: 40%;
+        line-height: 28px;
+      }
+    }
+    .grade-box {
+      .grade-info {
+        display: flex;
+        flex-wrap: wrap;
+        padding: 20px 20px 0;
+        & > li {
+          margin-right: 20px;
+          margin-bottom: 20px;
+          position: relative;
+          .el-icon-delete {
+            position: absolute;
+            top: 8px;
+            right: 8px;
+            padding: 2px;
+            cursor: pointer;
+            display: none;
+            &:hover {
+              color: #667ffd;
+            }
+          }
+          &:hover {
+            .el-icon-delete {
+              display: block;
+            }
+          }
+        }
+
+        .grade-item {
+          width: 200px;
+          box-sizing: border-box;
+          padding: 12px 16px;
+          border-radius: 10px;
+          box-shadow: 1px 1px 3px #888;
+        }
+        .grade-name {
+          font-size: 16px;
+          font-weight: bold;
+          line-height: 18px;
+          padding-bottom: 12px;
+        }
+        .grade-class {
+          display: flex;
+          justify-content: space-between;
+          font-size: 15px;
+          padding-right: 20px;
+          .fa {
+            font-size: 18px;
+            margin-right: 5px;
+            color: #a4a4a4;
+          }
+          .fa-book {
+            font-size: 20px;
+          }
+        }
+      }
+    }
+  }
+}
+.add-box {
+  margin-top: 10px;
+}
+.sel-c {
+  width: 120px;
+  margin-right: 12px;
+}
+.role-list {
+  margin-bottom: 10px;
+  position: relative;
+  .sel-p {
+    position: absolute;
+    left: 146px;
+    top: 0;
+    font-size: 13px;
+    color: #606266;
+  }
+  .sel-t {
+    :deep(.el-input__inner) {
+      background: transparent;
+    }
+  }
+  .el-icon-close {
+    padding: 5px;
+    cursor: pointer;
+    margin-left: 16px;
+    background: #ccc;
+    border-radius: 50%;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue
new file mode 100644
index 0000000..bc84cc3
--- /dev/null
+++ b/src/views/basic/test/analysis.vue
@@ -0,0 +1,878 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>单卷分析</span>
+      </template>
+    </back-box>
+    <div class="tips" v-if="paperModifyLog.modifiedTime && !status">
+      <p class="tips-p">
+        <i class="fa fa-bell-o"></i>
+        {{
+          `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
+        }}修改了答案，是否重新记分？
+      </p>
+      <div class="btn-box">
+        <el-button type="danger" round @click="_ReScore" size="mini"
+          >重新计分</el-button
+        >
+        <el-button
+          type="danger"
+          round
+          plain
+          size="mini"
+          @click="paperModifyLog.modifiedTime = ''"
+          >暂时不计</el-button
+        >
+      </div>
+    </div>
+    <div class="page-content">
+      <div class="tab-box">
+        <span
+          v-for="(item, index) in tabList"
+          :key="item"
+          class="tab-item"
+          :class="type == index ? 'active' : ''"
+          @click="setType(index)"
+          >{{ item }}</span
+        >
+      </div>
+      <div id="print-content" class="table-box" v-loading="loading">
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 0"
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="questionIndex"
+            label="题号"
+            align="center"
+            fixed
+            width="60"
+          ></el-table-column>
+          <el-table-column
+            prop="questionType"
+            label="题型"
+            align="center"
+            fixed
+            width="100"
+            ><template slot-scope="scope">{{
+              setSubPro(scope.row.questionType)
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="score"
+            width="100"
+            label="满分值"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="highestScore"
+            label="班最高分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="lowestScore"
+            label="班最低分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="avgScore"
+            label="班平均分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="classScoringRate"
+            width="120"
+            sortable
+            label="班级得分率"
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.classScoringRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column prop="correctAnswer" label="答案" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.correctAnswer == 1
+                ? "✓"
+                : scoped.row.correctAnswer == 2
+                ? "✗"
+                : scoped.row.correctAnswer
+            }}</template>
+          </el-table-column>
+          <el-table-column
+            v-for="(item, index) in optionsList"
+            :key="index"
+            :label="item.title"
+            :prop="'count' + index"
+            align="center"
+            width="120"
+            ><template slot-scope="scope"
+              ><p class="persent">
+                {{
+                  scope.row.questionType == "5"
+                    ? ""
+                    : scope.row["option" + index]
+                    ? `${scope.row["option" + index]}(${
+                        scope.row["persent" + index]
+                      })`
+                    : ""
+                }}
+              </p></template
+            >
+          </el-table-column>
+        </el-table>
+        <div id="print-table">
+          <table class="hide">
+            <thead>
+              <tr>
+                <th>题号</th>
+                <th>题型</th>
+                <th>满分值</th>
+                <th>班最高分</th>
+                <th>班最低分</th>
+                <th>班平均分</th>
+                <th>班级得分率</th>
+                <th>答案</th>
+                <th>选项1</th>
+                <th>选项2</th>
+                <th>选项3</th>
+                <th>选项4</th>
+                <th>未答</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(tr, index) in tableData">
+                <td width="60">{{ index + 1 }}</td>
+                <td width="100">{{ setSubPro(tr.questionType) }}</td>
+                <td width="100">{{ tr.sortable }}</td>
+                <td width="110">{{ tr.highestScore }}</td>
+                <td width="110">{{ tr.lowestScore }}</td>
+                <td width="110">{{ tr.avgScore }}</td>
+                <td width="120">{{ tr.classScoringRate }}%</td>
+                <td>
+                  {{
+                    tr.correctAnswer == 1
+                      ? "✓"
+                      : tr.correctAnswer == 2
+                      ? "✗"
+                      : tr.correctAnswer
+                  }}
+                </td>
+                <td
+                  v-for="(item, index) in optionsList"
+                  :key="index"
+                  width="120"
+                >
+                  <p class="persent">
+                    {{
+                      tr.questionType == "5"
+                        ? ""
+                        : tr["option" + index]
+                        ? `${tr["option" + index]}(${tr["persent" + index]})`
+                        : ""
+                    }}
+                  </p>
+                </td>
+              </tr>
+            </tbody>
+          </table>
+          <div class="hui-box" v-show="type == 0">
+            <span class="s-txt">汇总</span>
+            <ul class="hui-ul">
+              <li class="hui-li">
+                <span class="hui-s s1">主观题</span>
+                <span class="hui-s s1">{{ examReport.subjectiveScore }}</span>
+                <span class="hui-s s2">{{
+                  examReport.subjectiveHighestScore
+                }}</span>
+                <span class="hui-s s2">{{
+                  examReport.subjectiveLowestScore
+                }}</span>
+                <span class="hui-s s2">{{
+                  examReport.subjectiveAvgScore
+                }}</span>
+                <span class="hui-s s3"
+                  >{{ examReport.subjectiveClassScoringRate }}%</span
+                >
+              </li>
+              <li class="hui-li">
+                <span class="hui-s s1">客观题</span>
+                <span class="hui-s s1">{{ examReport.objectiveScore }}</span>
+                <span class="hui-s s2">{{
+                  examReport.objectiveHighestScore
+                }}</span>
+                <span class="hui-s s2">{{
+                  examReport.objectiveLowestScore
+                }}</span>
+                <span class="hui-s s2">{{ examReport.objectiveAvgScore }}</span>
+                <span class="hui-s s3"
+                  >{{ examReport.objectiveClassScoringRate }}%</span
+                >
+              </li>
+              <li class="hui-li">
+                <span class="hui-s s1">整卷</span>
+                <span class="hui-s s1">{{ examReport.examPaperScore }}</span>
+                <span class="hui-s s2">{{ examReport.highestScore }}</span>
+                <span class="hui-s s2">{{ examReport.lowestScore }}</span>
+                <span class="hui-s s2">{{ examReport.avgScore }}</span>
+                <span class="hui-s s3">{{ examReport.classScoringRate }}%</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <el-table
+          v-show="type == 1"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'dadui', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            align="center"
+            fixed
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="scoringRate"
+            label="得分率"
+            sortable
+            align="center"
+            ><template slot-scope="scope"
+              >{{ scope.row.scoringRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="classRank"
+            label="班名"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column label="客观题" align="center">
+            <el-table-column
+              prop="objectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="objectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.objectiveScoringRate }}%</template
+              ></el-table-column
+            >
+          </el-table-column>
+          <el-table-column label="主观题" align="center">
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.subjectiveScoringRate }}%</template
+              ></el-table-column
+            >
+          </el-table-column>
+        </el-table>
+        <el-table
+          v-show="type == 2"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+            width="120"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column label="分数组成" align="center">
+            <el-table-column
+              prop="objectiveExamScore"
+              label="客观题分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="主观题分"
+              align="center"
+            ></el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'Q' + item.id"
+            :prop="'score' + item.id"
+          >
+          </el-table-column>
+        </el-table>
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 3"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="className"
+            label="班级"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'Q' + item.id"
+          >
+            <template slot-scope="scope">
+              <span v-if="tableData[index]?.questionType == 5">*</span>
+              <span
+                v-else-if="scope.row['answer' + item.id]"
+                :class="scope.row['isRight' + item.id] ? '' : 'error'"
+              >
+                {{ scope.row["answer" + item.id] }}
+              </span>
+              <span
+                v-else
+                :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
+                >-</span
+              >
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="down">
+        <div>
+          <el-button
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            v-if="!this.$store.getters.code"
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </div>
+        <div v-if="!status">
+          <el-button
+            v-if="examReport.subjectiveScore != 0"
+            @click="diaUp = true"
+            type="primary"
+            round
+            v-loading="exportLoading"
+            >导入主观题分数</el-button
+          >
+          <template v-if="role == 'ROLE_JIAOSHI'">
+            <el-button
+              @click="edit"
+              type="primary"
+              v-if="examReport.subjectiveScore != examReport.examPaperScore"
+              round
+              >查看题目</el-button
+            ></template
+          >
+        </div>
+      </div>
+      <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
+        <up-load :url="url" :examId="id" @upSuccess="upSuccess">
+          <template slot="down">
+            <p class="down-txt">
+              第一步：下载模板并编辑完成学生分数
+              <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+            </p>
+            <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
+          </template>
+        </up-load>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="diaUp = false">取 消</el-button>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { downloadFile, tablePrint } from "@/utils";
+export default {
+  data() {
+    return {
+      role: "",
+      status: 0,
+      tableMaxHeight: 600,
+      loading: false,
+      exportLoading: false,
+      diaUp: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      id: "",
+      title: "",
+      score: "",
+      tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
+      type: 0,
+      paperModifyLog: {
+        realName: "",
+        modifiedTime: "",
+      },
+      examReport: {
+        subjectiveScore: 0,
+        subjectiveHighestScore: "",
+        subjectiveLowestScore: "",
+        subjectiveAvgScore: "",
+        subjectiveClassScoringRate: "",
+        objectiveScore: "",
+        objectiveHighestScore: "",
+        objectiveLowestScore: "",
+        objectiveAvgScore: "",
+        objectiveClassScoringRate: "",
+        examPaperScore: "",
+        highestScore: "",
+        lowestScore: "",
+        avgScore: "",
+        classScoringRate: "",
+      },
+      tableData: [],
+      optionsList: [],
+      tableData2: [],
+      questionList: [],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
+    this.title = this.$route.query.title || "";
+    this._QueryData();
+  },
+  methods: {
+    print() {
+      if (this.type == 0) {
+        tablePrint("print-table", this.title + this.tabList[this.type], true);
+      } else {
+        tablePrint("print-content", this.title + this.tabList[this.type]);
+      }
+    },
+    upSuccess(res) {
+      //导入成功
+      this.$message.success("导入成功");
+      this.diaUp = false;
+      this._QueryData();
+    },
+    setType(type) {
+      console.log(this.$refs.main.offsetHeight - 50);
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.type = type;
+    },
+    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() {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: this.id,
+          title: this.title,
+          type: 2,
+        },
+      });
+    },
+    changePage(page) {
+      this.page = page;
+      this.examQuestionReport();
+    },
+    async _QueryData() {
+      this.examDetail();
+      this.examStudentReport();
+      this.examQuestionReport();
+    },
+    async examDetail() {
+      //详情
+      this.loading = true;
+      let { data, info, status } = await this.$request.examDetail({
+        examId: this.id,
+      });
+      this.loading = false;
+      if (status === 0) {
+        if (data.paperModifyLog) {
+          this.paperModifyLog = { ...data?.paperModifyLog };
+        }
+        this.examReport = { ...data?.examReport };
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _ReScore() {
+      //重新记分
+      this.loading = true;
+      let { data, info, status } = await this.$request.reScore({
+        examId: this.id,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success(info);
+        this._QueryData();
+        this.paperModifyLog.modifiedTime = "";
+        this.paperModifyLog.realName = "";
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async examStudentReport() {
+      //成绩排名-小题分-作答明细
+      this.loading = true;
+      let { data, info, status } = await this.$request.examStudentReport({
+        examId: this.id,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let optionsList = [];
+        this.tableData2 = data?.list.map((item) => {
+          let params = {};
+
+          const detail = JSON.parse(item.detail);
+          if (detail.length > optionsList.length) {
+            optionsList = [...detail];
+          }
+          detail.map((items, index) => {
+            params["que" + items.id] = items.id;
+            params["score" + items.id] = String(items.score).includes(".")
+              ? Number(items.score).toFixed(2)
+              : items.score;
+            params["answer" + items.id] =
+              items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
+            params["isRight" + items.id] = items.isRight;
+            params["questionType" + items.id] = items.questionType;
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        console.log();
+        this.questionList = optionsList.sort((a, b) => {
+          return a.id - b.id;
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async examQuestionReport() {
+      //试题分析
+      this.loading = true;
+      let { data, info, status } = await this.$request.examQuestionReport({
+        examId: this.id,
+        page: this.page,
+        // size: this.size,
+        size: 9999,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let optionsList = [{}, {}, {}, {}, {}];
+        let tableData = data?.list.map((item) => {
+          let params = {};
+          const detail = JSON.parse(item.detail);
+          let lastOPtion = detail?.find((item) => {
+            return item.option == "未答";
+          });
+          let defaultArr = detail?.filter((item) => {
+            return item.option != "未答";
+          });
+
+          optionsList.map((items, index) => {
+            if (index != 4) {
+              params["count" + index] =
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.count
+                  : "";
+              params["persent" + index] =
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.persent
+                  : "";
+              params["option" + index] =
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.option == 1
+                    ? "✓"
+                    : defaultArr[index]?.option == 2
+                    ? "✗"
+                    : defaultArr[index]?.option
+                  : "";
+              items["title"] = "选项" + (index + 1);
+            } else {
+              items["title"] = "未答";
+              params["count" + index] = lastOPtion.count;
+              params["persent" + index] = lastOPtion.persent;
+              params["option" + index] = "?";
+            }
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.tableData = tableData.sort((a, b) => {
+          return a.questionIndex - b.questionIndex;
+        });
+        this.optionsList = [...optionsList];
+        this.total = data.count;
+        this.setType(0);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      this.exportLoading = true;
+      const data = await this.$request.exportExamReport({
+        examId: this.id,
+      });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(
+          this.status
+            ? "即时测-已归档单卷测练报表.xlsx"
+            : "即时测-单卷测练报表.xlsx",
+          blob
+        );
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.id,
+      });
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.hide {
+  display: none;
+}
+.page-container {
+  position: relative;
+  height: 100%;
+  .table-box {
+    min-height: 100%;
+  }
+  &.active {
+    overflow: hidden;
+  }
+  .edit-dia {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: calc(100vh - 70px);
+    background: #fff;
+    overflow-y: auto;
+    z-index: 10;
+  }
+}
+.persent {
+  white-space: nowrap;
+}
+.error {
+  color: #f30;
+}
+.page-content {
+  padding: 20px 20px 0;
+}
+.tips {
+  height: 48px;
+  box-sizing: border-box;
+  line-height: 48px;
+  padding: 0 16px;
+  border: 1px solid #fac7cc;
+  border-radius: 5px;
+  background-color: #ffebec;
+  font-size: 14px;
+  color: #fd9795;
+  margin: 10px 20px 0 20px;
+  display: flex;
+  &-p {
+    flex: 1;
+  }
+  .fa-bell-o {
+    font-size: 18px;
+    margin-right: 5px;
+  }
+}
+.tab-box {
+  width: 800px;
+  margin: 0 auto 12px;
+  background: #f8f8f8;
+  border-radius: 20px;
+  display: flex;
+  user-select: none;
+  .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;
+    cursor: pointer;
+    &.active {
+      background: #667ffd;
+      color: #fff;
+    }
+  }
+}
+.down {
+  padding-top: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
+.hui-box {
+  display: flex;
+  text-align: center;
+  .s-txt {
+    width: 61px;
+    line-height: 144px;
+    background: #e2e2e2;
+    font-size: 16px;
+    color: #fff;
+    font-weight: 700;
+  }
+  .hui-ul {
+    border-top: 1px solid #e2e2e2;
+  }
+  .hui-li {
+    display: flex;
+    .hui-s {
+      height: 48px;
+      line-height: 48px;
+      border-right: 1px solid #e2e2e2;
+      border-bottom: 1px solid #e2e2e2;
+      box-sizing: border-box;
+    }
+    .s1 {
+      width: 100px;
+    }
+    .s2 {
+      width: 110px;
+    }
+    .s3 {
+      width: 120px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/test/archiving.vue b/src/views/basic/test/archiving.vue
new file mode 100644
index 0000000..9c51c60
--- /dev/null
+++ b/src/views/basic/test/archiving.vue
@@ -0,0 +1,876 @@
+<template>
+  <div ref="main" class="page-container">
+    <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.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == 'ROLE_BANZHUREN'"
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          @change="changeSub"
+        >
+          <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.subjectNames"
+          placeholder="选择科目"
+        >
+          <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
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? '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"
+        @change="changeTab"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div v-show="tabIndex == 1" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="title"
+            label="试卷名称"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examPaperScore"
+            label="卷面分"
+            align="center"
+            width="68"
+          ></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"
+            ><template slot-scope="scoped">{{
+              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="examStartTime"
+            label="测验时间"
+            width="100"
+            align="center"
+          ></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.avgScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="highestScore" label="班最高分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.highestScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="lowestScore" label="班最低分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.lowestScore
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="excellenRate"
+            label="优秀数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.excellenNum }}</p>
+                <p v-if="scoped.row.excellenNum">
+                  {{ `（${scoped.row.excellenRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="goodRate"
+            label="良好数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.goodNum }}</p>
+                <p v-if="scoped.row.goodNum">
+                  {{ `（${scoped.row.goodRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="passRate"
+            label="及格数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.passNum }}</p>
+                <p v-if="scoped.row.passNum">
+                  {{ `（${scoped.row.passRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="failedRate"
+            label="不及格数(率)"
+            sortable
+            align="center"
+            width="130"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.failedNum }}</p>
+                <p v-if="scoped.row.failedNum">
+                  {{ `（${scoped.row.failedRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip effect="dark" content="详情" placement="top">
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"
+                ></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <div v-show="tabIndex == 2" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && loading == false"
+          description="没有更多数据"
+        ></el-empty>
+        <template v-if="tableData.length && loading == false">
+          <div id="print-content">
+            <el-table
+              :max-height="tableMaxHeight"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item.title"
+              >
+                <el-table-column
+                  :prop="'score' + index"
+                  :label="index == 0 ? '总分' : '成绩'"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + index"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-else
+              :data="tableData"
+              :max-height="tableMaxHeight"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item"
+              >
+                <el-table-column
+                  :prop="'examCount' + item"
+                  label="测练数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'participationCount' + item"
+                  label="参与数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'score' + item"
+                  label="总分"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + item"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </div>
+      <p class="down" v-if="tabIndex == 2 && tableData.length">
+        <el-button
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          @click="downExl"
+          >导出报表</el-button
+        >
+        <el-button
+          v-if="!this.$store.getters.code"
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      exportLoading: false,
+      tableMaxHeight: 300,
+      role: "",
+      loading: false,
+      loadingDown: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      examId: "",
+      form: {
+        id: "",
+        title: "",
+        examPaperScore: "",
+      },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单卷测练报表", "阶段测练报表"],
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+    },
+    changeSub(val) {
+      //科目改变触发事件
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val);
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore,
+          status: 1,
+        },
+      });
+    },
+
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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;
+          that.tabIndex = 1;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    changeTab() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this._QueryData();
+    },
+
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      this.page = 1;
+      await this._QuerySubjectList();
+      await this._QueryData();
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.tableData = [];
+      if (!this.query.classId) {
+        return;
+      }
+      if (this.tabIndex == 1) {
+        this.examReportList();
+      } else {
+        this.phaseExamReport();
+      }
+    },
+    //单卷测练
+    async examReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const { data, status, info } = await this.$request.examReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"]?.length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"]?.shift();
+        }
+      }
+      const phaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseExamReport
+          : this.$request.phaseExamReport;
+      const { data, status, info } = await phaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["examCount" + items.subjectName] = items.examCount;
+              params["participationCount" + items.subjectName] =
+                items.participationCount;
+              params["score" + items.subjectName] = items.score;
+              params["classRank" + items.subjectName] = items.classRank;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = [...subjectName];
+        } else {
+          let dataIdsList = [],
+            dataList = [];
+          data?.list.map((item) => {
+            item.examList.map((items) => {
+              if (!dataIdsList.includes(items.title)) {
+                dataIdsList.push(items.title);
+                dataList.push(items);
+              }
+            });
+          });
+          console.log(dataList);
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            dataIdsList.map((ids, index) => {
+              params["score" + index] = "--";
+              params["classRank" + index] = "--";
+              item.examList.map((items) => {
+                if (items.title == ids) {
+                  params["score" + index] = items.score;
+                  params["classRank" + index] = items.classRank;
+                }
+              });
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = dataList;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      //报表到处
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const exportPhaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTExportPhaseExamReport
+          : this.$request.exportPhaseExamReport;
+      this.exportLoading = true;
+      const data = await exportPhaseExamReport({ ...query });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("即时测-已归档阶段测练报表.xlsx", blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.page-container {
+  position: relative;
+  height: 100%;
+  &.active {
+    overflow: hidden;
+  }
+}
+.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;
+  }
+}
+.down {
+  padding-top: 16px;
+}
+.click-b {
+  cursor: pointer;
+  color: #409eff;
+  text-decoration: underline;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue
new file mode 100644
index 0000000..4a99ebd
--- /dev/null
+++ b/src/views/basic/test/index.vue
@@ -0,0 +1,1067 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>即时测-数据报表</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code && gdClass"
+          effect="dark"
+          content="已归档试卷"
+          placement="bottom"
+        >
+          <el-button
+            type="primary"
+            icon="fa fa-archive"
+            size="mini"
+            plain
+            circle
+            @click="toArchiving"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == 'ROLE_BANZHUREN'"
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          @change="changeSub"
+        >
+          <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.subjectNames"
+          placeholder="选择科目"
+        >
+          <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
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? '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"
+        @change="changeTab"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div v-show="tabIndex == 1" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="title"
+            label="试卷名称"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examPaperScore"
+            label="卷面分"
+            align="center"
+            width="68"
+          ></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"
+            ><template slot-scope="scoped">{{
+              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="examStartTime"
+            label="测验时间"
+            width="100"
+            align="center"
+          ></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.avgScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="highestScore" label="班最高分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.highestScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="lowestScore" label="班最低分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.lowestScore
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="excellenRate"
+            label="优秀数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.excellenNum }}</p>
+                <p v-if="scoped.row.excellenNum">
+                  {{ `（${scoped.row.excellenRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="goodRate"
+            label="良好数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.goodNum }}</p>
+                <p v-if="scoped.row.goodNum">
+                  {{ `（${scoped.row.goodRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="passRate"
+            label="及格数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.passNum }}</p>
+                <p v-if="scoped.row.passNum">
+                  {{ `（${scoped.row.passRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="failedRate"
+            label="不及格数(率)"
+            sortable
+            align="center"
+            width="130"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.failedNum }}</p>
+                <p v-if="scoped.row.failedNum">
+                  {{ `（${scoped.row.failedRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip
+                v-if="
+                  scoped.row.answerNum != 0 ||
+                  (scoped.row.recordStatus != 0 &&
+                    scoped.row.subjectiveScore == scoped.row.examPaperScore)
+                "
+                effect="dark"
+                content="详情"
+                placement="top"
+              >
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"
+                ></el-button>
+              </el-tooltip>
+              <template
+                v-if="
+                  scoped.row.answerNum == 0 &&
+                  scoped.row.subjectiveScore != scoped.row.examPaperScore
+                "
+              >
+                <el-tooltip
+                  v-if="role == 'ROLE_JIAOSHI'"
+                  effect="dark"
+                  content="设置答案"
+                  placement="top"
+                >
+                  <el-button
+                    type="primary"
+                    circle
+                    size="mini"
+                    icon="fa fa-file-text"
+                    @click="edit(scoped.row)"
+                  ></el-button>
+                </el-tooltip>
+                <template v-else>未设置答案</template>
+              </template>
+              <el-tooltip
+                v-if="
+                  scoped.row.subjectiveScore == scoped.row.examPaperScore &&
+                  scoped.row.recordStatus == 0
+                "
+                effect="dark"
+                content="导入主观题"
+                placement="top"
+              >
+                <el-button
+                  type="primary"
+                  circle
+                  size="mini"
+                  icon="fa fa-cloud"
+                  @click="uploadSJ(scoped.row)"
+                ></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <div v-show="tabIndex == 2" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && loading == false"
+          description="没有更多数据"
+        ></el-empty>
+        <template v-if="tableData.length && loading == false">
+          <div id="print-content">
+            <el-table
+              :max-height="tableMaxHeight"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  ><span class="click-b" @click="toPortrait(scoped.row)">
+                    {{ scoped.row.studentName }}
+                  </span></template
+                ></el-table-column
+              >
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item.title"
+              >
+                <el-table-column
+                  :prop="'score' + index"
+                  :label="index == 0 ? '总分' : '成绩'"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + index"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-else
+              :data="tableData"
+              :max-height="tableMaxHeight"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              >
+                <template slot-scope="scoped"
+                  ><span class="click-b" @click="toPortrait(scoped.row)">
+                    {{ scoped.row.studentName }}
+                  </span></template
+                >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item"
+              >
+                <el-table-column
+                  :prop="'examCount' + item"
+                  label="测练数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'participationCount' + item"
+                  label="参与数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'score' + item"
+                  label="总分"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + item"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </div>
+      <p class="down" v-if="tabIndex == 2 && tableData.length">
+        <el-button
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          @click="downExl"
+          >导出报表</el-button
+        >
+        <el-button
+          v-if="!this.$store.getters.code"
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
+      </p>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
+      <up-load
+        :url="url"
+        :examId="examId"
+        @upSuccess="upSuccess"
+        fileName="主观题分数"
+        v-loading="loadingDown"
+      >
+        <template slot="down">
+          <p class="down-txt">
+            第一步：下载模板并编辑完成学生分数
+            <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+          </p>
+          <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
+        </template>
+      </up-load>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="diaUp = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      code: "",
+      gdClass: 0, //已归档班级数量
+      exportLoading: false,
+      tableMaxHeight: 300,
+      role: "",
+      loading: false,
+      diaUp: false,
+      loadingDown: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      examId: "",
+      form: {
+        id: "",
+        title: "",
+        examPaperScore: "",
+      },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单卷测练报表", "阶段测练报表"],
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this._QueryClassList2();
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      // if (that.$route.path == "/test") {
+      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+      that._QueryClassList2();
+      await that._QueryClassList();
+      if (!that.query.classId) {
+        return;
+      }
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+      // }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+    },
+    changeSub(val) {
+      //科目改变触发事件
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      console.log(val);
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
+    toArchiving() {
+      this.$router.push({
+        path: "/testArchiving",
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore,
+        },
+      });
+    },
+    toPortrait(obj) {
+      //暂时不上线
+      return;
+      if (this.$store.getters.code) {
+        return;
+      }
+      let subjectNames = [];
+      subjectNames =
+        this.role == "ROLE_BANZHUREN"
+          ? [...this.query["subjectNames"]]
+          : [this.query["subjectNames"]];
+      if (
+        this.query["subjectNames"] &&
+        this.query["subjectNames"]?.length == 1 &&
+        this.query["subjectNames"][0] == "全部"
+      ) {
+        subjectNames = this.subjectList.map((item) => {
+          return item.value;
+        });
+        subjectNames?.shift();
+      }
+      //去学生画像
+      this.$router.push({
+        path: "/portraitDetail",
+        query: {
+          id: obj.studentId,
+          classId: this.query.classId,
+          subjectNames: subjectNames.join(","),
+          studentName: obj.studentName,
+          studentCode: obj.studentCode,
+          startDay: this.query.startDay,
+          endDay: this.query.endDay,
+          date: this.date,
+        },
+      });
+    },
+    uploadSJ(obj) {
+      //导入开关
+      this.examId = obj.id;
+      this.diaUp = true;
+    },
+    setDate(index) {
+      const that = this;
+      this.date = index == this.date ? "" : index;
+      let aYear = new Date().getFullYear();
+      let aMonth = new Date().getMonth() + 1;
+      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;
+          that.tabIndex = 1;
+          break;
+        case 2:
+          let day = new Date().getDay();
+          if (day == 0) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "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 = "";
+        }
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    edit(item) {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 2,
+        },
+      });
+    },
+    changeTab() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this._QueryData();
+    },
+    upSuccess(res) {
+      //导入成功
+      this.$message.success("导入成功");
+      this.diaUp = false;
+      this._QueryData();
+    },
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      this.page = 1;
+      await this._QuerySubjectList();
+      await this._QueryData();
+    },
+    async _QueryClassList2() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList();
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      if (!this.query.classId) {
+        return;
+      }
+      this.tableData = [];
+      if (this.tabIndex == 1) {
+        this.examReportList();
+      } else {
+        this.phaseExamReport();
+      }
+    },
+    //单卷测练
+    async examReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const { data, status, info } = await this.$request.examReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"]?.length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"]?.shift();
+        }
+      }
+      const phaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseExamReport
+          : this.$request.phaseExamReport;
+      const { data, status, info } = await phaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["examCount" + items.subjectName] = items.examCount;
+              params["participationCount" + items.subjectName] =
+                items.participationCount;
+              params["score" + items.subjectName] = items.score;
+              params["classRank" + items.subjectName] = items.classRank;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = [...subjectName];
+        } else {
+          let dataIdsList = [],
+            dataList = [];
+          data?.list.map((item) => {
+            item.examList.map((items) => {
+              if (!dataIdsList.includes(items.title)) {
+                dataIdsList.push(items.title);
+                dataList.push(items);
+              }
+            });
+          });
+          console.log(dataList);
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            dataIdsList.map((ids, index) => {
+              params["score" + index] = "--";
+              params["classRank" + index] = "--";
+              item.examList.map((items) => {
+                if (items.title == ids) {
+                  params["score" + index] = items.score;
+                  params["classRank" + index] = items.classRank;
+                }
+              });
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = dataList;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      //报表到处
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const exportPhaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTExportPhaseExamReport
+          : this.$request.exportPhaseExamReport;
+      this.exportLoading = true;
+      const data = await exportPhaseExamReport({ ...query });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("即时测-阶段测练报表.xlsx", blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+    async downExcel() {
+      //模板下载
+      this.loadingDown = true;
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.examId,
+      });
+      this.loadingDown = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.page-container {
+  position: relative;
+  height: 100%;
+  &.active {
+    overflow: hidden;
+  }
+}
+.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;
+  }
+}
+.down {
+  padding-top: 16px;
+}
+.click-b {
+  cursor: pointer;
+  color: #409eff;
+  text-decoration: underline;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/analysis/index.vue b/src/views/standard/analysis/index.vue
deleted file mode 100644
index 0ab8b3e..0000000
--- a/src/views/standard/analysis/index.vue
+++ /dev/null
@@ -1,685 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>使用分析</span>
-      </template>
-      <template slot="btns">
-        <el-tooltip effect="dark" content="导出更多数据" placement="bottom">
-          <el-button
-            type="primary"
-            icon="fa fa-cloud-download"
-            size="mini"
-            plain
-            circle
-            @click="downExc"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <ul class="params-box">
-        <li class="item item3">
-          <span class="s-txt">时间段：</span>
-          <div class="sel-box">
-            <div class="d1">
-              <el-date-picker
-                v-model="query.startDay"
-                type="date"
-                @change="handleChangeTimeStart"
-                placeholder="选择日期时间"
-                value-format="yyyy-MM-dd"
-                size="mini"
-              >
-              </el-date-picker>
-              ~
-              <el-date-picker
-                v-model="query.endDay"
-                type="date"
-                placeholder="选择日期时间"
-                @change="handleChangeTimeEnd"
-                value-format="yyyy-MM-dd"
-                size="mini"
-              >
-              </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
-              >
-              <span
-                @click="setDate(4)"
-                :class="[date == 4 ? 'active' : '', 's1']"
-                >本季度</span
-              >
-            </p>
-          </div>
-          <el-button
-            class="btn"
-            v-if="role == 'ROLE_JITUAN'"
-            type="primary"
-            round
-            size="small"
-            @click="resetRank"
-            >使用频率前十</el-button
-          >
-        </li>
-        <li class="item item2" v-for="(item, index) in query.secGraClaSub">
-          <span class="s-txt">对比项{{ setBigNum(index) }}：</span>
-          <div class="sel-box">
-            <el-cascader
-              :ref="'cascader' + index"
-              size="small"
-              class="sel sel2"
-              clearable
-              placeholder="选择范围"
-              @change="secGraClaSubChange($event, index)"
-              v-model="query.secGraClaSub[index]"
-              :options="gradeList"
-              :props="props"
-            ></el-cascader>
-          </div>
-          <i class="el-icon-delete" @click="removeQuery(index)"></i>
-        </li>
-        <li class="item">
-          <span class="s-txt"></span>
-          <div class="disflex-b">
-            <el-button
-              class="btn btn-none"
-              :class="query.secGraClaSub.length < 10 ? '' : 'active'"
-              icon="el-icon-plus"
-              size="small"
-              round
-              @click="addQuery"
-              >添加对比项</el-button
-            >
-            <el-button
-              v-show="query.secGraClaSub.length"
-              class="btn"
-              type="primary"
-              round
-              size="small"
-              @click="getData"
-              >多项对比</el-button
-            >
-          </div>
-        </li>
-      </ul>
-      <div class="chart-box">
-        <barChart id="barChart" ref="barChart" />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import barChart from "@/components/charts/barChart";
-import { formatDate, downloadFile } from "@/utils";
-export default {
-  components: {
-    barChart,
-  },
-  data() {
-    return {
-      role: "",
-      loading: false,
-      date: "", //今天-本周-本月-本季度
-      type: 1, //集团管理员 表格切换
-      query: {
-        //搜索条件
-        startDay: "",
-        endDay: "",
-        day: "",
-        secGraClaSub: [],
-        secGraClaSubName: [],
-      },
-      props: {
-        multiple: false,
-        checkStrictly: true,
-      },
-      params: [],
-      gradeList: [],
-      chartData: [
-        {
-          name: "课时数",
-          value: [],
-        },
-        {
-          name: "测练数",
-          value: [],
-        },
-      ],
-      xAxis: [],
-    };
-  },
-  async created() {
-    let that = this;
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    if (this.role == "ROLE_JITUAN") {
-      (this.props.lazy = true),
-        (this.props.lazyLoad = function (node, resolve) {
-          const { level } = node;
-          if (level == 3) {
-            console.log(node);
-            that.$request
-              .tenantSubjectList({
-                schoolId: node.path[0],
-                grade: node.value,
-              })
-              .then((res) => {
-                let children = res.data?.subjectNames.map((item) => {
-                  return {
-                    label: item,
-                    value: item,
-                    leaf: true,
-                  };
-                });
-                const nodes = [...children];
-                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
-                resolve(nodes);
-              });
-          } else {
-            resolve(node);
-          }
-        });
-      await this._QuerySchool();
-    }
-    await this._QueryGradeList();
-    if (this.role == "ROLE_XUEXIAO") {
-      await this._QueryClassList();
-    }
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = formatDate(new Date(), "yyyy-MM-dd");
-      this.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-    }
-    this.setDate(3);
-    this._QueryData();
-  },
-  methods: {
-    async downExc() {
-      if (this.exportLoading == true) return;
-      let query = {
-        //搜索条件
-        startDay: this.query.startDay,
-        endDay: this.query.endDay,
-        day: this.query.day,
-      };
-      this.exportLoading = true;
-
-      const exportUsageAnalysis =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.exportUsageAnalysis
-          : this.$request.exportSchoolContrast;
-      const data = await exportUsageAnalysis({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("使用分析.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    addQuery() {
-      this.query.secGraClaSub.push([]);
-      this.query.secGraClaSubName.push("");
-    },
-    filterObj(arr, value) {
-      return arr.filter((item) => {
-        return value == item.value;
-      })[0];
-    },
-    secGraClaSubChange(event, index) {
-      console.log(event);
-      let txt = "";
-      let xx = this.filterObj(this.gradeList, event[0]);
-      txt += xx.label;
-      if (event.length > 1) {
-        let grade = this.filterObj(xx.children, event[1]);
-        txt += "/" + grade.label;
-        if (event.length > 2) {
-          let clazz = this.filterObj(grade.children, event[2]);
-          txt += "/" + clazz.label;
-          if (event.length > 3) {
-            txt += "/" + event[3];
-          }
-        }
-      }
-      this.query.secGraClaSubName[index] = txt;
-    },
-    setBigNum(num) {
-      let txt = "";
-      let bigNum = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"];
-      txt = bigNum[num];
-
-      return txt;
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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 day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-      }
-    },
-    removeQuery(index) {
-      let secGraClaSubLen = this.query.secGraClaSub.length;
-      let xAxisLen = this.xAxis.length;
-      this.query.secGraClaSub.splice(index, 1);
-      this.query.secGraClaSubName.splice(index, 1);
-      this.xAxis.splice(index, 1);
-      if (
-        secGraClaSubLen == xAxisLen ||
-        (secGraClaSubLen > xAxisLen && index < xAxisLen)
-      ) {
-        this.chartData[0].value.splice(index, 1);
-        this.chartData[1].value.splice(index, 1);
-        this.$refs.barChart.initData(this.xAxis, this.chartData);
-      }
-    },
-    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 = "";
-        }
-      }
-    },
-    getData() {
-      if (!this.query.secGraClaSub.length) {
-        this.$message.warning("请添加对比项，并选择对比条件！");
-        return;
-      }
-      let hasSpace = null;
-      for (let i = 0; i < this.query.secGraClaSub.length; i++) {
-        if (!this.query.secGraClaSub[i].length) {
-          hasSpace = i;
-          break;
-        }
-      }
-      if (hasSpace !== null) {
-        this.$message.warning(
-          `对比项${this.setBigNum(hasSpace)}对比条件不能为空请检查！`
-        );
-        return;
-      }
-      this.xAxis = [...this.query.secGraClaSubName];
-      this._QueryData();
-    },
-    setQuery() {
-      let query = { ...this.query };
-      delete query.secGraClaSub;
-      if (this.role != "ROLE_JITUAN") {
-        query.params = this.query.secGraClaSub.map((item) => {
-          let jsons = {};
-          jsons.section = item[0];
-          item.length > 1 ? (jsons.grade = item[1]) : "";
-          item.length > 2 ? (jsons.classId = item[2]) : "";
-          item.length == 4 ? (jsons.subjectName = item[3]) : "";
-          return jsons;
-        });
-      } else {
-        query.params = this.query.secGraClaSub.map((item) => {
-          let jsons = {};
-          jsons.schoolId = item[0];
-          item.length > 1 ? (jsons.section = item[1]) : "";
-          item.length > 2 ? (jsons.grade = item[2]) : "";
-          item.length == 4 ? (jsons.subjectName = item[3]) : "";
-          return jsons;
-        });
-      }
-      delete query.secGraClaSubName;
-      return query;
-    },
-    async resetRank() {
-      this.query.secGraClaSub = [];
-      this.query.secGraClaSubName = [];
-      this.chartData[0].value = [];
-      this.chartData[1].value = [];
-      this.xAxis = [];
-      this.$refs.barChart.clearChart();
-      await this._QuerySchool();
-      await this._QueryGradeList();
-      this._QueryData();
-    },
-    async _QueryData() {
-      this.loading = true;
-      let query = this.setQuery();
-      const usageStatistics =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.usageStatistics
-          : this.$request.tenantUsageStatistics;
-      const { data, status, info } = await usageStatistics({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.chartData[0].value = [];
-        this.chartData[1].value = [];
-        this.xAxis = this.query.secGraClaSubName.map((item) => {
-          let arr = item.split("/");
-          return arr[0] + "\n" + arr.slice(1, arr.length).join("/");
-        });
-        data?.list.map((item, index) => {
-          this.chartData[0].value.push(item.periodCount);
-          this.chartData[1].value.push(item.examCount);
-        });
-        this.$refs.barChart.initData(this.xAxis, this.chartData);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找nian级
-    async _QueryGradeList() {
-      this.loading = true;
-      const gradeList =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.sectionAndGradeList
-          : this.$request.tenantSectionAndGradeList;
-      const { data, status, info } = await gradeList();
-      if (status === 0) {
-        if (!!data.list) {
-          this.query.secGraClaSub = [];
-          this.query.secGraClaSubName = [];
-          if (this.role != "ROLE_JITUAN") {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeIds = [];
-                let children = item.gradeList.map((items) => {
-                  gradeIds.push(items.grade);
-                  return {
-                    value: items.grade,
-                    label: items.gradeName,
-                  };
-                });
-                return {
-                  value: item.section,
-                  label: item.sectionName,
-                  gradeIds: [...gradeIds],
-                  children: [...children],
-                };
-              }) || [];
-          } else {
-            let children = data.list?.map((item) => {
-              let children = item.gradeList.map((items) => {
-                return {
-                  value: items.grade,
-                  label: items.gradeName,
-                };
-              });
-              return {
-                value: item.section,
-                label: item.sectionName,
-                children: [...children],
-              };
-            });
-            this.gradeList = this.schoolList.map((item) => {
-              if (this.query.secGraClaSub.length < 10) {
-                this.query.secGraClaSub.push([item.id]);
-                this.query.secGraClaSubName.push(item.schoolName);
-              }
-              return {
-                value: item.id,
-                label: item.schoolName,
-                children: [...children],
-              };
-            });
-          }
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找班级
-    async _QueryClassList() {
-      const { data, status, info } = await this.$request.gradeList();
-      if (status === 0) {
-        if (!!data.list) {
-          if (this.role == "ROLE_XUEXIAO") {
-            this.query.secGraClaSub = [];
-            this.query.secGraClaSubName = [];
-            data.list?.map((item) => {
-              let subList = item.subjectNames?.map((items) => {
-                return {
-                  value: items,
-                  label: items,
-                };
-              });
-              let children = item.classList.map((clazz) => {
-                return {
-                  value: clazz.id,
-                  label: clazz.className,
-                  id: clazz.id,
-                  children: [...subList],
-                };
-              });
-              this.gradeList.map((sec) => {
-                if (sec.gradeIds.includes(item.grade)) {
-                  sec.children[sec.gradeIds.indexOf(item.grade)].children = [
-                    ...children,
-                  ];
-                }
-              });
-            }) || [];
-            this.gradeList.map((sec) => {
-              sec.children.map((items) => {
-                if (this.query.secGraClaSub.length < 10) {
-                  this.query.secGraClaSub.push([sec.value, items.value]);
-                  this.query.secGraClaSubName.push(
-                    `${sec.label}/${items.label}`
-                  );
-                }
-              });
-            });
-          }
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySchool() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.schoolList({
-        needSort: 1,
-        day: this.query.day,
-        startDay: this.query.startDay,
-        endDay: this.query.endDay,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.schoolList = [...data.list] || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px 40px;
-}
-.disflex-b {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  .btn-none {
-    border: none;
-    background: none;
-  }
-  .active {
-    transform: translateX(-999999px);
-  }
-}
-.item3 {
-  .sel-box {
-    flex: 1;
-  }
-}
-.sel-box {
-  display: flex;
-  align-items: center;
-  flex-wrap: nowrap;
-  .btn {
-    margin-left: 100px;
-  }
-  .sel {
-    width: 8%;
-    min-width: 160px;
-    margin-right: 20px;
-  }
-  :deep(.el-input__inner) {
-    border: 1px solid #e2e2e2;
-    border-radius: 20px;
-    height: 32px;
-    line-height: 30px;
-  }
-
-  .el-input__icon {
-    line-height: 34px;
-  }
-  .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
-    width: 160px;
-  }
-
-  .p1 {
-    flex: 1;
-
-    .s1 {
-      margin-left: 36px;
-      cursor: pointer;
-      color: #7f7f7f;
-
-      &:hover {
-        color: #409eff;
-      }
-
-      &.active {
-        color: #667ffd;
-      }
-    }
-  }
-  .sel2 {
-    width: 240px;
-  }
-}
-.params-box {
-  display: flex;
-  flex-wrap: wrap;
-  .item {
-    width: 100%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 20px;
-    .s-txt {
-      width: 120px;
-    }
-    .btn {
-      font-size: 14px;
-    }
-    .disflex-b {
-      flex: 1;
-      padding-right: 100px;
-    }
-    &:hover {
-      .el-icon-delete {
-        display: block;
-      }
-    }
-    .el-icon-delete {
-      cursor: pointer;
-      display: none;
-      &:hover {
-        color: #667ffd;
-      }
-    }
-  }
-  .item2 {
-    width: 50%;
-  }
-  .item3 {
-    padding-right: 100px;
-  }
-}
-.chart-box {
-  height: 400px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/analysis/indexOld.vue b/src/views/standard/analysis/indexOld.vue
deleted file mode 100644
index cb85746..0000000
--- a/src/views/standard/analysis/indexOld.vue
+++ /dev/null
@@ -1,463 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>使用分析</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="answer-header">
-        <div class="sel-box">
-          <el-select
-            class="sel"
-            v-model="query.regionId"
-            placeholder="选择区域"
-            @change="_QueryData"
-            v-if="role == 'ROLE_JITUAN'"
-          >
-            <el-option
-              v-for="item in gradeList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-else
-            class="sel"
-            v-model="query.gradeName"
-            placeholder="选择年级"
-            @change="_QueryData"
-          >
-            <el-option
-              v-for="item in gradeList"
-              :key="item.label"
-              :label="item.label"
-              :value="item.label"
-            >
-            </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
-            >
-            <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
-              >本季度</span
-            >
-          </p>
-          <el-button type="primary" round @click="_QueryData">筛选</el-button>
-        </div>
-      </div>
-      <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
-        <el-radio-group v-model="type" @change="changeType">
-          <el-radio-button :label="1">学校使用对比</el-radio-button>
-          <el-radio-button :label="2">学段使用对比</el-radio-button>
-        </el-radio-group>
-      </div>
-      <div class="table-box" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && !loading"
-          description="没有更多数据"
-        ></el-empty>
-        <el-table
-          v-else
-          :data="tableData"
-          :border="false"
-          style="width: 100%"
-          show-summary
-        >
-          <el-table-column align="center" fixed label="科目" prop="subjectName">
-          </el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in dataList"
-            :key="index"
-            :label="
-              role == 'ROLE_JITUAN'
-                ? item.schoolName || item.gradeName
-                : item.gradeName || item.className
-            "
-          >
-            <template v-if="role == 'ROLE_JITUAN'">
-              <el-table-column
-                :prop="'periodCount' + (type == 1 ? item.schoolId : item.grade)"
-                label="课时数"
-                align="center"
-              >
-              <template slot-scope="scoped">{{scoped.row['periodCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template>
-              </el-table-column>
-              <el-table-column
-                :prop="'examCount' + (type == 1 ? item.schoolId : item.grade)"
-                label="测练数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['examCount' + (type == 1 ? item.schoolId : item.grade)]||"--"}}</template></el-table-column>
-            </template>
-            <template v-else>
-              <el-table-column
-                :prop="'periodCount' + (item.grade || item.classId)"
-                label="课时数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['periodCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
-              <el-table-column
-                :prop="'examCount' + (item.grade || item.classId)"
-                label="测练数"
-                align="center"
-              ><template slot-scope="scoped">{{scoped.row['examCount' + (item.grade || item.classId)]||"--"}}</template></el-table-column>
-            </template>
-          </el-table-column>
-        </el-table>
-        <p class="down" v-if="tableData.length">
-          <el-button
-            @click="downExc"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDate, downloadFile } from "@/utils";
-export default {
-  data() {
-    return {
-      loading: false,
-      exportLoading: false,
-      role: "",
-      date: "", //今天-本周-本月-本季度
-      type: 1, //集团管理员 表格切换
-      query: {
-        //搜索条件
-        regionId: "",
-        gradeName: "全部",
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      gradeList: [],
-      tableData: [],
-      dataList: [],
-    };
-  },
-  created() {
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
-    this._QueryGradeList();
-    this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  methods: {
-    async downExc() {
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "gradeName") {
-            query[key] = this.query[key] == "全部" ? "" : this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_JITUAN") {
-        delete query.gradeName;
-      } else {
-        delete query.regionId;
-      }
-      this.exportLoading = true;
-
-      const exportUsageAnalysis = this.role != "ROLE_JITUAN"?this.$request.exportUsageAnalysis:
-      this.$request.exportSchoolContrast
-      const data = await exportUsageAnalysis({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("使用分析.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    changeType(val) {
-      if (val == 1) {
-        this.query.regionId = "";
-      }
-      this._QueryData(val);
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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 day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    async _QueryData() {
-      this.loading = true;
-      //多课时对比
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "gradeName") {
-            query[key] = this.query[key] == "全部" ? "" : this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_JITUAN") {
-        delete query.gradeName;
-      } else {
-        delete query.regionId;
-      }
-      this.tableData = [];
-      const Contrast =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.usageAnalysis
-          : this.type == 1
-          ? this.$request.schoolContrast
-          : this.$request.gradeContrast;
-      const { data, status, info } = await Contrast({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        let dataIdsList = [],
-          dataList = [];
-
-        data.map((item) => {
-          item.dataList.map((items) => {
-            if (this.role == "ROLE_JITUAN") {
-              if (this.type == 1) {
-                if (!dataIdsList.includes(items.schoolId)) {
-                  dataIdsList.push(items.schoolId);
-                  dataList.push(items);
-                }
-              } else if (this.type == 2) {
-                if (!dataIdsList.includes(items.grade)) {
-                  dataIdsList.push(items.grade);
-                  dataList.push(items);
-                }
-              }
-            } else {
-              if (this.query.gradeName == "全部") {
-                if (!dataIdsList.includes(items.grade)) {
-                  dataIdsList.push(items.grade);
-                  dataList.push(items);
-                }
-              } else {
-                if (!dataIdsList.includes(items.classId)) {
-                  dataIdsList.push(items.classId);
-                  dataList.push(items);
-                }
-              }
-            }
-          });
-        });
-        console.log(dataList);
-        this.tableData = data.map((item) => {
-          let params = {};
-          dataIdsList.map((ids, index) => {
-            item.dataList.map((items) => {
-              if (this.role == "ROLE_JITUAN") {
-                if (this.type == 1) {
-                  if (items.schoolId == ids) {
-                    params["examCount" + items.schoolId] = items.examCount;
-                    params["periodCount" + items.schoolId] = items.periodCount;
-                  }
-                } else if (this.type == 2) {
-                  if (items.grade == ids) {
-                    params["examCount" + items.grade] = items.examCount;
-                    params["periodCount" + items.grade] = items.periodCount;
-                  }
-                }
-              } else {
-                if (this.query.gradeName == "全部") {
-                  if (items.grade == ids) {
-                    params["examCount" + items.grade] = items.examCount;
-                    params["periodCount" + items.grade] = items.periodCount;
-                  }
-                } else if (this.query.gradeName) {
-                  if (items.classId == ids) {
-                    params["examCount" + items.classId] = items.examCount;
-                    params["periodCount" + items.classId] = items.periodCount;
-                  }
-                }
-              }
-            });
-          });
-          return {
-            subjectName: item.subjectName,
-            ...params,
-          };
-        });
-        this.dataList = dataList.sort((a, b) => {
-          return a.grade - b.grade;
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找班级
-    async _QueryGradeList() {
-      this.loading = true;
-      const gradeList =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.gradeList
-          : this.$request.regionList;
-      const { data, status, info } = await gradeList();
-      if (status === 0) {
-        if (!!data.list) {
-          if (this.role != "ROLE_JITUAN") {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeList = {
-                  value: item.grade,
-                  label: item.gradeName,
-                };
-                return gradeList;
-              }) || [];
-            this.gradeList.unshift({
-              value: "",
-              label: "全部",
-            });
-          } else {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeList = {
-                  value: item.id,
-                  label: item.regionName,
-                };
-                return gradeList;
-              }) || [];
-            this.gradeList.unshift({
-              value: "",
-              label: "全部",
-            });
-          }
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.table-box {
-  padding: 0 20px;
-}
-.radio-box {
-  padding: 0 20px 12px;
-}
-.down {
-  padding-top: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/ask/analysis.vue b/src/views/standard/ask/analysis.vue
deleted file mode 100644
index a83b49f..0000000
--- a/src/views/standard/ask/analysis.vue
+++ /dev/null
@@ -1,587 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>单课分析</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="tab-box">
-        <span
-          class="tab-item"
-          v-for="(item, index) in tabList"
-          :key="index"
-          :class="type == index + 1 ? 'active' : ''"
-          @click="setType(index + 1)"
-          >{{ item }}</span
-        >
-      </div>
-      <div v-loading="loading">
-        <div id="print-content">
-          <ul class="info" v-if="type == 1">
-            <li class="info-item">科目：{{ detail.subjectName }}</li>
-            <li class="info-item">课时：{{ detail.title }}</li>
-            <li class="info-item">上课时间：{{ detail.startTime }}</li>
-            <li class="info-item">下课时间：{{ detail.endTime }}</li>
-            <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
-            <li class="info-item">题目总数：{{ detail.questionNum }}</li>
-            <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
-            <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
-            <li class="info-item">
-              总参与度：：{{ detail.participationRate }}%
-            </li>
-            <li class="info-item">
-              班级总正确率：{{ detail.classCorrectRate }}%
-            </li>
-            <li class="info-item">
-              已答总正确率：{{ detail.answerCorrectRate }}%
-            </li>
-            <li class="info-item">
-              反馈时长：{{ setDuration(detail.consumingDuration) }}
-            </li>
-          </ul>
-          <el-table
-            v-if="type == 1"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <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">
-              <template slot-scope="scoped">{{
-                setSubPro(scoped.row.questionType)
-              }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="answeredNum"
-              label="答题人数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="correctAnswerNum"
-              label="答对人数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="participationRate"
-              label="班级参与度"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.participationRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="classCorrectRate"
-              label="班级正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.classCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="answerCorrectRate"
-              label="已答正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.answerCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="correctAnswer"
-              label="正确答案"
-              align="center"
-            >
-              <template slot-scope="scoped">{{
-                scoped.row.correctAnswer == 1
-                  ? "✓"
-                  : scoped.row.correctAnswer == 2
-                  ? "✗"
-                  : scoped.row.correctAnswer
-              }}</template></el-table-column
-            >
-            <el-table-column prop="fallible" label="干扰答案" align="center"
-              ><template slot-scope="scoped">{{
-                scoped.row.fallible == 1
-                  ? "✓"
-                  : scoped.row.fallible == 2
-                  ? "✗"
-                  : scoped.row.fallible
-              }}</template></el-table-column
-            >
-            <!-- <el-table-column prop="screenshot" label="题干" align="center">
-            <template slot-scope="scoped">
-              <el-image
-                v-if="scoped.row.screenshot"
-                style="width: 60px; height: 40px"
-                :src="scoped.row.screenshot"
-                :preview-src-list="[scoped.row.screenshot]"
-              >
-              </el-image><span v-else>暂无</span></template
-          ></el-table-column> -->
-          </el-table>
-          <el-table
-            v-if="type == 2"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="answerTimes"
-              label="答题次数"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="consumingDuration"
-              label="答题耗时"
-              align="center"
-              ><template slot-scope="scoped">{{
-                setDuration(scoped.row.consumingDuration)
-              }}</template></el-table-column
-            >
-            <el-table-column
-              prop="correctAnswerTimes"
-              label="答对次数"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="participationRate"
-              label="参与度"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.participationRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="correctRate"
-              label="正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.correctRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="answerCorrectRate"
-              label="已答正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.answerCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              v-for="(item, index) in optionsList"
-              :key="index"
-              :label="'Q' + (index + 1)"
-              align="center"
-              ><template slot-scope="scoped">
-                <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
-                  scoped.row["answer" + index]
-                }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-table
-            v-if="type == 3"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="rushAnswerTimes"
-              label="抢答成功次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="rushAnswerCorrectTimes"
-              label="答对次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkAnswerTimes"
-              label="抽答次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkAnswerCorrectTimes"
-              label="抽答答对次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="interactionsNum"
-              label="参与得分"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="interactionsCorrectNum"
-              label="对错得分"
-              sortable
-              align="center"
-            ></el-table-column>
-          </el-table>
-          <el-table
-            v-if="type == 4"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkInTime"
-              label="签到时间"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="makeUpTime"
-              label="补签时间"
-              sortable
-              align="center"
-            ></el-table-column>
-          </el-table>
-        </div>
-        <div class="pagination-box" v-show="type == 1">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-        <p class="down">
-          <el-button
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-          <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
-        </p>
-      </div>
-    </div>
-
-    <set-answer
-      :diaVisible="dialogVisible"
-      :questionList="form.questionList"
-      :paperId="form.id"
-      @saveSuccess="handleSuccess"
-      @cancel="cancel"
-    />
-  </div>
-</template>
-
-<script>
-import { downloadFile, tablePrint } from "@/utils";
-export default {
-  data() {
-    return {
-      dialogVisible: false,
-      loading: false,
-      id: "",
-      type: 1,
-      form: {
-        id: "",
-        questionList: [],
-      },
-      tabList: ["答题表现", "学生问答表现", "学生互动表现", "签到明细"],
-      detail: {},
-      tableData: [],
-      optionsList: [],
-      page: 1,
-      size: 20,
-      total: 0,
-      status: 0,
-    };
-  },
-  created() {
-    this.id = this.$route.query.id;
-    this.status = this.$route.query.status ? this.$route.query.status : 0;
-    this._QueryData();
-    this.periodDetail();
-  },
-  methods: {
-    print() {
-      tablePrint(
-        "print-content",
-        this.detail.title + "_" + this.tabList[this.type - 1]
-      );
-    },
-    setType(type) {
-      this.type = type;
-      this.page = 1;
-      this._QueryData();
-    },
-    setDuration(times) {
-      let m = parseInt(times / 1000 / 60);
-      let s = parseInt((times / 1000) % 60);
-      let ms = times;
-      let aTime;
-      if (times == 0) {
-        aTime = `0`;
-      } else {
-        if (m == 0 && s == 0) {
-          aTime = `${ms}毫秒`;
-        } else if (m == 0 && s != 0) {
-          aTime = `${s}秒`;
-        } else if (m != 0 && s != 0) {
-          aTime = `${m}分${s}秒`;
-        }
-      }
-      return aTime;
-    },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-        default:
-          tit = "其他";
-      }
-      return tit;
-    },
-    cancel() {
-      this.dialogVisible = false;
-    },
-    handleSuccess() {
-      this.dialogVisible = false;
-      this._QueryData();
-    },
-    async edit() {
-      if (this.editLoading) return;
-      this.editLoading = true;
-      const { data, status, info } = await this.$request.periodQuestionList({
-        periodId: this.id,
-      });
-      this.editLoading = false;
-      if (status === 0) {
-        this.form.id = this.id;
-        this.form.questionList = (data.list && [...data.list]) || [];
-        this.dialogVisible = true;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    async periodDetail() {
-      let { data, info, status } = await this.$request.periodDetail({
-        periodId: this.id,
-      });
-      if (status == 0) {
-        this.detail = { ...data };
-        this.detail.duration = this.detail.duration
-          ? (this.detail.duration / 60).toFixed(2)
-          : 0;
-        this.detail.consumingDuration = this.detail.consumingDuration
-          ? (this.detail.consumingDuration / 60).toFixed(2)
-          : 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      const queryData =
-        this.type == 1
-          ? this.$request.periodQuestionReport
-          : this.$request.periodStudentReport;
-      let query = {};
-      if (this.type == 2) {
-        query.type = 1;
-      } else if (this.type == 3) {
-        query.type = 2;
-      } else if (this.type == 4) {
-        query.type = 3;
-      }
-      this.loading = true;
-      let { data, info, status } = await queryData({
-        periodId: this.id,
-        page: this.page,
-        size: this.size,
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.type == 2) {
-          let optionsList = [];
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            const detail = JSON.parse(item.detail);
-            if (detail.length > optionsList.length) {
-              optionsList = [...detail];
-            }
-            detail.map((items, index) => {
-              params["isRight" + index] = items.isRight;
-              params["answer" + index] =
-                items.answer == 1
-                  ? "✓"
-                  : items.answer == 2
-                  ? "✗"
-                  : items.answer;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.optionsList = [...optionsList];
-        } else {
-          this.tableData = data?.list.sort((a, b) => {
-            return a.questionIndex - b.questionIndex;
-          });
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      const data = await this.$request.exportPeriodReport({
-        periodId: this.id,
-      });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile(this.status?"随堂问-已归档单课时报表.xlsx":"随堂问-单课时报表.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.down {
-  padding-top: 20px;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.red {
-  color: #f30;
-}
-.page-content {
-  padding: 20px 20px 0;
-}
-.tab-box {
-  width: 800px;
-  margin: 0 auto 12px;
-  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;
-    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/standard/ask/archiving.vue b/src/views/standard/ask/archiving.vue
deleted file mode 100644
index 5e3d438..0000000
--- a/src/views/standard/ask/archiving.vue
+++ /dev/null
@@ -1,1055 +0,0 @@
-<template>
-  <div class="main" ref="main">
-    <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.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN' || role == 'ROLE_PERSONAL'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <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.subjectNames"
-          placeholder="选择科目"
-        >
-          <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
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? '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"
-        @change="tabChange"
-        style="margin-bottom: 20px"
-      >
-        <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
-        </template>
-      </el-radio-group>
-      <div class="table-cont" v-loading="loading">
-        <div id="print-content">
-          <div v-show="tabIndex == 1">
-            <el-table
-              :data="tableData"
-              border
-              style="width: 100%"
-              @sort-change="sortChange"
-            >
-              <el-table-column
-                prop="title"
-                label="课时"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="questionNum"
-                label="题目总数"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="startTime"
-                label="上课时间"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="参与度"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classCorrectRate"
-                label="班级总正确率"
-                sortable="custom"
-                align="center"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row.classCorrectRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scoped">
-                  <el-tooltip effect="dark" content="详情" placement="top">
-                    <el-button
-                      type="primary"
-                      circle
-                      size="mini"
-                      icon="fa fa-arrow-right"
-                      @click="linkTo(scoped.row)"
-                    ></el-button>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 2">
-            <el-table
-              id="print-content2"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="answerTimes"
-                label="累计答题次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="correctAnswerTimes"
-                label="累计答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="总参与度"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="correctRate"
-                label="总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.correctRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classRank"
-                label="总正确率班排名"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content2"
-              :max-height="tableMaxHeight"
-              v-else
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                fixed
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseOption"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总课时数' : '课时数'"
-                  :prop="'periodCount' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总出题数' : '出题数'"
-                  :prop="'questionNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总参与度' : '参与度'"
-                  :prop="'participationRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["participationRate" + item] }}%</template
-                  >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总正确率' : '正确率'"
-                  :prop="'correctRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["correctRate" + item] }}%</template
-                  >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 3">
-            <el-table
-              id="print-content3"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerTimes"
-                label="抢答成功次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerCorrectTimes"
-                label="抢答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerTimes"
-                label="抽答次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerCorrectTimes"
-                label="抽答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsNum"
-                label="参与得分"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsCorrectNum"
-                label="对错得分"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content3"
-              v-else
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseInter"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  v-if="index == 0"
-                  label="参与分"
-                  sortable
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="互动数"
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-if="index == 0"
-                  align="center"
-                  label="对错分"
-                  sortable
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="参与数"
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div class="pagination-box" v-show="tabIndex == 1">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-        <p
-          class="down"
-          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
-        >
-          <el-button
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDate, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
-export default {
-  data() {
-    return {
-      tableMaxHeight: 300,
-      code: "",
-      role: "",
-      loading: false,
-      date: "", //今天-昨天-本周
-      query: {
-        //搜索条件
-        classId: "",
-        subjectNames: "",
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
-      custom: {
-        //单课时排序
-        orderField: null,
-        orderType: null,
-      },
-      classList: [], //班级
-      subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      phaseOption: [], //问答补充数据
-      phaseInter: [], //互动补充数据
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
-    await this._QueryClassList();
-    if (!this.query.classId) {
-      return;
-    }
-    await this._QuerySubjectList();
-    await this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      await that._QueryClassList();
-      if (!that.query.classId) {
-        return;
-      }
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
-    });
-  },
-  methods: {
-    print() {
-      tablePrint(
-        "print-content",
-        "随堂问-已归档" + this.tabList[this.tabIndex - 1]
-      );
-    },
-    changeSub(val) {
-      let sub;
-      if (val && val.length) {
-        let leng = val.length - 1;
-        sub = val[leng];
-      }
-      console.log(val);
-      this.query.subjectNames = val.filter((item) => {
-        return sub != "全部" ? item != "全部" : item == "全部";
-      });
-    },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/askAnalysis",
-        query: {
-          id: obj.id,
-          status: 1,
-        },
-      });
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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;
-          that.tabIndex = 1;
-          break;
-        case 2:
-          let day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    tabChange() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this.tableData = [];
-      this._QueryData();
-    },
-    sortChange(obj) {
-      this.custom.orderField =
-        obj.prop == "participationRate"
-          ? 1
-          : obj.prop == "answerCorrectRate"
-          ? 2
-          : 3;
-      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
-      this.page = 1;
-      this._QueryData();
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    async changeclass() {
-      await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      await this._QuerySubjectList();
-      // await this.setDate(1);
-      this._QueryData();
-    },
-    async _QueryClassList() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList({ status: 1 });
-      if (status === 0) {
-        this.classList = data.list.map((item) => {
-          return {
-            value: item.classId,
-            label: item.className,
-          };
-        });
-        this.query.classId = this.classList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubjectList() {
-      const fetchSubjectList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList
-          : this.$request.tSubjectList;
-
-      const { data, status, info } = await fetchSubjectList({
-        classId: this.query.classId,
-        status: 1,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
-        } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      if (!this.query.classId) {
-        return;
-      }
-      if (this.tabIndex == 1) {
-        this.periodReportList();
-      } else if (this.tabIndex == 2) {
-        this.phaseAnswerReport();
-      } else if (this.tabIndex == 3) {
-        this.phaseInteractiveReport();
-      }
-    },
-    //分页查询课时报表列表
-    async periodReportList() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          query[key] = this.query[key];
-        }
-      }
-      if (this.custom.orderField !== null) {
-        query = { ...query, ...this.custom };
-      }
-      if (this.role != "ROLE_BANZHUREN") {
-        query.subjectNames = [query.subjectNames];
-      } else {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const { data, status, info } = await this.$request.periodReportList({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data?.count || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //查询阶段问答报表
-    async phaseAnswerReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const phaseAnswerReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseAnswerReport
-          : this.$request.phaseAnswerReport;
-
-      const { data, status, info } = await phaseAnswerReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["answerCorrectRate" + items.subjectName] =
-                items.answerCorrectRate;
-              params["correctRate" + items.subjectName] = items.correctRate;
-              params["participationRate" + items.subjectName] =
-                items.participationRate;
-              params["periodCount" + items.subjectName] = items.periodCount;
-              params["questionNum" + items.subjectName] = items.questionNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseOption = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //查询阶段互动报表
-    async phaseInteractiveReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const phaseInteractiveReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseInteractiveReport
-          : this.$request.phaseInteractiveReport;
-
-      const { data, status, info } = await phaseInteractiveReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["interactionsNum" + items.subjectName] =
-                items.interactionsNum;
-              params["interactionsCorrectNum" + items.subjectName] =
-                items.interactionsCorrectNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseInter = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      this.exportLoading = true;
-      let exportData;
-      if (this.role == "ROLE_BANZHUREN") {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.cTExportPhaseAnswerReport
-            : this.$request.cTExportPhaseInteractiveReport;
-      } else {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.exportPhaseAnswerReport
-            : this.$request.exportPhaseInteractiveReport;
-      }
-      const data = await exportData({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("随堂问-已归档阶段报表.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.main {
-  height: 100%;
-}
-.table-box {
-  margin: 0 20px;
-  padding: 16px;
-  background: #f8f8f8;
-  border-radius: 5px;
-  .table-cont {
-    min-height: 300px;
-  }
-  :deep(.fa-arrow-right) {
-    padding-left: 2px;
-  }
-  :deep(.fa-file-text) {
-    padding-left: 2px;
-  }
-}
-
-.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/standard/ask/index.vue b/src/views/standard/ask/index.vue
deleted file mode 100644
index 71b1053..0000000
--- a/src/views/standard/ask/index.vue
+++ /dev/null
@@ -1,1119 +0,0 @@
-<template>
-  <div class="main" ref="main">
-    <back-box>
-      <template slot="title">
-        <span>问答-数据报表</span>
-      </template>
-      <template slot="btns">
-        <el-tooltip
-          v-if="!code && gdClass"
-          effect="dark"
-          content="已归档试卷"
-          placement="bottom"
-        >
-          <el-button
-            type="primary"
-            icon="fa fa-archive"
-            size="mini"
-            plain
-            circle
-            @click="toArchiving"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN' || role == 'ROLE_PERSONAL'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <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.subjectNames"
-          placeholder="选择科目"
-        >
-          <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
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? '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"
-        @change="tabChange"
-        style="margin-bottom: 20px"
-      >
-        <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
-        </template>
-      </el-radio-group>
-      <div class="table-cont" v-loading="loading">
-        <div id="print-content">
-          <div v-show="tabIndex == 1">
-            <el-table
-              :data="tableData"
-              border
-              style="width: 100%"
-              @sort-change="sortChange"
-            >
-              <el-table-column
-                prop="title"
-                label="课时"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="questionNum"
-                label="题目总数"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="startTime"
-                label="上课时间"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="参与度"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classCorrectRate"
-                label="班级总正确率"
-                sortable="custom"
-                align="center"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row.classCorrectRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scoped">
-                  <template v-if="scoped.row.answerNum == 0">
-                    <el-tooltip
-                      v-if="role == 'ROLE_JIAOSHI'"
-                      effect="dark"
-                      content="设置答案"
-                      placement="top"
-                    >
-                      <el-button
-                        type="primary"
-                        circle
-                        size="mini"
-                        icon="fa fa-file-text"
-                        @click="edit(scoped.row)"
-                      ></el-button>
-                    </el-tooltip>
-                    <template v-else>未设置答案</template>
-                  </template>
-                  <el-tooltip
-                    v-else
-                    effect="dark"
-                    content="详情"
-                    placement="top"
-                  >
-                    <el-button
-                      type="primary"
-                      circle
-                      size="mini"
-                      icon="fa fa-arrow-right"
-                      @click="linkTo(scoped.row)"
-                    ></el-button>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 2">
-            <el-table
-              id="print-content2"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="answerTimes"
-                label="累计答题次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="correctAnswerTimes"
-                label="累计答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="总参与度"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="correctRate"
-                label="总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.correctRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classRank"
-                label="总正确率班排名"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content2"
-              :max-height="tableMaxHeight"
-              v-else
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                fixed
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseOption"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总课时数' : '课时数'"
-                  :prop="'periodCount' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总出题数' : '出题数'"
-                  :prop="'questionNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总参与度' : '参与度'"
-                  :prop="'participationRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["participationRate" + item] }}%</template
-                  >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总正确率' : '正确率'"
-                  :prop="'correctRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["correctRate" + item] }}%</template
-                  >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 3">
-            <el-table
-              id="print-content3"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerTimes"
-                label="抢答成功次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerCorrectTimes"
-                label="抢答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerTimes"
-                label="抽答次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerCorrectTimes"
-                label="抽答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsNum"
-                label="参与得分"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsCorrectNum"
-                label="对错得分"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content3"
-              v-else
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseInter"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  v-if="index == 0"
-                  label="参与分"
-                  sortable
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="互动数"
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-if="index == 0"
-                  align="center"
-                  label="对错分"
-                  sortable
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="参与数"
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div class="pagination-box" v-show="tabIndex == 1">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-        <p
-          class="down"
-          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
-        >
-          <el-button
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDate, deepClone, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
-export default {
-  data() {
-    return {
-      gdClass: 0, //已归档班级数量
-      tableMaxHeight: 300,
-      code: "",
-      role: "",
-      loading: false,
-      date: "", //今天-昨天-本周
-      query: {
-        //搜索条件
-        classId: "",
-        subjectNames: "",
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
-      custom: {
-        //单课时排序
-        orderField: null,
-        orderType: null,
-      },
-      classList: [], //班级
-      subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      phaseOption: [], //问答补充数据
-      phaseInter: [], //互动补充数据
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
-    this._QueryClassList2();
-    await this._QueryClassList();
-    if (!this.query.classId) {
-      return;
-    }
-    await this._QuerySubjectList();
-    await this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      that._QueryClassList2();
-      await that._QueryClassList();
-      if (!that.query.classId) {
-        return;
-      }
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
-    });
-  },
-  methods: {
-    toArchiving() {
-      this.$router.push({
-        path: "/askArchiving",
-      });
-    },
-    print() {
-      tablePrint("print-content", "随堂问-" + this.tabList[this.tabIndex - 1]);
-    },
-    changeSub(val) {
-      let sub;
-      if (val && val.length) {
-        let leng = val.length - 1;
-        sub = val[leng];
-      }
-      console.log(val);
-      this.query.subjectNames = val.filter((item) => {
-        return sub != "全部" ? item != "全部" : item == "全部";
-      });
-    },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/askAnalysis",
-        query: {
-          id: obj.id,
-        },
-      });
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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;
-          that.tabIndex = 1;
-          break;
-        case 2:
-          let day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    async edit(item) {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: item.id,
-          title: item.title,
-          type: 3,
-        },
-      });
-    },
-    tabChange() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this.tableData = [];
-      this._QueryData();
-    },
-    sortChange(obj) {
-      this.custom.orderField =
-        obj.prop == "participationRate"
-          ? 1
-          : obj.prop == "answerCorrectRate"
-          ? 2
-          : 3;
-      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
-      this.page = 1;
-      this._QueryData();
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    async changeclass() {
-      await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      await this._QuerySubjectList();
-      // await this.setDate(1);
-      this._QueryData();
-    },
-    async _QueryClassList2() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList({ status: 1 });
-      if (status === 0) {
-        this.gdClass = data?.list?.length || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryClassList() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList();
-      if (status === 0) {
-        this.classList = data.list.map((item) => {
-          return {
-            value: item.classId,
-            label: item.className,
-          };
-        });
-        this.query.classId = this.classList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubjectList() {
-      const fetchSubjectList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList
-          : this.$request.tSubjectList;
-
-      const { data, status, info } = await fetchSubjectList({
-        classId: this.query.classId,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
-        } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      if (!this.query.classId) {
-        return;
-      }
-      if (this.tabIndex == 1) {
-        this.periodReportList();
-      } else if (this.tabIndex == 2) {
-        this.phaseAnswerReport();
-      } else if (this.tabIndex == 3) {
-        this.phaseInteractiveReport();
-      }
-    },
-    //分页查询课时报表列表
-    async periodReportList() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          query[key] = this.query[key];
-        }
-      }
-      if (this.custom.orderField !== null) {
-        query = { ...query, ...this.custom };
-      }
-      if (this.role != "ROLE_BANZHUREN") {
-        query.subjectNames = [query.subjectNames];
-      } else {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const { data, status, info } = await this.$request.periodReportList({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data?.count || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //查询阶段问答报表
-    async phaseAnswerReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const phaseAnswerReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseAnswerReport
-          : this.$request.phaseAnswerReport;
-
-      const { data, status, info } = await phaseAnswerReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["answerCorrectRate" + items.subjectName] =
-                items.answerCorrectRate;
-              params["correctRate" + items.subjectName] = items.correctRate;
-              params["participationRate" + items.subjectName] =
-                items.participationRate;
-              params["periodCount" + items.subjectName] = items.periodCount;
-              params["questionNum" + items.subjectName] = items.questionNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseOption = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //查询阶段互动报表
-    async phaseInteractiveReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const phaseInteractiveReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseInteractiveReport
-          : this.$request.phaseInteractiveReport;
-
-      const { data, status, info } = await phaseInteractiveReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["interactionsNum" + items.subjectName] =
-                items.interactionsNum;
-              params["interactionsCorrectNum" + items.subjectName] =
-                items.interactionsCorrectNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseInter = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      this.exportLoading = true;
-      let exportData;
-      if (this.role == "ROLE_BANZHUREN") {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.cTExportPhaseAnswerReport
-            : this.$request.cTExportPhaseInteractiveReport;
-      } else {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.exportPhaseAnswerReport
-            : this.$request.exportPhaseInteractiveReport;
-      }
-      const data = await exportData({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("随堂问-阶段报表.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.main {
-  height: 100%;
-}
-.table-box {
-  margin: 0 20px;
-  padding: 16px;
-  background: #f8f8f8;
-  border-radius: 5px;
-  .table-cont {
-    min-height: 300px;
-  }
-  :deep(.fa-arrow-right) {
-    padding-left: 2px;
-  }
-  :deep(.fa-file-text) {
-    padding-left: 2px;
-  }
-}
-
-.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/standard/card/index.vue b/src/views/standard/card/index.vue
deleted file mode 100644
index d1b5553..0000000
--- a/src/views/standard/card/index.vue
+++ /dev/null
@@ -1,345 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>发卡记录</span>
-      </template>
-    </back-box>
-
-    <div class="page-content">
-      <div class="answer-header">
-        <div class="sel-box">
-          <!-- <template v-if="role == 'ROLE_XUEXIAO'">
-            <el-cascader
-              @change="(page = 1), _QueryData(1)"
-              size="small"
-              class="sel"
-              clearable
-              placeholder="选择班级"
-              v-model="query.classId"
-              :options="gradeList"
-              :props="props"
-              :show-all-levels="false"
-            ></el-cascader>
-          </template> -->
-          <template v-if="role == 'ROLE_JITUAN'">
-            <el-select class="sel2" v-model="query.schoolId" placeholder="选择学校" @change="(page = 1), _QueryData(1)">
-              <el-option v-for="item in schoolList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </template>
-          <el-select class="sel sel3" v-model="query.operationType" placeholder="选择类型"
-            @change="(page = 1), _QueryData(1)">
-            <el-option label="全部" value=""></el-option>
-            <el-option label="发卡" :value="0"></el-option>
-            <el-option label="补卡" :value="1"></el-option>
-            <el-option label="换班" :value="2"></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>
-          <template v-if="role == 'ROLE_XUEXIAO'">
-            <el-input placeholder="请输入学生姓名" v-model="query.studentName" class="input-with-select sel"
-              @keyup.enter.native="(page = 1), _QueryData(2)">
-              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(2)"></el-button>
-            </el-input>
-            <el-input placeholder="请输入学生学号" v-model="query.studentCode" class="input-with-select sel"
-              @keyup.enter.native="(page = 1), _QueryData(3)">
-              <el-button slot="append" icon="el-icon-search" @click="(page = 1), _QueryData(3)"></el-button>
-            </el-input>
-          </template>
-          <el-button type="primary" round @click="(page = 1), _QueryData(4)">筛选</el-button>
-        </div>
-      </div>
-      <el-empty :image-size="100" v-if="!tableData.length && !loading" description="暂无数据"></el-empty>
-      <div v-else class="table-box" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column align="center" label="答题器编码" prop="clickerSn"></el-table-column>
-          <el-table-column align="center" label="年级">
-            <template slot-scope="scope">
-              <span>{{ scope.row.classList[0]?.gradeName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="班级">
-            <template slot-scope="scope">
-              <span v-for="(item, index) in scope.row.classList" :key="item.classCode">{{ (index == 0 ? "" : "、") +
-                item.className }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" label="学生姓名" prop="studentName"></el-table-column>
-          <el-table-column align="center" label="学号" prop="studentCode"></el-table-column>
-          <el-table-column align="center" label="类型">
-            <template slot-scope="scope">
-              {{
-                scope.row.operationType == 0
-                ? "发卡"
-                : scope.row.operationType == 1
-                  ? "补卡"
-                  : "换班"
-              }}
-            </template></el-table-column>
-          <el-table-column align="center" label="操作次数" prop="operations"></el-table-column>
-          <el-table-column align="center" label="描述">
-            <template slot-scope="scope">
-              {{
-                scope.row.operationType == 0
-                ? "--"
-                : scope.row.reason == 0
-                  ? "丢失"
-                  : scope.row.reason == 1 ? "损坏" : "换班"
-              }}
-            </template></el-table-column>
-          <el-table-column align="center" label="操作时间" prop="modifiedTime" width="160"></el-table-column>
-        </el-table>
-        <div class="pagination-box">
-          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
-            @current-change="changePage" :current-page="page" :page-size="size">
-          </el-pagination>
-        </div>
-      </div>
-      <p class="down" v-if="tableData.length">
-        <el-button type="primary" plain round icon="fa fa-cloud-download" @click="downExl">导出报表</el-button>
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { downloadFile, formatDate } from "utils";
-const defauleQuery = {
-  classId: "",
-  studentName: "",
-  studentCode: "",
-  operationType: "",
-  startDay: "",
-  endDay: "",
-};
-export default {
-  data() {
-    return {
-      role: "",
-      loading: false,
-      props: { multiple: false },
-      query: {
-        classId: "",
-        studentName: "",
-        studentCode: "",
-        operationType: "",
-        schoolId: "",
-        startDay: "",
-        endDay: "",
-      },
-      schoolList: [],
-      gradeList: [],
-      tableData: [],
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  async created() {
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this.loading = true;
-    if (this.role == "ROLE_XUEXIAO") {
-      this._QueryGradeList();
-    } else if (this.role == "ROLE_JITUAN") {
-      await this._QuerySchool();
-    }
-
-    this._QueryData();
-  },
-  methods: {
-    handleChangeTimeStart(val) {
-      if (this.query.endDay) {
-        if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
-          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
-          this.query.startDay = "";
-        }
-      }
-    },
-    handleChangeTimeEnd(val) {
-      if (this.query.startDay) {
-        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
-          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
-          this.query.endDay = "";
-        }
-      }
-    },
-    // 查找班级
-    async _QueryGradeList() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.gradeList();
-      console.log(status);
-      if (status === 0) {
-        if (!!data.list) {
-          this.gradeList =
-            data.list?.map((item) => {
-              let gradeList = {
-                value: item.grade,
-                label: item.gradeName,
-              };
-              gradeList.children =
-                item.classList?.map((items) => {
-                  return {
-                    value: items.id,
-                    label: items.className,
-                  };
-                }) || [];
-              return gradeList;
-            }) || [];
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData(4);
-    },
-    async _QuerySchool() {
-      const { data, status, info } = await this.$request.schoolList();
-      if (status === 0) {
-        this.schoolList =
-          data.list?.map((item) => {
-            return {
-              label: item.schoolName,
-              value: item.id,
-            };
-          }) || [];
-        this.schoolList.unshift({
-          label: "全部",
-          value: "",
-        });
-        this.query.schoolId = this.schoolList[0].value || "";
-      } else {
-        this.$message.error(info);
-      }
-    },
-    serQuery(type) {
-      let query = {};
-      if (this.role == "ROLE_XUEXIAO") {
-        delete query.schoolId;
-        if (type == 1) {
-          this.query.studentCode = "";
-          this.query.studentName = "";
-          query = { ...this.query };
-          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
-        } else if (type == 2) {
-          this.query = { ...defauleQuery, studentName: this.query.studentName };
-          query = { ...this.query };
-        } else if (type == 3) {
-          this.query = { ...defauleQuery, studentCode: this.query.studentCode };
-          query = { ...this.query };
-        } else {
-          query = { ...this.query };
-          query.classId = this.query.classId[1] ? this.query.classId[1] : "";
-        }
-      } else if (this.role == "ROLE_JITUAN") {
-        query.schoolId = this.query.schoolId;
-        query.operationType = this.query.operationType;
-        query.startDay = this.query.startDay;
-        query.endDay = this.query.endDay;
-      }
-      return query;
-    },
-    async _QueryData(type) {
-      if (this.role == "ROLE_XUEXIAO") {
-        if (type == 2) {
-          if (!this.query.studentName) {
-            this.$message.warning("输入学生姓名～");
-            return;
-          }
-        } else if (type == 3) {
-          if (!this.query.studentCode) {
-            this.$message.warning("输入学生学号～");
-            return;
-          }
-        }
-      }
-      let query = this.serQuery(type);
-      this.loading = true;
-      const { data, status, info } = await this.$request.cardList({
-        ...query,
-        page: this.page,
-        size: 20,
-      });
-      this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.tableData = data.list || [];
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExl() {
-      let query = { ...this.query };
-      if (this.role == "ROLE_XUEXIAO") {
-        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
-        delete query.schoolId;
-      } else if (this.role == "ROLE_JITUAN") {
-        delete query.classId;
-        delete query.studentName;
-        delete query.studentCode;
-      }
-      //报表导出
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      const data = await this.$request.exportClickersLog({
-        ...query,
-      });
-      this.exportLoading = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        let date = formatDate(new Date().getTime(), "yyyy-MM-dd");
-        let name = `发卡记录_${date}.xlsx`;
-        downloadFile(name, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.table-box {
-  padding: 0 20px;
-}
-
-.down {
-  padding: 16px 20px;
-}
-
-.answer-header {
-  .sel-box {
-    .sel {
-      margin-right: 20px;
-      min-width: 120px;
-    }
-
-    .sel2 {
-      width: 200px;
-      margin-right: 20px;
-    }
-
-    .sel3 {
-      min-width: 80px;
-    }
-
-    .d1 {
-      margin-right: 20px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/dataSync/index.vue b/src/views/standard/dataSync/index.vue
deleted file mode 100644
index 18cb7b1..0000000
--- a/src/views/standard/dataSync/index.vue
+++ /dev/null
@@ -1,188 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>数据同步</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="down-item">
-        <p class="h-title">从U盘上传</p>
-        <p class="txt">
-          本功能帮助无法上网的授课端软件，将本地数据同步到云平台。
-        </p>
-        <el-upload
-          class="upload-demo"
-          ref="upload"
-          :action="url"
-          :multiple="false"
-          :with-credentials="true"
-          :limit="1"
-          :on-change="change"
-          :on-success="upSuccess"
-          :on-error="upError"
-        >
-          <div class="btn-box">
-            <i class="fa fa-cloud-upload"></i>
-            <el-button type="primary" round>选择文件</el-button>
-          </div>
-        </el-upload>
-      </div>
-
-      <div class="down-item">
-        <p class="h-title">数据导出至U盘</p>
-        <p class="txt">本功能将云平台的数据导出到U盘。</p>
-        <div class="btn-box btn-box2" v-loading="downLoading">
-          <i class="fa fa-cloud-download" @click="downloadFile"></i>
-          <el-button type="primary" round @click="downloadFile"
-            >文件下载</el-button
-          >
-        </div>
-      </div>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="" :visible.sync="dialogVisible" width="300" center>
-      <el-result icon="success" title="上传成功"> </el-result>
-      <el-descriptions title="" :column="1">
-        <el-descriptions-item label="导入答题卡数量">{{tipData.paperNum}}</el-descriptions-item>
-        <el-descriptions-item label="导入随堂问报表数量">{{tipData.periodNum}}</el-descriptions-item>
-        <el-descriptions-item label="导入即时测报表数量">{{tipData.examNum}}</el-descriptions-item>
-      </el-descriptions>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogVisible = false"
-          >确 定</el-button
-        >
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { formatDate } from "@/utils";
-export default {
-  data() {
-    return {
-      downLoading: false,
-      url: "/api_html/teaching/importData",
-      file: {},
-      dialogVisible: false,
-      tipData: {
-        paperNum: 0,
-        periodNum: 0,
-        examNum: 0,
-      },
-    };
-  },
-  methods: {
-    async downloadFile() {
-      if (this.downLoading) return;
-      this.downLoading = true;
-      const data = await this.$request.exportData();
-      this.downLoading = false;
-      console.log(data);
-      if (data) {
-        let blob = new Blob([data], { type: "application/octet-stream" });
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement("a");
-        document.body.appendChild(link);
-        link.download =
-          this.$store.getters.info.name +
-          formatDate(new Date(), "yyyy_MM_dd_hh_mm_ss") +
-          "文件.json";
-        link.href = url;
-        link.click();
-        document.body.removeChild(link);
-        URL.revokeObjectURL(url);
-      } else {
-        this.$message.error("下载失败，请重试");
-      }
-    },
-    async submitUpload() {
-      this.$refs.upload.submit();
-
-      // const formData = new FormData()
-      // formData.append('id',this.componentId)
-      // formData.append('file',new File(this.file.raw))
-      // let {status,info} = await uploadExcel(formData);
-      // if(status===0){
-      //   this.$message.success(info);
-      //   this.$emit("upSuccess")
-      // } else {
-      //   this.$message.error(info);
-      // }
-    },
-    upSuccess(res) {
-      if (res && res.status == 0) {
-        this.tipData = res.data
-        this.dialogVisible = true
-      } else {
-        this.$message.error(res.info);
-      }
-    },
-    upError(res) {
-      debugger;
-      if (res && res.status == 0) {
-        this.$message.error("上传失败");
-      } else {
-        this.$message.error(res.message);
-      }
-    },
-    change(file) {
-      this.file = file;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 50px;
-  display: flex;
-  justify-content: center;
-  .down-item {
-    width: 400px;
-    height:330px;
-    border-radius: 20px;
-    margin: 20px;
-    background: #f8f8f8;
-    box-shadow: 2px 2px 5px #ccc;
-    .h-title {
-      font-size: 16px;
-      color: #667ffd;
-      padding: 16px 0 16px 12px;
-    }
-    .txt {
-      height: 80px;
-      padding: 0 20px;
-      font-size: 16px;
-      color: #7f7f7f;
-      line-height: 24px;
-      text-align: center;
-    }
-  }
-  .upload-demo {
-    padding:0 20px 20px;
-    :deep(.el-upload--text){
-      display: block;
-    }
-  }
-  :deep(.el-upload) {
-    margin: 0 auto;
-  }
-  .btn-box {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding-bottom: 10px;
-    .fa {
-      font-size: 80px;
-      color: #aeaeae;
-      padding-bottom: 10px;
-      cursor: pointer;
-    }
-  }
-  .btn-box {
-    width: 100%;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/device/error.vue b/src/views/standard/device/error.vue
deleted file mode 100644
index a2e0579..0000000
--- a/src/views/standard/device/error.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>异常设备信息</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column
-          prop="sn"
-          label="设备编码"
-          align="center"
-          width="160"
-        ></el-table-column>
-        <el-table-column prop="deviceType" label="设备类型" align="center">
-          <template slot-scope="scoped">
-            {{
-              scoped.row.deviceType == 1
-                ? "基站"
-                : scoped.row.deviceType == 2
-                ? "键盘"
-                : "PC"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="异常类型" align="center">
-          <template slot-scope="scoped">
-            {{
-              scoped.row.status == 0
-                ? "正常"
-                : scoped.row.status == 1
-                ? "低电量异常"
-                : scoped.row.status == 2
-                ? "配对码异常"
-                : "关联班级异常"
-            }}
-          </template></el-table-column
-        >
-        <template v-if="type == 1">
-          <el-table-column
-            prop="pairingCode"
-            label="配对码"
-            align="center"
-          ></el-table-column>
-          <el-table-column label="关联班级" align="center">
-            <template slot-scope="scoped">
-              <p v-for="(item, index) in scoped.row.classList" :key="index">
-                {{ item.className }}
-              </p>
-            </template>
-          </el-table-column>
-        </template>
-        <el-table-column
-          prop="modifiedTime"
-          label="最早发现时间"
-          align="center"
-          width="200"
-        ></el-table-column>
-        <el-table-column
-          v-if="type == 2"
-          prop="answerTimes"
-          label="答题次数"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="abnormalRemark"
-          label="状态"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="abnormalSource" label="信息来源" align="center">
-          <template slot-scope="scoped">
-            {{
-              scoped.row.abnormalSource == 0
-                ? "无"
-                : scoped.row.abnormalSource == 1
-                ? "云平台"
-                : scoped.row.abnormalSource == 2
-                ? "授课端"
-                : scoped.row.abnormalSource == 3
-                ? "出厂工具"
-                : "发卡工具"
-            }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100"
-          ><template slot-scope="scoped">
-            <el-link
-              :disabled="!!scoped.row.abnormalRemark"
-              @click="openDia(scoped.row)"
-              >处理</el-link
-            ></template
-          ></el-table-column
-        >
-      </el-table>
-      <div class="pagination-box">
-        <el-pagination
-          small=""
-          layout="total,prev, pager, next"
-          :hide-on-single-page="true"
-          :total="total"
-          @current-change="changePage"
-          :current-page="page"
-          :page-size="size"
-        >
-        </el-pagination>
-      </div>
-    </div>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="备注"
-      :visible.sync="diaNotes"
-      width="400"
-    >
-      <el-form ref="formClass" label-width="100px">
-        <el-form-item label="处理备注：" prop="studentName">
-          <el-col :span="12">
-            <el-input
-              type="textarea"
-              :rows="3"
-              maxlength="200"
-              v-model="ntoes"
-            />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="_SaveNotes" type="primary">确 定</el-button>
-        <el-button @click="diaNotes = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      role: "",
-      loading: false,
-      diaNotes: false,
-      ntoes: "",
-      deviceId: "",
-      type: 1,
-      tableData: [],
-      total: 0,
-      page: 1,
-      size: 20,
-    };
-  },
-  created() {
-    this.type = this.$route.query.type;
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this._QueryData();
-  },
-  methods: {
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    openDia(obj) {
-      this.diaNotes = true;
-      this.deviceId = obj.id;
-      this.ntoes = "";
-    },
-    async _SaveNotes() {
-      if (!this.ntoes.trim()) {
-        this.$message.warning("请填写备注内容！");
-        return;
-      }
-      const { status, info } = await this.$request.abnormalRemark({
-        deviceId: this.deviceId,
-        abnormalRemark: this.ntoes,
-      });
-      if (status === 0) {
-        this.ntoes = "";
-        this.diaNotes = false;
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      this.loading = true;
-      const deviceList =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.deviceList
-          : this.$request.tenantDeviceList;
-      this.tableData = [];
-      const { data, status, info } = await deviceList({
-        status: 1,
-        deviceType: this.type,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
deleted file mode 100644
index 07fbf45..0000000
--- a/src/views/standard/device/index.vue
+++ /dev/null
@@ -1,1355 +0,0 @@
-<template>
-  <div ref="main" class="page-content">
-    <back-box>
-      <template slot="title">
-        <span>设备管理</span>
-      </template>
-      <template slot="btns">
-        <template v-if="tableData.length">
-          <el-tooltip effect="dark" content="设备导出" placement="bottom">
-            <el-button
-              type="primary"
-              icon="fa fa-cloud-download"
-              size="mini"
-              plain
-              circle
-              @click="downExl"
-            ></el-button>
-          </el-tooltip>
-        </template>
-        <template v-if="role == 'ROLE_XUEXIAO' && type == 1">
-          <el-tooltip effect="dark" content="设备导入" placement="bottom">
-            <el-button
-              type="primary"
-              icon="el-icon-upload2"
-              size="mini"
-              plain
-              circle
-              @click="diaUp = true"
-            ></el-button>
-          </el-tooltip>
-          <el-tooltip effect="dark" content="添加基站" placement="bottom">
-            <el-button
-              type="primary"
-              icon="el-icon-receiving"
-              size="mini"
-              plain
-              circle
-              @click="addDev"
-            ></el-button> </el-tooltip
-        ></template>
-      </template>
-    </back-box>
-    <div>
-      <div class="tab-box">
-        <el-radio-group v-model="type">
-          <el-radio-button :label="1">基站管理</el-radio-button>
-          <el-radio-button :label="2">答题器管理</el-radio-button>
-          <el-radio-button :label="3">授课端管理</el-radio-button>
-        </el-radio-group>
-      </div>
-      <p
-        v-show="(type == 1 && stationCount) || (type == 2 && clickerCount)"
-        class="error-tips"
-      >
-        有{{
-          type == 1 ? stationCount : clickerCount
-        }}条设备异常信息，<router-link
-          :to="{ path: '/deviceError', query: { type: type } }"
-          >点击查看&gt;&gt;</router-link
-        >
-      </p>
-      <div class="content">
-        <div v-show="type == 1">
-          <div class="chart-box" v-if="count">
-            <div class="device-num">
-              <p class="p1">{{ count }}</p>
-              <p class="p2">基站数量</p>
-            </div>
-            <div class="chart">
-              <pie-chart
-                id="pieChart"
-                :params="chartData"
-                @clickPieChart="clickPieChart"
-              ></pie-chart>
-            </div>
-          </div>
-          <div class="table-box">
-            <div class="answer-header">
-              <div class="sel-box">
-                <el-cascader
-                  size="small"
-                  class="sel sel2"
-                  clearable
-                  placeholder="选择班级"
-                  v-model="query.classId"
-                  :options="gradeList"
-                  :props="props"
-                  collapse-tags
-                  :show-all-levels="false"
-                ></el-cascader>
-                <el-select
-                  class="sel"
-                  v-model="query.onlineStatus"
-                  placeholder="选择状态"
-                  @change="_QueryData(true)"
-                >
-                  <el-option
-                    v-for="item in statusList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-input
-                  placeholder="请输入设备编码"
-                  v-model="query.sn"
-                  class="input-with-select"
-                  clearable
-                  @keyup.enter.native="_QueryData(true)"
-                >
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="_QueryData(true)"
-                  ></el-button>
-                </el-input>
-                <el-button class="serach-box" round @click="_QueryData(true)"
-                  >筛选</el-button
-                >
-              </div>
-            </div>
-            <p class="loading" v-if="!tableData.length && loading">
-              加载中<i class="el-icon-loading"></i>
-            </p>
-            <el-table v-else :data="tableData" border style="width: 100%">
-              <el-table-column
-                prop="sn"
-                label="设备编码"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="frequency"
-                label="频点"
-                align="center"
-                width="60"
-              ></el-table-column>
-              <el-table-column
-                prop="pairingCode"
-                label="配对码"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="schoolName"
-                label="学校"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="gradeName"
-                label="年级"
-                align="center"
-                ><template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.gradeName }}
-                  </p>
-                </template></el-table-column
-              >
-              <el-table-column
-                prop="roomName"
-                label="所在教室"
-                align="center"
-              ></el-table-column>
-              <el-table-column label="关联班级" align="center">
-                <template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.className }}
-                  </p>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="otaVersionName"
-                label="固件版本号"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="onlineTime"
-                label="最近上报"
-                align="center"
-                width="160"
-              ></el-table-column>
-              <el-table-column
-                prop="createdTime"
-                label="创建时间"
-                align="center"
-                width="160"
-              ></el-table-column>
-              <el-table-column label="状态" align="center" width="60"
-                ><template slot-scope="scope">
-                  {{
-                    scope.row.onlineStatus == 1
-                      ? "在线"
-                      : scope.row.onlineStatus == 2
-                      ? "异常"
-                      : "离线"
-                  }}
-                </template></el-table-column
-              >
-              <el-table-column label="操作" align="center"
-                ><template slot-scope="scoped">
-                  <el-tooltip
-                    effect="dark"
-                    v-if="role != 'ROLE_JITUAN'"
-                    content="修改基站"
-                    placement="top"
-                  >
-                    <el-button
-                      type="primary"
-                      circle
-                      size="mini"
-                      icon="fa fa-edit"
-                      @click="edit(scoped.row)"
-                    ></el-button>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" content="日志" placement="top">
-                    <el-button
-                      type="warning"
-                      circle
-                      size="mini"
-                      icon="fa fa-eye"
-                      @click="linkTo(scoped.row, 1)"
-                    ></el-button>
-                  </el-tooltip> </template
-              ></el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div v-show="type == 2">
-          <div class="chart-box" v-if="count">
-            <div class="device-num">
-              <p class="p1">{{ count }}</p>
-              <p class="p2">答题器数量</p>
-            </div>
-            <div class="chart">
-              <scatter-chart
-                id="scatterChart"
-                :params="chartData2"
-                @clickScatterChart="clickScatterChart"
-              ></scatter-chart>
-            </div>
-          </div>
-          <div class="table-box">
-            <div class="answer-header">
-              <div class="sel-box">
-                <el-cascader
-                  size="small"
-                  class="sel sel2"
-                  clearable
-                  placeholder="选择班级"
-                  v-model="query.classId"
-                  :options="gradeList"
-                  :props="props"
-                  collapse-tags
-                  :show-all-levels="false"
-                ></el-cascader>
-                <el-select
-                  class="sel"
-                  v-model="query.type"
-                  placeholder="选择状态"
-                  @change="_QueryData(true)"
-                >
-                  <el-option
-                    v-for="item in typeList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-                <el-input
-                  placeholder="请输入设备编码"
-                  v-model="query.sn"
-                  class="input-with-select"
-                  clearable
-                  @input.native="query.studentName = ''"
-                  @keyup.enter.native="_QueryData(true)"
-                >
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="_QueryData(true)"
-                  ></el-button>
-                </el-input>
-                <el-input
-                  placeholder="学生姓名"
-                  v-model="query.studentName"
-                  class="input-with-select"
-                  clearable
-                  @input.native="query.sn = ''"
-                  @keyup.enter.native="_QueryData(true)"
-                >
-                  <el-button
-                    slot="append"
-                    icon="el-icon-search"
-                    @click="_QueryData(true)"
-                  ></el-button>
-                </el-input>
-                <el-button class="serach-box" round @click="_QueryData(true)"
-                  >筛选</el-button
-                >
-              </div>
-            </div>
-            <p class="loading" v-if="!tableData.length && loading">
-              加载中<i class="el-icon-loading"></i>
-            </p>
-            <el-table v-else :data="tableData" border style="width: 100%">
-              <el-table-column
-                prop="sn"
-                label="设备编码"
-                align="center"
-              ></el-table-column>
-              <el-table-column label="学生信息" align="center"
-                ><template slot-scope="scoped"
-                  ><p
-                    v-for="(item, index) in scoped.row.studentList"
-                    :key="index"
-                  >
-                    {{ item.studentName }}
-                  </p></template
-                ></el-table-column
-              >
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="schoolName"
-                label="学校"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="gradeName"
-                label="年级"
-                align="center"
-                width="120"
-                ><template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.gradeName }}
-                  </p>
-                </template></el-table-column
-              >
-              <el-table-column
-                prop="class"
-                label="关联班级"
-                align="center"
-                width="160"
-              >
-                <template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.className }}
-                  </p>
-                </template></el-table-column
-              >
-              <!-- <el-table-column
-                prop="pairingCode"
-                label="配对码"
-                align="center"
-              ></el-table-column> -->
-              <!-- <el-table-column
-                prop="answerTimes"
-                label="答题次数"
-                align="center"
-              ></el-table-column> -->
-              <el-table-column
-                prop="latestReportTime"
-                label="最后答题时间"
-                align="center"
-                width="160"
-              ></el-table-column>
-              <el-table-column label="操作" align="center" width="80"
-                ><template slot-scope="scoped">
-                  <el-tooltip effect="dark" content="日志" placement="top">
-                    <el-button
-                      type="warning"
-                      circle
-                      size="mini"
-                      icon="fa fa-eye"
-                      @click="linkTo(scoped.row, 2)"
-                    ></el-button>
-                  </el-tooltip> </template
-              ></el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div v-show="type == 3">
-          <div class="table-box">
-            <div class="answer-header">
-              <div class="sel-box">
-                <el-cascader
-                  size="small"
-                  class="sel sel2"
-                  clearable
-                  placeholder="选择班级"
-                  v-model="query.classId"
-                  :options="gradeList"
-                  :props="props"
-                  collapse-tags
-                  :show-all-levels="false"
-                  @change="_QueryData(false)"
-                ></el-cascader>
-                <span class="sel"
-                  >共选择{{ selectionTabIds.length }}个授课端</span
-                >
-                <el-button plan round @click="autoUpDate(false)"
-                  >开启自动更新</el-button
-                >
-                <el-button plan round @click="stopUpdate(false)"
-                  >停止自动更新</el-button
-                >
-              </div>
-              <p class="upgrade-all" v-if="this.role == 'ROLE_XUEXIAO'">
-                <span>全校更新：</span>
-                <el-switch v-model="upgradeFlag" @change="changeUpdateBySchool">
-                </el-switch>
-              </p>
-            </div>
-            <p class="loading" v-if="!tableData.length && loading">
-              加载中<i class="el-icon-loading"></i>
-            </p>
-            <el-table
-              v-else
-              ref="multipleTable"
-              :data="tableData"
-              border
-              style="width: 100%"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="selection" width="55"></el-table-column>
-              <el-table-column
-                prop="sn"
-                label="设备编码"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="class"
-                label="关联班级"
-                align="center"
-                width="100"
-                ><template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.className }}
-                  </p>
-                </template></el-table-column
-              >
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="schoolName"
-                label="学校"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                v-if="role == 'ROLE_JITUAN'"
-                prop="gradeName"
-                label="年级"
-                align="center"
-                width="80"
-                ><template slot-scope="scoped">
-                  <p v-for="(item, index) in scoped.row.classList" :key="index">
-                    {{ item.gradeName }}
-                  </p>
-                </template></el-table-column
-              >
-              <el-table-column
-                prop="lastUpdateTime"
-                label="最近更新"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="osInfo"
-                label="软件系统"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="hardwareInfo"
-                label="硬件环境"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="otaVersionName"
-                label="版本号"
-                align="center"
-                width="80"
-              ></el-table-column>
-              <el-table-column label="状态" align="center" width="80"
-                ><template slot-scope="scope">
-                  {{
-                    scope.row.onlineStatus == 1
-                      ? "在线"
-                      : scope.row.onlineStatus == 2
-                      ? "异常"
-                      : "离线"
-                  }}
-                </template></el-table-column
-              >
-              <el-table-column label="自动更新" align="center" width="100"
-                ><template slot-scope="scoped">
-                  <el-switch
-                    v-model="scoped.row.upgradeFlag"
-                    @change="changeUpdate($event, scoped.row, this)"
-                  >
-                  </el-switch> </template
-              ></el-table-column>
-            </el-table>
-          </div>
-        </div>
-        <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-      </div>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="设备导入" :visible.sync="diaUp" width="400">
-      <up-load :url="url" @upSuccess="upSuccess" fileName="设备信息">
-        <p class="down-txt" slot="down">
-          通过Excel名单导入设备，需要提供设备编码，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :close-on-click-modal="false"
-      :title="isAdd ? '添加基站' : '修改基站'"
-      :visible.sync="diaAnswerEqu"
-      width="400"
-    >
-      <el-form ref="forms" :model="form" :rules="formRules" label-width="140px">
-        <el-form-item label="设备编码：" prop="sn">
-          <el-col :span="16"
-            ><el-input
-              type="text"
-              placeholder="输入设备编码"
-              v-model.trim="form.sn"
-              maxlength="30"
-              size="45"
-              show-word-limit
-              :disabled="!isAdd"
-            >
-            </el-input
-          ></el-col>
-        </el-form-item>
-        <el-form-item label="频点：" prop="frequency">
-          <el-col :span="16"
-            ><el-input
-              type="text"
-              placeholder="输入频点"
-              v-model.trim="form.frequency"
-              maxlength="30"
-              size="45"
-              show-word-limit
-            >
-            </el-input
-          ></el-col>
-        </el-form-item>
-        <el-form-item label="配对码：" prop="pairingCode">
-          <el-col :span="16"
-            ><el-input
-              type="text"
-              placeholder="输入配对码"
-              v-model.trim="form.pairingCode"
-              maxlength="30"
-              size="45"
-              show-word-limit
-            >
-            </el-input
-          ></el-col>
-        </el-form-item>
-        <el-form-item label="选择班级：" prop="classIds">
-          <el-col :span="16">
-            <el-cascader
-              class="sel"
-              clearable
-              v-model="form.classIds"
-              :options="gradeList"
-              :show-all-levels="false"
-            ></el-cascader>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="所在教室：">
-          <el-col :span="16"
-            ><el-input
-              type="text"
-              placeholder="输入所在教室"
-              v-model.trim="form.roomName"
-              maxlength="30"
-              size="45"
-              show-word-limit
-            >
-            </el-input
-          ></el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="setAnswerEqu">确 定</el-button>
-        <el-button @click="diaAnswerEqu = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import pieChart from "@/components/charts/pieChart";
-import scatterChart from "@/components/charts/scatterChart";
-import _ from "lodash";
-import { downloadFile, getBlob, formatGradeNameClass } from "@/utils";
-import api from "@/api/apis/apis";
-export default {
-  components: { pieChart, scatterChart },
-  watch: {
-    type: function (val) {
-      this.page = 1;
-      this.total = 0;
-      this.count = 0;
-      this.query.classId = [];
-      this.query.onlineStatus = "";
-      this.query.sn = "";
-      this.query.studentName = "";
-      this.query.type = "";
-      if (val == 1) {
-        this.stationReport();
-      } else if (val == 2) {
-        this.keyboardReport();
-      }
-      this._QueryData();
-    },
-  },
-  data() {
-    return {
-      code: "",
-      role: "",
-      loading: false,
-      exportLoading: false,
-      isAdd: false, //添加还是修改基站
-      url: "/api_html/school/manager/importStation",
-      diaUp: false,
-      diaAnswerEqu: false,
-      gradeList: [], //年级列表
-      schoolAll: [], //所有学校刘表
-      school: {}, //校园账号所属学校信息
-      props: {
-        multiple: true,
-        checkStrictly: true,
-      },
-      type: 1,
-      query: {
-        classId: [],
-        onlineStatus: "",
-        sn: "",
-        type: "",
-        studentName: "",
-      },
-      statusList: [
-        { label: "全部", value: "" },
-        { label: "离线", value: 0 },
-        { label: "在线", value: 1 },
-        { label: "异常", value: 2 },
-      ],
-      typeList: [
-        { label: "全部", value: 0 },
-        { label: "1日内", value: 1 },
-        { label: "3日内", value: 2 },
-        { label: "7日内", value: 3 },
-        { label: "1月内", value: 4 },
-        { label: "3月内", value: 5 },
-        { label: "3月以上", value: 6 },
-      ],
-      form: {
-        //修改/添加基站信息
-        deviceId: "",
-        sn: "",
-        frequency: "",
-        pairingCode: "",
-        classIds: [],
-        roomName: "",
-      },
-      formRules: {
-        sn: [{ required: true, message: "请输入设备编码", trigger: "blur" }],
-        frequency: [{ required: true, message: "请输入频点", trigger: "blur" }],
-        pairingCode: [
-          { required: true, message: "请输入配对码", trigger: "blur" },
-        ],
-        // classIds: [{ required: true, message: "请选择班级", trigger: "blur" }],
-      },
-      tableData: [],
-      total: 0,
-      count: 0,
-      chartData: [],
-      chartData2: [],
-      selectionTabIds: [], //已选择授课段
-      page: 1,
-      size: 20,
-      isBack: false, //是否是日志页面回来
-      upgradeFlag: false,
-      stationCount: 0, //异常基站数量
-      clickerCount: 0, //异常答题器数量
-    };
-  },
-  created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this._QueryErrorTotal();
-    if (this.role == "ROLE_JITUAN") {
-      (this.props.lazy = true),
-        (this.props.lazyLoad = function (node, resolve) {
-          const { level } = node;
-          if (level == 2) {
-            api
-              .tenantClassList({
-                schoolId: node.data.value,
-              })
-              .then((res) => {
-                let children = formatGradeNameClass(res.data?.list).sort(
-                  (a, b) => {
-                    return a.grade - b.grade;
-                  }
-                );
-                const nodes = [...children];
-                // 通过调用resolve将子节点数据返回，通知组件数据加载完成
-                resolve(nodes);
-              });
-          } else {
-            resolve(node);
-          }
-        });
-    }
-    if (this.role == "ROLE_XUEXIAO") {
-      this._QueryDataSchool();
-    }
-    this._QueryGradeList();
-    if (this.role == "ROLE_JITUAN") {
-      this.showSchool();
-    }
-  },
-  activated() {
-    const that = this;
-    this.isBack = this.$route.query.back ? this.$route.query.back : false;
-    if (!this.isBack) {
-      that.type = 1;
-      that.page = 1;
-      that.total = 0;
-      that.count = 0;
-      that.query.classId = [];
-      that.query.onlineStatus = "";
-      that.query.sn = "";
-      that.query.type = "";
-      if (this.role == "ROLE_XUEXIAO") {
-        this._QueryDataSchool();
-      }
-      this._QueryGradeList();
-      that.stationReport();
-      that._QueryData();
-    }
-  },
-  methods: {
-    upSuccess(res) {
-      //导入成功
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 5000,
-      });
-      this.diaUp = false;
-      this.page = 1;
-      this._QueryData();
-    },
-    edit(obj) {
-      //修改设备
-      this.isAdd = false;
-      for (let key in this.form) {
-        if (key == "classIds") {
-          this.form[key] = obj.classList.length
-            ? [obj.classList[0].gradeName, obj.classList[0].classId]
-            : [];
-        } else {
-          this.form[key] = obj[key];
-        }
-      }
-      delete this.form.schoolId;
-      this.form.deviceId = obj.id;
-      this.diaAnswerEqu = true;
-    },
-    linkTo(obj, type) {
-      this.$router.push({
-        path: "/deviceLog",
-        query: {
-          id: obj.id,
-          type: type,
-        },
-      });
-    },
-    clickPieChart(obj) {
-      this.query.onlineStatus =
-        obj.name == "在线" ? 1 : obj.name == "离线" ? 0 : 2;
-      this.query.sn = "";
-      this.query.classId = [];
-      this.page = 1;
-      this._QueryData(false);
-    },
-    clickScatterChart(obj) {
-      this.query.type =
-        obj.name == "1日内"
-          ? 1
-          : obj.name == "3日内"
-          ? 2
-          : obj.name == "7日内"
-          ? 3
-          : obj.name == "1月内"
-          ? 4
-          : obj.name == "3月内"
-          ? 5
-          : 6;
-      this.query.sn = "";
-      this.query.classId = [];
-      this.page = 1;
-      this._QueryData(false);
-    },
-    handleSelectionChange(val) {
-      console.log(val);
-      this.selectionTabIds = val.map((item) => {
-        return item.id;
-      });
-    },
-    changeUpdateBySchool: _.debounce(function (event) {
-      this._ModifyUpgradeFlagBySchool();
-    }, 800),
-    changeUpdate: _.debounce(function (event, obj) {
-      console.log(this);
-      if (event) {
-        this.autoUpDate(obj.id);
-      } else {
-        this.stopUpdate(obj.id);
-      }
-    }, 800),
-    changePage(page) {
-      this.page = page;
-      this._QueryData(false);
-    },
-    addDev() {
-      this.form.sn = "";
-      this.form.frequency = "";
-      this.form.pairingCode = "";
-      this.form.classIds = [];
-      this.form.roomName = "";
-      this.form.schoolId = this.school.id;
-      delete this.form.deviceId;
-      this.isAdd = true;
-      this.diaAnswerEqu = true;
-    },
-    _ModifyUpgradeFlagBySchool() {
-      let data = this.$request.modifyUpgradeFlagBySchool({
-        upgradeFlag: this.upgradeFlag ? 1 : 0,
-      });
-      if (data && !data.code) {
-        this._QueryData(false);
-        this.selectionTabIds = [];
-        this.$message.success(this.upgradeFlag?"开启自动更新成功":"关闭/停止自动更新成功");
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async showSchool() {
-      const { data, status, info } = await this.$request.schoolList();
-      if (status === 0) {
-        let gradeListAll = data.list?.map((item) => {
-          return {
-            value: item.id,
-            label: item.schoolName,
-          };
-        });
-        this.schoolAll = [
-          {
-            value: 0,
-            label: "全部",
-            children: [...gradeListAll],
-          },
-        ];
-        this.gradeList = [...this.schoolAll, ...this.gradeList];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async autoUpDate(id) {
-      if (!this.selectionTabIds.length && !id) {
-        this.$message.warning("请选择授课端~");
-        return;
-      }
-      if (this.loadingUpDate) return;
-      this.loadingUpDate = true;
-      let data = await this.$request.modifyUpgradeFlag({
-        deviceIds: id ? [id] : this.selectionTabIds,
-        upgradeFlag: 1,
-      });
-      this.loadingUpDate = false;
-      if (data && !data.code) {
-        this._QueryData(false);
-        this.selectionTabIds = [];
-        this.$message.success("开启自动更新成功");
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async stopUpdate(id) {
-      if (!this.selectionTabIds.length && !id) {
-        this.$message.warning("请选择授课端~");
-        return;
-      }
-      if (this.loadingUpDate) return;
-      this.loadingUpDate = true;
-      let data = await this.$request.modifyUpgradeFlag({
-        deviceIds: id ? [id] : this.selectionTabIds,
-        upgradeFlag: 0,
-      });
-      this.loadingUpDate = false;
-      if (data && !data.code) {
-        this.selectionTabIds = [];
-        this._QueryData(false);
-        this.$message.success("关闭自动更新成功");
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async downExcel() {
-      let data = await this.$request.stationTemplate({
-        id: this.id,
-      });
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`基站模版.xlsx`, blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    async downExl() {
-      //报表导出
-      if (this.exportLoading == true) return;
-      let query = this.setQuery();
-      const exportDevice =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.exportDevice
-          : this.$request.tenantExportDevice;
-
-      this.exportLoading = true;
-      const data = await exportDevice({
-        ...query,
-        deviceType: this.type,
-      });
-      this.exportLoading = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        let txt =
-          this.type == 1
-            ? "基站管理报表.xlsx"
-            : this.type == 2
-            ? "答题器报表.xlsx"
-            : "授课端报表.xlsx";
-        downloadFile(txt, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-
-    // 修改基站
-    setAnswerEqu() {
-      this.$refs.forms.validate(async (valid) => {
-        if (valid) {
-          if (this.loadingAnswerEqu) return;
-          this.loadingAnswerEqu = true;
-          let query = { ...this.form };
-
-          query.classIds = query.classIds.length ? [query.classIds[1]] : [];
-          let deviceApi = this.isAdd
-            ? this.$request.addStation
-            : this.$request.updateDevice;
-          const { data, status, info } = await deviceApi({
-            ...query,
-          });
-          this.loadingAnswerEqu = false;
-          console.log(status);
-          if (status === 0) {
-            this.diaAnswerEqu = false;
-            this.$message.success(info);
-            this._QueryData();
-            if (this.isAdd) {
-              this.stationReport();
-            }
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.warning("数据有误，请检查！");
-        }
-      });
-    },
-    async _QueryDataSchool() {
-      const { data, status, info } = await this.$request.schoolDetail();
-      if (status === 0) {
-        this.school = { ...data };
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找班级
-    async _QueryGradeList() {
-      this.loading = true;
-      const gradeList =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.gradeList
-          : this.$request.regionList;
-      const { data, status, info } = await gradeList();
-      if (status === 0) {
-        if (!!data.list) {
-          if (this.role != "ROLE_JITUAN") {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeList = {
-                  value: item.gradeName,
-                  label: item.gradeName,
-                };
-                gradeList.children =
-                  item.classList?.map((items) => {
-                    return {
-                      value: Number(items.id),
-                      label: items.className,
-                    };
-                  }) || [];
-                return gradeList;
-              }) || [];
-          } else {
-            this.gradeList =
-              data.list?.map((item) => {
-                let gradeList = {
-                  value: item.id,
-                  label: item.regionName,
-                };
-                gradeList.children =
-                  item.schoolList?.map((items) => {
-                    return {
-                      value: items.id,
-                      label: items.schoolName,
-                    };
-                  }) || [];
-                return gradeList;
-              }) || [];
-            this.gradeList = [...this.schoolAll, ...this.gradeList];
-          }
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 基站统计数据
-    async stationReport() {
-      const stationReport =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.stationReport
-          : this.$request.tenantStationReport;
-      const { data, status, info } = await stationReport();
-      if (status === 0) {
-        this.chartData =
-          data.list?.map((item) => {
-            return {
-              name:
-                item.onlineStatus == "1"
-                  ? "在线"
-                  : item.onlineStatus == 0
-                  ? "离线"
-                  : "异常",
-              value: item.total,
-              rate: item.rate,
-            };
-          }) || [];
-        this.count = data.total || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 答题器统计数据
-    async keyboardReport() {
-      const keyboardReport =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.keyboardReport
-          : this.$request.tenantKeyboardReport;
-      const { data, status, info } = await keyboardReport();
-      if (status === 0) {
-        this.chartData2 =
-          data.list?.map((item) => {
-            return {
-              name:
-                item.type == 1
-                  ? "1日内"
-                  : item.type == 2
-                  ? "3日内"
-                  : item.type == 3
-                  ? "7日内"
-                  : item.type == 4
-                  ? "1月内"
-                  : item.type == 5
-                  ? "3月内"
-                  : "3月以上",
-              count: item.total,
-              value: item.rate * 100,
-            };
-          }) || [];
-        this.count = data.total || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    setQuery() {
-      //整理传参
-      let query = {};
-      if (this.query.sn) {
-        this.query.classId = [];
-        this.query.onlineStatus = "";
-        this.query.type = "";
-        this.query.studentName = "";
-        query.sn = this.query.sn;
-      } else if (this.query.studentName) {
-        this.query.classId = [];
-        this.query.onlineStatus = "";
-        this.query.type = "";
-        this.query.sn = "";
-        query.studentName = this.query.studentName;
-      } else {
-        if (this.type == 1) {
-          this.query.onlineStatus !== ""
-            ? (query.onlineStatus = this.query.onlineStatus)
-            : "";
-        } else if (this.type == 2) {
-          this.query.type !== "" ? (query.type = this.query.type) : "";
-        }
-        if (this.role == "ROLE_JITUAN") {
-          query.regionIds = [];
-          query.schoolIds = [];
-          query.gradeNames = [];
-          query.classIds = [];
-          this.query.classId?.map((item) => {
-            if (item.length == 1) {
-              if (!query.regionIds.includes(item[0])) {
-                query.regionIds.push(item[0]);
-              }
-            } else if (item.length == 2) {
-              if (!query.schoolIds.includes(item[1])) {
-                query.schoolIds.push(item[1]);
-              }
-              query.regionIds.includes(item[0])
-                ? query.regionIds.remove(item[0])
-                : "";
-            } else if (item.length == 3) {
-              if (!query.schoolIds.includes(item[1])) {
-                query.schoolIds.push(item[1]);
-              }
-              if (!query.gradeNames.includes(item[2])) {
-                query.gradeNames.push(item[2]);
-              }
-              query.regionIds.includes(item[0])
-                ? query.regionIds.remove(item[0])
-                : "";
-            } else if (item.length == 4) {
-              if (!query.classIds.includes(item[3])) {
-                query.classIds.push(item[3]);
-              }
-              query.regionIds.includes(item[0])
-                ? query.regionIds.remove(item[0])
-                : "";
-              query.schoolIds.includes(item[1])
-                ? query.schoolIds.remove(item[1])
-                : "";
-              query.gradeNames.includes(item[2])
-                ? query.gradeNames.remove(item[2])
-                : "";
-            }
-          });
-        } else {
-          query.gradeNames = [];
-          query.classIds = [];
-          this.query.classId?.map((item) => {
-            if (item.length == 1) {
-              if (!query.gradeNames.includes(item[0])) {
-                query.gradeNames.push(item[0]);
-              }
-            } else {
-              if (!query.classIds.includes(item[1])) {
-                query.classIds.push(item[1]);
-              }
-              if (query.gradeNames.includes(item[0])) {
-                query.gradeNames.remove(item[0]);
-              }
-            }
-          });
-        }
-        delete query.classId;
-      }
-      return query;
-    },
-    // 设备列表信息
-    async _QueryData(isRef) {
-      let query = this.setQuery();
-      if (isRef) {
-        this.page = 1;
-      }
-      this.loading = true;
-      const deviceList =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.deviceList
-          : this.$request.tenantDeviceList;
-      this.tableData = [];
-      const { data, status, info } = await deviceList({
-        ...query,
-        deviceType: this.type,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status == 0) {
-        this.tableData =
-          (data?.list &&
-            data?.list.map((item) => {
-              item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
-              return item;
-            })) ||
-          [];
-
-        this.total = data.count;
-        this.$nextTick(function () {
-          this.$refs.main.scrollTop = 0;
-          if (this.query.classId.length) {
-            this.selectionTabIds = this.tableData.map((item) => {
-              this.$refs.multipleTable.toggleRowSelection(item);
-              return item.id;
-            });
-          }
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 异常设备数量
-    async _QueryErrorTotal() {
-      const abnormalDeviceCount =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.abnormalDeviceCount
-          : this.$request.tenantAbnormalDeviceCount;
-      this.tableData = [];
-      const { data, status, info } = await abnormalDeviceCount();
-      if (status == 0) {
-        this.stationCount = data?.stationCount;
-        this.clickerCount = data?.clickerCount;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 0 20px;
-  height: 100%;
-  overflow-y: auto;
-}
-.tab-box {
-  padding: 20px 0 12px;
-}
-.down {
-  padding: 0 0 16px 20px;
-}
-.error-tips {
-  margin-bottom: 12px;
-}
-.content {
-  background: #f8f8f8;
-  border: 1px solid #e2e2e2;
-  border-radius: 10px;
-  overflow: hidden;
-  :deep(.fa-edit) {
-    width: 12px;
-    height: 12px;
-    &::before {
-      margin-left: 2px;
-    }
-  }
-  :deep(.fa-eye) {
-    width: 12px;
-    height: 12px;
-    &::before {
-      margin-left: 1px;
-    }
-  }
-  .chart-box {
-    display: flex;
-    overflow: hidden;
-    height: 240px;
-    border-bottom: 0.5px solid #e2e2e2;
-    .device-num {
-      width: 280px;
-      border-right: 0.5px solid #e2e2e2;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      .p1 {
-        font-size: 28px;
-      }
-    }
-    .chart {
-      flex: 1;
-      height: 100%;
-    }
-  }
-  .table-box {
-    padding: 20px 20px 0;
-    .loading {
-      text-align: center;
-      line-height: 36px;
-      font-size: 16px;
-      color: #666;
-    }
-    .answer-header {
-      padding: 0;
-      margin-bottom: 12px;
-      .upgrade-all {
-        display: flex;
-        align-items: center;
-      }
-    }
-  }
-}
-.answer-header .sel-box .input-with-select {
-  margin-right: 20px;
-  :deep(.el-input__suffix) {
-    right: -5px;
-  }
-  :deep(.el-button) {
-    padding: 12px 16px 12px 10px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/device/log.vue b/src/views/standard/device/log.vue
deleted file mode 100644
index eb6ecea..0000000
--- a/src/views/standard/device/log.vue
+++ /dev/null
@@ -1,327 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>设备日志</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <el-descriptions :column="3" border>
-        <el-descriptions-item label="设备编码">{{
-          device.sn
-        }}</el-descriptions-item>
-        <el-descriptions-item label="配对码">{{
-          device.pairingCode
-        }}</el-descriptions-item>
-        <el-descriptions-item label="关联班级">
-          <span v-for="item in device.classList" :key="item.classId">{{
-            item.className
-          }}</span>
-        </el-descriptions-item>
-        <el-descriptions-item label="操作时间">{{
-          device.modifiedTime
-        }}</el-descriptions-item>
-        <el-descriptions-item v-if="type == 1" label="所在教室">{{
-          device.roomName
-        }}</el-descriptions-item>
-        <el-descriptions-item v-if="type == 1" label="固件版本号">{{
-          device.otaVersionName
-        }}</el-descriptions-item>
-        <!-- <el-descriptions-item v-if="type == 2" label="电量">{{
-          device.electricity
-        }}</el-descriptions-item> -->
-        <el-descriptions-item v-if="type == 2" label="答题次数">{{
-          device.answerTimes
-        }}</el-descriptions-item>
-      </el-descriptions>
-    </div>
-    <div class="answer-header">
-      <div class="sel-box">
-        <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
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
-            >本季度</span
-          >
-        </p>
-        <el-button type="primary" class="serach-box" round @click="_QueryData"
-          >筛选</el-button
-        >
-      </div>
-    </div>
-    <div class="table-box">
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column
-          prop="operationType"
-          label="请求类型"
-          align="center"
-          width="160"
-          ><template slot-scope="scoped">{{
-            setOperationType(scoped.row.operationType)
-          }}</template></el-table-column
-        >
-        <!-- <el-table-column
-          v-if="type == 2"
-          prop="electricity"
-          width="100"
-          label="电量"
-          align="center"
-        ></el-table-column> -->
-        <el-table-column
-          prop="operationTime"
-          label="时间"
-          align="center"
-          width="200"
-        ></el-table-column>
-        <el-table-column prop="content" label="日志内容" align="center"
-          ><template slot-scope="scoped">
-            <p style="text-align: left">{{ scoped.row.content }}</p></template
-          ></el-table-column
-        >
-      </el-table>
-    </div>
-    <div class="pagination-box">
-      <el-pagination
-        small=""
-        layout="total,prev, pager, next"
-        :hide-on-single-page="true"
-        :total="total"
-        @current-change="changePage"
-        :current-page="page"
-        :page-size="size"
-      >
-      </el-pagination>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDate } from "utils";
-export default {
-  data() {
-    return {
-      type: 1,
-      id: "",
-      date: "", //今天-昨天-本周
-      query: {
-        //搜索条件
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      tableData: [],
-      device: {
-        sn: "",
-        electricity: "",
-        pairingCode: "",
-        classList: [],
-        modifiedTime: "",
-        answerTimes: "",
-        roomName: "",
-        otaVersionName: "",
-      },
-      total: 0,
-      page: 1,
-      size: 20,
-    };
-  },
-  created() {
-    this.id = this.$route.query.id;
-    this.type = this.$route.query.type;
-    this._QueryDetail();
-    this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  methods: {
-    setOperationType(type) {
-      let txt;
-      switch (type) {
-        case 0:
-          txt = "连接异常";
-          break;
-        case 1:
-          txt = "问";
-          break;
-        case 2:
-          txt = "测";
-          break;
-        case 3:
-          txt = "考";
-          break;
-        case 4:
-          txt = "抢答";
-          break;
-        case 5:
-          txt = "抽答";
-          break;
-        case 6:
-          txt = "再答";
-          break;
-        case 7:
-          txt = "签到";
-          break;
-      }
-      return txt;
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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 day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    async _QueryDetail() {
-      const { data, status, info } = await this.$request.deviceDetail({
-        deviceId: this.id,
-      });
-      if (status === 0) {
-        this.device = { ...data };
-        for (let key in this.device) {
-          this.device[key] = data[key];
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      this.loading = true;
-      //多课时对比
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "day" || key == "startDay" || key == "endDay") {
-            query[key] = this.query[key].split("-").join("");
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      const {
-        data = {},
-        status,
-        info,
-      } = await this.$request.deviceLogList({
-        ...query,
-        deviceId: Number(this.id),
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px;
-}
-.table-box {
-  padding: 0 20px;
-}
-.serach-box {
-  margin-left: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/down/client.vue b/src/views/standard/down/client.vue
deleted file mode 100644
index 4077096..0000000
--- a/src/views/standard/down/client.vue
+++ /dev/null
@@ -1,715 +0,0 @@
-<template>
-  <div class="page-container">
-    <back-box>
-      <template slot="title">
-        <span>授课端下载</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="content-top">
-        <div class="cont-info">
-          <img v-if="info.appImage" class="logo" :src="info.appImage" alt="" />
-          <div>
-            <p class="name">
-              {{ `${info.appName || ""} ${info.versionName || ""}` }}
-            </p>
-            <p class="txt">文件大小：{{ `${info.fileSize}` }}M</p>
-            <p class="txt">最近更新：{{ info.modifiedTime }}</p>
-          </div>
-        </div>
-        <div class="down-box">
-          <p class="txt">默认参数配置</p>
-          <el-button
-            class="down-btn"
-            type="primary"
-            @click="getAppDownloadUrl(false)"
-            >立即下载</el-button
-          >
-        </div>
-      </div>
-      <!-- <ul class="down-ul">
-        <li class="down-li" v-for="item in tableData" :key="item.id">
-          <span class="p1 ellipsis" @click="setConfigForm(item)">{{
-            item.configName
-          }}</span>
-          <el-button plan round @click="getAppDownloadUrl(item.id)"
-            >下载</el-button
-          >
-        </li>
-        <li class="down-li">
-          <span>自定义软件功能</span>
-          <el-button
-            plan
-            round
-            icon="el-icon-plus"
-            @click="setDefaultForm(), (dialogVis = true), (type = 1)"
-            >参数设置</el-button
-          >
-        </li>
-      </ul> -->
-    </div>
-    <div class="edit-dia" ref="editDia" v-show="dialogVis" height="100%">
-      <div class="back">
-        <div class="back-l" @click="dialogVis = false">
-          <i class="fa fa-mail-reply-all"></i>
-          <p>
-            {{
-              `${type == 1 ? "参数设置" : formData.configName}`
-            }}
-          </p>
-        </div>
-      </div>
-      <div class="form-box">
-        <el-form
-          ref="forms"
-          :model="formData"
-          :rules="ruleForm"
-          label-width="180px"
-        >
-          <el-form-item label="配置名称：" prop="configName" v-if="type == 1">
-            <el-col :span="12">
-              <el-input
-                v-model.trim="formData.configName"
-                placeholder="请填写配置名称"
-              ></el-input>
-            </el-col>
-          </el-form-item>
-          <el-form-item label="主菜单设置：" prop="mainMenu">
-            <el-checkbox-group v-model="formData.mainMenu" :max="4">
-              <el-checkbox v-for="item in menuList" :label="item" :key="item">{{
-                item
-              }}</el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="弹出菜单组：" prop="popupMenu">
-            <el-radio-group v-model="formData.popupMenu">
-              <p class="popup-menu">
-                <el-radio :label="1"
-                  ><span>1：签到点名</span> <span> 2：导入导出</span>
-                  <span>3：班级管理</span> <span>4：系统设置</span></el-radio
-                >
-              </p>
-              <p class="popup-menu popup-menu1">
-                <el-radio :label="2">
-                  <span>1：签到点名</span> <span> 2：导入导出</span>
-                  <span>3：考试任务</span> <span>4：系统设置</span></el-radio
-                >
-              </p>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="成绩等级设置：">
-            <el-col :span="12">
-              <div class="silde-box">
-                <p class="silde-p">
-                  <span class="num" :style="{ left: formData.failedSet + '%' }"
-                    >{{ formData.failedSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.failedSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.failedSet + '%' }"
-                    >不及格</span
-                  >
-                </p>
-                <p class="silde-p">
-                  <span class="num" :style="{ left: formData.passSet + '%' }"
-                    >{{ formData.passSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.passSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.passSet + '%' }"
-                    >及格</span
-                  >
-                </p>
-                <p class="silde-p">
-                  <span class="num" :style="{ left: formData.goodSet + '%' }"
-                    >{{ formData.goodSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.goodSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.goodSet + '%' }"
-                    >良好</span
-                  >
-                </p>
-                <p class="silde-p">
-                  <span
-                    class="num"
-                    :style="{ left: formData.excellenSet + '%' }"
-                    >{{ formData.excellenSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.excellenSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span
-                    class="txt"
-                    :style="{ left: formData.excellenSet + '%' }"
-                    >优秀</span
-                  >
-                </p>
-              </div>
-            </el-col>
-          </el-form-item>
-          <el-form-item label="抢答设置：" prop="viesAnswerSet">
-            <el-radio-group v-model="formData.viesAnswerSet">
-              <el-radio :label="0">倒计时抢答</el-radio>
-              <el-radio :label="1">即时抢答</el-radio>
-              <el-radio :label="2">老师选择</el-radio>
-            </el-radio-group>
-            <el-input-number
-              v-show="formData.viesAnswerSet === 0"
-              size="small"
-              class="count-down"
-              v-model="formData.countdown"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
-            <span v-show="formData.viesAnswerSet == 0">秒</span>
-          </el-form-item>
-          <el-form-item label="抽答设置：" prop="ballotAnswerSet">
-            <el-radio-group v-model="formData.ballotAnswerSet">
-              <el-radio :label="0">点名抽答</el-radio>
-              <el-radio :label="1">随机抽答</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="单选题选项默认个数：" prop="singleChoiceNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.singleChoiceNum"
-              :min="2"
-              :max="7"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
-          </el-form-item>
-          <el-form-item label="多选题选项默认个数：" prop="multipleChoiceNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.multipleChoiceNum"
-              :min="2"
-              :max="7"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
-          </el-form-item>
-          <el-form-item label="测—单题型默认题数：" prop="singleTypeNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.singleTypeNum"
-              :min="2"
-              :max="25"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
-          </el-form-item>
-          <el-form-item label="问—倒计时：" prop="askCountdown">
-            <el-switch v-model="askCount" @change="askCountChange"> </el-switch>
-            <el-input-number
-              v-show="askCount"
-              size="small"
-              class="count-down"
-              v-model="formData.askCountdown"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
-            {{ askCount ? "秒" : "" }}
-          </el-form-item>
-          <el-form-item label="测—倒计时：" prop="viesAnswerSet">
-            <el-switch v-model="examsDuration" @change="examsDurationChange">
-            </el-switch>
-            <el-input-number
-              v-show="examsDuration"
-              size="small"
-              class="count-down"
-              v-model="formData.examsDuration"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
-            {{ examsDuration ? "分" : "" }}
-          </el-form-item>
-          <el-form-item label="答题结构展示：" prop="displayModel">
-            <el-radio-group v-model="formData.displayModel">
-              <el-radio :label="0">极简模式</el-radio>
-              <el-radio :label="1">全屏模式</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="语言设置：" prop="languageSet">
-            <el-radio-group v-model="formData.languageSet">
-              <el-radio :label="0">中文</el-radio>
-              <el-radio :label="1">英文</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="其他设置：">
-            <el-checkbox-group v-model="formData.otherSet">
-              <p>
-                <el-checkbox :label="0">答题结束自动显示答题统计</el-checkbox>
-              </p>
-              <p><el-checkbox :label="1">答题结束自动保存截屏</el-checkbox></p>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label=" ">
-            <el-button type="primary" round @click="saveForm">保存</el-button>
-            <el-button round @click="setDefaultForm">恢复默认设置</el-button>
-            <el-button round @click="dialogVis = false">取消</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-const defaultForm = {
-  configName: "",
-  mainMenu: ["问"],
-  popupMenu: 1,
-  failedSet: 60,
-  passSet: 80,
-  goodSet: 90,
-  excellenSet: 98,
-  viesAnswerSet: 0,
-  countdown: 5,
-  ballotAnswerSet: 0,
-  singleChoiceNum: 4,
-  multipleChoiceNum: 4,
-  singleTypeNum: 25,
-  askCountdown: 30,
-  examsDuration: 90,
-  displayModel: 0,
-  languageSet: 0,
-  otherSet: [],
-};
-export default {
-  watch: {
-    "formData.askCountdown": function (val) {
-      if (val == 0) {
-        this.askCount = false;
-      }
-    },
-    "formData.examsDuration": function (val) {
-      if (val == 0) {
-        this.examsDuration = false;
-      }
-    },
-  },
-  data() {
-    return {
-      page: 1,
-      size: 20,
-      type: 1, //1-添加；2-修改
-      info: {
-        appName: "",
-        appImage: "",
-        versionName: "",
-        fileSize: "",
-        modifiedTime: "",
-      },
-      tableData: [],
-      dialogVis: false,
-      askCount: true,
-      examsDuration: true,
-      configId: "",
-      formData: {
-        configName: "",
-        mainMenu: ["问"],
-        popupMenu: 1,
-        failedSet: 60,
-        passSet: 80,
-        goodSet: 90,
-        excellenSet: 98,
-        viesAnswerSet: 0,
-        countdown: 5,
-        ballotAnswerSet: 0,
-        singleChoiceNum: 4,
-        multipleChoiceNum: 4,
-        singleTypeNum: 25,
-        askCountdown: 30,
-        examsDuration: 90,
-        displayModel: 0,
-        languageSet: 0,
-        otherSet: [],
-      },
-      ruleForm: {
-        configName: [
-          { required: true, message: "请填写配置名称", trigger: "blur" },
-        ],
-        // mainMenu: [
-        //   { required: true, message: "请选择主菜单", trigger: "blur" },
-        // ],
-        // popupMenu: [
-        //   { required: true, message: "请选择弹出菜单", trigger: "blur" },
-        // ],
-        // viesAnswerSet: [
-        //   { required: true, message: "请选择抢答类型", trigger: "blur" },
-        // ],
-        // countdown: [
-        //   { required: true, message: "请输入抢答倒计时", trigger: "blur" },
-        // ],
-        // ballotAnswerSet: [
-        //   { required: true, message: "请选择抽答类型", trigger: "blur" },
-        // ],
-        // singleChoiceNum: [
-        //   {
-        //     required: true,
-        //     message: "请输入单选题选项默认个数",
-        //     trigger: "blur",
-        //   },
-        // ],
-        // multipleChoiceNum: [
-        //   {
-        //     required: true,
-        //     message: "请输入多选题选项默认个数",
-        //     trigger: "blur",
-        //   },
-        // ],
-        // singleTypeNum: [
-        //   {
-        //     required: true,
-        //     message: "请输入测—单题型默认题数",
-        //     trigger: "blur",
-        //   },
-        // ],
-        // displayModel: [
-        //   {
-        //     required: true,
-        //     message: "请选择答题结构",
-        //     trigger: "blur",
-        //   },
-        // ],
-        // languageSet: [
-        //   {
-        //     required: true,
-        //     message: "请选择语言",
-        //     trigger: "blur",
-        //   },
-        // ],
-      },
-      menuList: ["问", "测", "析"],
-    };
-  },
-  created() {
-    this.latestVersion();
-    // this.appConfigList();
-  },
-  methods: {
-    setConfigForm(obj) {
-      let content = JSON.parse(obj.content);
-      console.log(content);
-      this.formData.configName = obj.configName;
-      for (let key in this.formData) {
-        content[key] ? (this.formData[key] = content[key]) : "";
-      }
-      this.formData.examsDuration = (this.formData.examsDuration / 60).toFixed(
-        0
-      );
-      this.type = 2;
-      (this.configId = obj.id), (this.dialogVis = true);
-      this.$nextTick(function () {
-        this.$refs.editDia.scrollTop = 0;
-      });
-    },
-    setDefaultForm() {
-      for (let key in this.formData) {
-        this.formData[key] = defaultForm[key];
-      }
-    },
-    askCountChange(val) {
-      if (val) {
-        this.formData.askCountdown = 30;
-      } else {
-        this.formData.askCountdown = 0;
-      }
-    },
-    examsDurationChange(val) {
-      if (val) {
-        this.formData.examsDuration = 90;
-      } else {
-        this.formData.examsDuration = 0;
-      }
-    },
-    async saveForm() {
-      let content = {};
-      for (let key in this.formData) {
-        if (key != "configName") {
-          content[key] = this.formData[key];
-        }
-      }
-      content.examsDuration = content.examsDuration * 60;
-      this.$refs.forms.validate((valid) => {
-        if (valid) {
-          if (this.type == 1) {
-            this.addAppConfig({
-              configName: this.formData.configName,
-              content: { ...content },
-            });
-          } else {
-            this.updateAppConfig({
-              configId: this.configId,
-              content: { ...content },
-            });
-          }
-        } else {
-          this.$message.warning("配置名称输入有误请检查！");
-          return false;
-        }
-      });
-    },
-
-    async addAppConfig(params) {
-      const { data, status, info } = await this.$request.addAppConfig({
-        ...params,
-      });
-      if (status == 0) {
-        this.$message.success("配置成功");
-        this.dialogVis = false;
-        this.appConfigList();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async updateAppConfig(params) {
-      const { data, status, info } = await this.$request.updateAppConfig({
-        ...params,
-      });
-      if (status == 0) {
-        this.$message.success("配置成功");
-        this.dialogVis = false;
-        this.appConfigList();
-      } else {
-        this.$message.error(info);
-      }
-    },
-
-    async latestVersion() {
-      const { data, status, info } = await this.$request.latestVersion();
-      if (status == 0) {
-        this.info = { ...data };
-        this.info.fileSize =
-          (this.info.fileSize &&
-            (this.info.fileSize / 1024 / 1024).toFixed(2)) ||
-          "--";
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async appConfigList() {
-      const { data, status, info } = await this.$request.appConfigList({
-        page: this.page,
-        size: this.size,
-      });
-      if (status == 0) {
-        this.tableData = [...data.list] || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async getAppDownloadUrl(configId) {
-      const { data, status, info } = await this.$request.getAppDownloadUrl({
-        configId: configId || "",
-      });
-      if (status == 0) {
-        // this.tableData = [...data.list] || [];
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-container {
-  width: 100%;
-  position: relative;
-}
-.page-content {
-  padding: 30px;
-  .content-top {
-    padding: 20px 50px 20px 20px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .cont-info {
-      flex: 1;
-      display: flex;
-      align-items: center;
-      .logo {
-        width: 140px;
-        margin-right: 16px;
-      }
-      .name {
-        font-size: 20px;
-        color: #333;
-        line-height: 24px;
-        padding-bottom: 12px;
-      }
-      .txt {
-        font-size: 15px;
-        color: #7f7f7f;
-        line-height: 25px;
-      }
-    }
-    .down-box {
-      width: 200px;
-      text-align: center;
-      .txt {
-        font-size: 16px;
-        padding-bottom: 8px;
-      }
-      .down-btn {
-        font-size: 20px;
-      }
-    }
-  }
-  .down-ul {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 0 20px;
-    .down-li {
-      width: calc(50% - 12px);
-      height: 72px;
-      padding: 0 16px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 0 24px 30px 0;
-      border-radius: 10px;
-      background: #f8f8f8;
-      box-shadow: 2px 2px 5px #ccc;
-      &:nth-child(2n) {
-        margin-right: 0;
-      }
-      font-size: 16px;
-      color: #667ffd;
-      .p1 {
-        cursor: pointer;
-      }
-    }
-  }
-}
-:deep(.el-button.is-round) {
-  width: 120px;
-  text-align: center;
-  padding: 10px 0;
-}
-.edit-dia {
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  width: 100%;
-  height: calc(100vh - 80px);
-  background: #fff;
-  overflow-y: auto;
-  .back {
-    width: 100%;
-    height: 56px;
-    border-bottom: 1px solid #e2e2e2;
-    display: flex;
-    align-items: center;
-    padding: 0 20px;
-    box-sizing: border-box;
-    .back-l {
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      flex-shrink: 0;
-      font-size: 18px;
-      font-weight: 500;
-    }
-    .fa-mail-reply-all {
-      font-size: 28px;
-      color: #b3b3b3;
-      margin-right: 12px;
-    }
-  }
-  .form-box {
-    padding: 20px;
-    .popup-menu {
-      padding-bottom: 16px;
-      span {
-        padding-right: 12px;
-      }
-    }
-    .popup-menu1 {
-      padding-bottom: 0;
-    }
-    .count-down {
-      width: 48px;
-      margin: 0 8px 0 20px;
-      :deep(.el-input__inner) {
-        width: 48px;
-        height: 32px;
-        line-height: 32px;
-        border-radius: 20px;
-        border-color: #667ffd;
-        padding: 0;
-      }
-      :deep(.el-input-number__decrease) {
-        display: none;
-      }
-      :deep(.el-input-number__increase) {
-        display: none;
-      }
-    }
-    .count-down2 {
-      margin-left: 0;
-    }
-    .silde-box {
-      position: relative;
-      width: 100%;
-      height: 60px;
-      .silde-p {
-        width: 100%;
-        position: absolute;
-        padding-top: 20px;
-        & > span {
-          position: absolute;
-          width: 48px;
-          text-align: center;
-          line-height: 18px;
-          flex-shrink: 0;
-          font-size: 12px;
-        }
-        :deep(.el-slider) {
-          flex: 1;
-        }
-        :deep(.el-slider__runway) {
-          margin: 5px 0;
-        }
-        :deep(.el-slider__runway) {
-          background-color: #409eff;
-        }
-        .num {
-          top: 0;
-          transform: translateX(-24px);
-        }
-        .txt {
-          bottom: -20px;
-          transform: translateX(-24px);
-        }
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/down/index.vue b/src/views/standard/down/index.vue
deleted file mode 100644
index 3b64cef..0000000
--- a/src/views/standard/down/index.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div class="content-box">
-    <back-box>
-      <template slot="title">
-        <span>软件下载</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="down-item">
-        <p class="txt">
-          K12公私立学校、高等院校、教育培训机构的课堂互动教学、即时课堂测验。
-        </p>
-        <el-button plan round @click="links">授课端下载</el-button>
-      </div>
-      <div class="down-item" v-loading="loading" v-if="role == 'ROLE_XUEXIAO'">
-        <p class="txt">
-          配合发卡器硬件，方便学校管理员进行发卡补卡操作的软件。
-        </p>
-        <el-button plan round @click="downCard">发卡软件下载</el-button>
-      </div>
-      <div class="down-item" v-loading="loading">
-        <p class="txt">
-          电脑缺少.NET Framework环境时，请下载安装.NET Framework
-          4.5.2，以便于授课端可正常使用。
-        </p>
-        <el-button plan round @click="downNet">.Net环境下载</el-button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      role: "",
-      loading: false,
-      loadingNet: false,
-    };
-  },
-  created() {
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-  },
-  methods: {
-    links() {
-      this.$router.push({
-        path: "/downClient",
-      });
-    },
-    async downCard() {
-      if (this.loading == true) return;
-      this.loading = true;
-      const { data, status, info } = await this.$request.latestClickersApp();
-      this.loading = false;
-      if (status == 0) {
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        a.download = data.appName;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downNet() {
-      if (this.loadingNet == true) return;
-      this.loadingNet = true;
-      const { data, status, info } = await this.$request.runtimeEnvFileUrl();
-      this.loadingNet = false;
-      if (status == 0) {
-        const a = document.createElement("a");
-        a.href = data;
-        // a.download = data.appName;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.content-box {
-  width: 100%;
-}
-.page-content {
-  display: flex;
-  padding-top: 50px;
-  margin-left: 160px;
-  .down-item {
-    width: 200px;
-    padding: 50px 20px;
-    border-radius: 20px;
-    margin: 20px;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    background: #f8f8f8;
-    box-shadow: 2px 2px 5px #ccc;
-    .txt {
-      font-size: 16px;
-      color: #7f7f7f;
-      line-height: 24px;
-      height: 120px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/examinationPaper/add.vue b/src/views/standard/examinationPaper/add.vue
deleted file mode 100644
index 6f3e240..0000000
--- a/src/views/standard/examinationPaper/add.vue
+++ /dev/null
@@ -1,2005 +0,0 @@
-<template>
-  <div ref="content" class="content-box">
-    <back-box>
-      <template slot="title">
-        <span>{{ "创建答题卡" }}</span>
-      </template>
-    </back-box>
-    <div class="content">
-      <el-steps
-        :active="step"
-        finish-status="success"
-        simple
-        style="margin: 20px 0"
-      >
-        <el-step title="基础信息" icon="el-icon-edit"></el-step>
-        <el-step title="题目编辑" icon="el-icon-tickets"></el-step>
-        <el-step title="设置答案" icon="el-icon-edit-outline"></el-step>
-      </el-steps>
-      <div v-show="step == 0">
-        <el-form
-          ref="forms"
-          :model="form"
-          :rules="formRules"
-          label-width="140px"
-        >
-          <el-form-item label="答题卡名称：" prop="title">
-            <el-input
-              class="sel2"
-              type="text"
-              placeholder="请输入答题卡名称"
-              v-model.trim="form.title"
-              maxlength="30"
-              size="45"
-              show-word-limit
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="测验类型：">
-            <el-select v-model="form.tagId" placeholder="选择测验类型">
-              <el-option label="--" value=""> </el-option>
-              <el-option
-                v-for="item in answerTypeList"
-                :key="item.id"
-                :label="item.typeName"
-                :value="item.id"
-                >{{ item.typeName }}</el-option
-              >
-            </el-select>
-            <el-button
-              class="ml-20"
-              type="primary"
-              round
-              circle
-              icon="el-icon-edit"
-              @click="openTagDia"
-            ></el-button>
-          </el-form-item>
-          <el-form-item label="年级：" prop="gradeName">
-            <el-select
-              class="sel"
-              v-model="form.gradeName"
-              placeholder=""
-              @change="changeGrade"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item"
-                :label="item"
-                :value="item"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <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"
-                :label="item.label"
-                :value="item.value"
-                >{{ item.label }}
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="考试时长：">
-            <el-input-number
-              size="medium"
-              :min="1"
-              :max="140"
-              :step-strictly="true"
-              :step="1"
-              v-model="form.examsDuration"
-              label="考试时长"
-            ></el-input-number>
-          </el-form-item>
-          <el-form-item label="分享范围：" prop="sharingType">
-            <el-radio-group v-model="form.sharingType">
-              <el-radio :label="0">任课班级分享</el-radio>
-              <el-radio :label="1">全年级分享</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-form>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack"
-            >取消</el-button
-          >
-          <el-button type="primary" round @click="setStep1">下一步</el-button>
-        </div>
-        <el-dialog :close-on-click-modal="false"
-          title="设置测验类型"
-          :visible.sync="dialogVisible"
-          width="500px"
-        >
-          <div class="dia-content">
-            <p class="add-type" v-for="item in tagList" :key="item.id">
-              <el-row :gutter="10">
-                <el-col :span="18"
-                  ><el-input
-                    v-model="item.typeName"
-                    :maxlength="10"
-                    placeholder="请输入答题卡类型名称"
-                  ></el-input
-                ></el-col>
-                <el-col :span="6">
-                  <el-tooltip effect="dark" content="保存" placement="top">
-                    <el-button
-                      class="js-set"
-                      type="primary"
-                      size="small"
-                      round
-                      circle
-                      icon="el-icon-check"
-                      @click="editTypeName(item)"
-                    ></el-button>
-                  </el-tooltip>
-                  <el-tooltip effect="dark" content="删除" placement="right">
-                    <el-popconfirm
-                      title="确定删除这道大题吗？"
-                      @confirm="removeTypeName(item)"
-                    >
-                      <el-button
-                        class="js-set"
-                        type="danger"
-                        size="small"
-                        round
-                        circle
-                        icon="el-icon-delete"
-                        slot="reference"
-                      ></el-button>
-                    </el-popconfirm>
-                  </el-tooltip>
-                </el-col>
-              </el-row>
-            </p>
-            <p class="add-type">
-              <el-row :gutter="10">
-                <el-col :span="18">
-                  <el-input
-                    type="text"
-                    placeholder="请输入答题卡类型名称"
-                    v-model.trim="answerTypeName"
-                    :maxlength="10"
-                  >
-                  </el-input>
-                </el-col>
-                <el-col :span="6">
-                  <el-tooltip effect="dark" content="添加" placement="right">
-                    <el-button
-                      class="js-set"
-                      type="primary"
-                      size="small"
-                      round
-                      circle
-                      icon="el-icon-plus"
-                      @click="addPaperType"
-                    ></el-button>
-                  </el-tooltip>
-                </el-col>
-              </el-row>
-            </p>
-          </div>
-          <div class="" slot="footer">
-            <el-button @click="dialogVisible = false">关 闭</el-button>
-          </div>
-        </el-dialog>
-      </div>
-      <div v-show="step == 1">
-        <div
-          class="question-box"
-          v-for="(question, index) in form.questionList"
-          :key="index"
-        >
-          <p class="question-title">
-            <el-tooltip
-              effect="dark"
-              :content="question.show ? '收起' : '展开'"
-              placement="left"
-            >
-              <i
-                class="el-icon-caret-right"
-                :class="question.show ? 'active' : ''"
-                @click="question.show = !question.show"
-              ></i>
-            </el-tooltip>
-            <span>{{ setBigNum(index) }}、</span>
-            <el-input
-              class="ipt"
-              v-model.trim="question.questionTitle"
-              maxlength="30"
-              placeholder="填写大题名称"
-            ></el-input>
-            <el-popconfirm
-              title="确定删除这道大题吗？"
-              @confirm="form.questionList.splice(index, 1)"
-            >
-              <el-button
-                slot="reference"
-                class="delete"
-                type="danger"
-                size="mini"
-                circle
-                icon="el-icon-delete"
-              ></el-button>
-            </el-popconfirm>
-            <template v-if="equalScore(question)">
-              <span class="m20"
-                >每题{{
-                  question.subQuestions && question.subQuestions[0].score
-                }}分</span
-              >
-            </template>
-            <span class="m20">共：{{ question.subQuestions.length }}题</span>
-            <span class="m20">共：{{ setScore(question) }}分</span>
-          </p>
-          <transition name="el-zoom-in-top">
-            <ul v-show="question.show" 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-options">选项设置</div>
-                <div class="qs-set">操作</div>
-              </li>
-              <li
-                class="sub-questions"
-                v-for="(subQuestions, indexs) in question.subQuestions"
-                :key="indexs"
-              >
-                <div class="qs-num">{{ setNum(index, indexs) }}</div>
-                <div class="qs-type">
-                  <el-select
-                    v-model="subQuestions.questionType"
-                    placeholder="选择题目类型"
-                    @change="changeSubQuestions($event, subQuestions)"
-                  >
-                    <el-option label="单选题" :value="2"></el-option>
-                    <el-option label="多选题" :value="3"></el-option>
-                    <el-option label="判断题" :value="4"></el-option>
-                    <el-option label="主观题" :value="5"></el-option>
-                  </el-select>
-                </div>
-                <div class="qs-score">
-                  <el-input-number
-                    class="number-ipt"
-                    size="medium"
-                    :min="1"
-                    :max="200"
-                    :precision="2"
-                    :step="1"
-                    v-model="subQuestions.score"
-                    label="单题分值"
-                  ></el-input-number>
-                </div>
-                <div class="qs-partScore">
-                  <p v-if="subQuestions.questionType != 3">--</p>
-                  <el-input-number
-                    class="number-ipt"
-                    v-else
-                    size="medium"
-                    :min="0"
-                    :precision="2"
-                    :max="subQuestions.score"
-                    :step="0.5"
-                    v-model="subQuestions.partScore"
-                    label="漏选得分"
-                  ></el-input-number>
-                </div>
-                <div class="qs-options">
-                  <p v-if="subQuestions.questionType == 5">--</p>
-                  <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.split(',')"
-                      :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.split(',')"
-                      :class="
-                        subQuestions.correctAnswer == option ? 'active' : ''
-                      "
-                      :key="option"
-                      @click="subQuestions.correctAnswer = option"
-                      >{{ option }}</span
-                    >
-                  </p>
-                  <p
-                    v-if="
-                      subQuestions.questionType == 3 ||
-                      subQuestions.questionType == 2
-                    "
-                    class="answer-box"
-                  >
-                    <el-button
-                      size="mini"
-                      type="primary"
-                      icon="el-icon-plus"
-                      circle
-                      @click="addOptions(subQuestions)"
-                    ></el-button>
-                    <el-button
-                      size="mini"
-                      type="primary"
-                      icon="el-icon-minus"
-                      round
-                      circle
-                      @click="removeOptions(subQuestions)"
-                    ></el-button>
-                  </p>
-                </div>
-                <div class="qs-set">
-                  <el-popconfirm
-                    title="确定删除这道题吗？"
-                    @confirm="delTabData(indexs, index)"
-                  >
-                    <el-button
-                      slot="reference"
-                      class="delete"
-                      type="danger"
-                      size="mini"
-                      circle
-                      icon="el-icon-delete"
-                    ></el-button>
-                  </el-popconfirm>
-                </div>
-              </li>
-              <li class="sub-questions">
-                <div class="qs-num">添加</div>
-                <div class="qs-type">
-                  <el-select
-                    v-model="addSubQuestionsType"
-                    placeholder="选择题目类型"
-                    @change="changeAddSubQuestions($event, question)"
-                  >
-                    <el-option label="单选题" :value="2"></el-option>
-                    <el-option label="多选题" :value="3"></el-option>
-                    <el-option label="判断题" :value="4"></el-option>
-                    <el-option label="主观题" :value="5"></el-option>
-                  </el-select>
-                </div>
-                <div class="qs-score"></div>
-                <div class="qs-partScore"></div>
-                <div class="qs-options"></div>
-                <div class="qs-set"></div>
-              </li>
-            </ul>
-          </transition>
-        </div>
-        <div class="add-box">
-          <p class="add-question" @click="openQuestion">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-plus"
-              circle
-            ></el-button>
-            <span class="s1">添加大题</span>
-          </p>
-        </div>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack"
-            >取消</el-button
-          >
-          <el-button round @click="step = 0">上一步</el-button>
-          <el-button
-            :type="form.questionList.length == 0 ? 'info' : 'primary'"
-            round
-            @click="setStep2"
-            >下一步</el-button
-          >
-        </div>
-        <el-dialog :close-on-click-modal="false"
-          title="添加大题"
-          :visible.sync="addQuestionVisible"
-          width="600px"
-        >
-          <div class="dia-content">
-            <el-form
-              ref="form"
-              :model="questionForm"
-              :rules="questionFormRules"
-              label-width="100px"
-            >
-              <el-form-item label="标题：">
-                <el-col :span="20">
-                  <el-input
-                    v-model.trim="questionForm.questionTitle"
-                    maxlength="30"
-                    placeholder="输入大题名称"
-                  ></el-input>
-                </el-col>
-              </el-form-item>
-              <el-form-item label="选择题型：">
-                <el-select
-                  v-model="questionForm.questionType"
-                  placeholder=""
-                  @change="setQuestionForm"
-                >
-                  <el-option
-                    v-for="item in questionOptions"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                  <el-option label="混合题" :value="6"> </el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item label="题数：">
-                <el-input-number
-                  v-model="questionForm.number"
-                  @change="changeQesNum"
-                  :min="1"
-                  :max="100"
-                  :step-strictly="true"
-                  :step="1"
-                  label="label"
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item
-                label="选项个数："
-                v-show="
-                  questionForm.questionType != 4 &&
-                  questionForm.questionType != 5
-                "
-              >
-                <el-input-number
-                  v-model="questionForm.selectNum"
-                  :min="3"
-                  :max="7"
-                  :step-strictly="true"
-                  :step="1"
-                  label="label"
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item label="单题分数：">
-                <el-input-number
-                  v-model="questionForm.score"
-                  :min="1"
-                  :max="200"
-                  :precision="2"
-                  :step="1"
-                  label="label"
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item
-                label="漏选得分："
-                v-if="questionForm.questionType == 3"
-              >
-                <el-input-number
-                  v-model="questionForm.partScore"
-                  :min="0"
-                  :max="questionForm.score"
-                  :precision="2"
-                  :step="0.5"
-                  label="label"
-                ></el-input-number>
-              </el-form-item>
-              <el-form-item
-                label="设置答案："
-                v-show="
-                  questionForm.questionType != 5 &&
-                  questionForm.questionType != 6
-                "
-              >
-                <div class="qs-options">
-                  <p class="ipt">
-                    <el-input
-                      v-if="
-                        questionForm.questionType == 2 ||
-                        questionForm.questionType == 3 ||
-                        questionForm.questionType == 6
-                      "
-                      ref="formAnsIpt2"
-                      v-model="questionForm.answerList"
-                      @keydown.native="
-                        keydownAnswer($event, questionForm.questionType, 1)
-                      "
-                      @input="
-                        setAllAnswer($event, questionForm.questionType, 1)
-                      "
-                    ></el-input>
-                    <el-input
-                      v-if="questionForm.questionType == 4"
-                      v-model="questionForm.answerList"
-                      readonly=""
-                    ></el-input>
-                  </p>
-                  <p class="answer-box">
-                    <template v-if="questionForm.questionType == 4">
-                      <span
-                        class="answer-s active"
-                        @click="
-                          questionForm.answerList.length < questionForm.number
-                            ? (questionForm.answerList += '✓')
-                            : ''
-                        "
-                        >✓</span
-                      >
-                      <span
-                        class="answer-s active"
-                        @click="
-                          questionForm.answerList.length < questionForm.number
-                            ? (questionForm.answerList += '✗')
-                            : ''
-                        "
-                        >✗</span
-                      >
-                    </template>
-                    <template v-if="questionForm.questionType == 3">
-                      <template v-for="(option, opIdx) in rightOptions">
-                        <span
-                          v-if="opIdx < questionForm.selectNum"
-                          class="answer-s active"
-                          :key="option"
-                          @click="setMultiple(questionForm, option, 1)"
-                          >{{ option }}</span
-                        >
-                      </template>
-                      <span
-                        class="answer-s active"
-                        @click="setMultiple(questionForm, ',', 1)"
-                        >,</span
-                      >
-                    </template>
-                    <template
-                      v-if="
-                        questionForm.questionType == 2 ||
-                        questionForm.questionType == 6
-                      "
-                    >
-                      <template v-for="(option, opIdx) in rightOptions">
-                        <span
-                          v-if="opIdx < questionForm.selectNum"
-                          class="answer-s active"
-                          :key="option"
-                          @click="
-                            questionForm.answerList.length < questionForm.number
-                              ? (questionForm.answerList += option)
-                              : ''
-                          "
-                          >{{ option }}</span
-                        >
-                      </template>
-                    </template>
-                    <span
-                      class="answer-s delButton"
-                      @click="
-                        questionForm.answerList = questionForm.answerList.slice(
-                          0,
-                          -1
-                        )
-                      "
-                      >x</span
-                    >
-                    <span
-                      class="answer-s ac"
-                      @click="questionForm.answerList = ''"
-                      >ac</span
-                    >
-                  </p>
-                </div>
-              </el-form-item>
-            </el-form>
-          </div>
-          <div class="dialog-footer" slot="footer">
-            <el-button type="primary" @click="addQuestion">确 定</el-button>
-            <el-button @click="addQuestionVisible = false">取 消</el-button>
-          </div>
-        </el-dialog>
-      </div>
-      <div v-show="step == 2">
-        <div class="answer-title">
-          <p class="name">{{ form.title }}</p>
-          <p class="totals">卷面总分：{{ allScore }}分</p>
-        </div>
-        <div
-          class="question-box"
-          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 class="m20">共：{{ setNums(question.subQuestions) }}题</span>
-            <span class="m20">共：{{ setScore(question) }} 分</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-options qs-options2">选项设置</div>
-            </li>
-            <li
-              v-for="(subQuestions, indexs) in question.subQuestions"
-              :key="indexs"
-            >
-              <p
-                class="set-ans-btn"
-                v-if="
-                  subQuestions.qusType &&
-                  subQuestions.subNum &&
-                  subQuestions.subNum > 4
-                "
-              >
-                <el-button type="primary" @click="setFormAns(indexs, index)"
-                  >批量设置答案</el-button
-                >
-              </p>
-              <div v-else class="sub-questions">
-                <div class="qs-num">
-                  {{ setNum(index, indexs, subQuestions) }}
-                </div>
-                <div class="qs-type">
-                  {{ setSubPro(subQuestions.questionType) }}
-                </div>
-                <div class="qs-score">
-                  <el-input-number
-                    class="number-ipt"
-                    size="medium"
-                    :min="1"
-                    :max="200"
-                    :precision="2"
-                    v-model="subQuestions.score"
-                    label="单题分值"
-                  ></el-input-number>
-                </div>
-                <div class="qs-partScore">
-                  <p v-if="subQuestions.questionType != 3">--</p>
-                  <el-input-number
-                    class="number-ipt"
-                    v-else
-                    size="medium"
-                    :min="0"
-                    :precision="2"
-                    :max="subQuestions.score"
-                    :step="0.5"
-                    v-model="subQuestions.partScore"
-                    label="漏选得分"
-                  ></el-input-number>
-                </div>
-                <div class="qs-options qs-options2">
-                  <p v-if="subQuestions.questionType == 5">--</p>
-                  <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.split(',')"
-                      :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.split(',')"
-                      :class="
-                        subQuestions.correctAnswer == option ? 'active' : ''
-                      "
-                      :key="option"
-                      @click="subQuestions.correctAnswer = option"
-                      >{{ option }}</span
-                    >
-                  </p>
-                </div>
-              </div>
-            </li>
-          </ul>
-        </div>
-        <el-dialog :close-on-click-modal="false"
-          title="批量设置答案"
-          :visible.sync="diaSetAns"
-          width="400"
-          :modal-append-to-body="false"
-        >
-          <div class="qs-options">
-            <p class="dia-tips">
-              请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-            </p>
-            <p>{{ setSubPro(formAns.qusType) }}：</p>
-            <p class="ipt">
-              <el-input
-                v-if="formAns.qusType == 2 || formAns.qusType == 3"
-                ref="formAnsIpt"
-                v-model="formAns.answerList"
-                @keydown.native="keydownAnswer($event, formAns.qusType)"
-                @input="setAllAnswer($event, formAns.qusType)"
-              ></el-input>
-              <el-input
-                v-if="formAns.qusType == 4"
-                v-model="formAns.answerList"
-                readonly=""
-              ></el-input>
-            </p>
-            <p class="answer-box">
-              <template v-if="formAns.qusType == 4">
-                <span
-                  class="answer-s active"
-                  @click="
-                    formAns.answerList.length < formAns.subNum
-                      ? (formAns.answerList += '✓')
-                      : ''
-                  "
-                  >✓</span
-                >
-                <span
-                  class="answer-s active"
-                  @click="
-                    formAns.answerList.length < formAns.subNum
-                      ? (formAns.answerList += '✗')
-                      : ''
-                  "
-                  >✗</span
-                >
-              </template>
-              <template v-if="formAns.qusType == 3">
-                <span
-                  class="answer-s active"
-                  v-for="option in formAns.answerOptions.split(',')"
-                  :key="option"
-                  @click="setMultiple(formAns, option, 2)"
-                  >{{ option }}</span
-                >
-                <span
-                  class="answer-s active"
-                  @click="setMultiple(formAns, ',', 2)"
-                  >,</span
-                >
-              </template>
-              <template v-if="formAns.qusType == 2">
-                <span
-                  class="answer-s active"
-                  v-for="option in formAns.answerOptions.split(',')"
-                  :key="option"
-                  @click="
-                    formAns.answerList.length < formAns.subNum
-                      ? (formAns.answerList += option)
-                      : ''
-                  "
-                  >{{ option }}</span
-                >
-              </template>
-              <span
-                class="answer-s delButton"
-                @click="formAns.answerList = formAns.answerList.slice(0, -1)"
-                >x</span
-              >
-              <span class="answer-s ac" @click="formAns.answerList = ''"
-                >ac</span
-              >
-            </p>
-          </div>
-          <div class="dialog-footer" slot="footer">
-            <el-button @click="saveFormAns">确 定</el-button>
-            <el-button @click="diaSetAns = false">取 消</el-button>
-          </div>
-        </el-dialog>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack"
-            >取消</el-button
-          >
-          <el-button round @click="backStep1">上一步</el-button>
-          <el-button type="primary" round @click="save">保存</el-button>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { deepClone, checkAnswer } from "utils";
-const questionForm = {
-  questionTitle: "",
-  questionType: 2,
-  number: 10,
-  selectNum: 4,
-  score: 1,
-  partScore: 0,
-  answerList: "",
-};
-const subQuesOptions = {
-  questionType: 2,
-  score: 1,
-  partScore: 0,
-  selectNum: 4,
-  answerOptions: "A,B,C,D",
-  correctAnswer: "",
-};
-export default {
-  computed: {
-    allScore: function () {
-      let score = 0;
-      this.form.questionList.map((item) => {
-        score += item.subQuestions.reduce((a, b) => {
-          return a + Number(b.score ? b.score : 0);
-        }, 0);
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-  },
-  watch: {
-    step: function () {
-      this.$nextTick(function () {
-        this.$refs.content.scrollTop = 0;
-      });
-    },
-  },
-  data() {
-    return {
-      type: 1, //1-创建，2-复制答题卡
-      dialogVisible: false, //测验类型设置弹窗
-      addQuestionVisible: false, //添加大题弹窗
-      questionForm: { ...questionForm },
-      questionFormRules: {
-        questionTitle: [
-          { required: true, message: "请输入大题名称", trigger: "blur" },
-          {
-            min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-      questionOptions: [
-        { label: "单选题", value: 2 },
-        { label: "多选题", value: 3 },
-        { label: "判断题", value: 4 },
-        { label: "主观题", value: 5 },
-      ],
-      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
-      addSubQuestionsType: "",
-      step: 0, //步骤
-      gradeList: [], //年级
-      subjectList: [], //科目
-      answerTypeList: [], //测验类型
-      answerTypeName: "", //测验类型名称
-      form: {
-        //答题卡详情
-        title: "",
-        tagId: "",
-        gradeName: "",
-        subjectName: "",
-        examsDuration: 90,
-        sharingType: 0,
-        questionList: [],
-      },
-      formRules: {
-        //答题卡验证
-        title: [
-          { required: true, message: "请输入答题卡名称", trigger: "blur" },
-          {
-            min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
-            trigger: "blur",
-          },
-        ],
-        gradeName: [{ required: true, message: "请选择年级", trigger: "blur" }],
-        subjectName: [
-          { required: true, message: "请选择科目", trigger: "blur" },
-        ],
-        examsDuration: [
-          { required: true, message: "请设置考试时长", trigger: "blur" },
-        ],
-      },
-      tagList: [],
-      diaSetAns: false,
-      formAns: {
-        listIndex: 0, //大题位置
-        endIndex: 0, //相同题目最后一位题目的questionIndex
-        index: 0, //相同题目最后一位题目的位置
-        qusType: "", //题目类型
-        subNum: 0, //数量
-        answerOptions: [], //答案选项
-        answerList: "", //答案列表-字符串
-      },
-    };
-  },
-  async created() {
-    this.type = this.$route.query.type ? this.$route.query.type : 1;
-    await this._GradeList();
-    await this._QuerySubjectList(this.gradeList[0]);
-    await this._TypeList();
-    if (this.type == 2) {
-      this._QueryDetail();
-    }
-  },
-  methods: {
-    linkBack() {
-      this.$confirm(
-        (this.type == 2 ? "修改复制的" : "组建的") +
-          "答题卡未保存，确认退出吗？",
-        "提示",
-        {
-          confirmButtonText: "取消",
-          cancelButtonText: "确定",
-          confirmButtonClass: "el-button--danger1",
-          cancelButtonClass: "el-button--primary",
-          showClose: false,
-          roundButton: true,
-          center: true,
-          type: "warning",
-        }
-      )
-        .then(() => {})
-        .catch(() => {
-          this.$router.push({
-            path: "/examinationPaper",
-          });
-        });
-    },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-      }
-      return tit;
-    },
-    setNum(index, indexs, sub) {
-      let lengths = 0;
-      let subIndex = 0;
-      for (let i = 0; i < index; i++) {
-        let subArr = this.form.questionList[i].subQuestions.filter((item) => {
-          return !!item.questionType;
-        });
-        lengths += subArr.length;
-      }
-
-      for (let i = 0; i < indexs; i++) {
-        if (!!this.form.questionList[index].subQuestions[i].questionType) {
-          subIndex += 1;
-        }
-      }
-      return lengths + subIndex + 1;
-    },
-    setNums(ques) {
-      let lengths = 0;
-      let subArr = ques.filter((item) => {
-        return !!item.questionType;
-      });
-      lengths = subArr.length;
-      return lengths;
-    },
-    setBigNum(num) {
-      let txt = "";
-      let bigNum = [
-        "一",
-        "二",
-        "三",
-        "四",
-        "五",
-        "六",
-        "七",
-        "八",
-        "九",
-        "十",
-        "十一",
-        "十二",
-        "十三",
-        "十四",
-        "十五",
-        "十六",
-        "十七",
-        "十八",
-        "十九",
-        "二十",
-      ];
-      txt = bigNum[num];
-
-      return txt;
-    },
-    setQuestionForm(val) {
-      //切换题型清空答案
-      this.questionForm.answerList = "";
-    },
-    changeQesNum(val) {
-      //减少题数设置答案
-      if (
-        this.questionForm.questionType == 2 ||
-        this.questionForm.questionType == 4
-      ) {
-        this.questionForm.answerList = this.questionForm.answerList.substring(
-          0,
-          val
-        );
-      } else {
-        console.log(this.questionForm.answerList.split(","));
-        this.questionForm.answerList = this.questionForm.answerList
-          .split(",")
-          .splice(0, val)
-          .join(",");
-      }
-    },
-    setFormAns(indexs, index) {
-      //初始化要修改的答案
-      this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
-      this.formAns.listIndex = index;
-      let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
-      this.formAns.answerList = [];
-      let answerList = "";
-      this.form.questionList[index].subQuestions.map((item, subIdx) => {
-        if (subIdx >= startIndex) {
-          answerList += this.setAnswer(item.questionType, item.correctAnswer);
-          if (subIdx != indexs) {
-            if (!!item.qusType) {
-              answerList = "";
-            }
-          } else {
-            if (item.qusType == 3) {
-              answerList = answerList.slice(0, -1);
-            }
-            this.formAns.answerList = answerList;
-          }
-        }
-      });
-
-      this.diaSetAns = true;
-    },
-    insertTxtAndSetcursor(element, answerList, str) {
-      let startPos = element.selectionStart; // 获取光标开始的位置
-      if (startPos === undefined) {
-        // 如果没有光标位置 不操作
-        return answerList;
-      } else {
-        return {
-          text:
-            answerList.substring(0, startPos) +
-            str +
-            answerList.substring(startPos), // 将文本插入
-          startPos: startPos + str.length,
-        };
-      }
-    },
-    setMultiple(obj, answer, type) {
-      //多选答案设置
-      let elements =
-        type == 1
-          ? this.$refs["formAnsIpt2"].$el.children[0]
-          : this.$refs["formAnsIpt"].$el.children[0];
-      let resault = this.insertTxtAndSetcursor(
-        elements,
-        obj.answerList || "",
-        answer
-      );
-      obj.answerList = resault.text;
-      let str = obj.answerList;
-      let str2;
-      if (!!obj.answerOptions) {
-        str2 = checkAnswer(
-          str,
-          3,
-          obj.answerOptions.split(",").length,
-          obj.subNum
-        );
-      } else {
-        str2 = checkAnswer(str, 3, obj.selectNum, obj.number);
-      }
-      obj.answerList = str2;
-      elements.focus();
-      elements.selectionStart = resault.startPos;
-    },
-    saveFormAns() {
-      //批量修改答案
-      let EndIndex;
-      let subNum = this.formAns.subNum - 1;
-      this.form.questionList[this.formAns.listIndex].subQuestions.some(
-        (item, index) => {
-          if (this.formAns.endIndex == item.questionIndex) {
-            EndIndex = index;
-            return;
-          }
-        }
-      );
-
-      for (let i = 0; i <= subNum; i++) {
-        let correctAnswer = "";
-        if (this.formAns.qusType == 2) {
-          correctAnswer = this.formAns.answerList[subNum - i] || "";
-        } else if (this.formAns.qusType == 3) {
-          correctAnswer = this.formAns.answerList.split(",")[subNum - i] || "";
-        } else if (this.formAns.qusType == 4) {
-          correctAnswer =
-            this.formAns.answerList[subNum - i] == "✓"
-              ? 1
-              : this.formAns.answerList[subNum - i] == "✗"
-              ? 2
-              : "";
-        }
-        this.form.questionList[this.formAns.listIndex].subQuestions[
-          EndIndex - i
-        ].correctAnswer = correctAnswer;
-      }
-      this.diaSetAns = false;
-    },
-    // 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 = "";
-    //   }
-    // },
-    keydownAnswer(event, type, isAddBig) {
-      let answerA = "ABCDEFG";
-      let answer_a = "abcdefg";
-      if (isAddBig) {
-        answerA = answerA.substring(0, this.questionForm.selectNum);
-        answer_a = answer_a.substring(0, this.questionForm.selectNum);
-      } else {
-        answerA = answerA.substring(0, this.formAns.subNum);
-        answer_a = answer_a.substring(0, this.formAns.subNum);
-      }
-      answerA += answer_a;
-      answerA = type == 2 ? answerA : answerA + ",";
-      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;
-      if (!answerA.includes(event.key)) {
-        event.returnValue = "";
-      }
-    },
-    setAllAnswer(event, type, isAddBig) {
-      if (isAddBig) {
-        let str = this.questionForm.answerList;
-        let str2 = checkAnswer(
-          str,
-          type,
-          this.questionForm.selectNum,
-          this.questionForm.number
-        );
-        this.questionForm.answerList = str2;
-      } else {
-        let str = this.formAns.answerList;
-        let str2 = checkAnswer(
-          str,
-          type,
-          this.formAns.answerOptions.split(",").length,
-          this.formAns.subNum
-        );
-        this.formAns.answerList = str2;
-      }
-    },
-    setAnswer(type, ans) {
-      let txt = "";
-      if (type == 2) {
-        txt = ans;
-      } else if (type == 3) {
-        txt = ans + ",";
-      } else if (type == 4) {
-        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
-      }
-      return txt;
-    },
-    backStep1() {
-      this.formatQuestionList();
-      this.step = 1;
-    },
-    setStep1() {
-      this.$refs["forms"].validate((valid) => {
-        // 验证通过：保存
-        if (valid) {
-          this.step = 1;
-        } else {
-          this.$message.error("数据有误，请检查！");
-          return false;
-        }
-      });
-    },
-    setStep2() {
-      if (!this.form.questionList.length) {
-        this.$message.warning("请添加题目！");
-        return;
-      }
-      // let valid = "";
-      // this.form.questionList.map((item, index) => {
-      //   if (!item.questionTitle) {
-      //     valid += index + 1 + "、";
-      //   }
-      // });
-      // if (!valid) {
-      //添加题目ID、序号
-      this.form.questionList.map((item, index) => {
-        item.questionType = 0;
-        item.subQuestions.map((items, indexs) => {
-          items.questionId = this.setNum(index, indexs);
-          items.questionIndex = this.setNum(index, indexs);
-        });
-      });
-      //整理问题
-      this.form.questionList?.map((item) => {
-        let types = [{}];
-        let addndex = 0;
-        item.subQuestions.map((sub, index) => {
-          if (!!sub.questionType) {
-            if (
-              sub.questionType == types[addndex].qusType &&
-              sub.questionType != 5
-            ) {
-              //同类型批量答案+1
-              types[addndex].subNum += 1;
-              if (
-                types[addndex].answerOptions.length < sub.answerOptions.length
-              ) {
-                types[addndex].answerOptions = sub.answerOptions;
-              }
-
-              // types[addndex].answerList += this.setAnswer(
-              //   sub.questionType,
-              //   sub.correctAnswer
-              // );
-              types[addndex].answerList = "";
-              if (index == item.subQuestions.length - 1) {
-                //循环最后类型数量大于等于5，保存批量答案
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  types[addndex].endIndex = sub.questionIndex;
-                  types[addndex].index = index;
-                }
-              }
-            } else {
-              if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                //不同类型时如果原有类型数量大于等于5，保存批量答案
-                types[addndex].endIndex =
-                  item.subQuestions[index - 1].questionIndex;
-                types[addndex].index = index - 1;
-                addndex += 1;
-                types[addndex] = {};
-              }
-              //不同类型初始化批量答案
-              types[addndex].qusType = sub.questionType;
-              types[addndex].subNum = 1;
-              types[addndex].answerOptions = sub.answerOptions;
-              types[addndex].answerList = "";
-            }
-          }
-        });
-        for (let i = 0; i < types.length; i++) {
-          if (types[i].subNum >= 5) {
-            item.subQuestions.splice(
-              types[i].index + i + 1,
-              0,
-              deepClone(types[i])
-            );
-          }
-        }
-        console.log(types);
-      });
-      this.step = 2;
-      return;
-      // } else {
-      //   this.$message.error(
-      //     `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
-      //   );
-      // }
-    },
-    formatQuestionList() {
-      for (let i = 0; i < this.form.questionList.length; i++) {
-        for (
-          let j = 0;
-          j < this.form.questionList[i].subQuestions.length;
-          j++
-        ) {
-          if (this.form.questionList[i].subQuestions[j].qusType) {
-            this.form.questionList[i].subQuestions.splice(j, 1);
-          }
-        }
-      }
-    },
-    openQuestion() {
-      this.questionForm = { ...questionForm };
-      this.addQuestionVisible = true;
-    },
-    addQuestion() {
-      //添加大题
-      let subQuestions = [];
-      let questionsOptions = {
-        ...subQuesOptions,
-        selectNum: this.questionForm.selectNum,
-        score: this.questionForm.score,
-        partScore: this.questionForm.partScore,
-        questionType:
-          this.questionForm.questionType == 6
-            ? 2
-            : this.questionForm.questionType,
-      };
-      switch (questionsOptions.questionType) {
-        case 2:
-          questionsOptions.answerOptions = this.rightOptions
-            .slice(0, questionsOptions.selectNum)
-            .join(",");
-          break;
-        case 3:
-          questionsOptions.answerOptions = this.rightOptions
-            .slice(0, questionsOptions.selectNum)
-            .join(",");
-          break;
-        case 4:
-          questionsOptions.selectNum = 0;
-          questionsOptions.answerOptions = "1,2";
-          break;
-        case 5:
-          questionsOptions.selectNum = 0;
-          break;
-      }
-      for (let i = 0; i < this.questionForm.number; i++) {
-        let answer = "";
-        if (questionsOptions.questionType == 4) {
-          answer =
-            this.questionForm.answerList[i] == "✓"
-              ? 1
-              : this.questionForm.answerList[i] == "✗"
-              ? 2
-              : "";
-        } else if (questionsOptions.questionType == 3) {
-          answer = this.questionForm.answerList.split(",")[i] || "";
-        } else if (questionsOptions.questionType == 2) {
-          answer = this.questionForm.answerList[i] || "";
-        }
-        questionsOptions.correctAnswer = answer;
-        subQuestions.push({ ...questionsOptions });
-      }
-      this.form.questionList.push({
-        questionTitle: this.questionForm.questionTitle,
-        number: this.questionForm.number,
-        source: 10,
-        subQuestions: [...subQuestions],
-        show: false,
-      });
-      this.addQuestionVisible = false;
-    },
-    delTabData(subIndex, index) {
-      //删除小题
-      console.log(subIndex);
-      console.log(index);
-      this.form.questionList[index].subQuestions.splice(subIndex, 1);
-    },
-    setScore(question) {
-      let score = question.subQuestions.reduce((a, b) => {
-        return a + (b.score ? b.score : 0);
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-    equalScore(question) {
-      let score = 0;
-      let bools = true;
-      for (let i = 0; i < question.subQuestions.length; i++) {
-        if (i == 0) {
-          score = question.subQuestions[i].score;
-        } else {
-          if (score != question.subQuestions[i].score) {
-            bools = false;
-            break;
-          }
-        }
-      }
-      return bools;
-    },
-    changeAddSubQuestions(val, question) {
-      if (val) {
-        let questionsOptions = {
-          ...subQuesOptions,
-          questionType: val,
-        };
-        switch (questionsOptions.questionType) {
-          case 2:
-            questionsOptions.answerOptions = this.rightOptions
-              .slice(0, questionsOptions.selectNum)
-              .join(",");
-            break;
-          case 3:
-            questionsOptions.answerOptions = this.rightOptions
-              .slice(0, questionsOptions.selectNum)
-              .join(",");
-            questionsOptions.partScore = 0;
-            break;
-          case 4:
-            questionsOptions.selectNum = 0;
-            questionsOptions.answerOptions = "1,2";
-            break;
-          case 5:
-            questionsOptions.selectNum = 0;
-            break;
-        }
-        question.subQuestions.push(questionsOptions);
-        this.addSubQuestionsType = "";
-      }
-    },
-    changeSubQuestions(val, subQuestions) {
-      //切换多题型-小题题型
-      const that = this;
-      subQuestions.score = 1;
-      subQuestions.partScore = 0;
-      subQuestions.correctAnswer = "";
-      subQuestions.selectNum = 4;
-      switch (val) {
-        case 2:
-          subQuestions.answerOptions = that.rightOptions
-            .slice(0, subQuestions.selectNum)
-            .join(",");
-          break;
-        case 3:
-          subQuestions.answerOptions = that.rightOptions
-            .slice(0, subQuestions.selectNum)
-            .join(",");
-          break;
-        case 4:
-          subQuestions.selectNum = 0;
-          subQuestions.answerOptions = "1,2";
-          break;
-        case 5:
-          subQuestions.selectNum = 0;
-          break;
-      }
-    },
-    addOptions(subQuestions) {
-      //添加选项
-      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.split(",").length;
-      if (length < 3) return;
-      subQuestions.selectNum = length - 1;
-      subQuestions.answerOptions = this.rightOptions
-        .slice(0, subQuestions.selectNum)
-        .join(",");
-      subQuestions.correctAnswer = subQuestions.correctAnswer.slice(
-        0,
-        subQuestions.selectNum
-      );
-    },
-    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("");
-      }
-    },
-    openTagDia() {
-      this.tagList = deepClone(this.answerTypeList);
-      this.dialogVisible = true;
-    },
-    async editTypeName(obj) {
-      let isRepeat = false;
-      this.answerTypeList.map((item) => {
-        if (item.typeName == obj.typeName) {
-          isRepeat = true;
-        }
-      });
-      if (isRepeat) {
-        this.$message.error("类型已存在请重新填写！");
-        return;
-      }
-      //修改测验类型
-      const { data, status, info } = await this.$request.editPaperType({
-        tagId: obj.id,
-        tag: obj.typeName,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.$message.success("修改成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async removeTypeName(obj) {
-      //删除测验类型
-      const { data, status, info } = await this.$request.delPaperType({
-        tagId: obj.id,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.$message.success("删除成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async addPaperType() {
-      //保存测验类型
-      if (!this.answerTypeName) {
-        this.$message.error("请填写测验名称！");
-        return;
-      }
-      let isRepeat = false;
-      this.answerTypeList.map((item) => {
-        if (item.typeName == this.answerTypeName) {
-          isRepeat = true;
-        }
-      });
-      if (isRepeat) {
-        this.$message.error("类型已存在请重新填写！");
-        return;
-      }
-      //添加测验类型
-      const { data, status, info } = await this.$request.addPaperType({
-        tag: this.answerTypeName,
-      });
-      if (status == 0) {
-        await this._TypeList();
-        this.tagList = deepClone(this.answerTypeList);
-        this.form.tagId = data || "";
-        this.answerTypeName = "";
-        this.$message.success("添加成功");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async save() {
-      if (this.saveLoading) return;
-      this.saveLoading = true;
-      this.formatQuestionList();
-      let formDatas = deepClone(this.form);
-      for (let i = 0; i < formDatas.questionList.length; i++) {
-        delete formDatas.questionList[i].show;
-      }
-      const { data, status, info } = await this.$request.addPaper({
-        ...formDatas,
-      });
-      this.saveLoading = false;
-      if (status == 0) {
-        this.$router.push({
-          path: "/examinationPaper",
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async changeGrade() {
-      //切换年级查询科目
-      this._QuerySubjectList(this.form.gradeName);
-    },
-    async _TypeList() {
-      //测验类型查询
-      const { data, status, info } = await this.$request.fetchTypeNames({
-        gradeName: this.form.gradeName,
-        type: 1,
-      });
-      if (status == 0) {
-        this.answerTypeList =
-          data.list?.map((item) => {
-            return {
-              typeName: item.tag,
-              id: item.tagId,
-            };
-          }) || [];
-        if (this.type != 2) {
-          this.form.tagId = this.answerTypeList[0]?.id || "";
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _GradeList() {
-      //查询年级列表
-      const { data, status, info } = await this.$request.fetchGradeList();
-      if (status == 0) {
-        this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
-        if (this.type != 2) {
-          this.form.gradeName = this.gradeList[0];
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubjectList(grade) {
-      //查询科目列表
-      const { data, status, info } = await this.$request.fetchSubjectList({
-        gradeName: grade,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        console.log(this.subjectList);
-        if (this.subjectList.length) {
-          this.form.subjectName = this.subjectList[0].value;
-        }
-        console.log(this.form);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDetail() {
-      //查询答题卡详情
-      const { data, status, info } = await this.$request.fetchPaperDetail({
-        paperId: this.$route.query.paperId,
-      });
-      if (status == 0) {
-        this.form.title = data.title + "_副本";
-        this.form.tagId = data.tagId === 0 ? "" : 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 || "A,B,C,D",
-                correctAnswer: items.correctAnswer,
-              };
-            }) || [];
-          return {
-            questionTitle: item.questionTitle,
-            subQuestions: subQuestions,
-            show: false,
-          };
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.red {
-  color: #f30;
-}
-.qs-options {
-  flex: 1;
-  .ipt {
-    margin-bottom: 5px;
-  }
-  .answer-box {
-    .answer-s {
-      cursor: pointer;
-      user-select: none;
-      &:first-of-type {
-        margin-left: 0;
-      }
-    }
-  }
-  .delButton {
-    text-indent: -9999999px;
-    border-color: #ff6868;
-    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
-    background-size: 19px;
-    color: transparent;
-  }
-  .answer-s.ac {
-    border: none;
-  }
-  .ac {
-    border-color: #ff6868;
-    background: #ff6868;
-    color: #fff !important;
-  }
-}
-
-.sel2 {
-  width: 480px;
-}
-.set-ans-btn {
-  width: 100%;
-  padding: 10px 0 10px 630px;
-  box-sizing: border-box;
-  border-right: 1px solid #e2e2e2;
-  border-bottom: 1px solid #e2e2e2;
-}
-.content-box {
-  width: 100%;
-  height: 100%;
-  overflow-y: auto;
-}
-.content {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 0 50px;
-  .ml-20 {
-    margin-left: 20px;
-  }
-  .btn-box {
-    text-align: right;
-    margin-left: 140px;
-  }
-}
-.dia-content {
-  .dia-tit {
-    font-size: 20px;
-    color: #333;
-    font-weight: 700;
-    text-align: center;
-  }
-  .add-type {
-    width: 100%;
-    margin-bottom: 10px;
-    .js-set {
-      margin: 2.5px 10px 0 0;
-      font-size: 14px;
-    }
-  }
-  .add-btn {
-    margin-left: 20px;
-  }
-}
-.el-message-box {
-  :deep(.el-button--default) {
-    color: #fff;
-  }
-}
-.add-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .add-question {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 16px;
-    font-weight: bolder;
-    padding: 2px;
-    cursor: pointer;
-    .s1 {
-      margin-left: 6px;
-    }
-    :deep(.el-icon-plus) {
-      font-size: 24px;
-      font-weight: 900;
-    }
-    :deep(.el-button--mini.is-circle) {
-      padding: 3px;
-    }
-  }
-}
-.dialog-footer {
-  text-align: center;
-  :deep(.el-button) {
-    border-radius: 20px;
-    padding: 8px 20px 7px;
-    margin: 0 12px;
-  }
-}
-.question-box {
-  margin-bottom: 20px;
-}
-.question-title {
-  line-height: 40px;
-  display: flex;
-  align-items: center;
-  margin-bottom: 12px;
-  .m20 {
-    margin-left: 20px;
-  }
-  .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;
-  }
-  .el-icon-caret-right {
-    font-size: 24px;
-    color: #888;
-    transition: all 0.4s;
-    margin-right: 12px;
-    cursor: pointer;
-    &.active {
-      transform: rotate(90deg);
-    }
-  }
-}
-.questions-ul {
-  border-left: 1px solid #e2e2e2;
-  border-top: 1px solid #e2e2e2;
-}
-.el-input-number {
-  width: 140px;
-}
-.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;
-  }
-}
-.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;
-    }
-  }
-}
-.qs-options {
-  .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;
-    cursor: pointer;
-    &.active {
-      background: #5e78fa;
-      border-color: #5e78fa;
-      color: #fff;
-    }
-  }
-}
-.sub-questions {
-  width: 100%;
-  display: flex;
-  border-bottom: 1px solid #e2e2e2;
-  & > div {
-    min-height: 40px;
-    padding: 5px;
-    flex-shrink: 0;
-    border-right: 1px solid #e2e2e2;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .qs-num {
-    width: 80px;
-  }
-  .qs-type {
-    width: 160px;
-  }
-  .qs-score,
-  .qs-partScore {
-    width: 160px;
-  }
-  .qs-options {
-    flex: 1;
-  }
-  .qs-set {
-    width: 80px;
-  }
-  .qs-options2 {
-    text-align: left;
-    justify-content: flex-start;
-    padding-left: 20px;
-    .answer-s {
-      cursor: pointer;
-    }
-  }
-  :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;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/examinationPaper/detail.vue b/src/views/standard/examinationPaper/detail.vue
deleted file mode 100644
index 4611414..0000000
--- a/src/views/standard/examinationPaper/detail.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<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/standard/examinationPaper/edit.vue b/src/views/standard/examinationPaper/edit.vue
deleted file mode 100644
index 4736cc5..0000000
--- a/src/views/standard/examinationPaper/edit.vue
+++ /dev/null
@@ -1,997 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>修改答案</span>
-      </template>
-    </back-box>
-    <div class="content">
-      <template v-if="type == 1"
-        ><p class="tips" v-if="paperModifyLog.modifiedTime">
-          <i class="fa fa-bell-o"></i>
-          {{
-            `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
-          }}老师修改了答案
-        </p></template
-      >
-      <div class="answer-title">
-        <p class="name">{{ form.title || title }}</p>
-        <p class="totals">卷面总分：{{ allScore }}分</p>
-      </div>
-      <template v-if="questionList[0]?.subQuestions">
-        <div v-for="(question, index) in questionList" :key="index">
-          <p class="question-title">
-            <span>{{ setBigNum(index) }}、</span>
-            <el-input
-              class="ipt"
-              v-model.trim="question.questionTitle"
-              maxlength="30"
-              placeholder="填写大题名称"
-            ></el-input>
-            <span>共 {{ setScore(question) }} 分</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-options qs-options2">选项设置</div>
-            </li>
-            <li
-              v-for="(subQuestions, indexs) in question.subQuestions"
-              :key="indexs"
-            >
-              <p
-                class="set-ans-btn"
-                v-if="
-                  subQuestions.qusType &&
-                  subQuestions.subNum &&
-                  subQuestions.subNum > 4
-                "
-              >
-                <el-button type="primary" @click="setFormAns(indexs, index)"
-                  >批量设置答案</el-button
-                >
-              </p>
-              <div v-else class="sub-questions">
-                <div class="qs-num">{{ subQuestions.questionIndex }}</div>
-                <div class="qs-type">
-                  {{ setSubPro(subQuestions.questionType) }}
-                </div>
-                <div class="qs-score">
-                  <el-input-number
-                    class="number-ipt"
-                    size="medium"
-                    :min="1"
-                    :max="200"
-                    :precision="2"
-                    :step="1"
-                    v-model="subQuestions.score"
-                    label="单题分值"
-                  ></el-input-number>
-                </div>
-                <div class="qs-partScore">
-                  <p v-if="subQuestions.questionType != 3">--</p>
-                  <el-input-number
-                    class="number-ipt"
-                    v-else
-                    size="medium"
-                    :min="0"
-                    :precision="2"
-                    :max="subQuestions.score"
-                    :step="0.5"
-                    v-model="subQuestions.partScore"
-                    label="漏选得分"
-                  ></el-input-number>
-                </div>
-                <div class="qs-options qs-options2">
-                  <p v-if="subQuestions.questionType == 5">--</p>
-                  <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">
-                    <template
-                      v-for="option in subQuestions.answerOptions.split(',')"
-                    >
-                      <span
-                        v-if="option"
-                        class="answer-s"
-                        :class="
-                          subQuestions.correctAnswer.includes(option)
-                            ? 'active'
-                            : ''
-                        "
-                        :key="option"
-                        @click="changAnswer(subQuestions, option)"
-                        >{{ option }}</span
-                      >
-                    </template>
-                  </p>
-                  <p v-if="subQuestions.questionType == 2" class="answer-box">
-                    <template
-                      v-for="option in subQuestions.answerOptions.split(',')"
-                    >
-                      <span
-                        class="answer-s"
-                        v-if="option"
-                        :class="
-                          subQuestions.correctAnswer == option ? 'active' : ''
-                        "
-                        :key="option"
-                        @click="subQuestions.correctAnswer = option"
-                        >{{ option }}</span
-                      >
-                    </template>
-                  </p>
-                </div>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </template>
-      <ul class="questions-ul" v-else>
-        <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-options qs-options2">选项设置</div>
-        </li>
-        <li v-for="(subQuestions, indexs) in questionList" :key="indexs">
-          <p
-            class="set-ans-btn"
-            v-if="
-              subQuestions.qusType &&
-              subQuestions.subNum &&
-              subQuestions.subNum > 4
-            "
-          >
-            <el-button type="primary" @click="setFormAns(indexs, index)"
-              >批量设置答案</el-button
-            >
-          </p>
-          <div v-else class="sub-questions">
-            <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">
-              <p v-if="subQuestions.questionType != 3">--</p>
-              <el-input-number
-                class="number-ipt"
-                v-else
-                size="medium"
-                :min="0"
-                :precision="2"
-                :max="subQuestions.score"
-                :step="0.5"
-                v-model="subQuestions.partScore"
-                label="漏选得分"
-              ></el-input-number>
-            </div>
-            <div class="qs-options qs-options2">
-              <p v-if="subQuestions.questionType == 5">--</p>
-              <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">
-                <template
-                  v-for="option in subQuestions.answerOptions.split(',')"
-                >
-                  <span
-                    v-if="option"
-                    class="answer-s"
-                    :class="
-                      subQuestions.correctAnswer.includes(option)
-                        ? 'active'
-                        : ''
-                    "
-                    :key="option"
-                    @click="changAnswer(subQuestions, option)"
-                    >{{ option }}</span
-                  >
-                </template>
-              </p>
-              <p v-if="subQuestions.questionType == 2" class="answer-box">
-                <template
-                  v-for="option in subQuestions.answerOptions.split(',')"
-                >
-                  <span
-                    class="answer-s"
-                    v-if="option"
-                    :class="
-                      subQuestions.correctAnswer == option ? 'active' : ''
-                    "
-                    :key="option"
-                    @click="subQuestions.correctAnswer = option"
-                    >{{ option }}</span
-                  >
-                </template>
-              </p>
-            </div>
-          </div>
-        </li>
-      </ul>
-      <div class="btn-box">
-        <el-button type="danger" plain round @click="linkBack">取消</el-button>
-        <el-button type="primary" round @click="save">保存</el-button>
-      </div>
-      <el-dialog :close-on-click-modal="false"
-        title="批量设置答案"
-        :visible.sync="diaSetAns"
-        width="400"
-        :modal-append-to-body="false"
-      >
-        <div class="qs-options set-questions">
-          <p class="dia-tips">
-            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-          </p>
-          <p>{{ setSubPro(formAns.qusType) }}：</p>
-          <p class="ipt">
-            <el-input
-              ref="formAnsIpt"
-              v-if="formAns.qusType == 2 || formAns.qusType == 3"
-              v-model="formAns.answerList"
-              @keydown.native="keydownAnswer($event, formAns.qusType)"
-              @input="setAllAnswer($event, formAns.qusType)"
-            ></el-input>
-            <el-input
-              v-if="formAns.qusType == 4"
-              v-model="formAns.answerList"
-              readonly=""
-            ></el-input>
-          </p>
-          <p class="answer-box">
-            <template v-if="formAns.qusType == 4">
-              <span
-                class="answer-s active"
-                @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += '✓')
-                    : ''
-                "
-                >✓</span
-              >
-              <span
-                class="answer-s active"
-                @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += '✗')
-                    : ''
-                "
-                >✗</span
-              >
-            </template>
-            <template v-if="formAns.qusType == 3">
-              <span
-                class="answer-s active"
-                v-for="option in formAns.answerOptions.split(',')"
-                :key="option"
-                @click="setMultiple(formAns, option)"
-                >{{ option }}</span
-              >
-              <span class="answer-s active" @click="setMultiple(formAns, ',')"
-                >,</span
-              >
-            </template>
-            <template v-if="formAns.qusType == 2">
-              <span
-                class="answer-s active"
-                v-for="option in formAns.answerOptions.split(',')"
-                :key="option"
-                @click="
-                  formAns.answerList.length < formAns.subNum
-                    ? (formAns.answerList += option)
-                    : ''
-                "
-                >{{ option }}</span
-              >
-            </template>
-            <span
-              class="answer-s delButton"
-              @click="formAns.answerList = formAns.answerList.slice(0, -1)"
-              >x</span
-            >
-            <span class="answer-s ac" @click="formAns.answerList = ''">ac</span>
-          </p>
-        </div>
-        <div class="dialog-footer" slot="footer">
-          <el-button @click="saveFormAns">确 定</el-button>
-          <el-button @click="diaSetAns = false">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import { deepClone, checkAnswer } from "utils";
-export default {
-  data() {
-    return {
-      role: "",
-      questionList: [],
-      form: {
-        //答题卡详情
-        title: "",
-        tag: "",
-        subjectId: "",
-        examsDuration: 90,
-        gradeName: "",
-        share: 1,
-        questionList: [],
-      },
-      title: "",
-      type: 1,
-      paperModifyLog: {
-        realName: "",
-        modifiedTime: "",
-      },
-      diaSetAns: false,
-      formAns: {
-        listIndex: 0, //大题位置
-        endIndex: 0, //相同题目最后一位题目的questionIndex
-        index: 0,
-        qusType: "", //题目类型
-        subNum: 0, //数量
-        answerOptions: [], //答案选项
-        answerList: "", //答案列表-字符串
-      },
-    };
-  },
-  computed: {
-    allScore: function () {
-      let score = 0;
-      this.questionList?.map((item) => {
-        if (item.subQuestions) {
-          score += item.subQuestions.reduce((a, b) => {
-            return a + (Number(b.score) || 0);
-          }, 0);
-        } else {
-          score += item.score;
-        }
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-  },
-  created() {
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this.type = this.$route.query.type || 1;
-    this.title = this.$route.query.title || "";
-    this._QueryDetail();
-  },
-  methods: {
-    linkBack() {
-      this.$router.push({
-        path: "/examinationPaper",
-      });
-    },
-    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;
-    },
-    setScore(question) {
-      let score = question.subQuestions.reduce((a, b) => {
-        return a + (b.score || 0);
-      }, 0);
-      return Number(score).toFixed(2);
-    },
-    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("");
-      }
-    },
-    keydownAnswer(event, type) {
-      let answerA = "ABCDEFG";
-      let answer_a = "abcdefg";
-      answerA = answerA.substring(0, this.formAns.subNum);
-      answer_a = answer_a.substring(0, this.formAns.subNum);
-      answerA += answer_a;
-      answerA = type == 2 ? answerA : answerA + ",";
-      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;
-      if (!answerA.includes(event.key)) {
-        event.returnValue = "";
-      }
-    },
-    setAllAnswer(event, type) {
-      let str = this.formAns.answerList;
-      let str2 = checkAnswer(
-        str,
-        type,
-        this.formAns.answerOptions.split(",").length,
-        this.formAns.subNum
-      );
-      this.formAns.answerList = str2;
-    },
-    setAnswer(type, ans) {
-      let txt = "";
-      if (type == 2) {
-        txt = ans;
-      } else if (type == 3) {
-        txt = ans + ",";
-      } else if (type == 4) {
-        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
-      }
-      return txt;
-    },
-    insertTxtAndSetcursor(answerList, str) {
-      let element = this.$refs.formAnsIpt.$el.children[0]; // 获取到指定标签
-      let startPos = element.selectionStart; // 获取光标开始的位置
-      if (startPos === undefined) {
-        // 如果没有光标位置 不操作
-        return answerList;
-      } else {
-        return {
-          text:
-            answerList.substring(0, startPos) +
-            str +
-            answerList.substring(startPos), // 将文本插入
-          startPos: startPos + str.length,
-        };
-      }
-    },
-    setMultiple(obj, answer) {
-      //多选答案设置
-      let resault = this.insertTxtAndSetcursor(obj.answerList || "", answer);
-      obj.answerList = resault.text;
-      let str = obj.answerList;
-      let str2 = checkAnswer(
-        str,
-        3,
-        obj.answerOptions.split(",").length,
-        obj.subNum
-      );
-      obj.answerList = str2;
-      this.$refs.formAnsIpt.$el.children[0].focus();
-      this.$refs.formAnsIpt.$el.children[0].selectionStart = resault.startPos;
-    },
-    setFormAns(indexs, index) {
-      //初始化要修改的答案
-      if (this.questionList[0].subQuestions) {
-        this.formAns = { ...this.questionList[index].subQuestions[indexs] };
-        this.formAns.listIndex = index;
-        let answerList = "";
-        let startIndex = this.formAns.index + 1 - this.formAns.subNum; //批量设置大难开始位置
-        this.questionList[index].subQuestions.map((item, subIdx) => {
-          if (subIdx >= startIndex) {
-            answerList += this.setAnswer(item.questionType, item.correctAnswer);
-            if (subIdx != indexs) {
-              if (!!item.qusType) {
-                answerList = "";
-              }
-            } else {
-              if (item.qusType == 3) {
-                answerList = answerList.slice(0, -1);
-              }
-              this.formAns.answerList = answerList;
-            }
-          }
-        });
-      } else {
-        this.formAns = { ...this.questionList[indexs] };
-        let startIndex = this.formAns.endIndex - this.formAns.subNum;
-        this.formAns.listIndex = indexs;
-        let answerList = "";
-        this.questionList[index].map((item, subIdx) => {
-          if (subIdx >= startIndex) {
-            answerList += this.setAnswer(item.questionType, item.correctAnswer);
-            if (subIdx != indexs) {
-              if (!!item.qusType) {
-                answerList = "";
-              }
-            } else {
-              if (item.qusType == 3) {
-                answerList = answerList.slice(0, -1);
-              }
-              this.formAns.answerList = answerList;
-            }
-          }
-        });
-      }
-      this.diaSetAns = true;
-    },
-    saveFormAns() {
-      //批量修改答案
-      let EndIndex;
-      let subNum = this.formAns.subNum - 1;
-      if (this.questionList[this.formAns.listIndex].subQuestions) {
-        this.questionList[this.formAns.listIndex].subQuestions.some(
-          (item, index) => {
-            if (this.formAns.endIndex == item.questionIndex) {
-              EndIndex = index;
-              return;
-            }
-          }
-        );
-      } else {
-        this.questionList.some((item, index) => {
-          if (this.formAns.endIndex == item.questionIndex) {
-            EndIndex = index;
-            return;
-          }
-        });
-      }
-
-      for (let i = 0; i <= subNum; i++) {
-        let correctAnswer = "";
-        if (this.formAns.qusType == 2) {
-          correctAnswer = this.formAns.answerList[subNum - i] || "";
-        } else if (this.formAns.qusType == 3) {
-          correctAnswer = this.formAns.answerList.split(",")[subNum - i] || "";
-        } else if (this.formAns.qusType == 4) {
-          correctAnswer =
-            this.formAns.answerList[subNum - i] == "✓"
-              ? 1
-              : this.formAns.answerList[subNum - i] == "✗"
-              ? 2
-              : "";
-        }
-        if (this.questionList[0].subQuestions) {
-          this.questionList[this.formAns.listIndex].subQuestions[
-            EndIndex - i
-          ].correctAnswer = correctAnswer;
-        } else {
-          this.questionList[EndIndex - i].correctAnswer = correctAnswer;
-        }
-      }
-      this.diaSetAns = false;
-    },
-    async save() {
-      for (let i = 0; i < this.questionList.length; i++) {
-        if (this.questionList[0].subQuestions) {
-          for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
-            if (this.questionList[i].subQuestions[j].qusType) {
-              this.questionList[i].subQuestions.splice(j, 1);
-            }
-          }
-        } else {
-          if (this.questionList[i].qusType) {
-            this.questionList.splice(i, 1);
-            i--;
-          }
-        }
-      }
-      let questionList = this.questionList.map((item) => {
-        item.score = null;
-        // item.questionId = "";
-        // item.questionIndex = "";
-        return item;
-      });
-      //更新答题卡
-      let modifyPaper, params;
-      if (this.type == 1) {
-        modifyPaper =
-          this.role == "ROLE_PERSONAL"
-            ? this.$request.pModifyPaper
-            : this.$request.modifyPaper;
-        params = {
-          paperId: this.$route.query.paperId,
-          questionList: questionList,
-        };
-      } else if (this.type == 2) {
-        modifyPaper =
-          this.role == "ROLE_PERSONAL"
-            ? this.$request.pSetExamAnswer
-            : this.$request.setExamAnswer;
-        params = {
-          examId: this.$route.query.paperId,
-          questionList: questionList,
-        };
-      } else {
-        modifyPaper =
-          this.role == "ROLE_PERSONAL"
-            ? this.$request.pSetPeriodAnswer
-            : this.$request.setPeriodAnswer;
-        params = {
-          periodId: this.$route.query.paperId,
-          questionList: questionList,
-        };
-      }
-      const { data, status, info } = await modifyPaper(params);
-      if (status == 0) {
-        this.$router.go(-1);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDetail() {
-      //查询详情
-      let detail;
-      if (this.role == "ROLE_PERSONAL") {
-        detail =
-          this.type == 1
-            ? this.$request.pPaperDetail
-            : this.type == 2
-            ? this.$request.pExamQuestionList
-            : this.$request.pPeriodQuestionList;
-      } else {
-        detail =
-          this.type == 1
-            ? this.$request.fetchPaperDetail
-            : this.type == 2
-            ? this.$request.examQuestionList
-            : this.$request.periodQuestionList;
-      }
-      let params =
-        this.type == 1
-          ? { paperId: this.$route.query.paperId }
-          : this.type == 2
-          ? { examId: this.$route.query.paperId }
-          : {
-              periodId: this.$route.query.paperId,
-            };
-      const { data, status, info } = await detail(params);
-      if (status == 0) {
-        this.form = deepClone(data);
-        this.questionList = deepClone(this.form.questionList || data.list);
-        this.paperModifyLog = {
-          ...this.paperModifyLog,
-          ...this.form.paperModifyLog,
-        };
-        if (!!this.questionList[0]?.subQuestions) {
-          this.questionList?.map((item) => {
-            let types = [{}];
-            let addndex = 0;
-            item.subQuestions.map((sub, index) => {
-              if (!!sub.questionType) {
-                if (
-                  sub.questionType == types[addndex].qusType &&
-                  sub.questionType != 5
-                ) {
-                  //同类型批量答案+1
-                  types[addndex].subNum += 1;
-                  if (
-                    types[addndex].answerOptions.length <
-                    sub.answerOptions.length
-                  ) {
-                    types[addndex].answerOptions = sub.answerOptions;
-                  }
-                  types[addndex].answerList += this.setAnswer(
-                    sub.questionType,
-                    sub.correctAnswer
-                  );
-                  if (index == item.subQuestions.length - 1) {
-                    //循环最后类型数量大于等于5，保存批量答案
-                    if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                      types[addndex].endIndex = sub.questionIndex;
-                      types[addndex].index = index;
-                    }
-                  }
-                } else {
-                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                    //不同类型时如果原有类型数量大于等于5，保存批量答案
-                    types[addndex].endIndex =
-                      item.subQuestions[index - 1].questionIndex;
-                    types[addndex].index = index - 1;
-                    addndex += 1;
-                    types[addndex] = {};
-                  }
-                  //不同类型初始化批量答案
-                  types[addndex].qusType = sub.questionType;
-                  types[addndex].subNum = 1;
-                  types[addndex].answerOptions = sub.answerOptions;
-                  types[addndex].answerList = this.setAnswer(
-                    sub.questionType,
-                    sub.correctAnswer
-                  );
-                }
-              }
-            });
-            for (let i = 0; i < types.length; i++) {
-              if (types[i].qusType == 3) {
-                types[i].answerList = types[i].answerList.slice(0, -1);
-              }
-              if (types[i].subNum >= 5) {
-                item.subQuestions.splice(
-                  types[i].index + i + 1,
-                  0,
-                  deepClone(types[i])
-                );
-              }
-            }
-          });
-        } else {
-          let types = [{}];
-          let addndex = 0;
-          this.questionList?.map((sub, index) => {
-            if (!!sub.questionType) {
-              if (
-                sub.questionType == types[addndex].qusType &&
-                sub.questionType != 5
-              ) {
-                //同类型批量答案+1
-                types[addndex].subNum += 1;
-                if (
-                  types[addndex].answerOptions.length < sub.answerOptions.length
-                ) {
-                  types[addndex].answerOptions = sub.answerOptions;
-                }
-                types[addndex].answerList += this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
-                if (index == this.questionList.length - 1) {
-                  //循环最后类型数量大于等于5，保存批量答案
-                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                    types[addndex].endIndex = sub.questionIndex;
-                    types[addndex].index = index;
-                  }
-                }
-              } else {
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  //不同类型时如果原有类型数量大于等于5，保存批量答案
-                  types[addndex].endIndex =
-                    this.questionList[index - 1].questionIndex;
-                  types[addndex].index = index - 1;
-                  addndex += 1;
-                  types[addndex] = {};
-                }
-                //不同类型初始化批量答案
-                types[addndex].qusType = sub.questionType;
-                types[addndex].subNum = 1;
-                types[addndex].answerOptions = sub.answerOptions;
-                types[addndex].answerList = this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
-              }
-            }
-          });
-          for (let i = 0; i < types.length; i++) {
-            if (types[i].qusType == 3) {
-              types[i].answerList = types[i].answerList.slice(0, -1);
-            }
-            if (types[i].subNum >= 5) {
-              item.subQuestions.splice(
-                types[i].index + i + 1,
-                0,
-                deepClone(types[i])
-              );
-            }
-          }
-        }
-        console.log(this.questionList);
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.content {
-  width: 100%;
-  box-sizing: border-box;
-  padding: 0 50px;
-  .ml-20 {
-    margin-left: 20px;
-  }
-  .btn-box {
-    width: calc(100% - 240px);
-    position: fixed;
-    right: 40px;
-    bottom: 20px;
-    padding: 10px 0 20px;
-    background: #fff;
-    text-align: right;
-    margin-left: 140px;
-    z-index: 10;
-  }
-  .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: 20px 0;
-  .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;
-  }
-}
-.set-ans-btn {
-  width: 100%;
-  padding: 10px 0 10px 630px;
-  box-sizing: border-box;
-  border-bottom: 1px solid #e2e2e2;
-  border-right: 1px solid #e2e2e2;
-}
-.el-input-number {
-  width: 140px;
-}
-
-.questions-ul {
-  border-left: 1px solid #e2e2e2;
-  border-top: 1px solid #e2e2e2;
-  margin: 12px 0;
-}
-.sub-questions {
-  width: 100%;
-  display: flex;
-  border-bottom: 1px solid #e2e2e2;
-  & > div {
-    min-height: 40px;
-    padding: 5px;
-    flex-shrink: 0;
-    border-right: 1px solid #e2e2e2;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .qs-num {
-    width: 80px;
-  }
-  .qs-type {
-    width: 160px;
-  }
-  .qs-score,
-  .qs-partScore {
-    width: 160px;
-  }
-  .qs-options {
-    flex: 1;
-  }
-  .qs-set {
-    width: 80px;
-  }
-  .qs-options2 {
-    text-align: left;
-    justify-content: flex-start;
-    padding-left: 20px;
-  }
-  .answer-s {
-    cursor: pointer;
-  }
-  :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;
-    }
-  }
-}
-.set-questions {
-  .answer-box {
-    .answer-s {
-      cursor: pointer;
-      user-select: none;
-      &:first-of-type {
-        margin-left: 0;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/examinationPaper/index.vue b/src/views/standard/examinationPaper/index.vue
deleted file mode 100644
index 6c3fe42..0000000
--- a/src/views/standard/examinationPaper/index.vue
+++ /dev/null
@@ -1,537 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>备题组卷</span>
-      </template>
-      <template slot="btns">
-        <el-button
-          type="primary"
-          size="mini"
-          icon="el-icon-plus"
-          plain
-          @click="toAdd({})"
-        >
-          添加答题卡</el-button
-        >
-      </template>
-    </back-box>
-
-    <div class="answer-header">
-      <div class="sel-box">
-        <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.subjectName"
-          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
-          class="sel"
-          v-model="query.tagId"
-          placeholder="选择类型"
-          @change="_QueryData()"
-        >
-          <el-option
-            v-for="item in typeList"
-            :key="item.label"
-            :label="item.label"
-            :value="item.value"
-            >{{ item.label }}
-          </el-option>
-        </el-select>
-        <el-input
-          placeholder="试卷名称"
-          v-model="query.title"
-          class="input-with-select"
-          @keyup.enter.native="_QueryData(true)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(true)"
-          ></el-button>
-        </el-input>
-      </div>
-    </div>
-    <p class="tips" v-show="archivedTotal">
-      <span>回收站内已有{{ archivedTotal }}份答题卡,</span>
-      <router-link to="/examinationPaperRecycle">点击查看&gt;&gt;</router-link>
-    </p>
-    <ul class="content" v-if="tableData && tableData.length">
-      <li class="item" v-for="item in tableData" :key="item.id">
-        <div class="pic-box">
-          <p class="i-box"><i class="fa fa-map-o"></i></p>
-          <p class="ids">{{ item.id }}</p>
-        </div>
-        <div class="info">
-          <p class="title">
-            {{ item.title }}
-            <span class="label" v-if="!!item.tag">{{ item.tag }}</span>
-          </p>
-          <p class="num">
-            总题数：{{ item.questionNum }}
-            <em class="s-line">|</em>
-            预计时长：{{ item.examsDuration }}
-            <em class="s-line">|</em>
-            授课端同步：
-            <span
-              class="clazz"
-              v-for="(clazzChild, indexs) in item.classList"
-              :key="clazzChild.classId"
-              :class="clazzChild.keepStatus == 1?'active':''"
-              >{{
-                `${clazzChild.className}${
-                  indexs != item.classList.length - 1 ? "、" : ""
-                }`
-              }}
-              <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
-            ></span>
-            <el-tooltip effect="dark" content="刷新同步状态" placement="right">
-              <i class="icon-refresh el-icon-refresh" @click="refreshStic"></i>
-            </el-tooltip>
-          </p>
-          <p class="person">
-            {{ item.realName }}<em class="s-line">|</em
-            ><span class="date">{{ item.modifiedTime }}</span>
-          </p>
-        </div>
-        <div class="btn-box">
-          <el-tooltip effect="dark" content="修改答案" placement="bottom">
-            <el-button
-              class="edit"
-              type="primary"
-              size="mini"
-              circle
-              icon="el-icon-edit"
-              @click="toEdit(item)"
-            ></el-button>
-          </el-tooltip>
-          <el-dropdown
-            trigger="click"
-            @command="handleDropdownClick($event, item)"
-          >
-            <el-button
-              type="info"
-              size="mini"
-              circle
-              icon="el-icon-more"
-            ></el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item :command="1" v-if="userName == item.realName"
-                >修改分享范围</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>
-      </li>
-    </ul>
-    <div class="pagination-box">
-      <el-pagination
-        small=""
-        layout="total,prev, pager, next"
-        :hide-on-single-page="true"
-        :total="total"
-        @current-change="changePage"
-        :current-page="page"
-        :page-size="size"
-      >
-      </el-pagination>
-    </div>
-    <el-empty
-      v-if="!loading && tableData.length == 0"
-      content="没有更多数据"
-      :image-size="100"
-    ></el-empty>
-    <el-dialog :close-on-click-modal="false" title="选择分享范围" :visible.sync="dialogVisible" width="400">
-      <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
-        <el-form-item prop="share" label="分享范围：">
-          <el-radio-group v-model="shareForm.sharingType">
-            <el-radio :label="0">任课班级分享</el-radio>
-            <el-radio :label="1">全年级分享</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="saveShare">确 定</el-button>
-        <el-button @click="dialogVisible = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "examinationPaper",
-  data() {
-    return {
-      loading: false,
-      userName: "",
-      dialogVisible: false,
-      query: {
-        classId: "",
-        subjectName: "",
-        tagId: "",
-        title: "",
-      },
-      classList: [],
-      subjectList: [],
-      typeList: [],
-      archivedTotal: 0, //已归档答题卡数量
-      tableData: null,
-      shareForm: {
-        id: "",
-        sharingType: 0, //0-任课班级/1-全年级
-      },
-      shareRulesForm: {
-        sharingType: [
-          { required: true, message: "选择分享范围", trigger: "blur" },
-        ],
-      },
-      total: 0,
-      page: 1,
-      size: 20,
-    };
-  },
-  async created() {
-    this.userName = this.$store.getters.info.name || "";
-    await this._QueryClassList();
-    await this._QuerySubjectList();
-    this._QueryData();
-    this._QueryTypeList();
-  },
-  methods: {
-    refreshStic(){
-      setTimeout(function(){
-        window.location.reload()
-      },500)
-    },
-    toAdd(query) {
-      let routerItem = {
-        path: "/examinationPaperAdd",
-      };
-      query ? (routerItem["query"] = { ...query }) : "";
-      this.$router.push(routerItem);
-    },
-    toEdit(item) {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: item.id,
-        },
-      });
-    },
-    handleDropdownClick(value, item) {
-      //更多
-      const that = this;
-      switch (value) {
-        case 1:
-          //修改分享范围
-          that.shareForm.id = item.id;
-          that.shareForm.sharingType = item.sharingType;
-          that.dialogVisible = true;
-          break;
-        case 2:
-          //复制
-          that.toAdd({ type: 2, paperId: item.id });
-          break;
-        case 3:
-          //归档
-          that.recovery(item);
-          break;
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData(this.query.title);
-    },
-    async saveShare() {
-      //修改分享范围
-      const { data, status, info } = await this.$request.modifyPaper({
-        paperId: this.shareForm.id,
-        sharingType: this.shareForm.sharingType,
-      });
-      if (status === 0) {
-        this.shareForm.id = "";
-        this.shareForm.sharingType = 1;
-        this.dialogVisible = false;
-        this.$message.success(info);
-        this._QueryData(this.query.title == "");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async recovery(item) {
-      //归档
-      const { data, status, info } = await this.$request.modifyPaper({
-        paperId: item.id,
-        status: 2,
-      });
-      if (status === 0) {
-        let type = this.query.title ? 1 : 0;
-        this.page = 1;
-        this._QueryData(type);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //切换班级
-    async changClazz() {
-      await this._QuerySubjectList();
-      this._QueryData(false);
-    },
-    // 查找答题卡类型
-    async _QueryTypeList() {
-      const { data, status, info } = await this.$request.fetchTypeNames({
-        classId: this.query.classId,
-        type: 0,
-      });
-      if (status === 0) {
-        this.typeList =
-          data.list.map((item) => {
-            return {
-              value: item.tagId,
-              label: item.tag,
-            };
-          }) || [];
-        this.typeList.unshift({
-          value: "",
-          label: "请选择标签",
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找班级
-    async _QueryClassList() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.fetchClassList();
-      console.log(status);
-      if (status === 0) {
-        if (!!data.list) {
-          this.classList =
-            data.list?.map((item) => {
-              return {
-                value: item.classId,
-                label: item.className,
-              };
-            }) || [];
-          this.query.classId = this.classList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找科目
-    async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.fetchSubjectList({
-        classId: this.query.classId,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        this.query.subjectName = this.subjectList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData(type) {
-      this.loading = true;
-      //获取答题卡列表
-      let query = {};
-      if (!type) {
-        this.query.title = "";
-        query = { ...this.query };
-      } else {
-        query = { title: this.query.title };
-        this.query.tagId = "";
-        // this.query.subjectName = "";
-      }
-      query.classId = this.query.classId;
-      query.subjectName = this.query.subjectName;
-      for (let key in query) {
-        if (!query[key]) {
-          query[key] = null;
-        }
-      }
-      if (!query.classId) {
-        this.total = 0;
-        this.tableData = [];
-        this.loading = false;
-        return;
-      }
-      this.loading = true;
-      const { data, status, info } = await this.$request.fetchPaperList({
-        ...query,
-        status: 1,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.archivedTotal = data.archivedTotal;
-        this.total = data.total;
-        this.tableData = (data.list && [...data.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.tips {
-  display: flex;
-  padding-left: 30px;
-  line-height: 16px;
-  font-size: 14px;
-  color: #999;
-  margin-bottom: 10px;
-}
-.content {
-  margin: 0 20px;
-  background: #f8f8f8;
-  padding: 12px;
-  border-radius: 20px;
-  .item {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    overflow: hidden;
-    box-sizing: border-box;
-    padding: 12px;
-    border-radius: 20px;
-    background: #fff;
-    margin-bottom: 12px;
-    &:last-of-type {
-      margin-bottom: 0;
-    }
-    .pic-box {
-      width: 80px;
-      height: 80px;
-      border-radius: 10px;
-      margin-right: 10px;
-      flex-shrink: 0;
-      background: #667ffd;
-      text-align: center;
-      color: #fff;
-      font-weight: 500;
-      .i-box {
-        padding-top: 10px;
-        font-size: 32px;
-        margin-bottom: 3px;
-      }
-    }
-    .info {
-      min-height: 80px;
-      flex: 1;
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      .s-line {
-        padding: 0 5px;
-        color: #e2e2e2;
-      }
-      .title {
-        font-size: 16px;
-        color: #222;
-        font-weight: 500;
-        .label {
-          display: inline-block;
-          font-size: 12px;
-          color: #2e9afe;
-          line-height: 16px;
-          padding: 0 10px;
-          border: 1px solid #2e9afe;
-          border-radius: 10px;
-          transform: translateY(-2px);
-        }
-      }
-      .person {
-        color: #666;
-      }
-    }
-    .clazz {
-      font-size: 14px;
-      font-weight: 500;
-      position: relative;
-      position: relative;
-      &.active {
-        color: #667ffd;
-      }
-      .el-icon-success {
-        position: absolute;
-        right: 0;
-        top: -5px;
-        color: #667ffd;
-      }
-      &:last-of-type {
-        .el-icon-success {
-          right: -18px;
-        }
-      }
-    }
-    .btn-box {
-      flex-shrink: 0;
-      .edit {
-        margin-right: 12px;
-      }
-    }
-    .icon-refresh{
-      margin-left:20px;
-      cursor: pointer;
-      &:hover{
-        color:#2e9afe
-      }
-    }
-  }
-}
-.answer-header {
-  .sel-box {
-    .sel {
-      min-width: 160px;
-    }
-    :deep(.el-cascader__tags) {
-      flex-wrap: nowrap;
-    }
-  }
-}
-.dialog-footer {
-  text-align: center;
-  :deep(.el-button) {
-    border-radius: 20px;
-    padding: 8px 20px 7px;
-    margin: 0 12px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/examinationPaper/recycle.vue b/src/views/standard/examinationPaper/recycle.vue
deleted file mode 100644
index 110986a..0000000
--- a/src/views/standard/examinationPaper/recycle.vue
+++ /dev/null
@@ -1,411 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>已归档答题卡</span>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <!-- <el-cascader size="small"
-          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.subjectName"
-          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
-          class="sel"
-          v-model="query.tagId"
-          placeholder="选择类型"
-          @change="_QueryData()"
-        >
-          <el-option
-            v-for="item in typeList"
-            :key="item.label"
-            :label="item.label"
-            :value="item.value"
-            >{{ item.label }}
-          </el-option>
-        </el-select>
-
-        <el-input
-          placeholder="输入试卷名称"
-          v-model="query.title"
-          class="input-with-select"
-          @keyup.enter.native="_QueryData(true)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(true)"
-          ></el-button>
-        </el-input>
-      </div>
-    </div>
-    <ul class="content" v-loading="loading">
-      <li class="item" v-for="item in tableData" :key="item.id">
-        <div class="pic-box">
-          <p class="i-box"><i class="fa fa-map-o"></i></p>
-          <p class="ids">{{ item.id }}</p>
-        </div>
-        <div class="info">
-          <p class="title">
-            {{ item.title }} <span class="label" v-if="item.tag">{{ item.tag }}</span>
-          </p>
-          <p class="num">
-            {{ item.gradeName }}
-            <em class="s-line">|</em>
-            总题数：{{ item.questionNum }}
-            <em class="s-line">|</em>
-            预计时长：{{ item.examsDuration }}
-          </p>
-          <p class="person">
-            {{ item.realName }}<em class="s-line">|</em
-            ><span class="date">{{ item.modifiedTime }}</span>
-          </p>
-        </div>
-        <div class="btn-box">
-          <el-tooltip effect="dark" content="恢复" placement="bottom">
-            <el-button
-              class="edit"
-              type="info"
-              size="mini"
-              circle
-              icon="fa fa-mail-reply"
-              @click="modify(item)"
-            ></el-button>
-          </el-tooltip>
-          <el-popconfirm title="确定删除这张答题卡吗？" @confirm="remove(item)">
-            <el-button
-              slot="reference"
-              class="delete"
-              type="info"
-              size="mini"
-              circle
-              icon="el-icon-delete"
-            ></el-button>
-          </el-popconfirm>
-        </div>
-      </li>
-    </ul>
-    <div class="pagination-box">
-      <el-pagination
-        small=""
-        layout="total,prev, pager, next"
-        :hide-on-single-page="true"
-        :total="total"
-        @current-change="changePage"
-        :current-page="page"
-        :page-size="size"
-      >
-      </el-pagination>
-    </div>
-    <el-empty :image-size="100" v-if="!tableData.length&&loading==false" description="没有更多数据"></el-empty>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      loading:false,
-      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: {
-        classId: "",
-        subjectName: "",
-        tagId: "",
-        title: "",
-      },
-      classList: [],
-      subjectList: [],
-      typeList: [],
-      tableData: [],
-      total: 0,
-      page:1,
-      size:20
-    };
-  },
-  async created() {
-    await this._QueryClassList();
-    await this._QuerySubjectList();
-    this._QueryTypeList();
-    this._QueryData(false);
-  },
-  methods: {
-    async modify(obj) {
-      //恢复答题卡
-      const { data, status, info } = await this.$request.modifyPaper({
-        paperId: obj.id,
-        status: 1,
-      });
-      if (status == 0) {
-        let type = this.query.title ? 1 : 0;
-        this._QueryData(type);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async remove(obj) {
-      //删除答题卡
-      const { data, status, info } = await this.$request.delPaper({
-        paperId: obj.id,
-      });
-      if (status == 0) {
-        let type = this.query.title ? 1 : 0;
-        this._QueryData(type);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //切换班级
-    async changClazz() {
-      await this._QuerySubjectList();
-      this._QueryData(false);
-    },
-    changePage(page){
-      this.page = page
-      this._QueryData(this.query.title)
-    },
-    async _QueryData(type) {
-      //获取答题卡列表
-      this.loading=true
-      let query = {};
-      if (!type) {
-        this.query.title = "";
-        query = { ...this.query };
-      } else {
-        query = { title: this.query.title };
-        this.query.type = "";
-        this.query.subjectId = "";
-      }
-       query.classId = this.query.classId;
-      for (let key in query) {
-        if (!query[key]) {
-          query[key] = null;
-        }
-      }
-      const { data, status, info } = await this.$request.fetchPaperList({
-        ...query,
-        status:2,
-        page:this.page,
-        size:this.size
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.total = data.total;
-        this.tableData = (data.list && [...data.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找班级
-    async _QueryClassList() {
-      const { data, status, info } = await this.$request.fetchClassList();
-      console.log(status);
-      if (status === 0) {
-        if (!!data.list) {
-          this.classList = data.list?.map((item) => {
-            return {
-              value: item.classId,
-              label: item.className,
-            };
-          })||[];
-          this.query.classId = this.classList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找科目
-    async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.fetchSubjectList({
-        classId: this.query.classId,
-      });
-      if (status === 0) {
-        this.subjectList = data.subjectNames?.map((item) => {
-          return {
-            value: item,
-            label: item,
-          };
-        })||[];
-        this.query.subjectName = this.subjectList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    // 查找答题卡类型
-    async _QueryTypeList() {
-      const { data, status, info } = await this.$request.fetchTypeNames({
-        classId: this.query.classId,
-        tyle:0
-      });
-      if (status === 0) {
-        this.typeList =
-          data.list?.map((item) => {
-            return {
-              value: item.tagId,
-              label: item.tag,
-            };
-          }) || [];
-        this.typeList.unshift({
-          value: "",
-          label: "请选择标签",
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.answer-header {
-  .sel-box {
-    .sel {
-      min-width: 160px;
-    }
-    :deep(.el-cascader__tags) {
-      flex-wrap: nowrap;
-    }
-  }
-}
-.content {
-  margin: 0 20px;
-  background: #f8f8f8;
-  padding: 12px;
-  border-radius: 20px;
-  .item {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    overflow: hidden;
-    box-sizing: border-box;
-    padding: 12px;
-    border-radius: 20px;
-    background: #fff;
-    margin-bottom: 12px;
-    &:last-of-type {
-      margin-bottom: 0;
-    }
-    .pic-box {
-      width: 80px;
-      height: 80px;
-      border-radius: 10px;
-      margin-right: 10px;
-      flex-shrink: 0;
-      background: #d7d7d7;
-      text-align: center;
-      color: #fff;
-      font-weight: 500;
-      .i-box {
-        padding-top: 10px;
-        font-size: 32px;
-        margin-bottom: 3px;
-      }
-    }
-    .info {
-      height: 80px;
-      flex: 1;
-      overflow: hidden;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      .s-line {
-        padding: 0 5px;
-        color: #e2e2e2;
-      }
-      .title {
-        font-size: 16px;
-        color: #222;
-        font-weight: 500;
-        .label {
-          display: inline-block;
-          font-size: 12px;
-          color: #2e9afe;
-          line-height: 16px;
-          padding: 0 10px;
-          border: 1px solid #2e9afe;
-          border-radius: 10px;
-          transform: translateY(-2px);
-        }
-      }
-      .person {
-        color: #666;
-      }
-    }
-    .btn-box {
-      flex-shrink: 0;
-      .edit {
-        margin-right: 12px;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/account.vue b/src/views/standard/setUp/account.vue
deleted file mode 100644
index 58ed870..0000000
--- a/src/views/standard/setUp/account.vue
+++ /dev/null
@@ -1,764 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>账号管理</span>
-      </template>
-      <template slot="btns" v-if="role == 'ROLE_JITUAN'">
-        <!-- 暂未有接口 -->
-        <!-- <el-tooltip effect="dark" content="导入账号" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-upload2"
-            size="mini"
-            plain
-            circle
-            @click="diaUp = true"
-          ></el-button>
-        </el-tooltip> -->
-        <el-tooltip
-          effect="dark"
-          content="添加账号"
-          placement="bottom"
-          v-if="!code"
-        >
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            plain
-            circle
-            @click="openAddDia"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="账号同步" placement="bottom" v-else>
-          <el-button
-            v-loading="syncLoading"
-            type="primary"
-            icon="el-icon-refresh"
-            size="mini"
-            plain
-            circle
-            @click="refreshAcc"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-cascader
-          size="small"
-          v-if="role == 'ROLE_JITUAN'"
-          class="sel"
-          clearable
-          placeholder="选择学校"
-          v-model="query.schoolIds"
-          :options="schoolList"
-          :props="props"
-          :show-all-levels="false"
-        ></el-cascader>
-        <el-select
-          v-else
-          class="sel"
-          v-model="query.roleId"
-          placeholder="选择账号角色"
-          @change="(page = 1), _QueryData(1)"
-        >
-          <el-option
-            v-for="item in roleList"
-            :key="item.id"
-            :label="item.roleName"
-            :value="item.id"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          class="sel"
-          v-model="query.available"
-          placeholder="选择账号状态"
-          @change="(page = 1), _QueryData(1)"
-        >
-          <el-option label="正常" :value="0"></el-option>
-          <el-option label="禁用" :value="1"></el-option>
-        </el-select>
-        <el-input
-          :placeholder="role != 'ROLE_JITUAN' ? '请输入老师账号' : '请输入账号'"
-          v-model="query.loginName"
-          class="input-with-select sel"
-          type="number"
-          clearable
-          oninput="if(value.length > 11) value = value.slice(0,11)"
-          @keyup.enter.native="(page = 1), _QueryData(2)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="(page = 1), _QueryData(2)"
-          ></el-button>
-        </el-input>
-        <el-input
-          placeholder="请输入老师姓名"
-          maxlength="30"
-          v-model="query.realName"
-          class="input-with-select"
-          clearable
-          @keyup.enter.native="(page = 1), _QueryData(3)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="(page = 1), _QueryData(3)"
-          ></el-button>
-        </el-input>
-        <el-button
-          v-if="role == 'ROLE_JITUAN'"
-          type="primary"
-          round
-          @click="(page = 1), _QueryData(4)"
-          >筛选</el-button
-        >
-      </div>
-    </div>
-    <div class="table-box">
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        v-loading="loading"
-      >
-        <el-table-column
-          prop="loginName"
-          label="账号"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="realName"
-          label="姓名"
-          align="center"
-        ></el-table-column>
-        <el-table-column prop="roleList" label="角色" align="center">
-          <template slot-scope="scoped">
-            <span v-for="(item, index) in scoped.row.roleList" :key="item.id">{{
-              `${item.roleName}${
-                index != scoped.row.roleList.length - 1 ? "、" : ""
-              }`
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="role == 'ROLE_JITUAN'"
-          prop="regionList"
-          label="管辖范围"
-          align="center"
-        >
-          <template slot-scope="scoped" v-if="scoped.row.schoolList.length">
-            <span v-for="item in scoped.row.schoolList" :key="item.id">{{
-              item.schoolName
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="available" label="状态" align="center"
-          ><template slot-scope="scoped">{{
-            `${scoped.row.available == 0 ? "正常" : "禁用"}`
-          }}</template></el-table-column
-        >
-        <el-table-column
-          prop="createdTime"
-          label="创建时间"
-          align="center"
-          width="200"
-        ></el-table-column>
-        <el-table-column label="操作" align="center" width="160" v-if="!code">
-          <template slot-scope="scoped">
-            <el-tooltip content="修改账号" placement="left">
-              <el-button
-                class="set-count"
-                type="primary"
-                circle
-                icon="el-icon-edit-outline"
-                size="mini"
-                @click="setCount(scoped.row)"
-              ></el-button>
-            </el-tooltip>
-            <el-dropdown
-              trigger="hover"
-              @command="handleDropdownClick($event, scoped.row)"
-            >
-              <el-button
-                type="info"
-                size="mini"
-                circle
-                icon="el-icon-more"
-              ></el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item :command="0">重置密码</el-dropdown-item>
-                <el-dropdown-item :command="1">{{
-                  `${scoped.row.available == 0 ? "禁用" : "启用"}`
-                }}</el-dropdown-item>
-                <el-dropdown-item :command="2">删除</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="pagination-box">
-        <el-pagination
-          layout="total,prev, pager, next"
-          :hide-on-single-page="true"
-          :total="total"
-          @current-change="changePage"
-          :current-page="page"
-          :page-size="size"
-        >
-        </el-pagination>
-      </div>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="修改账号信息" :visible.sync="diaCount" width="400">
-      <el-form
-        class="form-box"
-        :model="formCount"
-        :rules="ruleCount"
-        ref="formCount"
-        label-width="160px"
-      >
-        <el-form-item label="手机号码：" prop="loginName">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入联系电话"
-              v-model.trim="formCount.loginName"
-              clearable
-              maxlength="11"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="姓名：" prop="realName">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入教师姓名"
-              v-model.trim="formCount.realName"
-              clearable
-              maxlength="11"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="saveCount">确 定</el-button>
-        <el-button @click="diaCount = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="添加账号" :visible.sync="diaAdd" width="400">
-      <el-form
-        class="form-box"
-        :model="formAddCount"
-        :rules="ruleAddCount"
-        ref="formAddCount"
-        label-width="160px"
-      >
-        <el-form-item label="手机号码：" prop="phone">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入联系电话"
-              v-model.trim="formAddCount.phone"
-              type="number"
-              clearable
-              oninput="if(value.length > 11) value = value.slice(0,11)"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="密码：" prop="password">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入密码"
-              v-model.trim="formAddCount.password"
-              clearable
-              maxlength="18"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="姓名：" prop="realName">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入姓名"
-              v-model.trim="formAddCount.realName"
-              clearable
-              maxlength="30"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="选择角色：" prop="roleId">
-          <el-col :span="12">
-            <el-select
-              class="sel"
-              v-model="formAddCount.roleId"
-              placeholder="选择角色"
-            >
-              <el-option
-                v-for="item in tenantRoleList"
-                :key="item.id"
-                :label="item.roleName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-          </el-col>
-        </el-form-item>
-        <el-form-item
-          v-if="permissionLevel(formAddCount.roleId) != 6"
-          label="选择管辖范围："
-          :prop="
-            permissionLevel(formAddCount.roleId) == 5 ? 'regionId' : 'schoolId'
-          "
-        >
-          <el-col :span="12">
-            <el-select
-              v-show="permissionLevel(formAddCount.roleId) == 5"
-              class="sel"
-              v-model="formAddCount.regionId"
-              placeholder="选择管辖范围"
-            >
-              <el-option
-                v-for="item in regionList"
-                :key="item.id"
-                :label="item.regionName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
-            <el-select
-              v-show="permissionLevel(formAddCount.roleId) == 4"
-              class="sel"
-              v-model="formAddCount.schoolId"
-              placeholder="选择管辖范围"
-            >
-              <el-option
-                v-for="item in addSelectSchoolList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="saveAddCount">确 定</el-button>
-        <el-button @click="diaAdd = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="导入账号名单" :visible.sync="diaUp" width="600">
-      <up-load
-        id="downTeacher"
-        :url="url"
-        @upSuccess="upSuccess"
-        fileName="教师名单"
-      >
-        <p class="down-txt" slot="down">
-          通过Excel名单导入账号名单，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { encryptLoginPassword } from "@/utils";
-export default {
-  data() {
-    return {
-      code: "",
-      role: "",
-      diaUp: false,
-      diaAdd: false,
-      url: "", //上传地址
-      loading: false,
-      syncLoading: false,
-      diaCount: false,
-      tenantRoleList: [],
-      regionList: [],
-      schoolList: [],
-      schoolAll: [],
-      props: { multiple: true, checkStrictly: true },
-      roleList: [],
-      query: {
-        schoolIds: [],
-        roleId: "",
-        available: "",
-        loginName: "",
-        realName: "",
-      },
-      tableData: [],
-      total: 0,
-      page: 1,
-      size: 20,
-      formCount: {
-        userId: "",
-        loginName: "",
-        realName: "",
-      },
-      ruleCount: {
-        loginName: [
-          { required: true, message: "请输入联系电话", trigger: "blur" },
-        ],
-        realName: [
-          { required: true, message: "请输入教师姓名", trigger: "blur" },
-        ],
-      },
-      formAddCount: {
-        phone: "",
-        realName: "",
-        password: "",
-        roleId: "",
-        regionId: "",
-        schoolId: "",
-      },
-      addSelectSchoolList: [],
-      ruleAddCount: {
-        phone: [{ required: true, message: "请输入联系电话", trigger: "blur" }],
-        realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        roleId: [{ required: true, message: "请选择角色", trigger: "blur" }],
-        regionId: [
-          { required: true, message: "请选择权限区域", trigger: "blur" },
-        ],
-        schoolId: [
-          { required: true, message: "请选择权限区域", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    if (this.role == "ROLE_JITUAN") {
-      this._TenantRoleList();
-      this._RegionList();
-      this.showSchool();
-    } else {
-      this._RoleList();
-    }
-    this._QueryData(4);
-  },
-  methods: {
-    permissionLevel(id) {
-      let permissionLevel;
-      this.tenantRoleList.map((item) => {
-        if (item.id == id) {
-          permissionLevel = item.permissionLevel;
-        }
-      });
-      return permissionLevel;
-    },
-    async refreshAcc() {
-      //长水账号同步
-      if (this.syncLoading) return;
-      this.syncLoading = true;
-      const { data, status, info } = await this.$request.syncUser();
-      this.syncLoading = false;
-      if (status === 0) {
-        this.$message.success("同步中，请稍后刷新重试～");
-        // this._QueryData(4);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 5000,
-      });
-      this.diaUp = false;
-      this._QueryData(4);
-    },
-    async downExcel() {
-      let data = await this.$request.downDevice();
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`账号信息.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    openAddDia() {
-      //添加账号
-      this.formAddCount.phone = "";
-      this.formAddCount.realName = "";
-      this.formAddCount.password = "";
-      this.formAddCount.roleId = "";
-      this.formAddCount.regionId = "";
-      this.formAddCount.schoolId = "";
-      this.diaAdd = true;
-    },
-    saveAddCount() {
-      this.$refs.formAddCount.validate(async (valid) => {
-        if (valid) {
-          let params = { ...this.formAddCount };
-          params.password = encryptLoginPassword(params.password);
-          const { data, status, info } = await this.$request.addUser({
-            ...params,
-          });
-          if (status === 0) {
-            this.$message.success(info);
-            this._QueryData(4);
-            this.diaAdd = false;
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.warning("输入有误请检查！");
-          return false;
-        }
-      });
-    },
-    setCount(obj) {
-      if (this.role != "ROLE_JITUAN") {
-        this.formCount.userId = obj.userId;
-      } else {
-        this.formCount.userId = obj.id;
-      }
-      this.formCount.loginName = obj.loginName;
-      this.formCount.realName = obj.realName;
-      this.diaCount = true;
-    },
-    handleDropdownClick(value, item) {
-      console.log(item);
-      //更多
-      if (value == 2) {
-        this.$confirm("确定要删除这条账号信息吗？", "提示", {
-          customClass: "del-model",
-          cancelButttonText: "取消",
-          confirmButtonText: "确定",
-          type: "warning",
-        }).then(() => {
-          this.updateUser(item, value);
-        });
-      } else {
-        this.updateUser(item, value);
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData(4);
-    },
-
-    saveCount() {
-      this.$refs.formCount.validate(async (valid) => {
-        if (valid) {
-          const { data, status, info } =
-            this.role != "ROLE_JITUAN"
-              ? await this.$request.updateUser({
-                  type: 3,
-                  ...this.formCount,
-                })
-              : await this.$request.tenantUpdateUser({
-                  type: 3,
-                  ...this.formCount,
-                });
-          if (status === 0) {
-            this.$message.success(info);
-            this.diaCount = false;
-            this._QueryData(4);
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.warning("输入有误请检查！");
-          return false;
-        }
-      });
-    },
-    async showSchool() {
-      const { data, status, info } = await this.$request.schoolList();
-      if (status === 0) {
-        (this.addSelectSchoolList = data.list?.map((item) => {
-          return {
-            value: item.id,
-            label: item.schoolName,
-          };
-        })),
-          (this.schoolAll = [
-            {
-              value: 0,
-              label: "全部",
-              children: [...this.addSelectSchoolList],
-            },
-          ]);
-        this.schoolList = [...this.schoolAll, ...this.schoolList];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async updateUser(obj, type) {
-      let query = {};
-      console.log(query);
-      if (type == 1) {
-        query.available = obj.available == 0 ? 1 : 0;
-      }
-      const { data, status, info } =
-        this.role != "ROLE_JITUAN"
-          ? await this.$request.updateUser({
-              userId: obj.userId,
-              type: type,
-              ...query,
-            })
-          : await this.$request.tenantUpdateUser({
-              userId: obj.id,
-              type: type,
-              ...query,
-            });
-      if (status === 0) {
-        this.$message.success(info);
-        this._QueryData(4);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _RoleList() {
-      const { data, status, info } = await this.$request.roleList();
-      if (status === 0) {
-        this.roleList = data.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _TenantRoleList() {
-      //集团-添加账号权限
-      const { data, status, info } = await this.$request.tenantRoleList();
-      if (status === 0) {
-        this.tenantRoleList = data.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _RegionList() {
-      //集团-区域列表
-      const { data, status, info } = await this.$request.regionList();
-      if (status === 0) {
-        this.regionList = [...data.list] || [];
-        this.schoolList = data.list?.map((item) => {
-          let children = item.schoolList?.map((items) => {
-            return {
-              value: items.id,
-              label: items.schoolName,
-            };
-          });
-          return {
-            value: item.id,
-            label: item.regionName,
-            children: children,
-          };
-        });
-        this.schoolList = [...this.schoolAll, ...this.schoolList];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    setQuery(type) {
-      //整理请求参数
-      let query = {};
-      if (type == 1) {
-        query.roleId = this.query.roleId;
-        query.available = this.query.available;
-        this.query.loginName = "";
-        this.query.realName = "";
-      } else if (type == 2) {
-        this.query.roleId = "";
-        this.query.available = "";
-        this.query.schoolIds = [];
-        query.loginName = this.query.loginName;
-        this.query.realName = "";
-      } else if (type == 3) {
-        this.query.schoolIds = [];
-        this.query.roleId = "";
-        this.query.available = "";
-        this.query.loginName = "";
-        query.realName = this.query.realName;
-      } else {
-        query = { ...this.query };
-      }
-      if (this.role == "ROLE_JITUAN") {
-        let isAll = false;
-        query.schoolIds?.map((item) => {
-          if (item.length == 1) {
-            isAll = true;
-          }
-        });
-        query.schoolIds = isAll
-          ? null
-          : query.schoolIds?.map((item) => {
-              return item[1];
-            });
-        delete query.roleId;
-      } else {
-        delete query.schoolIds;
-      }
-      return query;
-    },
-    async _QueryData(type) {
-      let query = this.setQuery(type);
-      this.loading = true;
-      this.tableData = [];
-      let userPage =
-        this.role != "ROLE_JITUAN"
-          ? this.$request.userPage
-          : this.$request.tenantUserPage;
-      const { data, status, info } = await userPage({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
-
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = data.list || [];
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-<style  lang="scss">
-.del-model {
-  .el-message-box__btns button:nth-child(1) {
-    color: #667ffd;
-  }
-}
-</style>
-<style lang="scss" scoped>
-.el-message-box .el-button--default {
-  color: red;
-}
-.set-count {
-  margin-right: 12px;
-}
-.table-box {
-  padding: 0 20px;
-}
-.answer-header {
-  .sel-box {
-    .sel {
-      margin-right: 20px;
-    }
-  }
-  :deep(.el-input-group__append) {
-    padding: 0 20px 0 12px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/archived.vue b/src/views/standard/setUp/archived.vue
deleted file mode 100644
index 89d0b56..0000000
--- a/src/views/standard/setUp/archived.vue
+++ /dev/null
@@ -1,395 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>分班</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <el-steps :active="step" align-center class="step">
-        <el-step title="1 班级归档"></el-step>
-        <el-step title="2 分班后学生名单"></el-step>
-        <el-step title="3 分班后任课老师"></el-step>
-        <el-step title="4 授课端指引"></el-step>
-      </el-steps>
-      <ul v-loading="loading">
-        <li v-show="step == 0">
-          <div class="form-item">
-            <span class="s-txt">选择分班年级：</span>
-            <el-select
-              class="sel"
-              v-model="grade"
-              placeholder="选择年级"
-              @change="changeGrade"
-            >
-              <el-option
-                v-for="item in gradeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </div>
-          <div class="form-item">
-            <span class="s-txt">确定班级：</span>
-            <i class="el-icon-loading" v-show="loadingClass"></i>
-            <div class="check-box" v-if="classList.length && !loadingClass">
-              <p class="all-check">
-                <el-checkbox
-                  :indeterminate="isIndeterminate"
-                  v-model="checkAll"
-                  @change="handleCheckAllChange"
-                  >全选</el-checkbox
-                >
-              </p>
-              <el-checkbox-group
-                v-model="classIds"
-                @change="handleCheckedChange"
-              >
-                <el-checkbox v-for="item in classList" :label="item.id">{{
-                  item.className
-                }}</el-checkbox>
-              </el-checkbox-group>
-            </div>
-          </div>
-          <div class="form-item">
-            <span class="s-txt"></span>
-            <p class="tips">
-              <i class="el-icon-warning"></i
-              >请谨慎操作，班级归档后，学生解除班级关系且相关老师任课信息将不存在。
-            </p>
-          </div>
-          <div class="btn-box">
-            <el-button class="btn" round @click="toClazz">取消</el-button>
-            <el-popconfirm
-              confirm-button-text="确定"
-              cancel-button-text="取消"
-              icon="el-icon-info"
-              icon-color="red"
-              title="确定要将所选班级归档吗？"
-              @confirm="_ClassArchiving"
-            >
-              <el-button class="btn" slot="reference" type="primary" round
-                >归档</el-button
-              >
-            </el-popconfirm>
-          </div>
-        </li>
-        <li v-show="step == 1">
-          <div class="step-item">
-            <up-load
-              id="downTeacher"
-              :url="urlClazz"
-              @upSuccess="upStudentSuccess"
-              fileName="学生名单模板"
-            >
-              <p class="down-txt" slot="down">
-                通过Excel名单导入学生名单模板，点击
-                <el-link type="primary" @click="downStudentExcel"
-                  >导出未分配学生</el-link
-                >
-                。
-              </p>
-            </up-load>
-          </div>
-        </li>
-        <li v-show="step == 2">
-          <div class="step-item">
-            <up-load
-              id="downTeacher"
-              :url="urlTeacher"
-              @upSuccess="upTeacherSuccess"
-              fileName="任课老师名单模板"
-            >
-              <p class="down-txt" slot="down">
-                通过Excel名单导入任课老师名单模板，点击
-                <el-link type="primary" @click="downTeacherExcel"
-                  >导出未分配教师</el-link
-                >。
-              </p>
-            </up-load>
-          </div>
-        </li>
-        <li v-show="step == 3">
-          <div class="step-item2">
-            <p class="p2">
-              <el-button
-                class="btn"
-                type="success"
-                icon="el-icon-check"
-                circle
-                size="small"
-              ></el-button
-              >恭喜您，分班已经完成，分班后老师第一次上课时注意事项：
-            </p>
-            <p class="p1">
-              1、点击授课端的设置—应用设置—初始化设置—重新选择绑定班级。
-            </p>
-            <p class="p1">
-              2、点击授课端的设置—班级名册—基站登录—学生完成基站绑定。
-            </p>
-          </div>
-        </li>
-
-        <li v-show="step != 0">
-          <div class="btn-box">
-            <el-button class="btn" round @click="step -= 1">上一步</el-button>
-            <el-button
-              v-show="step != 3"
-              class="btn"
-              type="primary"
-              round
-              @click="step += 1"
-              >下一步</el-button
-            ><el-button
-              v-show="step == 3"
-              class="btn"
-              type="primary"
-              round
-              @click="toClazz"
-              >完成</el-button
-            >
-          </div>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-import { downloadFile } from "utils";
-export default {
-  data() {
-    return {
-      loading: false,
-      loadingClass: false,
-      loadingDown: false,
-      step: 0,
-      grade: "",
-      gradeList: [],
-      classIds: [],
-      classList: [],
-      urlClazz: "/api_html/school/manager/importClassAndStudent",
-      urlTeacher: "/api_html/school/manager/importTeacher",
-      checkAll: true,
-      isIndeterminate: false,
-    };
-  },
-  created() {
-    this._QueryDataGrade();
-  },
-  methods: {
-    handleCheckAllChange(val) {
-      this.classIds = val
-        ? this.classList.map((item) => {
-            return item.id;
-          })
-        : [];
-      this.isIndeterminate = false;
-    },
-    handleCheckedChange(value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.classList.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.classList.length;
-    },
-    toClazz() {
-      this.$router.push({
-        path: "/setUpClazz",
-      });
-    },
-    //切换年级
-    changeGrade() {
-      this._QueryClass();
-    },
-    //学生名单上传成功回调
-    upStudentSuccess(res) {
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 10000,
-      });
-    },
-    //任课老师名单上传成功回调
-    upTeacherSuccess(res) {
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 10000,
-      });
-    },
-    //导出学生名单
-    async downStudentExcel() {
-      this.loadingDown = true;
-      let data = await this.$request.exportNoClassStudent();
-      this.loadingDown = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("未分配学生名单.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    //导出任课老师名单
-    async downTeacherExcel() {
-      this.loadingDown = true;
-      let data = await this.$request.exportNoClassTeacher();
-      this.loadingDown = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("未分配教师 名单.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    //班级归档
-    async _ClassArchiving() {
-      if (!this.classIds.length) {
-        this.$message.warning("班级不能为空，请选择班级～");
-        return;
-      }
-      this.loading = true;
-      const { status, info } = await this.$request.classArchiving({
-        classIds: [...this.classIds],
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.$message.success("班级归档成功！");
-        this.step = 1;
-        this._QueryDataGrade();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //年级列表
-    async _QueryDataGrade() {
-      const { data, status, info } = await this.$request.gradeList();
-      if (status === 0) {
-        this.gradeList =
-          data.list?.map((item) => {
-            return {
-              value: item.grade,
-              label: item.gradeName,
-            };
-          }) || [];
-        this.grade = this.gradeList[0]?.value;
-        this._QueryClass();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //班级列表
-    async _QueryClass() {
-      this.classList = [];
-      this.loadingClass = true;
-      const { data, status, info } = await this.$request.schoolClassList({
-        grade: this.grade,
-      });
-      this.loadingClass = false;
-      if (status === 0) {
-        this.classList = (data.list && [...data.list]) || [];
-        this.classIds = this.classList.map((item) => {
-          return item.id;
-        });
-        this.checkAll = true;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  width: 100%;
-  padding: 20px;
-  box-sizing: border-box;
-}
-.step {
-  margin-bottom: 40px;
-}
-.form-item {
-  width: 70%;
-  display: flex;
-  margin: 0 auto 20px;
-  .check-box {
-    flex: 1;
-  }
-  .all-check {
-    margin-right: 30px;
-  }
-  &:first-of-type {
-    .s-txt {
-      line-height: 40px;
-    }
-  }
-  .s-txt {
-    width: 160px;
-    flex-shrink: 0;
-  }
-  .sel {
-    :deep(.el-input__inner) {
-      border-radius: 20px;
-    }
-  }
-  :deep(.el-checkbox) {
-    margin-bottom: 12px;
-  }
-  .tips {
-    display: flex;
-    align-items: center;
-    color: #666;
-  }
-  .el-icon-warning {
-    font-size: 20px;
-    color: #ec7f8c;
-    margin-right: 10px;
-  }
-}
-.btn-box {
-  width: 80%;
-  margin: 60px auto 0;
-  display: flex;
-  justify-content: flex-end;
-  .btn {
-    margin: 0 10px;
-  }
-}
-.step-item {
-  text-align: center;
-}
-.step-item2 {
-  width: 100%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  color: #000;
-  font-weight: 500;
-  .p2 {
-    font-size: 16px;
-    margin: 0 0 20px -68px;
-    .btn {
-      margin-right: 14px;
-    }
-  }
-  .p1 {
-    width: 450px;
-    text-align: left;
-    margin-bottom: 20px;
-  }
-}
-:deep(.down-txt) {
-  justify-content: center;
-  padding-left: 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/archivedClazz.vue b/src/views/standard/setUp/archivedClazz.vue
deleted file mode 100644
index 1540917..0000000
--- a/src/views/standard/setUp/archivedClazz.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>已归档班级</span>
-      </template>
-    </back-box>
-    <div class="page-content" v-loading="loading">
-      <el-table :data="tableData" border style="width: 100%">
-        <el-table-column
-          prop="gradeName"
-          label="年级"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="className"
-          label="班级名称"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="studentCount"
-          label="学生数量"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="modifiedTime"
-          label="归档时间"
-          fixed
-          align="center"
-        ></el-table-column>
-      </el-table>
-    </div>
-    <!-- <div class="pagination-box">
-      <el-pagination
-        small=""
-        layout="total,prev, pager, next"
-        :hide-on-single-page="true"
-        :total="total"
-        @current-change="changePage"
-        :current-page="page"
-        :page-size="size"
-      >
-      </el-pagination>
-    </div> -->
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      role: "",
-      loading: false,
-      tableData: [],
-      total: 0,
-      page: 1,
-      size: 20,
-    };
-  },
-  async created() {
-    this._QueryData();
-  },
-  methods: {
-    changePage(page) {
-      this.page = page;
-      this._QueryData(this.query.title);
-    },
-    async _QueryData() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.archivingClassList();
-      this.loading = false;
-      if (status === 0) {
-        this.total = data.total;
-        this.tableData = (data.list && [...data.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/clazz.vue b/src/views/standard/setUp/clazz.vue
deleted file mode 100644
index ae01e44..0000000
--- a/src/views/standard/setUp/clazz.vue
+++ /dev/null
@@ -1,662 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>班级管理</span>
-      </template>
-      <template slot="btns" v-if="!code">
-        <el-tooltip effect="dark" content="导入班级名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-upload2"
-            size="mini"
-            plain
-            circle
-            @click="diaUp = true"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="导出班级名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            size="mini"
-            plain
-            circle
-            @click="exportTeacherExl"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="分班" placement="bottom">
-          <img
-            @click="toArchived"
-            src="../../../assets/images/fenban.png"
-            class="fenban"
-            alt=""
-          />
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="grade-box">
-        <div class="grade-item" v-for="(item, index) in dataList">
-          <p class="h-title">
-            <span>{{ item.gradeName }}</span>
-            <span class="s-num" v-if="item.classList"
-              >（共{{ item.classList.length }}个班）</span
-            >
-            <el-button
-              class="sub-btn"
-              type="info"
-              size="mini"
-              round
-              plain
-              @click="openSubject(item)"
-              >科目管理({{ item.subjectNames.length }})</el-button
-            >
-            <span class="txt" v-if="index == 0">拖动班级进行排序</span>
-          </p>
-          <draggable
-            tag="ul"
-            class="grade-info"
-            v-model="item.classList"
-            @start="start"
-            @end="end(item)"
-            v-bind="{
-              animation: 300,
-            }"
-          >
-            <li class="clazz-li" v-for="clazz in item.classList" :key="item.id">
-              <div class="clazz-item">
-                <i
-                  class="el-icon-edit"
-                  @click.stop="setClass(clazz, item.gradeName)"
-                ></i>
-                <p class="clazz-name ellipsis">
-                  {{ clazz.className }}
-                </p>
-                <div class="clazz-class">
-                  <p>学生：{{ clazz.studentCount }}个</p>
-                  <p>教师：{{ clazz.teacherCount }}个</p>
-                </div>
-              </div>
-            </li>
-          </draggable>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="导入班级名单"
-      :visible.sync="diaUp"
-      width="600"
-    >
-      <up-load :url="url" @upSuccess="upSuccess" fileName="班级名单">
-        <p class="down-txt" slot="down">
-          通过Excel名单导入班级名单，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="修改班级"
-      :visible.sync="diaClass"
-      width="400"
-    >
-      <el-form
-        ref="formClass"
-        :model="formClass"
-        :rules="rulesClass"
-        label-width="160px"
-      >
-        <el-form-item label="所在年级：">
-          <span>{{ formClass.gradeName }}</span>
-        </el-form-item>
-        <el-form-item label="班级名称：" prop="studentName">
-          <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formClass.className" />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="班级编码：">
-          <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formClass.classCode" />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="入学年份：">
-          <el-col :span="10">
-            <el-date-picker
-              v-model="formClass.intoSchoolYear"
-              type="year"
-              placeholder="选择年"
-            >
-            </el-date-picker>
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="_SaveClass" type="primary">确 定</el-button>
-        <el-button @click="diaClass = false">取 消</el-button>
-        <el-popconfirm
-          v-if="!formClass.teacherCount && !formClass.studentCount"
-          title="确定删除该班级吗？"
-          @confirm="_RemoveClass"
-        >
-          <el-button class="el-button-del" slot="reference" type="danger" plain
-            >删 除</el-button
-          >
-        </el-popconfirm>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      :visible.sync="diaSubject"
-      width="400"
-    >
-      <p slot="title" class="dia-tit">
-        {{ formClass.gradeName }}
-        <span class="tips">（默认科目和已经有任课老师的科目不能删除）</span>
-      </p>
-      <el-form class="form-box" label-width="80px" v-loading="loadingSub">
-        <el-form-item label="科目：">
-          <div class="subject-box">
-            <el-checkbox-group v-model="subjectNames">
-              <p
-                class="p1"
-                v-for="(item, index) in subjectList"
-                :key="item.default"
-              >
-                <el-checkbox v-if="!item.checked" :label="item.value">{{
-                  item.value
-                }}</el-checkbox>
-                <el-input
-                  class="sub-ipt"
-                  v-else
-                  v-model="item.value"
-                  @keyup.enter.native="_EditSub(item)"
-                ></el-input>
-                <i
-                  class="el-icon el-icon-edit"
-                  v-show="!item.checked"
-                  @click="item.checked = true"
-                ></i>
-                <i
-                  class="el-icon el-icon-check"
-                  v-show="item.checked"
-                  @click="_EditSub(item)"
-                ></i>
-                <!-- <i
-                  class="el-icon el-icon-close"
-                  v-show="item.checked"
-                  @click="resetSub(item)"
-                ></i> -->
-                <i
-                  v-show="!item.checked"
-                  class="el-icon el-icon-delete"
-                  @click="_DelSubject(item, index)"
-                ></i>
-              </p>
-            </el-checkbox-group>
-          </div>
-          <el-col :span="8">
-            <el-input
-              placeholder="添加科目"
-              v-model.trim="subjectName"
-              maxlength="30"
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-plus"
-                @click="addSubjectName"
-              ></i>
-            </el-input>
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="_SaveSubject" type="primary">确 定</el-button>
-        <el-button @click="diaSubject = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { downloadFile, formatDate } from "@/utils";
-import draggable from "vuedraggable";
-export default {
-  components: {
-    draggable,
-  },
-  watch: {
-    diaSubject: function (val) {
-      if (!val) {
-        this.subjectName = "";
-        this.subjectList.map((item) => {
-          item.checked = false;
-        });
-      }
-    },
-  },
-  data() {
-    return {
-      code: "",
-      loading: false,
-      loadingDown: false,
-      loadingSub: false,
-      diaUp: false,
-      diaClass: false,
-      diaSubject: false,
-      subjectLoading: false,
-      url: "/api_html/school/manager/importClassAndStudent",
-      formClass: {
-        //修改班级信息
-        gradeName: "",
-        className: "",
-        classCode: "",
-        intoSchoolYear: "",
-        studentCount: "",
-        teacherCount: "",
-      },
-      rulesClass: {
-        className: [
-          { required: true, message: "请输入班级名称", trigger: "blur" },
-        ],
-      },
-      subjects: [], //科目列表(只有科目)
-      subjectList: [], //科目列表
-      subjectNames: [], //已有科目
-      subjectName: "", //要添加的科目
-      dataList: [],
-    };
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this._QueryData();
-    this._QuerySubject();
-  },
-  methods: {
-    toArchived() {
-      this.$router.push({
-        path: "/archived",
-      });
-    },
-    openSubject(obj) {
-      this.formClass.gradeName = obj.gradeName;
-      this.subjectNames = [...obj.subjectNames];
-      this.diaSubject = true;
-    },
-    start(e) {
-      console.log(e);
-    },
-    end(obj) {
-      let classListIds = obj.classList.map((item) => {
-        return item.id;
-      });
-      this._SaveComponents(classListIds);
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.closeAll();
-      let txt = "";
-      if (res.data.errorInfo && res.data.errorInfo.length) {
-        res.data.errorInfo.map((item) => {
-          txt += `<p style="padding-top:5px;">第${item.row}行：${item.error}</p>`;
-        });
-      }
-      let sTxt = `<p>成功（${res.data.success}）</p>`;
-      this.$message({
-        showClose: true,
-        dangerouslyUseHTMLString: true,
-        message: sTxt + txt,
-        type: "success",
-        duration: 10000,
-      });
-      this.diaUp = false;
-      this._QueryData();
-    },
-    setClass(obj, gradeName) {
-      this.formClass.studentCount = obj.studentCount;
-      this.formClass.teacherCount = obj.teacherCount;
-      this.formClass.gradeName = gradeName;
-      this.formClass.classId = obj.id;
-      this.formClass.className = obj.className;
-      this.formClass.classCode = obj.classCode || "";
-      this.formClass.intoSchoolYear = obj.intoSchoolYear
-        ? obj.intoSchoolYear + ""
-        : "";
-      this.diaClass = true;
-    },
-    async _RemoveClass() {
-      const { data, status, info } = await this.$request.removeClass({
-        classId: this.formClass.classId,
-      });
-      if (status === 0) {
-        this.$message.success("删除成功");
-        this.diaClass = false;
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    _SaveClass() {
-      this.$refs.formClass.validate(async (valid) => {
-        if (valid) {
-          const { data, status, info } = await this.$request.updateClass({
-            classId: this.formClass.classId,
-            className: this.formClass.className,
-            classCode: this.formClass.classCode,
-            intoSchoolYear: formatDate(this.formClass.intoSchoolYear, "yyyy"),
-          });
-          if (status === 0) {
-            this.$message.success("修改成功");
-            this.diaClass = false;
-            this._QueryData();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.warning("输入有误请检查！");
-          return false;
-        }
-      });
-    },
-    addSubjectName() {
-      //添加科目
-      if (!this.subjectName) {
-        this.$message.warning("请填写科目名称");
-        return;
-      } else if (this.subjects.includes(this.subjectName)) {
-        this.$message.warning("科目已存在，请重新填写～");
-        return;
-      }
-      this.subjectList.push({
-        default: this.subjectName,
-        value: this.subjectName,
-        checked: false,
-      });
-      this.subjects.push(this.subjectName);
-      this.subjectNames.push(this.subjectName);
-      this.subjectName = "";
-    },
-    resetSub(item) {
-      item.value = item.default;
-      item.checked = false;
-    },
-    async _EditSub(item) {
-      // if (this.subjects.includes(item.value)) {
-      //   this.$message.warning("科目已存在，请重新填写～");
-      //   return;
-      // }
-      let idx = this.subjectNames.findIndex((sub) => item.default == sub);
-      item.checked = false;
-      const { status, info } = await this.$request.updateSubject({
-        subjectName: item.value,
-        oldSubjectName: item.default,
-      });
-      if (status === 0) {
-        this.$message.success(info);
-        this.subjectNames.splice(idx, 1, item.value);
-        item.default = item.value;
-      } else {
-        item.value = item.default
-        this.$message.error(info);
-      }
-    },
-    async _DelSubject(obj, index) {
-      if (this.subjectLoading) return;
-      this.subjectLoading = true;
-      const { status, info } = await this.$request.delSubject({
-        subjectName: obj.default,
-      });
-      this.subjectLoading = false;
-      if (status === 0) {
-        this.$message.success(info);
-        this.subjectList.splice(index, 1);
-        this.subjects.splice(index, 1);
-        this.subjectNames.splice(index, 1);
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _SaveSubject() {
-      //保存修改年级信息
-      if (!this.subjectNames.length) {
-        this.$message.error("请选择科目！");
-        return;
-      }
-      this.loadingSub = true;
-      const { status, info } = await this.$request.updateGrade({
-        gradeName: this.formClass.gradeName,
-        subjectNames: this.subjectNames,
-      });
-      this.loadingSub = false;
-      if (status === 0) {
-        this.$message.success("修改成功~");
-        this.diaSubject = false;
-        this._QueryData();
-        this._QuerySubject();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _SaveComponents(classListIds) {
-      this.loading = true;
-      let { status, info } = await this.$request.classSort({
-        classIds: [...classListIds],
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.$message.success("调整成功！");
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      this.loading = true;
-      let { data, status, info } = await this.$request.classManager();
-      this.loading = false;
-      if (status === 0) {
-        this.dataList = [...data.list] || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubject() {
-      const { data, status, info } = await this.$request.subjectList();
-      if (status === 0) {
-        this.subjects = [...data?.subjectNames] || [];
-        this.subjectList =
-          data?.subjectNames.map((item) => {
-            return {
-              default: item,
-              value: item,
-              checked: false,
-            };
-          }) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExcel() {
-      let data = await this.$request.classAndStudentTemplate();
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`班级名单模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async exportTeacherExl() {
-      this.loadingDown = true;
-      let data = await this.$request.exportClassAndStudent();
-      this.loadingDown = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`班级名单.xlsx`, blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.fenban {
-  width: 28px;
-  margin-left: 10px;
-  cursor: pointer;
-}
-.page-tit {
-  margin-bottom: 20px;
-}
-.page-content {
-  padding: 20px;
-}
-.grade-box {
-  background: #f8f8f8;
-  padding: 12px 0;
-}
-.el-button-del {
-  margin-left: 10px;
-}
-.h-title {
-  display: flex;
-  align-items: center;
-  .s-num {
-    font-size: 13px;
-  }
-  .sub-btn {
-    margin-left: 30px;
-  }
-  .txt {
-    margin-left: 30px;
-    font-size: 13px;
-    color: #666;
-  }
-}
-.dia-tit {
-  .tips {
-    font-size: 12px;
-  }
-}
-.grade-item {
-  .grade-info {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 10px 20px 0;
-    .clazz-li {
-      margin-right: 20px;
-      margin-bottom: 18px;
-      position: relative;
-      background: #fff;
-      .el-icon-edit {
-        cursor: pointer;
-        display: none;
-        &:hover {
-          color: #667ffd;
-        }
-      }
-      &:hover {
-        .el-icon-edit {
-          display: inline;
-        }
-      }
-    }
-
-    .clazz-item {
-      width: 96px;
-      padding: 14px 18px 14px 14px;
-      border-radius: 10px;
-      box-shadow: 1px 1px 3px #888;
-      box-sizing: content-box;
-      position: relative;
-    }
-    .el-icon-edit {
-      position: absolute;
-      right: 5px;
-      top: 5px;
-    }
-    .clazz-name {
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 18px;
-      padding-bottom: 6px;
-      position: relative;
-    }
-    .clazz-class {
-      // display: flex;
-      // justify-content: space-between;
-      font-size: 14px;
-    }
-  }
-}
-.subject-box {
-  overflow: hidden;
-  position: relative;
-  .p1 {
-    line-height: 20px;
-    margin-bottom: 10px;
-  }
-}
-:deep(.el-checkbox-group) {
-  display: flex;
-  flex-wrap: wrap;
-  .p1 {
-    padding-right: 50px;
-    position: relative;
-    &:hover {
-      .el-icon {
-        display: block;
-        &:hover {
-          color: #667ffd;
-        }
-      }
-      .is-checked ~ .el-icon-delete {
-        display: none;
-      }
-    }
-  }
-  .el-icon {
-    font-size: 14px;
-    color: #999;
-    position: absolute;
-    right: 10px;
-    top: 3px;
-    cursor: pointer;
-    display: none;
-  }
-  .el-icon-check,
-  .el-icon-close {
-    display: block;
-  }
-  .el-icon-edit,
-  .el-icon-check {
-    right: 28px;
-  }
-}
-.sub-ipt {
-  :deep(.el-input__inner) {
-    height: 24px;
-    line-height: 24px;
-  }
-}
-.form-box {
-  :deep(.el-form-item__label) {
-    line-height: 28px;
-  }
-  .el-icon-plus {
-    cursor: pointer;
-    &:hover {
-      color: #667ffd;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/conglomerate.vue b/src/views/standard/setUp/conglomerate.vue
deleted file mode 100644
index cae63c6..0000000
--- a/src/views/standard/setUp/conglomerate.vue
+++ /dev/null
@@ -1,661 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>学校管理</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="content-box" v-loading="loading">
-        <div class="left-box">
-          <p class="h-title">
-            <span class="tog-type">集团列表</span>
-            <i class="icon el-icon-circle-plus-outline" @click="edit"></i>
-          </p>
-          <ul class="school-ul">
-            <li
-              class="school-item"
-              :class="showId == '' ? 'active' : ''"
-              @click="(showId = ''), showSchool(false)"
-            >
-              全部（{{ schoolTotal }}）
-            </li>
-            <li
-              class="school-item"
-              v-for="item in tableList"
-              :key="item.id"
-              :class="showId == item.id ? 'active' : ''"
-              @click="(showId = item.id), showSchool()"
-            >
-              {{ item.regionName }}（{{ item.schoolCount }}）
-              <i class="el-icon-edit-outline" @click.stop="setRegion(item)"></i>
-            </li>
-          </ul>
-        </div>
-        <div class="content-detail">
-          <div class="title-box">
-            <span>管辖的学校（{{ schoolData.num }}）</span>
-            <i class="icon el-icon-circle-plus-outline" @click="addSchool"></i>
-          </div>
-          <el-empty
-            :image-size="100"
-            v-if="!schoolData.list.length && loading == false"
-            description="没有更多数据"
-          ></el-empty>
-          <ul v-else class="detail-list">
-            <li
-              class="detail-item"
-              v-for="item in schoolData.list"
-              :key="item.id"
-            >
-              <p class="item-tit">
-                <span class="name active" @click="setSchool(item)">{{
-                  item.schoolName
-                }}</span>
-                <i @click="addAdmin(item)" class="icon el-icon-user-solid"></i>
-              </p>
-              <div class="info">
-                <p class="info-item">
-                  <span class="txt">基站</span>
-                  <img class="pic" src="../../../assets/images/jizhan.png" />
-                  <span>{{ item.stationCount }}</span>
-                </p>
-                <p class="info-item">
-                  <span class="txt">键盘</span>
-                  <img class="pic" src="../../../assets/images/jianpan.png" />
-                  <span>{{ item.keyboardCount }}</span>
-                </p>
-                <p class="info-item">
-                  <span class="txt">班级</span>
-                  <img class="pic" src="../../../assets/images/banji.png" />
-                  <span>{{ item.classCount }}</span>
-                </p>
-                <p class="info-item">
-                  <span class="txt">学生</span>
-                  <img class="pic" src="../../../assets/images/xuesheng.png" />
-                  <span>{{ item.studentCount }}</span>
-                </p>
-                <p class="info-item">
-                  <span class="txt">老师</span>
-                  <img class="pic" src="../../../assets/images/laoshi.png" />
-                  <span>{{ item.teacherCount }}</span>
-                </p>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="isAdd ? '添加区域/集团' : '修改区域/集团'"
-      :visible.sync="diaCL"
-      width="400"
-    >
-      <el-form
-        class="form-box"
-        ref="formCL"
-        :model="formCL"
-        :rules="rulesCL"
-        label-width="160px"
-      >
-        <el-form-item label="区域/集团名称：" prop="regionName">
-          <el-col :span="10">
-            <el-input
-              maxlength="30"
-              v-model.trim="formCL.regionName"
-              placeholder="请输入区域/集团名称"
-            />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" round @click="saveFormCL">确 定</el-button>
-        <el-button round @click="diaCL = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="添加管理员"
-      :visible.sync="diaAdmin"
-      width="400"
-    >
-      <el-form
-        class="form-box"
-        ref="formAdmin"
-        :model="formAdmin"
-        :rules="rulesAdmin"
-        label-width="160px"
-      >
-        <el-form-item label="学校名称：">
-          <span>{{ formAdmin.schoolName }}</span>
-        </el-form-item>
-        <el-form-item label="手机号码：" prop="phone">
-          <el-col :span="10">
-            <el-input
-              maxlength="11"
-              v-model.trim="formAdmin.phone"
-              placeholder="请输入手机号码"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="密码：" prop="password">
-          <el-col :span="10">
-            <el-input
-              maxlength="18"
-              v-model.trim="formAdmin.password"
-              show-password
-              placeholder="请输入密码"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="姓名：" prop="realName">
-          <el-col :span="10">
-            <el-input
-              maxlength="30"
-              v-model.trim="formAdmin.realName"
-              placeholder="请输入姓名"
-            />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" round @click="saveFormAdmin">确 定</el-button>
-        <el-button round @click="diaAdmin = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="添加学校"
-      :visible.sync="diaSchool"
-      width="400"
-    >
-      <el-form
-        class="form-box"
-        ref="formSchool"
-        :model="formSchool"
-        :rules="rulesSchool"
-        label-width="160px"
-      >
-        <el-form-item label="学校名称：" prop="schoolName">
-          <el-col :span="10">
-            <el-input
-              maxlength="30"
-              v-model.trim="formSchool.schoolName"
-              placeholder="请输入学校名称"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="所属区域/集团：">
-          <el-select
-            class="sel"
-            v-model="formSchool.regionId"
-            placeholder="选择所属区域/集团"
-          >
-            <el-option
-              v-for="item in tableList"
-              :key="item.id"
-              :label="item.regionName"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="学段：" prop="sections">
-          <el-checkbox-group v-model="formSchool.sections">
-            <el-checkbox
-              v-for="item in sectionsList"
-              :label="item.code"
-              :key="item.code"
-              >{{ item.name }}</el-checkbox
-            >
-          </el-checkbox-group>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" round @click="saveFormSchool"
-          >确 定</el-button
-        >
-        <el-button round @click="diaSchool = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="学校信息修改"
-      :visible.sync="diaSchool2"
-      width="400"
-    >
-      <el-form
-        class="form-box"
-        ref="formSchool2"
-        :model="setFormSchool"
-        :rules="rulesSchool"
-        label-width="160px"
-      >
-        <el-form-item label="学校名称：" prop="schoolName">
-          <el-col :span="10">
-            <el-input
-              maxlength="30"
-              v-model.trim="setFormSchool.schoolName"
-              placeholder="请输入学校名称"
-            />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" round @click="saveSetFormSchool"
-          >确 定</el-button
-        >
-        <el-button round @click="diaSchool2 = false">取 消</el-button>
-        <el-button round v-if="showDelSclBtn" @click="removeSchool"
-          >删除学校</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { encryptLoginPassword } from "@/utils";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      diaCL: false,
-      diaAdmin: false,
-      diaSchool: false,
-      diaSchool2: false,
-      loading: false,
-      showId: "", //显示学校Id
-      schoolTotal: 0,
-      sectionsList: [],
-      tableList: [
-        // 集团列表/区域列表
-        {
-          id: 1,
-          regionName: "云南衡水实验中学",
-          schoolCount: 5,
-        },
-      ],
-      schoolData: {
-        //学校信息
-        num: 0,
-        list: [{ id: 1, schoolName: "曲靖校区" }],
-      },
-      formCL: {
-        regionId: "",
-        regionName: "",
-      },
-      rulesCL: {
-        regionName: [
-          { required: true, message: "请输入区域/集团名称", trigger: "blur" },
-        ],
-      },
-      formAdmin: {
-        schoolId: "",
-        schoolName: "",
-        phone: "",
-        password: "",
-        realName: "",
-      },
-      rulesAdmin: {
-        phone: [{ required: true, message: "请输入手机号码", trigger: "blur" }],
-        password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        realName: [{ required: true, message: "请输入姓名", trigger: "blur" }],
-      },
-      formSchool: {
-        schoolName: "",
-        regionId: "",
-        sections: [],
-      },
-      rulesSchool: {
-        schoolName: [
-          { required: true, message: "请输入学校名称", trigger: "blur" },
-        ],
-        sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
-      },
-      setFormSchool: {
-        schoolId: "",
-        schoolName: "",
-      },
-      showDelSclBtn: false,
-    };
-  },
-  created() {
-    this._QueryData();
-    this.showSchool();
-    this._QuerySectionList();
-  },
-  methods: {
-    edit() {
-      //添加区域/集团
-      this.isAdd = true;
-      this.formCL.regionId = "";
-      this.formCL.regionName = "";
-      this.diaCL = true;
-    },
-    addAdmin(obj) {
-      //添加管理员
-      this.formAdmin.schoolId = obj.id;
-      this.formAdmin.schoolName = obj.schoolName;
-      this.formAdmin.phone = "";
-      this.formAdmin.password = "";
-      this.formAdmin.realName = "";
-
-      this.diaAdmin = true;
-    },
-    addSchool() {
-      //添加学校
-      this.formSchool.schoolName = "";
-      this.formSchool.sections = [];
-      this.formSchool.regionId = "";
-      this.diaSchool = true;
-    },
-    setRegion(obj) {
-      this.isAdd = false;
-      this.formCL.regionId = obj.id;
-      this.formCL.regionName = obj.regionName;
-      this.diaCL = true;
-    },
-    setSchool(obj) {
-      this.setFormSchool.schoolId = obj.id;
-      this.setFormSchool.schoolName = obj.schoolName;
-      let num =
-        obj.stationCount +
-        obj.keyboardCount +
-        obj.classCount +
-        obj.studentCount +
-        obj.teacherCount;
-      this.showDelSclBtn = num == 0 ? true : false;
-      this.diaSchool2 = true;
-    },
-    async _QuerySectionList() {
-      //学校学段
-      const { data, status, info } = await this.$request.sectionList();
-      console.log(status);
-      if (status === 0) {
-        this.sectionsList = data?.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async removeSchool() {
-      const { data, status, info } = await this.$request.removeSchool({
-        schoolId: this.setFormSchool.schoolId,
-      });
-      if (status === 0) {
-        this._QueryData();
-        this.showSchool();
-        this.$message.success(info);
-        this.diaSchool2 = false;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    saveFormCL() {
-      //保存添加区域/集团
-      this.$refs["formCL"].validate(async (valid) => {
-        // 验证通过：保存
-        if (valid) {
-          const { data, status, info } = await this.$request.saveRegion({
-            regionId: this.formCL.regionId,
-            regionName: this.formCL.regionName,
-          });
-          if (status === 0) {
-            this._QueryData();
-            this.$message.success(info);
-            this.diaCL = false;
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("区域/集团名称数据有误，请检查！");
-          return false;
-        }
-      });
-    },
-    saveFormAdmin() {
-      //保存管理员
-      this.$refs["formAdmin"].validate(async (valid) => {
-        // 验证通过：保存
-        if (valid) {
-          let params = { ...this.formAdmin };
-          params.password = encryptLoginPassword(this.formAdmin.password);
-          delete params.schoolName;
-          const { data, status, info } = await this.$request.addSchoolManager({
-            ...params,
-          });
-          if (status === 0) {
-            this.$message.success(info);
-            this.diaAdmin = false;
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("数据有误，请检查！");
-          return false;
-        }
-      });
-    },
-    saveFormSchool() {
-      //保存学校
-      this.$refs["formSchool"].validate(async (valid) => {
-        // 验证通过：保存
-        if (valid) {
-          let query = { ...this.formSchool };
-          query.sections = query.sections.join(",");
-          const { data, status, info } = await this.$request.saveSchool({
-            ...query,
-          });
-          if (status === 0) {
-            this.$message.success(info);
-            this.diaSchool = false;
-            this._QueryData();
-            this.showSchool();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("学校名称数据有误，请检查！");
-          return false;
-        }
-      });
-    },
-    saveSetFormSchool() {
-      //保存学校
-      this.$refs["formSchool2"].validate(async (valid) => {
-        // 验证通过：保存
-        if (valid) {
-          const { data, status, info } = await this.$request.saveSchool({
-            ...this.setFormSchool,
-          });
-          if (status === 0) {
-            this.$message.success(info);
-            this.diaSchool2 = false;
-            this.showSchool();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("数据有误，请检查！");
-          return false;
-        }
-      });
-    },
-    async showSchool() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.schoolList({
-        regionId: this.showId,
-        needCount: 1,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.schoolData.list = [...data.list] || [];
-        this.schoolData.num = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      const { data, status, info } = await this.$request.regionList();
-      if (status === 0) {
-        this.tableList = [...data.list] || [];
-        this.schoolTotal = data.schoolCount;
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px 30px;
-}
-.content-box {
-  display: flex;
-  background: #f8f8f8;
-  border-radius: 10px;
-  overflow: hidden;
-  min-height: 400px;
-
-  .h-title {
-    height: 40px;
-    line-height: 40px;
-    background: #eee;
-    border-radius: 10px 10px 0 0;
-  }
-  .left-box {
-    width: 240px;
-    .h-title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      padding-right: 16px;
-      box-sizing: border-box;
-      .tog-type {
-        cursor: pointer;
-      }
-      .icon {
-        font-size: 20px;
-        color: #7f7f7f;
-        cursor: pointer;
-      }
-    }
-    .school-ul {
-      max-height: 70vh;
-      overflow-y: scroll;
-    }
-    .school-item {
-      font-size: 16px;
-      color: #7f7f7f;
-      line-height: 36px;
-      cursor: pointer;
-      padding-left: 12px;
-      position: relative;
-      &:hover {
-        background: #eee;
-      }
-      &.active {
-        color: #667ffd;
-      }
-      .el-icon-edit-outline {
-        position: absolute;
-        top: 8px;
-        right: 12px;
-        font-size: 20px;
-        display: none;
-        &:hover {
-          color: #667ffd;
-        }
-      }
-      &:hover {
-        background: #eee;
-        .el-icon-edit-outline {
-          display: block;
-        }
-      }
-    }
-  }
-  .content-detail {
-    flex: 1;
-    position: relative;
-    border-left: 0.5px solid #eee;
-    .title-box {
-      display: flex;
-      justify-content: space-between;
-      padding: 10px 20px;
-      .icon {
-        font-size: 24px;
-        color: #7f7f7f;
-        cursor: pointer;
-      }
-      .el-icon-circle-plus-outline {
-        margin-left: 10px;
-      }
-    }
-    .detail-list {
-      padding-left: 20px;
-      display: flex;
-      flex-wrap: wrap;
-    }
-    .detail-item {
-      width: 320px;
-      padding: 12px 16px;
-      border-radius: 10px;
-      box-shadow: 1px 1px 3px #888;
-      box-sizing: border-box;
-      margin: 0 20px 20px 0;
-      .item-tit {
-        font-size: 16px;
-        position: relative;
-        padding-bottom: 10px;
-        .name {
-          cursor: pointer;
-          &.active {
-            color: #667ffd;
-          }
-        }
-        &:hover {
-          .icon {
-            display: block;
-          }
-        }
-        .icon {
-          display: none;
-          position: absolute;
-          right: -5px;
-          top: 0;
-          color: #7f7f7f;
-          cursor: pointer;
-          padding: 2px;
-          &:hover {
-            color: #667ffd;
-          }
-        }
-      }
-      .info {
-        width: 100%;
-        display: flex;
-        .info-item {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-        }
-        .txt {
-          color: #7f7f7f;
-        }
-        .pic {
-          height: 28px;
-          margin: 2px 0 5px;
-        }
-      }
-    }
-  }
-}
-.dialog-footer {
-  text-align: center;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
deleted file mode 100644
index 003999e..0000000
--- a/src/views/standard/setUp/school.vue
+++ /dev/null
@@ -1,461 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>学校设置</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="content-box">
-        <i class="el-icon-edit" @click="diaSchool = true"></i>
-        <ul class="school-info">
-          <li class="school-item">
-            <span class="s1">学校名称：</span>
-            <span class="s2">{{ school.schoolName || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">授课端管理密码：</span>
-            <span class="s2">{{ school.managePwd || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">联系人：</span>
-            <span class="s2">{{ school.contactPerson || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">手机号码：</span>
-            <span class="s2">{{ school.contactPhone || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">学段：</span>
-            <span class="s2">{{ sections }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">所属集团：</span>
-            <span class="s2">{{ school.tenantName || "--" }}</span>
-          </li>
-          <li class="school-item">
-            <span class="s1">基站登录密码 ：</span>
-            <span class="s2">{{ school.stationPwd || "--" }}</span>
-          </li>
-        </ul>
-        <div class="grade-box">
-          <p class="h-title">
-            年级管理
-            <span v-if="!code" class="popconfirm-box" @click="diaUpgradeGrade = true">
-              年级升级<i class="fa fa-level-up"></i>
-            </span>
-          </p>
-          <ul class="grade-info">
-            <li
-              class="grade-item"
-              v-for="item in tableData"
-              :key="item.grade"
-            >
-              <p class="grade-name">{{ item.gradeName }}</p>
-              <div class="grade-class">
-                <p>
-                  <i class="fa fa-building"></i>班级：{{
-                    item.classList.length
-                  }}个
-                </p>
-                <p>
-                  <i class="fa fa-book"></i>科目：{{
-                    item.subjectNames.length
-                  }}个
-                </p>
-              </div>
-            </li>
-          </ul>
-          <el-empty
-            :image-size="100"
-            v-if="!tableData.length && loading == false"
-            description="没有更多数据"
-          ></el-empty>
-        </div>
-      </div>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="修改学校信息" :visible.sync="diaSchool" width="400">
-      <el-form
-        ref="formSchool"
-        class="form-box"
-        :model="formSchool"
-        :rules="rulesSchool"
-        label-width="160px"
-      >
-        <el-form-item label="学段：" prop="sections">
-          <el-checkbox-group v-model="formSchool.sections">
-            <el-checkbox
-              v-for="item in sectionsList"
-              :label="item.code"
-              :key="item.code"
-              :disabled="defaultSections.includes(item.code)"
-              >{{ item.name }}</el-checkbox
-            >
-          </el-checkbox-group>
-        </el-form-item>
-        <el-form-item label="授课端管理密码：" prop="managePwd">
-          <el-col :span="10">
-            <el-input
-              maxlength="20"
-              v-model="formSchool.managePwd"
-              show-password
-              placeholder="请输入授课端管理密码"
-            ></el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="基站登录密码：" prop="stationPwd">
-          <el-col :span="10">
-            <el-input
-              maxlength="6"
-              v-model="formSchool.stationPwd"
-              show-password
-              placeholder="请输入基站登录密码"
-            ></el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="联系人：" prop="contactPerson"
-          ><el-col :span="10"
-            ><el-input
-              maxlength="30"
-              v-model="formSchool.contactPerson"
-              placeholder="请输入联系人"
-            ></el-input></el-col
-        ></el-form-item>
-        <el-form-item label="手机号码：" prop="contactPhone"
-          ><el-col :span="10"
-            ><el-input
-              v-model="formSchool.contactPhone"
-              type="number"
-              oninput="if(value.length > 11) value = value.slice(0,11)"
-              placeholder="请输入联系人手机号码"
-            ></el-input></el-col
-        ></el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="editSchool">确 定</el-button>
-        <el-button @click="diaSchool = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog :close-on-click-modal="false" title="班级升级" :visible.sync="diaUpgradeGrade" width="400">
-      <p>注意该操作会将所有年级升级，请谨慎操作！</p>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="danger" @click="_UpgradeGrade()">确认升级</el-button>
-        <el-button type="primary" @click="diaUpgradeGrade = false"
-          >取 消</el-button
-        >
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { downloadFile } from "@/utils";
-export default {
-  data() {
-    return {
-      code: "", //长水跳转标志
-      loading: false,
-      url: "/api_html/school/manager/importClassAndStudent",
-      diaSchool: false,
-      school: {
-        schoolName: "",
-        managePwd: "",
-        contactPerson: "",
-        contactPhone: "",
-        sections: "",
-        tenantName: "",
-      },
-      tableData: [],
-      formSchool: {
-        //修改学校
-        sections: "",
-        managePwd: "",
-        stationPwd: "",
-        contactPerson: "",
-        contactPhone: "",
-      },
-      rulesSchool: {
-        sections: [{ required: true, message: "请选择学段", trigger: "blur" }],
-        managePwd: [
-          { required: true, message: "请填写管理密码", trigger: "blur" },
-          {
-            min: 8,
-            max: 20,
-            message: "长度在 8 到 20 个字符",
-            trigger: "blur",
-          },
-        ],
-        stationPwd: [
-          { required: true, message: "请填写基站登陆密码", trigger: "blur" },
-          {
-            min: 6,
-            max: 6,
-            message: "长度为 6 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-      subjectName: "",
-      sectionsList: [],
-      diaUpgradeGrade: false, //班级升级
-      defaultSections: [],
-    };
-  },
-  computed: {
-    sections: function () {
-      let arr = this.formSchool.sections || [];
-      let sections = [];
-      this.sectionsList.map((item) => {
-        if (arr.includes(item.code)) {
-          sections.push(item.name);
-        }
-      });
-      return sections.join(",");
-    },
-  },
-  created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this._QueryDataSchool();
-    this._QueryDataGrade();
-    this._QuerySectionList();
-  },
-  methods: {
-   
-    editSchool() {
-      //保存修改学校信息
-      if (!this.formSchool.sections.length) {
-        this.$message.error("请选择学段！");
-        return;
-      }
-      if (!this.formSchool.managePwd) {
-        this.$message.error("请填写密码！");
-        return;
-      }
-      if (!this.formSchool.stationPwd) {
-        this.$message.error("请填写基站登录密码！");
-        return;
-      }
-      if (this.loading) {
-        return;
-      }
-      this.$refs.formSchool.validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          let form = { ...this.formSchool };
-          form.sections = this.formSchool.sections.join(",");
-          const { data, status, info } = await this.$request.updateSchool({
-            ...form,
-          });
-          this.loading = false;
-          if (status === 0) {
-            this.$message.success("修改成功~");
-            this.diaSchool = false;
-            this._QueryDataSchool();
-            this._QueryDataGrade();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("数据有误，请检查！");
-        }
-      });
-    },
-    
-    async _UpgradeGrade() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.upgradeGrade();
-      this.loading = false;
-      if (status === 0) {
-        this.$message.success("升级成功~");
-        this.diaUpgradeGrade = false;
-        this._QueryDataGrade();
-      } else {
-        this.$message.error(info);
-      }
-    },
-
-    async _QuerySectionList() {
-      //学校学段
-      const { data, status, info } = await this.$request.sectionList();
-      console.log(status);
-      if (status === 0) {
-        this.sectionsList = data?.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDataSchool() {
-      //学校详情
-      this.loading = true;
-      const { data, status, info } = await this.$request.schoolDetail();
-      this.loading = false;
-      if (status === 0) {
-        this.school = { ...data };
-        for (let key in this.formSchool) {
-          if (key == "sections") {
-            this.formSchool.sections = data[key].split(",").map((item) => {
-              console.log(Number(item));
-              return Number(item);
-            });
-          } else {
-            this.formSchool[key] = data[key] || "";
-          }
-        }
-        this.defaultSections = [...this.formSchool.sections];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDataGrade() {
-      this.loading = true;
-      const { data, status, info } = await this.$request.gradeList();
-      this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.tableData = data.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 20px;
-  .content-box {
-    background: #f8f8f8;
-    border-radius: 16px;
-    position: relative;
-    .el-icon-edit {
-      position: absolute;
-      top: 12px;
-      right: 12px;
-      padding: 5px;
-      font-size: 18px;
-      cursor: pointer;
-      &:hover {
-        color: #36f;
-      }
-    }
-  }
-  .school-info {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 16px 0;
-    border-bottom: 0.5px solid #f2f2f2;
-    .school-item {
-      width: 50%;
-      line-height: 48px;
-      padding-left: 100px;
-      display: flex;
-      box-sizing: border-box;
-      .s1 {
-        width: 160px;
-        font-size: 15px;
-        color: #888;
-      }
-      .s2 {
-        flex: 1;
-      }
-    }
-  }
-  .grade-box {
-    padding: 20px;
-    .h-title {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .popconfirm-box {
-        cursor: pointer;
-        font-size: 14px;
-        color: #999;
-        .fa-level-up {
-          font-size: 16px;
-          padding-left: 2px;
-        }
-        &:hover {
-          color: #f30;
-        }
-      }
-    }
-    .grade-info {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 20px;
-      .grade-item {
-        width: calc((100% - 100px) / 3);
-        margin-right: 50px;
-        margin-bottom: 40px;
-        box-sizing: border-box;
-        padding: 12px 16px;
-        border-radius: 10px;
-        box-shadow: 1px 1px 3px #888;
-        transition: all 0.5s;
-        &:hover {
-          transform: translate(-2px, -5px);
-          box-shadow: 5px 5px 10px #888;
-        }
-        &:nth-of-type(3n) {
-          margin-right: 0;
-        }
-      }
-      .grade-name {
-        font-size: 16px;
-        font-weight: bold;
-        line-height: 18px;
-        padding-bottom: 12px;
-      }
-      .grade-class {
-        display: flex;
-        justify-content: space-between;
-        font-size: 15px;
-        padding-right: 20px;
-        .fa {
-          font-size: 18px;
-          margin-right: 5px;
-          color: #a4a4a4;
-        }
-        .fa-book {
-          font-size: 20px;
-        }
-      }
-    }
-  }
-}
-.form-box {
-  margin: 0 20px;
-}
-.el-icon-plus {
-  cursor: pointer;
-  &:hover {
-    color: #667ffd;
-  }
-}
-:deep(.el-checkbox-group) {
-  display: flex;
-  flex-wrap: wrap;
-  .p1 {
-    padding-right: 30px;
-    position: relative;
-    &:hover {
-      .el-icon-delete {
-        display: block;
-      }
-      .is-checked + .el-icon-delete {
-        display: none;
-      }
-    }
-  }
-  .el-icon-delete {
-    font-size: 14px;
-    color: #999;
-    position: absolute;
-    right: 10px;
-    top: 13px;
-    cursor: pointer;
-    display: none;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
deleted file mode 100644
index c7c5ff0..0000000
--- a/src/views/standard/setUp/student.vue
+++ /dev/null
@@ -1,892 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>学生管理</span>
-      </template>
-      <template slot="btns" v-if="role == 'ROLE_XUEXIAO'">
-        <el-tooltip effect="dark" content="设置答题器" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-upload2"
-            size="mini"
-            plain
-            circle
-            @click="diaUp = true"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip
-          v-if="!code"
-          effect="dark"
-          content="添加学生"
-          placement="bottom"
-        >
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            plain
-            circle
-            @click="openAddDia"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.grade"
-          placeholder="选择年级"
-          @change="changeGrade"
-        >
-          <el-option disabled label="全部" value=""></el-option>
-          <el-option
-            v-for="item in gradeList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-          <el-option label="未分配" :value="80"></el-option>
-          <el-option label="已毕业" :value="81"></el-option>
-        </el-select>
-        <el-input
-          placeholder="请输入学生姓名"
-          v-model="query.studentName"
-          class="input-with-select"
-          @keyup.enter.native="_QueryData(1)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(1)"
-          ></el-button>
-        </el-input>
-        <el-input
-          placeholder="请输入学生学号"
-          v-model="query.studentCode"
-          class="input-with-select"
-          @keyup.enter.native="_QueryData(2)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(2)"
-          ></el-button>
-        </el-input>
-      </div>
-    </div>
-    <p
-      class="total"
-      v-if="
-        studentList.length &&
-        (query.grade == 80 || query.grade == 81 || !query.grade)
-      "
-    >
-      共筛选出{{ studentList.length }}名学生。
-    </p>
-    <p
-      class="total"
-      v-if="
-        getStuTotal && query.grade && query.grade != 80 && query.grade != 81
-      "
-    >
-      共筛选出{{ getStuTotal }}名学生。
-    </p>
-    <div class="page-content">
-      <div class="stu-box">
-        <div
-          class="stu-list"
-          v-show="query.grade && query.grade != 80 && query.grade != 81"
-        >
-          <div class="h-title">班级列表</div>
-          <ul class="stu-ul">
-            <li
-              class="stu-item"
-              v-for="(item, index) in classList"
-              :key="item.id"
-              :class="query.classId == item.id ? 'active' : ''"
-              @click="classDetail(item)"
-            >
-              {{ item.className }}（{{ item.studentCount }}）
-            </li>
-          </ul>
-        </div>
-        <div class="stu-detail" v-loading="loading">
-          <div
-            class="clazz-detail"
-            v-if="
-              clazzDetail.stationSn &&
-              query.grade &&
-              query.grade != 80 &&
-              query.grade != 81
-            "
-          >
-            <p>基站SN：{{ clazzDetail.stationSn }}</p>
-            <p>配对码：{{ clazzDetail.pairingCode }}</p>
-            <p>频点：{{ clazzDetail.frequency }}</p>
-          </div>
-          <ul class="s-ul">
-            <li
-              class="s-li"
-              v-for="(item, index) in studentList"
-              :key="item.id"
-            >
-              <el-popconfirm
-                v-if="!code"
-                title="确定删除吗？"
-                @confirm="removeStu(item, index, $event)"
-              >
-                <i class="el-icon-delete" slot="reference"></i>
-              </el-popconfirm>
-              <i
-                class="el-icon-user-solid"
-                v-if="!code && query.grade != 81"
-                @click.stop="openChangeClazz(item)"
-              ></i>
-              <div class="s-li-box" @click="sayChange(item)">
-                <p class="name">
-                  {{ item.studentName }}
-                </p>
-                <p class="p2" v-if="!query.classId">
-                  <template v-if="item.classList && item.classList.length">
-                    <template v-for="(clazz, index) in item.classList">
-                      <span v-if="index == 0">
-                        {{ clazz.gradeName }}﹒{{ clazz.className }}</span
-                      >
-                    </template></template
-                  >
-                  <template v-else>
-                    {{
-                      item.status == 0
-                        ? "未分配"
-                        : item.status == 2
-                        ? "已毕业"
-                        : ""
-                    }}
-                  </template>
-                </p>
-                <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
-                <p class="p1">长学号：{{ item.studentCode }}</p>
-                <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
-              </div>
-            </li>
-          </ul>
-          <el-empty
-            :image-size="100"
-            v-if="!studentList.length && loading == false"
-            description="没有更多数据"
-          ></el-empty>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="学生调班"
-      :visible.sync="diaChangeClass"
-      width="400"
-    >
-      <el-form
-        class="form-box"
-        ref="formStuCla"
-        :model="formStuCla"
-        :rules="rulesStuCla"
-        label-width="160px"
-      >
-        <el-form-item label="学生姓名：">
-          <span>{{ formStuCla.studentName }}</span>
-        </el-form-item>
-        <el-form-item label="当前班级：">
-          <span>{{ formStuCla.className }}</span>
-        </el-form-item>
-        <el-form-item label="调到班级：" prop="classId">
-          <el-col :span="10">
-            <el-select
-              class="sel"
-              v-model="formStuCla.classId"
-              placeholder="选择年级"
-            >
-              <el-option disabled label="请选择" value=""></el-option>
-              <el-option
-                v-for="item in classList"
-                :key="item.id"
-                :label="item.className"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="长学号：" prop="studentCode">
-          <el-col :span="10">
-            <el-input
-              maxlength="12"
-              placeholder="输入学生长学号"
-              v-model.trim="formStuCla.studentCode"
-            />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="changeStu">确 定</el-button>
-        <el-button @click="diaChangeClass = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="调班轨迹"
-      :visible.sync="diaChangeClassTrack"
-      width="400"
-    >
-      <el-form
-        :model="formClassTrack"
-        label-width="160px"
-        v-loading="loadingClassLogs"
-      >
-        <el-form-item label="学生姓名：">
-          <span>{{ formClassTrack.studentName }}</span>
-        </el-form-item>
-        <el-form-item label="当前班级：">
-          <span>{{ formClassTrack.className }}</span>
-        </el-form-item>
-        <el-form-item label="历史班级：">
-          <p v-for="item in formClassTrack.classList">
-            {{ `${item.gradeName}-${item.className}：${item.createdTime}` }}
-          </p>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaChangeClassTrack = false">关 闭</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="添加学生"
-      :visible.sync="diaStu"
-      width="400"
-    >
-      <el-form
-        ref="formBox"
-        class="form-box"
-        :model="formStu"
-        :rules="rulesStu"
-        label-width="160px"
-      >
-        <el-form-item label="所在班级：">
-          <span>{{ formStu.className }}</span>
-        </el-form-item>
-        <el-form-item label="学生姓名：" prop="studentName">
-          <el-col :span="10">
-            <el-input
-              maxlength="30"
-              placeholder="输入学生姓名"
-              v-model.trim="formStu.studentName"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="长学号：" prop="studentCode">
-          <el-col :span="10">
-            <el-input
-              maxlength="12"
-              placeholder="输入学生长学号"
-              v-model.trim="formStu.studentCode"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="短学号：">
-          <el-col :span="10">
-            <el-input maxlength="12" v-model.trim="formStu.shortNumber" />
-          </el-col>
-        </el-form-item>
-        <el-form-item label="性别：">
-          <el-radio-group v-model="formStu.sex">
-            <el-radio :label="1">男</el-radio>
-            <el-radio :label="2">女</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="答题器编码：">
-          <el-col :span="10">
-            <el-input v-model.trim="formStu.clickerSn" />
-          </el-col>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="addStu">确 定</el-button>
-        <el-button @click="diaStu = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="学生答题器绑定"
-      :visible.sync="diaUp"
-      width="600"
-    >
-      <up-load
-        id="downTeacher"
-        :url="url"
-        @upSuccess="upSuccess"
-        fileName="学生答题器绑定模板"
-      >
-        <p class="down-txt" slot="down">
-          通过Excel名单导入学生答题器绑定模板，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import _ from "lodash";
-import { setGradeName } from "@/utils";
-export default {
-  data() {
-    return {
-      code: "",
-      role: "",
-      loading: false,
-      loadingDown: false,
-      loadingClassLogs: false,
-      diaUp: false,
-      url: "/api_html/school/manager/importStudentClicker",
-      diaStu: false,
-      diaChangeClass: false,
-      diaChangeClassTrack: false,
-      formClassTrack: {
-        studentName: "",
-        className: "",
-        classList: [],
-      },
-      clazzDetail: { stationSn: "", pairingCode: "", frequency: "" },
-      query: {
-        grade: "",
-        classId: "",
-        status: 0,
-        studentCode: "",
-        studentName: "",
-      },
-      formStu: {
-        className: "",
-        studentName: "",
-        studentCode: "",
-        shortNumber: "",
-        sex: 1,
-        clickerSn: "",
-      },
-      rulesStu: {
-        studentName: [
-          { required: true, message: "请输入学生名称", trigger: "blur" },
-        ],
-        studentCode: [
-          { required: true, message: "请输入学生长学号", trigger: "blur" },
-        ],
-      },
-      formStuCla: {
-        studentName: "",
-        studentId: "",
-        oldClassId: "",
-        className: "",
-        classId: "",
-        studentCode: "",
-      },
-      rulesStuCla: {
-        classId: [{ required: true, message: "请选择班级", trigger: "blur" }],
-        studentCode: [
-          { required: true, message: "请输入学生号", trigger: "blur" },
-        ],
-      },
-      gradeName: "",
-      gradeList: [],
-      classList: [],
-      studentList: [],
-      teacherDetail: {
-        teacherName: "",
-        loginName: "",
-        sex: "",
-        available: "",
-        managerList: [],
-        teacherCourseList: [],
-        teacherGradeList: [],
-      },
-    };
-  },
-  computed: {
-    getStuTotal: function () {
-      let num = this.classList.reduce((pre, cur) => {
-        return (pre += cur.studentCount);
-      }, 0);
-      return num;
-    },
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    await this._QueryDataGrade();
-    await this._QueryClass();
-    this._QueryData(3);
-  },
-  methods: {
-    getGradeName(type) {
-      return setGradeName(type);
-    },
-    openAddDia() {
-      if (!this.query.classId) {
-        this.$message.warning("暂无班级信息，请选择或导入班级！");
-        return;
-      }
-      this.formStu.studentName = "";
-      this.formStu.studentCode = "";
-      this.formStu.shortNumber = "";
-      this.formStu.sex = 1;
-      this.formStu.clickerSn = "";
-      this.diaStu = true;
-    },
-    classDetail(obj) {
-      this.clazzDetail.stationSn = obj.stationSn;
-      this.clazzDetail.pairingCode = obj.pairingCode;
-      this.clazzDetail.frequency = obj.frequency;
-      this.query.classId = obj.id;
-      this.formStu.className = obj.className;
-      this._QueryData(3);
-    },
-
-    async upSuccess(res) {
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 5000,
-      });
-      //导入成功
-      this.diaUp = false;
-      await this._QueryClazz(this.query.grade);
-      this._QueryData();
-    },
-    //添加学生
-    addStu() {
-      let query = {};
-      for (let key in this.formStu) {
-        if (key != "className" && this.formStu[key]) {
-          query[key] = this.formStu[key];
-        }
-      }
-      this.loading = true;
-      this.$refs.formBox.validate(async (valid) => {
-        if (valid) {
-          let hasName = this.studentList.find((item) => {
-            return item.studentName == this.formStu.studentName;
-          });
-          console.log(hasName);
-          if (hasName) {
-            this.$message.warning("学生姓名已存在");
-            return;
-          }
-          const { data, status, info } = await this.$request.addStudent({
-            classId: this.query.classId,
-            ...query,
-          });
-          this.loading = false;
-          console.log(status);
-          if (status === 0) {
-            this.$message.success(info);
-            this.diaStu = false;
-            await this._QueryClazz(this.query.grade);
-            this._QueryData();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.error("数据有误，请检查！");
-        }
-      });
-    },
-    //学生调班轨迹
-    sayChange(obj) {
-      this._StudentClassLogs(obj);
-      this.diaChangeClassTrack = true;
-    },
-    //学生调班弹窗
-    openChangeClazz(obj) {
-      console.log(obj);
-      if (this.query.grade == 80 || !this.query.grade) {
-        this._QueryClazz(obj.grade);
-      }
-      this.formStuCla.classId = "";
-      this.formStuCla.studentId = obj.id;
-      this.formStuCla.className = obj.classList && obj.classList[0]?.className;
-      this.formStuCla.studentName = obj.studentName;
-      this.formStuCla.studentCode = obj.studentCode;
-      this.formStuCla.oldClassId = obj.classList && obj.classList[0]?.id;
-      this.diaChangeClass = true;
-    },
-    //学生调班
-    changeStu: _.throttle(
-      function () {
-        this.$refs.formStuCla.validate(async (valid) => {
-          if (valid) {
-            // if (this.formStuCla.classId == this.formStuCla.oldClassId) {
-            //   this.$message.warning("班级无变更～");
-            //   return;
-            // }
-            const { data, status, info } =
-              await this.$request.studentChangeClass({
-                studentId: this.formStuCla.studentId,
-                oldClassId: this.formStuCla.oldClassId,
-                classId: this.formStuCla.classId,
-                studentCode: this.formStuCla.studentCode,
-              });
-            if (status == 0) {
-              this.diaChangeClass = false;
-              this.$message.success(info);
-              await this._QueryClazz(this.query.grade);
-              this._QueryData();
-            } else {
-              this.$message.error(info);
-            }
-          } else {
-            this.$message.error("数据有误请检查！");
-          }
-        });
-      },
-      2000,
-      { leading: true, trailing: false }
-    ),
-
-    //学生调班轨迹
-    async _StudentClassLogs(obj) {
-      this.loadingClassLogs = true;
-      let { data, info, status } = await this.$request.studentClassLogs({
-        studentId: obj.id,
-      });
-      this.loadingClassLogs = false;
-      if (status == 0) {
-        this.formClassTrack.className =
-          (obj.classList && obj.classList[0]?.className) || "";
-        this.formClassTrack.studentName = obj.studentName;
-        this.formClassTrack.classList = (data.list && [...data.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async removeStu(obj, index, $event) {
-      const { data, status, info } = await this.$request.delStudent({
-        studentId: obj.id,
-      });
-      if (status === 0) {
-        this.$message.success("删除成功");
-        await this._QueryClazz(this.query.grade);
-        this._QueryData();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async changeGrade(val) {
-      if (!val) return;
-      this.query.classId = "";
-      this.query.studentName = "";
-      this.query.studentCode = "";
-      if (val != 80 && val != 81) {
-        await this._QueryClass(val);
-      }
-      this._QueryData(3);
-    },
-    serQuery(type) {
-      let query = {};
-      if (type == 1) {
-        this.query.classId = "";
-        this.query.studentCode = "";
-        this.query.grade = "";
-        query.studentName = this.query.studentName;
-        query.status = 9;
-      } else if (type == 2) {
-        this.query.classId = "";
-        this.query.studentName = "";
-        this.query.grade = "";
-        query.studentCode = this.query.studentCode;
-        query.status = 9;
-      } else if (type == 3) {
-        this.query.studentName = "";
-        this.query.studentCode = "";
-        if (this.query.grade == 80) {
-          this.query.classId = "";
-          query.status = -1;
-        } else if (this.query.grade == 81) {
-          this.query.classId = "";
-          query.status = 2;
-        } else {
-          query.grade = this.query.grade;
-          query.classId = this.query.classId;
-        }
-      } else {
-        query = { ...this.query };
-      }
-      return query;
-    },
-    async _QueryData(type) {
-      if (type == 1) {
-        if (!this.query.studentName) {
-          this.$message.warning("输入学生姓名～");
-          return;
-        }
-      } else if (type == 2) {
-        if (!this.query.studentCode) {
-          this.$message.warning("输入学生学号～");
-          return;
-        }
-      }
-      let query = this.serQuery(type);
-      this.loading = true;
-      this.studentList = [];
-      const { data, status, info } = await this.$request.studentList({
-        ...query,
-      });
-      this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.studentList = (data.list && [...data?.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDataGrade() {
-      const { data, status, info } = await this.$request.gradeList();
-      if (status === 0) {
-        this.gradeList =
-          data.list?.map((item) => {
-            return {
-              value: item.grade,
-              label: item.gradeName,
-            };
-          }) || [];
-        this.query.grade = this.gradeList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryClass(value) {
-      this.loading = true;
-      this.classList = [];
-      const { data, status, info } = await this.$request.schoolClassList({
-        grade: value || this.query.grade,
-      });
-      if (status === 0) {
-        this.classList = (data.list && [...data?.list]) || [];
-        this.query.classId = this.classList[0]?.id;
-        this.formStu.className = this.classList[0]?.className;
-        this.clazzDetail.stationSn = this.classList[0]?.stationSn;
-        this.clazzDetail.pairingCode = this.classList[0]?.pairingCode;
-        this.clazzDetail.frequency = this.classList[0]?.frequency;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryClazz(value) {
-      this.classList = [];
-      const { data, status, info } = await this.$request.schoolClassList({
-        grade: value,
-      });
-      if (status === 0) {
-        this.classList = (data.list && [...data?.list]) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExcel() {
-      this.loadingDown = true;
-      let { data, info, status } =
-        await this.$request.studentClickerTemplateUrl();
-      this.loadingDown = false;
-      if (status == 0) {
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-      } else {
-        this.$message.error(info);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 0 20px;
-}
-.tips {
-  display: flex;
-  line-height: 16px;
-  font-size: 14px;
-  color: #999;
-  margin-bottom: 10px;
-}
-.total {
-  padding: 0 20px 10px;
-  font-size: 14px;
-  color: #666;
-}
-.stu-box {
-  display: flex;
-  background: #f8f8f8;
-  border-radius: 10px;
-  overflow: hidden;
-  .answer-header {
-    padding-top: 10px;
-  }
-  .stu-list {
-    min-width: 200px;
-    max-height: 80vh;
-    .h-title {
-      height: 40px;
-      line-height: 40px;
-      background: #eee;
-    }
-    .stu-item {
-      font-size: 16px;
-      color: #7f7f7f;
-      line-height: 36px;
-      cursor: pointer;
-      padding-left: 12px;
-      position: relative;
-      .el-icon-edit-outline {
-        position: absolute;
-        top: 8px;
-        right: 4px;
-        font-size: 20px;
-        display: none;
-        &:hover {
-          color: #667ffd;
-        }
-      }
-      .popconfirm-box {
-        position: absolute;
-        top: 6px;
-        right: 31px;
-        font-size: 17px;
-        line-height: 24px;
-        display: none;
-        &:hover {
-          color: #667ffd;
-        }
-      }
-      &:hover {
-        background: #eee;
-        .el-icon-edit-outline {
-          display: block;
-        }
-        .popconfirm-box {
-          display: block;
-        }
-      }
-      &.active {
-        color: #667ffd;
-        background: #eee;
-      }
-    }
-    .sel {
-      width: 180px;
-      :deep(.el-input__inner) {
-        font-size: 16px;
-        padding-left: 0;
-        border: none;
-        background: transparent;
-      }
-      :deep(.el-icon-arrow-up:before) {
-        content: "\e78f";
-      }
-    }
-  }
-  .stu-detail {
-    flex: 1;
-    border-left: 0.5px solid #eee;
-    min-height: 200px;
-    &-tit {
-      display: flex;
-      justify-content: space-between;
-    }
-
-    .s-ul {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 12px 0 0 20px;
-      .s-li {
-        position: relative;
-        box-shadow: 2px 2px 5px #7f7f7f;
-        margin: 0 20px 20px 0;
-        .s-li-box {
-          width: 160px;
-          border-radius: 10px;
-          min-height: 120px;
-          padding: 0 12px 5px;
-          cursor: pointer;
-        }
-        .el-icon-user-solid {
-          position: absolute;
-          top: 8px;
-          left: 8px;
-          font-size: 18px;
-          color: #666;
-          padding: 2px;
-          display: none;
-          cursor: pointer;
-          &:hover {
-            color: #667ffd;
-          }
-        }
-        .el-icon-delete {
-          position: absolute;
-          top: 8px;
-          right: 8px;
-          font-size: 18px;
-          padding: 2px;
-          display: none;
-          cursor: pointer;
-          &:hover {
-            color: #667ffd;
-          }
-        }
-        &:hover {
-          .el-icon-user-solid {
-            display: block;
-          }
-          .el-icon-delete {
-            display: block;
-          }
-        }
-        .name {
-          text-align: center;
-          font-size: 16px;
-          line-height: 18px;
-          padding: 10px 0;
-        }
-        .p1 {
-          color: #7f7f7f;
-          line-height: 20px;
-          padding-bottom: 5px;
-        }
-        .p2 {
-          color: #333;
-          line-height: 20px;
-          padding-bottom: 5px;
-        }
-      }
-    }
-  }
-  .clazz-detail {
-    display: flex;
-    padding: 12px 12px 0 20px;
-    p {
-      margin-right: 16px;
-      color: #666;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
deleted file mode 100644
index bd9f177..0000000
--- a/src/views/standard/setUp/teacher.vue
+++ /dev/null
@@ -1,1132 +0,0 @@
-<template>
-  <div>
-    <back-box>
-      <template slot="title">
-        <span>教师管理</span>
-      </template>
-      <template slot="btns" v-if="!code">
-        <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-upload2"
-            size="mini"
-            plain
-            circle
-            @click="diaUp = true"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="导出教师名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            size="mini"
-            plain
-            circle
-            @click="exportTeacherExl"
-          ></el-button>
-        </el-tooltip>
-        <el-tooltip effect="dark" content="添加教师" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            size="mini"
-            plain
-            circle
-            @click="addTeacherDia"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-cascader
-          size="small"
-          class="sel sel2"
-          clearable
-          placeholder="选择范围"
-          @change="_QueryData(1)"
-          v-model="query.gradeClassSub"
-          :options="gradeClassSubList"
-          :props="{
-            multiple: true,
-            checkStrictly: true,
-          }"
-          collapse-tags
-          :show-all-levels="false"
-        ></el-cascader>
-        <el-select
-          class="sel"
-          v-model="query.type"
-          @change="_QueryData(4)"
-          placeholder="选择类型"
-        >
-          <el-option disabled label="请选择" :value="9"></el-option>
-          <el-option label="已分配任课信息" :value="0"></el-option>
-          <el-option label="未分配任课信息" :value="1"></el-option>
-        </el-select>
-        <el-input
-          placeholder="请输入老师姓名"
-          v-model="query.teacherName"
-          class="input-with-select"
-          maxlength="30"
-          clearable
-          @keyup.enter.native="_QueryData(2)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(2)"
-          ></el-button>
-        </el-input>
-        <el-input
-          type="number"
-          oninput="if(value.length > 11) value = value.slice(0,11)"
-          placeholder="请输入老师手机号"
-          v-model="query.phone"
-          clearable
-          class="input-with-select"
-          @keyup.enter.native="_QueryData(3)"
-        >
-          <el-button
-            slot="append"
-            icon="el-icon-search"
-            @click="_QueryData(3)"
-          ></el-button>
-        </el-input>
-        <!-- <el-button class="serach-box" round @click="_QueryData(4)"
-          >筛选</el-button
-        > -->
-      </div>
-    </div>
-    <p class="total" v-if="teacherList.length">
-      共筛选出{{ teacherList.length }}名教师。
-    </p>
-    <div class="page-content">
-      <el-empty
-        :image-size="100"
-        v-if="!teacherList.length && loading == false"
-        description="没有更多数据"
-      ></el-empty>
-      <div class="teacher-box" v-loading="loading" v-else>
-        <div class="teacher-list">
-          <p class="h-title">教师列表</p>
-          <ul class="teacher-ul">
-            <li
-              class="teacher-item"
-              v-for="item in teacherList"
-              :key="item.id"
-              :class="showTId == item.id ? 'active' : ''"
-              @click="showTeacher(item)"
-            >
-              {{ item.realName
-              }}<template v-if="setClass(item)"
-                >（{{ setClass(item) }}）</template
-              >
-            </li>
-          </ul>
-        </div>
-        <div class="teacher-detail">
-          <div class="icon-box" v-if="!code">
-            <i class="icon el-icon-edit-outline" @click="editTeacher(1)"></i>
-            <i
-              class="icon el-icon-circle-plus-outline"
-              @click="editTeacher(2)"
-            ></i>
-          </div>
-          <div class="detail-top">
-            <p class="p-item">手机号码：{{ teacherDetail.loginName }}</p>
-            <p class="p-item">
-              状态：{{ teacherDetail.available == 1 ? "不可用" : "正常" }}
-            </p>
-            <p class="p-item">
-              性别：{{
-                teacherDetail.sex == 1
-                  ? "男"
-                  : teacherDetail.sex == 2
-                  ? "女"
-                  : "未知"
-              }}
-            </p>
-          </div>
-          <div
-            class="grade-box"
-            v-if="teacherDetail.managerList && teacherDetail.managerList.length"
-          >
-            <p class="h-title">班主任</p>
-            <ul class="grade-info">
-              <li
-                class="grade-li"
-                v-for="item in teacherDetail.managerList"
-                :key="item.classId"
-              >
-                <el-popconfirm
-                  title="确定删除吗？"
-                  @confirm="delTeacherManager(item, 1)"
-                  v-if="!code"
-                >
-                  <i class="el-icon-delete" slot="reference"></i>
-                </el-popconfirm>
-                <div class="grade-item">
-                  <p class="grade-name">
-                    {{ item.gradeName }}-{{ item.className }}
-                  </p>
-                  <div class="grade-class">
-                    <p>
-                      <i class="fa fa-address-book-o"></i>学生：{{
-                        item.studentCount
-                      }}个
-                    </p>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-          <div
-            class="grade-box"
-            v-if="
-              teacherDetail.teacherCourseList &&
-              teacherDetail.teacherCourseList.length
-            "
-          >
-            <p class="h-title">任课老师</p>
-            <ul class="grade-info">
-              <li
-                class="grade-li"
-                v-for="item in teacherDetail.teacherCourseList"
-                :key="item.classId+item.subjectName"
-              >
-                <el-popconfirm
-                  title="确定删除吗？"
-                  @confirm="delTeacherManager(item, 2)"
-                  v-if="!code"
-                >
-                  <i class="el-icon-delete" slot="reference"></i>
-                </el-popconfirm>
-                <div class="grade-item">
-                  <p class="grade-name">
-                    {{ item.gradeName }}-{{ item.className }}（{{
-                      item.subjectName
-                    }}）
-                  </p>
-                  <div class="grade-class">
-                    <p>
-                      <i class="fa fa-address-book-o"></i>学生：{{
-                        item.studentCount
-                      }}个
-                    </p>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-          <div
-            class="grade-box"
-            v-if="
-              teacherDetail.teacherGradeList &&
-              teacherDetail.teacherGradeList.length
-            "
-          >
-            <p class="h-title">备课组长</p>
-            <ul
-              class="grade-info"
-              v-for="item in teacherDetail.teacherGradeList"
-              :key="item.grade"
-            >
-              <li class="grade-li">
-                <el-popconfirm
-                  title="确定删除吗？"
-                  @confirm="delTeacherManager(item, 3)"
-                  v-if="!code"
-                >
-                  <i class="el-icon-delete" slot="reference"></i>
-                </el-popconfirm>
-                <div class="grade-item">
-                  <p class="grade-name">
-                    {{ item.gradeName }}（{{ item.subjectName }}）
-                  </p>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-    <el-dialog
-      :close-on-click-modal="false"
-      title="导入教师名单"
-      :visible.sync="diaUp"
-      width="600"
-    >
-      <up-load
-        id="downTeacher"
-        :url="url"
-        @upSuccess="upSuccess"
-        fileName="教师名单"
-      >
-        <p class="down-txt" slot="down">
-          通过Excel名单导入教师名单，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="
-        isAdd ? '添加教师' : setTercherType == 1 ? '编辑教师信息' : '管理班级'
-      "
-      :visible.sync="diaTeacher"
-      width="400"
-      append-to-body
-    >
-      <el-form
-        class="form-box"
-        ref="formTeacher"
-        :model="formTeacher"
-        :rules="rulesTeacher"
-        label-width="160px"
-      >
-        <el-form-item v-show="!isAdd && setTercherType == 2" label="教师姓名：">
-          <span>{{ formTeacher.teacherName }}</span>
-        </el-form-item>
-        <el-form-item
-          v-show="isAdd || (!isAdd && setTercherType == 1)"
-          label="手机号码："
-          prop="loginName"
-        >
-          <el-col :span="10">
-            <el-input
-              type="number"
-              oninput="if(value.length > 11) value = value.slice(0,11)"
-              v-model.trim="formTeacher.loginName"
-            />
-          </el-col>
-        </el-form-item>
-        <el-form-item
-          v-show="isAdd || (!isAdd && setTercherType == 1)"
-          label="教师姓名："
-          prop="teacherName"
-        >
-          <el-col :span="10">
-            <el-input maxlength="30" v-model.trim="formTeacher.teacherName" />
-          </el-col>
-        </el-form-item>
-        <el-form-item
-          v-show="isAdd || (!isAdd && setTercherType == 1)"
-          label="性别："
-          prop="sex"
-        >
-          <el-radio-group v-model="formTeacher.sex">
-            <el-radio :label="1">男</el-radio>
-            <el-radio :label="2">女</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item
-          v-show="isAdd || (!isAdd && setTercherType == 2)"
-          label="教师角色："
-          prop="roleList"
-        >
-          <div
-            class="role-list"
-            v-for="(item, index) in formTeacher.roleList"
-            :key="item.id"
-          >
-            <el-select
-              class="sel-c"
-              v-model="item.roleId"
-              placeholder="选择角色"
-              @change="item.classId = []"
-            >
-              <el-option
-                v-for="item in teacherRoleList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-            <el-cascader
-              size="small"
-              v-if="item.roleId == 6"
-              class="sel-t"
-              collapse
-              clearable
-              placeholder="选择年级-班级"
-              v-model="item.classId"
-              :options="gradeClassList"
-              :props="{ expandTrigger: 'hover' }"
-            ></el-cascader>
-            <el-cascader
-              size="small"
-              v-if="item.roleId == 7"
-              class="sel-t teacher-cascader"
-              collapse
-              clearable
-              placeholder="选择年级-科目-班级"
-              v-model="item.classId"
-              :options="gradeSubListClass"
-              :props="{ expandTrigger: 'hover', multiple: true }"
-              popperClass="cascader-clazz"
-            ></el-cascader>
-            <el-cascader
-              size="small"
-              v-if="item.roleId == 8"
-              class="sel-t"
-              collapse
-              clearable
-              placeholder="选择年级-科目"
-              v-model="item.classId"
-              :options="gradeList"
-              :props="{ expandTrigger: 'hover' }"
-            ></el-cascader>
-            <i class="el-icon-close" @click="removeRoleList(index)"></i>
-          </div>
-          <p class="add-box">
-            <el-button icon="el-icon-plus" @click="addRoleList">添加</el-button>
-          </p>
-        </el-form-item>
-      </el-form>
-      <div class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="addTeacher">确 定</el-button>
-        <el-button @click="diaTeacher = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {
-  downloadFile,
-  formatGradeClass,
-  randomWord,
-  setGradeName,
-} from "@/utils";
-export default {
-  data() {
-    return {
-      code: "",
-      loading: false,
-      url: "/api_html/school/manager/importTeacher",
-      diaUp: false,
-      diaTeacher: false,
-      isAdd: false,
-      setTercherType: 1,
-      query: {
-        gradeClassSub: [],
-        type: 0,
-        teacherName: "",
-        phone: "",
-      },
-      subjectList: [],
-      gradeList: [],
-      classList: [],
-      gradeClassSubList: [],
-      gradeSubListClass: [],
-      teacherList: [],
-      teacherRoleList: [
-        //角色
-        {
-          value: 6,
-          label: "班主任",
-        },
-        {
-          value: 7,
-          label: "任课老师",
-        },
-        {
-          value: 8,
-          label: "备课组长",
-        },
-      ],
-      teacherDetail: {
-        teacherName: "",
-        loginName: "",
-        sex: "",
-        available: "",
-        managerList: [],
-        teacherCourseList: [],
-        teacherGradeList: [],
-      },
-      showTId: "", //显示详情 教师ID
-      roleList: [],
-      formTeacher: {
-        teacherName: "",
-        loginName: "",
-        sex: 1,
-        roleList: [],
-      },
-      rulesTeacher: {
-        teacherName: [
-          { required: true, message: "请输入联系电话", trigger: "blur" },
-        ],
-        loginName: [
-          { required: true, message: "请输入教师姓名", trigger: "blur" },
-        ],
-        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
-        roleList: [
-          { required: true, message: "请选择角色信息", trigger: "blur" },
-        ],
-      },
-    };
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this._QueryData(4);
-    await this._QuerySubject();
-    await this._QueryDataGrade();
-    this._RoleList();
-    await this._QueryClass();
-  },
-  methods: {
-    gradeName(type) {
-      return setGradeName(type);
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.closeAll();
-      this.$message({
-        showClose: true,
-        message: `成功（${res.data.success}）`,
-        type: "success",
-        duration: 5000,
-      });
-      this.diaUp = false;
-      this._QueryData(5);
-    },
-    addRoleList() {
-      //添加教师角色
-      this.formTeacher.roleList.push({
-        id: randomWord(true, 16, 20),
-        roleId: "",
-        classId: [],
-      });
-    },
-    removeRoleList(index) {
-      //删除教师角色
-      this.formTeacher.roleList.splice(index, 1);
-    },
-    addTeacherDia() {
-      //添加教师弹窗
-      this.isAdd = true;
-      this.formTeacher = {
-        teacherName: "",
-        loginName: "",
-        sex: 1,
-        roleList: [],
-      };
-      this.diaTeacher = true;
-    },
-    setClass(obj) {
-      //教师角色数量
-      return (
-        obj.managerList?.length +
-        obj.teacherCourseList?.length +
-        obj.teacherGradeList?.length
-      );
-    },
-    getClassName(id) {
-      let name;
-      this.classList.map((item) => {
-        if (item.value == id) {
-          name = item.label;
-        }
-      });
-      return name;
-    },
-    showTeacher(obj) {
-      //教师详细数据
-      this.showTId = obj.id;
-      this.teacherDetail = { ...obj };
-    },
-    editTeacher(type) {
-      this.diaTeacher = true;
-      this.setTercherType = type;
-      this.isAdd = false;
-      for (let key in this.teacherDetail) {
-        if (key == "realName") {
-          this.formTeacher.teacherName = this.teacherDetail.realName;
-        } else {
-          this.formTeacher[key] = this.teacherDetail[key];
-        }
-      }
-      this.toTeacherForm();
-    },
-    addTeacher() {
-      //添加教师
-      this.$refs.formTeacher.validate(async (valid) => {
-        if (valid) {
-          let obj = this.setTeacharForm();
-          if (!obj) {
-            this.$message.error("教师角色数据有误请检查！");
-            return;
-          }
-          let res;
-          if (this.isAdd) {
-            res = await this.$request.addTeacher({
-              teacherName: this.formTeacher.teacherName,
-              loginName: this.formTeacher.loginName,
-              sex: this.formTeacher.sex,
-              ...obj,
-            });
-          } else {
-            res = await this.$request.updateTeacher({
-              teacherId: this.formTeacher.id,
-              teacherName: this.formTeacher.teacherName,
-              loginName: this.formTeacher.loginName,
-              sex: this.formTeacher.sex,
-              ...obj,
-            });
-          }
-          if (res.status === 0) {
-            this.$message.success(res.info);
-            this.diaTeacher = false;
-            this._QueryData(5);
-          } else {
-            this.$message.error(res.info);
-          }
-        } else {
-          this.$message.warning("输入有误请检查！");
-          return false;
-        }
-      });
-    },
-    setTeacharForm() {
-      //转换保存教师数据格式
-      let ERR_OK = true;
-      this.formTeacher.roleList.map((item) => {
-        if (item.classId.length == 0) {
-          ERR_OK = false;
-        }
-      });
-      if (ERR_OK) {
-        let [managerList, teacherCourseList, gradeGroupList] = [[], [], []];
-        this.formTeacher.roleList.map((item) => {
-          if (item.roleId == 6) {
-            managerList.push({
-              classId: item.classId[1],
-              className:
-                this.classList.find((items) => items.value == item.classId[1])
-                  ?.label || "",
-            });
-          } else if (item.roleId == 7) {
-            item.classId.map((clazz) => {
-              teacherCourseList.push({
-                classId: clazz[2],
-                className:
-                  this.classList.find((items) => items.value == clazz[2])
-                    ?.label || "",
-                subjectName: clazz[1],
-              });
-            });
-          } else {
-            gradeGroupList.push({
-              grade: item.classId[0],
-              gradeName:
-                this.gradeList.find((items) => items.id == item.classId[0])
-                  ?.label || "",
-              subjectName: item.classId[1],
-            });
-          }
-        });
-        return {
-          managerList,
-          teacherCourseList,
-          gradeGroupList,
-        };
-      } else {
-        return false;
-      }
-    },
-    toTeacherForm() {
-      //教师角色数据转换为form格式数据
-      this.formTeacher.roleList = [];
-      this.formTeacher.managerList?.map((item) => {
-        this.formTeacher.roleList.push({
-          id: randomWord(true, 16, 20),
-          roleId: 6,
-          classId: [
-            this.classList.find(
-              (items) =>
-                items.value == item.classId ||
-                items.label.includes(item.className)
-            ).grade,
-            item.classId,
-          ],
-        });
-      });
-      let teacherClassId = [];
-      this.formTeacher.teacherCourseList?.map((item) => {
-        teacherClassId.push([
-          item.grade,
-          item.subjectName,
-          this.classList.find(
-            (items) =>
-              items.value == item.classId ||
-              items.label.includes(item.className)
-          ).value,
-        ]);
-      });
-      if (teacherClassId.length) {
-        this.formTeacher.roleList.push({
-          id: randomWord(true, 16, 20),
-          roleId: 7,
-          classId: [...teacherClassId],
-        });
-      }
-      this.formTeacher.gradeGroupList?.map((item) => {
-        this.formTeacher.roleList.push({
-          id: randomWord(true, 16, 20),
-          roleId: 8,
-          classId: [
-            this.gradeList.find((items) => items.id == item.classId[0]).id,
-            item.subjectName,
-          ],
-        });
-      });
-    },
-    async delTeacherManager(obj, type) {
-      let query;
-      switch (type) {
-        case 1:
-          query = {
-            classId: obj.classId,
-          };
-          break;
-        case 2:
-          query = {
-            classId: obj.classId,
-            subjectName: obj.subjectName,
-          };
-          break;
-        case 3:
-          query = {
-            classId: obj.classId,
-            grade: obj.grade,
-            subjectName: obj.subjectName,
-          };
-          break;
-      }
-      //角色
-      const { data, status, info } = await this.$request.delTeacherManager({
-        teacherId: obj.teacherId,
-        ...query,
-      });
-      if (status === 0) {
-        this._QueryData(5);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _RoleList() {
-      //角色
-      const { data, status, info } = await this.$request.roleList();
-      if (status === 0) {
-        this.roleList = data.list || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    setQuery(type) {
-      let query = {};
-      if (type == 1) {
-        query.grades = [];
-        query.classIds = [];
-        query.subjectNames = [];
-        this.query.gradeClassSub?.map((item) => {
-          if (item.length == 1) {
-            if (!query.grades.includes(item[0])) {
-              query.grades.push(item[0]);
-            }
-          } else if (item.length == 2) {
-            if (!query.classIds.includes(item[1])) {
-              query.classIds.push(item[1]);
-            }
-            query.grades.includes(item[0]) && query.grades.remove(item[0]);
-          } else if (item.length == 3) {
-            if (!query.subjectNames.includes(item[2])) {
-              query.subjectNames.push(item[2]);
-            }
-            query.grades.includes(item[0]) && query.grades.remove(item[0]);
-            query.classIds.includes(item[0]) && query.classIds.remove(item[0]);
-          }
-        });
-
-        delete query.gradeClassSub;
-        query.grades.length ? "" : delete query.grades;
-        query.classIds.length ? "" : delete query.classIds;
-        query.subjectNames.length ? "" : delete query.subjectNames;
-        this.query.teacherName = "";
-        this.query.phone = "";
-        this.query.type = 0;
-      } else if (type == 2) {
-        this.query.type = 9;
-        this.query.phone = "";
-        this.query.gradeClassSub = [];
-        query.teacherName = this.query.teacherName;
-        query.type = this.query.type;
-      } else if (type == 3) {
-        this.query.type = 9;
-        this.query.teacherName = "";
-        this.query.gradeClassSub = [];
-        query.phone = this.query.phone;
-        query.type = this.query.type;
-      } else if (type == 4) {
-        this.query.teacherName = "";
-        this.query.phone = "";
-        this.query.gradeClassSub = [];
-        query.type = this.query.type;
-      } else {
-        query = { ...this.query };
-        query.grades = [];
-        query.classIds = [];
-        query.subjectNames = [];
-        this.query.gradeClassSub?.map((item) => {
-          if (item.length == 1) {
-            if (!query.grades.includes(item[0])) {
-              query.grades.push(item[0]);
-            }
-          } else if (item.length == 2) {
-            if (!query.classIds.includes(item[1])) {
-              query.classIds.push(item[1]);
-            }
-            query.grades.includes(item[0]) && query.grades.remove(item[0]);
-          } else if (item.length == 3) {
-            if (!query.subjectNames.includes(item[2])) {
-              query.subjectNames.push(item[2]);
-            }
-            query.grades.includes(item[0]) && query.grades.remove(item[0]);
-            query.classIds.includes(item[0]) && query.classIds.remove(item[0]);
-          }
-        });
-
-        delete query.gradeClassSub;
-        query.grades.length ? "" : delete query.grades;
-        query.classIds.length ? "" : delete query.classIds;
-        query.subjectNames.length ? "" : delete query.subjectNames;
-        query.teacherName.length ? "" : delete query.teacherName;
-        query.phone.length ? "" : delete query.phone;
-      }
-
-      return query;
-    },
-    async _QueryData(type) {
-      if (this.loading) return;
-      if (type == 2) {
-        if (this.query.teacherName == "") {
-          this.$message.warning("请输入老师姓名");
-          return;
-        }
-      } else if (type == 3) {
-        if (this.query.phone == "") {
-          this.$message.warning("请输入老师手机");
-          return;
-        }
-      }
-      this.loading = true;
-      let query = this.setQuery(type);
-      this.teacherList = [];
-      const { data, status, info } = await this.$request.teacherList({
-        ...query,
-      });
-      this.loading = false;
-      console.log(status);
-      if (status === 0) {
-        this.teacherList = data.list || [];
-        if (type == 10) {
-          let detailArr =
-            data.list.filter((item) => item.id == this.formTeacher.id) || [];
-          this.teacherDetail = (detailArr.length && detailArr[0]) || {
-            ...data.list[0],
-          };
-        } else {
-          this.teacherDetail = { ...this.teacherList[0] };
-        }
-        this.showTId = this.teacherDetail.id;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubject() {
-      const { data, status, info } = await this.$request.subjectList();
-      if (status === 0) {
-        this.subjectList = [...data?.subjectNames] || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryDataGrade() {
-      //年级数据
-      const { data, status, info } = await this.$request.gradeList();
-      if (status === 0) {
-        this.gradeList =
-          data.list?.map((item) => {
-            let subList = item.subjectNames?.map((items) => {
-              return {
-                value: items,
-                label: items,
-              };
-            });
-            this.gradeClassSubList.push({
-              value: item.grade,
-              label: item.gradeName,
-              id: item.grade,
-              children: item.classList.map((clazz) => {
-                return {
-                  value: clazz.id,
-                  label: clazz.className,
-                  id: clazz.id,
-                  children: [...subList],
-                };
-              }),
-            });
-            this.gradeSubListClass.push({
-              value: item.grade,
-              label: item.gradeName,
-              id: item.grade,
-              children: item.subjectNames.map((items) => {
-                return {
-                  value: items,
-                  label: items,
-                  children: item.classList.map((clazz) => {
-                    return {
-                      value: clazz.id,
-                      label: clazz.className,
-                    };
-                  }),
-                };
-              }),
-            });
-            return {
-              value: item.grade,
-              label: item.gradeName,
-              id: item.grade,
-              children: [...subList],
-            };
-          }) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryClass() {
-      //班级数据
-      const { data, status, info } = await this.$request.schoolClassList();
-      if (status === 0) {
-        let gradeSubList = {};
-        this.gradeList.map((item) => {
-          gradeSubList[item.label] = [...item.children];
-        });
-        this.classList =
-          data.list.map((item) => {
-            return {
-              value: item.id,
-              label: `${item.className}（${item.gradeName}）`,
-              grade: item.grade,
-              gradeName: item.gradeName,
-              children: gradeSubList[item.gradeName],
-            };
-          }) || [];
-        this.gradeClassList = formatGradeClass([...data.list]);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExcel() {
-      let data = await this.$request.teacherTemplate();
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`教师名单模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async exportTeacherExl() {
-      this.loadingDown = true;
-      let data = await this.$request.exportTeacher();
-      this.loadingDown = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`教师名单.xlsx`, blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-content {
-  padding: 0 20px 20px;
-}
-.total {
-  padding: 0 20px 10px;
-  font-size: 14px;
-  color: #666;
-}
-.teacher-box {
-  display: flex;
-  background: #f8f8f8;
-  border-radius: 10px;
-  overflow: hidden;
-  min-height: 400px;
-  .teacher-ul {
-    max-height: 60vh;
-    overflow-y: scroll;
-    &::-webkit-scrollbar {
-      width: 6px;
-    }
-    &::-webkit-scrollbar-thumb {
-      border-radius: 10px;
-      background-color: #ccc;
-    }
-  }
-  .teacher-list {
-    width: 240px;
-
-    .h-title {
-      height: 40px;
-      line-height: 40px;
-      background: #eee;
-      // border-radius: 10px 10px 0 0;
-    }
-    .teacher-item {
-      font-size: 16px;
-      color: #7f7f7f;
-      line-height: 36px;
-      cursor: pointer;
-      padding-left: 12px;
-      &:hover {
-        background: #eee;
-      }
-      &.active {
-        color: #667ffd;
-        background: #eee;
-      }
-    }
-  }
-
-  .teacher-detail {
-    flex: 1;
-    position: relative;
-    padding-left: 10px;
-    .icon-box {
-      position: absolute;
-      top: 12px;
-      right: 20px;
-      .icon {
-        font-size: 24px;
-        color: #7f7f7f;
-        cursor: pointer;
-      }
-      .el-icon-circle-plus-outline {
-        margin-left: 10px;
-      }
-    }
-    .detail-top {
-      padding: 12px 20px;
-      box-sizing: border-box;
-      display: flex;
-      flex-wrap: wrap;
-      font-size: 14px;
-      color: #7f7f7f;
-      .p-item {
-        width: 40%;
-        line-height: 28px;
-      }
-    }
-    .grade-box {
-      .grade-info {
-        display: flex;
-        flex-wrap: wrap;
-        padding: 20px 20px 0;
-        & > li {
-          margin-right: 20px;
-          margin-bottom: 20px;
-          position: relative;
-          .el-icon-delete {
-            position: absolute;
-            top: 8px;
-            right: 8px;
-            padding: 2px;
-            cursor: pointer;
-            display: none;
-            &:hover {
-              color: #667ffd;
-            }
-          }
-          &:hover {
-            .el-icon-delete {
-              display: block;
-            }
-          }
-        }
-
-        .grade-item {
-          width: 200px;
-          box-sizing: border-box;
-          padding: 12px 16px;
-          border-radius: 10px;
-          box-shadow: 1px 1px 3px #888;
-        }
-        .grade-name {
-          font-size: 16px;
-          font-weight: bold;
-          line-height: 18px;
-          padding-bottom: 12px;
-        }
-        .grade-class {
-          display: flex;
-          justify-content: space-between;
-          font-size: 15px;
-          padding-right: 20px;
-          .fa {
-            font-size: 18px;
-            margin-right: 5px;
-            color: #a4a4a4;
-          }
-          .fa-book {
-            font-size: 20px;
-          }
-        }
-      }
-    }
-  }
-}
-.add-box {
-  margin-top: 10px;
-}
-.sel-c {
-  width: 120px;
-  margin-right: 12px;
-}
-.role-list {
-  margin-bottom: 10px;
-  position: relative;
-  .sel-p {
-    position: absolute;
-    left: 146px;
-    top: 0;
-    font-size: 13px;
-    color: #606266;
-  }
-  .sel-t {
-    :deep(.el-input__inner) {
-      background: transparent;
-    }
-  }
-  .el-icon-close {
-    padding: 5px;
-    cursor: pointer;
-    margin-left: 16px;
-    background: #ccc;
-    border-radius: 50%;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
deleted file mode 100644
index bc84cc3..0000000
--- a/src/views/standard/test/analysis.vue
+++ /dev/null
@@ -1,878 +0,0 @@
-<template>
-  <div ref="main" class="page-container">
-    <back-box>
-      <template slot="title">
-        <span>单卷分析</span>
-      </template>
-    </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime && !status">
-      <p class="tips-p">
-        <i class="fa fa-bell-o"></i>
-        {{
-          `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
-        }}修改了答案，是否重新记分？
-      </p>
-      <div class="btn-box">
-        <el-button type="danger" round @click="_ReScore" size="mini"
-          >重新计分</el-button
-        >
-        <el-button
-          type="danger"
-          round
-          plain
-          size="mini"
-          @click="paperModifyLog.modifiedTime = ''"
-          >暂时不计</el-button
-        >
-      </div>
-    </div>
-    <div class="page-content">
-      <div class="tab-box">
-        <span
-          v-for="(item, index) in tabList"
-          :key="item"
-          class="tab-item"
-          :class="type == index ? 'active' : ''"
-          @click="setType(index)"
-          >{{ item }}</span
-        >
-      </div>
-      <div id="print-content" class="table-box" v-loading="loading">
-        <el-table
-          :max-height="tableMaxHeight"
-          v-show="type == 0"
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="questionIndex"
-            label="题号"
-            align="center"
-            fixed
-            width="60"
-          ></el-table-column>
-          <el-table-column
-            prop="questionType"
-            label="题型"
-            align="center"
-            fixed
-            width="100"
-            ><template slot-scope="scope">{{
-              setSubPro(scope.row.questionType)
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="score"
-            width="100"
-            label="满分值"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="highestScore"
-            label="班最高分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="lowestScore"
-            label="班最低分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="avgScore"
-            label="班平均分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="classScoringRate"
-            width="120"
-            sortable
-            label="班级得分率"
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.classScoringRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column prop="correctAnswer" label="答案" align="center"
-            ><template slot-scope="scoped">{{
-              scoped.row.correctAnswer == 1
-                ? "✓"
-                : scoped.row.correctAnswer == 2
-                ? "✗"
-                : scoped.row.correctAnswer
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in optionsList"
-            :key="index"
-            :label="item.title"
-            :prop="'count' + index"
-            align="center"
-            width="120"
-            ><template slot-scope="scope"
-              ><p class="persent">
-                {{
-                  scope.row.questionType == "5"
-                    ? ""
-                    : scope.row["option" + index]
-                    ? `${scope.row["option" + index]}(${
-                        scope.row["persent" + index]
-                      })`
-                    : ""
-                }}
-              </p></template
-            >
-          </el-table-column>
-        </el-table>
-        <div id="print-table">
-          <table class="hide">
-            <thead>
-              <tr>
-                <th>题号</th>
-                <th>题型</th>
-                <th>满分值</th>
-                <th>班最高分</th>
-                <th>班最低分</th>
-                <th>班平均分</th>
-                <th>班级得分率</th>
-                <th>答案</th>
-                <th>选项1</th>
-                <th>选项2</th>
-                <th>选项3</th>
-                <th>选项4</th>
-                <th>未答</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr v-for="(tr, index) in tableData">
-                <td width="60">{{ index + 1 }}</td>
-                <td width="100">{{ setSubPro(tr.questionType) }}</td>
-                <td width="100">{{ tr.sortable }}</td>
-                <td width="110">{{ tr.highestScore }}</td>
-                <td width="110">{{ tr.lowestScore }}</td>
-                <td width="110">{{ tr.avgScore }}</td>
-                <td width="120">{{ tr.classScoringRate }}%</td>
-                <td>
-                  {{
-                    tr.correctAnswer == 1
-                      ? "✓"
-                      : tr.correctAnswer == 2
-                      ? "✗"
-                      : tr.correctAnswer
-                  }}
-                </td>
-                <td
-                  v-for="(item, index) in optionsList"
-                  :key="index"
-                  width="120"
-                >
-                  <p class="persent">
-                    {{
-                      tr.questionType == "5"
-                        ? ""
-                        : tr["option" + index]
-                        ? `${tr["option" + index]}(${tr["persent" + index]})`
-                        : ""
-                    }}
-                  </p>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <div class="hui-box" v-show="type == 0">
-            <span class="s-txt">汇总</span>
-            <ul class="hui-ul">
-              <li class="hui-li">
-                <span class="hui-s s1">主观题</span>
-                <span class="hui-s s1">{{ examReport.subjectiveScore }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveHighestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveLowestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveAvgScore
-                }}</span>
-                <span class="hui-s s3"
-                  >{{ examReport.subjectiveClassScoringRate }}%</span
-                >
-              </li>
-              <li class="hui-li">
-                <span class="hui-s s1">客观题</span>
-                <span class="hui-s s1">{{ examReport.objectiveScore }}</span>
-                <span class="hui-s s2">{{
-                  examReport.objectiveHighestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.objectiveLowestScore
-                }}</span>
-                <span class="hui-s s2">{{ examReport.objectiveAvgScore }}</span>
-                <span class="hui-s s3"
-                  >{{ examReport.objectiveClassScoringRate }}%</span
-                >
-              </li>
-              <li class="hui-li">
-                <span class="hui-s s1">整卷</span>
-                <span class="hui-s s1">{{ examReport.examPaperScore }}</span>
-                <span class="hui-s s2">{{ examReport.highestScore }}</span>
-                <span class="hui-s s2">{{ examReport.lowestScore }}</span>
-                <span class="hui-s s2">{{ examReport.avgScore }}</span>
-                <span class="hui-s s3">{{ examReport.classScoringRate }}%</span>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <el-table
-          v-show="type == 1"
-          :max-height="tableMaxHeight"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: 'dadui', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="scoringRate"
-            label="得分率"
-            sortable
-            align="center"
-            ><template slot-scope="scope"
-              >{{ scope.row.scoringRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="classRank"
-            label="班名"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column label="客观题" align="center">
-            <el-table-column
-              prop="objectiveExamScore"
-              label="得分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="objectiveScoringRate"
-              label="得分率"
-              align="center"
-              ><template slot-scope="scope"
-                >{{ scope.row.objectiveScoringRate }}%</template
-              ></el-table-column
-            >
-          </el-table-column>
-          <el-table-column label="主观题" align="center">
-            <el-table-column
-              prop="subjectiveExamScore"
-              label="得分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="subjectiveScoringRate"
-              label="得分率"
-              align="center"
-              ><template slot-scope="scope"
-                >{{ scope.row.subjectiveScoringRate }}%</template
-              ></el-table-column
-            >
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="type == 2"
-          :max-height="tableMaxHeight"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            fixed
-            align="center"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column label="分数组成" align="center">
-            <el-table-column
-              prop="objectiveExamScore"
-              label="客观题分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="subjectiveExamScore"
-              label="主观题分"
-              align="center"
-            ></el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in questionList"
-            :key="index"
-            :label="'Q' + item.id"
-            :prop="'score' + item.id"
-          >
-          </el-table-column>
-        </el-table>
-        <el-table
-          :max-height="tableMaxHeight"
-          v-show="type == 3"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="className"
-            label="班级"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in questionList"
-            :key="index"
-            :label="'Q' + item.id"
-          >
-            <template slot-scope="scope">
-              <span v-if="tableData[index]?.questionType == 5">*</span>
-              <span
-                v-else-if="scope.row['answer' + item.id]"
-                :class="scope.row['isRight' + item.id] ? '' : 'error'"
-              >
-                {{ scope.row["answer" + item.id] }}
-              </span>
-              <span
-                v-else
-                :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
-                >-</span
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="down">
-        <div>
-          <el-button
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-        </div>
-        <div v-if="!status">
-          <el-button
-            v-if="examReport.subjectiveScore != 0"
-            @click="diaUp = true"
-            type="primary"
-            round
-            v-loading="exportLoading"
-            >导入主观题分数</el-button
-          >
-          <template v-if="role == 'ROLE_JIAOSHI'">
-            <el-button
-              @click="edit"
-              type="primary"
-              v-if="examReport.subjectiveScore != examReport.examPaperScore"
-              round
-              >查看题目</el-button
-            ></template
-          >
-        </div>
-      </div>
-      <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
-        <up-load :url="url" :examId="id" @upSuccess="upSuccess">
-          <template slot="down">
-            <p class="down-txt">
-              第一步：下载模板并编辑完成学生分数
-              <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-            </p>
-            <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
-          </template>
-        </up-load>
-        <div class="dialog-footer" slot="footer">
-          <el-button @click="diaUp = false">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import { downloadFile, tablePrint } from "@/utils";
-export default {
-  data() {
-    return {
-      role: "",
-      status: 0,
-      tableMaxHeight: 600,
-      loading: false,
-      exportLoading: false,
-      diaUp: false,
-      url: "/api_html/teaching/importSubjectiveScore",
-      id: "",
-      title: "",
-      score: "",
-      tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
-      type: 0,
-      paperModifyLog: {
-        realName: "",
-        modifiedTime: "",
-      },
-      examReport: {
-        subjectiveScore: 0,
-        subjectiveHighestScore: "",
-        subjectiveLowestScore: "",
-        subjectiveAvgScore: "",
-        subjectiveClassScoringRate: "",
-        objectiveScore: "",
-        objectiveHighestScore: "",
-        objectiveLowestScore: "",
-        objectiveAvgScore: "",
-        objectiveClassScoringRate: "",
-        examPaperScore: "",
-        highestScore: "",
-        lowestScore: "",
-        avgScore: "",
-        classScoringRate: "",
-      },
-      tableData: [],
-      optionsList: [],
-      tableData2: [],
-      questionList: [],
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  created() {
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this.id = this.$route.query.id;
-    this.status = this.$route.query.status ? this.$route.query.status : 0;
-    this.title = this.$route.query.title || "";
-    this._QueryData();
-  },
-  methods: {
-    print() {
-      if (this.type == 0) {
-        tablePrint("print-table", this.title + this.tabList[this.type], true);
-      } else {
-        tablePrint("print-content", this.title + this.tabList[this.type]);
-      }
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.success("导入成功");
-      this.diaUp = false;
-      this._QueryData();
-    },
-    setType(type) {
-      console.log(this.$refs.main.offsetHeight - 50);
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.type = type;
-    },
-    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() {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: this.id,
-          title: this.title,
-          type: 2,
-        },
-      });
-    },
-    changePage(page) {
-      this.page = page;
-      this.examQuestionReport();
-    },
-    async _QueryData() {
-      this.examDetail();
-      this.examStudentReport();
-      this.examQuestionReport();
-    },
-    async examDetail() {
-      //详情
-      this.loading = true;
-      let { data, info, status } = await this.$request.examDetail({
-        examId: this.id,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (data.paperModifyLog) {
-          this.paperModifyLog = { ...data?.paperModifyLog };
-        }
-        this.examReport = { ...data?.examReport };
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _ReScore() {
-      //重新记分
-      this.loading = true;
-      let { data, info, status } = await this.$request.reScore({
-        examId: this.id,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.$message.success(info);
-        this._QueryData();
-        this.paperModifyLog.modifiedTime = "";
-        this.paperModifyLog.realName = "";
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async examStudentReport() {
-      //成绩排名-小题分-作答明细
-      this.loading = true;
-      let { data, info, status } = await this.$request.examStudentReport({
-        examId: this.id,
-      });
-      this.loading = false;
-      if (status === 0) {
-        let optionsList = [];
-        this.tableData2 = data?.list.map((item) => {
-          let params = {};
-
-          const detail = JSON.parse(item.detail);
-          if (detail.length > optionsList.length) {
-            optionsList = [...detail];
-          }
-          detail.map((items, index) => {
-            params["que" + items.id] = items.id;
-            params["score" + items.id] = String(items.score).includes(".")
-              ? Number(items.score).toFixed(2)
-              : items.score;
-            params["answer" + items.id] =
-              items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
-            params["isRight" + items.id] = items.isRight;
-            params["questionType" + items.id] = items.questionType;
-          });
-          return {
-            ...item,
-            ...params,
-          };
-        });
-        console.log();
-        this.questionList = optionsList.sort((a, b) => {
-          return a.id - b.id;
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async examQuestionReport() {
-      //试题分析
-      this.loading = true;
-      let { data, info, status } = await this.$request.examQuestionReport({
-        examId: this.id,
-        page: this.page,
-        // size: this.size,
-        size: 9999,
-      });
-      this.loading = false;
-      if (status === 0) {
-        let optionsList = [{}, {}, {}, {}, {}];
-        let tableData = data?.list.map((item) => {
-          let params = {};
-          const detail = JSON.parse(item.detail);
-          let lastOPtion = detail?.find((item) => {
-            return item.option == "未答";
-          });
-          let defaultArr = detail?.filter((item) => {
-            return item.option != "未答";
-          });
-
-          optionsList.map((items, index) => {
-            if (index != 4) {
-              params["count" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.count
-                  : "";
-              params["persent" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.persent
-                  : "";
-              params["option" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.option == 1
-                    ? "✓"
-                    : defaultArr[index]?.option == 2
-                    ? "✗"
-                    : defaultArr[index]?.option
-                  : "";
-              items["title"] = "选项" + (index + 1);
-            } else {
-              items["title"] = "未答";
-              params["count" + index] = lastOPtion.count;
-              params["persent" + index] = lastOPtion.persent;
-              params["option" + index] = "?";
-            }
-          });
-          return {
-            ...item,
-            ...params,
-          };
-        });
-        this.tableData = tableData.sort((a, b) => {
-          return a.questionIndex - b.questionIndex;
-        });
-        this.optionsList = [...optionsList];
-        this.total = data.count;
-        this.setType(0);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      const data = await this.$request.exportExamReport({
-        examId: this.id,
-      });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile(
-          this.status
-            ? "即时测-已归档单卷测练报表.xlsx"
-            : "即时测-单卷测练报表.xlsx",
-          blob
-        );
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    async downExcel() {
-      let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.id,
-      });
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`主观题模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-  },
-};
-</script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.hide {
-  display: none;
-}
-.page-container {
-  position: relative;
-  height: 100%;
-  .table-box {
-    min-height: 100%;
-  }
-  &.active {
-    overflow: hidden;
-  }
-  .edit-dia {
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    width: 100%;
-    height: calc(100vh - 70px);
-    background: #fff;
-    overflow-y: auto;
-    z-index: 10;
-  }
-}
-.persent {
-  white-space: nowrap;
-}
-.error {
-  color: #f30;
-}
-.page-content {
-  padding: 20px 20px 0;
-}
-.tips {
-  height: 48px;
-  box-sizing: border-box;
-  line-height: 48px;
-  padding: 0 16px;
-  border: 1px solid #fac7cc;
-  border-radius: 5px;
-  background-color: #ffebec;
-  font-size: 14px;
-  color: #fd9795;
-  margin: 10px 20px 0 20px;
-  display: flex;
-  &-p {
-    flex: 1;
-  }
-  .fa-bell-o {
-    font-size: 18px;
-    margin-right: 5px;
-  }
-}
-.tab-box {
-  width: 800px;
-  margin: 0 auto 12px;
-  background: #f8f8f8;
-  border-radius: 20px;
-  display: flex;
-  user-select: none;
-  .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;
-    cursor: pointer;
-    &.active {
-      background: #667ffd;
-      color: #fff;
-    }
-  }
-}
-.down {
-  padding-top: 20px;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.hui-box {
-  display: flex;
-  text-align: center;
-  .s-txt {
-    width: 61px;
-    line-height: 144px;
-    background: #e2e2e2;
-    font-size: 16px;
-    color: #fff;
-    font-weight: 700;
-  }
-  .hui-ul {
-    border-top: 1px solid #e2e2e2;
-  }
-  .hui-li {
-    display: flex;
-    .hui-s {
-      height: 48px;
-      line-height: 48px;
-      border-right: 1px solid #e2e2e2;
-      border-bottom: 1px solid #e2e2e2;
-      box-sizing: border-box;
-    }
-    .s1 {
-      width: 100px;
-    }
-    .s2 {
-      width: 110px;
-    }
-    .s3 {
-      width: 120px;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/test/archiving.vue b/src/views/standard/test/archiving.vue
deleted file mode 100644
index 9c51c60..0000000
--- a/src/views/standard/test/archiving.vue
+++ /dev/null
@@ -1,876 +0,0 @@
-<template>
-  <div ref="main" class="page-container">
-    <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.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <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.subjectNames"
-          placeholder="选择科目"
-        >
-          <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
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? '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"
-        @change="changeTab"
-        style="margin-bottom: 20px"
-      >
-        <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
-        </template>
-      </el-radio-group>
-      <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="title"
-            label="试卷名称"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examPaperScore"
-            label="卷面分"
-            align="center"
-            width="68"
-          ></el-table-column>
-          <el-table-column prop="answeredNum" label="测验人数" align="center"
-            ><template slot-scope="scoped">{{
-              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="examStartTime"
-            label="测验时间"
-            width="100"
-            align="center"
-          ></el-table-column>
-          <el-table-column prop="avgScore" label="班平均分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.avgScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="highestScore" label="班最高分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.highestScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="lowestScore" label="班最低分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.lowestScore
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="excellenRate"
-            label="优秀数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.excellenNum }}</p>
-                <p v-if="scoped.row.excellenNum">
-                  {{ `（${scoped.row.excellenRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="goodRate"
-            label="良好数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.goodNum }}</p>
-                <p v-if="scoped.row.goodNum">
-                  {{ `（${scoped.row.goodRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="passRate"
-            label="及格数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.passNum }}</p>
-                <p v-if="scoped.row.passNum">
-                  {{ `（${scoped.row.passRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="failedRate"
-            label="不及格数(率)"
-            sortable
-            align="center"
-            width="130"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.failedNum }}</p>
-                <p v-if="scoped.row.failedNum">
-                  {{ `（${scoped.row.failedRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scoped">
-              <el-tooltip effect="dark" content="详情" placement="top">
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-      </div>
-      <div v-show="tabIndex == 2" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && loading == false"
-          description="没有更多数据"
-        ></el-empty>
-        <template v-if="tableData.length && loading == false">
-          <div id="print-content">
-            <el-table
-              :max-height="tableMaxHeight"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item.title"
-              >
-                <el-table-column
-                  :prop="'score' + index"
-                  :label="index == 0 ? '总分' : '成绩'"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + index"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
-            <el-table
-              v-else
-              :data="tableData"
-              :max-height="tableMaxHeight"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item"
-              >
-                <el-table-column
-                  :prop="'examCount' + item"
-                  label="测练数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'participationCount' + item"
-                  label="参与数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'score' + item"
-                  label="总分"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + item"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-        </template>
-      </div>
-      <p class="down" v-if="tabIndex == 2 && tableData.length">
-        <el-button
-          type="primary"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          @click="downExl"
-          >导出报表</el-button
-        >
-        <el-button
-          v-if="!this.$store.getters.code"
-          @click="print"
-          type="primary"
-          plain
-          round
-          icon="el-icon-printer"
-          >打印</el-button
-        >
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-import { formatDate, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
-export default {
-  data() {
-    return {
-      exportLoading: false,
-      tableMaxHeight: 300,
-      role: "",
-      loading: false,
-      loadingDown: false,
-      url: "/api_html/teaching/importSubjectiveScore",
-      examId: "",
-      form: {
-        id: "",
-        title: "",
-        examPaperScore: "",
-      },
-      date: "", //今天-昨天-本周
-      query: {
-        //搜索条件
-        classId: "",
-        subjectNames: "",
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      tabList: ["单卷测练报表", "阶段测练报表"],
-      classList: [], //班级
-      subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      answerList: [], //设置多卷内容供tableStage表格数据用
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  async created() {
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    await this._QueryClassList();
-    if (!this.query.classId) {
-      return;
-    }
-    await this._QuerySubjectList();
-    await this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      await that._QueryClassList();
-      if (!that.query.classId) {
-        return;
-      }
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
-    });
-  },
-  methods: {
-    print() {
-      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
-    },
-    changeSub(val) {
-      //科目改变触发事件
-      let sub;
-      if (val && val.length) {
-        let leng = val.length - 1;
-        sub = val[leng];
-      }
-      console.log(val);
-      this.query.subjectNames = val.filter((item) => {
-        return sub != "全部" ? item != "全部" : item == "全部";
-      });
-    },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/testAnalysis",
-        query: {
-          id: obj.id,
-          title: obj.title,
-          score: obj.examPaperScore,
-          status: 1,
-        },
-      });
-    },
-
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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;
-          that.tabIndex = 1;
-          break;
-        case 2:
-          let day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    changeTab() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this._QueryData();
-    },
-
-    async changeclass() {
-      await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      this.page = 1;
-      await this._QuerySubjectList();
-      await this._QueryData();
-    },
-    async _QueryClassList() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList({ status: 1 });
-      if (status === 0) {
-        this.classList = data.list.map((item) => {
-          return {
-            value: item.classId,
-            label: item.className,
-          };
-        });
-        this.query.classId = this.classList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubjectList() {
-      const fetchSubjectList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList
-          : this.$request.tSubjectList;
-
-      const { data, status, info } = await fetchSubjectList({
-        classId: this.query.classId,
-        status: 1,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
-        } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      this.tableData = [];
-      if (!this.query.classId) {
-        return;
-      }
-      if (this.tabIndex == 1) {
-        this.examReportList();
-      } else {
-        this.phaseExamReport();
-      }
-    },
-    //单卷测练
-    async examReportList() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          query[key] = this.query[key];
-        }
-      }
-      if (this.role != "ROLE_BANZHUREN") {
-        query.subjectNames = [query.subjectNames];
-      } else {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const { data, status, info } = await this.$request.examReportList({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data?.count || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //多卷测练
-    async phaseExamReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"]?.length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"]?.shift();
-        }
-      }
-      const phaseExamReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseExamReport
-          : this.$request.phaseExamReport;
-      const { data, status, info } = await phaseExamReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.total = data.count;
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["examCount" + items.subjectName] = items.examCount;
-              params["participationCount" + items.subjectName] =
-                items.participationCount;
-              params["score" + items.subjectName] = items.score;
-              params["classRank" + items.subjectName] = items.classRank;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = [...subjectName];
-        } else {
-          let dataIdsList = [],
-            dataList = [];
-          data?.list.map((item) => {
-            item.examList.map((items) => {
-              if (!dataIdsList.includes(items.title)) {
-                dataIdsList.push(items.title);
-                dataList.push(items);
-              }
-            });
-          });
-          console.log(dataList);
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            dataIdsList.map((ids, index) => {
-              params["score" + index] = "--";
-              params["classRank" + index] = "--";
-              item.examList.map((items) => {
-                if (items.title == ids) {
-                  params["score" + index] = items.score;
-                  params["classRank" + index] = items.classRank;
-                }
-              });
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = dataList;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExl() {
-      //报表到处
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const exportPhaseExamReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTExportPhaseExamReport
-          : this.$request.exportPhaseExamReport;
-      this.exportLoading = true;
-      const data = await exportPhaseExamReport({ ...query });
-      this.exportLoading = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("即时测-已归档阶段测练报表.xlsx", blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-  },
-};
-</script>
-
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.page-container {
-  position: relative;
-  height: 100%;
-  &.active {
-    overflow: hidden;
-  }
-}
-.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;
-  }
-}
-.down {
-  padding-top: 16px;
-}
-.click-b {
-  cursor: pointer;
-  color: #409eff;
-  text-decoration: underline;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
deleted file mode 100644
index 4a99ebd..0000000
--- a/src/views/standard/test/index.vue
+++ /dev/null
@@ -1,1067 +0,0 @@
-<template>
-  <div ref="main" class="page-container">
-    <back-box>
-      <template slot="title">
-        <span>即时测-数据报表</span>
-      </template>
-      <template slot="btns">
-        <el-tooltip
-          v-if="!code && gdClass"
-          effect="dark"
-          content="已归档试卷"
-          placement="bottom"
-        >
-          <el-button
-            type="primary"
-            icon="fa fa-archive"
-            size="mini"
-            plain
-            circle
-            @click="toArchiving"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <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.subjectNames"
-          placeholder="选择科目"
-        >
-          <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
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? '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"
-        @change="changeTab"
-        style="margin-bottom: 20px"
-      >
-        <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
-        </template>
-      </el-radio-group>
-      <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="title"
-            label="试卷名称"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examPaperScore"
-            label="卷面分"
-            align="center"
-            width="68"
-          ></el-table-column>
-          <el-table-column prop="answeredNum" label="测验人数" align="center"
-            ><template slot-scope="scoped">{{
-              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="examStartTime"
-            label="测验时间"
-            width="100"
-            align="center"
-          ></el-table-column>
-          <el-table-column prop="avgScore" label="班平均分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.avgScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="highestScore" label="班最高分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.highestScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="lowestScore" label="班最低分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.lowestScore
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="excellenRate"
-            label="优秀数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.excellenNum }}</p>
-                <p v-if="scoped.row.excellenNum">
-                  {{ `（${scoped.row.excellenRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="goodRate"
-            label="良好数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.goodNum }}</p>
-                <p v-if="scoped.row.goodNum">
-                  {{ `（${scoped.row.goodRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="passRate"
-            label="及格数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.passNum }}</p>
-                <p v-if="scoped.row.passNum">
-                  {{ `（${scoped.row.passRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="failedRate"
-            label="不及格数(率)"
-            sortable
-            align="center"
-            width="130"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.failedNum }}</p>
-                <p v-if="scoped.row.failedNum">
-                  {{ `（${scoped.row.failedRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scoped">
-              <el-tooltip
-                v-if="
-                  scoped.row.answerNum != 0 ||
-                  (scoped.row.recordStatus != 0 &&
-                    scoped.row.subjectiveScore == scoped.row.examPaperScore)
-                "
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-              <template
-                v-if="
-                  scoped.row.answerNum == 0 &&
-                  scoped.row.subjectiveScore != scoped.row.examPaperScore
-                "
-              >
-                <el-tooltip
-                  v-if="role == 'ROLE_JIAOSHI'"
-                  effect="dark"
-                  content="设置答案"
-                  placement="top"
-                >
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-file-text"
-                    @click="edit(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-                <template v-else>未设置答案</template>
-              </template>
-              <el-tooltip
-                v-if="
-                  scoped.row.subjectiveScore == scoped.row.examPaperScore &&
-                  scoped.row.recordStatus == 0
-                "
-                effect="dark"
-                content="导入主观题"
-                placement="top"
-              >
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-cloud"
-                  @click="uploadSJ(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
-        </div>
-      </div>
-      <div v-show="tabIndex == 2" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && loading == false"
-          description="没有更多数据"
-        ></el-empty>
-        <template v-if="tableData.length && loading == false">
-          <div id="print-content">
-            <el-table
-              :max-height="tableMaxHeight"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  ><span class="click-b" @click="toPortrait(scoped.row)">
-                    {{ scoped.row.studentName }}
-                  </span></template
-                ></el-table-column
-              >
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item.title"
-              >
-                <el-table-column
-                  :prop="'score' + index"
-                  :label="index == 0 ? '总分' : '成绩'"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + index"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
-            <el-table
-              v-else
-              :data="tableData"
-              :max-height="tableMaxHeight"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  ><span class="click-b" @click="toPortrait(scoped.row)">
-                    {{ scoped.row.studentName }}
-                  </span></template
-                >
-              </el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item"
-              >
-                <el-table-column
-                  :prop="'examCount' + item"
-                  label="测练数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'participationCount' + item"
-                  label="参与数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'score' + item"
-                  label="总分"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + item"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-        </template>
-      </div>
-      <p class="down" v-if="tabIndex == 2 && tableData.length">
-        <el-button
-          type="primary"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          @click="downExl"
-          >导出报表</el-button
-        >
-        <el-button
-          v-if="!this.$store.getters.code"
-          @click="print"
-          type="primary"
-          plain
-          round
-          icon="el-icon-printer"
-          >打印</el-button
-        >
-      </p>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
-      <up-load
-        :url="url"
-        :examId="examId"
-        @upSuccess="upSuccess"
-        fileName="主观题分数"
-        v-loading="loadingDown"
-      >
-        <template slot="down">
-          <p class="down-txt">
-            第一步：下载模板并编辑完成学生分数
-            <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-          </p>
-          <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
-        </template>
-      </up-load>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { formatDate, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
-export default {
-  data() {
-    return {
-      code: "",
-      gdClass: 0, //已归档班级数量
-      exportLoading: false,
-      tableMaxHeight: 300,
-      role: "",
-      loading: false,
-      diaUp: false,
-      loadingDown: false,
-      url: "/api_html/teaching/importSubjectiveScore",
-      examId: "",
-      form: {
-        id: "",
-        title: "",
-        examPaperScore: "",
-      },
-      date: "", //今天-昨天-本周
-      query: {
-        //搜索条件
-        classId: "",
-        subjectNames: "",
-        startDay: "",
-        endDay: "",
-        day: "",
-      },
-      tabList: ["单卷测练报表", "阶段测练报表"],
-      classList: [], //班级
-      subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      answerList: [], //设置多卷内容供tableStage表格数据用
-      page: 1,
-      size: 20,
-      total: 0,
-    };
-  },
-  async created() {
-    this.code = localStorage.getItem("csCode") || "";
-    this.role =
-      this.$store.getters.info.showRole ||
-      this.$store.getters.info.permissions[0].role;
-    this._QueryClassList2();
-    await this._QueryClassList();
-    if (!this.query.classId) {
-      return;
-    }
-    await this._QuerySubjectList();
-    await this.setDate(1);
-    let startDay = this.query?.startDay;
-    if (!startDay) {
-      this.query.startDay = new Date();
-      this.query.endDay = new Date();
-    }
-  },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      // if (that.$route.path == "/test") {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      that._QueryClassList2();
-      await that._QueryClassList();
-      if (!that.query.classId) {
-        return;
-      }
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
-      // }
-    });
-  },
-  methods: {
-    print() {
-      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
-    },
-    changeSub(val) {
-      //科目改变触发事件
-      let sub;
-      if (val && val.length) {
-        let leng = val.length - 1;
-        sub = val[leng];
-      }
-      console.log(val);
-      this.query.subjectNames = val.filter((item) => {
-        return sub != "全部" ? item != "全部" : item == "全部";
-      });
-    },
-    toArchiving() {
-      this.$router.push({
-        path: "/testArchiving",
-      });
-    },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/testAnalysis",
-        query: {
-          id: obj.id,
-          title: obj.title,
-          score: obj.examPaperScore,
-        },
-      });
-    },
-    toPortrait(obj) {
-      //暂时不上线
-      return;
-      if (this.$store.getters.code) {
-        return;
-      }
-      let subjectNames = [];
-      subjectNames =
-        this.role == "ROLE_BANZHUREN"
-          ? [...this.query["subjectNames"]]
-          : [this.query["subjectNames"]];
-      if (
-        this.query["subjectNames"] &&
-        this.query["subjectNames"]?.length == 1 &&
-        this.query["subjectNames"][0] == "全部"
-      ) {
-        subjectNames = this.subjectList.map((item) => {
-          return item.value;
-        });
-        subjectNames?.shift();
-      }
-      //去学生画像
-      this.$router.push({
-        path: "/portraitDetail",
-        query: {
-          id: obj.studentId,
-          classId: this.query.classId,
-          subjectNames: subjectNames.join(","),
-          studentName: obj.studentName,
-          studentCode: obj.studentCode,
-          startDay: this.query.startDay,
-          endDay: this.query.endDay,
-          date: this.date,
-        },
-      });
-    },
-    uploadSJ(obj) {
-      //导入开关
-      this.examId = obj.id;
-      this.diaUp = true;
-    },
-    setDate(index) {
-      const that = this;
-      this.date = index == this.date ? "" : index;
-      let aYear = new Date().getFullYear();
-      let aMonth = new Date().getMonth() + 1;
-      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;
-          that.tabIndex = 1;
-          break;
-        case 2:
-          let day = new Date().getDay();
-          if (day == 0) {
-            //中国式星期天是一周的最后一天
-            day = 7;
-          }
-          day--;
-          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
-          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 3:
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
-          break;
-        case 4:
-          if (aMonth > 0 && aMonth < 4) {
-            aMonth = "1";
-          } else if (aMonth > 3 && aMonth < 7) {
-            aMonth = "4";
-          } else if (aMonth > 6 && aMonth < 10) {
-            aMonth = "7";
-          } else {
-            aMonth = "10";
-          }
-
-          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
-          that.query.startDay = `${aYear}-${aMonth}-01`;
-          that.query.endDay = formatDate(new Date(), "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 = "";
-        }
-      }
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    edit(item) {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: item.id,
-          title: item.title,
-          type: 2,
-        },
-      });
-    },
-    changeTab() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this._QueryData();
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.success("导入成功");
-      this.diaUp = false;
-      this._QueryData();
-    },
-    async changeclass() {
-      await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      this.page = 1;
-      await this._QuerySubjectList();
-      await this._QueryData();
-    },
-    async _QueryClassList2() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList({ status: 1 });
-      if (status === 0) {
-        this.gdClass = data?.list?.length || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryClassList() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList();
-      if (status === 0) {
-        this.classList = data.list.map((item) => {
-          return {
-            value: item.classId,
-            label: item.className,
-          };
-        });
-        this.query.classId = this.classList[0]?.value;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QuerySubjectList() {
-      const fetchSubjectList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList
-          : this.$request.tSubjectList;
-
-      const { data, status, info } = await fetchSubjectList({
-        classId: this.query.classId,
-      });
-      if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
-        } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      if (!this.query.classId) {
-        return;
-      }
-      this.tableData = [];
-      if (this.tabIndex == 1) {
-        this.examReportList();
-      } else {
-        this.phaseExamReport();
-      }
-    },
-    //单卷测练
-    async examReportList() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          query[key] = this.query[key];
-        }
-      }
-      if (this.role != "ROLE_BANZHUREN") {
-        query.subjectNames = [query.subjectNames];
-      } else {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const { data, status, info } = await this.$request.examReportList({
-        ...query,
-        page: this.page,
-        size: this.size,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.tableData = (data?.list && [...data?.list]) || [];
-        this.total = data?.count || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //多卷测练
-    async phaseExamReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"]?.length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"]?.shift();
-        }
-      }
-      const phaseExamReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseExamReport
-          : this.$request.phaseExamReport;
-      const { data, status, info } = await phaseExamReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        this.total = data.count;
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["examCount" + items.subjectName] = items.examCount;
-              params["participationCount" + items.subjectName] =
-                items.participationCount;
-              params["score" + items.subjectName] = items.score;
-              params["classRank" + items.subjectName] = items.classRank;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = [...subjectName];
-        } else {
-          let dataIdsList = [],
-            dataList = [];
-          data?.list.map((item) => {
-            item.examList.map((items) => {
-              if (!dataIdsList.includes(items.title)) {
-                dataIdsList.push(items.title);
-                dataList.push(items);
-              }
-            });
-          });
-          console.log(dataList);
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            dataIdsList.map((ids, index) => {
-              params["score" + index] = "--";
-              params["classRank" + index] = "--";
-              item.examList.map((items) => {
-                if (items.title == ids) {
-                  params["score" + index] = items.score;
-                  params["classRank" + index] = items.classRank;
-                }
-              });
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = dataList;
-        }
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async downExl() {
-      //报表到处
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      const exportPhaseExamReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTExportPhaseExamReport
-          : this.$request.exportPhaseExamReport;
-      this.exportLoading = true;
-      const data = await exportPhaseExamReport({ ...query });
-      this.exportLoading = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("即时测-阶段测练报表.xlsx", blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async downExcel() {
-      //模板下载
-      this.loadingDown = true;
-      let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.examId,
-      });
-      this.loadingDown = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`主观题模版.xlsx`, blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-  },
-};
-</script>
-
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
-<style lang="scss" scoped>
-.page-container {
-  position: relative;
-  height: 100%;
-  &.active {
-    overflow: hidden;
-  }
-}
-.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;
-  }
-}
-.down {
-  padding-top: 16px;
-}
-.click-b {
-  cursor: pointer;
-  color: #409eff;
-  text-decoration: underline;
-}
-</style>
\ No newline at end of file
--
libgit2 0.21.4