update

src/components/student/courseDetail.vue

@@ -3,7 +3,7 @@
     <div class="pb_content_body" style="height: 100%">
       <div class="body_student">
         <div class="student_head">
-          <div v-if="screenType == 1" class="return" @click.stop="
+          <div v-if="screenType != 2" class="return" @click.stop="
             goTo(
               '/studentIndex?userid=' +
               userid +

src/components/student/studyStudent.vue

@@ -241,11 +241,13 @@
                   </div>
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 3"
                     style="height: 650px; width: 95%; margin: 0 auto">
-                    <iframe style="width: 100%; height: 100%; border: none" :src="chapterlist[chapterIndex].src"></iframe>
+                    <iframe style="width: 100%; height: 100%; border: none" :src="chapterlist[chapterIndex].src" security="restricted"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
                   </div>
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 8"
                     style="height: 650px; width: 95%; margin: 0 auto">
-                    <iframe style="width: 100%; height: 100%; border: none" :src="chapterlist[chapterIndex].src"></iframe>
+                    <iframe style="width: 100%; height: 100%; border: none" :src="chapterlist[chapterIndex].src" security="restricted"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
                   </div>
                   <div class="wheel" v-if="chapterlist[chapterIndex].type == 9"
                     style="height: 650px; width: 95%; margin: 0 auto">
@@ -548,12 +550,12 @@
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 3"
                           style="height: 650px; width: 98%;">
                           <iframe style="width: 100%; height: 100%; border: none"
-                            :src="tool.toolData[tool.sourceIndex].src"></iframe>
+                            :src="tool.toolData[tool.sourceIndex].src" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
                         </div>
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 8"
                           style="height: 650px; width: 98%;">
                           <iframe style="width: 100%; height: 100%; border: none"
-                            :src="tool.toolData[tool.sourceIndex].src"></iframe>
+                            :src="tool.toolData[tool.sourceIndex].src" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
                         </div>
                         <div class="wheel" v-if="tool.toolData[tool.sourceIndex].type == 9"
                           style="height: 650px; width: 98%;">
@@ -705,7 +707,7 @@
         </div>
       </div>
       <div style="height: 100%">
-        <iframe v-if="fulltype == 3" style="width: 100%; height: 100%; border: none" :src="fullUrl"></iframe>
+        <iframe v-if="fulltype == 3" style="width: 100%; height: 100%; border: none" :src="fullUrl" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
         <pdf v-else-if="fulltype == 9" :pdfUrl="fullUrl" style="width: 100%; height: 100%; overflow: auto"></pdf>
         <div class="wheel" v-if="fulltype == 6" style="
               box-shadow: 0 0 6px 1px #f2f2f2;
@@ -749,7 +751,7 @@
       </div>
       <pdf v-if="showPDF" :pdfUrl="pptImgUrl" style="width: 100%; height: 520px; overflow: auto"
         :class="{ fullStyle: full }"></pdf>
-      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }"></iframe>
+      <iframe v-else :src="pptImgUrl" frameborder="0" width="100%" height="600" :class="{ fullStyle: full }" security="restricted" sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"></iframe>
     </el-dialog>
     <el-dialog title="查看文档" :visible.sync="dialogVisibleText2" :append-to-body="true" width="800px"
       :before-close="handleClose" class="dialog_diy">

src/components/studentIndex.vue

@@ -22,7 +22,7 @@
         </div>
         <div class="choose">
           <div class="all_choose" v-for="(item, index) in CourseType[0]" :key="index">
-            <span>{{ item.name }}:</span>
+            <div><span>{{ item.name }}</span>:</div>
             <div class="typeCss">
               <div class="cName" @click="getCourse(item.name, '', item.id, 1)"
                 :class="typeE.indexOf(item.id) != -1 ? 'isCType' : ''" style="min-width: fit-content;width: auto;">
@@ -483,43 +483,43 @@ export default {
         oid: this.oid && this.oid != "" ? this.oid : "",
       };
       this.ajax
-        .get(this.$store.state.api + "selectStudentType", params)
+        .get(this.$store.state.api + "selectAllTypeS", params)
         .then((res) => {
-          this.CourseTypeJson = {};
+          this.CourseTypeJson = {}
           this.CourseType = res.data;
+
           for (var i = 0; i < res.data[0].length; i++) {
-            if (!this.cid) {
-              this.courseTypeId[res.data[0][i].id] = "";
-            }
             if (!this.CourseTypeJson[res.data[0][i].id]) {
               this.CourseTypeJson[res.data[0][i].id] = [];
             }
+            if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
+              if (res.data[0][i].name == "赛道") {
+                this.CourseType[0][i].name = "项目类型";
+              }
+            }
 
-            // if (res.data[2].length == 0 && res.data[3].length == 0) {
-            for (var j = 0; j < res.data[1].length; j++) {
-              if (res.data[0][i].id == res.data[1][j].pid) {
-                if (!this.CourseTypeJson[res.data[0][i].id]) {
-                  this.CourseTypeJson[res.data[0][i].id] = [];
+            if (res.data[2].length == 0 && res.data[3].length == 0) {
+              for (var j = 0; j < res.data[1].length; j++) {
+                if (res.data[0][i].id == res.data[1][j].pid) {
+                  this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
+                }
+              }
+            } else {
+              if (res.data[2].length > 0) {
+                for (var j = 0; j < res.data[2].length; j++) {
+                  if (res.data[0][i].id == res.data[2][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
+                  }
+                }
+              }
+              if (res.data[3].length > 0) {
+                for (var j = 0; j < res.data[3].length; j++) {
+                  if (res.data[0][i].id == res.data[3][j].pid) {
+                    this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
+                  }
                 }
-                this.CourseTypeJson[res.data[0][i].id].push(res.data[1][j]); // 去除公共分类
               }
             }
-            // } else {
-            //   if (res.data[2].length > 0) {
-            //     for (var j = 0; j < res.data[2].length; j++) {
-            //       if (res.data[0][i].id == res.data[2][j].pid) {
-            //         this.CourseTypeJson[res.data[0][i].id].push(res.data[2][j]); // 去除公共分类
-            //       }
-            //     }
-            //   }
-            //   if (res.data[3].length > 0) {
-            //     for (var j = 0; j < res.data[3].length; j++) {
-            //       if (res.data[0][i].id == res.data[3][j].pid) {
-            //         this.CourseTypeJson[res.data[0][i].id].push(res.data[3][j]); // 去除公共分类
-            //       }
-            //     }
-            //   }
-            // }
           }
           this.$forceUpdate();
         })
@@ -802,14 +802,18 @@ export default {
   width: 100%;
 }
 
-.all_choose>span {
-  min-width: 80px;
+.all_choose>div:nth-child(1) span {
+  text-align-last: justify;
+  width: 100%;
   display: block;
-  letter-spacing: 14px;
 }
 
-.all_choose>span:nth-child(1) {
+.all_choose>div:nth-child(1) {
+  min-width: 80px;
+  width: 80px;
   font-weight: bold;
+  margin-right: 10px;
+  display: flex;
 }
 
 .all_choose>>>.el-checkbox-group {

src/components/studyStudent.vue

@@ -298,6 +298,8 @@
                   >
                     <iframe
                       style="width: 100%; height: 100%; border: none"
+                      security="restricted"
+                      sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
                       :src="pptImgUrl1"
                     ></iframe>
                   </div>
@@ -5153,6 +5155,8 @@
         width="100%"
         height="600"
         :class="{ fullStyle: full }"
+        security="restricted"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -5167,6 +5171,8 @@
         frameborder="0"
         width="100%"
         height="600"
+        security="restricted"
+        sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
       ></iframe>
     </el-dialog>
     <el-dialog
@@ -5369,6 +5375,8 @@
             width="100%"
             height="600"
             :class="{ fullStyle: full }"
+            security="restricted"
+            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
           ></iframe>
         </div>
         <div
@@ -5615,6 +5623,8 @@
           v-if="fulltype == 2"
           style="width: 100%; height: 100%; border: none"
           :src="fullUrl"
+          security="restricted"
+          sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
         ></iframe>
         <pdf
           v-else-if="fulltype == 3"
@@ -5843,6 +5853,8 @@
             width="100%"
             height="600"
             :class="{ fullStyle: full }"
+            security="restricted"
+            sandbox="allow-top-navigation allow-same-origin allow-forms allow-scripts"
           ></iframe>
         </div>
         <div
@@ -6985,6 +6997,7 @@ export default {
       tType: this.$route.query.tType,
       courseType: this.$route.query.type,
       screenType: this.$route.query.screenType,
+      tcid: this.$route.query.tcid,
       pptImgUrl: "",
       pptImgUrl1: "",
       commentText: "",
@@ -7587,18 +7600,36 @@ export default {
               studentK = studentK.join(",");
               for (var j = 0; j < a.length; j++) {
                 if (studentK.indexOf(a[j].userid) == -1) {
-                  this.noWorksS[i].push({
-                    student: a[j].name,
-                    userid: a[j].userid,
-                  });
+                  if(this.tcid){
+                    if(this.tcid == a[j].classid){
+                      this.noWorksS[i].push({
+                        student: a[j].name,
+                        userid: a[j].userid,
+                      });
+                    }
+                  }else{
+                    this.noWorksS[i].push({
+                      student: a[j].name,
+                      userid: a[j].userid,
+                    });
+                  }
                 }
               }
             } else {
               for (var k = 0; k < a.length; k++) {
-                this.noWorksS[i].push({
-                  student: a[k].name,
-                  userid: a[k].userid,
-                });
+                if(this.tcid){
+                  if(this.tcid == a[k].classid){
+                    this.noWorksS[i].push({
+                      student: a[k].name,
+                      userid: a[k].userid,
+                    });
+                  }
+                }else{
+                  this.noWorksS[i].push({
+                    student: a[k].name,
+                    userid: a[k].userid,
+                  });
+                }
               }
             }
           }
@@ -8236,6 +8267,9 @@ export default {
                 this.worksStudent[i][gA] = [];
 
                 for (var g = 0; g < f.length; g++) {
+                  if(this.tcid && this.tcid != f[g].classid && f[g].type == 2){
+                    continue
+                  }
                   if (gA == f[g].group && f[g].tool == i) {
                     this.groupStudent[i][gA].push(f[g]);
                     this.groupStudentUid[i][gA].push(f[g].userid);
@@ -8245,6 +8279,9 @@ export default {
               this.$forceUpdate();
             }
             for (var j = 0; j < b.length; j++) {
+              if(this.tcid && this.tcid != b[j].classid && b[j].type == 2){
+                  continue
+              }
               var likesCount = 0;
               var commentCount = 0;
               var isLikes = false;