Browse Source

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

zengyicheng 2 years ago
parent
commit
d7b2316130

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.d0f35dc8af02f16e1437f15a1ceda8f8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.619060b93593c61121a8.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.f04121deda809f7408d660b1a9f657aa.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.ab95705b4e56cfaa9f33.js></script><script type=text/javascript src=./static/js/app.f42a37679c18459d3f13.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


BIN
dist/static/img/answerBgNew.8088cd0.png


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


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


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


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


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


+ 3 - 1
src/components/index.vue

@@ -190,6 +190,7 @@ export default {
       bannerList: [],
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
+      org: this.$route.query.org,
       classId: this.$route.query.cid,
       tType: this.$route.query.tType,
       org: this.$route.query.org,
@@ -385,10 +386,11 @@ export default {
         cu: "",
         cn: this.sCourse,
         classid: this.classId,
+        org: this.org,
         page: this.page,
       };
       this.ajax
-        .get(this.$store.state.api + "selectTypeCourse", params)
+        .get(this.$store.state.api + "selectTypeCourse2", params)
         .then((res) => {
           this.loading.close();
           this.loading = "";

+ 5 - 5
src/components/study.vue

@@ -2081,12 +2081,12 @@
             查看文档
           </div>
           <el-form class="textBox" style="height: 90%">
-            <el-form-item label="文档标题" class="textTitle">
+            <el-form-item  class="textTitle">
               <div style="font-size: 22px; max-height: 100px; overflow: auto">
                 {{ fullUrl.name }}
               </div>
             </el-form-item>
-            <div style="color: #918f8f; width: 85%">文档内容</div>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
             <div
               v-html="fullUrl.url"
               class="textContent"
@@ -4833,7 +4833,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  width: 85%;
+  width: 95%;
 }
 .textTitle >>> .el-form-item__label {
   font-size: 22px;
@@ -5152,8 +5152,8 @@ export default {
 .textContent {
   font-size: 18px;
   padding: 30px 0px 0px;
-  height: 300px;
-  width: 90%;
+  height: 600px;
+  width: 95%;
   overflow: auto;
   line-height: 30px;
 }

+ 22 - 16
src/components/studyStudent.vue

@@ -2346,12 +2346,12 @@
             查看文档
           </div>
           <el-form class="textBox" style="height: 90%">
-            <el-form-item label="文档标题" class="textTitle">
+            <el-form-item class="textTitle">
               <div style="font-size: 22px; max-height: 100px; overflow: auto">
                 {{ fullUrl.name }}
               </div>
             </el-form-item>
-            <div style="color: #918f8f; width: 85%">文档内容</div>
+            <!-- <div style="color: #918f8f; width: 85%">文档内容</div> -->
             <div
               v-html="fullUrl.url"
               class="textContent"
@@ -3003,7 +3003,11 @@ export default {
           this.$message.error("上传文件大于10兆,请重新选择文件!");
           return;
         }
-      } else {
+      } else if (
+        file.name
+          .split(".")
+          [file.name.split(".").length - 1].toLocaleUpperCase() != "PDF"
+      ) {
         if (file.size / 1024 / 1024 > 5) {
           this.$message.error("添加成上传文件大于5兆,请重新选择文件!");
           return;
@@ -3218,16 +3222,16 @@ export default {
         // }
       }
       this.navId = this.navList[this.courseType].task[this.taskCount].id;
-      if (this.vedio[this.taskCount].length > 0) {
-        var a =
-          document.getElementsByClassName("box_course")[this.taskCount]
-            .offsetHeight;
-        document.getElementsByClassName("vedioList")[
-          this.taskCount
-        ].style.height = a + "px";
-        document.getElementsByClassName("navBox")[this.taskCount].style.height =
-          a - 40 + "px";
-      }
+      // if (this.vedio[this.taskCount].length > 0) {
+      //   var a =
+      //     document.getElementsByClassName("box_course")[this.taskCount]
+      //       .offsetHeight;
+      //   document.getElementsByClassName("vedioList")[
+      //     this.taskCount
+      //   ].style.height = a + "px";
+      //   document.getElementsByClassName("navBox")[this.taskCount].style.height =
+      //     a - 40 + "px";
+      // }
 
       this.isNoHomeWork = false;
       (this.studyJuri = [
@@ -3239,8 +3243,10 @@ export default {
         },
       ]),
         (this.radio = []);
+      this.isClickNav = "";
       this.getHomeWork();
       this.getCourseDetail();
+      this.$forceUpdate();
     },
     openTask(s, n, i) {
       this.courseType = s;
@@ -5113,7 +5119,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  width: 85%;
+  width: 95%;
 }
 .textTitle >>> .el-form-item__label {
   font-size: 22px;
@@ -5437,8 +5443,8 @@ export default {
 .textContent {
   font-size: 18px;
   padding: 30px 0px 0px;
-  height: 300px;
-  width: 85%;
+  height: 600px;
+  width: 95%;
   overflow: auto;
   margin: 0 0 0 10px;
   line-height: 30px;

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