zengyicheng 1 gadu atpakaļ
vecāks
revīzija
8f1acfdc48

+ 3 - 0
src/components/courseDetail.vue

@@ -1180,6 +1180,9 @@ export default {
       if (this.isFollow == 2 && this.tType == 2 && this.followC != i) {
         return;
       }
+      if(this.tType == 1 || this.tType == 4){
+        return;
+      }
       let params = {
         uid: this.userid,
         cid: this.id,

+ 22 - 1
src/components/easy2/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="overflow: unset">
+<!-- 任务模式 -->
     <div
       class="pb_content_body"
       style="
@@ -62,7 +63,15 @@
         >
           <div class="courseTitle">
             <div style="max-width: calc(100% - 40px); width: auto">
-              <div class="ctitle">{{ courseDetail.title }}</div>
+              <el-tooltip
+                effect="light"
+                :content="courseDetail.title"
+                placement="top"
+              >
+                <div class="ctitle">
+                  {{ courseDetail.title }}
+                </div>
+              </el-tooltip>
             </div>
             <el-tooltip effect="light" content="收缩" placement="top">
               <div class="mlImg" @click="setContent2(false)">
@@ -21543,6 +21552,18 @@ ol {
   font-weight: 400;
   color: #0e1e33;
 }
+.navItemList > div:first-child {
+  min-width: 60px;
+}
+.navItemList > div:last-child {
+  display: -webkit-box;
+  overflow: hidden;
+  white-space: normal !important;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 .isItemList {
   background: #3681fc;
 }

+ 60 - 29
src/components/easy3/studyStudent.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="pb_content" style="overflow: unset">
+<!-- 极简模式 -->
     <div
       class="pb_content_body"
       style="
@@ -62,7 +63,15 @@
         >
           <div class="courseTitle">
             <div style="max-width: calc(100% - 40px); width: auto">
-              <div class="ctitle">{{ courseDetail.title }}</div>
+              <el-tooltip
+                effect="light"
+                :content="courseDetail.title"
+                placement="top"
+              >
+                <div class="ctitle">
+                  {{ courseDetail.title }}
+                </div>
+              </el-tooltip>
             </div>
             <el-tooltip effect="light" content="收缩" placement="top">
               <div class="mlImg" @click="setContent2(false)">
@@ -209,9 +218,13 @@
               .toolChoose[0].tool.length == 0 &&
             chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
               .taskDetail == '' &&
-            !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && !(courseDetail.userid == userid ||
-                (courseDetail.course_teacher &&
-                  courseDetail.course_teacher.indexOf(userid) != -1))
+            !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+              .eList &&
+            !(
+              courseDetail.userid == userid ||
+              (courseDetail.course_teacher &&
+                courseDetail.course_teacher.indexOf(userid) != -1)
+            )
           "
         >
           <img src="../../assets/icon/isNoMessage.png" alt />
@@ -555,15 +568,17 @@
                   ? '0 0 20px 20px'
                   : '20px',
             }"
-             v-if="
-                ((chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
-                  .toolChoose[0].tool &&
+            v-if="
+              (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .toolChoose[0].tool &&
                 chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
-                  .toolChoose[0].tool.length > 0) || (chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
-                    .taskDetail != '')) || (courseDetail.userid == userid ||
-                (courseDetail.course_teacher &&
-                  courseDetail.course_teacher.indexOf(userid) != -1))
-              "
+                  .toolChoose[0].tool.length > 0) ||
+              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail != '' ||
+              courseDetail.userid == userid ||
+              (courseDetail.course_teacher &&
+                courseDetail.course_teacher.indexOf(userid) != -1)
+            "
           >
             <div
               class="taskBox"
@@ -11883,14 +11898,14 @@ export default {
     previewImg(url) {
       this.$hevueImgPreview(url);
     },
-    checkImg(list){
-      if(!list.length){
-        return
+    checkImg(list) {
+      if (!list.length) {
+        return;
       }
       this.$hevueImgPreview({
-          multiple: true, // 开启多图预览模式
-          imgList: list, // 需要预览的多图数组
-      })
+        multiple: true, // 开启多图预览模式
+        imgList: list, // 需要预览的多图数组
+      });
     },
     change(val) {
       console.log(val);
@@ -17661,16 +17676,20 @@ export default {
         return check;
       };
     },
-    getImgList(){
-      return function(val){
-        let srcList = [];  // 定义一个数组用来接收后面的img地址
-        
-        val.replace(/<img [^>]*src=['"]([^'"]+)[^>]*>/g, function (match, capture) {  // 查找匹配的元素   match为整个img标签  capture为src中的内容
+    getImgList() {
+      return function (val) {
+        let srcList = []; // 定义一个数组用来接收后面的img地址
+
+        val.replace(
+          /<img [^>]*src=['"]([^'"]+)[^>]*>/g,
+          function (match, capture) {
+            // 查找匹配的元素   match为整个img标签  capture为src中的内容
             srcList.push(capture);
-        });
-        return srcList
-      }
-    }
+          }
+        );
+        return srcList;
+      };
+    },
   },
   mounted() {
     if (this.screenType == 2) {
@@ -20290,8 +20309,8 @@ export default {
   background: #fff;
 }
 
-.pzContent >>> img{
-  max-width:100%;
+.pzContent >>> img {
+  max-width: 100%;
 }
 
 .pzListBox {
@@ -21414,6 +21433,18 @@ ol {
   font-weight: 400;
   color: #0e1e33;
 }
+.navItemList > div:first-child {
+  min-width: 60px;
+}
+.navItemList > div:last-child {
+  display: -webkit-box;
+  overflow: hidden;
+  white-space: normal !important;
+  text-overflow: ellipsis;
+  word-wrap: break-word;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 .isItemList {
   background: #3681fc;
 }

+ 20 - 4
src/components/studyStudent.vue

@@ -30,7 +30,15 @@
         >
           <div class="courseTitle">
             <div style="max-width: calc(100% - 40px); width: auto">
-              <div class="ctitle">{{ courseDetail.title }}</div>
+              <el-tooltip
+                effect="light"
+                :content="courseDetail.title"
+                placement="top"
+              >
+                <div class="ctitle">
+                  {{ courseDetail.title }}
+                </div>
+              </el-tooltip>
             </div>
             <el-tooltip effect="light" content="收缩" placement="top">
               <div class="mlImg" @click="setContent2(false)">
@@ -63,7 +71,15 @@
               </div>
               <div class="stageItemTitle">
                 <div>阶段{{ stageIndex + 1 }}</div>
-                <div>{{ item.dyName }}</div>
+                <el-tooltip
+                  effect="light"
+                  :content="item.dyName"
+                  placement="top"
+                >
+                  <div>
+                    {{ item.dyName }}
+                  </div>
+                </el-tooltip>
               </div>
             </div>
             <div class="stageChild" :class="{ navActive: item.isOpen }">
@@ -19406,8 +19422,8 @@ export default {
   background: #fff;
 }
 
-.pzContent >>> img{
-  max-width:100%;
+.pzContent >>> img {
+  max-width: 100%;
 }
 
 .pzListBox {