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

src/components/pages/components/classStudentComponents/worksDetail3.vue

@@ -59,6 +59,12 @@
                     >
                       任务{{ navIndex + 1 }}
                     </div>
+                    <div
+                      class="isWorkCss"
+                      v-if="nav.isWork && nav.isWork == true"
+                    >
+                      <img src="../../../../assets/icon/isWork.png" alt="" />
+                    </div>
                     <el-tooltip
                       class="navTaskname item"
                       effect="light"
@@ -2164,7 +2170,22 @@ export default {
           //     _dyList2[_stage].taskList;
           // }
           for (var dc = 0; dc < _dyList.length; dc++) {
-            _dyList[dc].isOpen = dc === 0 ? true : false;
+            // _dyList[dc].isOpen = dc === 0 ? true : false;
+            _dyList[dc].isOpen = true;
+          }
+
+          for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < _dyList.length; j++) {
+              var sta = result[i].stagetask.split("-")[0];
+              var ta = result[i].stagetask.split("-")[1];
+              if (sta == _dyList[j].id) {
+                for (var z = 0; z < _dyList[j].taskList.length; z++) {
+                  if (ta == _dyList[j].taskList[z].id) {
+                    _dyList[j].taskList[z].isWork = true;
+                  }
+                }
+              }
+            }
           }
 
           this.dyList2 = _dyList;
@@ -3222,7 +3243,7 @@ export default {
 }
 
 .isClick {
-  border: 3px solid #5f89d4;
+  /* border: 3px solid #5f89d4; */
   border-radius: 5px;
 }
 
@@ -3774,6 +3795,17 @@ export default {
   font-size: 14px;
 }
 
+.isWorkCss {
+  min-width: 20px;
+  height: 20px;
+  margin: 0 5px 0 10px;
+}
+
+.isWorkCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .navTaskname {
   white-space: nowrap;
   text-overflow: ellipsis;

src/components/pages/components/studentWorksDetail.vue

@@ -277,6 +277,12 @@
                           >
                             任务{{ navIndex + 1 }}
                           </div>
+                          <div
+                            class="isWorkCss"
+                            v-if="nav.isWork && nav.isWork == true"
+                          >
+                            <img src="../../../assets/icon/isWork.png" alt="" />
+                          </div>
                           <el-tooltip
                             class="navTaskname item"
                             effect="light"
@@ -2538,7 +2544,22 @@ export default {
           //     _dyList2[_stage].taskList;
           // }
           for (var dc = 0; dc < _dyList.length; dc++) {
-            _dyList[dc].isOpen = dc === 0 ? true : false;
+            // _dyList[dc].isOpen = dc === 0 ? true : false;
+            _dyList[dc].isOpen = true;
+          }
+
+          for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < _dyList.length; j++) {
+              var sta = result[i].stagetask.split("-")[0];
+              var ta = result[i].stagetask.split("-")[1];
+              if (sta == _dyList[j].id) {
+                for (var z = 0; z < _dyList[j].taskList.length; z++) {
+                  if (ta == _dyList[j].taskList[z].id) {
+                    _dyList[j].taskList[z].isWork = true;
+                  }
+                }
+              }
+            }
           }
 
           this.dyList2 = _dyList;
@@ -3924,7 +3945,7 @@ export default {
 }
 
 .isClick {
-  border: 3px solid #5f89d4;
+  /* border: 3px solid #5f89d4; */
   border-radius: 5px;
 }
 
@@ -4791,6 +4812,17 @@ ol {
   font-size: 14px;
 }
 
+.isWorkCss {
+  min-width: 20px;
+  height: 20px;
+  margin: 0 5px 0 10px;
+}
+
+.isWorkCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .navTaskname {
   white-space: nowrap;
   text-overflow: ellipsis;

src/components/pages/components/worksDetail2.vue

@@ -275,6 +275,12 @@
                           >
                             任务{{ navIndex + 1 }}
                           </div>
+                          <div
+                            class="isWorkCss"
+                            v-if="nav.isWork && nav.isWork == true"
+                          >
+                            <img src="../../../assets/icon/isWork.png" alt="" />
+                          </div>
                           <el-tooltip
                             class="navTaskname item"
                             effect="light"
@@ -2542,7 +2548,22 @@ export default {
           //     _dyList2[_stage].taskList;
           // }
           for (var dc = 0; dc < _dyList.length; dc++) {
-            _dyList[dc].isOpen = dc === 0 ? true : false;
+            // _dyList[dc].isOpen = dc === 0 ? true : false;
+            _dyList[dc].isOpen = true;
+          }
+
+          for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < _dyList.length; j++) {
+              var sta = result[i].stagetask.split("-")[0];
+              var ta = result[i].stagetask.split("-")[1];
+              if (sta == _dyList[j].id) {
+                for (var z = 0; z < _dyList[j].taskList.length; z++) {
+                  if (ta == _dyList[j].taskList[z].id) {
+                    _dyList[j].taskList[z].isWork = true;
+                  }
+                }
+              }
+            }
           }
 
           this.dyList2 = _dyList;
@@ -4052,7 +4073,7 @@ export default {
 }
 
 .isClick {
-  border: 3px solid #5f89d4;
+  /* border: 3px solid #5f89d4; */
   border-radius: 5px;
 }
 
@@ -4610,6 +4631,17 @@ export default {
   font-size: 14px;
 }
 
+.isWorkCss {
+  min-width: 20px;
+  height: 20px;
+  margin: 0 5px 0 10px;
+}
+
+.isWorkCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .navTaskname {
   white-space: nowrap;
   text-overflow: ellipsis;

src/components/pages/components/worksDetail3.vue

@@ -59,6 +59,12 @@
                     >
                       任务{{ navIndex + 1 }}
                     </div>
+                    <div
+                      class="isWorkCss"
+                      v-if="nav.isWork && nav.isWork == true"
+                    >
+                      <img src="../../../assets/icon/isWork.png" alt="" />
+                    </div>
                     <el-tooltip
                       class="navTaskname item"
                       effect="light"
@@ -2164,7 +2170,22 @@ export default {
           //     _dyList2[_stage].taskList;
           // }
           for (var dc = 0; dc < _dyList.length; dc++) {
-            _dyList[dc].isOpen = dc === 0 ? true : false;
+            // _dyList[dc].isOpen = dc === 0 ? true : false;
+            _dyList[dc].isOpen = true;
+          }
+
+          for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < _dyList.length; j++) {
+              var sta = result[i].stagetask.split("-")[0];
+              var ta = result[i].stagetask.split("-")[1];
+              if (sta == _dyList[j].id) {
+                for (var z = 0; z < _dyList[j].taskList.length; z++) {
+                  if (ta == _dyList[j].taskList[z].id) {
+                    _dyList[j].taskList[z].isWork = true;
+                  }
+                }
+              }
+            }
           }
 
           this.dyList2 = _dyList;
@@ -3226,7 +3247,7 @@ export default {
 }
 
 .isClick {
-  border: 3px solid #5f89d4;
+  /* border: 3px solid #5f89d4; */
   border-radius: 5px;
 }
 
@@ -3778,6 +3799,17 @@ export default {
   font-size: 14px;
 }
 
+.isWorkCss {
+  min-width: 20px;
+  height: 20px;
+  margin: 0 5px 0 10px;
+}
+
+.isWorkCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .navTaskname {
   white-space: nowrap;
   text-overflow: ellipsis;

src/components/pages/myReport/components/MyLookComponent/worksDetail3.vue

@@ -59,6 +59,12 @@
                     >
                       任务{{ navIndex + 1 }}
                     </div>
+                    <div
+                      class="isWorkCss"
+                      v-if="nav.isWork && nav.isWork == true"
+                    >
+                      <img src="../../../../../assets/icon/isWork.png" alt="" />
+                    </div>
                     <el-tooltip
                       class="navTaskname item"
                       effect="light"
@@ -2163,7 +2169,22 @@ export default {
           //     _dyList2[_stage].taskList;
           // }
           for (var dc = 0; dc < _dyList.length; dc++) {
-            _dyList[dc].isOpen = dc === 0 ? true : false;
+            // _dyList[dc].isOpen = dc === 0 ? true : false;
+            _dyList[dc].isOpen = true;
+          }
+
+          for (var i = 0; i < result.length; i++) {
+            for (var j = 0; j < _dyList.length; j++) {
+              var sta = result[i].stagetask.split("-")[0];
+              var ta = result[i].stagetask.split("-")[1];
+              if (sta == _dyList[j].id) {
+                for (var z = 0; z < _dyList[j].taskList.length; z++) {
+                  if (ta == _dyList[j].taskList[z].id) {
+                    _dyList[j].taskList[z].isWork = true;
+                  }
+                }
+              }
+            }
           }
 
           this.dyList2 = _dyList;
@@ -3225,7 +3246,7 @@ export default {
 }
 
 .isClick {
-  border: 3px solid #5f89d4;
+  /* border: 3px solid #5f89d4; */
   border-radius: 5px;
 }
 
@@ -4086,6 +4107,17 @@ ol {
   font-size: 14px;
 }
 
+.isWorkCss {
+  min-width: 20px;
+  height: 20px;
+  margin: 0 5px 0 10px;
+}
+
+.isWorkCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .navTaskname {
   white-space: nowrap;
   text-overflow: ellipsis;