Browse Source

修改功能和样式问题

zengyicheng 2 years ago
parent
commit
fbc712635c
2 changed files with 53 additions and 9 deletions
  1. 46 9
      src/components/study.vue
  2. 7 0
      src/components/studyStudent.vue

+ 46 - 9
src/components/study.vue

@@ -1001,7 +1001,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex,wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1192,7 +1192,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1289,7 +1289,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1386,7 +1386,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1483,7 +1483,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1580,7 +1580,7 @@
                               >
                                 <div
                                   class="commentImg"
-                                  @click="commentOther(w)"
+                                  @click="commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)"
                                 >
                                   <img
                                     src="../assets/icon/comment/comment.png"
@@ -1744,7 +1744,7 @@
                                 <div
                                   class="commentImg"
                                   @click="
-                                    commentOther(w, jdIndex, rwIndex, toolIndex)
+                                    commentOther(w, jdIndex, rwIndex, toolIndex, wIndex)
                                   "
                                 >
                                   <img
@@ -2667,7 +2667,7 @@
       </div>
 
       <div slot="footer">
-        <el-button @click="commentDialogVisible = false">取 消</el-button>
+        <el-button @click="commentDialogVisible = false,this.commentIndexJson={}">取 消</el-button>
         <el-button
           type="primary"
           @click="addComment(commentDetail.wid, userid, 2)"
@@ -3066,6 +3066,7 @@ export default {
       fullDialogVisible: false,
       fulltype: "",
       fullUrl: "",
+      commentIndexJson: {},
     };
   },
   methods: {
@@ -3092,6 +3093,7 @@ export default {
       }
     },
     handleClose(done) {
+      this.commentIndexJson = {};
       done();
     },
     fullTools() {
@@ -3218,6 +3220,18 @@ export default {
             }
           }
           this.$forceUpdate();
+          if (Object.keys(this.commentIndexJson).length) {
+            this.commentOther(
+              
+              this.worksStudent[this.commentIndexJson.jdIndex][this.commentIndexJson.rwIndex][this.commentIndexJson.toolIndex][
+              this.commentIndexJson.wIndex
+              ],
+              this.commentIndexJson.jdIndex,
+              this.commentIndexJson.rwIndex,
+              this.commentIndexJson.toolIndex,
+              this.commentIndexJson.wIndex
+            );
+          }
         })
         .catch((err) => {
           console.error(err);
@@ -3331,7 +3345,8 @@ export default {
           });
       }
     },
-    commentOther(w, jdIndex, rwIndex, toolIndex) {
+    commentOther(w, jdIndex, rwIndex, toolIndex,wIndex) {
+      this.commentIndexJson = { jdInde: jdIndex,reIndex:rwIndex,toolIndex: toolIndex, wIndex: wIndex };
       this.commentDetail = [];
       this.commentDialogVisible = true;
       if (w.works && w.type == 1) {
@@ -4965,6 +4980,22 @@ export default {
               )
             )
           : { url: "", select: [], answer: [] };
+        if (this.worksStudent[this.courseType][index][i].length) {
+          for (var k = 0; k < this.worksStudent[this.courseType][index][i].length; k++) {
+            if (this.userid == this.worksStudent[this.courseType][index][i][k].userid) {
+              var a = this.worksStudent[this.courseType][index][i][k].works.split(",");
+              for (var ki = 0; ki < a.length; ki++) {
+                a[ki] = parseInt(a[ki]);
+              }
+              this.selectAnswer = { answer: a, stu: this.worksStudent[this.courseType][index][i][k].sName };
+              break;
+            } else {
+              this.selectAnswer = { answer: [], stu: '' }
+            }
+          }
+        } else {
+          this.selectAnswer = { answer: [], stu: '' }
+        }
         this.isSelect = false;
         this.dialogVisibleSelect = true;
       }
@@ -6351,6 +6382,12 @@ export default {
   align-items: center;
   margin: 0 10px;
 }
+.worksName>div:nth-child(1) {
+  width: 48px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 .worksName > div:nth-child(2) {
   color: #b7b4b5;
 }

+ 7 - 0
src/components/studyStudent.vue

@@ -5700,6 +5700,13 @@ export default {
   margin: 0 10px;
 }
 
+.worksName>div:nth-child(1) {
+  width: 48px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .worksName>div:nth-child(2) {
   color: #b7b4b5;
 }