Merge branch 'master' of http://60.205.254.193:3000/GCLS/GCLS_Page_Book_Component_NPC

src/components/Adult/Preview.vue

@@ -1124,15 +1124,16 @@ export default {
 
                 let answerData = JSON.parse(Bookanswer);
                 if (answerData && itemss.data) {
-                  itemss.data.Bookanswer =
-                    answerData.length > 0 &&
-                    answerData[index].table_list &&
-                    answerData[index].table_list.length > 0 &&
-                    answerData[index].table_list[indexs].length > 0 &&
-                    answerData[index].table_list[indexs][indexss].data
-                      ? answerData[index].table_list[indexs][indexss].data
-                          .Bookanswer
-                      : [];
+                  let BookanswerRes =
+                        answerData.length > 0 &&
+                        answerData[index].table_list &&
+                        answerData[index].table_list.length > 0 &&
+                        answerData[index].table_list[indexs].length > 0 &&
+                        answerData[index].table_list[indexs][indexss].data
+                        ? answerData[index].table_list[indexs][indexss].data
+                            .Bookanswer
+                        : [];
+                    _this.$set(itemss.data, "Bookanswer", BookanswerRes);
                 }
               } else {
                 _this.judgeAnswersList = [""];

src/components/Adult/preview/ConfigurableTable.vue

@@ -339,7 +339,7 @@ export default {
       if (type == "input") {
         this.$forceUpdate();
         if (
-          this.curQue.Bookanswer[i].content[j].answer ==
+          this.curQue.Bookanswer[i].content[j].answer.trim() ==
           this.curQue.tableData.body[i].content[j].answer
         ) {
           if (this.curQue.tableData.body[i].content[j].isCross) {

src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -718,7 +718,7 @@ export default {
     // 判断题选择
     handleSelectJudge(obj, index) {
       let _this = this;
-      if (_this.TaskModel != "ANSWER" || !judgeAnswer) {
+      if (_this.TaskModel != "ANSWER" || !_this.judgeAnswer) {
         _this.$set(_this.Bookanswer.judge[index], "value", obj);
         let correct = _this.curQue.judge[index].judge;
         if (correct) {

src/components/Adult/preview/HeaderSparate/index.vue

@@ -313,7 +313,7 @@ export default {
       if (type == "input") {
         this.$forceUpdate();
         if (
-          this.curQue.Bookanswer[i].content[j].answer ==
+          this.curQue.Bookanswer[i].content[j].answer.trim() ==
           this.curQue.tableData.body[i].content[j].answer
         ) {
           if (this.curQue.tableData.body[i].content[j].isCross) {

src/components/Adult/preview/SentenceInput.vue

@@ -328,7 +328,7 @@ export default {
         if (this.curQue.option[index].answer.length > 0) {
           let userAnswerJudge = "[JUDGE##F##JUDGE]";
           this.curQue.option[index].answer.forEach((item) => {
-            if (this.curQue.Bookanswer[index].answer == item) {
+            if (this.curQue.Bookanswer[index].answer.trim() == item) {
               userAnswerJudge = "[JUDGE##T##JUDGE]";
             }
           });

src/components/Adult/preview/SentenceSortQP.vue

@@ -19,7 +19,7 @@
       :key="index"
     >
       <div class="item-right">
-        <b>{{ index + 1 }}</b>
+        <b>{{ judgeAnswer == 'standardAnswer' ? item.itemIndex + 1 :  index+ 1}}</b>
         <draggable
           v-model="item.detail.wordsList"
           animation="300"
@@ -216,6 +216,7 @@ export default {
     if (this.judgeAnswer == "standardAnswer") {
       this.curQue.Bookanswer.forEach((item, i) => {
         if (item.userAnswerJudge == "[JUDGE##F##JUDGE]") {
+          this.curQue.option[i].itemIndex = i
           this.userErrList.push(
             JSON.parse(JSON.stringify(this.curQue.option[i]))
           );

src/components/Adult/preview/TextInputRecord.vue

@@ -71,7 +71,7 @@
           >{{ items.con }}</span
         >
         <input
-          @blur="handleInput"
+          @blur="handleInput(indexs)"
           :class="['item-input', items.Inputfont]"
           v-model="
             judgeAnswer == 'standardAnswer'
@@ -169,8 +169,9 @@ export default {
       this.stopAudio = playFlag;
     },
     // input 输入时
-    handleInput(e) {
-      e.target.value = e.target.value ? e.target.value.trim() : "";
+    handleInput(index) {
+        this.curQue.Bookanswer[index].answer = this.curQue.Bookanswer[index].answer.trim()
+        e.target.value = e.target.value ? e.target.value.trim() : "";
     },
     // 处理数据
     handleData() {
@@ -204,7 +205,7 @@ export default {
     changeuserAnswerJudge(index) {
       if (this.curQue.option[index].answer) {
         if (
-          this.curQue.Bookanswer[index].answer ==
+          this.curQue.Bookanswer[index].answer.trim() ==
           this.curQue.option[index].answer
         ) {
           this.curQue.Bookanswer[index].userAnswerJudge = "[JUDGE##T##JUDGE]";