diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 806c32a..aed1879 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -1,12 +1,18 @@
 <template>
-  <div class="el-dialog-wrapper" v-show="diaVisible" width="400" center @click.self="cancel">
+  <div
+    class="el-dialog-wrapper"
+    v-show="diaVisible"
+    width="400"
+    center
+    @click.self="cancel"
+  >
     <div class="el-dialog-content">
       <p class="title">
-        <!-- 设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i> -->
-        设置答案
+        设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i>
+        <!-- 设置答案 -->
         <i class="el-icon-close" @click="cancel"></i>
       </p>
-      <div v-show="editType">
+      <div v-if="editType">
         <div v-for="(item, index) in FormQuestionList" :key="index">
           <template v-for="(subQuestions, indexs) in item.subQuestions">
             <div
@@ -61,97 +67,90 @@
           </template>
         </div>
       </div>
-      <!-- <div v-show="!editType">
+      <div v-else>
         <p class="dia-tips">
-            请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-          </p>
+          请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+        </p>
         <div class="dia-question-box">
           <div v-for="(item, index) in FormQuestionList2" :key="index">
-            <template v-for="(items, indexs) in item.subQuestions">
-              <div class="set-questions" :key="indexs">
-                <div class="qs-num">
-                  <p>{{ items.name }}</p>
-                  <p>共{{ items.list.length }}题</p>
-                </div>
-                <div class="qs-options">
-                  <p class="ipt">
-                    <el-input
-                      v-model="items.answerList"
-                      @keydown.native="keydownAnswer($event)"
-                    ></el-input>
-                  </p>
-                  <p class="answer-box">
-                    <template v-if="items.list[0].questionType == 4">
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += '✓')
-                            : ''
-                        "
-                        >✓</span
-                      >
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += '✗')
-                            : ''
-                        "
-                        >✗</span
-                      >
-                    </template>
-                    <template v-if="items.list[0].questionType == 3">
-                      <span
-                        class="answer-s active"
-                        v-for="option in items.list[0].answerOptions"
-                        :key="option"
-                        @click="setAnswer(items,option)"
-                        >{{ option }}</span
-                      >
-                      <span
-                        class="answer-s active"
-                        @click="
-                          items.answerList.split(',').length < items.list.length
-                            ? (items.answerList += ',')
-                            : ''
-                        "
-                        >,</span
-                      >
-                    </template>
-                    <template
-                      v-if="items.list[0].questionType == 2"
-                      class="answer-box"
+            <div class="set-questions">
+              <div class="qs-num">
+                <p class="txt">{{ item.name }}</p>
+                <p class="num">共{{ item.list.length }}题</p>
+              </div>
+              <div class="qs-options">
+                <p class="ipt">
+                  <el-input
+                    v-model="item.answerList"
+                    @keydown.native="keydownAnswer($event)"
+                  ></el-input>
+                </p>
+                <p class="answer-box">
+                  <template v-if="item.list[0].questionType == 4">
+                    <span
+                      class="answer-s active"
+                      @click="
+                        item.answerList.length < item.list.length
+                          ? (item.answerList += '✓')
+                          : ''
+                      "
+                      >✓</span
+                    >
+                    <span
+                      class="answer-s active"
+                      @click="
+                        item.answerList.length < item.list.length
+                          ? (item.answerList += '✗')
+                          : ''
+                      "
+                      >✗</span
                     >
-                      <span
-                        class="answer-s active"
-                        v-for="option in items.list[0].answerOptions"
-                        :key="option"
-                        @click="
-                          items.answerList.length < items.list.length
-                            ? (items.answerList += option)
-                            : ''
-                        "
-                        >{{ option }}</span
-                      >
-                    </template>
+                  </template>
+                  <template v-if="item.list[0].questionType == 3">
                     <span
-                      class="answer-s delButton"
-                      @click="items.answerList = items.answerList.slice(0, -1)"
-                      >x</span
+                      class="answer-s active"
+                      v-for="option in item.list[0].answerOptions"
+                      :key="option"
+                      @click="setAnswer(item, option)"
+                      >{{ option }}</span
                     >
                     <span
-                      class="answer-s ac"
-                      @click="items.answerList = ''"
-                      >AC</span
+                      class="answer-s active"
+                      @click="
+                        item.answerList.split(',').length < item.list.length
+                          ? (item.answerList += ',')
+                          : ''
+                      "
+                      >,</span
                     >
-                  </p>
-                </div>
+                  </template>
+                  <template
+                    v-if="item.list[0].questionType == 2"
+                    class="answer-box"
+                  >
+                    <span
+                      class="answer-s active"
+                      v-for="option in item.list[0].answerOptions"
+                      :key="option"
+                      @click="
+                        item.answerList.length < item.list.length
+                          ? (item.answerList += option)
+                          : ''
+                      "
+                      >{{ option }}</span
+                    >
+                  </template>
+                  <span
+                    class="answer-s delButton"
+                    @click="item.answerList = item.answerList.slice(0, -1)"
+                    >x</span
+                  >
+                </p>
               </div>
-            </template>
+            </div>
           </div>
         </div>
-      </div> -->
+      </div>
       <div class="footer-box">
         <el-button class="dia-btn" type="primary" @click="saveAnswer"
           >确 定</el-button
@@ -165,7 +164,7 @@
 </template>
 
 <script>
-import { deepClone } from "utils";
+import { deepClone, checkAnswer } from "utils";
 export default {
   name: "SetAnswer",
   props: {
@@ -177,42 +176,55 @@ export default {
     return {
       editType: true, //修改答案模式
       FormQuestionList: [],
+      FormQuestionList2: [],
     };
   },
   watch: {
     questionList: {
       handler: function () {
         this.FormQuestionList = deepClone(this.questionList);
+        this.FormQuestionList2 = [];
         console.log(this.questionList);
-        //组合每道大题中的相同题目
-        // let questionList = deepClone(item.questionList);
-        // for (let i = 0; i < questionList.length; i++) {
-        //   let jsons = {};
-        //   let answerOptions = [];
-        //   questionList[i].subQuestions.map((items) => {
-        //     let txt = this.setSubPro(items.questionType);
-        //     if (jsons[txt]) {
-        //       jsons[txt].push(items);
-        //     } else {
-        //       jsons[txt] = [items];
-        //     }
-        //     if (items.questionType == 2 || items.questionType == 3) {
-        //       if (items.answerOptions.length > answerOptions.length) {
-        //         answerOptions = items.answerOptions;
-        //       }
-        //       jsons[txt][0].answerOptions = answerOptions;
-        //     }
-        //   });
-        //     this.FormQuestionList2[i].subQuestions = Object.keys(jsons).map(
-        //     (item) => {
-        //       return {
-        //         name: item,
-        //         list: jsons[item],
-        //         answerList: "",
-        //       };
-        //     }
-        //   );
-        // }
+        // 组合每道大题中的相同题目
+        let questionList = deepClone(this.questionList);
+        let jsons = {};
+        let answerOptions = [];
+        for (let i = 0; i < questionList.length; i++) {
+          questionList[i].subQuestions.map((items) => {
+            let txt = this.setSubPro(items.questionType);
+            if (jsons[txt]) {
+              jsons[txt].push(items);
+            } else {
+              jsons[txt] = [items];
+            }
+            if (items.questionType == 2 || items.questionType == 3) {
+              if (items.answerOptions.length > answerOptions.length) {
+                answerOptions = items.answerOptions;
+              }
+              jsons[txt][0].answerOptions = answerOptions;
+            }
+          });
+          console.log(jsons);
+        }
+        this.FormQuestionList2 = Object.keys(jsons).map((item) => {
+          let answerList = "";
+          jsons[item].map((items, index) => {
+            if (items.questionType == 2) {
+              answerList += items.correctAnswer;
+            } else if (items.questionType == 3) {
+              answerList +=
+                items.correctAnswer +
+                (jsons[item].length - 1 != index ? "," : "");
+            } else if (items.questionType == 4) {
+              answerList += items.correctAnswer == 1 ? "✓" : "✗";
+            }
+          });
+          return {
+            name: item,
+            list: jsons[item],
+            answerList: answerList,
+          };
+        });
       },
       deep: true,
     },
@@ -282,6 +294,37 @@ export default {
       }
     },
     async saveAnswer() {
+      let questionList = [],
+        questionList2 = [];
+      if (this.editType) {
+        questionList = [...this.FormQuestionList];
+      } else {
+        this.FormQuestionList2.map((item) => {
+          item.list.map((items, index) => {
+            if (items.questionType == 2 ) {
+              items.correctAnswer = item.answerList.split("")[index];
+            } else if (items.questionType == 3) {
+              items.correctAnswer = item.answerList.split(",")[index];
+            }else if (items.questionType == 4) {
+              items.correctAnswer = item.answerList[index] == "✓" ? 1 : 2;
+            }
+            questionList2.push(items);
+          });
+        });
+        questionList = this.FormQuestionList.map((item) => {
+          let subQuestions = item.subQuestions.map((items) => {
+            items.correctAnswer = questionList2.find((question) => {
+              return question.questionIndex == items.questionIndex;
+            })?.correctAnswer;
+            return items;
+          });
+          return {
+            ...item,
+            subQuestions: [...subQuestions],
+          };
+        });
+      }
+      console.log(questionList);
       const { data, status, message } = await this.$request.modifyPaper({
         paperId: this.paperId,
         questionList: questionList,
@@ -315,22 +358,29 @@ export default {
   z-index: 2022;
   .el-dialog-content {
     width: 600px;
-    background:#fff;
+    background: #fff;
     border-radius: 10px;
-    padding:16px 20px 20px;
+    padding: 16px 20px 20px;
   }
-  .title{
+  .title {
     font-size: 18px;
     position: relative;
-    margin-bottom:20px;
-    .el-icon-close{
+    margin-bottom: 20px;
+    .el-icon-close {
       position: absolute;
-      top:0;
-      right:12px;
-      padding:2px;
+      top: 0;
+      right: 12px;
+      padding: 2px;
       font-size: 16px;
       cursor: pointer;
-      &:hover{
+      &:hover {
+        color: #667ffa;
+      }
+    }
+    .fa-exchange {
+      color: #999;
+      cursor: pointer;
+      &:hover {
         color: #667ffa;
       }
     }
@@ -338,7 +388,7 @@ export default {
 }
 .footer-box {
   text-align: center;
-  padding-top:20px;
+  padding-top: 20px;
 }
 .sub-questions {
   width: 100%;
@@ -391,4 +441,48 @@ export default {
     }
   }
 }
+.dia-tips {
+  line-height: 18px;
+  padding-bottom: 10px;
+}
+.set-questions {
+  display: flex;
+  padding-right: 20px;
+  margin-bottom: 20px;
+  .qs-num {
+    width: 80px;
+    padding-top: 6px;
+    .txt {
+      font-size: 16px;
+      line-height: 18px;
+      margin-bottom: 6px;
+    }
+  }
+  .qs-options {
+    flex: 1;
+    .ipt {
+      margin-bottom: 5px;
+    }
+    .answer-box {
+      .answer-s {
+        cursor: pointer;
+        user-select: none;
+        &:first-of-type {
+          margin-left: 0;
+        }
+      }
+    }
+  }
+  .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;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 92c5c48..76e8fb9 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -27,7 +27,7 @@
           multiple
           collapse-tags
           v-model="query.subjectId"
-          placeholder=""
+          placeholder="选择科目"
           @change="_QueryData"
         >
           <el-option
@@ -42,7 +42,7 @@
           v-else
           class="sel"
           v-model="query.subjectId"
-          placeholder=""
+          placeholder="选择科目"
           @change="_QueryData"
         >
           <el-option
@@ -146,7 +146,7 @@
           ><template slot-scope="scoped">{{scoped.row.allzheng}}%</template></el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
-              <el-tooltip effect="dark" content="详情" placement="left">
+              <el-tooltip effect="dark" content="详情" placement="top">
                 <el-button
                   type="primary"
                   circle
@@ -155,7 +155,7 @@
                   @click="linkTo(scoped.row)"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip effect="dark" content="修改答案" placement="right">
+              <el-tooltip effect="dark" content="修改答案" placement="top">
                 <el-button
                   type="primary"
                   circle
@@ -345,7 +345,7 @@ export default {
                   correctAnswer: "A",
                 },
                 {
-                  questionIndex: 2,
+                  questionIndex: 3,
                   questionType: 3,
                   score: 1,
                   partScore: 0,
@@ -354,7 +354,7 @@ export default {
                   correctAnswer: "AB",
                 },
                 {
-                  questionIndex: 2,
+                  questionIndex: 4,
                   questionType: 3,
                   score: 1,
                   partScore: 0,
@@ -363,7 +363,58 @@ export default {
                   correctAnswer: "AB",
                 },
                 {
-                  questionIndex: 3,
+                  questionIndex: 5,
+                  questionType: 4,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 0,
+                  answerOptions: [],
+                  correctAnswer: "1",
+                },
+              ],
+            },
+            {
+              questionTitle: "f",
+              score: 1,
+              subQuestions: [
+                {
+                  questionIndex: 6,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D"],
+                  correctAnswer: "B",
+                },
+                {
+                  questionIndex: 7,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "A",
+                },
+                {
+                  questionIndex: 8,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 9,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 10,
                   questionType: 4,
                   score: 1,
                   partScore: 0,
@@ -439,10 +490,7 @@ export default {
     };
   },
   async created() {
-    this.role = this.$store.getters.info.permissions[0]?.role||"";
-    if (this.role == "ROLE_BANZHUREN") {
-      this.query.subjectId = [];
-    }
+    this.role = this.$store.getters.info.permissions.find(item=>item.roleName ==  this.$store.getters.info.showRoleName)?.role;
     await this._QueryClassList();
     await this._QuerySubjectList();
     // await this.setDate(1);
@@ -552,7 +600,7 @@ export default {
         this.classList = data.list.map((item) => {
           return {
             value: item.classId,
-            label: item.clazzName,
+            label: item.className,
           };
         });
         this.query.classId = this.classList[0]?.value;
@@ -565,10 +613,10 @@ export default {
         {classId: this.query.classId,}
       );
       if (status === 0) {
-        this.subjectList = data.list?.map((item) => {
+        this.subjectList = data.subjectNames?.map((item) => {
           return {
-            value: item.subjectId,
-            label: item.subjectName,
+            value: item,
+            label: item,
           };
         })||[];
         if (this.role == "ROLE_BANZHUREN") {
@@ -576,8 +624,10 @@ export default {
             value: "",
             label: "全部",
           });
+          this.query.subjectId = [this.subjectList[0]?.value];
+        }else{
+          this.query.subjectId = this.subjectList[0]?.value;
         }
-        this.query.subjectId = this.subjectList[0]?.value;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 148c1fc..bdb3f63 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -100,7 +100,8 @@
           </div>
           <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
-            <p class="p2">共分析{{ schoolInfo.imagesCount }}名学生成绩。</p>
+            <!-- <p class="p2">共分析{{ schoolInfo.imagesCount }}名学生成绩。</p> -->
+            <p class="p2">功能开发中。</p>
           </div>
           <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a1f7b38..2288288 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,12 +90,12 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        username: "13610050254",
-        password: "Pw050254#",
+        // username: "13610050254",
+        // password: "Pw050254#",
         // username: "18946034886",
         // password: "Pw034886#",
-        // username: "18332123505",
-        // password: "Pw123505#",
+        username: "18332123505",
+        password: "Pw123505#",
       },
       loginRules: {
         username: [
diff --git a/src/views/portrait/index.vue b/src/views/portrait/index.vue
index d427429..71c2613 100644
--- a/src/views/portrait/index.vue
+++ b/src/views/portrait/index.vue
@@ -5,6 +5,9 @@
         <span>{{ "学生画像" }}</span>
       </template>
     </back-box>
+    <div class="page-content">
+      功能开发中。
+    </div>
   </div>
 </template>
 
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 4e8fa64..b2dcfd1 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -27,7 +27,7 @@
           multiple
           collapse-tags
           v-model="query.subjectId"
-          placeholder=""
+          placeholder="选择科目"
           @change="_QueryData"
         >
           <el-option
@@ -42,7 +42,7 @@
           v-else
           class="sel"
           v-model="query.subjectId"
-          placeholder=""
+          placeholder="选择科目"
           @change="_QueryData"
         >
           <el-option
@@ -175,7 +175,7 @@
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
-              <el-tooltip effect="dark" content="详情" placement="left">
+              <el-tooltip effect="dark" content="详情" placement="top">
                 <el-button
                   type="primary"
                   circle
@@ -184,7 +184,7 @@
                   @click="linkTo(scoped.row)"
                 ></el-button>
               </el-tooltip>
-              <el-tooltip effect="dark" content="修改答案" placement="right">
+              <el-tooltip effect="dark" content="修改答案" placement="top">
                 <el-button
                   type="primary"
                   circle
@@ -371,31 +371,32 @@ export default {
           xingming: "丁芳菲",
           totalScore: 5,
           rank: 1,
-          周测卷20221130totalScore:10,
-          周测卷20221130rank:0,
-          周测卷20221131totalScore:11,
-          周测卷20221131rank:1,
-          周测卷20221132totalScore:12,
-          周测卷20221132rank:2,
-          周测卷20221132totalScore:13,
-          周测卷20221132rank:3,
+          周测卷20221130totalScore: 10,
+          周测卷20221130rank: 0,
+          周测卷20221131totalScore: 11,
+          周测卷20221131rank: 1,
+          周测卷20221132totalScore: 12,
+          周测卷20221132rank: 2,
+          周测卷20221132totalScore: 13,
+          周测卷20221132rank: 3,
         },
         {
           xuehao: 2,
           xingming: "丁芳",
           totalScore: 4,
           rank: 2,
-          周测卷20221130totalScore:20,
-          周测卷20221130rank:3,
-          周测卷20221131totalScore:21,
-          周测卷20221131rank:4,
-          周测卷20221132totalScore:22,
-          周测卷20221132rank:5,
-          周测卷20221132totalScore:22,
-          周测卷20221132rank:5,
+          周测卷20221130totalScore: 20,
+          周测卷20221130rank: 3,
+          周测卷20221131totalScore: 21,
+          周测卷20221131rank: 4,
+          周测卷20221132totalScore: 22,
+          周测卷20221132rank: 5,
+          周测卷20221132totalScore: 22,
+          周测卷20221132rank: 5,
         },
       ],
-      answerList: [//设置多卷内容供tabel表格数据用
+      answerList: [
+        //设置多卷内容供tabel表格数据用
         {
           title: "周测卷20221130",
           totalScore: 6,
@@ -415,10 +416,9 @@ export default {
     };
   },
   async created() {
-    this.role = this.$store.getters.info.permissions[0]?.role || "";
-    if (this.role == "ROLE_BANZHUREN") {
-      this.query.subjectId = [];
-    }
+    this.role = this.$store.getters.info.permissions.find(
+      (item) => item.roleName == this.$store.getters.info.showRoleName
+    )?.role;
     await this._QueryClassList();
     await this._QuerySubjectList();
     // await this.setDate(1);
@@ -528,7 +528,7 @@ export default {
         this.classList = data.list.map((item) => {
           return {
             value: item.classId,
-            label: item.clazzName,
+            label: item.className,
           };
         });
         this.query.classId = this.classList[0]?.value;
@@ -542,19 +542,21 @@ export default {
       });
       if (status === 0) {
         this.subjectList =
-          data.list?.map((item) => {
+          data.subjectNames?.map((item) => {
             return {
-              value: item.subjectId,
-              label: item.subjectName,
+              value: item,
+              label: item,
             };
           }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
+         if (this.role == "ROLE_BANZHUREN") {
           this.subjectList.unshift({
             value: "",
             label: "全部",
           });
+          this.query.subjectId = [this.subjectList[0]?.value];
+        }else{
+          this.query.subjectId = this.subjectList[0]?.value;
         }
-        this.query.subjectId = this.subjectList[0]?.value;
       } else {
         this.$message.error(info);
       }