update

src/components/student/studyStudent.vue

@@ -300,7 +300,6 @@
                     <div></div>
                     <div>步骤{{ toolIndex + 1 }}</div>
                   </div>
-
                   <div class="toolBox" v-if="false">
                     <div>
                       <div class="noiframeBox">
@@ -475,9 +474,17 @@
                     <div class="toolPhoto_box">
                       <div class="photo_box" v-for="(photo, pIndex) in tool.toolPhoto" :key="pIndex">
                         <span>{{ photo.workContent }}</span>
-                        <div class="toolPhoto">
+                        <div class="toolPhoto" :class="{ answerWidth: photo.type == 3 }">
                           <img v-if="photo.type == 1" :src="photo.content" @click="previewImg(photo.content)">
                           <img v-if="photo.type == 10" :src="word" @click="openTable(photo.content)">
+                          <div class="answerBg" v-if="photo.type == 3">
+                            <!-- <div>{{ w.sName }}</div> -->
+                            <el-tooltip class="item" effect="light" :content="photo.content" placement="top">
+                              <div class="answerContent">
+                                {{ photo.content }}
+                              </div>
+                            </el-tooltip>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -1434,6 +1441,8 @@ export default {
                         _work.workContent = `(${_work.username})使用(思维网格)提交了：`
                       } else if (_tool.tool == 6) {
                         _work.workContent = `(${_work.username})使用(协同文档)提交了：`
+                      } else if (_tool.tool == 15) {
+                        _work.workContent = `(${_work.username})使用(问答工具)提交了：`
                       } else if (_tool.tool == 48) {
                         _work.workContent = `(${_work.username})使用(表格)提交了：`
                       }
@@ -1471,6 +1480,8 @@ export default {
                         _work.workContent = `(${_work.username})使用(思维网格)提交了：`
                       } else if (_tool.tool == 6) {
                         _work.workContent = `(${_work.username})使用(协同文档)提交了：`
+                      } else if (_tool.tool == 15) {
+                        _work.workContent = `(${_work.username})使用(问答工具)提交了：`
                       } else if (_tool.tool == 48) {
                         _work.workContent = `(${_work.username})使用(表格)提交了：`
                       }
@@ -3624,11 +3635,19 @@ export default {
   line-height: 30px;
 }
 
+
+.answerWidth {
+  width: 250px !important;
+  height: auto !important;
+}
+
 .answerBg {
   background: url("../../assets/icon/answerBgNew.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   width: 100%;
-  height: 100%;
+  height: 120px;
+  padding: 0 10px;
+  box-sizing: border-box;
   color: #fff;
   text-align: center;
   display: flex;
@@ -3637,15 +3656,11 @@ export default {
   align-items: center;
   position: relative;
   justify-content: center;
-}
-
-.answerBg>div:nth-child(1) {
-  /* font-size: 22px;
-  padding: 25px 0 10px; */
+  border-radius: 5px;
 }
 
 .answerContent {
-  width: 215px;
+  /* width: 215px; */
   max-height: 60px;
   word-break: break-all;
   text-align: center;

src/components/studyStudent.vue

@@ -584,7 +584,7 @@
                   >打开链接
                 </el-button>
               </div>
-              <div style="padding: 0px 30px" v-if="showType == 1">
+              <div style="padding: 10px 30px 0" v-if="showType == 1">
                 <el-button type="primary" @click="checkFileFull(showType, text)"
                   >全屏查看</el-button
                 >
@@ -6565,6 +6565,7 @@
               ></el-input> -->
 
               <el-select
+                style="margin-top:10px"
                 v-model="item.username"
                 filterable
                 allow-create
@@ -7444,7 +7445,7 @@ export default {
                         .split(".")
                         [b[j].content.split(".").length - 1].toLocaleUpperCase()
                     ) != -1 &&
-                    a[i].tool[0] == 16
+                    a[i].tool[0] == 16 && b[j].atool != 50
                   ) {
                     this.workStudent[i].push({
                       works: b[j].content,
@@ -7462,7 +7463,7 @@ export default {
                         .split(".")
                         [b[j].content.split(".").length - 1].toLocaleUpperCase()
                     ) != -1 &&
-                    a[i].tool[0] == 16
+                    a[i].tool[0] == 16 && b[j].atool != 50
                   ) {
                     this.workStudent[i].push({
                       userid: b[j].userid,
@@ -7474,7 +7475,7 @@ export default {
                       type: 3,
                       time: b[j].time,
                     });
-                  } else if (b[j].type == 6) {
+                  } else if (b[j].type == 6 && b[j].atool != 50) {
                     this.workStudent[i].push({
                       userid: b[j].userid,
                       wid: b[j].id,
@@ -7485,7 +7486,7 @@ export default {
                       type: 4,
                       time: b[j].time,
                     });
-                  } else if (b[j].type == 7) {
+                  } else if (b[j].type == 7 && b[j].atool != 50) {
                     this.workStudent[i].push({
                       userid: b[j].userid,
                       wid: b[j].id,
@@ -8108,7 +8109,8 @@ export default {
                         .split(".")
                         [b[j].content.split(".").length - 1].toLocaleUpperCase()
                     ) != -1 &&
-                    a[i].tool[0] == 16
+                    a[i].tool[0] == 16 &&
+                    b[j].atool != 50
                   ) {
                     this.worksStudent[i].push({
                       userid: b[j].userid,
@@ -8131,7 +8133,7 @@ export default {
                         .split(".")
                         [b[j].content.split(".").length - 1].toLocaleUpperCase()
                     ) != -1 &&
-                    a[i].tool[0] == 16
+                    a[i].tool[0] == 16 && b[j].atool != 50
                   ) {
                     this.worksStudent[i].push({
                       userid: b[j].userid,
@@ -8148,7 +8150,7 @@ export default {
                       isLikes: isLikes,
                       commentJson: commentJson,
                     });
-                  } else if (b[j].type == 6) {
+                  } else if (b[j].type == 6 && b[j].atool != 50) {
                     this.worksStudent[i].push({
                       userid: b[j].userid,
                       ateacher: b[j].ateacher,
@@ -8164,7 +8166,7 @@ export default {
                       isLikes: isLikes,
                       commentJson: commentJson,
                     });
-                  } else if (b[j].type == 7) {
+                  } else if (b[j].type == 7 && b[j].atool != 50) {
                     this.worksStudent[i].push({
                       userid: b[j].userid,
                       ateacher: b[j].ateacher,
@@ -11694,6 +11696,7 @@ export default {
 
 .up_photo2 {
   width: 120px;
+  min-width:120px;
   cursor: pointer;
   display: flex;
   flex-direction: column;
@@ -11706,6 +11709,7 @@ export default {
 
 .up_photo2 img {
   width: 60%;
+  height: auto;
 }
 
 .up_photo2 span {