Merge branch 'beta' into HK

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

@@ -2144,37 +2144,24 @@ export default {
             }
           }, 0);
           let _dyList = JSON.parse(JSON.stringify(this.dyList));
-          let _dyList2 = [];
-          let _dyList3 = [];
-          for (var c = 0; c < _dyList.length; c++) {
-            _dyList[c].taskList = [];
-            _dyList2.push(_dyList[c]);
-          }
-          _dyList = JSON.parse(JSON.stringify(this.dyList));
-          for (var c = 0; c < result.length; c++) {
-            let _stage = result[c].stagetask.split("-")[0];
-            let _task = result[c].stagetask.split("-")[1];
-            if (_dyList2[_stage].taskList.length > 0) {
-              for (var i = 0; i < _dyList2[_stage].taskList.length; i++) {
-                if (
-                  _dyList[_stage].taskList[_task].id ==
-                  _dyList2[_stage].taskList[i].id
-                ) {
-                  continue;
-                }
-              }
-            } else {
-              _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
-              _dyList2[_stage].taskList;
-            }
-          }
-          for (var c = 0; c < _dyList2.length; c++) {
-            if (_dyList2[c].taskList.length) {
-              _dyList2[c].isOpen = c === 0 ? true : false;
-              _dyList3.push(_dyList2[c]);
-            }
+          // let _dyList2 = [];
+          // let _dyList3 = [];
+          // for (var c = 0; c < _dyList.length; c++) {
+          //   _dyList[c].taskList = [];
+          //   _dyList2.push(_dyList[c]);
+          // }
+          // _dyList = JSON.parse(JSON.stringify(this.dyList));
+          // for (var c = 0; c < result.length; c++) {
+          //   let _stage = result[c].stagetask.split("-")[0];
+          //   let _task = result[c].stagetask.split("-")[1];
+          //     _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
+          //     _dyList2[_stage].taskList;
+          // }
+          for (var dc = 0; dc < _dyList.length; dc++) {
+              _dyList[dc].isOpen = dc === 0 ? true : false;
           }
-          this.dyList2 = _dyList3;
+
+          this.dyList2 = _dyList;
           this.stageIndex = this.dyList2[0].id;
           this.taskCount = this.dyList2[0].taskList[0].id;
           this.navId =

src/components/pages/components/studentWorksDetail.vue

@@ -2518,37 +2518,24 @@ export default {
             }
           }, 0);
           let _dyList = JSON.parse(JSON.stringify(this.dyList));
-          let _dyList2 = [];
-          let _dyList3 = [];
-          for (var c = 0; c < _dyList.length; c++) {
-            _dyList[c].taskList = [];
-            _dyList2.push(_dyList[c]);
-          }
-          _dyList = JSON.parse(JSON.stringify(this.dyList));
-          for (var c = 0; c < result.length; c++) {
-            let _stage = result[c].stagetask.split("-")[0];
-            let _task = result[c].stagetask.split("-")[1];
-            if (_dyList2[_stage].taskList.length > 0) {
-              for (var i = 0; i < _dyList2[_stage].taskList.length; i++) {
-                if (
-                  _dyList[_stage].taskList[_task].id ==
-                  _dyList2[_stage].taskList[i].id
-                ) {
-                  continue;
-                }
-              }
-            } else {
-              _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
-              _dyList2[_stage].taskList;
-            }
-          }
-          for (var c = 0; c < _dyList2.length; c++) {
-            if (_dyList2[c].taskList.length) {
-              _dyList2[c].isOpen = c === 0 ? true : false;
-              _dyList3.push(_dyList2[c]);
-            }
+          // let _dyList2 = [];
+          // let _dyList3 = [];
+          // for (var c = 0; c < _dyList.length; c++) {
+          //   _dyList[c].taskList = [];
+          //   _dyList2.push(_dyList[c]);
+          // }
+          // _dyList = JSON.parse(JSON.stringify(this.dyList));
+          // for (var c = 0; c < result.length; c++) {
+          //   let _stage = result[c].stagetask.split("-")[0];
+          //   let _task = result[c].stagetask.split("-")[1];
+          //     _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
+          //     _dyList2[_stage].taskList;
+          // }
+          for (var dc = 0; dc < _dyList.length; dc++) {
+              _dyList[dc].isOpen = dc === 0 ? true : false;
           }
-          this.dyList2 = _dyList3;
+
+          this.dyList2 = _dyList;
           this.stageIndex = this.dyList2[0].id;
           this.taskCount = this.dyList2[0].taskList[0].id;
           this.navId =

src/components/pages/components/worksDetail2.vue

@@ -2520,37 +2520,24 @@ export default {
             }
           }, 0);
           let _dyList = JSON.parse(JSON.stringify(this.dyList));
-          let _dyList2 = [];
-          let _dyList3 = [];
-          for (var c = 0; c < _dyList.length; c++) {
-            _dyList[c].taskList = [];
-            _dyList2.push(_dyList[c]);
-          }
-          _dyList = JSON.parse(JSON.stringify(this.dyList));
-          for (var c = 0; c < result.length; c++) {
-            let _stage = result[c].stagetask.split("-")[0];
-            let _task = result[c].stagetask.split("-")[1];
-            if (_dyList2[_stage].taskList.length > 0) {
-              for (var i = 0; i < _dyList2[_stage].taskList.length; i++) {
-                if (
-                  _dyList[_stage].taskList[_task].id ==
-                  _dyList2[_stage].taskList[i].id
-                ) {
-                  continue;
-                }
-              }
-            } else {
-              _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
-              _dyList2[_stage].taskList;
-            }
-          }
-          for (var c = 0; c < _dyList2.length; c++) {
-            if (_dyList2[c].taskList.length) {
-              _dyList2[c].isOpen = c === 0 ? true : false;
-              _dyList3.push(_dyList2[c]);
-            }
+          // let _dyList2 = [];
+          // let _dyList3 = [];
+          // for (var c = 0; c < _dyList.length; c++) {
+          //   _dyList[c].taskList = [];
+          //   _dyList2.push(_dyList[c]);
+          // }
+          // _dyList = JSON.parse(JSON.stringify(this.dyList));
+          // for (var c = 0; c < result.length; c++) {
+          //   let _stage = result[c].stagetask.split("-")[0];
+          //   let _task = result[c].stagetask.split("-")[1];
+          //     _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
+          //     _dyList2[_stage].taskList;
+          // }
+          for (var dc = 0; dc < _dyList.length; dc++) {
+              _dyList[dc].isOpen = dc === 0 ? true : false;
           }
-          this.dyList2 = _dyList3;
+
+          this.dyList2 = _dyList;
           this.stageIndex = this.dyList2[0].id;
           this.taskCount = this.dyList2[0].taskList[0].id;
           this.navId =

src/components/pages/components/worksDetail3.vue

@@ -2144,37 +2144,24 @@ export default {
             }
           }, 0);
           let _dyList = JSON.parse(JSON.stringify(this.dyList));
-          let _dyList2 = [];
-          let _dyList3 = [];
-          for (var c = 0; c < _dyList.length; c++) {
-            _dyList[c].taskList = [];
-            _dyList2.push(_dyList[c]);
-          }
-          _dyList = JSON.parse(JSON.stringify(this.dyList));
-          for (var c = 0; c < result.length; c++) {
-            let _stage = result[c].stagetask.split("-")[0];
-            let _task = result[c].stagetask.split("-")[1];
-            if (_dyList2[_stage].taskList.length > 0) {
-              for (var i = 0; i < _dyList2[_stage].taskList.length; i++) {
-                if (
-                  _dyList[_stage].taskList[_task].id ==
-                  _dyList2[_stage].taskList[i].id
-                ) {
-                  continue;
-                }
-              }
-            } else {
-              _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
-              _dyList2[_stage].taskList;
-            }
-          }
-          for (var c = 0; c < _dyList2.length; c++) {
-            if (_dyList2[c].taskList.length) {
-              _dyList2[c].isOpen = c === 0 ? true : false;
-              _dyList3.push(_dyList2[c]);
-            }
+          // let _dyList2 = [];
+          // let _dyList3 = [];
+          // for (var c = 0; c < _dyList.length; c++) {
+          //   _dyList[c].taskList = [];
+          //   _dyList2.push(_dyList[c]);
+          // }
+          // _dyList = JSON.parse(JSON.stringify(this.dyList));
+          // for (var c = 0; c < result.length; c++) {
+          //   let _stage = result[c].stagetask.split("-")[0];
+          //   let _task = result[c].stagetask.split("-")[1];
+          //     _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
+          //     _dyList2[_stage].taskList;
+          // }
+          for (var dc = 0; dc < _dyList.length; dc++) {
+              _dyList[dc].isOpen = dc === 0 ? true : false;
           }
-          this.dyList2 = _dyList3;
+
+          this.dyList2 = _dyList;
           this.stageIndex = this.dyList2[0].id;
           this.taskCount = this.dyList2[0].taskList[0].id;
           this.navId =

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

@@ -2143,37 +2143,24 @@ export default {
             }
           }, 0);
           let _dyList = JSON.parse(JSON.stringify(this.dyList));
-          let _dyList2 = [];
-          let _dyList3 = [];
-          for (var c = 0; c < _dyList.length; c++) {
-            _dyList[c].taskList = [];
-            _dyList2.push(_dyList[c]);
-          }
-          _dyList = JSON.parse(JSON.stringify(this.dyList));
-          for (var c = 0; c < result.length; c++) {
-            let _stage = result[c].stagetask.split("-")[0];
-            let _task = result[c].stagetask.split("-")[1];
-            if (_dyList2[_stage].taskList.length > 0) {
-              for (var i = 0; i < _dyList2[_stage].taskList.length; i++) {
-                if (
-                  _dyList[_stage].taskList[_task].id ==
-                  _dyList2[_stage].taskList[i].id
-                ) {
-                  continue;
-                }
-              }
-            } else {
-              _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
-              _dyList2[_stage].taskList;
-            }
-          }
-          for (var c = 0; c < _dyList2.length; c++) {
-            if (_dyList2[c].taskList.length) {
-              _dyList2[c].isOpen = c === 0 ? true : false;
-              _dyList3.push(_dyList2[c]);
-            }
+          // let _dyList2 = [];
+          // let _dyList3 = [];
+          // for (var c = 0; c < _dyList.length; c++) {
+          //   _dyList[c].taskList = [];
+          //   _dyList2.push(_dyList[c]);
+          // }
+          // _dyList = JSON.parse(JSON.stringify(this.dyList));
+          // for (var c = 0; c < result.length; c++) {
+          //   let _stage = result[c].stagetask.split("-")[0];
+          //   let _task = result[c].stagetask.split("-")[1];
+          //     _dyList2[_stage].taskList.push(_dyList[_stage].taskList[_task]);
+          //     _dyList2[_stage].taskList;
+          // }
+          for (var dc = 0; dc < _dyList.length; dc++) {
+              _dyList[dc].isOpen = dc === 0 ? true : false;
           }
-          this.dyList2 = _dyList3;
+
+          this.dyList2 = _dyList;
           this.stageIndex = this.dyList2[0].id;
           this.taskCount = this.dyList2[0].taskList[0].id;
           this.navId =