Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table into beta

src/components/courseDetail.vue

@@ -2137,7 +2137,7 @@ export default {
   background: #f0f4fa;
   width: 75px;
   height: 36px;
-  color: #717c8d;
+  color: #000;
   text-align: center;
   line-height: 36px;
   margin-right: 20px;

src/components/easy2/studyStudent.vue

@@ -233,7 +233,8 @@
           <div
             class="vedioBox"
             v-if="
-              vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
+              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail != '' || vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
             "
           >
             <div
@@ -631,8 +632,6 @@
                 .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)

src/components/studyStudent.vue

@@ -263,7 +263,8 @@
           <div
             class="vedioBox"
             v-if="
-              vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
+              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail != '' || vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
             "
             style="border-radius: 0 0 20px 20px"
           >
@@ -637,8 +638,6 @@
                   .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)

src/components/wordCloud/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="词云" :visible.sync="dialogVisibleWordCloud" :append-to-body="true" width="650px"
+        <el-dialog title="词云" :visible.sync="dialogVisibleWordCloud" :append-to-body="true" width="800px"
             :before-close="handleClose" class="dialog_diy dialog_diy3">
             <div class="wordCloud__tagBall" :style="{ width: `500px`, height: `500px` }" @mouseenter="stop"
                 @mouseleave="start">
@@ -107,6 +107,8 @@ export default {
                     style: {}
                 }));
                 this.innit();
+            }else{
+                window.cancelAnimationFrame(this.animateID);
             }
         }
     },
@@ -261,13 +263,14 @@ export default {
     color: #fff;
 }
 
-.dialog_diy1>>>.el-dialog__body {
-    padding: 0;
+.dialog_diy>>>.el-dialog__body {
+    overflow:hidden;
 }
 
 .dialog_diy>>>.el-dialog__body,
 .dialog_diy>>>.el-dialog__footer {
     background: #fafafa;
+    
 }
 
 button {