Sfoglia il codice sorgente

修改作业管理样式、文档全屏查看问题、连词成句无法显示问题

zengyicheng 2 anni fa
parent
commit
b084fc0dae

+ 138 - 68
src/components/pages/components/classStudentComponents/worksDetail3.vue

@@ -127,10 +127,16 @@
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      "
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      }}
                     </div>
                     <div
                       class="bigImg"
@@ -185,10 +191,23 @@
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].answerInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].answerInfo[0].score }}
+                    </div>
+                    <div
+                      class="a_add_title"
+                      style="
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: flex-start;
+                        flex-wrap: wrap;
+                        margin-bottom: 10px;
+                      "
+                    >
+                      <div style="font-size: 16px">问答工具</div>
                     </div>
                     <div class="answerbox">
                       <div style="min-width: 80px">问答标题</div>
@@ -217,10 +236,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].askInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].askInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -255,7 +274,11 @@
                       <div class="a_addBox">
                         <div style="font-size: 16px; color: #c7c7c7">内容</div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .askInfo[0].askInfo.askJson.askCount"
                           :key="index1"
@@ -336,10 +359,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].chooseInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].chooseInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -358,7 +381,11 @@
                           题目内容
                         </div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .chooseInfo[0].chooseInfo.testCount"
                           :key="index1"
@@ -485,10 +512,10 @@
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wpptInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wpptInfo[0].score }}
                     </div>
                     <div
                       style="height: 238px"
@@ -530,10 +557,10 @@
                   >
                     <div style="width: 100%">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].pjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].pjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -602,10 +629,10 @@
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].xztkInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].xztkInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -718,10 +745,10 @@
                   >
                     <div class="sentenBox">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].lccjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].lccjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -736,8 +763,7 @@
                         <div style="font-size: 16px">连词成句工具</div>
                       </div>
                       <div
-                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo
-                          .lccjInfo"
+                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo"
                         :key="stIndex"
                         style="padding-bottom: 20px"
                       >
@@ -745,10 +771,13 @@
                           第{{ stIndex + 1 }}题
                         </div>
                         <div class="isWrong">
-                          <div class="cardList1" v-if="st.chooseSenList">
+                          <div
+                            class="cardList1"
+                            v-if="st.lccjInfo.chooseSenList"
+                          >
                             <div class="cardBox">
                               <div
-                                v-for="(s, sIndex) in st.chooseSenList"
+                                v-for="(s, sIndex) in st.lccjInfo.chooseSenList"
                                 :key="sIndex"
                               >
                                 <el-tooltip
@@ -764,14 +793,16 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.chooseSenList.join(" ") }}
+                              组成句子:{{
+                                st.lccjInfo.chooseSenList.join(" ")
+                              }}
                             </div>
                           </div>
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() ==
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() ==
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -785,8 +816,8 @@
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() !=
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() !=
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -800,8 +831,8 @@
                         </div>
                         <div
                           v-if="
-                            st.chooseSenList.toString() !=
-                            st.rightAnswer.toString()
+                            st.lccjInfo.chooseSenList.toString() !=
+                            st.lccjInfo.rightAnswer.toString()
                           "
                         >
                           <div style="padding: 15px 0 10px 20px">
@@ -809,7 +840,7 @@
                           </div>
                           <div
                             class="cardList"
-                            v-if="st.rightAnswer"
+                            v-if="st.lccjInfo.rightAnswer"
                             style="
                               border: none;
                               padding: 10px 0 10px 10px;
@@ -818,7 +849,7 @@
                           >
                             <div class="cardBox">
                               <div
-                                v-for="(r, rIndex) in st.rightAnswer"
+                                v-for="(r, rIndex) in st.lccjInfo.rightAnswer"
                                 :key="rIndex"
                               >
                                 <el-tooltip
@@ -834,7 +865,7 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.rightAnswer.join(" ") }}
+                              组成句子:{{ st.lccjInfo.rightAnswer.join(" ") }}
                             </div>
                           </div>
                         </div>
@@ -849,10 +880,10 @@
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].bgInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].bgInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -882,10 +913,10 @@
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].cocopiInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].cocopiInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -952,10 +983,10 @@
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wordInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wordInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -1594,7 +1625,9 @@ export default {
                 workJson[k].img.push({
                   src: worksDetail[i].content,
                   id: i,
-                  score: worksDetail[i].score,
+                  score: worksDetail[i].score
+                    ? JSON.parse(worksDetail[i].score).wScore
+                    : worksDetail[i].score,
                 });
               }
             }
@@ -1616,7 +1649,9 @@ export default {
                 a.radio = e;
                 workJson[k].askInfo.push({
                   askInfo: a,
-                  score: askInfo[i].score,
+                  score: askInfo[i].score
+                    ? JSON.parse(askInfo[i].score).wScore
+                    : askInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1712,7 +1747,9 @@ export default {
                 t.radio = e;
                 workJson[k].chooseInfo.push({
                   chooseInfo: t,
-                  score: chooseInfo[i].score,
+                  score: chooseInfo[i].score
+                    ? JSON.parse(chooseInfo[i].score).wScore
+                    : chooseInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1810,7 +1847,9 @@ export default {
                     pptInfo[i].content;
                   workJson[k].wpptInfo.push({
                     wpptInfo: a,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = false;
                 } else if (
@@ -1822,7 +1861,9 @@ export default {
                 ) {
                   workJson[k].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = true;
                 }
@@ -1837,7 +1878,9 @@ export default {
                 const element = answerInfo[i];
                 workJson[k].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score,
+                  score: answerInfo[i].score
+                    ? JSON.parse(answerInfo[i].score).wScore
+                    : answerInfo[i].score,
                 });
               }
             }
@@ -1860,7 +1903,9 @@ export default {
                 workJson[k].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
-                  score: pjInfo[i].score,
+                  score: pjInfo[i].score
+                    ? JSON.parse(pjInfo[i].score).wScore
+                    : pjInfo[i].score,
                 });
               }
             }
@@ -1885,7 +1930,9 @@ export default {
                   workJson[k].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
-                    score: xztkInfo[i].score,
+                    score: xztkInfo[i].score
+                      ? JSON.parse(xztkInfo[i].score).wScore
+                      : xztkInfo[i].score,
                   });
                 }
               }
@@ -1899,9 +1946,10 @@ export default {
                 var lccj = lccjInfo[i];
                 workJson[k].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score,
+                  score: lccjInfo[i].score
+                    ? JSON.parse(lccjInfo[i].score).wScore
+                    : lccjInfo[i].score,
                 });
-                workJson[k].lccjInfo[i].score = lccjInfo[i].score;
               }
             }
 
@@ -1913,7 +1961,9 @@ export default {
                 var bg = bgInfo[i];
                 workJson[k].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score,
+                  score: bgInfo[i].score
+                    ? JSON.parse(bgInfo[i].score).wScore
+                    : bgInfo[i].score,
                 });
               }
             }
@@ -1951,7 +2001,9 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 } else if (
                   c.indexOf(
@@ -1967,14 +2019,24 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: a,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
-                } else {
+                } else if (
+                  cocopi.content
+                    .split(".")
+                    [
+                      cocopi.content.split(".").length - 1
+                    ].toLocaleUpperCase() == "PDF"
+                ) {
                   t = 3;
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 }
               }
@@ -1988,7 +2050,9 @@ export default {
                 var word = wordInfo[i];
                 workJson[k].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score,
+                  score: wordInfo[i].score
+                    ? JSON.parse(wordInfo[i].score).wScore
+                    : wordInfo[i].score,
                 });
               }
             }
@@ -3361,11 +3425,16 @@ export default {
   /* overflow: auto; */
 }
 
-.a_add_box {
+.a_add_box,
+.isAddBox {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
 }
 
+.isAddBox {
+  border: none;
+}
+
 .a_add_head {
   display: flex;
   align-items: center;
@@ -3567,7 +3636,9 @@ export default {
 
 .left_top {
   width: 45%;
-  padding-left: 20px;
+  margin: 0 0 0 20px;
+  padding: 10px 0 10px 0;
+  border-bottom: 2px solid #eee;
 }
 
 .right_top {
@@ -3797,7 +3868,6 @@ export default {
   flex-direction: column;
   align-items: flex-start;
   flex-wrap: nowrap;
-  font-size: 16px;
 }
 
 .answerbox1 > div:nth-child(2) {

+ 147 - 68
src/components/pages/components/studentWorksDetail.vue

@@ -361,10 +361,18 @@
                           v-if="worksDetail[sIndex].img.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="
+                              worksDetail[sIndex].img[
+                                worksDetail[sIndex].imgIndex
+                              ].score
+                            "
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{
+                              worksDetail[sIndex].img[
+                                worksDetail[sIndex].imgIndex
+                              ].score
+                            }}
                           </div>
                           <div
                             class="bigImg"
@@ -424,10 +432,23 @@
                           v-if="worksDetail[sIndex].answerInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].answerInfo[0].score"
+                            style="float: right; margin-right: 10px"
+                          >
+                            评分:{{ worksDetail[sIndex].answerInfo[0].score }}
+                          </div>
+                          <div
+                            class="a_add_title"
+                            style="
+                              display: flex;
+                              flex-direction: row;
+                              align-items: center;
+                              justify-content: flex-start;
+                              flex-wrap: wrap;
+                              margin-bottom: 10px;
+                            "
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            <div style="font-size: 16px">问答工具</div>
                           </div>
                           <div class="answerbox">
                             <div style="min-width: 80px">问答标题</div>
@@ -459,10 +480,10 @@
                         >
                           <div>
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].askInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].askInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -499,7 +520,11 @@
                                 内容
                               </div>
                               <div
-                                class="a_add_box"
+                                :class="
+                                  worksDetail[sIndex].askInfo.length > 1
+                                    ? 'a_add_box'
+                                    : 'isAddBox'
+                                "
                                 v-for="(item1, index1) in worksDetail[sIndex]
                                   .askInfo[0].askInfo.askJson.askCount"
                                 :key="index1"
@@ -581,10 +606,12 @@
                         >
                           <div>
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].chooseInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{
+                                worksDetail[sIndex].chooseInfo[0].score
+                              }}
                             </div>
                             <div
                               class="a_add_title"
@@ -603,7 +630,11 @@
                                 题目内容
                               </div>
                               <div
-                                class="a_add_box"
+                                :class="
+                                  worksDetail[sIndex].askInfo.length > 1
+                                    ? 'a_add_box'
+                                    : 'isAddBox'
+                                "
                                 v-for="(item1, index1) in worksDetail[sIndex]
                                   .chooseInfo[0].chooseInfo.testCount"
                                 :key="index1"
@@ -741,10 +772,10 @@
                           v-if="worksDetail[sIndex].wpptInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].wpptInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].wpptInfo[0].score }}
                           </div>
                           <div
                             style="height: 238px"
@@ -790,10 +821,10 @@
                         >
                           <div style="width: 100%">
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].pjInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].pjInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -866,10 +897,10 @@
                           v-if="worksDetail[sIndex].xztkInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].xztkInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].xztkInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -988,10 +1019,10 @@
                         >
                           <div class="sentenBox">
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].lccjInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].lccjInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -1007,7 +1038,7 @@
                             </div>
                             <div
                               v-for="(st, stIndex) in worksDetail[sIndex]
-                                .lccjInfo.lccjInfo"
+                                .lccjInfo"
                               :key="stIndex"
                               style="padding-bottom: 20px"
                             >
@@ -1020,10 +1051,14 @@
                                 第{{ stIndex + 1 }}题
                               </div>
                               <div class="isWrong">
-                                <div class="cardList1" v-if="st.chooseSenList">
+                                <div
+                                  class="cardList1"
+                                  v-if="st.lccjInfo.chooseSenList"
+                                >
                                   <div class="cardBox">
                                     <div
-                                      v-for="(s, sIndex) in st.chooseSenList"
+                                      v-for="(s, sIndex) in st.lccjInfo
+                                        .chooseSenList"
                                       :key="sIndex"
                                     >
                                       <el-tooltip
@@ -1039,14 +1074,16 @@
                                     </div>
                                   </div>
                                   <div class="cardAnswerBox">
-                                    组成句子:{{ st.chooseSenList.join(" ") }}
+                                    组成句子:{{
+                                      st.lccjInfo.chooseSenList.join(" ")
+                                    }}
                                   </div>
                                 </div>
                                 <div
                                   class="answerRight isTj"
                                   v-if="
-                                    st.chooseSenList.toString() ==
-                                    st.rightAnswer.toString()
+                                    st.lccjInfo.chooseSenList.toString() ==
+                                    st.lccjInfo.rightAnswer.toString()
                                   "
                                 >
                                   <div class="isTjImg">
@@ -1060,8 +1097,8 @@
                                 <div
                                   class="answerRight isTj"
                                   v-if="
-                                    st.chooseSenList.toString() !=
-                                    st.rightAnswer.toString()
+                                    st.lccjInfo.chooseSenList.toString() !=
+                                    st.lccjInfo.rightAnswer.toString()
                                   "
                                 >
                                   <div class="isTjImg">
@@ -1075,8 +1112,8 @@
                               </div>
                               <div
                                 v-if="
-                                  st.chooseSenList.toString() !=
-                                  st.rightAnswer.toString()
+                                  st.lccjInfo.chooseSenList.toString() !=
+                                  st.lccjInfo.rightAnswer.toString()
                                 "
                               >
                                 <div style="padding: 15px 0 10px 20px">
@@ -1084,7 +1121,7 @@
                                 </div>
                                 <div
                                   class="cardList"
-                                  v-if="st.rightAnswer"
+                                  v-if="st.lccjInfo.rightAnswer"
                                   style="
                                     border: none;
                                     padding: 10px 0 10px 10px;
@@ -1093,7 +1130,8 @@
                                 >
                                   <div class="cardBox">
                                     <div
-                                      v-for="(r, rIndex) in st.rightAnswer"
+                                      v-for="(r, rIndex) in st.lccjInfo
+                                        .rightAnswer"
                                       :key="rIndex"
                                     >
                                       <el-tooltip
@@ -1109,7 +1147,9 @@
                                     </div>
                                   </div>
                                   <div class="cardAnswerBox">
-                                    组成句子:{{ st.rightAnswer.join(" ") }}
+                                    组成句子:{{
+                                      st.lccjInfo.rightAnswer.join(" ")
+                                    }}
                                   </div>
                                 </div>
                               </div>
@@ -1126,10 +1166,10 @@
                           v-if="worksDetail[sIndex].bgInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].bgInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].bgInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1161,10 +1201,10 @@
                           v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].cocopiInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].cocopiInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1238,10 +1278,10 @@
                           v-if="worksDetail[sIndex].wordInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].wordInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].wordInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1594,7 +1634,7 @@ export default {
       userid: this.uid,
       oid: this.ooid,
       org: this.oorg,
-      studentId:"",
+      studentId: "",
       formLabelWidth: "100px",
       dialogImageUrl: "",
       pictureDialog: false,
@@ -1983,7 +2023,9 @@ export default {
                 workJson[k].img.push({
                   src: worksDetail[i].content,
                   id: i,
-                  score: worksDetail[i].score,
+                  score: worksDetail[i].score
+                    ? JSON.parse(worksDetail[i].score).wScore
+                    : worksDetail[i].score,
                 });
               }
             }
@@ -2005,7 +2047,9 @@ export default {
                 a.radio = e;
                 workJson[k].askInfo.push({
                   askInfo: a,
-                  score: askInfo[i].score,
+                  score: askInfo[i].score
+                    ? JSON.parse(askInfo[i].score).wScore
+                    : askInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -2101,7 +2145,9 @@ export default {
                 t.radio = e;
                 workJson[k].chooseInfo.push({
                   chooseInfo: t,
-                  score: chooseInfo[i].score,
+                  score: chooseInfo[i].score
+                    ? JSON.parse(chooseInfo[i].score).wScore
+                    : chooseInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -2199,7 +2245,9 @@ export default {
                     pptInfo[i].content;
                   workJson[k].wpptInfo.push({
                     wpptInfo: a,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = false;
                 } else if (
@@ -2211,7 +2259,9 @@ export default {
                 ) {
                   workJson[k].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = true;
                 }
@@ -2226,7 +2276,9 @@ export default {
                 const element = answerInfo[i];
                 workJson[k].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score,
+                  score: answerInfo[i].score
+                    ? JSON.parse(answerInfo[i].score).wScore
+                    : answerInfo[i].score,
                 });
               }
             }
@@ -2249,7 +2301,9 @@ export default {
                 workJson[k].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
-                  score: pjInfo[i].score,
+                  score: pjInfo[i].score
+                    ? JSON.parse(pjInfo[i].score).wScore
+                    : pjInfo[i].score,
                 });
               }
             }
@@ -2274,7 +2328,9 @@ export default {
                   workJson[k].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
-                    score: xztkInfo[i].score,
+                    score: xztkInfo[i].score
+                      ? JSON.parse(xztkInfo[i].score).wScore
+                      : xztkInfo[i].score,
                   });
                 }
               }
@@ -2288,9 +2344,10 @@ export default {
                 var lccj = lccjInfo[i];
                 workJson[k].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score,
+                  score: lccjInfo[i].score
+                    ? JSON.parse(lccjInfo[i].score).wScore
+                    : lccjInfo[i].score,
                 });
-                workJson[k].lccjInfo[i].score = lccjInfo[i].score;
               }
             }
 
@@ -2302,7 +2359,9 @@ export default {
                 var bg = bgInfo[i];
                 workJson[k].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score,
+                  score: bgInfo[i].score
+                    ? JSON.parse(bgInfo[i].score).wScore
+                    : bgInfo[i].score,
                 });
               }
             }
@@ -2340,7 +2399,9 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 } else if (
                   c.indexOf(
@@ -2356,14 +2417,24 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: a,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
-                } else {
+                } else if (
+                  cocopi.content
+                    .split(".")
+                    [
+                      cocopi.content.split(".").length - 1
+                    ].toLocaleUpperCase() == "PDF"
+                ) {
                   t = 3;
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 }
               }
@@ -2377,7 +2448,9 @@ export default {
                 var word = wordInfo[i];
                 workJson[k].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score,
+                  score: wordInfo[i].score
+                    ? JSON.parse(wordInfo[i].score).wScore
+                    : wordInfo[i].score,
                 });
               }
             }
@@ -3752,11 +3825,16 @@ export default {
   overflow: auto;
 }
 
-.a_add_box {
+.a_add_box,
+.isAddBox {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
 }
 
+.isAddBox {
+  border: none;
+}
+
 .a_add_head {
   display: flex;
   align-items: center;
@@ -3959,7 +4037,9 @@ export default {
 
 .left_top {
   width: 45%;
-  padding-left: 20px;
+  margin: 0 0 0 20px;
+  padding: 10px 0 10px 0;
+  border-bottom: 2px solid #eee;
 }
 
 .right_top {
@@ -4192,7 +4272,6 @@ export default {
   flex-direction: column;
   align-items: flex-start;
   flex-wrap: nowrap;
-  font-size: 16px;
 }
 
 .answerbox1 > div:nth-child(2) {

+ 149 - 69
src/components/pages/components/worksDetail2.vue

@@ -362,10 +362,18 @@
                           v-if="worksDetail[sIndex].img.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="
+                              worksDetail[sIndex].img[
+                                worksDetail[sIndex].imgIndex
+                              ].score
+                            "
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{
+                              worksDetail[sIndex].img[
+                                worksDetail[sIndex].imgIndex
+                              ].score
+                            }}
                           </div>
                           <div
                             class="bigImg"
@@ -425,10 +433,23 @@
                           v-if="worksDetail[sIndex].answerInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].answerInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].answerInfo[0].score }}
+                          </div>
+                          <div
+                            class="a_add_title"
+                            style="
+                              display: flex;
+                              flex-direction: row;
+                              align-items: center;
+                              justify-content: flex-start;
+                              flex-wrap: wrap;
+                              margin-bottom: 10px;
+                            "
+                          >
+                            <div style="font-size: 16px">问答工具</div>
                           </div>
                           <div class="answerbox">
                             <div style="min-width: 80px">问答标题</div>
@@ -460,10 +481,10 @@
                         >
                           <div>
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].askInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].askInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -500,7 +521,11 @@
                                 内容
                               </div>
                               <div
-                                class="a_add_box"
+                                :class="
+                                  worksDetail[sIndex].askInfo.length > 1
+                                    ? 'a_add_box'
+                                    : 'isAddBox'
+                                "
                                 v-for="(item1, index1) in worksDetail[sIndex]
                                   .askInfo[0].askInfo.askJson.askCount"
                                 :key="index1"
@@ -582,10 +607,12 @@
                         >
                           <div>
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].chooseInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{
+                                worksDetail[sIndex].chooseInfo[0].score
+                              }}
                             </div>
                             <div
                               class="a_add_title"
@@ -604,7 +631,11 @@
                                 题目内容
                               </div>
                               <div
-                                class="a_add_box"
+                                :class="
+                                  worksDetail[sIndex].askInfo.length > 1
+                                    ? 'a_add_box'
+                                    : 'isAddBox'
+                                "
                                 v-for="(item1, index1) in worksDetail[sIndex]
                                   .chooseInfo[0].chooseInfo.testCount"
                                 :key="index1"
@@ -742,10 +773,10 @@
                           v-if="worksDetail[sIndex].wpptInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].wpptInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].wpptInfo[0].score }}
                           </div>
                           <div
                             style="height: 238px"
@@ -791,10 +822,10 @@
                         >
                           <div style="width: 100%">
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].pjInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].pjInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -867,10 +898,10 @@
                           v-if="worksDetail[sIndex].xztkInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].xztkInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].xztkInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -989,10 +1020,10 @@
                         >
                           <div class="sentenBox">
                             <div
-                              v-if="worksDetail[sIndex].img.score"
-                              style="float: right"
+                              v-if="worksDetail[sIndex].lccjInfo[0].score"
+                              style="float: right; margin-right: 10px"
                             >
-                              评分:{{ worksDetail[sIndex].img.score }}
+                              评分:{{ worksDetail[sIndex].lccjInfo[0].score }}
                             </div>
                             <div
                               class="a_add_title"
@@ -1008,7 +1039,7 @@
                             </div>
                             <div
                               v-for="(st, stIndex) in worksDetail[sIndex]
-                                .lccjInfo.lccjInfo"
+                                .lccjInfo"
                               :key="stIndex"
                               style="padding-bottom: 20px"
                             >
@@ -1021,10 +1052,14 @@
                                 第{{ stIndex + 1 }}题
                               </div>
                               <div class="isWrong">
-                                <div class="cardList1" v-if="st.chooseSenList">
+                                <div
+                                  class="cardList1"
+                                  v-if="st.lccjInfo.chooseSenList"
+                                >
                                   <div class="cardBox">
                                     <div
-                                      v-for="(s, sIndex) in st.chooseSenList"
+                                      v-for="(s, sIndex) in st.lccjInfo
+                                        .chooseSenList"
                                       :key="sIndex"
                                     >
                                       <el-tooltip
@@ -1040,14 +1075,16 @@
                                     </div>
                                   </div>
                                   <div class="cardAnswerBox">
-                                    组成句子:{{ st.chooseSenList.join(" ") }}
+                                    组成句子:{{
+                                      st.lccjInfo.chooseSenList.join(" ")
+                                    }}
                                   </div>
                                 </div>
                                 <div
                                   class="answerRight isTj"
                                   v-if="
-                                    st.chooseSenList.toString() ==
-                                    st.rightAnswer.toString()
+                                    st.lccjInfo.chooseSenList.toString() ==
+                                    st.lccjInfo.rightAnswer.toString()
                                   "
                                 >
                                   <div class="isTjImg">
@@ -1061,8 +1098,8 @@
                                 <div
                                   class="answerRight isTj"
                                   v-if="
-                                    st.chooseSenList.toString() !=
-                                    st.rightAnswer.toString()
+                                    st.lccjInfo.chooseSenList.toString() !=
+                                    st.lccjInfo.rightAnswer.toString()
                                   "
                                 >
                                   <div class="isTjImg">
@@ -1076,8 +1113,8 @@
                               </div>
                               <div
                                 v-if="
-                                  st.chooseSenList.toString() !=
-                                  st.rightAnswer.toString()
+                                  st.lccjInfo.chooseSenList.toString() !=
+                                  st.lccjInfo.rightAnswer.toString()
                                 "
                               >
                                 <div style="padding: 15px 0 10px 20px">
@@ -1085,7 +1122,7 @@
                                 </div>
                                 <div
                                   class="cardList"
-                                  v-if="st.rightAnswer"
+                                  v-if="st.lccjInfo.rightAnswer"
                                   style="
                                     border: none;
                                     padding: 10px 0 10px 10px;
@@ -1094,7 +1131,8 @@
                                 >
                                   <div class="cardBox">
                                     <div
-                                      v-for="(r, rIndex) in st.rightAnswer"
+                                      v-for="(r, rIndex) in st.lccjInfo
+                                        .rightAnswer"
                                       :key="rIndex"
                                     >
                                       <el-tooltip
@@ -1110,7 +1148,9 @@
                                     </div>
                                   </div>
                                   <div class="cardAnswerBox">
-                                    组成句子:{{ st.rightAnswer.join(" ") }}
+                                    组成句子:{{
+                                      st.lccjInfo.rightAnswer.join(" ")
+                                    }}
                                   </div>
                                 </div>
                               </div>
@@ -1127,10 +1167,10 @@
                           v-if="worksDetail[sIndex].bgInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].bgInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].bgInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1162,10 +1202,10 @@
                           v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].cocopiInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].cocopiInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1239,10 +1279,10 @@
                           v-if="worksDetail[sIndex].wordInfo.length > 0"
                         >
                           <div
-                            v-if="worksDetail[sIndex].img.score"
-                            style="float: right"
+                            v-if="worksDetail[sIndex].wordInfo[0].score"
+                            style="float: right; margin-right: 10px"
                           >
-                            评分:{{ worksDetail[sIndex].img.score }}
+                            评分:{{ worksDetail[sIndex].wordInfo[0].score }}
                           </div>
                           <div
                             class="a_add_title"
@@ -1983,7 +2023,9 @@ export default {
                 workJson[k].img.push({
                   src: worksDetail[i].content,
                   id: i,
-                  score: worksDetail[i].score,
+                  score: worksDetail[i].score
+                    ? JSON.parse(worksDetail[i].score).wScore
+                    : worksDetail[i].score,
                 });
               }
             }
@@ -2005,7 +2047,9 @@ export default {
                 a.radio = e;
                 workJson[k].askInfo.push({
                   askInfo: a,
-                  score: askInfo[i].score,
+                  score: askInfo[i].score
+                    ? JSON.parse(askInfo[i].score).wScore
+                    : askInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -2101,7 +2145,9 @@ export default {
                 t.radio = e;
                 workJson[k].chooseInfo.push({
                   chooseInfo: t,
-                  score: chooseInfo[i].score,
+                  score: chooseInfo[i].score
+                    ? JSON.parse(chooseInfo[i].score).wScore
+                    : chooseInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -2199,7 +2245,9 @@ export default {
                     pptInfo[i].content;
                   workJson[k].wpptInfo.push({
                     wpptInfo: a,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = false;
                 } else if (
@@ -2211,7 +2259,9 @@ export default {
                 ) {
                   workJson[k].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = true;
                 }
@@ -2226,7 +2276,9 @@ export default {
                 const element = answerInfo[i];
                 workJson[k].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score,
+                  score: answerInfo[i].score
+                    ? JSON.parse(answerInfo[i].score).wScore
+                    : answerInfo[i].score,
                 });
               }
             }
@@ -2249,7 +2301,9 @@ export default {
                 workJson[k].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
-                  score: pjInfo[i].score,
+                  score: pjInfo[i].score
+                    ? JSON.parse(pjInfo[i].score).wScore
+                    : pjInfo[i].score,
                 });
               }
             }
@@ -2274,7 +2328,9 @@ export default {
                   workJson[k].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
-                    score: xztkInfo[i].score,
+                    score: xztkInfo[i].score
+                      ? JSON.parse(xztkInfo[i].score).wScore
+                      : xztkInfo[i].score,
                   });
                 }
               }
@@ -2288,9 +2344,10 @@ export default {
                 var lccj = lccjInfo[i];
                 workJson[k].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score,
+                  score: lccjInfo[i].score
+                    ? JSON.parse(lccjInfo[i].score).wScore
+                    : lccjInfo[i].score,
                 });
-                workJson[k].lccjInfo[i].score = lccjInfo[i].score;
               }
             }
 
@@ -2302,7 +2359,9 @@ export default {
                 var bg = bgInfo[i];
                 workJson[k].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score,
+                  score: bgInfo[i].score
+                    ? JSON.parse(bgInfo[i].score).wScore
+                    : bgInfo[i].score,
                 });
               }
             }
@@ -2340,7 +2399,9 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 } else if (
                   c.indexOf(
@@ -2356,14 +2417,24 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: a,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
-                } else {
+                } else if (
+                  cocopi.content
+                    .split(".")
+                    [
+                      cocopi.content.split(".").length - 1
+                    ].toLocaleUpperCase() == "PDF"
+                ) {
                   t = 3;
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 }
               }
@@ -2377,7 +2448,9 @@ export default {
                 var word = wordInfo[i];
                 workJson[k].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score,
+                  score: wordInfo[i].score
+                    ? JSON.parse(wordInfo[i].score).wScore
+                    : wordInfo[i].score,
                 });
               }
             }
@@ -3828,11 +3901,16 @@ export default {
   /* overflow: auto; */
 }
 
-.a_add_box {
+.a_add_box,
+.isAddBox {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
 }
 
+.isAddBox {
+  border: none;
+}
+
 .a_add_head {
   display: flex;
   align-items: center;
@@ -4035,7 +4113,9 @@ export default {
 
 .left_top {
   width: 45%;
-  padding: 0 0 20px 20px;
+  margin: 0 0 0 20px;
+  padding: 10px 0 10px 0;
+  border-bottom: 2px solid #eee;
 }
 
 .right_top {
@@ -4264,13 +4344,13 @@ export default {
 
 .answerbox1 {
   display: flex;
-  flex-direction: column;
-  align-items: flex-start;
+  flex-direction: row;
+  align-items: center;
   flex-wrap: nowrap;
 }
 
 .answerbox1 > div:nth-child(2) {
-  margin-top: 10px;
+  margin-left: 10px;
   width: 265px;
   max-height: 147px;
   overflow: auto;

+ 138 - 68
src/components/pages/components/worksDetail3.vue

@@ -127,10 +127,16 @@
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      "
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      }}
                     </div>
                     <div
                       class="bigImg"
@@ -185,10 +191,23 @@
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].answerInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].answerInfo[0].score }}
+                    </div>
+                    <div
+                      class="a_add_title"
+                      style="
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: flex-start;
+                        flex-wrap: wrap;
+                        margin-bottom: 10px;
+                      "
+                    >
+                      <div style="font-size: 16px">问答工具</div>
                     </div>
                     <div class="answerbox">
                       <div style="min-width: 80px">问答标题</div>
@@ -217,10 +236,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].askInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].askInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -255,7 +274,11 @@
                       <div class="a_addBox">
                         <div style="font-size: 16px; color: #c7c7c7">内容</div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .askInfo[0].askInfo.askJson.askCount"
                           :key="index1"
@@ -336,10 +359,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].chooseInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].chooseInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -358,7 +381,11 @@
                           题目内容
                         </div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .chooseInfo[0].chooseInfo.testCount"
                           :key="index1"
@@ -485,10 +512,10 @@
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wpptInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wpptInfo[0].score }}
                     </div>
                     <div
                       style="height: 238px"
@@ -530,10 +557,10 @@
                   >
                     <div style="width: 100%">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].pjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].pjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -602,10 +629,10 @@
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].xztkInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].xztkInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -718,10 +745,10 @@
                   >
                     <div class="sentenBox">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].lccjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].lccjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -736,8 +763,7 @@
                         <div style="font-size: 16px">连词成句工具</div>
                       </div>
                       <div
-                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo
-                          .lccjInfo"
+                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo"
                         :key="stIndex"
                         style="padding-bottom: 20px"
                       >
@@ -745,10 +771,13 @@
                           第{{ stIndex + 1 }}题
                         </div>
                         <div class="isWrong">
-                          <div class="cardList1" v-if="st.chooseSenList">
+                          <div
+                            class="cardList1"
+                            v-if="st.lccjInfo.chooseSenList"
+                          >
                             <div class="cardBox">
                               <div
-                                v-for="(s, sIndex) in st.chooseSenList"
+                                v-for="(s, sIndex) in st.lccjInfo.chooseSenList"
                                 :key="sIndex"
                               >
                                 <el-tooltip
@@ -764,14 +793,16 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.chooseSenList.join(" ") }}
+                              组成句子:{{
+                                st.lccjInfo.chooseSenList.join(" ")
+                              }}
                             </div>
                           </div>
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() ==
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() ==
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -785,8 +816,8 @@
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() !=
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() !=
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -800,8 +831,8 @@
                         </div>
                         <div
                           v-if="
-                            st.chooseSenList.toString() !=
-                            st.rightAnswer.toString()
+                            st.lccjInfo.chooseSenList.toString() !=
+                            st.lccjInfo.rightAnswer.toString()
                           "
                         >
                           <div style="padding: 15px 0 10px 20px">
@@ -809,7 +840,7 @@
                           </div>
                           <div
                             class="cardList"
-                            v-if="st.rightAnswer"
+                            v-if="st.lccjInfo.rightAnswer"
                             style="
                               border: none;
                               padding: 10px 0 10px 10px;
@@ -818,7 +849,7 @@
                           >
                             <div class="cardBox">
                               <div
-                                v-for="(r, rIndex) in st.rightAnswer"
+                                v-for="(r, rIndex) in st.lccjInfo.rightAnswer"
                                 :key="rIndex"
                               >
                                 <el-tooltip
@@ -834,7 +865,7 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.rightAnswer.join(" ") }}
+                              组成句子:{{ st.lccjInfo.rightAnswer.join(" ") }}
                             </div>
                           </div>
                         </div>
@@ -849,10 +880,10 @@
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].bgInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].bgInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -882,10 +913,10 @@
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].cocopiInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].cocopiInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -952,10 +983,10 @@
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wordInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wordInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -1594,7 +1625,9 @@ export default {
                 workJson[k].img.push({
                   src: worksDetail[i].content,
                   id: i,
-                  score: worksDetail[i].score,
+                  score: worksDetail[i].score
+                    ? JSON.parse(worksDetail[i].score).wScore
+                    : worksDetail[i].score,
                 });
               }
             }
@@ -1616,7 +1649,9 @@ export default {
                 a.radio = e;
                 workJson[k].askInfo.push({
                   askInfo: a,
-                  score: askInfo[i].score,
+                  score: askInfo[i].score
+                    ? JSON.parse(askInfo[i].score).wScore
+                    : askInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1712,7 +1747,9 @@ export default {
                 t.radio = e;
                 workJson[k].chooseInfo.push({
                   chooseInfo: t,
-                  score: chooseInfo[i].score,
+                  score: chooseInfo[i].score
+                    ? JSON.parse(chooseInfo[i].score).wScore
+                    : chooseInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1810,7 +1847,9 @@ export default {
                     pptInfo[i].content;
                   workJson[k].wpptInfo.push({
                     wpptInfo: a,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = false;
                 } else if (
@@ -1822,7 +1861,9 @@ export default {
                 ) {
                   workJson[k].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = true;
                 }
@@ -1837,7 +1878,9 @@ export default {
                 const element = answerInfo[i];
                 workJson[k].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score,
+                  score: answerInfo[i].score
+                    ? JSON.parse(answerInfo[i].score).wScore
+                    : answerInfo[i].score,
                 });
               }
             }
@@ -1860,7 +1903,9 @@ export default {
                 workJson[k].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
-                  score: pjInfo[i].score,
+                  score: pjInfo[i].score
+                    ? JSON.parse(pjInfo[i].score).wScore
+                    : pjInfo[i].score,
                 });
               }
             }
@@ -1885,7 +1930,9 @@ export default {
                   workJson[k].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
-                    score: xztkInfo[i].score,
+                    score: xztkInfo[i].score
+                      ? JSON.parse(xztkInfo[i].score).wScore
+                      : xztkInfo[i].score,
                   });
                 }
               }
@@ -1899,9 +1946,10 @@ export default {
                 var lccj = lccjInfo[i];
                 workJson[k].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score,
+                  score: lccjInfo[i].score
+                    ? JSON.parse(lccjInfo[i].score).wScore
+                    : lccjInfo[i].score,
                 });
-                workJson[k].lccjInfo[i].score = lccjInfo[i].score;
               }
             }
 
@@ -1913,7 +1961,9 @@ export default {
                 var bg = bgInfo[i];
                 workJson[k].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score,
+                  score: bgInfo[i].score
+                    ? JSON.parse(bgInfo[i].score).wScore
+                    : bgInfo[i].score,
                 });
               }
             }
@@ -1951,7 +2001,9 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 } else if (
                   c.indexOf(
@@ -1967,14 +2019,24 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: a,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
-                } else {
+                } else if (
+                  cocopi.content
+                    .split(".")
+                    [
+                      cocopi.content.split(".").length - 1
+                    ].toLocaleUpperCase() == "PDF"
+                ) {
                   t = 3;
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 }
               }
@@ -1988,7 +2050,9 @@ export default {
                 var word = wordInfo[i];
                 workJson[k].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score,
+                  score: wordInfo[i].score
+                    ? JSON.parse(wordInfo[i].score).wScore
+                    : wordInfo[i].score,
                 });
               }
             }
@@ -3365,11 +3429,16 @@ export default {
   /* overflow: auto; */
 }
 
-.a_add_box {
+.a_add_box,
+.isAddBox {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
 }
 
+.isAddBox {
+  border: none;
+}
+
 .a_add_head {
   display: flex;
   align-items: center;
@@ -3571,7 +3640,9 @@ export default {
 
 .left_top {
   width: 45%;
-  padding-left: 20px;
+  margin: 0 0 0 20px;
+  padding: 10px 0 10px 0;
+  border-bottom: 2px solid #eee;
 }
 
 .right_top {
@@ -3801,7 +3872,6 @@ export default {
   flex-direction: column;
   align-items: flex-start;
   flex-wrap: nowrap;
-  font-size: 16px;
 }
 
 .answerbox1 > div:nth-child(2) {

+ 138 - 68
src/components/pages/myReport/components/MyLookComponent/worksDetail3.vue

@@ -127,10 +127,16 @@
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      "
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{
+                        worksDetail[sIndex].img[worksDetail[sIndex].imgIndex]
+                          .score
+                      }}
                     </div>
                     <div
                       class="bigImg"
@@ -185,10 +191,23 @@
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].answerInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].answerInfo[0].score }}
+                    </div>
+                    <div
+                      class="a_add_title"
+                      style="
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: flex-start;
+                        flex-wrap: wrap;
+                        margin-bottom: 10px;
+                      "
+                    >
+                      <div style="font-size: 16px">问答工具</div>
                     </div>
                     <div class="answerbox">
                       <div style="min-width: 80px">问答标题</div>
@@ -217,10 +236,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].askInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].askInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -255,7 +274,11 @@
                       <div class="a_addBox">
                         <div style="font-size: 16px; color: #c7c7c7">内容</div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .askInfo[0].askInfo.askJson.askCount"
                           :key="index1"
@@ -336,10 +359,10 @@
                   >
                     <div>
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].chooseInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].chooseInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -358,7 +381,11 @@
                           题目内容
                         </div>
                         <div
-                          class="a_add_box"
+                          :class="
+                            worksDetail[sIndex].askInfo.length > 1
+                              ? 'a_add_box'
+                              : 'isAddBox'
+                          "
                           v-for="(item1, index1) in worksDetail[sIndex]
                             .chooseInfo[0].chooseInfo.testCount"
                           :key="index1"
@@ -485,10 +512,10 @@
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wpptInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wpptInfo[0].score }}
                     </div>
                     <div
                       style="height: 238px"
@@ -530,10 +557,10 @@
                   >
                     <div style="width: 100%">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].pjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].pjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -602,10 +629,10 @@
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].xztkInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].xztkInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -718,10 +745,10 @@
                   >
                     <div class="sentenBox">
                       <div
-                        v-if="worksDetail[sIndex].img.score"
-                        style="float: right"
+                        v-if="worksDetail[sIndex].lccjInfo[0].score"
+                        style="float: right; margin-right: 10px"
                       >
-                        评分:{{ worksDetail[sIndex].img.score }}
+                        评分:{{ worksDetail[sIndex].lccjInfo[0].score }}
                       </div>
                       <div
                         class="a_add_title"
@@ -736,8 +763,7 @@
                         <div style="font-size: 16px">连词成句工具</div>
                       </div>
                       <div
-                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo
-                          .lccjInfo"
+                        v-for="(st, stIndex) in worksDetail[sIndex].lccjInfo"
                         :key="stIndex"
                         style="padding-bottom: 20px"
                       >
@@ -745,10 +771,13 @@
                           第{{ stIndex + 1 }}题
                         </div>
                         <div class="isWrong">
-                          <div class="cardList1" v-if="st.chooseSenList">
+                          <div
+                            class="cardList1"
+                            v-if="st.lccjInfo.chooseSenList"
+                          >
                             <div class="cardBox">
                               <div
-                                v-for="(s, sIndex) in st.chooseSenList"
+                                v-for="(s, sIndex) in st.lccjInfo.chooseSenList"
                                 :key="sIndex"
                               >
                                 <el-tooltip
@@ -764,14 +793,16 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.chooseSenList.join(" ") }}
+                              组成句子:{{
+                                st.lccjInfo.chooseSenList.join(" ")
+                              }}
                             </div>
                           </div>
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() ==
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() ==
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -785,8 +816,8 @@
                           <div
                             class="answerRight isTj"
                             v-if="
-                              st.chooseSenList.toString() !=
-                              st.rightAnswer.toString()
+                              st.lccjInfo.chooseSenList.toString() !=
+                              st.lccjInfo.rightAnswer.toString()
                             "
                           >
                             <div class="isTjImg">
@@ -800,8 +831,8 @@
                         </div>
                         <div
                           v-if="
-                            st.chooseSenList.toString() !=
-                            st.rightAnswer.toString()
+                            st.lccjInfo.chooseSenList.toString() !=
+                            st.lccjInfo.rightAnswer.toString()
                           "
                         >
                           <div style="padding: 15px 0 10px 20px">
@@ -809,7 +840,7 @@
                           </div>
                           <div
                             class="cardList"
-                            v-if="st.rightAnswer"
+                            v-if="st.lccjInfo.rightAnswer"
                             style="
                               border: none;
                               padding: 10px 0 10px 10px;
@@ -818,7 +849,7 @@
                           >
                             <div class="cardBox">
                               <div
-                                v-for="(r, rIndex) in st.rightAnswer"
+                                v-for="(r, rIndex) in st.lccjInfo.rightAnswer"
                                 :key="rIndex"
                               >
                                 <el-tooltip
@@ -834,7 +865,7 @@
                               </div>
                             </div>
                             <div class="cardAnswerBox">
-                              组成句子:{{ st.rightAnswer.join(" ") }}
+                              组成句子:{{ st.lccjInfo.rightAnswer.join(" ") }}
                             </div>
                           </div>
                         </div>
@@ -849,10 +880,10 @@
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].bgInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].bgInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -882,10 +913,10 @@
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].cocopiInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].cocopiInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -952,10 +983,10 @@
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
-                      v-if="worksDetail[sIndex].img.score"
-                      style="float: right"
+                      v-if="worksDetail[sIndex].wordInfo[0].score"
+                      style="float: right; margin-right: 10px"
                     >
-                      评分:{{ worksDetail[sIndex].img.score }}
+                      评分:{{ worksDetail[sIndex].wordInfo[0].score }}
                     </div>
                     <div
                       class="a_add_title"
@@ -1593,7 +1624,9 @@ export default {
                 workJson[k].img.push({
                   src: worksDetail[i].content,
                   id: i,
-                  score: worksDetail[i].score,
+                  score: worksDetail[i].score
+                    ? JSON.parse(worksDetail[i].score).wScore
+                    : worksDetail[i].score,
                 });
               }
             }
@@ -1615,7 +1648,9 @@ export default {
                 a.radio = e;
                 workJson[k].askInfo.push({
                   askInfo: a,
-                  score: askInfo[i].score,
+                  score: askInfo[i].score
+                    ? JSON.parse(askInfo[i].score).wScore
+                    : askInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1711,7 +1746,9 @@ export default {
                 t.radio = e;
                 workJson[k].chooseInfo.push({
                   chooseInfo: t,
-                  score: chooseInfo[i].score,
+                  score: chooseInfo[i].score
+                    ? JSON.parse(chooseInfo[i].score).wScore
+                    : chooseInfo[i].score,
                 });
                 this.checkJson[k].allRight = 0;
                 var isCount = 0;
@@ -1809,7 +1846,9 @@ export default {
                     pptInfo[i].content;
                   workJson[k].wpptInfo.push({
                     wpptInfo: a,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = false;
                 } else if (
@@ -1821,7 +1860,9 @@ export default {
                 ) {
                   workJson[k].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
-                    score: pptInfo[i].score,
+                    score: pptInfo[i].score
+                      ? JSON.parse(pptInfo[i].score).wScore
+                      : pptInfo[i].score,
                   });
                   this.showPDF = true;
                 }
@@ -1836,7 +1877,9 @@ export default {
                 const element = answerInfo[i];
                 workJson[k].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
-                  score: answerInfo[i].score,
+                  score: answerInfo[i].score
+                    ? JSON.parse(answerInfo[i].score).wScore
+                    : answerInfo[i].score,
                 });
               }
             }
@@ -1859,7 +1902,9 @@ export default {
                 workJson[k].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
-                  score: pjInfo[i].score,
+                  score: pjInfo[i].score
+                    ? JSON.parse(pjInfo[i].score).wScore
+                    : pjInfo[i].score,
                 });
               }
             }
@@ -1884,7 +1929,9 @@ export default {
                   workJson[k].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
-                    score: xztkInfo[i].score,
+                    score: xztkInfo[i].score
+                      ? JSON.parse(xztkInfo[i].score).wScore
+                      : xztkInfo[i].score,
                   });
                 }
               }
@@ -1898,9 +1945,10 @@ export default {
                 var lccj = lccjInfo[i];
                 workJson[k].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
-                  score: lccjInfo[i].score,
+                  score: lccjInfo[i].score
+                    ? JSON.parse(lccjInfo[i].score).wScore
+                    : lccjInfo[i].score,
                 });
-                workJson[k].lccjInfo[i].score = lccjInfo[i].score;
               }
             }
 
@@ -1912,7 +1960,9 @@ export default {
                 var bg = bgInfo[i];
                 workJson[k].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
-                  score: bgInfo[i].score,
+                  score: bgInfo[i].score
+                    ? JSON.parse(bgInfo[i].score).wScore
+                    : bgInfo[i].score,
                 });
               }
             }
@@ -1950,7 +2000,9 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 } else if (
                   c.indexOf(
@@ -1966,14 +2018,24 @@ export default {
                   workJson[k].cocopiInfo.push({
                     url: a,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
-                } else {
+                } else if (
+                  cocopi.content
+                    .split(".")
+                    [
+                      cocopi.content.split(".").length - 1
+                    ].toLocaleUpperCase() == "PDF"
+                ) {
                   t = 3;
                   workJson[k].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
-                    score: cocopiInfo[i].score,
+                    score: cocopiInfo[i].score
+                      ? JSON.parse(cocopiInfo[i].score).wScore
+                      : cocopiInfo[i].score,
                   });
                 }
               }
@@ -1987,7 +2049,9 @@ export default {
                 var word = wordInfo[i];
                 workJson[k].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
-                  score: wordInfo[i].score,
+                  score: wordInfo[i].score
+                    ? JSON.parse(wordInfo[i].score).wScore
+                    : wordInfo[i].score,
                 });
               }
             }
@@ -3364,11 +3428,16 @@ export default {
   /* overflow: auto; */
 }
 
-.a_add_box {
+.a_add_box,
+.isAddBox {
   border-bottom: 2px solid #eee;
   padding-bottom: 10px;
 }
 
+.isAddBox {
+  border: none;
+}
+
 .a_add_head {
   display: flex;
   align-items: center;
@@ -3570,7 +3639,9 @@ export default {
 
 .left_top {
   width: 45%;
-  padding-left: 20px;
+  margin: 0 0 0 20px;
+  padding: 10px 0 10px 0;
+  border-bottom: 2px solid #eee;
 }
 
 .right_top {
@@ -3800,7 +3871,6 @@ export default {
   flex-direction: column;
   align-items: flex-start;
   flex-wrap: nowrap;
-  font-size: 16px;
 }
 
 .answerbox1 > div:nth-child(2) {