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

src/components/pages/addCourse.vue

@@ -729,7 +729,7 @@
                             position: relative;
                           ">
                           <div style="margin-right: 20px; font-weight: bold">
-                            工具 {{ toolIndex + 1 }} ：
+                            步骤 {{ toolIndex + 1 }} ：
                           </div>
                           <div class="chooseWho">
                             <div :class="
@@ -2306,6 +2306,7 @@ export default {
       grade: [],
       courseUserid: "",
       timer: null,
+      timer2: null,
       checkId: "",
       isDelete: 1,
       addindex: 0,
@@ -5239,10 +5240,14 @@ export default {
   beforeDestroy() {
     clearTimeout(this.timer);
     this.timer = null;
+    clearInterval(this.timer);
+    this.timer = null;
   },
   beforeRouteLeave(to, from, next) {
     clearTimeout(this.timer);
     this.timer = null;
+    clearInterval(this.timer2);
+    this.timer2 = null;
     next();
   },
   created() {
@@ -5253,10 +5258,10 @@ export default {
     this.selectType();
     this.selectEva();
     this.loading = false;
-    setTimeout(() => {
+    this.timer2 = setInterval(() => {
       this.selectCourseDetail();
       this.selectEva();
-    }, 500);
+    }, 5000);
   },
 };
 </script>

src/components/pages/addCourseGM.vue

@@ -716,7 +716,7 @@
                             position: relative;
                           ">
                           <div style="margin-right: 20px; font-weight: bold">
-                            工具 {{ toolIndex + 1 }} ：
+                            步骤 {{ toolIndex + 1 }} ：
                           </div>
                           <div class="chooseWho">
                             <!-- <div

src/components/pages/course.vue

@@ -8,7 +8,7 @@
         ">评价管理</span>
       </div>
       <div class="student_button">
-        <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button>
+        <!-- <el-button type="primary" class="bgColor" @click="openCourse">协同编辑</el-button> -->
         <el-button type="primary" class="bgColor" @click="goToCourse()">添加项目</el-button>
       </div>
     </div>

src/components/pages/scourse.vue

@@ -79,12 +79,12 @@
               </div>
             </div>
             <div class="three_bottom">
-              <div @click="jump(item.courseId)">评论</div>
+              <div @click="goToCourse(item.courseId)">编辑</div>
               <div @click="get(item.courseId)">预览</div>
-              <div @click="getA(item.courseId)">项目进展</div>
-              <div @click="goToCourse(item.courseId)">
-                修改
-              </div>
+              <!-- 项目进展 -->
+              <div @click="getA(item.courseId)">管理</div>
+              <div @click="jump(item.courseId)">评论</div>
+
               <!-- <div v-if="groupA == '0'" @click="
                 goTo(
                   '/works?cid=' +

src/components/pages/student/addCourse.vue

@@ -102,7 +102,10 @@
                     oid +
                     '&org=' +
                     org,
-                }">{{orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" : "学生项目"}}</el-breadcrumb-item>
+                }">{{
+  orgArray.indexOf(org) != -1 || oidArray.indexOf(oid) != -1 ? "师生项目" :
+    "学生项目"
+}}</el-breadcrumb-item>
                 <el-breadcrumb-item>
                   <span style="color: rgb(15, 126, 255)">添加项目</span>
                 </el-breadcrumb-item>
@@ -594,6 +597,172 @@
                         " @change="change"></editor-bar>
                       </div>
                     </div>
+
+                  </div>
+                  <div class="basic_box" v-if="false" style="
+                      margin: 0;
+                      min-height: 0;
+                      width: 90% !important;
+                      paddint-top: 10px !important;
+                    ">
+                    <div style="
+                        display: flex;
+                        margin: 0 0 20px 0;
+                        flex-direction: row;
+                        justify-content: flex-start;
+                        align-items: center;
+                      ">
+                      <div class="lineTitle">资源上传</div>
+                      <div class="line"></div>
+                    </div>
+                    <div>
+                      <div class="add_chapters_box" v-if="
+                        itemTask.chapterData &&
+                        itemTask.chapterData.length == 0
+                      " style="height: 185px"></div>
+                      <div v-else class="add_chapters_box" style="display: flex; flex-direction: column">
+                        <div class="chapter_upload" v-for="(item1, index1) in itemTask.chapterData" :key="item1.id"
+                          @click="
+                            getChapterData(
+                              $event,
+                              unitIndex,
+                              index,
+                              index1,
+                              item1.type
+                            )
+                          ">
+                          <div class="chapter_upload_t" style="width: 100%"></div>
+                          <div class="chapter_upload_o" style="
+                              position: relative;
+                              display: flex;
+                              align-items: center;
+                            ">
+                            <div class="chapter_upload_l" style="padding: 1px 0 0 10px">
+                              <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
+                              <div v-if="
+                                item1.type == 3 ||
+                                item1.type == 6 ||
+                                item1.type == 7
+                              " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
+                              <div v-if="item1.type == 8" class="chapter_upload_l_i8" style="margin-left: 1px"></div>
+                            </div>
+                            <div class="chapter_upload_ic" style="
+                                cursor: pointer;
+                                position: absolute;
+                                width: 45px;
+                                right: 0;
+                                top: 0;
+                              ">
+                              <div class="chapter_upload_ic_l"></div>
+                              <div class="chapter_upload_ic_r" style="position: absolute" @click.stop="
+                                deleteChapterData(
+                                  $event,
+                                  unitIndex,
+                                  index,
+                                  index1,
+                                  itemTaskIndex
+                                )
+                              ">
+                                <div></div>
+                              </div>
+                            </div>
+                            <div class="chapter_upload_n">
+                              <input v-if="
+                                item1.type == 2 ||
+                                item1.type == 3 ||
+                                item1.type == 7
+                              " :placeholder="item1.name" @change="
+  updataVideoT(
+    $event,
+    unitIndex,
+    chapterIndex,
+    index1
+  )
+" style="
+                                  border: none;
+                                  outline: none;
+                                  width: 80%;
+                                  minwidth: 215px;
+                                  z-index: 99;
+                                  font-size: 14px;
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                " />
+                              <input :placeholder="item1.name" v-if="item1.type == 6" style="
+                                  border: none;
+                                  outline: none;
+                                  width: 80%;
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                " readonly="true" @click="selectAttText(itemTaskIndex, index1)" />
+                              <input :placeholder="
+                                item1.title ? item1.title : '链接'
+                              " v-if="item1.type == 8" style="
+                                  border: none;
+                                  outline: none;
+                                  width: 80%;
+                                  white-space: nowrap;
+                                  overflow: hidden;
+                                  text-overflow: ellipsis;
+                                " readonly="true" @click="selectLine(itemTaskIndex, index1)" />
+                              <div class="chapter_upload_ud" style="z-index: 99">
+                                <div class="chapter_upload_up" @click="
+                                  upCd($event, unitIndex, index, index1)
+                                "></div>
+                                <div class="chapter_upload_down" @click="
+                                  downCd($event, unitIndex, index, index1)
+                                "></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="add_info_box">
+                      <button class="info_btn" @click="addImg($event)">
+                        添加教学视频
+                        <input type="file" accept="video/mp4, video/quicktime, video/x-msvideo" style="display: none"
+                          capture="camera" v-if="inputShow" @change="
+                            beforeUpload2($event, unitIndex, 2, itemTaskIndex)
+                          " />
+                      </button>
+                      <button class="info_btn" @click="addImg($event)">
+                        添加教学附件
+                        <input type="file"
+                          accept="application/pdf, application/.ppt, .ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+                          style="display: none" v-if="inputShow" @change="
+                            beforeUpload2($event, unitIndex, 3, itemTaskIndex)
+                          " />
+                      </button>
+                      <button class="info_btn" @click="addAttText(itemTaskIndex)">
+                        添加图文
+                      </button>
+                      <button class="info_btn" @click="openLine(itemTaskIndex)">
+                        添加链接
+                      </button>
+                    </div>
+                    <div v-if="
+                      unitJson[unitIndex].chapterInfo[0].taskJson[
+                        itemTaskIndex
+                      ].proVisible
+                    " class="mask">
+                      <div class="progressBox">
+                        <div class="lbox">
+                          <img src="../../../assets/loading.gif" />上传中，请稍后
+                        </div>
+                        <el-progress :text-inside="true" :stroke-width="20" :percentage="
+                          unitJson[unitIndex].chapterInfo[0].taskJson[
+                            itemTaskIndex
+                          ].progress
+                            ? unitJson[unitIndex].chapterInfo[0].taskJson[
+                              itemTaskIndex
+                            ].progress
+                            : 0
+                        " style="width: 80%"></el-progress>
+                      </div>
+                    </div>
                   </div>
                   <div class="toolChoose" style="padding: 0 0 30px 30px">
                     <div class="tools" style="margin-top:20px">
@@ -612,7 +781,7 @@
                             position: relative;
                           ">
                           <div style="margin-right: 20px; font-weight: bold">
-                            工具 {{ toolIndex + 1 }} ：
+                            步骤 {{ toolIndex + 1 }} ：
                           </div>
                           <div class="chooseWho" style="padding-bottom: 0;">
                             <span v-if="itemTool.tool == 1">
@@ -1584,8 +1753,8 @@ export default {
       oid: this.$route.query.oid,
       org: this.$route.query.org,
       cid: this.$route.query.cid != undefined ? this.$route.query.cid : "",
-      orgArray:["150e3120-9195-11ed-b13d-005056b86db5"],
-      oidArray:[],
+      orgArray: ["150e3120-9195-11ed-b13d-005056b86db5"],
+      oidArray: [],
       dialogVisibleTable: false,
       tableJson: { text: "" },
       cover: [], //项目封面
@@ -1737,27 +1906,27 @@ export default {
           j < this.unitJson[_unitIndex].chapterInfo[0].taskJson.length;
           j++
         ) {
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
-          ) {
-            this.$message.error("请填写任务名称");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
-          ) {
-            this.$message.error("请填写负责人");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
-          ) {
-            this.$message.error("请填写任务完成时间");
-            cPan = 2
-            break;
-          }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
+          // ) {
+          //   this.$message.error("请填写任务名称");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
+          // ) {
+          //   this.$message.error("请填写负责人");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
+          // ) {
+          //   this.$message.error("请填写任务完成时间");
+          //   cPan = 2
+          //   break;
+          // }
           if (this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList) {
             this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList =
               this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList.filter(
@@ -1942,27 +2111,27 @@ export default {
               j < this.unitJson[i].chapterInfo[0].taskJson.length;
               j++
             ) {
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].task
-              ) {
-                this.$message.error("请填写任务名称");
-                cPan = 2
-                break;
-              }
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].people
-              ) {
-                this.$message.error("请填写负责人");
-                cPan = 2
-                break;
-              }
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].time
-              ) {
-                this.$message.error("请填写任务完成时间");
-                cPan = 2
-                break;
-              }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].task
+              // ) {
+              //   this.$message.error("请填写任务名称");
+              //   cPan = 2
+              //   break;
+              // }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].people
+              // ) {
+              //   this.$message.error("请填写负责人");
+              //   cPan = 2
+              //   break;
+              // }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].time
+              // ) {
+              //   this.$message.error("请填写任务完成时间");
+              //   cPan = 2
+              //   break;
+              // }
               if (this.unitJson[i].chapterInfo[0].taskJson[j].eList) {
                 this.unitJson[i].chapterInfo[0].taskJson[j].eList = this.unitJson[
                   i
@@ -2021,27 +2190,27 @@ export default {
               j < this.unitJson[i].chapterInfo[0].taskJson.length;
               j++
             ) {
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].task
-              ) {
-                this.$message.error("请填写任务名称");
-                cPan = 2
-                break;
-              }
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].people
-              ) {
-                this.$message.error("请填写负责人");
-                cPan = 2
-                break;
-              }
-              if (
-                !this.unitJson[i].chapterInfo[0].taskJson[j].time
-              ) {
-                this.$message.error("请填写任务完成时间");
-                cPan = 2
-                break;
-              }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].task
+              // ) {
+              //   this.$message.error("请填写任务名称");
+              //   cPan = 2
+              //   break;
+              // }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].people
+              // ) {
+              //   this.$message.error("请填写负责人");
+              //   cPan = 2
+              //   break;
+              // }
+              // if (
+              //   !this.unitJson[i].chapterInfo[0].taskJson[j].time
+              // ) {
+              //   this.$message.error("请填写任务完成时间");
+              //   cPan = 2
+              //   break;
+              // }
               if (this.unitJson[i].chapterInfo[0].taskJson[j].eList) {
                 this.unitJson[i].chapterInfo[0].taskJson[j].eList = this.unitJson[
                   i
@@ -2745,27 +2914,27 @@ export default {
           j < this.unitJson[_unitIndex].chapterInfo[0].taskJson.length;
           j++
         ) {
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
-          ) {
-            this.$message.error("请填写任务名称");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
-          ) {
-            this.$message.error("请填写负责人");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
-          ) {
-            this.$message.error("请填写任务完成时间");
-            cPan = 2
-            break;
-          }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
+          // ) {
+          //   this.$message.error("请填写任务名称");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
+          // ) {
+          //   this.$message.error("请填写负责人");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
+          // ) {
+          //   this.$message.error("请填写任务完成时间");
+          //   cPan = 2
+          //   break;
+          // }
           if (this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList) {
             this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList =
               this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList.filter(
@@ -3162,27 +3331,27 @@ export default {
         j < this.unitJson[_unitIndex].chapterInfo[0].taskJson.length;
         j++
       ) {
-        if (
-          !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
-        ) {
-          this.$message.error("请填写任务名称");
-          cPan = 2
-          break;
-        }
-        if (
-          !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
-        ) {
-          this.$message.error("请填写负责人");
-          cPan = 2
-          break;
-        }
-        if (
-          !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
-        ) {
-          this.$message.error("请填写任务完成时间");
-          cPan = 2
-          break;
-        }
+        // if (
+        //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].task
+        // ) {
+        //   this.$message.error("请填写任务名称");
+        //   cPan = 2
+        //   break;
+        // }
+        // if (
+        //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].people
+        // ) {
+        //   this.$message.error("请填写负责人");
+        //   cPan = 2
+        //   break;
+        // }
+        // if (
+        //   !this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].time
+        // ) {
+        //   this.$message.error("请填写任务完成时间");
+        //   cPan = 2
+        //   break;
+        // }
         if (this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList) {
           this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList =
             this.unitJson[_unitIndex].chapterInfo[0].taskJson[j].eList.filter(
@@ -3230,27 +3399,27 @@ export default {
           j < this.unitJson[i].chapterInfo[0].taskJson.length;
           j++
         ) {
-          if (
-            !this.unitJson[i].chapterInfo[0].taskJson[j].task
-          ) {
-            this.$message.error("请填写任务名称");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[i].chapterInfo[0].taskJson[j].people
-          ) {
-            this.$message.error("请填写负责人");
-            cPan = 2
-            break;
-          }
-          if (
-            !this.unitJson[i].chapterInfo[0].taskJson[j].time
-          ) {
-            this.$message.error("请填写任务完成时间");
-            cPan = 2
-            break;
-          }
+          // if (
+          //   !this.unitJson[i].chapterInfo[0].taskJson[j].task
+          // ) {
+          //   this.$message.error("请填写任务名称");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[i].chapterInfo[0].taskJson[j].people
+          // ) {
+          //   this.$message.error("请填写负责人");
+          //   cPan = 2
+          //   break;
+          // }
+          // if (
+          //   !this.unitJson[i].chapterInfo[0].taskJson[j].time
+          // ) {
+          //   this.$message.error("请填写任务完成时间");
+          //   cPan = 2
+          //   break;
+          // }
           if (this.unitJson[i].chapterInfo[0].taskJson[j].eList) {
             this.unitJson[i].chapterInfo[0].taskJson[j].eList = this.unitJson[
               i
@@ -7101,6 +7270,7 @@ ol {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
 .t_j_box span:nth-child(2) {
   min-width: 30px;
   margin-right: 10px;

src/components/pages/student/course.vue

@@ -79,12 +79,12 @@
               </div>
             </div>
             <div class="three_bottom">
-              <div @click="jump(item.courseId)">评论</div>
+              <div @click="goToCourse(item.courseId)">编辑</div>
               <div @click="get(item.courseId)">预览</div>
-              <div @click="getA(item.courseId)">项目进展</div>
-              <div v-if="groupA == '0'" @click="goToCourse(item.courseId)">
-                修改
-              </div>
+              <!-- 项目进展 -->
+              <div @click="getA(item.courseId)">管理</div>
+              <div @click="jump(item.courseId)">评论</div>
+
               <!-- <div v-if="groupA == '0'" @click="
                 goTo(
                   '/works?cid=' +

src/components/pages/tencent/notice.vue

@@ -325,8 +325,8 @@ export default {
   word-wrap: break-word;
   word-break: break-all;
   overflow: hidden;
-  font-size: 18px;
-  line-height: 35px;
+  font-size: 16px;
+  line-height: 31px;
   text-indent: 35px;
 }