Browse Source

连线模板完善,title组件取消及录音组件传参修改

qinpeng 2 years ago
parent
commit
c707534d6e

+ 6 - 6
src/components/Adult/preview/ConfigurableTable.vue

@@ -3,8 +3,6 @@
     class="config-table"
     class="config-table"
     v-if="judgeAnswer == 'standardAnswer' ? (userError ? true : false) : true"
     v-if="judgeAnswer == 'standardAnswer' ? (userError ? true : false) : true"
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
-
     <table
     <table
       :style="{
       :style="{
         'box-shadow': `${
         'box-shadow': `${
@@ -64,10 +62,12 @@
                 { underline: col.isUnderline },
                 { underline: col.isUnderline },
                 judgeAnswer == 'standardAnswer' ? 'correct' : '',
                 judgeAnswer == 'standardAnswer' ? 'correct' : '',
                 judgeAnswer == 'studentAnswer' || judgeAnswer == 'userAnswer'
                 judgeAnswer == 'studentAnswer' || judgeAnswer == 'userAnswer'
-                  ? curQue.Bookanswer[i].content[j].userAnswerJudge ==
-                    '[JUDGE##T##JUDGE]'
-                    ? 'correct'
-                    : 'error'
+                  ? curQue.Bookanswer[i].content[j].userAnswerJudge
+                    ? curQue.Bookanswer[i].content[j].userAnswerJudge ==
+                      '[JUDGE##T##JUDGE]'
+                      ? 'correct'
+                      : 'error'
+                    : ''
                   : '',
                   : '',
               ]"
               ]"
               :style="{ 'background-color': `${col.background}` }"
               :style="{ 'background-color': `${col.background}` }"

+ 6 - 5
src/components/Adult/preview/HeaderSparate/index.vue

@@ -3,7 +3,6 @@
     class="header-separate"
     class="header-separate"
     v-if="judgeAnswer == 'standardAnswer' ? (userError ? true : false) : true"
     v-if="judgeAnswer == 'standardAnswer' ? (userError ? true : false) : true"
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
     <table>
     <table>
       <colgroup>
       <colgroup>
         <col
         <col
@@ -46,10 +45,12 @@
                 `${curQue.firstColAligin === 'center' ? 'col-center' : ''}`,
                 `${curQue.firstColAligin === 'center' ? 'col-center' : ''}`,
                 judgeAnswer == 'standardAnswer' ? 'correct' : '',
                 judgeAnswer == 'standardAnswer' ? 'correct' : '',
                 judgeAnswer == 'studentAnswer' || judgeAnswer == 'userAnswer'
                 judgeAnswer == 'studentAnswer' || judgeAnswer == 'userAnswer'
-                  ? curQue.Bookanswer[i].content[j].userAnswerJudge ==
-                    '[JUDGE##T##JUDGE]'
-                    ? 'correct'
-                    : 'error'
+                  ? curQue.Bookanswer[i].content[j].userAnswerJudge
+                    ? curQue.Bookanswer[i].content[j].userAnswerJudge ==
+                      '[JUDGE##T##JUDGE]'
+                      ? 'correct'
+                      : 'error'
+                    : ''
                   : '',
                   : '',
               ]"
               ]"
               :style="{
               :style="{

+ 21 - 8
src/components/Adult/preview/InputHasRecord.vue

@@ -11,7 +11,6 @@
         : true
         : true
     "
     "
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
     <template v-if="judgeAnswer == 'standardAnswer'">
     <template v-if="judgeAnswer == 'standardAnswer'">
       <div v-for="(items, indexs) in userErrList" :key="indexs">
       <div v-for="(items, indexs) in userErrList" :key="indexs">
         <div class="item-content">
         <div class="item-content">
@@ -133,7 +132,11 @@
           <div v-if="items.record" class="luyin-inner">
           <div v-if="items.record" class="luyin-inner">
             <Soundrecord
             <Soundrecord
               @handleWav="handleWav"
               @handleWav="handleWav"
-              :answerRecordList="curQue.Bookanswer[indexs].recordList"
+              :answerRecordList="
+                judgeAnswer != 'standardAnswer'
+                  ? curQue.Bookanswer[0].recordList
+                  : []
+              "
               :tmIndex="indexs"
               :tmIndex="indexs"
               :TaskModel="TaskModel"
               :TaskModel="TaskModel"
               type="promax"
               type="promax"
@@ -306,7 +309,11 @@
                 <div v-if="items.record" class="luyin-inner">
                 <div v-if="items.record" class="luyin-inner">
                   <Soundrecord
                   <Soundrecord
                     @handleWav="handleWav"
                     @handleWav="handleWav"
-                    :answerRecordList="curQue.Bookanswer[indexs].recordList"
+                    :answerRecordList="
+                      judgeAnswer != 'standardAnswer'
+                        ? curQue.Bookanswer[0].recordList
+                        : []
+                    "
                     :tmIndex="indexs"
                     :tmIndex="indexs"
                     :TaskModel="TaskModel"
                     :TaskModel="TaskModel"
                     type="promax"
                     type="promax"
@@ -434,10 +441,12 @@
                 judgeAnswer == 'studentAnswer' ||
                 judgeAnswer == 'studentAnswer' ||
                 judgeAnswer == 'standardAnswer' ||
                 judgeAnswer == 'standardAnswer' ||
                 judgeAnswer == 'userAnswer'
                 judgeAnswer == 'userAnswer'
-                  ? curQue.Bookanswer[indexs].userAnswerJudge ==
-                    '[JUDGE##T##JUDGE]'
-                    ? 'correct'
-                    : 'error'
+                  ? curQue.Bookanswer[indexs].userAnswerJudge
+                    ? curQue.Bookanswer[indexs].userAnswerJudge ==
+                      '[JUDGE##T##JUDGE]'
+                      ? 'correct'
+                      : 'error'
+                    : ''
                   : '',
                   : '',
               ]"
               ]"
               type="textarea"
               type="textarea"
@@ -451,7 +460,11 @@
             <div v-if="items.record" class="luyin-inner">
             <div v-if="items.record" class="luyin-inner">
               <Soundrecord
               <Soundrecord
                 @handleWav="handleWav"
                 @handleWav="handleWav"
-                :answerRecordList="curQue.Bookanswer[indexs].recordList"
+                :answerRecordList="
+                  judgeAnswer != 'standardAnswer'
+                    ? curQue.Bookanswer[0].recordList
+                    : []
+                "
                 :tmIndex="indexs"
                 :tmIndex="indexs"
                 :TaskModel="TaskModel"
                 :TaskModel="TaskModel"
                 type="promax"
                 type="promax"

+ 57 - 23
src/components/Adult/preview/Ligature.vue

@@ -9,8 +9,6 @@
         : true
         : true
     "
     "
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
-
     <div class="main">
     <div class="main">
       <div style="text-align: center">{{ curQue.title }}</div>
       <div style="text-align: center">{{ curQue.title }}</div>
       <div :id="'container' + number" class="container">
       <div :id="'container' + number" class="container">
@@ -35,14 +33,13 @@
                   alt=""
                   alt=""
                   @load="conImageload"
                   @load="conImageload"
                 />
                 />
+                <!-- 
+                    judgeAnswer == 'standardAnswer' ? 'correct' : '',
+
+                 -->
                 <div
                 <div
                   class="text"
                   class="text"
-                  :class="[
-                    'left' + index,
-
-                    judgeAnswer == 'standardAnswer' ? 'correct' : '',
-                    YouranswerClass(item, 'left'),
-                  ]"
+                  :class="['left' + index, YouranswerClass(item, 'left')]"
                   v-if="
                   v-if="
                     item.detail.wordsList.length > 0 || item.detail.sentence
                     item.detail.wordsList.length > 0 || item.detail.sentence
                   "
                   "
@@ -154,13 +151,13 @@
                   alt=""
                   alt=""
                   @load="conImageload"
                   @load="conImageload"
                 />
                 />
+                <!-- 
+                    judgeAnswer == 'standardAnswer' ? 'correct' : '',
+
+                 -->
                 <div
                 <div
                   class="text"
                   class="text"
-                  :class="[
-                    'right' + index,
-                    judgeAnswer == 'standardAnswer' ? 'correct' : '',
-                    YouranswerClass(item, 'right'),
-                  ]"
+                  :class="['right' + index, YouranswerClass(item, 'right')]"
                   v-if="
                   v-if="
                     item.detail.wordsList.length > 0 || item.detail.sentence
                     item.detail.wordsList.length > 0 || item.detail.sentence
                   "
                   "
@@ -269,23 +266,36 @@ export default {
     YouranswerClass(item, type) {
     YouranswerClass(item, type) {
       if (
       if (
         this.judgeAnswer == "studentAnswer" ||
         this.judgeAnswer == "studentAnswer" ||
-        this.judgeAnswer == "userAnswer"
+        this.judgeAnswer == "userAnswer" ||
+        this.judgeAnswer == "standardAnswer"
       ) {
       ) {
         let clss = "";
         let clss = "";
         this.data.data.forEach((items) => {
         this.data.data.forEach((items) => {
           if (type == "left") {
           if (type == "left") {
-            if (items.source == item.nodeId) {
-              if (items.correct) {
-                clss = "correct";
-              } else if (items.error) {
+            if (items.source) {
+              if (items.source == item.nodeId) {
+                if (items.correct) {
+                  clss = "correct";
+                } else if (items.error) {
+                  clss = "error";
+                }
+              }
+            } else {
+              if (items.error) {
                 clss = "error";
                 clss = "error";
               }
               }
             }
             }
           } else {
           } else {
-            if (items.target == item.nodeId) {
-              if (items.correct) {
-                clss = "correct";
-              } else if (items.error) {
+            if (items.target) {
+              if (items.target == item.nodeId) {
+                if (items.correct) {
+                  clss = "correct";
+                } else if (items.error) {
+                  clss = "error";
+                }
+              }
+            } else {
+              if (items.error) {
                 clss = "error";
                 clss = "error";
               }
               }
             }
             }
@@ -523,7 +533,20 @@ export default {
       if (flag) {
       if (flag) {
         this.data.userAnswerJudge = "[JUDGE##T##JUDGE]";
         this.data.userAnswerJudge = "[JUDGE##T##JUDGE]";
       } else {
       } else {
-        this.data.userAnswerJudge = "[JUDGE##F##JUDGE]";
+        let isanswer = false;
+        this.curQue.con.forEach((con) => {
+          if (
+            Object.prototype.toString.call(con.AnswerList).indexOf("Number") !=
+            -1
+          ) {
+            isanswer = true;
+          }
+        });
+        if (isanswer) {
+          this.data.userAnswerJudge = "[JUDGE##F##JUDGE]";
+        } else {
+          this.data.userAnswerJudge = "";
+        }
       }
       }
     },
     },
   },
   },
@@ -644,6 +667,7 @@ export default {
           this.data.data.push({
           this.data.data.push({
             source: item.nodeId,
             source: item.nodeId,
             target: this.curQue.option[item.AnswerList].nodeId,
             target: this.curQue.option[item.AnswerList].nodeId,
+            correct: true,
           });
           });
         }
         }
       });
       });
@@ -665,6 +689,16 @@ export default {
                 item.error = true;
                 item.error = true;
               }
               }
             }
             }
+          } else {
+            if (
+              Object.prototype.toString
+                .call(con.AnswerList)
+                .indexOf("Number") != -1
+            ) {
+              if (item.correct != true) {
+                item.error = true;
+              }
+            }
           }
           }
         });
         });
       });
       });

+ 10 - 3
src/components/Adult/preview/SentenceInput.vue

@@ -10,7 +10,6 @@
         : true
         : true
     "
     "
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
     <h2 v-if="curQue.title">{{ curQue.title }}</h2>
     <h2 v-if="curQue.title">{{ curQue.title }}</h2>
     <ul>
     <ul>
       <li
       <li
@@ -248,7 +247,11 @@
           <template v-if="dataType.indexOf('sentence_input_chs') != -1">
           <template v-if="dataType.indexOf('sentence_input_chs') != -1">
             <Soundrecord
             <Soundrecord
               @handleWav="handleWav"
               @handleWav="handleWav"
-              :answerRecordList="curQue.Bookanswer[indexs].recordList"
+              :answerRecordList="
+                judgeAnswer != 'standardAnswer'
+                  ? curQue.Bookanswer[0].recordList
+                  : []
+              "
               :tmIndex="indexs"
               :tmIndex="indexs"
               :TaskModel="TaskModel"
               :TaskModel="TaskModel"
               type="normal"
               type="normal"
@@ -259,7 +262,11 @@
           <template v-else>
           <template v-else>
             <Soundrecord
             <Soundrecord
               @handleWav="handleWav"
               @handleWav="handleWav"
-              :answerRecordList="curQue.Bookanswer[indexs].recordList"
+              :answerRecordList="
+                judgeAnswer != 'standardAnswer'
+                  ? curQue.Bookanswer[0].recordList
+                  : []
+              "
               :tmIndex="indexs"
               :tmIndex="indexs"
               :TaskModel="TaskModel"
               :TaskModel="TaskModel"
               type="mini"
               type="mini"

+ 0 - 2
src/components/Adult/preview/SentenceSortQP.vue

@@ -10,8 +10,6 @@
         : true
         : true
     "
     "
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
-
     <h2>{{ curQue.title }}</h2>
     <h2>{{ curQue.title }}</h2>
     <div
     <div
       class="item-box"
       class="item-box"

+ 5 - 3
src/components/Adult/preview/TextInputRecord.vue

@@ -10,8 +10,6 @@
         : true
         : true
     "
     "
   >
   >
-    <AnswerTitle :judgeAnswer="judgeAnswer" />
-
     <h2 v-if="curQue.title">{{ curQue.title }}</h2>
     <h2 v-if="curQue.title">{{ curQue.title }}</h2>
     <div
     <div
       class="aduioLine-box"
       class="aduioLine-box"
@@ -89,7 +87,11 @@
         <template v-if="items.IsRecord">
         <template v-if="items.IsRecord">
           <Soundrecord
           <Soundrecord
             @handleWav="handleWav"
             @handleWav="handleWav"
-            :answerRecordList="curQue.Bookanswer[indexs].recordList"
+            :answerRecordList="
+              judgeAnswer != 'standardAnswer'
+                ? curQue.Bookanswer[0].recordList
+                : []
+            "
             :tmIndex="indexs"
             :tmIndex="indexs"
             :TaskModel="TaskModel"
             :TaskModel="TaskModel"
             type="pro"
             type="pro"