长水账号设置

梁保满
1 parent cffc1a98
Showing 18 changed files with 468 additions and 110 deletions
src/router/index.js
src/store/index.js
src/utils/index.js
src/views/examinationPaper/add.vue
src/views/examinationPaper/edit.vue
src/views/personal/ask/analysis.vue
src/views/personal/setUp/student.vue
src/views/personal/test/index.vue
src/views/portrait/detail.vue
src/views/portrait/index.vue
src/views/standard/ask/analysis.vue
src/views/standard/ask/index.vue
src/views/standard/examinationPaper/add.vue
src/views/standard/examinationPaper/edit.vue
src/views/standard/examinationPaper/index.vue
src/views/standard/portrait/index.vue
src/views/standard/test/analysis.vue
src/views/standard/test/index.vue
@@ -14,6 +14,10 @@ const ExaminationPaperEdit = () =&gt; import(&quot;@/views/examinationPaper/edit&quot;)
 const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
 const Portrait = () => import("@/views/portrait/index")
 const PortraitDetail = () => import("@/views/portrait/detail")
+const CSExaminationPaper = () => import("@/views/examinationPaper/index")
+const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
+const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
+const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
  
  
 const Ask = () => import("@/views/standard/ask/index")
@@ -111,7 +115,7 @@ let defaultRouter = [
   }
 ]
  
-let addrouters = [  //测试用，后续后端获取
+let addrouters = [  
   {
     path: "/examinationPaper",
     iconCls: "fa fa-file-text", // 图标样式class
@@ -397,6 +401,265 @@ let addrouters = [  //测试用，后续后端获取
     ]
   },
 ]
+let csAddrouters = [  
+  {
+    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: CSExaminationPaper,
+        children: []
+      },
+      {
+        path: "/examinationPaperAdd",
+        iconCls: "", // 图标样式class
+        name: "examinationPaperAdd",
+        component: CSExaminationPaperAdd,
+        parent: "examinationPaper",
+        children: []
+      },
+      {
+        path: "/examinationPaperEdit",
+        iconCls: "", // 图标样式class
+        name: "修改答题卡",
+        component: CSExaminationPaperEdit,
+        parent: "examinationPaper",
+        children: []
+      },
+      {
+        path: "/examinationPaperRecycle",
+        iconCls: "", // 图标样式class
+        name: "已归档答题卡",
+        component: CSExaminationPaperRecycle,
+        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: Ask,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+
+      },
+      {
+        path: "/askAnalysis",
+        iconCls: "", // 图标样式class
+        name: "随堂问报表分析",
+        component: AskAnalysis,
+        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: Test,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/testAnalysis",
+        iconCls: "", // 图标样式class
+        name: "即时测报表分析",
+        component: TestAnalysis,
+        parent: "test",
+        children: []
+      }
+
+    ]
+  },
+  {
+    path: "/setUpConglomerate",
+    iconCls: "fa fa-building", // 图标样式class
+    name: "学校管理",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/setUpConglomerate",
+        iconCls: "fa fa-building",
+        name: '集团管理',
+        component: SetUpConglomerate,
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/setUpAccount",
+    iconCls: "fa fa-id-card-o", // 图标样式class
+    name: "账号管理",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/setUpAccount",
+        iconCls: "fa fa-id-card-o",
+        name: '',
+        component: SetUpAccount,
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/",
+    iconCls: "fa fa-cog",
+    name: '学校管理',
+    component: Layout,
+    children: [
+      {
+        path: "/setUpSchool",
+        iconCls: "fa fa-calculator",
+        name: '学校设置',
+        component: SetUpSchool,
+        children: []
+      },
+      {
+        path: "/setUpTeacher",
+        iconCls: "fa fa-male",
+        name: '教师管理',
+        component: SetUpTeacher,
+        children: []
+      },
+      {
+        path: "/setUpStudent",
+        iconCls: "fa fa-mortar-board",
+        name: '学生管理',
+        component: SetUpStudent,
+        children: []
+      },
+    ]
+  },
+  {
+    path: "/card",
+    iconCls: "fa fa-id-card", // 图标样式class
+    name: "发卡记录",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/card",
+        iconCls: "fa fa-id-card", // 图标样式class
+        name: "",
+        component: Card,
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/device",
+    iconCls: "fa fa-dashboard", // 图标样式class
+    name: "设备状态",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/device",
+        iconCls: "fa fa-dashboard", // 图标样式class
+        name: "",
+        component: Device,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/deviceLog",
+        iconCls: "fa fa-list-alt", // 图标样式class
+        name: "",
+        component: DeviceLog,
+        parent: "device",
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/analysis",
+    iconCls: "fa fa-area-chart", // 图标样式class
+    name: "使用分析",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/analysis",
+        iconCls: "fa fa-area-chart", // 图标样式class
+        name: "",
+        component: Analysis,
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/down",
+    iconCls: "fa fa-download", // 图标样式class
+    name: "软件下载",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/down",
+        iconCls: "fa fa-download", // 图标样式class
+        name: "发卡软件",
+        component: Down,
+        children: []
+      },
+      {
+        path: "/downClient",
+        iconCls: "", // 图标样式class
+        name: "授课端软件",
+        component: DownClient,
+        parent: "down",
+        children: []
+      }
+    ]
+  },
+  {
+    path: "/dataSync",
+    iconCls: "fa fa-random", // 图标样式class
+    name: "数据同步",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/dataSync",
+        iconCls: "fa fa-random", // 图标样式class
+        name: "",
+        component: DataSync,
+        children: []
+      }
+    ]
+  },
+]
  
 const addroutersPersonal = [
   {
@@ -638,4 +901,4 @@ const addRoutersAdmin = [
 export default new Router({
   routes: defaultRouter
 })
-export { defaultRouter, addrouters,addroutersPersonal,addRoutersAdmin }
+export { defaultRouter, addrouters,addroutersPersonal,addRoutersAdmin ,csAddrouters}
@@ -8,7 +8,7 @@ import { Message } from &quot;element-ui&quot;;
  
 import request from "@/api/index";
 import router from "@/router/index";
-import { addrouters,addRoutersAdmin ,addroutersPersonal} from "@/router/index";
+import { addrouters, addRoutersAdmin, addroutersPersonal, csAddrouters } from "@/router/index";
 Vue.use(Vuex);
  
 const store = new Vuex.Store({
@@ -21,7 +21,7 @@ const store = new Vuex.Store({
     routers: [], //左侧菜单
     addRouters:
       localStorage.getItem("addRouters") &&
-      localStorage.getItem("addRouters") != "undefined"
+        localStorage.getItem("addRouters") != "undefined"
         ? JSON.parse(localStorage.getItem("addRouters"))
         : [], //动态路由
     tokenSources: new Map(), //正在请求接口（切换取消请求）
@@ -40,12 +40,17 @@ const store = new Vuex.Store({
     },
     setRouters: (state, routers) => {
       let addrouterList = []
-      if(state.info.showRole == 'ROLE_PERSONAL'){
+      if (state.info.showRole == 'ROLE_PERSONAL') {
         addrouterList = [...addroutersPersonal]
-      }else if(state.info.showRole == 'ROLE_PINGTAI'){
+      } else if (state.info.showRole == 'ROLE_PINGTAI') {
         addrouterList = [...addRoutersAdmin]
-      }else{
-        addrouterList = [...addrouters]
+      } else {
+        if (state.csCode) {
+          addrouterList = [...csAddrouters]
+        } else {
+          addrouterList = [...addrouters]
+        }
+
       }
       let aRouters = addrouterList.filter((item) => {
         let path = item.children[0]?.path.replace("/", "");
@@ -115,11 +120,11 @@ const store = new Vuex.Store({
             });
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     CSLogin({ state, commit }, code) {
       request
-        .ssoLogin({ code:code})
+        .ssoLogin({ code: code })
         .then((res) => {
           let response = res;
           if (response.status == 0) {
@@ -142,8 +147,8 @@ const store = new Vuex.Store({
                 hidden: true,
                 children: [],
               });
-                router.push({ path: "/" });
-              
+              router.push({ path: "/" });
+
             } else {
               Message({
                 message: "该账号暂无权限，请联系管理员~",
@@ -159,7 +164,7 @@ const store = new Vuex.Store({
             });
           }
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     permissions({ state, commit }, role) {
       commit("setToken", "isLogin");
@@ -778,6 +778,8 @@ export function tablePrint(id) {
     .hui-s.s1{width: 87.5px;}
     .hui-s.s2{ width: 97.5px;}
     .hui-s.s3{width: 108px;}
+    .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>`;
   let aDom = divs.cloneNode(true);
   let aTbody = aDom
@@ -536,8 +536,8 @@
               <el-form-item
                 label="设置答案："
                 v-show="
-                  questionForm.questionType != 5 ||
-                  questionForm.questionType == 6
+                  questionForm.questionType != 5 &&
+                  questionForm.questionType != 6
                 "
               >
                 <div class="qs-options">
@@ -1094,7 +1094,7 @@ export default {
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
-      this.stem.knowledge = obj.knowledge?.split(",") || [];
+      this.stem.knowledge = obj.knowledge?.split("") || [];
       this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
@@ -582,7 +582,7 @@ export default {
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
-      this.stem.knowledge = obj.knowledge?.split(",") || [];
+      this.stem.knowledge = obj.knowledge?.split("") || [];
       this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
@@ -54,6 +54,28 @@
           </li>
         </ul>
         <div id="print-content">
+          <ul class="info" v-if="type == 1">
+            <li class="info-item">科目：{{ detail.subjectName }}</li>
+            <li class="info-item">课时：{{ detail.title }}</li>
+            <li class="info-item">上课时间：{{ detail.startTime }}</li>
+            <li class="info-item">下课时间：{{ detail.endTime }}</li>
+            <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
+            <li class="info-item">题目总数：{{ detail.questionNum }}</li>
+            <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
+            <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+            <li class="info-item">
+              总参与度：：{{ detail.participationRate }}%
+            </li>
+            <li class="info-item">
+              班级总正确率：{{ detail.classCorrectRate }}%
+            </li>
+            <li class="info-item">
+              已答总正确率：{{ detail.answerCorrectRate }}%
+            </li>
+            <li class="info-item">
+              反馈时长：{{ setDuration(detail.consumingDuration) }}
+            </li>
+          </ul>
           <el-table
             v-if="type == 1"
             :data="tableData"
@@ -332,7 +354,7 @@
 </template>
  
 <script>
-import { downloadFile,tablePrint } from "@/utils";
+import { downloadFile, tablePrint } from "@/utils";
 export default {
   data() {
     return {
@@ -406,7 +428,7 @@ export default {
       return tit;
     },
     async edit() {
-     this.$router.push({
+      this.$router.push({
         path: "/examinationPaperEdit",
         query: {
           paperId: this.id,
@@ -355,6 +355,7 @@ export default {
       });
       //导入成功
       this.diaUp = false;
+      this._QueryClass()
       this._QueryData();
     },
     async _QuerySubject() {
@@ -91,7 +91,6 @@
           <el-table-column
             prop="title"
             label="试卷名称"
-            fixed
             align="center"
           ></el-table-column>
           <el-table-column
@@ -515,8 +514,8 @@ export default {
         path: "/portraitDetail",
         query: {
           id: obj.studentId,
-          classId: obj.classId,
-          subjectNames: subjectNames.join(","),
+          classId: this.query.classId,
+          subjectNames: subjectNames.join(""),
           studentName:obj.studentName,
           studentCode:obj.studentCode,
         },
@@ -22,12 +22,11 @@
           </el-option>
         </el-select>
         <el-select
+          v-else
           class="sel"
-          multiple
           v-model="query.subjectNames"
           placeholder="选择科目"
-          collapse-tags
-          @change="changeSub"
+          multiple
         >
           <el-option
             v-for="item in subjectList"
@@ -232,7 +231,7 @@ export default {
       this.type =
         this.query.subjectNames.length > 1
           ? 1
-          : this.query.subjectNames[0] == "全部" && this.subjectList.length != 2
+          : this.query.subjectNames[0] == "全部" && this.subjectList.length > 2
           ? 1
           : 2;
     },
@@ -336,10 +335,11 @@ export default {
             this.query.subjectNames.length > 1
               ? 1
               : this.query.subjectNames[0] == "全部" &&
-                this.subjectList.length != 2
+                this.subjectList.length > 2
               ? 1
               : 2;
         } else {
+          this.type = 2;
           if (!this.subjectNames) {
             this.query.subjectNames = this.subjectList[0]?.value;
           } else {
@@ -288,7 +288,7 @@ export default {
       margin-bottom: 0;
     }
     .tx {
-      width: 80px;
+      width: 100px;
       height: 80px;
       background: #667ffd;
       border-radius: 8px;
@@ -33,27 +33,29 @@
         >
       </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">
+          <ul class="info" v-if="type == 1">
+            <li class="info-item">科目：{{ detail.subjectName }}</li>
+            <li class="info-item">课时：{{ detail.title }}</li>
+            <li class="info-item">上课时间：{{ detail.startTime }}</li>
+            <li class="info-item">下课时间：{{ detail.endTime }}</li>
+            <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
+            <li class="info-item">题目总数：{{ detail.questionNum }}</li>
+            <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
+            <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+            <li class="info-item">
+              总参与度：：{{ detail.participationRate }}%
+            </li>
+            <li class="info-item">
+              班级总正确率：{{ detail.classCorrectRate }}%
+            </li>
+            <li class="info-item">
+              已答总正确率：{{ detail.answerCorrectRate }}%
+            </li>
+            <li class="info-item">
+              反馈时长：{{ setDuration(detail.consumingDuration) }}
+            </li>
+          </ul>
           <el-table
             v-if="type == 1"
             :data="tableData"
@@ -315,6 +317,7 @@
             >导出报表</el-button
           >
           <el-button
+            v-if="!this.$store.getters.code"
             @click="print"
             type="primary"
             plain
@@ -338,7 +341,7 @@
 </template>
  
 <script>
-import { downloadFile,tablePrint } from "@/utils";
+import { downloadFile, tablePrint } from "@/utils";
 export default {
   data() {
     return {
@@ -464,6 +464,7 @@
             >导出报表</el-button
           >
           <el-button
+            v-if="!this.$store.getters.code"
             @click="print"
             type="primary"
             plain
@@ -503,7 +503,10 @@
               </el-form-item>
               <el-form-item
                 label="设置答案："
-                v-show="questionForm.questionType != 5"
+                v-show="
+                  questionForm.questionType != 5 &&
+                  questionForm.questionType != 6
+                "
               >
                 <div class="qs-options">
                   <p class="ipt">
@@ -6,14 +6,16 @@
       </template>
     </back-box>
     <div class="content">
-      <p class="tips" v-if="paperModifyLog.modifiedTime">
-        <i class="fa fa-bell-o"></i>
-        {{
-          `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
-        }}老师修改了答案
-      </p>
+      <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 }}</p>
+        <p class="name">{{ form.title || title }}</p>
         <p class="totals">卷面总分：{{ allScore }}分</p>
       </div>
       <template v-if="questionList[0]?.subQuestions">
@@ -295,9 +297,7 @@
                 @click="setMultiple(formAns, option)"
                 >{{ option }}</span
               >
-              <span
-                class="answer-s active"
-                @click="setMultiple(formAns, ',')"
+              <span class="answer-s active" @click="setMultiple(formAns, ',')"
                 >,</span
               >
             </template>
@@ -336,6 +336,7 @@ import { deepClone, checkAnswer } from &quot;utils&quot;;
 export default {
   data() {
     return {
+      role: "",
       questionList: [],
       form: {
         //答题卡详情
@@ -347,6 +348,8 @@ export default {
         share: 1,
         questionList: [],
       },
+      title: "",
+      type: 1,
       paperModifyLog: {
         realName: "",
         modifiedTime: "",
@@ -355,7 +358,7 @@ export default {
       formAns: {
         listIndex: 0, //大题位置
         endIndex: 0, //相同题目最后一位题目的questionIndex
-        index:0,
+        index: 0,
         qusType: "", //题目类型
         subNum: 0, //数量
         answerOptions: [], //答案选项
@@ -366,15 +369,24 @@ export default {
   computed: {
     allScore: function () {
       let score = 0;
-      this.questionList.map((item) => {
-        score += item.subQuestions.reduce((a, b) => {
-          return a + (Number(b.score) || 0);
-        }, 0);
+      this.questionList?.map((item) => {
+        if (item.subQuestions) {
+          score += item.subQuestions.reduce((a, b) => {
+            return a + (Number(b.score) || 0);
+          }, 0);
+        } else {
+          score += item.score;
+        }
       }, 0);
       return Number(score).toFixed(2);
     },
   },
   created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.type = this.$route.query.type || 1;
+    this.title = this.$route.query.title || "";
     this._QueryDetail();
   },
   methods: {
@@ -531,7 +543,7 @@ export default {
         this.formAns = { ...this.questionList[index].subQuestions[indexs] };
         this.formAns.listIndex = index;
         let answerList = "";
-        let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置大难开始位置
+        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);
@@ -638,26 +650,72 @@ export default {
         return item;
       });
       //更新答题卡
-      const { data, status, info } = await this.$request.modifyPaper({
-        paperId: this.form.id,
-        questionList: questionList,
-      });
+      let modifyPaper, params;
+      if (this.type == 1) {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pModifyPaper
+            : this.$request.modifyPaper;
+        params = {
+          paperId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else if (this.type == 2) {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetExamAnswer
+            : this.$request.setExamAnswer;
+        params = {
+          examId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      } else {
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetPeriodAnswer
+            : this.$request.setPeriodAnswer;
+        params = {
+          periodId: this.$route.query.paperId,
+          questionList: questionList,
+        };
+      }
+      const { data, status, info } = await modifyPaper(params);
       if (status == 0) {
-        this.$router.push({
-          path: "/examinationPaper",
-        });
+        this.$router.go(-1);
       } else {
         this.$message.error(info);
       }
     },
     async _QueryDetail() {
-      //查询年级列表
-      const { data, status, info } = await this.$request.fetchPaperDetail({
-        paperId: this.$route.query.paperId,
-      });
+      //查询详情
+      let detail;
+      if (this.role == "ROLE_PERSONAL") {
+        detail =
+          this.type == 1
+            ? this.$request.pPaperDetail
+            : this.type == 2
+            ? this.$request.pExamQuestionList
+            : this.$request.pPeriodQuestionList;
+      } else {
+        detail =
+          this.type == 1
+            ? this.$request.fetchPaperDetail
+            : this.type == 2
+            ? this.$request.examQuestionList
+            : this.$request.periodQuestionList;
+      }
+      let params =
+        this.type == 1
+          ? { paperId: this.$route.query.paperId }
+          : this.type == 2
+          ? { examId: this.$route.query.paperId }
+          : {
+              periodId: this.$route.query.paperId,
+            };
+      const { data, status, info } = await detail(params);
       if (status == 0) {
         this.form = deepClone(data);
-        this.questionList = deepClone(this.form.questionList);
+        this.questionList = deepClone(this.form.questionList || data.list);
         this.paperModifyLog = {
           ...this.paperModifyLog,
           ...this.form.paperModifyLog,
@@ -668,7 +726,10 @@ export default {
             let addndex = 0;
             item.subQuestions.map((sub, index) => {
               if (!!sub.questionType) {
-                if (sub.questionType == types[addndex].qusType && sub.questionType != 5) {
+                if (
+                  sub.questionType == types[addndex].qusType &&
+                  sub.questionType != 5
+                ) {
                   //同类型批量答案+1
                   types[addndex].subNum += 1;
                   if (
@@ -726,7 +787,10 @@ export default {
           let addndex = 0;
           this.questionList?.map((sub, index) => {
             if (!!sub.questionType) {
-              if (sub.questionType == types[addndex].qusType && sub.questionType != 5) {
+              if (
+                sub.questionType == types[addndex].qusType &&
+                sub.questionType != 5
+              ) {
                 //同类型批量答案+1
                 types[addndex].subNum += 1;
                 if (
@@ -796,8 +860,15 @@ export default {
     margin-left: 20px;
   }
   .btn-box {
+    width: calc(100% - 240px);
+    position: fixed;
+    right: 40px;
+    bottom: 20px;
+    padding: 10px 0 20px;
+    background: #fff;
     text-align: right;
     margin-left: 140px;
+    z-index: 10;
   }
   .tips {
     height: 48px;
@@ -819,7 +890,7 @@ export default {
   font-size: 20px;
   color: #333;
   font-weight: 700;
-  padding-bottom: 20px;
+  padding: 20px 0;
   .totals {
     font-size: 16px;
     color: #888;
@@ -76,7 +76,7 @@
       </div>
     </div>
     <p class="tips" v-show="archivedTotal">
-      <span>另有{{ archivedTotal }}份已经归档的答题卡,</span>
+      <span>回收站内已有{{ archivedTotal }}份答题卡,</span>
       <router-link to="/examinationPaperRecycle">点击查看&gt;&gt;</router-link>
     </p>
     <ul class="content" v-if="tableData && tableData.length">
@@ -143,7 +143,7 @@
                 >修改分享范围</el-dropdown-item
               >
               <el-dropdown-item :command="2">复制</el-dropdown-item>
-              <el-dropdown-item :command="3">归档</el-dropdown-item>
+              <el-dropdown-item :command="3">放入回收站</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </div>
-<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
@@ -371,6 +371,7 @@
             >导出报表</el-button
           >
           <el-button
+          v-if="!this.$store.getters.code"
             @click="print"
             type="primary"
             plain
@@ -105,14 +105,13 @@
           <el-table-column
             prop="title"
             label="试卷名称"
-            fixed
             align="center"
           ></el-table-column>
           <el-table-column
             prop="examPaperScore"
             label="卷面分"
             align="center"
-            width="100"
+            width="68"
           ></el-table-column>
           <el-table-column prop="answeredNum" label="测验人数" align="center"
             ><template slot-scope="scoped">{{
@@ -348,7 +347,13 @@
                 label="姓名"
                 fixed
                 align="center"
-              ></el-table-column>
+              >
+                <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"
@@ -440,6 +445,7 @@
           >导出报表</el-button
         >
         <el-button
+          v-if="!this.$store.getters.code"
           @click="print"
           type="primary"
           plain
@@ -565,6 +571,9 @@ export default {
       });
     },
     toPortrait(obj) {
+      if (this.$store.getters.code) {
+        return;
+      }
       let subjectNames = [];
       subjectNames = [...this.query["subjectNames"]];
       if (
@@ -582,8 +591,8 @@ export default {
         path: "/portraitDetail",
         query: {
           id: obj.studentId,
-          classId: obj.classId,
-          subjectNames: subjectNames.join(","),
+          classId: this.query.classId,
+          subjectNames: subjectNames.join(""),
           studentName: obj.studentName,
           studentCode: obj.studentCode,
         },