diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index cf82df9..687ec23 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -34,6 +34,14 @@ export default {
       data,
     });
   },
+  // 个人版首页数据
+  personalIndex(data) {
+    return service({
+      url: setUpUrls.personalIndex,
+      method: "POST",
+      data,
+    });
+  },
    //班主任-查询管理的班级
    cTClassList(data) {
     return service({
diff --git a/src/api/axios.js b/src/api/axios.js
index 42cdd84..e1ed38c 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -63,7 +63,6 @@ service.interceptors.response.use(
     return Promise.resolve(res);
   },
   (error) => {
-    debugger
     const { data, status } = error.response;
     if (error.response == undefined) {
       return Promise.reject(error);
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 9d53bff..29eb06a 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -199,4 +199,8 @@ export default {
   exportGradeContrast: "/api_html/tenant/exportGradeContrast",
   //  同步教师账号
   syncUser: "/api_html/tenant/syncUser",
+
+
+   // 个人版首页统计数据
+   personalIndex:"/api_html/personal/classList"
 }
diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue
new file mode 100644
index 0000000..fa23aef
--- /dev/null
+++ b/src/components/charts/lineChart.vue
@@ -0,0 +1,111 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+export default {
+  name: "lineChart",
+  props: {
+    id: String,
+    params: Array,
+    xAxis: Array,
+  },
+  watch: {
+    params: {
+      handler: function (val) {
+        if (val.length) {
+          this.initData();
+        }
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  created() {},
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    setOption() {
+      const that = this;
+      const options = {
+        color: this.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
+        backgroundColor: "#fff",
+        tooltip: {
+          trigger: "item",
+          confine: true,
+        },
+        legend: {
+          show: true,
+          bottom: 0,
+          itemHeight: 2,
+        },
+        xAxis: {
+          type: "category",
+          data: this.xAxis,
+          axisLine: { show: true, lineStyle: { color: "#e2e2e2" } },
+          axisTick: {
+            show: false,
+          },
+          axisLabel: {
+            color: "#666",
+          },
+        },
+        yAxis: {
+          type: "value",
+          axisLine: { show: false },
+          splitLine: {
+            show: true,
+          },
+          axisLabel: {
+            color: "#666",
+          },
+        },
+        grid: {
+          top:28,
+          left: "10%",
+          right: "10%",
+          bottom: 30,
+          containLabel: true,
+        },
+        series: that.params.map((item) => {
+          return {
+            name: item.name,
+            type: "line",
+            symbol: "circle",
+            symbolSize: "8",
+            lineStyle: {
+              width: 3,
+            },
+            data: item.value,
+          };
+        }),
+      };
+      return options;
+    },
+    initData() {
+      if (!this.chart) {
+        const div = document.getElementById(this.id);
+        this.chart = this.$echarts.init(div);
+      }
+      const options = this.setOption();
+      this.chart?.clear();
+      this.chart.setOption(options, true);
+      this.chart.off("click");
+      this.chart.on("click", "series", (params) => {
+        // this.$emit("clickPieChart", params);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chart {
+  height: 100%;
+}
+</style>
diff --git a/src/components/charts/radarChart.vue b/src/components/charts/radarChart.vue
new file mode 100644
index 0000000..188169d
--- /dev/null
+++ b/src/components/charts/radarChart.vue
@@ -0,0 +1,104 @@
+<template>
+  <div class="chart" :id="id"></div>
+</template>
+
+<script>
+export default {
+  name: "radarChart",
+  props: {
+    id: String,
+    params: Object,
+  },
+  watch: {
+    params: {
+      handler: function (val) {
+        if (!!val.indicator) {
+          this.initData();
+        }
+      },
+      deep: true,
+    },
+  },
+  data() {
+    return {
+      chart: null,
+    };
+  },
+  created() {},
+  mounted() {
+    this.initData();
+  },
+  methods: {
+    setOption() {
+      const option = {
+        color: this.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
+        backgroundColor: "#fff",
+        tooltip: {
+          trigger: "item",
+          confine: true,
+        },
+        legend: {
+          show:true,
+          bottom:0,
+          itemHeight:2
+        },
+        radar: {
+          indicator: [...this.params.indicator],
+          splitNumber: 5,
+          center:['50%', '48%'],
+          radius:"70%",
+          shape: "polygon",
+          nameGap:10,
+          axisLine:{
+            show:false
+          },
+          splitLine:{
+            lineStyle: {
+              width: 0.5,
+              color:'#e2e2e2'
+            },
+          },
+          splitArea:{
+            areaStyle:{
+              color:['rgba(250,250,250,0)','rgba(200,200,200,0)']
+            }
+          }
+        },
+        series: [
+          {
+            type: "radar",
+            lineStyle: {
+              width: 1,
+            },
+            symbolSize: 4,
+            areaStyle: {
+              color: "transparent",
+            },
+            data: this.params.num,
+          },
+        ],
+      };
+      return option;
+    },
+    initData() {
+      if (!this.chart) {
+        const div = document.getElementById(this.id);
+        this.chart = this.$echarts.init(div);
+      }
+      const options = this.setOption();
+      this.chart?.clear();
+      this.chart.setOption(options, true);
+      this.chart.off("click");
+      this.chart.on("click", "series", (params) => {
+        // this.$emit("clickPieChart", params);
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.chart {
+  height: 100%;
+}
+</style>
diff --git a/src/main.js b/src/main.js
index a02acdc..b36367a 100755
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,7 @@ import permission from "./directive/permission/button"
 import NProgress from "nprogress"
 import "babel-polyfill"
 import '@/components/globalComponents.js'
-
+import '@/plugins/echarts.js'
 
 import "nprogress/nprogress.css"
 import "font-awesome/css/font-awesome.css"
diff --git a/src/plugins/echarts.js b/src/plugins/echarts.js
new file mode 100644
index 0000000..0b042fb
--- /dev/null
+++ b/src/plugins/echarts.js
@@ -0,0 +1,35 @@
+import Vue from 'vue'
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
+import * as echarts from 'echarts/core';
+// 引入柱状图图表，图表后缀都为 Chart
+import {
+    LineChart,
+    PieChart,
+    ScatterChart,
+    RadarChart
+} from 'echarts/charts';
+// 引入提示框，标题，直角坐标系组件，组件后缀都为 Component
+import {
+    LabelLayout,
+    UniversalTransition
+} from 'echarts/features'
+import {
+    TitleComponent,
+    TooltipComponent,
+    GridComponent,
+    GraphicComponent,
+    SingleAxisComponent,
+    LegendComponent
+} from 'echarts/components';
+
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+import {
+    CanvasRenderer
+} from 'echarts/renderers';
+
+// 注册必须的组件
+echarts.use(
+    [LineChart,RadarChart, ScatterChart, PieChart, SingleAxisComponent, TitleComponent, TooltipComponent, GridComponent, CanvasRenderer, GraphicComponent, UniversalTransition, LabelLayout,LegendComponent]
+);
+
+Vue.prototype.$echarts = echarts
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 913a0fe..45872fa 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,27 +8,46 @@ import HomeMain from "@/views/index/mainIndex"
 
 // 不是必须加载的组件使用懒加载
 const NotFound = () => import("@/views/page404")
-const ExaminationPaper = () => import("@/views/examinationPaper/index")
-const ExaminationPaperAdd = () => import("@/views/examinationPaper/add")
-const ExaminationPaperEdit = () => import("@/views/examinationPaper/edit")
-const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
-const Ask = () => import("@/views/ask/index")
-const AskAnalysis = () => import("@/views/ask/analysis")
-const Test = () => import("@/views/test/index")
-const TestAnalysis = () => import("@/views/test/analysis")
-const DataSync = () => import("@/views/dataSync/index")
-const Portrait = () => import("@/views/portrait/index")
-const Card = () => import("@/views/card/index")
-const Analysis = () => import("@/views/analysis/index")
-const Device = () => import("@/views/device/index")
-const DeviceLog = () => import("@/views/device/log")
-const Down = () => import("@/views/down/index")
-const DownClient = () => import("@/views/down/client")
-const SetUpAccount = () => import("@/views/setUp/account")
-const SetUpConglomerate = () => import("@/views/setUp/conglomerate")
-const SetUpSchool = () => import("@/views/setUp/school")
-const SetUpStudent = () => import("@/views/setUp/student")
-const SetUpTeacher = () => import("@/views/setUp/teacher")
+const ExaminationPaper = () => import("@/views/standard/examinationPaper/index")
+const ExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
+const ExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
+const ExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
+const Ask = () => import("@/views/standard/ask/index")
+const AskAnalysis = () => import("@/views/standard/ask/analysis")
+const Test = () => import("@/views/standard/test/index")
+const TestAnalysis = () => import("@/views/standard/test/analysis")
+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 SetUpStudent = () => import("@/views/standard/setUp/student")
+const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
+
+const PersonalExaminationPaper = () => import("@/views/personal/examinationPaper/index")
+const PersonalExaminationPaperAdd = () => import("@/views/personal/examinationPaper/add")
+const PersonalExaminationPaperEdit = () => import("@/views/personal/examinationPaper/edit")
+const PersonalExaminationPaperRecycle = () => import("@/views/personal/examinationPaper/recycle")
+const PersonalAsk = () => import("@/views/personal/ask/index")
+const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
+const PersonalTest = () => import("@/views/personal/test/index")
+const PersonalTestAnalysis = () => import("@/views/personal/test/analysis")
+const PersonalDataSync = () => import("@/views/personal/dataSync/index")
+const PersonalPortrait = () => import("@/views/personal/portrait/index")
+const PersonalPortraitDetail = () => import("@/views/personal/portrait/detail")
+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")
+const AdminClientVersion = () => import("@/views/admin/clientVersion/index")
 
 /**
  * 重写路由的push方法
@@ -70,6 +89,22 @@ let defaultRouter = [
     ]
   },
   {
+    path: "/userInfo",
+    iconCls: "fa fa-user", // 图标样式class
+    name: "个人信息",
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: "/userInfo",
+        iconCls: "fa fa-user", // 图标样式class
+        name: "个人信息",
+        component: PersonalUserInfo,
+        children: []
+      }
+    ]
+  },
+  {
     path: "/404",
     component: NotFound,
     name: "404",
@@ -176,23 +211,6 @@ let addrouters = [  //测试用，后续后端获取
 
     ]
   },
-  // {
-  //   path: "/portrait",
-  //   iconCls: "fa fa-users", // 图标样式class
-  //   name: "学生画像",
-  //   component: Layout,
-  //   alone: true,
-  //   children: [
-  //     {
-  //       path: "/portrait",
-  //       iconCls: "fa fa-users", // 图标样式class
-  //       name: "",
-  //       component: Portrait,
-  //       children: []
-  //     }
-  //   ]
-  // },
-
   {
     path: "/setUpConglomerate",
     iconCls: "fa fa-building", // 图标样式class
@@ -355,7 +373,247 @@ let addrouters = [  //测试用，后续后端获取
   },
 ]
 
+const addroutersPersonal = [
+  {
+    path: "/examinationPaper",
+    iconCls: "fa fa-file-text", // 图标样式class
+    name: "备题组卷",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/examinationPaper",
+        iconCls: "fa fa-file-text", // 图标样式class
+        name: "examinationPaper",
+        component: PersonalExaminationPaper,
+        children: []
+      },
+      {
+        path: "/examinationPaperAdd",
+        iconCls: "", // 图标样式class
+        name: "examinationPaperAdd",
+        component: PersonalExaminationPaperAdd,
+        parent: "examinationPaper",
+        children: []
+      },
+      {
+        path: "/examinationPaperEdit",
+        iconCls: "", // 图标样式class
+        name: "修改答题卡",
+        component: PersonalExaminationPaperEdit,
+        parent: "examinationPaper",
+        children: []
+      },
+      {
+        path: "/examinationPaperRecycle",
+        iconCls: "", // 图标样式class
+        name: "已归档答题卡",
+        component: PersonalExaminationPaperRecycle,
+        parent: "examinationPaper",
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/ask",
+    iconCls: "fa fa-bar-chart", // 图标样式class
+    name: "随堂问报表",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/ask",
+        iconCls: "fa fa-bar-chart", // 图标样式class
+        name: "ask",
+        name: "随堂问报表",
+        component: PersonalAsk,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+
+      },
+      {
+        path: "/askAnalysis",
+        iconCls: "", // 图标样式class
+        name: "随堂问报表分析",
+        component: PersonalAskAnalysis,
+        parent: "ask",
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/test",
+    iconCls: "fa fa-pie-chart", // 图标样式class
+    name: "即时测报表",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/test",
+        iconCls: "fa fa-pie-chart", // 图标样式class
+        name: "",
+        component: PersonalTest,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/testAnalysis",
+        iconCls: "", // 图标样式class
+        name: "即时测报表分析",
+        component: PersonalTestAnalysis,
+        parent: "test",
+        children: []
+      }
+
+    ]
+  },
+  {
+    path: "/portrait",
+    iconCls: "fa fa-users", // 图标样式class
+    name: "学生画像",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/portrait",
+        iconCls: "fa fa-users", // 图标样式class
+        name: "",
+        component: PersonalPortrait,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/portraitDetail",
+        iconCls: "", // 图标样式class
+        name: "授课端软件",
+        component: PersonalPortraitDetail,
+        parent: "down",
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/setUpStudent",
+    iconCls: "fa fa-mortar-board",
+    name: '班级名单',
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/setUpStudent",
+        iconCls: "a fa-mortar-board",
+        name: '',
+        component: PersonalSetUpStudent,
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/down",
+    iconCls: "fa fa-download", // 图标样式class
+    name: "软件下载",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/down",
+        iconCls: "fa fa-download", // 图标样式class
+        name: "发卡软件",
+        component: PersonalDown,
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/dataSync",
+    iconCls: "fa fa-random", // 图标样式class
+    name: "数据同步",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/dataSync",
+        iconCls: "fa fa-random", // 图标样式class
+        name: "",
+        component: PersonalDataSync,
+        children: []
+      }
+    ]
+  },
+
+
+
+]
+
+const addRoutersAdmin = [
+  {
+    path: "/account",
+    iconCls: "fa fa-id-card-o", // 图标样式class
+    name: "账号管理",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/account",
+        iconCls: "fa fa-id-card-o",
+        name: '',
+        component: AdminAccount,
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/device",
+    iconCls: "fa fa-dashboard", // 图标样式class
+    name: "设备状态",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/device",
+        iconCls: "fa fa-dashboard", // 图标样式class
+        name: "",
+        component: AdminDevice,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/deviceLog",
+        iconCls: "fa fa-list-alt", // 图标样式class
+        name: "",
+        component: AdminDeviceLog,
+        parent: "device",
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/clientVersion",
+    iconCls: "fa fa-cogs", // 图标样式class
+    name: "版本管理",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/clientVersion",
+        iconCls: "fa fa-id-card-o",
+        name: '',
+        component: AdminClientVersion,
+        children: []
+      },
+    ]
+  },
+]
+
 export default new Router({
   routes: defaultRouter
 })
-export { defaultRouter, addrouters }
+export { defaultRouter, addrouters,addroutersPersonal,addRoutersAdmin }
diff --git a/src/router/permission.js b/src/router/permission.js
index a3d6618..9e09e79 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -18,7 +18,25 @@ router.beforeEach((to, from, next) => {
           return item.roleName == userInfo.showRoleName;
         });
         console.log([...authorityRouterObj[0]?.authorityRouter])
-        store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
+        // store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
+
+        //start 开发用，测试删除 
+        store.commit("setRouters", [
+          "setUpStudent",
+          "examinationPaper",
+          "examinationPaperAdd",
+          "examinationPaperEdit",
+          "examinationPaperRecycle",
+          "ask",
+          "askAnalysis",
+          "test",
+          "testAnalysis",
+          "portrait",
+          "dataSync",
+          "down",
+        ]);
+        //end
+
         store.commit("setInfo", { ...userInfo });
         store.getters.addRouters.forEach((res) => {
           router.addRoute(res);
diff --git a/src/store/index.js b/src/store/index.js
index 5e47e01..585695a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -8,7 +8,7 @@ import { Message } from "element-ui";
 
 import request from "@/api/index";
 import router from "@/router/index";
-import { addrouters } from "@/router/index";
+import { addrouters,addRoutersAdmin ,addroutersPersonal} from "@/router/index";
 Vue.use(Vuex);
 
 const store = new Vuex.Store({
@@ -39,7 +39,15 @@ const store = new Vuex.Store({
       localStorage.setItem("info", JSON.stringify(data));
     },
     setRouters: (state, routers) => {
-      let aRouters = addrouters.filter((item) => {
+      let addrouterList = []
+      if(state.info.showRole == 'ROLE_PINGTAI'){
+        addrouterList = [...addroutersPersonal]
+      }else if(state.info.showRole == 'ROLE_ADMIN'){
+        addrouterList = [...addRoutersAdmin]
+      }else{
+        addrouterList = [...addrouters]
+      }
+      let aRouters = addrouterList.filter((item) => {
         let path = item.children[0]?.path.replace("/", "");
         return routers?.includes(path);
       });
@@ -72,11 +80,35 @@ const store = new Vuex.Store({
             const userInfo = { ...response.data };
             if (userInfo.permissions && userInfo.permissions.length) {
               userInfo.showRoleName = response.data.permissions[0]?.roleName;
+              // userInfo.showRole = response.data.permissions[0]?.role;
+              //  开发用，测试删除 
+              userInfo.showRole = "ROLE_PINGTAI";
               commit("setToken", "isLogin");
               commit("setInfo", { ...userInfo });
-              commit("setRouters", [
-                ...userInfo.permissions[0]?.authorityRouter,
+              // commit("setRouters", [
+              //   ...userInfo.permissions[0]?.authorityRouter,
+              // ]);
+               //start 开发用，测试删除 
+               commit("setRouters", [
+                "setUpStudent",
+                "examinationPaper",
+                "examinationPaperAdd",
+                "examinationPaperEdit",
+                "examinationPaperRecycle",
+                "ask",
+                "askAnalysis",
+                "test",
+                "testAnalysis",
+                "portrait",
+                "dataSync",
+                "down",
+
+                "account",
+                "device",
+                "clientVersion"
               ]);
+              //end
+
               state.addRouters.forEach((res) => {
                 router.addRoute(res);
               });
@@ -117,6 +149,7 @@ const store = new Vuex.Store({
             const userInfo = { ...response.data };
             if (userInfo.permissions && userInfo.permissions.length) {
               userInfo.showRoleName = response.data.permissions[0]?.roleName;
+              userInfo.showRole = response.data.permissions[0]?.role;
               commit("setToken", "isLogin");
               commit("setCode", code);
               commit("setInfo", { ...userInfo });
@@ -158,6 +191,7 @@ const store = new Vuex.Store({
         return item.role == role;
       });
       userInfo.showRoleName = authorityRouterObj[0]?.roleName;
+      userInfo.showRole = authorityRouterObj[0]?.role;
       commit("setInfo", userInfo);
       commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
       state.addRouters.forEach((res) => {
diff --git a/src/utils/global.js b/src/utils/global.js
index d9d4423..e889291 100644
--- a/src/utils/global.js
+++ b/src/utils/global.js
@@ -1,10 +1,8 @@
 import rules from "./rules"
 import request from "@/api"
-import * as echarts from "echarts"
 
 export default {
   install (Vue, options) {
-    Vue.prototype.$echarts = echarts
     Vue.prototype.$request = request
     Vue.prototype.$rules = rules
   }
diff --git a/src/utils/index.js b/src/utils/index.js
index aef5fe3..166760c 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -744,3 +744,44 @@ export function formatGradeNameClass(data) {
   });
   return gradeNameArr;
 }
+
+export function tablePrint(id) {
+  let divs = document.getElementById(id);
+  let awin = window.open("", "_blank");
+  awin.document.getElementsByTagName(
+    "head"
+  )[0].innerHTML = `<style> @media print {@page {size:A4 landscape;margin:10mm}
+    body{margin:5mm;font-size:8px;}}
+    .table-box,.el-table,.el-table__body-wrapper,.el-table--border{max-height:99999999px!important;height:auto;width:auto!important}
+    .el-table{width:100%}
+    .el-table,.el-table__body-wrapper{max-height:auto}
+    .el-table .el-table__cell{padding:12px 0}
+    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #EBEEF5;}
+    .el-table thead tr:first-child th.el-table__cell:first-child{border-left: 1px solid #EBEEF5;}
+    .el-table tbody tr td.el-table__cell:first-child{border-left: 1px solid #EBEEF5;}
+    .el-table td.el-table__cell{border-bottom: 1px solid #EBEEF5;}
+    .el-table--border .el-table__cell{border-right: 1px solid #EBEEF5;}
+    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{border-bottom: 1px solid #EBEEF5;}
+    .el-table .el-table__cell.gutter{border:none!important;}
+    .el-table__fixed{display:none!important}
+    .el-table .el-table__cell.is-center{text-align:center!important}
+    .el-table .el-table__cell.is-hidden>*{visibility: inherit;}
+    ul,li{margin:0;padding:0;list-style:none}
+    .hui-box{display: flex;text-align: center;}
+    .hui-box .s-txt{width: 60px;line-height: 144px;background: #e2e2e2;font-size: 16px;color: #fff;font-weight: 700;border:1px solid #e2e2e2;box-sizing:border-box}
+    .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;}
+    .hui-s.s1{width: 87.5px;}
+    .hui-s.s2{ width: 97.5px;}
+    .hui-s.s3{width: 108px;}
+    </style>`;
+  let aDom = divs.cloneNode(true);
+  let aTbody = aDom
+    .getElementsByClassName("el-table__body")[0]
+    .getElementsByTagName("tbody")[0];
+  aDom.getElementsByClassName("el-table__header")[0].append(aTbody);
+  awin.document.body.append(aDom);
+  awin.print();
+  awin.close()
+}
\ No newline at end of file
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
new file mode 100644
index 0000000..bba74da
--- /dev/null
+++ b/src/views/admin/account/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+     <back-box>
+      <template slot="title">
+        <span>账号管理</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      功能开发中。
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue
new file mode 100644
index 0000000..8e19534
--- /dev/null
+++ b/src/views/admin/clientVersion/index.vue
@@ -0,0 +1,22 @@
+<template>
+  <div>
+     <back-box>
+      <template slot="title">
+        <span>授课端版本管理</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      功能开发中。
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/admin/device/index.vue b/src/views/admin/device/index.vue
new file mode 100644
index 0000000..9be41bc
--- /dev/null
+++ b/src/views/admin/device/index.vue
@@ -0,0 +1,695 @@
+<template>
+  <div ref="main" class="page-content">
+    <back-box>
+      <template slot="title">
+        <span>设备管理</span>
+      </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>
+      <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"
+                  @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>
+            <el-table :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"
+              ></el-table-column>
+              <el-table-column
+                prop="pairingCode"
+                label="配对码"
+                align="center"
+              ></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"
+              ></el-table-column>
+              <el-table-column label="状态" align="center"
+                ><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" 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"
+                  @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>
+            <el-table :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
+                prop="electricity"
+                label="电量"
+                align="center"
+              ></el-table-column>
+              <el-table-column prop="class" label="关联班级" align="center">
+                <template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ 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"
+              ></el-table-column>
+              <el-table-column label="操作" align="center"
+                ><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 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>
+   
+   
+  </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";
+import BusEvent from "@/utils/busEvent";
+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.type = "";
+      if (val == 1) {
+        this.stationReport();
+      } else if (val == 2) {
+        this.keyboardReport();
+      }
+      this._QueryData();
+    },
+  },
+  data() {
+    return {
+      code: "",
+      loading: false,
+      gradeList: [],
+      gradeListAll: [],
+      schoolAll: [],
+      school: {}, //校园账号所属学校信息
+      props: {
+        multiple: true,
+        checkStrictly: true,
+      },
+      type: 1,
+      query: {
+        classId: [],
+        onlineStatus: "",
+        sn: "",
+        type: "",
+      },
+      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 },
+      ],
+      tableData: [],
+      total: 0,
+      count: 0,
+      chartData: [],
+      chartData2: [],
+      page: 1,
+      size: 20,
+    };
+  },
+  created() {
+    this.code = localStorage.getItem("csCode") || "";
+
+    (this.props.lazy = true),
+      (this.props.lazyLoad = function (node, resolve) {
+        const { level } = node;
+        if (level == 2) {
+          console.log(node);
+          api
+            .tenantClassList({
+              schoolId: node.data.value,
+            })
+            .then((res) => {
+              let children = formatGradeNameClass(res.data?.list).sort(
+                (a, b) => {
+                  return a.grade - b.grade;
+                }
+              );
+              console.log();
+
+              const nodes = [...children];
+              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+              resolve(nodes);
+            });
+        } else {
+          resolve(node);
+        }
+      });
+
+    this.stationReport();
+    this._QueryGradeList();
+    this._QueryData();
+    this.showSchool();
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      that.type = 1;
+      that.page = 1;
+      that.total = 0;
+      that.count = 0;
+      that.query.classId = [];
+      that.query.onlineStatus = "";
+      that.query.sn = "";
+      that.query.type = "";
+      that.stationReport();
+      that._QueryData();
+    });
+  },
+  methods: {
+  
+    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);
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(false);
+    },
+ 
+    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 _QueryGradeList() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.gradeList();
+      if (status === 0) {
+        if (!!data.list) {
+          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 { data, status, info } = await this.$request.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 { data, status, info } = await this.$request.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) {
+        query.sn = this.query.sn;
+      } 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) : "";
+        }
+        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])
+              : "";
+          }
+        });
+
+        delete query.classId;
+      }
+      return query;
+    },
+    // 设备列表信息
+    async _QueryData(isRef) {
+      this.loading = true;
+      let query = this.setQuery();
+      if (isRef) {
+        this.page = 1;
+      }
+      this.loading = true;
+      this.tableData = [];
+      const { data, status, info } = await this.$request.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);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px;
+  height: 100%;
+  overflow-y: auto;
+}
+.tab-box {
+  padding: 20px 0 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;
+    .answer-header {
+      padding: 0;
+      margin-bottom: 12px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/device/log.vue b/src/views/admin/device/log.vue
index eb6ecea..eb6ecea 100644
--- a/src/views/device/log.vue
+++ b/src/views/admin/device/log.vue
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index a22ebc6..b1b45b1 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -158,6 +158,93 @@
         </li>
       </template>
     </ul>
+     <ul class="nav-list" v-if="type == 'ROLE_PINGTAI'">
+        <li class="nav-item item1" @click="links('/examinationPaper')">
+          <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
+          <div class="text">
+            <p class="p1">备题组卷</p>
+            <p class="p2">
+              管理
+              <template v-if="dataInfo.paperCount">
+                {{ dataInfo.paperCount }}套答题卡，
+              </template>
+            </p>
+          </div>
+        </li>
+        <li class="nav-item item1" @click="links('/setUpStudent')">
+          <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
+          <div class="text">
+            <p class="p1">班级名单</p>
+            <p class="p2">
+              管理
+              <template v-if="dataInfo.classCount">
+                {{ dataInfo.classCount }}个班级的学生名单，
+              </template>
+            </p>
+          </div>
+        </li>
+        <li class="nav-item item2" @click="links('/portrait')">
+          <img class="icon" src="../../assets/nav/device.png" alt="" />
+          <div class="text">
+            <p class="p1">学生画像</p>
+            <p class="p2">
+              共分析
+              <template v-if="dataInfo.stationCount"
+                >{{ dataInfo.stationCount }}名学生成绩</template
+              >
+            </p>
+          </div>
+        </li>
+        <li class="item3">
+          <div class="nav-item item1 item-child2" @click="links('/ask')">
+            <img class="icon" src="../../assets/nav/card.png" alt="" />
+            <p class="p1">随堂问报表</p>
+            <p class="p2">
+              对
+              <template v-if="dataInfo.classPeriodCount"
+                >{{ dataInfo.classPeriodCount }}套随堂问答题记录分析</template
+              >
+            </p>
+          </div>
+          <div class="nav-item item1 item-child2" @click="links('/test')">
+            <img class="icon" src="../../assets/nav/analysis.png" alt="" />
+            <p class="p1">即时测报表</p>
+            <p class="p2">
+              对<template v-if="dataInfo.examCount"
+                >{{ dataInfo.examCount }}套即时测答题记录分析</template
+              >
+            </p>
+          </div>
+          <div class="nav-item item1 item-child1" @click="links('/down')">
+            <img class="icon" src="../../assets/nav/down.png" alt="" />
+            <div class="text">
+              <p class="p1">软件下载</p>
+              <p class="p2">授课端软件最新版本1.2.0。</p>
+            </div>
+          </div>
+        </li>
+      
+    </ul>
+    <ul class="nav-list" v-if="type == 'ROLE_ADMIN'">
+        <li class="nav-item item1" @click="links('/account')">
+          <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
+          <div class="text">
+            <p class="p1">账号管理</p>
+          </div>
+        </li>
+        <li class="nav-item item1" @click="links('/device')">
+          <img class="icon" src="../../assets/nav/device.png" alt="" />
+          <div class="text">
+            <p class="p1">设备管理</p>
+          </div>
+        </li>
+        <li class="nav-item item2" @click="links('/clientVersion')">
+          <img class="icon" src="../../assets/nav/down.png" alt="" />
+          <div class="text">
+            <p class="p1">授课端版本管理</p>
+          </div>
+        </li>
+    </ul>
   </div>
 </template>
 
@@ -198,6 +285,7 @@ export default {
         }
       });
       this.type = type ? type : this.$store.getters.info.permissions[0].role;
+      this.type = 'ROLE_PINGTAI'
       this.navList = this.$store.getters.addRouters.map((item) => {
         return {
           name: item.name,
@@ -214,6 +302,8 @@ export default {
         this.tenantIndex();
       } else if (this.type == "ROLE_BANZHUREN") {
         this.classIndex();
+      } else if (this.type == "ROLE_PINGTAI") {
+        this.personalIndex();
       }
     },
     async teacherIndex() {
@@ -248,6 +338,14 @@ export default {
         this.$message.error(info);
       }
     },
+     async personalIndex() {
+      const { data, status, info } = await this.$request.personalIndex();
+      if (status === 0) {
+        this.dataInfo = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
@@ -324,7 +422,6 @@ export default {
       }
       &.item-child2 {
         height: calc(50% - 8px);
-        margin-right: 20px;
         flex-wrap: wrap;
         padding: 12px 0 12px 30px;
         .icon {
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index 4261a8c..8148a35 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -9,7 +9,7 @@
         <!-- <li>
           <langSelect></langSelect>
         </li> -->
-        <li class="dropdown-box">
+        <li class="dropdown-box" v-if="role != 'ROLE_PINGTAI'">
           <div class="userInfo">
             <img :src="avatar" />
             <div class="txt">
@@ -34,6 +34,15 @@
             </el-dropdown-menu>
           </el-dropdown>
         </li>
+        <li class="dropdown-box" v-else @click="linkToUserInfo">
+          <div class="userInfo">
+            <img :src="avatar" />
+            <div class="txt">
+              <p>{{ `${this.$store.getters.info.name}` }}</p>
+              <p>个人版</p>
+            </div>
+          </div>
+        </li>
         <li class="fullScreen" @click="fullScreen">
           <el-tooltip
             class="item"
diff --git a/src/views/personal/ask/analysis.vue b/src/views/personal/ask/analysis.vue
new file mode 100644
index 0000000..0e1c13d
--- /dev/null
+++ b/src/views/personal/ask/analysis.vue
@@ -0,0 +1,577 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>单课分析</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="tab-box">
+        <span
+          class="tab-item"
+          :class="type == 1 ? 'active' : ''"
+          @click="setType(1)"
+          >答题表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 2 ? 'active' : ''"
+          @click="setType(2)"
+          >学生问答表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 3 ? 'active' : ''"
+          @click="setType(3)"
+          >学生互动表现</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 4 ? 'active' : ''"
+          @click="setType(4)"
+          >签到明细</span
+        >
+      </div>
+      <div v-loading="loading">
+        <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>
+        <div id="print-content">
+          <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>
+        <div class="down">
+          <p>
+            <el-button
+              @click="exportData"
+              type="primary"
+              plain
+              round
+              icon="fa fa-cloud-download"
+              >导出报表</el-button
+            >
+            <el-button
+              @click="print"
+              type="primary"
+              plain
+              round
+              icon="el-icon-printer"
+              >打印</el-button
+            >
+          </p>
+          <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { downloadFile,tablePrint } from "@/utils";
+export default {
+  data() {
+    return {
+      loading: false,
+      id: "",
+      title: "",
+      type: 1,
+      form: {
+        id: "",
+        questionList: [],
+      },
+      detail: {},
+      tableData: [],
+      optionsList: [],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+    this.title = this.$route.query.title;
+    this._QueryData();
+    this.periodDetail();
+  },
+  methods: {
+    print() {
+      tablePrint("print-content");
+    },
+    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;
+    },
+    async edit() {
+     this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: this.id,
+          title: this.title,
+          type: 3,
+        },
+      });
+    },
+    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("随堂问-单课时报表.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/personal/ask/index.vue b/src/views/personal/ask/index.vue
new file mode 100644
index 0000000..63f47c5
--- /dev/null
+++ b/src/views/personal/ask/index.vue
@@ -0,0 +1,844 @@
+<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
+          class="sel"
+          multiple
+          collapse-tags
+          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>
+        <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"
+      >
+        <el-radio-button :label="1">单课时报表</el-radio-button>
+        <el-radio-button :label="2" v-if="query.startDay != query.endDay"
+          >阶段问答报表</el-radio-button
+        >
+        <el-radio-button :label="3" v-if="query.startDay != query.endDay"
+          >阶段互动报表</el-radio-button
+        >
+      </el-radio-group>
+      <div class="table-cont" v-loading="loading">
+        <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"
+                  v-if="scoped.row.answerNum == 0"
+                  content="设置答案"
+                  placement="top"
+                >
+                  <el-button
+                    type="primary"
+                    circle
+                    size="mini"
+                    icon="fa fa-file-text"
+                    @click="edit(scoped.row)"
+                  ></el-button>
+                </el-tooltip>
+                <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"
+            :max-height="tableMaxHeight"
+            :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"
+            :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 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
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, tablePrint, downloadFile } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      tableMaxHeight: 300,
+      loading: false,
+      form: { questionList: [] },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      await that._QueryClassList();
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+     print() {
+      tablePrint("print-content");
+    },
+    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,
+          title: obj.title,
+        },
+      });
+    },
+    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 = "";
+        }
+      }
+    },
+    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 _QueryClassList() {
+      const { data, status, info } = await this.$request.tClassList();
+      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 { data, status, info } = await this.$request.tSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.query.subjectNames = [];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.subjectList.unshift({
+          value: "全部",
+          label: "全部",
+        });
+        this.query.subjectNames.push(this.subjectList[0]?.value);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      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 (
+        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;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段问答报表
+    async phaseAnswerReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      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.phaseAnswerReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        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;
+        });
+
+        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] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      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.phaseInteractiveReport(
+        {
+          ...query,
+        }
+      );
+      this.loading = false;
+      if (status === 0) {
+        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;
+        });
+
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    setDownQuery() {},
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      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;
+      const data = await this.$request.exportPhaseAnswerReport({ ...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/card/index.vue b/src/views/personal/card/index.vue
index 2a09e0e..2a09e0e 100644
--- a/src/views/card/index.vue
+++ b/src/views/personal/card/index.vue
diff --git a/src/views/dataSync/index.vue b/src/views/personal/dataSync/index.vue
index 12a50b9..12a50b9 100644
--- a/src/views/dataSync/index.vue
+++ b/src/views/personal/dataSync/index.vue
diff --git a/src/views/personal/down/index.vue b/src/views/personal/down/index.vue
new file mode 100644
index 0000000..ea5370f
--- /dev/null
+++ b/src/views/personal/down/index.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="content-box">
+    <back-box>
+      <template slot="title">
+        <span>软件下载</span>
+      </template>
+    </back-box>
+    <div class="down-box" v-loading="loading">
+      <img class="logo" src="" alt="" />
+      <div class="txt">
+        <p class="p1">中天易教授课端 V1.3.4</p>
+        <p class="p2">文件大小：35M</p>
+        <p class="p2">最近更新：2022-12-03 13:30</p>
+      </div>
+      <el-button type="primary" @click="downCard">立即下载</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+    };
+  },
+  methods: {
+    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);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content-box {
+  width: 100%;
+}
+
+.down-box {
+  padding:20px 50px;
+  display: flex;
+  align-items: center;
+}
+.logo {
+  width: 145px;
+  height: 85px;
+  margin-right: 20px;
+}
+.txt {
+  width: 300px;
+  margin-right: 50px;
+  .p1 {
+    font-size: 18px;
+    color: #333;
+    font-weight: 600;
+    padding-bottom: 16px;
+  }
+  .p2 {
+    color: #7f7f7f;
+    line-height: 20px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/examinationPaper/add.vue b/src/views/personal/examinationPaper/add.vue
new file mode 100644
index 0000000..7725b82
--- /dev/null
+++ b/src/views/personal/examinationPaper/add.vue
@@ -0,0 +1,2022 @@
+<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="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>
+        <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
+          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>
+            <span class="m20">共：{{ question.subQuestions.length }}题</span>
+            <span>共：{{ 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-tooltip effect="dark" content="上传提干" placement="top">
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions, 1)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip effect="dark" content="题目打标" placement="top">
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-price-tag"
+                      @click="openTag(subQuestions)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip
+                    effect="dark"
+                    content="上传题目解析"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="el-icon-upload"
+                      @click="openStem(subQuestions, 2)"
+                    ></el-button>
+                  </el-tooltip>
+                  <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
+          title="添加大题"
+          :visible.sync="addQuestionVisible"
+          :close-on-click-modal="false"
+          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"
+              >
+                <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
+                      "
+                      class="answer-box"
+                    >
+                      <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>共：{{ 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
+          title="批量设置答案"
+          :visible.sync="diaSetAns"
+          :close-on-click-modal="false"
+          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>
+      <el-dialog
+        :title="upLoadType == 1 ? '上传题干' : '上传题目解析'"
+        :visible.sync="dialogStem"
+        width="500"
+      >
+        <div>
+          <img class="stem-pic" :src="stem.src" alt="" />
+          <el-upload
+            class="upload-demo"
+            action="https://jsonplaceholder.typicode.com/posts/"
+            :limit="1"
+            :with-credentials="true"
+            :on-success="upSuccess"
+            :on-error="upError"
+            accept="image/*"
+          >
+            <el-button size="small" type="primary">{{
+              stem.src ? "重新上传" : "选择照片"
+            }}</el-button>
+          </el-upload>
+        </div>
+        <div slot="footer">
+          <el-button @click="dialogStem = false">关闭弹窗</el-button>
+        </div>
+      </el-dialog>
+      <el-dialog title="题目打标" :visible.sync="dialogTag" width="500">
+        <div>
+          <el-form ref="form" :model="stem" label-width="160px">
+            <el-form-item label="题目难度：">
+              <el-select v-model="stem.type" placeholder="选择题目难度">
+                <el-option label="简单" :value="0"></el-option>
+                <el-option label="正常" :value="1"></el-option>
+                <el-option label="困难" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="知识点：">
+              <el-select v-model="stem.tag" placeholder="选择知识点">
+                <el-option label="生字积累" :value="0"></el-option>
+                <el-option label="字词运用" :value="1"></el-option>
+                <el-option label="阅读理解" :value="2"></el-option>
+                <el-option label="作文" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div slot="footer">
+          <el-button @click="dialogTag = false">取 消</el-button>
+          <el-button type="primary" @click="dialogTag = false">确 定</el-button>
+        </div>
+      </el-dialog>
+    </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 {
+      dialogStem: false,
+      dialogTag: false,
+      upLoadType: 1,
+      stem: {
+        src: "", //题干图片地址
+        type: 0, //题目难度
+        tag: 0, //知识点
+      },
+      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: "",
+        subjectName: "",
+        examsDuration: 90,
+        questionList: [],
+      },
+      formRules: {
+        //答题卡验证
+        title: [
+          { required: true, message: "请输入答题卡名称", trigger: "blur" },
+          {
+            min: 1,
+            max: 30,
+            message: "长度在 1 到 30 个字符",
+            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._QuerySubjectList(this.gradeList[0]);
+    await this._TypeList();
+    if (this.type == 2) {
+      this._QueryDetail();
+    }
+  },
+  methods: {
+    openStem(obj, type) {
+      this.upLoadType = type;
+      this.stem = { ...this.stem, obj };
+      this.dialogStem = true;
+    },
+    openTag(obj) {
+      this.stem = { ...this.stem, obj };
+      this.dialogTag = true;
+    },
+    upSuccess(res) {
+      if (res && res.status == 0) {
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error(res.info);
+      }
+    },
+    upError(res) {
+      if (res && res.status == 0) {
+        this.$message.error("上传失败");
+      } else {
+        this.$message.error(res.message);
+      }
+    },
+    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, 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;
+      }
+      //添加题目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;
+    },
+    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) {
+      //删除小题
+      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);
+    },
+    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 _TypeList() {
+      //测验类型查询
+      const { data, status, info } = await this.$request.fetchTypeNames({
+        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 _QuerySubjectList() {
+      //查询科目列表
+      const { data, status, info } = await this.$request.fetchSubjectList();
+      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.examsDuration = data.examsDuration;
+        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 24px;
+  .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: 0 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: 70px;
+  }
+  .qs-type {
+    width: 160px;
+  }
+  .qs-score,
+  .qs-partScore {
+    width: 160px;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-set {
+    width: 190px;
+    .delete{
+      margin-left:9px;
+    }
+  }
+  .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;
+    }
+  }
+}
+.upload-demo{
+  text-align: center;
+}
+.stem-pic {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/detail.vue b/src/views/personal/examinationPaper/detail.vue
index 4611414..4611414 100644
--- a/src/views/examinationPaper/detail.vue
+++ b/src/views/personal/examinationPaper/detail.vue
diff --git a/src/views/personal/examinationPaper/edit.vue b/src/views/personal/examinationPaper/edit.vue
new file mode 100644
index 0000000..aaa7c89
--- /dev/null
+++ b/src/views/personal/examinationPaper/edit.vue
@@ -0,0 +1,1090 @@
+<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>
+              <div class="qs-set">操作</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 class="qs-set">
+                  <el-tooltip effect="dark" content="上传提干" placement="top">
+                    <el-button
+                      type="primary"
+                      circle
+                      size="small"
+                      icon="el-icon-tickets"
+                      @click="openStem(subQuestions,1)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip effect="dark" content="题目打标" placement="top">
+                    <el-button
+                      type="primary"
+                      circle
+                      size="small"
+                      icon="el-icon-price-tag"
+                       @click="openTag(subQuestions)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip
+                    effect="dark"
+                    content="上传题目解析"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="small"
+                      icon="el-icon-upload"
+                      @click="openStem(subQuestions,2)"
+                    ></el-button>
+                  </el-tooltip>
+                </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>
+          <div class="qs-set">操作</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)"
+              >批量设置答案</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
+        title="批量设置答案"
+        :close-on-click-modal="false"
+        :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" class="answer-box">
+              <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>
+      <el-dialog :title="upLoadType==1?'上传题干':'上传题目解析'" :visible.sync="dialogStem" width="500">
+        <div>
+          <img class="stem-pic" :src="stem.src" alt="" />
+          <el-upload
+            class="upload-demo"
+            action="https://jsonplaceholder.typicode.com/posts/"
+            :limit="1"
+            :with-credentials="true"
+            :on-success="upSuccess"
+            :on-error="upError"
+            accept="image/*"
+          >
+            <el-button size="small" type="primary">{{stem.src?"重新上传":"选择照片"}}</el-button>
+          </el-upload>
+        </div>
+        <div slot="footer">
+          <el-button @click="dialogStem = false">关闭弹窗</el-button>
+        </div>
+      </el-dialog>
+      <el-dialog title="题目打标" :visible.sync="dialogTag" width="500">
+        <div>
+         <el-form ref="form" :model="stem" label-width="160px">
+          <el-form-item label="题目难度：">
+            <el-select v-model="stem.type" placeholder="选择题目难度">
+              <el-option label="简单" :value="0"></el-option>
+              <el-option label="正常" :value="1"></el-option>
+              <el-option label="困难" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="知识点：">
+            <el-select v-model="stem.tag" placeholder="选择知识点">
+              <el-option label="生字积累" :value="0"></el-option>
+              <el-option label="字词运用" :value="1"></el-option>
+              <el-option label="阅读理解" :value="2"></el-option>
+              <el-option label="作文" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+          </el-form>
+        </div>
+        <div slot="footer">
+          <el-button @click="dialogTag = false">取 消</el-button>
+          <el-button type="primary" @click="dialogTag = false"
+            >确 定</el-button
+          >
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import { deepClone, checkAnswer } from "utils";
+export default {
+  data() {
+    return {
+      dialogStem: false,
+      dialogTag: false,
+      upLoadType:1,
+      stem: {
+        src: "", //题干图片地址
+        type: 0, //题目难度
+        tag: 0, //知识点
+      },
+      title: "",
+      type: 1,
+      questionList: [],
+      form: {
+        //答题卡详情
+        title: "",
+        tag: "",
+        subjectId: "",
+        examsDuration: 90,
+        gradeName: "",
+        share: 1,
+        questionList: [],
+      },
+      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.type = this.$route.query.type || 1;
+    this.title = this.$route.query.title || "";
+    this._QueryDetail();
+  },
+  methods: {
+    openStem(obj,type) {
+      this.upLoadType = type
+      this.stem = { ...this.stem, obj };
+      this.dialogStem = true;
+    },
+    openTag(obj) {
+      this.stem = { ...this.stem, obj };
+      this.dialogTag = true;
+    },
+    upSuccess(res) {
+      if (res && res.status == 0) {
+        this.$message.success("上传成功");
+      } else {
+        this.$message.error(res.info);
+      }
+    },
+    upError(res) {
+      if (res && res.status == 0) {
+        this.$message.error("上传失败");
+      } else {
+        this.$message.error(res.message);
+      }
+    },
+    linkBack() {
+      this.$router.go(-1);
+    },
+    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.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.$request.modifyPaper;
+        params = {
+          paperId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else if (this.type == 2) {
+        modifyPaper = this.$request.setExamAnswer;
+        params = {
+          examId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else {
+        modifyPaper = 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(message);
+      }
+    },
+    async _QueryDetail() {
+      //查询详情
+      let 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) {
+        if (this.type == 1) {
+          this.paperModifyLog = {
+            ...this.paperModifyLog,
+            ...this.form.paperModifyLog,
+          };
+          this.form = deepClone(data);
+          this.questionList = deepClone(this.form.questionList);
+        } else {
+          this.questionList = data.list.sort((a, b) => {
+            return a.questionIndex - b.questionIndex;
+          });
+        }
+        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) {
+              this.questionList.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 {
+    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: 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-set {
+    width: 180px;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .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;
+      }
+    }
+  }
+}
+.upload-demo{
+  text-align: center;
+}
+.stem-pic {
+  width: 100%;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/examinationPaper/index.vue b/src/views/personal/examinationPaper/index.vue
new file mode 100644
index 0000000..14804d6
--- /dev/null
+++ b/src/views/personal/examinationPaper/index.vue
@@ -0,0 +1,468 @@
+<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>
+          </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="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>
+   
+  </div>
+</template>
+
+<script>
+export default {
+  name: "examinationPaper",
+  data() {
+    return {
+      loading: false,
+      userName: "",
+      query: {
+        classId: "",
+        subjectName: "",
+        tagId: "",
+        title: "",
+      },
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      archivedTotal: 0, //已归档答题卡数量
+      tableData: null,
+      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: {
+    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 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 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/examinationPaper/recycle.vue b/src/views/personal/examinationPaper/recycle.vue
index 110986a..110986a 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/personal/examinationPaper/recycle.vue
diff --git a/src/views/personal/portrait/detail.vue b/src/views/personal/portrait/detail.vue
new file mode 100644
index 0000000..5a9e839
--- /dev/null
+++ b/src/views/personal/portrait/detail.vue
@@ -0,0 +1,371 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>学生测练表现</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          collapse-tags
+          @change="changeSub"
+        >
+          <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="page-content">
+      <p class="tips">张三 （学号：1301） 测练总次数：16</p>
+      <div class="chart">
+        <template v-if="type == 1">
+          <radarChart id="radarChart" :params="radarChartData" />
+        </template>
+        <template v-else>
+          <lineChart id="lineChart" :params="lineChartData" :xAxis="xAxis" />
+        </template>
+      </div>
+      <div class="tab-box">
+        <el-table
+          v-show="type == 1"
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="subjectName"
+            label="科目"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="cl"
+            label="参与测练数"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="bg"
+            label="班最高分"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="bp"
+            label="班平均分"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="br"
+            label="个人得分"
+            align="center"
+          ></el-table-column>
+        </el-table>
+        <el-table
+          v-show="type == 2"
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
+          <el-table-column
+            prop="subjectName"
+            label="课堂测练"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="br"
+            label="个人成绩"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="bp"
+            label="平均成绩"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="pm"
+            label="班级排名"
+            align="center"
+          ></el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from "utils";
+import radarChart from "@/components/charts/radarChart";
+import lineChart from "@/components/charts/lineChart";
+export default {
+  components: { radarChart, lineChart },
+  data() {
+    return {
+      id: "",
+      classId: "",
+      subjectNames: [],
+      type: 1,
+      query: {
+        //搜索条件
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      date: "",
+      subjectList: [], //科目
+      radarChartData: {
+        indicator: [
+          { name: "语文" },
+          { name: "数学" },
+          { name: "地理" },
+          { name: "物理" },
+          { name: "化学" },
+          { name: "生物" },
+        ],
+        num: [
+          {
+            name: "班最高分",
+            value: [100, 99, 98, 99, 100, 100],
+          },
+          {
+            name: "班平均分",
+            value: [95, 85, 90, 86, 92, 87],
+          },
+          {
+            name: "本人得分",
+            value: [90, 80, 95, 82, 95, 89],
+          },
+        ],
+      },
+      lineChartData: [
+        {
+          name: "班平均分",
+          value: [95, 85, 90, 86, 92],
+        },
+        {
+          name: "个人成绩",
+          value: [90, 80, 95, 82, 95],
+        },
+        {
+          name: "班级排名",
+          value: [2, 3, 1, 5, 6],
+        },
+      ],
+      xAxis: ["卷1", "卷2", "卷3", "卷4", "卷5"],
+      tableData: [
+        {
+          subjectName: "语文",
+          cl: 5,
+          bg: 100,
+          bp: 90,
+          br: 95,
+          pm: 1,
+        },
+      ],
+    };
+  },
+  async created() {
+    this.id = this.$route.query.id;
+    this.classId = this.$route.query.classId;
+    this.subjectNames = this.$route.query.subjectNames?.split(",") || [];
+    this.type =
+      this.subjectNames.length > 1 || this.subjectNames.length == 0 ? 1 : 2;
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  methods: {
+    changeSub(val) {
+      let sub;
+      if (val && val.length) {
+        let leng = val.length - 1;
+        sub = val[leng];
+      }
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+      this.type =
+        this.query.subjectNames.length > 1 ||
+        this.query.subjectNames.length == 0
+          ? 1
+          : 2;
+    },
+    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 _QuerySubjectList() {
+      const { data, status, info } = await this.$request.tSubjectList({
+        classId: this.classId,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.subjectList.unshift({
+          value: "全部",
+          label: "全部",
+        });
+        if (this.subjectNames.length == 0) {
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      return;
+      const { data, status, info } = await this.$request.studentList({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px;
+}
+.tips {
+  padding-left: 20px;
+  font-size: 16px;
+  color: #a3a4a8;
+  font-weight: 400;
+  font-style: normal;
+}
+.chart {
+  height: 300px;
+}
+.tab-box {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/portrait/index.vue b/src/views/personal/portrait/index.vue
new file mode 100644
index 0000000..b0cc45d
--- /dev/null
+++ b/src/views/personal/portrait/index.vue
@@ -0,0 +1,333 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>{{ "学生画像" }}</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :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="page-content">
+      <ul class="stu-ul">
+        <li class="stu-li" v-for="item in tableData" :key="item.studentId">
+          <div class="tx">
+            <i class="fa fa-mortar-board"></i>
+            <p>{{ item.studentCode }}</p>
+          </div>
+          <div class="info">
+            <p class="p1">
+              {{ item.studentName }} <i class="fa fa-calculator"></i>
+              {{ item.clickerSn }}
+            </p>
+            <p class="p2">{{ item.sectionName + item.className }}</p>
+            <p class="p3">最近活跃：{{ item.time }}</p>
+          </div>
+          <el-button
+            class="btn"
+            type="primary"
+            round
+            circle
+            icon="el-icon-right"
+            @click="linkDetail(item)"
+          ></el-button>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      query: {
+        //搜索条件
+        classId: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      date: "",
+      classList: [],
+      tableData: [
+        {
+          studentId: "111",
+          studentName: "丁方菲",
+          studentCode: 123321,
+          clickerSn: 32312,
+          sectionName: "初一",
+          className: "三班",
+          classId:12,
+          time: "2022-11-04 18:09:49",
+        },
+      ],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    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 () {
+      await that._QueryClassList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+    linkDetail(obj) {
+      this.$router.push({
+        path: "/portraitDetail",
+        query: {
+          id: obj.studentId,
+          classId:obj.classId,
+        },
+      });
+    },
+    changeclass() {
+      this.page = 1;
+      this._QueryData();
+    },
+    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 _QueryClassList() {
+      const { data, status, info } = await this.$request.tClassList();
+      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 _QueryData() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      return;
+      const { data, status, info } = await this.$request.studentList({
+        ...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);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 0 20px;
+}
+.stu-ul {
+  border-radius: 20px;
+  background: #f8f8f8;
+  padding: 12px;
+  .stu-li {
+    border-radius: 12px;
+    background: #fff;
+    display: flex;
+    align-items: center;
+    padding: 12px 10px;
+    margin-bottom: 16px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+    .tx {
+      width: 80px;
+      height: 80px;
+      background: #667ffd;
+      border-radius: 8px;
+      text-align: center;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      font-size: 16px;
+      color: #fff;
+      margin-right: 12px;
+      .fa-mortar-board {
+        font-size: 32px;
+      }
+    }
+    .info {
+      flex: 1;
+      .p1 {
+        font-size: 18px;
+        color: #333;
+        .fa-calculator {
+          font-size: 20px;
+          color: #a6a6a6;
+          margin: 0 5px 10px 10px;
+        }
+      }
+      .p2 {
+        font-size: 16px;
+        padding-bottom: 6px;
+      }
+      .p3 {
+        font-size: 16px;
+        color: #7f7f7f;
+      }
+    }
+    .btn {
+      margin-right: 40px;
+      &.is-circle {
+        padding: 8px;
+      }
+      :deep(.el-icon-right) {
+        font-size: 22px;
+        font-weight: bold;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
new file mode 100644
index 0000000..5d6d9a4
--- /dev/null
+++ b/src/views/personal/setUp/student.vue
@@ -0,0 +1,526 @@
+<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="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-plus"
+            size="mini"
+            plain
+            circle
+            @click="addClass"
+          ></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+
+    <div class="page-content">
+      <div class="stu-box">
+        <div class="stu-list">
+          <p class="h-title">班级列表</p>
+          <ul class="stu-ul">
+            <li
+              class="stu-item"
+              v-for="item in classList"
+              :key="item.id"
+              :class="query.classId == item.id ? 'active' : ''"
+              @click="classDetail(item)"
+            >
+              <i class="el-icon-edit-outline" @click.stop="setClass(item)"></i>
+              {{ item.className }}（{{ item.studentCount }}）
+            </li>
+          </ul>
+        </div>
+        <div class="stu-detail">
+          <p class="stu-head">
+            {{ formStu.className }}所有学生（{{ studentList.length }}）
+            <i
+              v-if="query.classId"
+              class="el-icon-circle-plus-outline"
+              @click="openAddDia"
+            ></i>
+          </p>
+          <ul class="s-ul" v-loading="loading">
+            <li
+              class="s-li"
+              v-for="(item, index) in studentList"
+              :key="item.id"
+            >
+              <el-popconfirm
+                title="确定删除吗？"
+                @confirm="removeStu(item, index)"
+              >
+                <i class="el-icon-delete" slot="reference"></i>
+              </el-popconfirm>
+              <p class="name">{{ item.studentName }}</p>
+              <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
+              <p class="p1">长学号：{{ item.studentCode }}</p>
+              <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
+            </li>
+          </ul>
+          <el-empty
+            :image-size="100"
+            v-if="!studentList.length && loading == false"
+            description="没有更多数据"
+          ></el-empty>
+        </div>
+      </div>
+    </div>
+    <el-dialog 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
+      :title="formClass.classId ? '修改班级' : '添加班级'"
+      :visible.sync="diaClass"
+      width="400"
+    >
+      <el-form
+        class="form-box"
+        ref="formClass"
+        :model="formClass"
+        :rules="rulesClass"
+        label-width="160px"
+      >
+        <el-form-item label="班级名称：" prop="className">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formClass.className" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="入学年份：" prop="intoSchoolYear">
+          <el-col :span="10">
+            <el-date-picker
+              v-model="formClass.intoSchoolYear"
+              type="year"
+              value-format="yyyy"
+              placeholder="选择年"
+            >
+            </el-date-picker>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveClass">确 定</el-button>
+        <el-button @click="diaClass = false">取 消</el-button>
+        <el-button v-if="formClass.classId" @click="removeClass"
+          >删 除</el-button
+        >
+      </div>
+    </el-dialog>
+    <el-dialog 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 { downloadFile, getBlob } from "@/utils";
+export default {
+  data() {
+    return {
+      diaUp: false,
+      url: "/api_html/school/manager/importStudentClicker",
+      diaStu: false,
+      diaClass: false,
+      loading: false,
+      query: {
+        classId: "",
+      },
+      formStu: {
+        className: "",
+        studentName: "",
+        studentCode: "",
+        shortNumber: "",
+        sex: 1,
+        clickerSn: "",
+      },
+      rulesStu: {
+        studentName: [
+          { required: true, message: "请输入学生名称", trigger: "blur" },
+        ],
+        studentCode: [
+          { required: true, message: "请输入学生长学号", trigger: "blur" },
+        ],
+      },
+      formClass: {
+        classId: "",
+        className: "",
+        intoSchoolYear: "",
+      },
+      rulesClass: {
+        className: [
+          { required: true, message: "请输入班级名称", trigger: "blur" },
+        ],
+      },
+      classList: [],
+      studentList: [],
+    };
+  },
+  async created() {
+    // await this._QueryClass();
+    // this._QueryData();
+  },
+  methods: {
+    addClass() {
+      this.formClass.classId = "";
+      this.formClass.className = "";
+      this.formClass.intoSchoolYear = "";
+      this.diaClass = true;
+    },
+    openAddDia() {
+      this.formStu.studentName = "";
+      this.formStu.studentCode = "";
+      this.formStu.shortNumber = "";
+      this.formStu.sex = 1;
+      this.formStu.clickerSn = "";
+      this.diaStu = true;
+    },
+    classDetail(obj) {
+      this.query.classId = obj.id;
+      this.formStu.className = obj.className;
+      this._QueryData();
+    },
+    setClass(obj) {
+      this.formClass.classId = obj.id;
+      this.formClass.className = obj.className;
+      this.formClass.intoSchoolYear = obj.intoSchoolYear + "";
+      this.diaClass = true;
+    },
+    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,
+            intoSchoolYear: this.formClass.intoSchoolYear,
+          });
+          if (status === 0) {
+            this.$message.success("修改成功");
+            this.diaClass = false;
+            this._QueryClass();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.warning("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    async removeClass() {
+      let stuNum = 0;
+      this.classList.map((item) => {
+        if (item.classId == this.formClass.classId) {
+          stuNum = item.studentCount;
+        }
+      });
+      if (stuNum) {
+        this.$message.warning("有学生的班级不能删除！");
+        return;
+      }
+      const { data, status, info } = await this.$request.updateClass({
+        classId: this.formClass.classId,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        this.diaClass = false;
+        this._QueryClass();
+      } 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();
+    },
+    async downExcel() {
+      this.loadingDown = true;
+      let { data, info, status } =
+        await this.$request.studentClickerTemplateUrl();
+      this.loadingDown = false;
+      if (status == 0) {
+        getBlob(data.downloadUrl).then((res) => {
+          downloadFile("学生答题器绑定模板", res);
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async removeStu(obj, index) {
+      const { data, status, info } = await this.$request.delStudent({
+        studentId: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        this.studentList.splice(index, 1);
+        this._QueryClass();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    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;
+            this._QueryClass();
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    async _QueryData() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.studentList({
+        ...this.query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.studentList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+
+    async _QueryClass() {
+      const { data, status, info } = await this.$request.schoolClassList();
+      if (status === 0) {
+        this.classList = [...data.list] || [];
+        this.query.classId = this.classList[0]?.id;
+        this.formStu.className = this.classList[0]?.className;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+.stu-box {
+  display: flex;
+  background: #f8f8f8;
+  border-radius: 10px;
+  overflow: hidden;
+  .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: 12px;
+        font-size: 20px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
+      &:hover {
+        background: #eee;
+        .el-icon-edit-outline {
+          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;
+    .stu-head {
+      padding: 12px 20px;
+      color: #7f7f7f;
+      position: relative;
+      .el-icon-circle-plus-outline {
+        position: absolute;
+        top: 10px;
+        right: 20px;
+        font-size: 24px;
+        color: #7f7f7f;
+        cursor: pointer;
+      }
+    }
+    .s-ul {
+      display: flex;
+      flex-wrap: wrap;
+      padding-left: 20px;
+      .s-li {
+        width: 180px;
+        height: 120px;
+        box-shadow: 2px 2px 5px #7f7f7f;
+        border-radius: 10px;
+        margin: 0 20px 20px 0;
+        padding: 0 12px 5px;
+        position: relative;
+        .el-icon-delete {
+          position: absolute;
+          top: 8px;
+          right: 8px;
+          font-size: 18px;
+          padding: 2px;
+          display: none;
+          cursor: pointer;
+          &:hover {
+            color: #667ffd;
+          }
+        }
+        &:hover {
+          .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;
+        }
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue
new file mode 100644
index 0000000..10221d7
--- /dev/null
+++ b/src/views/personal/test/analysis.vue
@@ -0,0 +1,824 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>单卷分析</span>
+      </template>
+    </back-box>
+    <div class="tips" v-if="paperModifyLog.modifiedTime">
+      <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
+          class="tab-item"
+          :class="type == 1 ? 'active' : ''"
+          @click="setType(1)"
+          >试题分析</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 2 ? 'active' : ''"
+          @click="setType(2)"
+          >成绩排名</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 3 ? 'active' : ''"
+          @click="setType(3)"
+          >小题分报表</span
+        >
+        <span
+          class="tab-item"
+          :class="type == 4 ? 'active' : ''"
+          @click="setType(4)"
+          >作答明细表</span
+        >
+      </div>
+      <div id="print-content" class="table-box" v-loading="loading">
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 1"
+          :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="90"
+            ><template slot-scope="scope">{{
+              setSubPro(scope.row.questionType)
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="score"
+            width="90"
+            label="满分值"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="100"
+            prop="highestScore"
+            label="班最高分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="100"
+            prop="lowestScore"
+            label="班最低分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="100"
+            prop="avgScore"
+            label="班平均分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="classScoringRate"
+            width="110"
+            sortable
+            label="班级得分率"
+            align="center"
+            ><template slot-scope="scoped"
+              ><span :class="scoped.row.classScoringRate < 60 ? 'error' : ''"
+                >{{ scoped.row.classScoringRate }}%</span
+              ></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="90"
+            ><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 class="hui-box" v-show="type == 1">
+          <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"
+                :class="
+                  examReport.subjectiveClassScoringRate < 60 ? 'error' : ''
+                "
+                >{{ 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"
+                :class="
+                  examReport.objectiveClassScoringRate < 60 ? 'error' : ''
+                "
+                >{{ 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"
+                :class="examReport.classScoringRate < 60 ? 'error' : ''"
+                >{{ examReport.classScoringRate }}%</span
+              >
+            </li>
+          </ul>
+        </div>
+        <el-table
+          v-show="type == 2"
+          :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 == 3"
+          :max-height="tableMaxHeight"
+          :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="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"
+            :width="questionList.length > 9 ? 60 : 'auto'"
+          >
+          </el-table-column>
+        </el-table>
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 4"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
+        >
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+            width="110"
+          ></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"
+            :width="questionList.length > 9 ? 60 : 'auto'"
+          >
+            <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
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </div>
+        <div>
+          <el-button
+            v-if="examReport.subjectiveScore != 0"
+            @click="diaUp = true"
+            type="primary"
+            round
+            v-loading="exportLoading"
+            >导入主观题分数</el-button
+          >
+          <el-button
+            @click="edit"
+            type="primary"
+            v-if="examReport.subjectiveScore != examReport.examPaperScore"
+            round
+            >查看题目</el-button
+          >
+        </div>
+      </div>
+      <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+        <up-load
+          :url="url"
+          :examId="id"
+          @upSuccess="upSuccess"
+          fileName="教师名单"
+        >
+          <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 {
+      tableMaxHeight: 600,
+      loading: false,
+      exportLoading: false,
+      diaUp: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      id: "",
+      title: "",
+      score: "",
+      type: 1,
+      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.id = this.$route.query.id;
+    this.title = this.$route.query.title || "";
+    this._QueryData();
+  },
+  methods: {
+    print() {
+      tablePrint("print-content");
+    },
+    upSuccess() {
+      //导入成功
+      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 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);
+      }
+    },
+    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(1);
+      } 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("即时测-单卷测练报表.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>
+.page-container {
+  position: relative;
+  height: 100%;
+  .table-box {
+    min-height: 100%;
+  }
+}
+.print-box {
+  display: none;
+}
+.persent {
+  white-space: nowrap;
+  font-size: 14px;
+}
+.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: 90px;
+    }
+    .s2 {
+      width: 100px;
+    }
+    .s3 {
+      width: 110px;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
new file mode 100644
index 0000000..a0d8741
--- /dev/null
+++ b/src/views/personal/test/index.vue
@@ -0,0 +1,865 @@
+<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
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          collapse-tags
+          @change="changeSub"
+        >
+          <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"
+      >
+        <el-radio-button :label="1">单卷测练报表</el-radio-button>
+        <el-radio-button
+          :label="2"
+          v-show="this.query.startDay != this.query.endDay"
+          >阶段测练报表</el-radio-button
+        >
+      </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="100"
+          ></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>
+              <el-tooltip
+                v-if="
+                  scoped.row.answerNum == 0 &&
+                  scoped.row.subjectiveScore != scoped.row.examPaperScore
+                "
+                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>
+              <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">
+          <el-table
+            id="print-content"
+            :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>
+        </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
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
+      </p>
+    </div>
+    <el-dialog 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 {
+      exportLoading: false,
+      tableMaxHeight: 300,
+      loading: false,
+      diaUp: false,
+      loadingDown: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      examId: "",
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+      await that._QueryClassList();
+      await that._QuerySubjectList();
+      await that.setDate(1);
+      let startDay = that.query?.startDay;
+      if (!startDay) {
+        that.query.startDay = new Date();
+        that.query.endDay = new Date();
+      }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint("print-content");
+    },
+    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,
+        },
+      });
+    },
+    toPortrait(obj) {
+      let subjectNames = [];
+      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: obj.classId,
+          subjectNames: subjectNames.join(","),
+        },
+      });
+    },
+    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() {
+      //导入成功
+      this.diaUp = false;
+      this._QueryData();
+    },
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    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);
+      }
+    },
+    async changClazz() {
+      this.page = 1;
+      await this._QuerySubjectList();
+      await this._QueryData();
+    },
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.tClassList();
+      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 { data, status, info } = await this.$request.tSubjectList({
+        classId: this.query.classId,
+      });
+      if (status === 0) {
+        this.query.subjectNames = [];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.subjectList.unshift({
+          value: "全部",
+          label: "全部",
+        });
+        this.query.subjectNames.push(this.subjectList[0]?.value);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      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 (
+        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;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      if (
+        query["subjectNames"] &&
+        query["subjectNames"]?.length == 1 &&
+        query["subjectNames"][0] == "全部"
+      ) {
+        query["subjectNames"] = this.subjectList.map((item) => {
+          return item.value;
+        });
+        query["subjectNames"]?.shift();
+      }
+      // 测试
+      query["subjectName"] = "政治";
+      delete query["subjectNames"];
+      // end
+      const { data, status, info } = await this.$request.phaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        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 {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      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 = await this.$request.exportPhaseExamReport({ ...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>
+.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;
+  }
+}
+.click-b {
+  cursor: pointer;
+}
+.down {
+  padding-top: 16px;
+}
+.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;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/userInfo/index.vue b/src/views/personal/userInfo/index.vue
new file mode 100644
index 0000000..11cdf1b
--- /dev/null
+++ b/src/views/personal/userInfo/index.vue
@@ -0,0 +1,299 @@
+<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">{{
+              school.sections | getSections(school.sections)
+            }}</span>
+          </li>
+        
+        </ul>
+      </div>
+    </div>
+    <el-dialog 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="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="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>  
+  </div>
+</template>
+
+<script>
+import { downloadFile } from "@/utils";
+export default {
+  filters: {
+    getSections(val) {
+      let arr = val.split(",");
+      let sections = arr.map((item) => {
+        let txt;
+        switch (item) {
+          case "0":
+            txt = "未知";
+            break;
+          case "1":
+            txt = "小学";
+            break;
+          case "2":
+            txt = "初中";
+            break;
+          case "3":
+            txt = "高中";
+            break;
+          case "4":
+            txt = "大学";
+            break;
+          case "7":
+            txt = "未知";
+            break;
+          default:
+            txt = "未知";
+        }
+        return txt;
+      });
+      return sections.join(",");
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      diaSchool: false,
+      school: {
+        schoolName: "",
+        managePwd: "",
+        contactPerson: "",
+        contactPhone: "",
+        sections: "",
+      },
+      tableData: [],
+      formSchool: {
+        sections: "",
+        managePwd: "",
+        contactPerson: "",
+        contactPhone: "",
+      },
+      subjectName: "",
+      subjectList: [],
+    };
+  },
+  created() {
+    // this._QueryDataSchool();
+    // this._QuerySubject();
+  },
+  methods: {
+    addSubjectName() {
+      if (!this.subjectName) {
+        this.$message.warning("请填写科目名称");
+        return;
+      }else if(this.subjectList.includes(this.subjectName)){
+        this.$message.warning("科目已存在，请重新填写～");
+        return;
+      }
+      this.subjectList.push(this.subjectName);
+      this.subjectName = "";
+    },
+    editSchool() {
+      if (!this.formSchool.sections.length) {
+        this.$message.error("请选择科目！");
+        return;
+      }
+      if (!this.formSchool.managePwd) {
+        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();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    async _QueryDataSchool() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.schoolDetail();
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.school = { ...data };
+        for (let key in this.formSchool) {
+          this.formSchool[key] = data[key] || "";
+        }
+        this.formSchool.sections = this.formSchool.sections.split(",");
+      } 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 downExcel() {
+      let data = await this.$request.downDevice({
+        id: 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 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;
+      }
+    }
+  }
+}
+.form-box {
+  margin: 0 20px;
+  .subject-box {
+    height: 90px;
+    overflow: hidden;
+    position: relative;
+    &.active {
+      height: auto;
+      overflow: auto;
+    }
+    .showAll {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
+      font-size: 12px;
+      color: #7f7f7f;
+      cursor: pointer;
+      padding: 2px;
+      &:hover {
+        color: #667ffd;
+      }
+    }
+  }
+}
+.el-icon-plus {
+  cursor: pointer;
+  &:hover {
+    color: #667ffd;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/analysis/index.vue b/src/views/standard/analysis/index.vue
index 6e5ee6f..6e5ee6f 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/standard/analysis/index.vue
diff --git a/src/views/ask/analysis.vue b/src/views/standard/ask/analysis.vue
index 642efb3..642efb3 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/standard/ask/analysis.vue
diff --git a/src/views/ask/index.vue b/src/views/standard/ask/index.vue
index 9452a75..2033c73 100644
--- a/src/views/ask/index.vue
+++ b/src/views/standard/ask/index.vue
@@ -1056,7 +1056,7 @@ div::-webkit-scrollbar-thumb {
   }
   .delButton {
     border-color: #ff6868;
-    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
     background-size: 19px;
     color: transparent;
   }
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
new file mode 100644
index 0000000..2a09e0e
--- /dev/null
+++ b/src/views/standard/card/index.vue
@@ -0,0 +1,215 @@
+<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-cascader
+            @change="_QueryData(1)"
+            size="small"
+            class="sel"
+            clearable
+            placeholder="选择班级"
+            v-model="query.classId"
+            :options="gradeList"
+            :props="props"
+            :show-all-levels="false"
+          ></el-cascader>
+          <el-input
+            placeholder="请输入学生姓名"
+            v-model="query.studentName"
+            class="input-with-select"
+            @keyup.enter.native="_QueryData(2)"
+          >
+            <el-button
+              slot="append"
+              icon="el-icon-search"
+              @click="_QueryData(2)"
+            ></el-button>
+          </el-input>
+          <el-input
+            placeholder="请输入学生学号"
+            v-model="query.studentCode"
+            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 type="primary" round @click="_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 v-for="item in scope.row.classList" :key="item.classCode">{{
+                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 ? "发卡" : "补卡" }}
+            </template></el-table-column
+          >
+          <el-table-column align="center" label="描述">
+            <template slot-scope="scope">
+              {{
+                scope.row.operationType == 0
+                  ? "--"
+                  : scope.row.reason == 0
+                  ? "丢失"
+                  : "损坏"
+              }}
+            </template></el-table-column
+          >
+          <el-table-column
+            align="center"
+            label="操作时间"
+            prop="modifiedTime"
+          ></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>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      loading: false,
+      props: { multiple: false },
+      query: {
+        classId: "",
+        studentName: "",
+        studentCode: "",
+      },
+      gradeList: [],
+      tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  created() {
+    this._QueryGradeList();
+    this._QueryData();
+  },
+  methods: {
+    // 查找班级
+    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 _QueryData(type) {
+      let query = {};
+      query.gradeName = this.query.gradeName;
+      if (type == 1) {
+        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
+        this.query.studentCode = "";
+        this.query.studentName = "";
+      } else if (type == 2) {
+        query.studentName = this.query.studentName;
+        this.query.classId = "";
+        this.query.studentCode = "";
+      } else if (type == 3) {
+        query.studentCode = this.query.studentCode;
+        this.query.classId = "";
+        this.query.studentName = "";
+      } else {
+        query = { ...this.query };
+      }
+      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);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.table-box {
+  padding: 0 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/dataSync/index.vue b/src/views/standard/dataSync/index.vue
new file mode 100644
index 0000000..12a50b9
--- /dev/null
+++ b/src/views/standard/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 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/device/index.vue b/src/views/standard/device/index.vue
index 3520469..3520469 100644
--- a/src/views/device/index.vue
+++ b/src/views/standard/device/index.vue
diff --git a/src/views/standard/device/log.vue b/src/views/standard/device/log.vue
new file mode 100644
index 0000000..eb6ecea
--- /dev/null
+++ b/src/views/standard/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/down/client.vue b/src/views/standard/down/client.vue
index 60c0590..60c0590 100644
--- a/src/views/down/client.vue
+++ b/src/views/standard/down/client.vue
diff --git a/src/views/down/index.vue b/src/views/standard/down/index.vue
index 9f825e9..9f825e9 100644
--- a/src/views/down/index.vue
+++ b/src/views/standard/down/index.vue
diff --git a/src/views/examinationPaper/add.vue b/src/views/standard/examinationPaper/add.vue
index fa48be3..32c4e41 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/standard/examinationPaper/add.vue
@@ -1757,7 +1757,7 @@ export default {
   .delButton {
     text-indent: -9999999px;
     border-color: #ff6868;
-    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
     background-size: 19px;
     color: transparent;
   }
diff --git a/src/views/standard/examinationPaper/detail.vue b/src/views/standard/examinationPaper/detail.vue
new file mode 100644
index 0000000..4611414
--- /dev/null
+++ b/src/views/standard/examinationPaper/detail.vue
@@ -0,0 +1,190 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>修改答案</span>
+      </template>
+    </back-box>
+    <div class="content">
+      <p class="tips">
+        <i class="fa fa-bell-o"></i> 2022-11-24 14:30张老师修改了答案。
+      </p>
+      <div class="answer-title">
+        <p class="name">{{ form.title }}</p>
+        <p class="totals">卷面总分：{{ allScore }}分</p>
+      </div>
+      <div v-for="(question, index) in form.questionList" :key="index">
+        <p class="question-title">
+          <span>{{ setBigNum(index) }}、</span>
+          <span class="title-txt">{{ question.questionTitle }}</span>
+          <span>共 {{ question.score }} 分</span>
+        </p>
+        <ul class="questions-ul">
+          <li class="sub-questions">
+            <div class="qs-num">题号</div>
+            <div class="qs-type">题型</div>
+            <div class="qs-score">分数</div>
+            <div class="qs-partScore">部分分值</div>
+            <div class="qs-answer">答案</div>
+          </li>
+          <li
+            class="sub-questions"
+            v-for="(subQuestions, indexs) in question.subQuestions"
+            :key="indexs"
+          >
+            <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+            <div class="qs-type">
+              {{ setSubPro(subQuestions.questionType) }}
+            </div>
+            <div class="qs-score">
+              {{ subQuestions.score }}
+            </div>
+            <div class="qs-partScore">
+              {{ subQuestions.partScore }}
+            </div>
+            <div class="qs-answer">
+              {{ setAns(subQuestions.correctAnswer) }}
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="btn-box">
+        <el-button type="danger" plain round @click="linkBack">取消</el-button>
+        <el-button type="primary" round @click="save">保存</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  methods: {
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = [
+        "一",
+        "二",
+        "三",
+        "四",
+        "五",
+        "六",
+        "七",
+        "八",
+        "九",
+        "十",
+        "十一",
+        "十二",
+        "十三",
+        "十四",
+        "十五",
+        "十六",
+        "十七",
+        "十八",
+        "十九",
+        "二十",
+      ];
+      txt = bigNum[num];
+
+      return txt;
+    },
+    setAns(answer) {
+      let txt;
+      switch (answer) {
+        case 1:
+        case "1":
+          txt = "✓";
+          break;
+        case 2:
+        case "2":
+          txt = "✗";
+          break;
+        case "":
+          txt = "--";
+          break;
+        default:
+          txt = answer;
+      }
+      return txt
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.content {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0 50px;
+  .ml-20 {
+    margin-left: 20px;
+  }
+  .btn-box {
+    text-align: right;
+    margin-left: 140px;
+  }
+  .tips {
+    height: 48px;
+    line-height: 48px;
+    padding: 0 16px;
+    border: 1px solid #fac7cc;
+    background-color: #ffebec;
+    font-size: 14px;
+    color: #fd9795;
+    margin: 10px 0 20px 0;
+    .fa-bell-o {
+      font-size: 18px;
+      margin-right: 5px;
+    }
+  }
+}
+.answer-title {
+  text-align: center;
+  font-size: 20px;
+  color: #333;
+  font-weight: 700;
+  padding-bottom: 20px;
+  .totals {
+    font-size: 16px;
+    color: #888;
+    font-weight: normal;
+  }
+}
+.question-title {
+  line-height: 40px;
+  .ipt {
+    width: 300px;
+    margin: 0 16px 0 10px;
+    :deep(.el-input__inner) {
+      border-radius: 20px;
+      border-color: #667ffd;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+  }
+  .delete {
+    margin-right: 8px;
+  }
+  .title-txt {
+    margin-right: 20px;
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/edit.vue b/src/views/standard/examinationPaper/edit.vue
index a1336b0..a1336b0 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/standard/examinationPaper/edit.vue
diff --git a/src/views/examinationPaper/index.vue b/src/views/standard/examinationPaper/index.vue
index 1b8774d..1b8774d 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/standard/examinationPaper/index.vue
diff --git a/src/views/standard/examinationPaper/recycle.vue b/src/views/standard/examinationPaper/recycle.vue
new file mode 100644
index 0000000..110986a
--- /dev/null
+++ b/src/views/standard/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/portrait/index.vue b/src/views/standard/portrait/index.vue
index 71c2613..71c2613 100644
--- a/src/views/portrait/index.vue
+++ b/src/views/standard/portrait/index.vue
diff --git a/src/views/setUp/account.vue b/src/views/standard/setUp/account.vue
index 0c4b820..0c4b820 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/standard/setUp/account.vue
diff --git a/src/views/setUp/conglomerate.vue b/src/views/standard/setUp/conglomerate.vue
index f6ad2fc..8ebcc28 100644
--- a/src/views/setUp/conglomerate.vue
+++ b/src/views/standard/setUp/conglomerate.vue
@@ -57,27 +57,27 @@
               <div class="info">
                 <p class="info-item">
                   <span class="txt">基站</span>
-                  <img class="pic" src="../../assets/images/jizhan.png" />
+                  <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" />
+                  <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" />
+                  <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" />
+                  <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" />
+                  <img class="pic" src="../../../assets/images/laoshi.png" />
                   <span>{{ item.teacherCount }}</span>
                 </p>
               </div>
diff --git a/src/views/setUp/school.vue b/src/views/standard/setUp/school.vue
index 55a6e11..55a6e11 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
diff --git a/src/views/setUp/student.vue b/src/views/standard/setUp/student.vue
index 6fa8051..6fa8051 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
diff --git a/src/views/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index 4d620c9..4d620c9 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
diff --git a/src/views/test/analysis.vue b/src/views/standard/test/analysis.vue
index 6841f4d..6841f4d 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
diff --git a/src/views/test/editAnswer.vue b/src/views/standard/test/editAnswer.vue
index 85bc484..761008d 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/standard/test/editAnswer.vue
@@ -919,7 +919,7 @@ export default {
   }
   .delButton {
     border-color: #ff6868;
-    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
     background-size: 19px;
     cursor: pointer;
     color: transparent;
diff --git a/src/views/test/index.vue b/src/views/standard/test/index.vue
index adcdb1e..adcdb1e 100644
--- a/src/views/test/index.vue
+++ b/src/views/standard/test/index.vue