lsc 2 роки тому
батько
коміт
b9c442e768

+ 2 - 2
src/components/student/courseDetail.vue

@@ -551,7 +551,7 @@ export default {
         courseId: this.id,
       };
       this.ajax
-        .get(this.$store.state.api + "selectStudentCourseDetail", params)
+        .get(this.$store.state.api + "selectStudentCourseDetail2", params)
         .then((res) => {
           loading.close();
           // this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
@@ -998,7 +998,7 @@ export default {
 
 .all_choose {
   margin-right: 10px;
-  max-width: 250px;
+  /* max-width: 250px; */
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;

+ 24 - 6
src/components/student/studyStudent.vue

@@ -117,7 +117,12 @@
               .taskDetail != '' ||
             chapInfoList[courseType].chapterInfo[0].taskJson[
               taskCount
-            ].people || chapInfoList[courseType].chapterInfo[0].taskJson[
+            ].people ||
+            (chapInfoList[courseType].chapterInfo[0].taskJson[
+              taskCount
+            ].tcMember && chapInfoList[courseType].chapterInfo[0].taskJson[
+              taskCount
+            ].tcMember.length) || chapInfoList[courseType].chapterInfo[0].taskJson[
               taskCount
             ].time || chapterlist.length > 0
           ">
@@ -146,6 +151,15 @@
     taskCount
   ].time[1])
 }}</div>
+              </div>
+              <div class="task_box">
+                <div class="task_pbox" v-if="chapInfoList[courseType].chapterInfo[0].taskJson[
+                  taskCount
+                ].tcMember && chapInfoList[courseType].chapterInfo[0].taskJson[
+                  taskCount
+                ].tcMember.length">协同者:<span class="tcMember" v-for="(men, mindex) in chapInfoList[courseType].chapterInfo[0].taskJson[
+  taskCount
+].tcMember" :key="mindex">{{ getMan(men) }}</span></div>
               </div>
               <div class="taskBox" v-if="
                 chapInfoList[courseType].chapterInfo[0].taskJson[
@@ -247,8 +261,7 @@
                 <el-button type="primary" @click="downloadFile(chapterlist[chapterIndex].src)">文件下载</el-button>
               </div>
               <div style="padding: 10px 30px 0" v-if="chapterlist[chapterIndex] && chapterlist[chapterIndex].type == 8">
-                <el-button type="primary"
-                  @click="openLine(chapterlist[chapterIndex].src)">打开链接
+                <el-button type="primary" @click="openLine(chapterlist[chapterIndex].src)">打开链接
                 </el-button>
               </div>
               <div style="padding: 10px 30px 0" v-if="chapterlist[chapterIndex] && chapterlist[chapterIndex].type == 6">
@@ -5123,18 +5136,19 @@ ol {
   font-size: 18px;
 }
 
-.toolPhoto_box{
+.toolPhoto_box {
   display: flex;
   flex-wrap: wrap;
 }
+
 .photo_box {
-  margin-right: 25px;
+  margin: 10px 25px 0 0;
   display: flex;
   align-items: flex-start;
   flex-direction: column;
 }
 
-.photo_box > span{
+.photo_box>span {
   margin-bottom: 10px;
 }
 
@@ -5162,4 +5176,8 @@ ol {
 .task_pbox+.task_pbox {
   margin-left: 20px;
 }
+
+.tcMember + .tcMember::before{
+  content: '、';
+}
 </style>