Ver Fonte

修改样式及功能

zengyicheng há 1 ano atrás
pai
commit
2c31e764d4

+ 1 - 1
src/components/pages/components/classReport.vue

@@ -17,7 +17,7 @@
         <div class="searchImg">
           <img src="../../../assets/icon/search.png" alt="" />
         </div>
-        <el-input v-model="sName" placeholder="请输入学生姓名或账号"></el-input>
+        <el-input v-model="sName" placeholder="请输入课程名称"></el-input>
         <el-button size="mini" type="primary" @click="searchStudent"
           >查询</el-button
         >

+ 311 - 43
src/components/pages/components/classStudentComponents/worksDetail3.vue

@@ -115,15 +115,9 @@
               <div class="contentBox">
                 <div
                   class="contentAuto"
-                  :style="{
-                    width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                  }"
                 >
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
@@ -185,9 +179,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
@@ -229,9 +220,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].askInfo.length > 0"
                   >
                     <div>
@@ -352,9 +340,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: '95%',
-                    }"
                     v-if="worksDetail[sIndex].chooseInfo.length > 0"
                   >
                     <div>
@@ -506,9 +491,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
@@ -550,9 +532,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].pjInfo.length > 0"
                   >
                     <div style="width: 100%">
@@ -623,9 +602,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
@@ -659,7 +635,7 @@
                         />
                       </div>
                       <div class="rightWidthCss">
-                        <div style="padding-top: 15px; width: 50%">
+                        <div style="padding-top: 15px;">
                           <div
                             class="select_box2_answer_box"
                             v-for="(item2, checkIndex) in worksDetail[sIndex]
@@ -738,9 +714,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].lccjInfo.length > 0"
                   >
                     <div class="sentenBox">
@@ -874,9 +847,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
@@ -907,9 +877,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
@@ -977,9 +944,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
@@ -1009,7 +973,7 @@
                     </el-form>
                   </div>
                 </div>
-                <div
+                <!-- <div
                   class="right_top"
                   v-show="
                     worksDetail[sIndex].eList.length &&
@@ -1036,7 +1000,7 @@
                       ></div>
                     </div>
                   </div>
-                </div>
+                </div> -->
               </div>
             </div>
             <div class="right_score" :class="{ rightScoreFullBox: full }">
@@ -2321,9 +2285,9 @@ export default {
           console.error(err);
         });
     },
-    fullTools() {
-      this.full = !this.full;
-    },
+    // fullTools() {
+    //   this.full = !this.full;
+    // },
     getCourseDetail() {
       let params = {
         cid: this.cid,
@@ -3635,7 +3599,7 @@ export default {
 }
 
 .left_top {
-  width: 45%;
+  width: 95%;
   margin: 0 0 0 20px;
   padding: 10px 0 10px 0;
   border-bottom: 2px solid #eee;
@@ -3993,7 +3957,311 @@ export default {
   padding: 10px 12px;
 }
 .contentAuto {
+  width: 100%;
   height: 253px;
   overflow: auto;
 }
+.evalCss {
+  background: #fff;
+  font-size: 18px;
+}
+
+.middleBox {
+  padding: 20px 0 15px 0;
+}
+
+.pfBox {
+  padding-bottom: 30px;
+}
+
+.nameAndrate {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  padding-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+}
+
+.nameAndrate > div {
+  margin-left: 10px;
+  color: #000;
+  height: 30px;
+}
+
+.nameAndrate >>> .el-rate__icon {
+  font-size: 28px !important;
+}
+
+.pfBox > div:nth-child(2) {
+  background: #f7f6f9;
+  min-height: 45px;
+  border-radius: 10px;
+  font-size: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.bz {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+  width: 100%;
+}
+
+.bz > div {
+  padding: 0 10px;
+}
+.pj {
+  font: inherit;
+  color: currentColor;
+  width: 100%;
+  margin: 0;
+  padding: 15px 14px;
+  display: block;
+  min-width: 0;
+  outline: none;
+  box-sizing: content-box;
+  background: none;
+  -webkit-tap-highlight-color: transparent;
+  border: 1px solid rgba(0, 0, 0, 0.23);
+  border-radius: 4px;
+  box-sizing: border-box;
+  resize: none;
+}
+.select_box2_box {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.select_box2_img {
+  width: 70%;
+  height: 100%;
+  overflow: auto;
+  background: #fff;
+  border-radius: 5px;
+  margin-top: 10px;
+}
+
+.select_box2_img img {
+  width: 100%;
+}
+
+.select_box2_answer_box {
+  margin: 0 0 10px 20px;
+  width: 85%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.select_box2_answer_box >>> .el-input.is-disabled .el-input__inner {
+  color: #000;
+}
+.rightWidthCss {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.rightAnswer {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  color: red;
+  margin-bottom: 31px;
+}
+
+.rightAnswerCss {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  padding-top: 30px;
+}
+
+.blueCss {
+  color: #767de1;
+  margin-left: 10px;
+}
+
+.redCss {
+  color: red;
+}
+.sentenBox {
+  background: #fff;
+  /* background-image: url("../../../assets/icon/conSentences/stuBg.png"); */
+  /* background-position: 102%; */
+  /* background-repeat: no-repeat; */
+  /* background-size: 60%; */
+}
+.isWrong {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  align-items: center;
+}
+.cardList,
+.cardList1 {
+  padding: 10px 0 10px 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom: 1px solid #f4f4f4;
+  width: 98%;
+  margin: 0 auto;
+  min-width: 60%;
+  max-width: 85%;
+}
+
+.cardList1 {
+  padding: 10px 0 10px 10px !important;
+  margin: 0 !important;
+}
+.cardBox {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+}
+
+.cardBox > div {
+  margin-bottom: 10px;
+}
+
+.isCard,
+.isCard1 {
+  width: 130px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 20px;
+  cursor: pointer;
+  background-image: url("../../../../assets/icon/conSentences/titleBorder.png");
+  background-size: cover;
+  transition: all 2s;
+  margin-right: 20px;
+}
+
+.isCard > div,
+.isCard1 > div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 75%;
+  margin: 0 auto;
+  font-size: 16px;
+}
+.cardAnswerBox {
+  font-size: 16px;
+  width: 97%;
+  border: 5px;
+  padding: 0;
+  border-radius: 5px;
+  margin: 10px auto;
+  word-break: break-word;
+}
+.answerRight {
+  width: 25%;
+}
+
+.isTj {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  min-width: 100px;
+}
+
+.isTj > div:nth-child(2) {
+  color: #727070;
+  margin-left: 5px;
+}
+
+.isTjImg {
+  width: 20px;
+  height: 20px;
+}
+
+.isTjImg > img {
+  width: 100%;
+  height: 100%;
+}
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding: 15px 5px;
+  max-width: 0px;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+.workImg {
+  width: 90%;
+  /* height: calc(100% - 40px); */
+  height: 105px;
+  position: relative;
+}
+
+.workImg > img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  cursor: pointer;
+}
 </style>

+ 1 - 1
src/components/pages/components/courseReport.vue

@@ -215,7 +215,7 @@ export default {
   height: 25px;
   position: absolute;
   z-index: 9;
-  top: 15px;
+  top: 8px;
   left: 5px;
 }
 .searchImg > img {

+ 1 - 1
src/components/pages/components/evaReport.vue

@@ -338,7 +338,7 @@ export default {
   height: 25px;
   position: absolute;
   z-index: 9;
-  top: 15px;
+  top: 8px;
   left: 5px;
 }
 .searchImg > img {

+ 319 - 67
src/components/pages/components/studentWorksDetail.vue

@@ -200,14 +200,14 @@
         >
           <div slot="title" class="header-title">
             <div style="color: #fff">查看作业</div>
-            <div style="position: absolute; top: 14px; right: 50px">
+            <!-- <div style="position: absolute; top: 14px; right: 50px">
               <img
                 src="../../../assets/full.png"
                 style="height: 14px; cursor: pointer"
                 alt=""
                 @click="fullTools"
               />
-            </div>
+            </div> -->
           </div>
           <div class="zyBoxC">
             <div class="courseTitle" v-if="allWorks.course">
@@ -345,19 +345,9 @@
                     <div class="contentBox">
                       <div
                         class="contentAuto"
-                        :style="{
-                          width: worksDetail[sIndex].eList.length
-                            ? '45%'
-                            : '95%',
-                        }"
                       >
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].img.length > 0"
                         >
                           <div
@@ -424,11 +414,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].answerInfo.length > 0"
                         >
                           <div
@@ -471,11 +456,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].askInfo.length > 0"
                         >
                           <div>
@@ -599,9 +579,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: '95%',
-                          }"
                           v-if="worksDetail[sIndex].chooseInfo.length > 0"
                         >
                           <div>
@@ -764,11 +741,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '45%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].wpptInfo.length > 0"
                         >
                           <div
@@ -812,11 +784,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].pjInfo.length > 0"
                         >
                           <div style="width: 100%">
@@ -889,11 +856,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].xztkInfo.length > 0"
                         >
                           <div
@@ -930,7 +892,7 @@
                               />
                             </div>
                             <div class="rightWidthCss">
-                              <div style="padding-top: 15px; width: 50%">
+                              <div style="padding-top: 15px;">
                                 <div
                                   class="select_box2_answer_box"
                                   v-for="(item2, checkIndex) in worksDetail[
@@ -1010,11 +972,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].lccjInfo.length > 0"
                         >
                           <div class="sentenBox">
@@ -1158,11 +1115,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].bgInfo.length > 0"
                         >
                           <div
@@ -1193,11 +1145,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                         >
                           <div
@@ -1270,11 +1217,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].wordInfo.length > 0"
                         >
                           <div
@@ -1306,7 +1248,7 @@
                           </el-form>
                         </div>
                       </div>
-                      <div
+                      <!-- <div
                         class="right_top"
                         v-show="
                           worksDetail[sIndex].eList.length &&
@@ -1337,7 +1279,7 @@
                             ></div>
                           </div>
                         </div>
-                      </div>
+                      </div> -->
                     </div>
                   </div>
                   <div class="right_score" :class="{ rightScoreFullBox: full }">
@@ -2870,9 +2812,9 @@ export default {
       this.page = 1;
       this.getWorks();
     },
-    fullTools() {
-      this.full = !this.full;
-    },
+    // fullTools() {
+    //   this.full = !this.full;
+    // },
     //获取作业
     getWorks() {
       this.isLoading = true;
@@ -4035,8 +3977,317 @@ export default {
   height: 253px;
 }
 
+.contentAuto {
+  width: 100%;
+  height: 253px;
+  overflow: auto;
+}
+.evalCss {
+  background: #fff;
+  font-size: 18px;
+}
+
+.middleBox {
+  padding: 20px 0 15px 0;
+}
+
+.pfBox {
+  padding-bottom: 30px;
+}
+
+.nameAndrate {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  padding-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+}
+
+.nameAndrate > div {
+  margin-left: 10px;
+  color: #000;
+  height: 30px;
+}
+
+.nameAndrate >>> .el-rate__icon {
+  font-size: 28px !important;
+}
+
+.pfBox > div:nth-child(2) {
+  background: #f7f6f9;
+  min-height: 45px;
+  border-radius: 10px;
+  font-size: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.bz {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+  width: 100%;
+}
+
+.bz > div {
+  padding: 0 10px;
+}
+.pj {
+  font: inherit;
+  color: currentColor;
+  width: 100%;
+  margin: 0;
+  padding: 15px 14px;
+  display: block;
+  min-width: 0;
+  outline: none;
+  box-sizing: content-box;
+  background: none;
+  -webkit-tap-highlight-color: transparent;
+  border: 1px solid rgba(0, 0, 0, 0.23);
+  border-radius: 4px;
+  box-sizing: border-box;
+  resize: none;
+}
+.select_box2_box {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.select_box2_img {
+  width: 70%;
+  height: 100%;
+  overflow: auto;
+  background: #fff;
+  border-radius: 5px;
+  margin-top: 10px;
+}
+
+.select_box2_img img {
+  width: 100%;
+}
+
+.select_box2_answer_box {
+  margin: 0 0 10px 20px;
+  width: 85%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.select_box2_answer_box >>> .el-input.is-disabled .el-input__inner {
+  color: #000;
+}
+.rightWidthCss {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.rightAnswer {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  color: red;
+  margin-bottom: 31px;
+}
+
+.rightAnswerCss {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  padding-top: 30px;
+}
+
+.blueCss {
+  color: #767de1;
+  margin-left: 10px;
+}
+
+.redCss {
+  color: red;
+}
+.sentenBox {
+  background: #fff;
+  /* background-image: url("../../../assets/icon/conSentences/stuBg.png"); */
+  /* background-position: 102%; */
+  /* background-repeat: no-repeat; */
+  /* background-size: 60%; */
+}
+.isWrong {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  align-items: center;
+}
+.cardList,
+.cardList1 {
+  padding: 10px 0 10px 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom: 1px solid #f4f4f4;
+  width: 98%;
+  margin: 0 auto;
+  min-width: 60%;
+  max-width: 85%;
+}
+
+.cardList1 {
+  padding: 10px 0 10px 10px !important;
+  margin: 0 !important;
+}
+.cardBox {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+}
+
+.cardBox > div {
+  margin-bottom: 10px;
+}
+
+.isCard,
+.isCard1 {
+  width: 130px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 20px;
+  cursor: pointer;
+  background-image: url("../../../assets/icon/conSentences/titleBorder.png");
+  background-size: cover;
+  transition: all 2s;
+  margin-right: 20px;
+}
+
+.isCard > div,
+.isCard1 > div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 75%;
+  margin: 0 auto;
+  font-size: 16px;
+}
+.cardAnswerBox {
+  font-size: 16px;
+  width: 97%;
+  border: 5px;
+  padding: 0;
+  border-radius: 5px;
+  margin: 10px auto;
+  word-break: break-word;
+}
+.answerRight {
+  width: 25%;
+}
+
+.isTj {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  min-width: 100px;
+}
+
+.isTj > div:nth-child(2) {
+  color: #727070;
+  margin-left: 5px;
+}
+
+.isTjImg {
+  width: 20px;
+  height: 20px;
+}
+
+.isTjImg > img {
+  width: 100%;
+  height: 100%;
+}
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding: 15px 5px;
+  max-width: 0px;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+.workImg {
+  width: 90%;
+  /* height: calc(100% - 40px); */
+  height: 105px;
+  position: relative;
+}
+
+.workImg > img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  cursor: pointer;
+}
+
 .left_top {
-  width: 45%;
+  width: 95%;
   margin: 0 0 0 20px;
   padding: 10px 0 10px 0;
   border-bottom: 2px solid #eee;
@@ -4444,4 +4695,5 @@ export default {
   padding: 20px;
   box-sizing: border-box;
 }
+
 </style>

+ 105 - 139
src/components/pages/components/worksDetail2.vue

@@ -201,14 +201,14 @@
         >
           <div slot="title" class="header-title">
             <div style="color: #fff">查看作业</div>
-            <div style="position: absolute; top: 14px; right: 50px">
+            <!-- <div style="position: absolute; top: 14px; right: 50px">
               <img
                 src="../../../assets/full.png"
                 style="height: 14px; cursor: pointer"
                 alt=""
                 @click="fullTools"
               />
-            </div>
+            </div> -->
           </div>
           <div class="zyBoxC">
             <div class="courseTitle" v-if="allWorks.course">
@@ -344,21 +344,14 @@
                       </div>
                     </div>
                     <div class="contentBox">
-                      <div
-                        class="contentAuto"
-                        :style="{
-                          width: worksDetail[sIndex].eList.length
-                            ? '45%'
-                            : '95%',
-                        }"
-                      >
-                        <div
-                          class="left_top"
-                          :style="{
+                      <div class="contentAuto">
+                        <!-- :style="{
                             width: worksDetail[sIndex].eList.length
                               ? '95%'
                               : '95%',
-                          }"
+                          }" -->
+                        <div
+                          class="left_top"
                           v-if="worksDetail[sIndex].img.length > 0"
                         >
                           <div
@@ -425,11 +418,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].answerInfo.length > 0"
                         >
                           <div
@@ -472,11 +460,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].askInfo.length > 0"
                         >
                           <div>
@@ -600,9 +583,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: '95%',
-                          }"
                           v-if="worksDetail[sIndex].chooseInfo.length > 0"
                         >
                           <div>
@@ -765,11 +745,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '45%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].wpptInfo.length > 0"
                         >
                           <div
@@ -813,11 +788,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].pjInfo.length > 0"
                         >
                           <div style="width: 100%">
@@ -890,11 +860,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].xztkInfo.length > 0"
                         >
                           <div
@@ -931,7 +896,7 @@
                               />
                             </div>
                             <div class="rightWidthCss">
-                              <div style="padding-top: 15px; width: 50%">
+                              <div style="padding-top: 15px">
                                 <div
                                   class="select_box2_answer_box"
                                   v-for="(item2, checkIndex) in worksDetail[
@@ -1011,11 +976,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].lccjInfo.length > 0"
                         >
                           <div class="sentenBox">
@@ -1046,7 +1006,7 @@
                               <div
                                 style="
                                   padding: 15px 0 10px 20px;
-                                  font-size: 20px;
+                                  font-size: 18px;
                                 "
                               >
                                 第{{ stIndex + 1 }}题
@@ -1159,11 +1119,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].bgInfo.length > 0"
                         >
                           <div
@@ -1194,11 +1149,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                         >
                           <div
@@ -1271,11 +1221,6 @@
                         </div>
                         <div
                           class="left_top"
-                          :style="{
-                            width: worksDetail[sIndex].eList.length
-                              ? '95%'
-                              : '95%',
-                          }"
                           v-if="worksDetail[sIndex].wordInfo.length > 0"
                         >
                           <div
@@ -1307,7 +1252,7 @@
                           </el-form>
                         </div>
                       </div>
-                      <div
+                      <!-- <div
                         class="right_top"
                         v-show="
                           worksDetail[sIndex].eList.length &&
@@ -1338,7 +1283,7 @@
                             ></div>
                           </div>
                         </div>
-                      </div>
+                      </div> -->
                     </div>
                   </div>
                   <div class="right_score" :class="{ rightScoreFullBox: full }">
@@ -1955,7 +1900,7 @@ export default {
           var cocopiInfo = res.data[11]; //cocopi或源码编辑作业
           var wordInfo = res.data[12]; //文档作业
           var workEvaList = res.data[13];
-          var workJson = [];
+          var workJson = {};
 
           for (var k = 0; k < res.data[0].length; k++) {
             this.allWorks = res.data[0][k];
@@ -1990,37 +1935,40 @@ export default {
             ) {
               continue;
             }
-            workJson.push({
-              img: [],
-              imgIndex: 0,
-              eList: [],
-              rateList: {},
-              askInfo: [],
-              answerInfo: [],
-              wpptInfo: [],
-              chooseInfo: [],
-              pjInfo: [],
-              xztkInfo: [],
-              lccjInfo: [],
-              bgInfo: [],
-              cocopiInfo: [],
-              wordInfo: [],
-              scopeId: res.data[0][k].id,
-              stagetask: "",
-              time: "",
-            });
+
             this.checkJson[k] = {};
 
-            workJson[k].time = res.data[0][k].time;
-            workJson[k].stagetask =
-              res.data[0][k].stage + "-" + res.data[0][k].task;
+            let stagetask = res.data[0][k].stage + "-" + res.data[0][k].task;
+            if (!workJson[stagetask]) {
+              workJson[stagetask] = {
+                img: [],
+                imgIndex: 0,
+                eList: [],
+                rateList: {},
+                askInfo: [],
+                answerInfo: [],
+                wpptInfo: [],
+                chooseInfo: [],
+                pjInfo: [],
+                xztkInfo: [],
+                lccjInfo: [],
+                bgInfo: [],
+                cocopiInfo: [],
+                wordInfo: [],
+                scopeId: res.data[0][k].id,
+                stagetask: "",
+                time: "",
+              };
+            }
 
+            workJson[stagetask].time = res.data[0][k].time;
             for (var i = 0; i < worksDetail.length; i++) {
               if (
                 res.data[0][k].stage == worksDetail[i].stage &&
-                res.data[0][k].task == worksDetail[i].task
+                res.data[0][k].task == worksDetail[i].task &&
+                res.data[0][k].tool == worksDetail[i].tool
               ) {
-                workJson[k].img.push({
+                workJson[stagetask].img.push({
                   src: worksDetail[i].content,
                   id: i,
                   score: worksDetail[i].score
@@ -2032,7 +1980,8 @@ export default {
             for (var i = 0; i < askInfo.length; i++) {
               if (
                 res.data[0][k].stage == askInfo[i].stage &&
-                res.data[0][k].task == askInfo[i].task
+                res.data[0][k].task == askInfo[i].task &&
+                res.data[0][k].tool == askInfo[i].tool
               ) {
                 const element = askInfo[i];
                 let a = JSON.parse(element.content)[0];
@@ -2045,7 +1994,7 @@ export default {
                   }
                 }
                 a.radio = e;
-                workJson[k].askInfo.push({
+                workJson[stagetask].askInfo.push({
                   askInfo: a,
                   score: askInfo[i].score
                     ? JSON.parse(askInfo[i].score).wScore
@@ -2069,7 +2018,7 @@ export default {
                   }
                   if (a.radio[p] instanceof Array) {
                     if (
-                      workJson[k].askInfo[0].askInfo.askJson[p].answer
+                      workJson[stagetask].askInfo[0].askInfo.askJson[p].answer
                         .sort()
                         .join(",") == a.radio[p].sort().join(",")
                     ) {
@@ -2097,8 +2046,8 @@ export default {
                     }
                   } else {
                     if (
-                      workJson[k].askInfo[0].askInfo.askJson[p].answer ==
-                      a.radio[p]
+                      workJson[stagetask].askInfo[0].askInfo.askJson[p]
+                        .answer == a.radio[p]
                     ) {
                       this.checkJson[k][p].right = 100;
                       isCount += this.checkJson[k][p].right;
@@ -2130,7 +2079,8 @@ export default {
             for (var i = 0; i < chooseInfo.length; i++) {
               if (
                 res.data[0][k].stage == chooseInfo[i].stage &&
-                res.data[0][k].task == chooseInfo[i].task
+                res.data[0][k].task == chooseInfo[i].task &&
+                res.data[0][k].tool == chooseInfo[i].tool
               ) {
                 const element1 = chooseInfo[i];
                 let t = JSON.parse(element1.content)[0].testJson;
@@ -2143,7 +2093,7 @@ export default {
                   }
                 }
                 t.radio = e;
-                workJson[k].chooseInfo.push({
+                workJson[stagetask].chooseInfo.push({
                   chooseInfo: t,
                   score: chooseInfo[i].score
                     ? JSON.parse(chooseInfo[i].score).wScore
@@ -2167,7 +2117,9 @@ export default {
                   }
                   if (t.radio[p] instanceof Array) {
                     if (
-                      workJson[k].chooseInfo[0].chooseInfo.testJson[p].answer
+                      workJson[stagetask].chooseInfo[0].chooseInfo.testJson[
+                        p
+                      ].answer
                         .sort()
                         .join(",") == t.radio[p].sort().join(",")
                     ) {
@@ -2195,8 +2147,8 @@ export default {
                     }
                   } else {
                     if (
-                      workJson[k].chooseInfo[0].chooseInfo.testJson[p].answer ==
-                      t.radio[p]
+                      workJson[stagetask].chooseInfo[0].chooseInfo.testJson[p]
+                        .answer == t.radio[p]
                     ) {
                       this.checkJson[k][p].right = 100;
                       isCount += this.checkJson[k][p].right;
@@ -2228,7 +2180,8 @@ export default {
             for (var i = 0; i < pptInfo.length; i++) {
               if (
                 res.data[0][k].stage == pptInfo[i].stage &&
-                res.data[0][k].task == pptInfo[i].task
+                res.data[0][k].task == pptInfo[i].task &&
+                res.data[0][k].tool == pptInfo[i].tool
               ) {
                 var a = ["PPT", "PPTX", "XLSX", "XLS", "DOC", "DOCX"];
                 if (
@@ -2243,7 +2196,7 @@ export default {
                   var a =
                     "https://view.officeapps.live.com/op/view.aspx?src=" +
                     pptInfo[i].content;
-                  workJson[k].wpptInfo.push({
+                  workJson[stagetask].wpptInfo.push({
                     wpptInfo: a,
                     score: pptInfo[i].score
                       ? JSON.parse(pptInfo[i].score).wScore
@@ -2257,7 +2210,7 @@ export default {
                       pptInfo[i].content.split(".").length - 1
                     ].toLocaleUpperCase() == "PDF"
                 ) {
-                  workJson[k].wpptInfo.push({
+                  workJson[stagetask].wpptInfo.push({
                     wpptInfo: pptInfo[i].content,
                     score: pptInfo[i].score
                       ? JSON.parse(pptInfo[i].score).wScore
@@ -2271,10 +2224,11 @@ export default {
             for (var i = 0; i < answerInfo.length; i++) {
               if (
                 res.data[0][k].stage == answerInfo[i].stage &&
-                res.data[0][k].task == answerInfo[i].task
+                res.data[0][k].task == answerInfo[i].task &&
+                res.data[0][k].tool == answerInfo[i].tool
               ) {
                 const element = answerInfo[i];
-                workJson[k].answerInfo.push({
+                workJson[stagetask].answerInfo.push({
                   answerInfo: JSON.parse(element.content)[0],
                   score: answerInfo[i].score
                     ? JSON.parse(answerInfo[i].score).wScore
@@ -2285,7 +2239,8 @@ export default {
             for (var i = 0; i < pjInfo.length; i++) {
               if (
                 res.data[0][k].stage == pjInfo[i].stage &&
-                res.data[0][k].task == pjInfo[i].task
+                res.data[0][k].task == pjInfo[i].task &&
+                res.data[0][k].tool == pjInfo[i].tool
               ) {
                 var pj = pjInfo[i];
                 var a =
@@ -2298,7 +2253,7 @@ export default {
                     rateJson = a[z].rateJson;
                   }
                 }
-                workJson[k].pjInfo.push({
+                workJson[stagetask].pjInfo.push({
                   answer: JSON.parse(pj.content),
                   rateJson: rateJson,
                   score: pjInfo[i].score
@@ -2311,7 +2266,8 @@ export default {
             for (var i = 0; i < xztkInfo.length; i++) {
               if (
                 res.data[0][k].stage == xztkInfo[i].stage &&
-                res.data[0][k].task == xztkInfo[i].task
+                res.data[0][k].task == xztkInfo[i].task &&
+                res.data[0][k].tool == xztkInfo[i].tool
               ) {
                 if (xztkInfo[i].type == 7) {
                   var xztk = xztkInfo[i];
@@ -2325,7 +2281,7 @@ export default {
                       selectJson = a[z].selectJson;
                     }
                   }
-                  workJson[k].xztkInfo.push({
+                  workJson[stagetask].xztkInfo.push({
                     answer: xztk.content.split(",").map(Number),
                     selectJson: selectJson,
                     score: xztkInfo[i].score
@@ -2339,10 +2295,11 @@ export default {
             for (var i = 0; i < lccjInfo.length; i++) {
               if (
                 res.data[0][k].stage == lccjInfo[i].stage &&
-                res.data[0][k].task == lccjInfo[i].task
+                res.data[0][k].task == lccjInfo[i].task &&
+                res.data[0][k].tool == lccjInfo[i].tool
               ) {
                 var lccj = lccjInfo[i];
-                workJson[k].lccjInfo.push({
+                workJson[stagetask].lccjInfo.push({
                   lccjInfo: JSON.parse(lccj.content)[0],
                   score: lccjInfo[i].score
                     ? JSON.parse(lccjInfo[i].score).wScore
@@ -2354,10 +2311,11 @@ export default {
             for (var i = 0; i < bgInfo.length; i++) {
               if (
                 res.data[0][k].stage == bgInfo[i].stage &&
-                res.data[0][k].task == bgInfo[i].task
+                res.data[0][k].task == bgInfo[i].task &&
+                res.data[0][k].tool == bgInfo[i].tool
               ) {
                 var bg = bgInfo[i];
-                workJson[k].bgInfo.push({
+                workJson[stagetask].bgInfo.push({
                   bgInfo: JSON.parse(bg.content),
                   score: bgInfo[i].score
                     ? JSON.parse(bgInfo[i].score).wScore
@@ -2369,7 +2327,8 @@ export default {
             for (var i = 0; i < cocopiInfo.length; i++) {
               if (
                 res.data[0][k].stage == cocopiInfo[i].stage &&
-                res.data[0][k].task == cocopiInfo[i].task
+                res.data[0][k].task == cocopiInfo[i].task &&
+                res.data[0][k].tool == cocopiInfo[i].tool
               ) {
                 var cocopi = cocopiInfo[i];
                 var c = ["DOT", "DOC", "DOCX", "PPT", "PPTX", "XLSX", "XLS"];
@@ -2396,7 +2355,7 @@ export default {
                   ) != -1
                 ) {
                   t = 1;
-                  workJson[k].cocopiInfo.push({
+                  workJson[stagetask].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
                     score: cocopiInfo[i].score
@@ -2414,7 +2373,7 @@ export default {
                   var a =
                     "https://view.officeapps.live.com/op/view.aspx?src=" +
                     cocopi.content;
-                  workJson[k].cocopiInfo.push({
+                  workJson[stagetask].cocopiInfo.push({
                     url: a,
                     type: t,
                     score: cocopiInfo[i].score
@@ -2429,7 +2388,7 @@ export default {
                     ].toLocaleUpperCase() == "PDF"
                 ) {
                   t = 3;
-                  workJson[k].cocopiInfo.push({
+                  workJson[stagetask].cocopiInfo.push({
                     url: cocopi.content,
                     type: t,
                     score: cocopiInfo[i].score
@@ -2443,10 +2402,11 @@ export default {
             for (var i = 0; i < wordInfo.length; i++) {
               if (
                 res.data[0][k].stage == wordInfo[i].stage &&
-                res.data[0][k].task == wordInfo[i].task
+                res.data[0][k].task == wordInfo[i].task &&
+                res.data[0][k].tool == wordInfo[i].tool
               ) {
                 var word = wordInfo[i];
-                workJson[k].wordInfo.push({
+                workJson[stagetask].wordInfo.push({
                   wordInfo: JSON.parse(word.content),
                   score: wordInfo[i].score
                     ? JSON.parse(wordInfo[i].score).wScore
@@ -2455,12 +2415,16 @@ export default {
               }
             }
           }
-          const result = workJson.filter((item, index, arr) => {
-            return (
-              arr.findIndex((temp) => temp.stagetask === item.stagetask) ===
-              index
-            );
-          });
+          // const result = workJson.filter((item, index, arr) => {
+          //   return (
+          //     arr.findIndex((temp) => temp.stagetask === item.stagetask) ===
+          //     index
+          //   );
+          // });
+          const result = [];
+          for (var wi = 0; wi < Object.keys(workJson).length; wi++) {
+            result.push(workJson[Object.keys(workJson)[wi]]);
+          }
           for (var l = 0; l < b.length; l++) {
             if (workEvaList.length > 0) {
               for (var p = 0; p < workEvaList.length; p++) {
@@ -2706,9 +2670,9 @@ export default {
       this.page = 1;
       this.getWorks();
     },
-    fullTools() {
-      this.full = !this.full;
-    },
+    // fullTools() {
+    //   this.full = !this.full;
+    // },
     //获取作业
     getWorks() {
       this.isLoading = true;
@@ -4112,7 +4076,7 @@ export default {
 }
 
 .left_top {
-  width: 45%;
+  width: 95%;
   margin: 0 0 0 20px;
   padding: 10px 0 10px 0;
   border-bottom: 2px solid #eee;
@@ -4499,6 +4463,7 @@ export default {
   margin-left: 10px;
 }
 .contentAuto {
+  width: 100%;
   height: 253px;
   overflow: auto;
 }
@@ -4584,7 +4549,7 @@ export default {
   align-items: center;
 }
 .select_box2_img {
-  width: 95%;
+  width: 70%;
   height: 100%;
   overflow: auto;
   background: #fff;
@@ -4641,10 +4606,10 @@ export default {
 }
 .sentenBox {
   background: #fff;
-  background-image: url("../../../assets/icon/conSentences/stuBg.png");
-  background-position: 102%;
-  background-repeat: no-repeat;
-  background-size: 60%;
+  /* background-image: url("../../../assets/icon/conSentences/stuBg.png"); */
+  /* background-position: 102%; */
+  /* background-repeat: no-repeat; */
+  /* background-size: 60%; */
 }
 .isWrong {
   display: flex;
@@ -4705,9 +4670,10 @@ export default {
   text-overflow: ellipsis;
   width: 75%;
   margin: 0 auto;
+  font-size: 16px;
 }
 .cardAnswerBox {
-  font-size: 18px;
+  font-size: 16px;
   width: 97%;
   border: 5px;
   padding: 0;
@@ -4729,12 +4695,12 @@ export default {
 
 .isTj > div:nth-child(2) {
   color: #727070;
-  margin-left: 10px;
+  margin-left: 5px;
 }
 
 .isTjImg {
-  width: 30px;
-  height: 30px;
+  width: 20px;
+  height: 20px;
 }
 
 .isTjImg > img {

+ 309 - 41
src/components/pages/components/worksDetail3.vue

@@ -115,15 +115,9 @@
               <div class="contentBox">
                 <div
                   class="contentAuto"
-                  :style="{
-                    width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                  }"
                 >
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
@@ -185,9 +179,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
@@ -229,9 +220,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].askInfo.length > 0"
                   >
                     <div>
@@ -352,9 +340,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: '95%',
-                    }"
                     v-if="worksDetail[sIndex].chooseInfo.length > 0"
                   >
                     <div>
@@ -506,9 +491,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
@@ -550,9 +532,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].pjInfo.length > 0"
                   >
                     <div style="width: 100%">
@@ -623,9 +602,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
@@ -659,7 +635,7 @@
                         />
                       </div>
                       <div class="rightWidthCss">
-                        <div style="padding-top: 15px; width: 50%">
+                        <div style="padding-top: 15px;">
                           <div
                             class="select_box2_answer_box"
                             v-for="(item2, checkIndex) in worksDetail[sIndex]
@@ -738,9 +714,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].lccjInfo.length > 0"
                   >
                     <div class="sentenBox">
@@ -874,9 +847,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
@@ -907,9 +877,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
@@ -977,9 +944,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
@@ -2323,9 +2287,9 @@ export default {
           console.error(err);
         });
     },
-    fullTools() {
-      this.full = !this.full;
-    },
+    // fullTools() {
+    //   this.full = !this.full;
+    // },
     getCourseDetail() {
       let params = {
         cid: this.cid,
@@ -3639,7 +3603,7 @@ export default {
 }
 
 .left_top {
-  width: 45%;
+  width: 95%;
   margin: 0 0 0 20px;
   padding: 10px 0 10px 0;
   border-bottom: 2px solid #eee;
@@ -3997,7 +3961,311 @@ export default {
   padding: 10px 12px;
 }
 .contentAuto {
+  width: 100%;
   height: 253px;
   overflow: auto;
 }
+.evalCss {
+  background: #fff;
+  font-size: 18px;
+}
+
+.middleBox {
+  padding: 20px 0 15px 0;
+}
+
+.pfBox {
+  padding-bottom: 30px;
+}
+
+.nameAndrate {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  padding-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+}
+
+.nameAndrate > div {
+  margin-left: 10px;
+  color: #000;
+  height: 30px;
+}
+
+.nameAndrate >>> .el-rate__icon {
+  font-size: 28px !important;
+}
+
+.pfBox > div:nth-child(2) {
+  background: #f7f6f9;
+  min-height: 45px;
+  border-radius: 10px;
+  font-size: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.bz {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+  width: 100%;
+}
+
+.bz > div {
+  padding: 0 10px;
+}
+.pj {
+  font: inherit;
+  color: currentColor;
+  width: 100%;
+  margin: 0;
+  padding: 15px 14px;
+  display: block;
+  min-width: 0;
+  outline: none;
+  box-sizing: content-box;
+  background: none;
+  -webkit-tap-highlight-color: transparent;
+  border: 1px solid rgba(0, 0, 0, 0.23);
+  border-radius: 4px;
+  box-sizing: border-box;
+  resize: none;
+}
+.select_box2_box {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.select_box2_img {
+  width: 70%;
+  height: 100%;
+  overflow: auto;
+  background: #fff;
+  border-radius: 5px;
+  margin-top: 10px;
+}
+
+.select_box2_img img {
+  width: 100%;
+}
+
+.select_box2_answer_box {
+  margin: 0 0 10px 20px;
+  width: 85%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.select_box2_answer_box >>> .el-input.is-disabled .el-input__inner {
+  color: #000;
+}
+.rightWidthCss {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.rightAnswer {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  color: red;
+  margin-bottom: 31px;
+}
+
+.rightAnswerCss {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  padding-top: 30px;
+}
+
+.blueCss {
+  color: #767de1;
+  margin-left: 10px;
+}
+
+.redCss {
+  color: red;
+}
+.sentenBox {
+  background: #fff;
+  /* background-image: url("../../../assets/icon/conSentences/stuBg.png"); */
+  /* background-position: 102%; */
+  /* background-repeat: no-repeat; */
+  /* background-size: 60%; */
+}
+.isWrong {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  align-items: center;
+}
+.cardList,
+.cardList1 {
+  padding: 10px 0 10px 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom: 1px solid #f4f4f4;
+  width: 98%;
+  margin: 0 auto;
+  min-width: 60%;
+  max-width: 85%;
+}
+
+.cardList1 {
+  padding: 10px 0 10px 10px !important;
+  margin: 0 !important;
+}
+.cardBox {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+}
+
+.cardBox > div {
+  margin-bottom: 10px;
+}
+
+.isCard,
+.isCard1 {
+  width: 130px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 20px;
+  cursor: pointer;
+  background-image: url("../../../assets/icon/conSentences/titleBorder.png");
+  background-size: cover;
+  transition: all 2s;
+  margin-right: 20px;
+}
+
+.isCard > div,
+.isCard1 > div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 75%;
+  margin: 0 auto;
+  font-size: 16px;
+}
+.cardAnswerBox {
+  font-size: 16px;
+  width: 97%;
+  border: 5px;
+  padding: 0;
+  border-radius: 5px;
+  margin: 10px auto;
+  word-break: break-word;
+}
+.answerRight {
+  width: 25%;
+}
+
+.isTj {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  min-width: 100px;
+}
+
+.isTj > div:nth-child(2) {
+  color: #727070;
+  margin-left: 5px;
+}
+
+.isTjImg {
+  width: 20px;
+  height: 20px;
+}
+
+.isTjImg > img {
+  width: 100%;
+  height: 100%;
+}
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding: 15px 5px;
+  max-width: 0px;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+.workImg {
+  width: 90%;
+  /* height: calc(100% - 40px); */
+  height: 105px;
+  position: relative;
+}
+
+.workImg > img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  cursor: pointer;
+}
 </style>

+ 313 - 40
src/components/pages/myReport/components/MyLookComponent/worksDetail3.vue

@@ -115,15 +115,9 @@
               <div class="contentBox">
                 <div
                   class="contentAuto"
-                  :style="{
-                    width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                  }"
                 >
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].img.length > 0"
                   >
                     <div
@@ -185,9 +179,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].answerInfo.length > 0"
                   >
                     <div
@@ -229,9 +220,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].askInfo.length > 0"
                   >
                     <div>
@@ -352,9 +340,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: '95%',
-                    }"
                     v-if="worksDetail[sIndex].chooseInfo.length > 0"
                   >
                     <div>
@@ -506,9 +491,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '45%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wpptInfo.length > 0"
                   >
                     <div
@@ -550,9 +532,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].pjInfo.length > 0"
                   >
                     <div style="width: 100%">
@@ -623,9 +602,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].xztkInfo.length > 0"
                   >
                     <div
@@ -738,9 +714,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].lccjInfo.length > 0"
                   >
                     <div class="sentenBox">
@@ -874,9 +847,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].bgInfo.length > 0"
                   >
                     <div
@@ -907,9 +877,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].cocopiInfo.length > 0"
                   >
                     <div
@@ -977,9 +944,6 @@
                   </div>
                   <div
                     class="left_top"
-                    :style="{
-                      width: worksDetail[sIndex].eList.length ? '95%' : '95%',
-                    }"
                     v-if="worksDetail[sIndex].wordInfo.length > 0"
                   >
                     <div
@@ -2322,9 +2286,9 @@ export default {
           console.error(err);
         });
     },
-    fullTools() {
-      this.full = !this.full;
-    },
+    // fullTools() {
+    //   this.full = !this.full;
+    // },
     getCourseDetail() {
       let params = {
         cid: this.cid,
@@ -3638,12 +3602,321 @@ export default {
 }
 
 .left_top {
-  width: 45%;
+  width: 95%;
   margin: 0 0 0 20px;
   padding: 10px 0 10px 0;
   border-bottom: 2px solid #eee;
 }
 
+.contentAuto {
+  width: 100%;
+  height: 253px;
+  overflow: auto;
+}
+.evalCss {
+  background: #fff;
+  font-size: 18px;
+}
+
+.middleBox {
+  padding: 20px 0 15px 0;
+}
+
+.pfBox {
+  padding-bottom: 30px;
+}
+
+.nameAndrate {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  padding-bottom: 10px;
+  height: 30px;
+  line-height: 30px;
+  width: 100%;
+}
+
+.nameAndrate > div {
+  margin-left: 10px;
+  color: #000;
+  height: 30px;
+}
+
+.nameAndrate >>> .el-rate__icon {
+  font-size: 28px !important;
+}
+
+.pfBox > div:nth-child(2) {
+  background: #f7f6f9;
+  min-height: 45px;
+  border-radius: 10px;
+  font-size: 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  color: #000;
+}
+
+.bz {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: flex-start;
+  width: 100%;
+}
+
+.bz > div {
+  padding: 0 10px;
+}
+.pj {
+  font: inherit;
+  color: currentColor;
+  width: 100%;
+  margin: 0;
+  padding: 15px 14px;
+  display: block;
+  min-width: 0;
+  outline: none;
+  box-sizing: content-box;
+  background: none;
+  -webkit-tap-highlight-color: transparent;
+  border: 1px solid rgba(0, 0, 0, 0.23);
+  border-radius: 4px;
+  box-sizing: border-box;
+  resize: none;
+}
+.select_box2_box {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+.select_box2_img {
+  width: 70%;
+  height: 100%;
+  overflow: auto;
+  background: #fff;
+  border-radius: 5px;
+  margin-top: 10px;
+}
+
+.select_box2_img img {
+  width: 100%;
+}
+
+.select_box2_answer_box {
+  margin: 0 0 10px 20px;
+  width: 85%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+}
+
+.select_box2_answer_box >>> .el-input.is-disabled .el-input__inner {
+  color: #000;
+}
+.rightWidthCss {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+}
+
+.rightAnswer {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  color: red;
+  margin-bottom: 31px;
+}
+
+.rightAnswerCss {
+  display: flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  padding-top: 30px;
+}
+
+.blueCss {
+  color: #767de1;
+  margin-left: 10px;
+}
+
+.redCss {
+  color: red;
+}
+.sentenBox {
+  background: #fff;
+  /* background-image: url("../../../assets/icon/conSentences/stuBg.png"); */
+  /* background-position: 102%; */
+  /* background-repeat: no-repeat; */
+  /* background-size: 60%; */
+}
+.isWrong {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  align-items: center;
+}
+.cardList,
+.cardList1 {
+  padding: 10px 0 10px 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  box-sizing: border-box;
+  border-bottom: 1px solid #f4f4f4;
+  width: 98%;
+  margin: 0 auto;
+  min-width: 60%;
+  max-width: 85%;
+}
+
+.cardList1 {
+  padding: 10px 0 10px 10px !important;
+  margin: 0 !important;
+}
+.cardBox {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: center;
+  align-content: center;
+}
+
+.cardBox > div {
+  margin-bottom: 10px;
+}
+
+.isCard,
+.isCard1 {
+  width: 130px;
+  height: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 20px;
+  cursor: pointer;
+  background-image: url("../../../../../assets/icon/conSentences/titleBorder.png");
+  background-size: cover;
+  transition: all 2s;
+  margin-right: 20px;
+}
+
+.isCard > div,
+.isCard1 > div {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  width: 75%;
+  margin: 0 auto;
+  font-size: 16px;
+}
+.cardAnswerBox {
+  font-size: 16px;
+  width: 97%;
+  border: 5px;
+  padding: 0;
+  border-radius: 5px;
+  margin: 10px auto;
+  word-break: break-word;
+}
+.answerRight {
+  width: 25%;
+}
+
+.isTj {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  min-width: 100px;
+}
+
+.isTj > div:nth-child(2) {
+  color: #727070;
+  margin-left: 5px;
+}
+
+.isTjImg {
+  width: 20px;
+  height: 20px;
+}
+
+.isTjImg > img {
+  width: 100%;
+  height: 100%;
+}
+/* table 样式 */
+.cont >>> table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont >>> table td,
+.cont >>> table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  padding: 15px 5px;
+  max-width: 0px;
+}
+
+.cont >>> table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont >>> blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+/* code 样式 */
+.cont >>> code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont >>> pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont >>> ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
+.workImg {
+  width: 90%;
+  /* height: calc(100% - 40px); */
+  height: 105px;
+  position: relative;
+}
+
+.workImg > img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  cursor: pointer;
+}
+
 .right_top {
   width: 53%;
 }