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

src/components/pages/addCourse.vue

@@ -107,7 +107,7 @@
             <div class="stepsNav">
               <h3 class="info_title" v-if="steps == 1">课程内容填写</h3>
               <h3 class="info_title" v-if="steps == 2">请选择课程框架</h3>
-              <h3 class="info_title" v-if="steps == 3">课程内容填写</h3>
+              <h3 class="info_title" v-if="steps == 3">上传课程内容</h3>
               <h3 class="info_title" v-if="steps == 4">上传课程</h3>
               <el-breadcrumb
                 separator-class="el-icon-arrow-right"
@@ -986,13 +986,13 @@
                                 <div
                                   class="chapter_upload_up"
                                   @click="
-                                    upCd($event, unitIndex, index, index1)
+                                    upCd($event, unitIndex, index,itemTaskIndex, index1)
                                   "
                                 ></div>
                                 <div
                                   class="chapter_upload_down"
                                   @click="
-                                    downCd($event, unitIndex, index, index1)
+                                    downCd($event, unitIndex, index,itemTaskIndex, index1)
                                   "
                                 ></div>
                               </div>
@@ -1195,7 +1195,7 @@
                               </div>
                               <div class="chapter_upload_n">
                                 <span
-                                  style="font-size: 14px; color: #6d6d6d"
+                                  style="font-size: 14px;color: rgb(109, 109, 109);height: 14px;line-height: 12px;"
                                   v-if="
                                     item1.type == 2 ||
                                     item1.type == 3 ||
@@ -1264,12 +1264,12 @@
                                   class="chapter_upload_ud"
                                   style="z-index: 99"
                                 >
-                                  <!-- <div class="chapter_upload_up" @click="
-                                  upCd($event, unitIndex, index, index1)
+                                  <div class="chapter_upload_up" @click="
+                                  upCd($event, unitIndex, index,itemTaskIndex, index1)
                                 "></div>
                                 <div class="chapter_upload_down" @click="
-                                  downCd($event, unitIndex, index, index1)
-                                "></div> -->
+                                  downCd($event, unitIndex, index,itemTaskIndex, index1)
+                                "></div>
                                 </div>
                               </div>
                             </div>
@@ -4988,15 +4988,17 @@ export default {
     },
     handle_remove1(file, fileList, type) {
       var _tmp = this.cover;
-      for (var i = 0, len = _tmp.length; i < len; i++) {
-        if (_tmp[i].uid == file.uid) {
-          _tmp.splice(i, 1);
-          break;
-        }
-        this.cover = _tmp;
-      }
-      this.noneBtnImg = _tmp.length >= 1;
+      // for (var i = 0, len = _tmp.length; i < len; i++) {
+      //   if (_tmp[i].uid == file.uid) {
+      //     _tmp.splice(i, 1);
+      //     break;
+      //   }
+      //   this.cover = _tmp;
+      // }
+      this.cover = []
+      this.noneBtnImg = this.cover.length >= 1;
       this.isSysPic = false;
+      this.$forceUpdate();
     },
     addImg(e) {
       var el = e.currentTarget;
@@ -5774,41 +5776,43 @@ export default {
         ic
       ].name = e.target.value;
     },
-    upCd(e, i, j, ic) {
+    upCd(e, i, j,taskCount, ic) {
       e.stopPropagation();
       if (ic == 0) {
         return;
       }
       var a =
-        this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+        this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
           ic - 1
         ];
-      this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+      this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
         ic - 1
       ] =
-        this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+        this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
           ic
         ];
-      this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[ic] =
+      this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] =
         a;
+      this.$forceUpdate();
     },
-    downCd(e, i, j, ic) {
+    downCd(e, i, j,taskCount, ic) {
       e.stopPropagation();
-      if (ic == this.unitJson[i].chapterInfo[j].chapterData.length - 1) {
+      if (ic == this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData.length - 1) {
         return;
       }
       var a =
-        this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+        this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
           ic + 1
         ];
-      this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+      this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
         ic + 1
       ] =
-        this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[
+        this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[
           ic
         ];
-      this.unitJson[i].chapterInfo[j].taskJson[this.taskCount].chapterData[ic] =
+      this.unitJson[i].chapterInfo[0].taskJson[taskCount].chapterData[ic] =
         a;
+      this.$forceUpdate();
     },
     addWork() {
       let cPan = 1;
@@ -7478,7 +7482,6 @@ export default {
         .then((res) => {
           this.CourseType = res.data;
           let _courseTypeId = []
-
           for (var i = 0; i < res.data[0].length; i++) {
             if (!this.cid) {
               this.courseTypeId[res.data[0][i].id] = [];
@@ -7519,7 +7522,7 @@ export default {
               }
               if (res.data[3].length > 0) {
                 for (var j = 0; j < res.data[3].length; j++) {
-                  if (this.courseTypeId.indexOf(res.data[3][j].id) != -1 && _courseTypeId.indexOf(res.data[2][j].id) == -1) {
+                  if (this.courseTypeId.indexOf(res.data[3][j].id) != -1 && _courseTypeId.indexOf(res.data[3][j].id) == -1) {
                     _courseTypeId.push(res.data[3][j].id)
                   }
                   if (res.data[0][i].id == res.data[3][j].pid) {
@@ -8819,6 +8822,7 @@ export default {
   margin-left: 10px;
   cursor: pointer;
   margin-top: 2px;
+  align-items: center;
 }
 
 .chapter_upload_l_i1 {

src/components/pages/student/addCourse.vue

@@ -1070,7 +1070,7 @@
                                                                     <iframe style="width: 100%; height: 100%; border: none"
                                                                         :src="itemTool.toolData[itemTool.sourceIndex].src"
                                                                         security="restricted"
-                                                                        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
+                                                                        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts allow-popups"></iframe>
                                                                 </div>
                                                                 <div class="wheel"
                                                                     v-if="itemTool.toolData[itemTool.sourceIndex].type == 8"