更改考试答案

danger-manage-web/src/views/educationPlanExam/lessonsProgram/components/QuestionList.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-22 17:56:05
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 17:54:16
+ * @LastEditTime: 2023-01-10 14:19:22
  * @FilePath: /danger-manage-web/src/views/lessonsProgram/components/QuestionList.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -14,11 +14,12 @@
         >道题
         <span class="warn">温馨提示：发布课程前需要进行考试设置</span>
       </div>
-      <div class="right">{{courseName}}</div>
+      <div class="right">{{ courseName }}</div>
     </div>
     <div class="table flex" v-loading="loading">
       <div class="th flex">
         <div class="left">序号</div>
+        <!-- <div class="type">题目类型</div> -->
         <div class="middle">题目名称</div>
         <div class="right">操作</div>
       </div>
@@ -29,6 +30,7 @@
           class="td flex"
         >
           <div class="left">{{ index + 1 }}</div>
+          <!-- <div class="type">{{item.topicType}}</div> -->
           <div class="middle zzz">
             {{ item.topicTitle }}
           </div>
@@ -53,17 +55,54 @@
     </div>
     <div class="rightNum flex">
       <div class="left">考试设置</div>
+
+      <div class="middle flex">
+        <div class="left-text">单选一题</div>
+        <div>
+          <el-input
+            v-model="bottomFrom.singleChoiceScore"
+            style="width: 40px"
+            size="mini"
+          ></el-input>
+        </div>
+        <div>分</div>
+      </div>
+      <div class="middle flex">
+        <div class="left-text">多选一题</div>
+        <div>
+          <el-input
+            v-model="bottomFrom.multipleChoiceScore"
+            style="width: 40px"
+            size="mini"
+          ></el-input>
+        </div>
+        <div>分</div>
+      </div>
+
+      <div class="middle flex">
+        <div class="left-text">判断一题</div>
+        <div>
+          <el-input
+            v-model="bottomFrom.judgmentScore"
+            style="width: 40px"
+            size="mini"
+          ></el-input>
+        </div>
+        <div>分</div>
+      </div>
+
       <div class="middle flex">
-        <div class="left-text">答对题目大于</div>
+        <div class="left-text">总分大于</div>
         <div>
           <el-input
-            v-model="rightNum"
+            v-model="bottomFrom.qualifiedNum"
             style="width: 60px"
             size="mini"
           ></el-input>
         </div>
         <div>为合格</div>
       </div>
+
       <div class="right">
         <el-button
           @click="saveRightNum"
@@ -97,10 +136,16 @@ export default {
       // 当前课程的第几题，调一遍接口
       questionNum: null,
       // 答对几道题
-      rightNum: 0,
+      // rightNum: 0,
+      bottomFrom: {
+        singleChoiceScore: 0,
+        multipleChoiceScore: 0,
+        judgmentScore: 0,
+        qualifiedNum: 0,
+      },
       questionList: [],
       loading: false,
-      courseName:'',
+      courseName: "",
     };
   },
   // watch: {
@@ -145,7 +190,12 @@ export default {
     getLessonById(courseId) {
       getLessonById(courseId).then((res) => {
         console.log(res);
-        this.rightNum = res.data.qualifiedNum;
+        this.bottomFrom ={
+        singleChoiceScore: res.data.qualifiedNum,
+        multipleChoiceScore: res.data.multipleChoiceScore,
+        judgmentScore: res.data.judgmentScore,
+        qualifiedNum: res.data.qualifiedNum,
+      }
         this.courseName = res.data.courseName;
       });
     },
@@ -179,23 +229,25 @@ export default {
         });
     },
     saveRightNum() {
-      if (this.rightNum > this.questionList.length) {
-        this.$message({
-          message: "答对题目数应小于等于考试题目总数",
-          type: "warning",
-        });
-        return;
-      }
-      changeLesson({ courseId: this.courseId, qualifiedNum: this.rightNum }).then(
-        (res) => {
-          if (res.code == 200) {
-            this.$message({
-              message: "答题合格数修改成功",
-              type: "success",
-            });
-          }
+      // if (this.bottomFrom.rightNum > this.questionList.length) {
+      //   this.$message({
+      //     message: "答对题目数应小于等于考试题目总数",
+      //     type: "warning",
+      //   });
+      //   return;
+      // }
+      changeLesson({
+        courseId: this.courseId,
+        // qualifiedNum: this.rightNum,
+        ...this.bottomFrom
+      }).then((res) => {
+        if (res.code == 200) {
+          this.$message({
+            message: "答题合格数修改成功",
+            type: "success",
+          });
         }
-      );
+      });
     },
   },
 };
@@ -255,6 +307,10 @@ export default {
         width: 15%;
         text-align: center;
       }
+      // .type {
+      //   width: 10%;
+      //   text-align: center;
+      // }
       .middle {
         width: 60%;
         padding-left: 100px;
@@ -283,9 +339,13 @@ export default {
           width: 15%;
           text-align: center;
         }
+        // .type {
+        //   width: 10%;
+        //   text-align: center;
+        // }
         .middle {
           width: 60%;
-          padding-left: 10px;
+          padding-left: 100px;
         }
         .right {
           width: 25%;

danger-manage-web/src/views/educationPlanExam/myLessons/components/AnswerLesson.vue

@@ -20,14 +20,26 @@
             <transition name="fade" mode="out-in">
               <div class="question-wrapper" v-if="visible" :key="nowQuestion">
                 <div v-for="(item, index) in list" :key="item.id">
-                  <Question
-                    v-if="index === nowQuestion"
-                    :questionObj="item"
-                    :index="index"
-                    :nowQuestion="nowQuestion"
-                    :selectLetter="selectLetter"
-                    @changeLetter="changeLetter"
-                  />
+                  <template v-if="item.topicType === 1 || item.topicType === 3">
+                    <Question
+                      v-if="index === nowQuestion"
+                      :questionObj="item"
+                      :index="index"
+                      :nowQuestion="nowQuestion"
+                      :selectLetter="selectLetter"
+                      @changeLetter="changeLetter"
+                    />
+                  </template>
+                  <template v-else>
+                    <QuestionChoice
+                      v-if="index === nowQuestion"
+                      :questionObj="item"
+                      :index="index"
+                      :nowQuestion="nowQuestion"
+                      :selectLetter="selectLetter"
+                      @changeLetter="changeLetter"
+                    />
+                  </template>
                 </div>
               </div>
             </transition>
@@ -40,7 +52,11 @@
                     active:
                       answerArr.findIndex(
                         (item) => item.questionNum === index + 1
-                      ) >= 0,
+                      ) >= 0 && activeBool(index),
+                    activered:
+                      answerArr.findIndex(
+                        (item) => item.questionNum === index + 1
+                      ) >= 0 && !activeBool(index),
                     now: index === nowQuestion,
                   }"
                   v-for="(item, index) in list"
@@ -77,6 +93,7 @@
 
 <script>
 import Question from "./Question";
+import QuestionChoice from "./QuestionChoice";
 import GoodJob from "./GoodJob.vue";
 import {
   userQuestionList,
@@ -98,8 +115,10 @@ export default {
   },
   components: {
     Question,
+    QuestionChoice,
     GoodJob,
   },
+
   data() {
     return {
       nowQuestion: 0,
@@ -116,9 +135,10 @@ export default {
       ],
       answerArr: [],
       // 题目是否被答过，如果答过，就把值传回去，如果没有答过，就是空
-      selectLetter: 999,
+      selectLetter: [],
     };
   },
+
   // watch: {
   //   visible(newValue) {
   //     if (newValue) {
@@ -135,6 +155,7 @@ export default {
         return {
           id: item.topicId,
           text: item.topicTitle,
+          topicType: item.topicType,
           question: JSON.parse(item.topicOption).map((item) => item.value),
         };
       });
@@ -148,7 +169,8 @@ export default {
       // this.answerClear();
       // this.$emit("update:visible", false);
       this.saveBody();
-      const answers = this.answerArr.map((item) => item.answer).join(",");
+      const answers = JSON.stringify(this.answerArr.map((item) => item.answer));
+      console.log(answers);
       this.loading = true;
       setAnswer({
         userCourseId: this.userCourseId,
@@ -158,13 +180,12 @@ export default {
           if (res.code == 200) {
             this.goodJobData = res.data;
             this.goodJobShow = true;
-
           }
         })
         .finally(() => {
           this.loading = false;
           // 是否作对
-          this.$emit('jj',this.goodJobData)
+          this.$emit("jj", this.goodJobData);
         });
     },
     dialogCancel() {
@@ -190,8 +211,7 @@ export default {
         this.nowQuestion = index;
       }
       // 赋值，如果答过的，就传回去，如果没答过，就是空 变成字符串是因为0位false
-      this.selectLetter =
-        this.answerArr[this.nowQuestion]?.answer + "" || 99999;
+      this.selectLetter = this.answerArr[this.nowQuestion]?.answer || [];
     },
     nextBtnClick() {
       // 到头了，打完了
@@ -229,7 +249,10 @@ export default {
         // 替换
         this.answerArr.splice(index, 1, obj);
       }
-      // console.log(this.answerArr);
+      console.log(this.answerArr);
+    },
+    activeBool(index) {
+      return this.answerArr[index]?.answer.length > 0;
     },
   },
 };
@@ -280,6 +303,9 @@ export default {
         &.active {
           background: #e9e9e9;
         }
+        &.activered {
+          background: #ffffff;
+        }
         &.now {
           background: #a3d3ff;
           border: none;

danger-manage-web/src/views/educationPlanExam/myLessons/components/Question.vue

@@ -2,7 +2,7 @@
  * @Author: 纪泽龙 jizelong@qq.com
  * @Date: 2022-09-21 11:00:14
  * @LastEditors: 纪泽龙 jizelong@qq.com
- * @LastEditTime: 2022-09-28 11:15:27
+ * @LastEditTime: 2023-01-10 14:36:39
  * @FilePath: /danger-manage-web/src/views/myLessons/components/Question.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -38,7 +38,7 @@
       <div class="change-wrapper flex">
         <div
           class="change"
-          :class="{ active: letterActive+'' === index+'' }"
+          :class="{ active: letterActive.indexOf(index)>=0 }"
           @click="changeLetter(index)"
           v-for="(item, index) in questionObj.question"
           :key="item+'a'+index"
@@ -105,8 +105,10 @@ export default {
     },
     // 从外面传进来的选项，选择过的才有，没选择过的没有
     selectLetter: {
-      type: [String, Number],
-      default:999,
+      type: [String, Number,Array],
+      default:()=>{
+        return [];
+      },
     },
   },
   data() {
@@ -143,8 +145,8 @@ export default {
       }
     },
     changeLetter(index) {
-      this.letterActive = index;
-      this.$emit("changeLetter", index);
+      this.letterActive = [index];
+      this.$emit("changeLetter", this.letterActive);
       // this.$emit("changeLetter", this.letters[index]);
     },
   },

danger-manage-web/src/views/educationPlanExam/myLessons/components/QuestionChoice.vue

+<!--
+ * @Author: 纪泽龙 jizelong@qq.com
+ * @Date: 2022-09-21 11:00:14
+ * @LastEditors: 纪泽龙 jizelong@qq.com
+ * @LastEditTime: 2023-01-10 15:32:10
+ * @FilePath: /danger-manage-web/src/views/myLessons/components/Question.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div class="question flex">
+    <div
+      class="top"
+      :class="{ flex: alignItemsCenter }"
+      :style="{ alignItems: alignItemsCenter ? 'center' : '' }"
+      ref="top"
+    >
+      <div class="text" ref="text">
+        {{ questionObj.text }}
+      </div>
+      <div class="num">{{ nowQuestion + 1 }}</div>
+    </div>
+    <div class="middle">
+      <div
+        class="item flex"
+        v-for="(item, index) in questionObj.question"
+        :key="item + 'aas' + index"
+      >
+        <div class="letter">
+          {{ letters[index] }}
+        </div>
+        <div class="">
+          {{ item }}
+        </div>
+      </div>
+    </div>
+
+    <div class="bottom flex">
+      <div class="change-wrapper flex">
+        <div
+          class="change"
+          :class="{ active: letterActive.indexOf(index) >= 0 }"
+          @click="changeLetter(index)"
+          v-for="(item, index) in questionObj.question"
+          :key="item + 'a' + index"
+        >
+          {{ letters[index] }}
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+const letters = [
+  "A",
+  "B",
+  "C",
+  "D",
+  "E",
+  "F",
+  "G",
+  "H",
+  "I",
+  "J",
+  "K",
+  "L",
+  "M",
+  "N",
+  "O",
+  "P",
+  "Q",
+  "R",
+  "S",
+  "T",
+  "U",
+  "V",
+  "W",
+  "X",
+  "Y",
+  "Z",
+];
+export default {
+  name: "question",
+  props: {
+    questionObj: {
+      type: Object,
+      default: () => {
+        return {
+          text: "asdfasdf",
+          question: [
+            "沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师沙发斯蒂芬大师",
+            "沙发斯蒂芬大师",
+            "沙发斯蒂芬大师",
+            "沙发斯蒂芬大师",
+            "沙发斯蒂芬大师",
+          ],
+        };
+      },
+    },
+    nowQuestion: {
+      type: Number,
+    },
+    index: {
+      type: Number,
+    },
+    // 从外面传进来的选项，选择过的才有，没选择过的没有
+    selectLetter: {
+      type: [String, Number, Array],
+      default: () => {
+        return [];
+      },
+    },
+  },
+  data() {
+    return {
+      alignItemsCenter: false,
+      // 如果传进来了，就是这个值，如果没有就是null，因为动画需要那个key的问题，会清空原始的盒子，所以要传一下值
+      letterActive: this.selectLetter,
+      letters,
+    };
+  },
+  mounted() {
+    // console.log('123')
+    // 每次都会更新，所以不需要watch 直接在这里面写 因为动画需要那个key的问题，会清空原始的盒子，所以要传一下值
+    this.textCenter();
+  },
+  watch: {
+    // 监听一下当前题目，调整一下位置
+    // nowQuestion(value) {
+    //   console.log('nowQuestion变化',value)
+    //   this.$nextTick(() => {
+    //     this.textCenter();
+    //   });
+    // },
+  },
+  methods: {
+    textCenter() {
+      let h1 = this.$refs.text?.offsetHeight;
+      let h2 = this.$refs.top?.offsetHeight;
+      // 如果text大于或者等于top，就出不居中，如果不小于top，就上下居中
+      if (h2 <= h1) {
+        this.alignItemsCenter = false;
+      } else {
+        this.alignItemsCenter = true;
+      }
+    },
+    changeLetter(index) {
+      // this.letterActive = index;
+      const ind = this.letterActive.indexOf(index);
+      if (ind < 0) {
+        this.letterActive.push(index);
+      } else {
+        this.letterActive.splice(ind, 1);
+      }
+
+      this.$emit("changeLetter", this.letterActive);
+      // this.$emit("changeLetter", this.letters[index]);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.question {
+  // position: absolute;
+  // top: 0px;
+  // display: inline-block;
+  width: 100%;
+  height: 370px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #bbbbbb;
+  // background: red;
+  flex-direction: column;
+  .top {
+    background: #f9f9f9;
+    height: 54px;
+    padding: 0px 10px 0px 43px;
+    overflow-wrap: anywhere;
+    // align-items: center;
+    overflow-y: auto;
+    position: relative;
+    .text {
+      font-size: 14px;
+      text-indent: 2em;
+    }
+    .num {
+      position: absolute;
+      left: 0;
+      width: 48px;
+      height: 48px;
+      top: 4px;
+      background: #1d84ff;
+      border-radius: 50%;
+      text-align: center;
+      line-height: 48px;
+      font-size: 18px;
+      color: #ffffff;
+    }
+  }
+  .middle {
+    flex: 1;
+    // background: blue;
+    overflow-y: auto;
+    padding-left: 43px;
+    padding-right: 10px;
+    margin-bottom: 15px;
+    .item {
+      padding-top: 38px;
+      width: 100%;
+      overflow-wrap: anywhere;
+      font-size: 14px;
+      color: #101010;
+      .letter {
+        padding: 2px;
+        margin-right: 10px;
+        box-sizing: border-box;
+      }
+    }
+  }
+  .bottom {
+    max-height: 70px;
+    // background: black;
+    padding-left: 43px;
+    padding-right: 10px;
+    overflow-y: auto;
+    .change-wrapper {
+      width: 756px;
+      flex-wrap: wrap;
+      margin: 0 auto;
+      .change {
+        width: 90px;
+        height: 30px;
+        background: #e8f4ff;
+        color: #101010;
+        border: 1px solid #a3d3ff;
+        line-height: 30px;
+        text-align: center;
+        margin: 0 9px 5px;
+        border-radius: 4px;
+        cursor: pointer;
+        &.active {
+          background: #1d84ff;
+          color: #ffffff;
+          border: 1px solid #a3d3ff;
+        }
+        &:hover {
+          background: rgba(29, 132, 255, 0.5);
+          color: #ffffff;
+        }
+      }
+    }
+  }
+}
+</style>

danger-manage-web/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: process.env.VUE_APP_TARGET,
-        // target: `http://192.168.2.21:8908/dangerManage`,
+        target: `http://192.168.2.21:8908/dangerManage`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''