应用中心作业问题

src/components/components/cocoFlowDia.vue

@@ -16,7 +16,7 @@
                     </div>
 
                     <div class="left" v-if="po.role == 'user'">
-                            <div class="TName">{{ po.sender }}</div>:
+                            <div class="TName">{{ username }}</div>:
                             <div class="con" v-html="po.content"></div>
                     </div>
                 </div>
@@ -30,6 +30,7 @@
     export default {
         data() {
             return {
+                username:'',
                 FlowVisible:false,
                 listData:[
                     // {
@@ -90,6 +91,7 @@
         methods: {
             openAppWork(val){
                 console.log(val);
+                this.username = val.sName
                 this.listData = JSON.parse(val.works)
                 this.FlowVisible = true;
             },

src/components/components/studentWorkPreviewDialog.vue

@@ -275,7 +275,7 @@
                     </div>
 
                     <div class="left" v-if="po.role == 'user'">
-                            <div class="TName">{{ po.sender }}</div>:
+                            <div class="TName">{{ studentWork.sName }}</div>:
                             <div class="con" v-html="po.content"></div>
                     </div>
                 </div>

src/components/easy2/studyStudent.vue

@@ -18600,6 +18600,17 @@ export default {
                     userid: b[j].userid,
                     wid: b[j].id
                   });
+                } else if (b[j].type == 20 && a[i].tool[0] == 72) {
+                  this.workStudent[i].push({
+                    works: b[j].content,
+                    sName: b[j].name,
+                    score: b[j].score,
+                    img: b[j].img,
+                    type: 20,
+                    time: b[j].time,
+                    userid: b[j].userid,
+                    wid: b[j].id
+                  });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   this.workStudent[i].push({
@@ -19853,7 +19864,7 @@ export default {
                     wid: b[j].id,
                     works: b[j].content,
                     sName: b[j].name,
-                    type: 2,
+                    type: 20,
                     ttype: b[j].ttype,
                     time: b[j].time,
                     score: b[j].score,

src/components/easy3/studyStudent.vue

@@ -14495,48 +14495,16 @@ export default {
                     wid: b[j].id,
                   });
                 } else if (b[j].type == 20 && a[i].tool[0] == 72) {
-                  let _works = {
-                    userid: b[j].userid,
-                    ateacher: b[j].ateacher,
-                    wid: b[j].id,
+                  this.workStudent[i].push({
                     works: b[j].content,
                     sName: b[j].name,
-                    type: 2,
-                    ttype: b[j].ttype,
-                    time: b[j].time,
                     score: b[j].score,
                     img: b[j].img,
-                    likesCount: likesCount,
-                    commentCount: commentCount,
-                    isLikes: isLikes,
-                    commentJson: commentJson,
-                    likeJson: likeJson
-                  };
-                  if (this.isGroup) {
-                    let isGw = 1;
-                    for (
-                      var groupI = 0;
-                      groupI < this.courseGroup.group.length;
-                      groupI++
-                    ) {
-                      let gid = this.courseGroup.group[groupI].id;
-                      if (
-                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
-                        -1
-                      ) {
-                        isGw = 2;
-                        this.courseGroup.group[groupI].works[i].push(_works);
-                        break;
-                      }
-                    }
-                    if (isGw == 1) {
-                      _worksStudent[i].push(_works);
-                    }
-                  } else {
-                    _worksStudent[i].push(_works);
-                  }
-                  _worksStudent2[i].push(_works);
-                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                    type: 20,
+                    time: b[j].time,
+                    userid: b[j].userid,
+                    wid: b[j].id,
+                  });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   this.workStudent[i].push({
@@ -15691,6 +15659,49 @@ export default {
                   }
                   _worksStudent2[i].push(_works);
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                } else if (b[j].type == 20 && a[i].tool[0] == 72) {
+                  let _works = {
+                    userid: b[j].userid,
+                    ateacher: b[j].ateacher,
+                    wid: b[j].id,
+                    works: b[j].content,
+                    sName: b[j].name,
+                    type: 20,
+										ttype:b[j].ttype,
+                    time: b[j].time,
+                    score: b[j].score,
+                    img: b[j].img,
+                    likesCount: likesCount,
+                    commentCount: commentCount,
+                    isLikes: isLikes,
+                    commentJson: commentJson,
+										likeJson:likeJson
+                  };
+                  if (this.isGroup) {
+                    let isGw = 1;
+                    for (
+                      var groupI = 0;
+                      groupI < this.courseGroup.group.length;
+                      groupI++
+                    ) {
+                      let gid = this.courseGroup.group[groupI].id;
+                      if (
+                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
+                        -1
+                      ) {
+                        isGw = 2;
+                        this.courseGroup.group[groupI].works[i].push(_works);
+                        break;
+                      }
+                    }
+                    if (isGw == 1) {
+                      _worksStudent[i].push(_works);
+                    }
+                  } else {
+                    _worksStudent[i].push(_works);
+                  }
+                  _worksStudent2[i].push(_works);
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   let _work = {

src/components/studyStudent.vue

@@ -14625,48 +14625,16 @@ export default {
                     wid: b[j].id,
                   });
                 } else if (b[j].type == 20 && a[i].tool[0] == 72) {
-                  let _works = {
-                    userid: b[j].userid,
-                    ateacher: b[j].ateacher,
-                    wid: b[j].id,
+                  this.workStudent[i].push({
                     works: b[j].content,
                     sName: b[j].name,
-                    type: 2,
-                    ttype: b[j].ttype,
-                    time: b[j].time,
                     score: b[j].score,
                     img: b[j].img,
-                    likesCount: likesCount,
-                    commentCount: commentCount,
-                    isLikes: isLikes,
-                    commentJson: commentJson,
-                    likeJson: likeJson
-                  };
-                  if (this.isGroup) {
-                    let isGw = 1;
-                    for (
-                      var groupI = 0;
-                      groupI < this.courseGroup.group.length;
-                      groupI++
-                    ) {
-                      let gid = this.courseGroup.group[groupI].id;
-                      if (
-                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
-                        -1
-                      ) {
-                        isGw = 2;
-                        this.courseGroup.group[groupI].works[i].push(_works);
-                        break;
-                      }
-                    }
-                    if (isGw == 1) {
-                      _worksStudent[i].push(_works);
-                    }
-                  } else {
-                    _worksStudent[i].push(_works);
-                  }
-                  _worksStudent2[i].push(_works);
-                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                    type: 20,
+                    time: b[j].time,
+                    userid: b[j].userid,
+                    wid: b[j].id,
+                  });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   this.workStudent[i].push({
@@ -15827,6 +15795,49 @@ export default {
                   }
                   _worksStudent2[i].push(_works);
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                } else if (b[j].type == 20 && a[i].tool[0] == 72) {
+                  let _works = {
+                    userid: b[j].userid,
+                    ateacher: b[j].ateacher,
+                    wid: b[j].id,
+                    works: b[j].content,
+                    sName: b[j].name,
+                    type: 20,
+										ttype:b[j].ttype,
+                    time: b[j].time,
+                    score: b[j].score,
+                    img: b[j].img,
+                    likesCount: likesCount,
+                    commentCount: commentCount,
+                    isLikes: isLikes,
+                    commentJson: commentJson,
+										likeJson:likeJson
+                  };
+                  if (this.isGroup) {
+                    let isGw = 1;
+                    for (
+                      var groupI = 0;
+                      groupI < this.courseGroup.group.length;
+                      groupI++
+                    ) {
+                      let gid = this.courseGroup.group[groupI].id;
+                      if (
+                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
+                        -1
+                      ) {
+                        isGw = 2;
+                        this.courseGroup.group[groupI].works[i].push(_works);
+                        break;
+                      }
+                    }
+                    if (isGw == 1) {
+                      _worksStudent[i].push(_works);
+                    }
+                  } else {
+                    _worksStudent[i].push(_works);
+                  }
+                  _worksStudent2[i].push(_works);
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   let _work = {

src/components/studySutdentClass/studyStudent.vue

@@ -15448,17 +15448,17 @@
         <el-button type="primary" style="width: 95%;" @click="confirmOpen">开始学习</el-button>
       </div>
 
-      <appStoreC ref="appStoreC" 
-      :sStudent="sStudent"
-      :courseType="courseType"
-      :taskCount="taskCount"
-      :toolindex="toolindex"
-      @selectSWorks="selectSWorks"
-      @selectStudent="selectStudent"
-    ></appStoreC>
-      <cocoFlowDia ref="cocoFlowDiaRef"></cocoFlowDia>
-
     </el-dialog>
+    <appStoreC ref="appStoreC" 
+        :sStudent="sStudent"
+        :courseType="courseType"
+        :taskCount="taskCount"
+        :toolindex="toolindex"
+        @selectSWorks="selectSWorks"
+        @selectStudent="selectStudent"
+      ></appStoreC>
+      
+      <cocoFlowDia ref="cocoFlowDiaRef"></cocoFlowDia>
   </div>
 </template>
 
@@ -18107,48 +18107,16 @@ export default {
                     wid: b[j].id,
                   });
                 } else if (b[j].type == 20 && a[i].tool[0] == 72) {
-                  let _works = {
-                    userid: b[j].userid,
-                    ateacher: b[j].ateacher,
-                    wid: b[j].id,
+                  this.workStudent[i].push({
                     works: b[j].content,
                     sName: b[j].name,
-                    type: 2,
-                    ttype: b[j].ttype,
-                    time: b[j].time,
                     score: b[j].score,
                     img: b[j].img,
-                    likesCount: likesCount,
-                    commentCount: commentCount,
-                    isLikes: isLikes,
-                    commentJson: commentJson,
-                    likeJson: likeJson
-                  };
-                  if (this.isGroup) {
-                    let isGw = 1;
-                    for (
-                      var groupI = 0;
-                      groupI < this.courseGroup.group.length;
-                      groupI++
-                    ) {
-                      let gid = this.courseGroup.group[groupI].id;
-                      if (
-                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
-                        -1
-                      ) {
-                        isGw = 2;
-                        this.courseGroup.group[groupI].works[i].push(_works);
-                        break;
-                      }
-                    }
-                    if (isGw == 1) {
-                      _worksStudent[i].push(_works);
-                    }
-                  } else {
-                    _worksStudent[i].push(_works);
-                  }
-                  _worksStudent2[i].push(_works);
-                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                    type: 20,
+                    time: b[j].time,
+                    userid: b[j].userid,
+                    wid: b[j].id,
+                  });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   this.workStudent[i].push({
@@ -19327,6 +19295,49 @@ export default {
                   }
                   _worksStudent2[i].push(_works);
                   this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
+                } else if (b[j].type == 20 && a[i].tool[0] == 72) {
+                  let _works = {
+                    userid: b[j].userid,
+                    ateacher: b[j].ateacher,
+                    wid: b[j].id,
+                    works: b[j].content,
+                    sName: b[j].name,
+                    type: 20,
+                    ttype: b[j].ttype,
+                    time: b[j].time,
+                    score: b[j].score,
+                    img: b[j].img,
+                    likesCount: likesCount,
+                    commentCount: commentCount,
+                    isLikes: isLikes,
+                    commentJson: commentJson,
+                    likeJson: likeJson
+                  };
+                  if (this.isGroup) {
+                    let isGw = 1;
+                    for (
+                      var groupI = 0;
+                      groupI < this.courseGroup.group.length;
+                      groupI++
+                    ) {
+                      let gid = this.courseGroup.group[groupI].id;
+                      if (
+                        this.courseGroupStudentUid[gid].indexOf(b[j].userid) !=
+                        -1
+                      ) {
+                        isGw = 2;
+                        this.courseGroup.group[groupI].works[i].push(_works);
+                        break;
+                      }
+                    }
+                    if (isGw == 1) {
+                      _worksStudent[i].push(_works);
+                    }
+                  } else {
+                    _worksStudent[i].push(_works);
+                  }
+                  _worksStudent2[i].push(_works);
+                  this.isWorksS[i].push({ uid: b[j].userid, sName: b[j].name });
                 } else if (b[j].type == 2 && a[i].tool[0] == 4) {
                   //问卷
                   let _work = {