lsc 1 year ago
parent
commit
079884e84e

+ 1 - 1
dist/index.html

@@ -25,7 +25,7 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
-    }</style><link href=./static/css/app.50a17334bfb7c37d6ea6aa7f624d8eac.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.cc482137b2a537b9186d.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.c61a0ae994306d79713de04d276096b6.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.d2a60cf4f8d4649786e6.js></script><script type=text/javascript src=./static/js/app.7b26459c423dae5b0a19.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


BIN
dist/static/img/allHistory.2b42789.png


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


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


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


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


BIN
src/assets/icon/fourthToolList/allHistory.png


+ 45 - 31
src/components/pages/addCourse.vue

@@ -1357,7 +1357,7 @@
                               </div>
                             </div>
                             <div class="tool">
-                              <div class="whiteBIcon" @click="openTools(itemTaskIndex, 50, toolIndex)">
+                              <div class="whiteBIcon" @click="addTools(50, itemTaskIndex, toolIndex)">
                                 <img src="../../assets/icon/thirdToolList/plwork.png" alt />
                                 <div style="margin: 5px 0">批量上传</div>
                               </div>
@@ -1653,6 +1653,18 @@
                                 </div>
                               </div>
                             </div>
+                            <div class="tool">
+                              <div class="whiteBIcon" @click="addTools(61, itemTaskIndex, toolIndex)">
+                                <img src="../../assets/icon/fourthToolList/allHistory.png" alt />
+                                <div style="margin: 5px 0">全历史</div>
+                              </div>
+                              <div class="check" @click="addTools(61, itemTaskIndex, toolIndex)">
+                                <img src="../../assets/icon/checkNo.png" alt v-if="itemTool.tool.indexOf(61) == -1" />
+                                <div class="checkDiv" v-else>
+                                  <img src="../../assets/icon/checkedIs.png" alt /><span>已选择</span>
+                                </div>
+                              </div>
+                            </div>
                             <!-- <div class="tool">
                               <div class="whiteBIcon" @click="addTools(44, itemTaskIndex, toolIndex)">
                                 <img src="../../assets/icon/thirdToolList/hanClass.png" alt />
@@ -3326,11 +3338,12 @@ export default {
     setMan() {
       // let teacherJuri = this.teacherJuri2;
       this.ManAarray = [];
-      if (this.checkboxList3.indexOf(this.courseUserid || this.userid) == -1) {
-        this.checkboxList3.push(this.courseUserid || this.userid);
+      let _user = JSON.parse(JSON.stringify(this.checkboxList3))
+      if (_user.indexOf(this.courseUserid || this.userid) == -1) {
+        _user.push(this.courseUserid || this.userid);
       }
       let params = {
-        uid: this.checkboxList3.join(","),
+        uid: _user.join(","),
       };
       this.ajax
         .get(this.$store.state.api + "getAllUserById", params)
@@ -5358,24 +5371,25 @@ export default {
           this.wordJson = wordJson;
         }
         this.dialogVisibleWord = true;
-      } else if (i == 50) {
-        if (
-          this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
-            .toolChoose[toolIndex].uploadJson
-        ) {
-          this.uploadJson = JSON.parse(
-            JSON.stringify(
-              this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
-                itemTaskIndex
-              ].toolChoose[toolIndex].uploadJson
-            )
-          );
-        } else {
-          var uploadJson = [];
-          this.uploadJson = uploadJson;
-        }
-        this.dialogVisibleMoreUpload = true;
-      } else if (i == 10) {
+      //   else if (i == 50) {
+      //   if (
+      //     this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
+      //       .toolChoose[toolIndex].uploadJson
+      //   ) {
+      //     this.uploadJson = JSON.parse(
+      //       JSON.stringify(
+      //         this.unitJson[this.unitIndex].chapterInfo[0].taskJson[
+      //           itemTaskIndex
+      //         ].toolChoose[toolIndex].uploadJson
+      //       )
+      //     );
+      //   } else {
+      //     var uploadJson = [];
+      //     this.uploadJson = uploadJson;
+      //   }
+      //   this.dialogVisibleMoreUpload = true;
+      // }
+      }  else if (i == 10) {
         if (
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
             .toolChoose[toolIndex].preTime
@@ -5611,15 +5625,15 @@ export default {
       //     return;
       //   }
       // }
-      if (i == 50) {
-        if (
-          !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
-            .toolChoose[toolIndex].uploadJson
-        ) {
-          this.openTools(itemTaskIndex, 50, toolIndex);
-          return;
-        }
-      }
+      // if (i == 50) {
+      //   if (
+      //     !this.unitJson[this.unitIndex].chapterInfo[0].taskJson[itemTaskIndex]
+      //       .toolChoose[toolIndex].uploadJson
+      //   ) {
+      //     this.openTools(itemTaskIndex, 50, toolIndex);
+      //     return;
+      //   }
+      // }
 
       if (i == 49) {
         if (

+ 1 - 1
src/components/pages/course.vue

@@ -114,7 +114,7 @@
             <div class="myCourse" v-if="item.userid == userid">
               我的课程
             </div>
-            <div class="myCourse" style="background:#4187f0" v-else-if="item.course_teacher.indexOf(userid) == -1">
+            <div class="myCourse" style="background:#4187f0" v-else-if="!item.course_teacher || (item.course_teacher && item.course_teacher.indexOf(userid) == -1)">
               他人课程
             </div>
             <div class="xtCourse" v-else>协同课程</div>

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