Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
700142bd27
commit
3a4524f8e9
14 changed files with 82 additions and 59 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.39876ee8599d212cbc2651e982b8fa81.css
  3. 0 0
      dist/static/css/app.39876ee8599d212cbc2651e982b8fa81.css.map
  4. 0 0
      dist/static/css/app.f46ad644e8688b45e6f212770011a7e5.css.map
  5. BIN
      dist/static/img/eval.5e18f49.png
  6. 0 0
      dist/static/js/app.8a33040381d0a124f400.js
  7. 0 0
      dist/static/js/app.8a33040381d0a124f400.js.map
  8. 0 0
      dist/static/js/app.f28d137665d85492171e.js
  9. 0 0
      dist/static/js/app.f28d137665d85492171e.js.map
  10. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  11. 0 0
      dist/static/js/vendor.22ce41e1fce64bc5d1cf.js
  12. 0 0
      dist/static/js/vendor.22ce41e1fce64bc5d1cf.js.map
  13. 48 35
      src/components/study.vue
  14. 33 23
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -18,4 +18,4 @@
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
-    }</style><link href=./static/css/app.f46ad644e8688b45e6f212770011a7e5.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.f28d137665d85492171e.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
+    }</style><link href=./static/css/app.39876ee8599d212cbc2651e982b8fa81.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.22ce41e1fce64bc5d1cf.js></script><script type=text/javascript src=./static/js/app.8a33040381d0a124f400.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.39876ee8599d212cbc2651e982b8fa81.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.39876ee8599d212cbc2651e982b8fa81.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.f46ad644e8688b45e6f212770011a7e5.css.map


BIN
dist/static/img/eval.5e18f49.png
View File


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.8a33040381d0a124f400.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.8a33040381d0a124f400.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f28d137665d85492171e.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.f28d137665d85492171e.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.22ce41e1fce64bc5d1cf.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/vendor.22ce41e1fce64bc5d1cf.js.map


+ 48 - 35
src/components/study.vue
View File 

@@ -1709,7 +1709,9 @@
 
                           <div class="workImg">
 
                             <img
 
                               src="../assets/icon/works/noImg.png"
 
-                              @click="openPj(w.works)"
 
+                              @click="
 
+                                openPj(w.works, jdIndex, rwIndex, toolIndex)
 
+                              "
 
                               alt
 
                             />
 
                           </div>
 
@@ -1738,7 +1740,9 @@
 
                               >
 
                                 <div
 
                                   class="commentImg"
 
-                                  @click="commentOther(w)"
 
+                                  @click="
 
+                                    commentOther(w, jdIndex, rwIndex, toolIndex)
 
+                                  "
 
                                 >
 
                                   <img
 
                                     src="../assets/icon/comment/comment.png"
 
@@ -2497,10 +2501,9 @@
 
                   <div>{{ e.value }}</div>
 
                   <el-rate v-model="eScore.eStar[eIndex]" disabled></el-rate>
 
                 </div>
 
-                <div>{{ e.detail }}</div>
 
+                <div v-if="e.detail">{{ e.detail }}</div>
 
               </div>
 
               <div class="bz">
 
-                <div>备注</div>
 
                 <textarea
 
                   disabled
 
                   rows="4"
 
@@ -2666,10 +2669,9 @@
 
                 :disabled="isStar"
 
               ></el-rate>
 
             </div>
 
-            <div>{{ e.detail }}</div>
 
+            <div v-if="e.detail">{{ e.detail }}</div>
 
           </div>
 
           <div class="bz">
 
-            <div>备注</div>
 
             <textarea
 
               :disabled="isStar == true"
 
               rows="4"
 
@@ -3164,7 +3166,7 @@ export default {
 
           });
 
       }
 
     },
 
-    commentOther(w) {
 
+    commentOther(w, jdIndex, rwIndex, toolIndex) {
 
       this.commentDetail = [];
 
       this.commentDialogVisible = true;
 
       if (w.works && w.type == 1) {
 
@@ -3197,9 +3199,9 @@ export default {
 
         this.commentDetail = w;
 
         this.eScore = JSON.parse(w.works);
 
         this.rateJson =
 
-          this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-            this.taskCount
 
-          ].toolChoose[this.toolindex].rateJson;
 
+          this.chapInfoList[jdIndex].chapterInfo[0].taskJson[
 
+            rwIndex
 
+          ].toolChoose[toolIndex].rateJson;
 
       } else {
 
         this.commentDetail = w;
 
       }
 
@@ -4739,40 +4741,49 @@ export default {
 
           a = this.evalCount;
 
           this.toolsCount(a, t);
 
         }
 
-        for (
 
-          var k = 0;
 
-          k < this.worksStudent[this.courseType][index][i].length;
 
-          k++
 
-        ) {
 
-          if (
 
-            this.userid ==
 
-            this.worksStudent[this.courseType][index][i][k].userid
 
+        if (this.worksStudent[this.courseType][index][i].length) {
 
+          for (
 
+            var k = 0;
 
+            k < this.worksStudent[this.courseType][index][i].length;
 
+            k++
 
           ) {
 
-            this.eScore = JSON.parse(
 
-              this.worksStudent[this.courseType][index][i][k].works
 
-            );
 
-            this.rateJson =
 
-              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-                index
 
-              ].toolChoose[i].rateJson;
 
-          } else {
 
-            this.rateJson =
 
-              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-                index
 
-              ].toolChoose[i].rateJson;
 
+            if (
 
+              this.userid ==
 
+              this.worksStudent[this.courseType][index][i][k].userid
 
+            ) {
 
+              this.eScore = JSON.parse(
 
+                this.worksStudent[this.courseType][index][i][k].works
 
+              );
 
+              this.rateJson =
 
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+                  index
 
+                ].toolChoose[i].rateJson;
 
+              break;
 
+            } else {
 
+              this.rateJson =
 
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+                  index
 
+                ].toolChoose[i].rateJson;
 
+            }
 
           }
 
+        } else {
 
+          this.rateJson =
 
+            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+              index
 
+            ].toolChoose[i].rateJson;
 
         }
 
+
 
         this.isStar = false;
 
         this.studentEvalDialogVisible = true;
 
       }
 
     },
 
-    openPj(w) {
 
+    openPj(w, jd, rw, toolindex) {
 
       this.isStar = true;
 
       this.eScore = JSON.parse(w);
 
       this.rateJson =
 
-        this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-          this.taskCount
 
-        ].toolChoose[this.toolindex].rateJson;
 
+        this.chapInfoList[jd].chapterInfo[0].taskJson[rw].toolChoose[
 
+          toolindex
 
+        ].rateJson;
 
       this.studentEvalDialogVisible = true;
 
     },
 
     toolsCount(a, t) {
 
@@ -6076,9 +6087,11 @@ export default {
 
   justify-content: flex-start;
 
   align-content: center;
 
   width: 240px;
 
-  height: 170px;
 
+  height: 140px;
 
   margin-right: 10px;
 
   overflow: hidden;
 
+  box-shadow: 0 0 6px 1px #dfdada;
 
+  border-radius: 15px;
 
 }
 
 .workImg {
 
   width: 100%;

+ 33 - 23
src/components/studyStudent.vue
View File 

@@ -1928,7 +1928,7 @@
 
                         <div class="workImg">
 
                           <img
 
                             src="../assets/icon/works/noImg.png"
 
-                            @click="openPj(w.works)"
 
+                            @click="openPj(w.works, toolIndex)"
 
                             alt
 
                           />
 
                         </div>
 
@@ -1952,7 +1952,7 @@
 
                               <div>{{ w.likesCount }}</div>
 
                             </div>
 
                             <div class="commentList" style="margin-right: 15px">
 
-                              <div class="commentImg" @click="commentOther(w)">
 
+                              <div class="commentImg" @click="commentOther(w, toolIndex)">
 
                                 <img
 
                                   src="../assets/icon/comment/comment.png"
 
                                   alt=""
 
@@ -2002,7 +2002,7 @@
 
                         <div class="workImg">
 
                           <img
 
                             src="../assets/icon/works/noImg.png"
 
-                            @click="openPj(w.works)"
 
+                            @click="openPj(w.works, toolIndex)"
 
                             alt
 
                           />
 
                         </div>
 
@@ -2741,10 +2741,9 @@
 
                   <div>{{ e.value }}</div>
 
                   <el-rate v-model="eScore.eStar[eIndex]" disabled></el-rate>
 
                 </div>
 
-                <div>{{ e.detail }}</div>
 
+                <div v-if="e.detail">{{ e.detail }}</div>
 
               </div>
 
               <div class="bz">
 
-                <div>备注</div>
 
                 <textarea
 
                   disabled
 
                   rows="4"
 
@@ -2926,10 +2925,9 @@
 
                 :disabled="isStar"
 
               ></el-rate>
 
             </div>
 
-            <div>{{ e.detail }}</div>
 
+            <div v-if="e.detail">{{ e.detail }}</div>
 
           </div>
 
           <div class="bz">
 
-            <div>备注</div>
 
             <textarea
 
               :disabled="isStar"
 
               rows="4"
 
@@ -3437,7 +3435,7 @@ export default {
 
           });
 
       }
 
     },
 
-    commentOther(w) {
 
+    commentOther(w, toolIndex) {
 
       this.commentDetail = [];
 
       this.commentDialogVisible = true;
 
       if (w.works && w.type == 1) {
 
@@ -3472,7 +3470,7 @@ export default {
 
         this.rateJson =
 
           this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
             this.taskCount
 
-          ].toolChoose[this.toolindex].rateJson;
 
+          ].toolChoose[toolIndex].rateJson;
 
       } else {
 
         this.commentDetail = w;
 
       }
 
@@ -3502,13 +3500,13 @@ export default {
 
           console.error(err);
 
         });
 
     },
 
-    openPj(w) {
 
+    openPj(w, toolindex) {
 
       this.isStar = true;
 
       this.eScore = JSON.parse(w);
 
       this.rateJson =
 
         this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
           this.taskCount
 
-        ].toolChoose[this.toolindex].rateJson;
 
+        ].toolChoose[toolindex].rateJson;
 
       this.studentEvalDialogVisible = true;
 
     },
 
     selectSWorks() {
 
@@ -4997,20 +4995,29 @@ export default {
 
           a = this.evalCount;
 
           this.toolsCount(a, t);
 
         }
 
-        for (var k = 0; k < this.worksStudent[i].length; k++) {
 
-          if (this.userid == this.worksStudent[i][k].userid) {
 
-            this.eScore = JSON.parse(this.worksStudent[i][k].works);
 
-            this.rateJson =
 
-              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-                index
 
-              ].toolChoose[i].rateJson;
 
-          } else {
 
-            this.rateJson =
 
-              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
-                index
 
-              ].toolChoose[i].rateJson;
 
+        if (this.worksStudent[i].length) {
 
+          for (var k = 0; k < this.worksStudent[i].length; k++) {
 
+            if (this.userid == this.worksStudent[i][k].userid) {
 
+              this.eScore = JSON.parse(this.worksStudent[i][k].works);
 
+              this.rateJson =
 
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+                  index
 
+                ].toolChoose[i].rateJson;
 
+              break;
 
+            } else {
 
+              this.rateJson =
 
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+                  index
 
+                ].toolChoose[i].rateJson;
 
+            }
 
           }
 
+        } else {
 
+          this.rateJson =
 
+            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
 
+              index
 
+            ].toolChoose[i].rateJson;
 
         }
 
+
 
         this.isStar = false;
 
         this.studentEvalDialogVisible = true;
 
       }
 
@@ -6267,6 +6274,9 @@ export default {
 
   margin-right: 10px;
 
   margin-bottom: 10px;
 
   overflow: hidden;
 
+  height: 140px;
 
+  box-shadow: 0 0 6px 1px #dfdada;
 
+  border-radius: 15px;
 
 }
 
 .workImg {
 
   width: 100%;

Some files were not shown because too many files changed in this diff