zengyicheng 2 years ago
parent
commit
b2dd0f7a29

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.3d602378fb0098620cb68a5e5424dde0.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.58e4d5b3fd0c569e76aa.js></script><script type=text/javascript src=./static/js/app.e590ddfc5d48a5185d34.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.bab39373ca7b30cbfaff5294515e6bd2.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.58e4d5b3fd0c569e76aa.js></script><script type=text/javascript src=./static/js/app.b5ac2f446c2fd4535776.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


+ 42 - 32
src/components/study.vue

@@ -141,13 +141,15 @@
                           taskCount
                         ].taskDetail != ''
                       "
-                      v-html="chapInfoList[courseType].chapterInfo[0].taskJson[
+                      v-html="
+                        chapInfoList[courseType].chapterInfo[0].taskJson[
                           taskCount
                         ].taskDetail
                           ? chapInfoList[courseType].chapterInfo[0].taskJson[
                               taskCount
                             ].taskDetail
-                          : '暂无描述'"
+                          : '暂无描述'
+                      "
                     >
                       <!-- <span style="color: #cbcbcb">任务描述</span> -->
                       <!-- {{
@@ -607,7 +609,7 @@
                       <!-- <div class="toolTitle">工具描述</div> -->
                       <div v-html="contentConvent(tool.toolDetail)">
                         <!-- {{ contentConvent(tool.toolDetail) }} -->
-                        </div>
+                      </div>
                     </div>
                   </div>
                   <div
@@ -1627,7 +1629,7 @@ export default {
       var el = e.currentTarget;
       el.getElementsByTagName("input")[0].click();
     },
-    
+
     addCourseWorks(i) {
       var typesql;
       if (this.fileType === 0) {
@@ -2210,31 +2212,34 @@ export default {
               w[m].id = l + "-" + m;
             }
           }
-          if (
-            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
-              this.taskCount
-            ].chapterData.length > 0 &&
-            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
-              this.taskCount
-            ].chapterData[0].type == 3
-          ) {
-            this.showType = 2;
-            this.pptImgUrl =
-              "https://view.officeapps.live.com/op/view.aspx?src=" +
+          if (this.vedio[this.taskCount][0].url == "") {
+            if (
               this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
                 this.taskCount
-              ].chapterData[0].url;
-          } else if (
-            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
-              this.taskCount
-            ].chapterData.length > 0 &&
-            this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
-              this.taskCount
-            ].chapterData[0].type == 6
-          ) {
-            this.showType = 1;
-            this.text = this.textList[this.taskCount][0];
+              ].chapterData.length > 0 &&
+              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                this.taskCount
+              ].chapterData[0].type == 3
+            ) {
+              this.showType = 2;
+              this.pptImgUrl =
+                "https://view.officeapps.live.com/op/view.aspx?src=" +
+                this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                  this.taskCount
+                ].chapterData[0].url;
+            } else if (
+              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                this.taskCount
+              ].chapterData.length > 0 &&
+              this.chapInfoList[this.courseType].chapterInfo[0].taskJson[
+                this.taskCount
+              ].chapterData[0].type == 6
+            ) {
+              this.showType = 1;
+              this.text = this.textList[this.taskCount][0];
+            }
           }
+
           this.$nextTick(function () {
             setTimeout(() => {
               // for (
@@ -2760,12 +2765,17 @@ export default {
   destroyed() {
     window.onresize = null;
   },
-  computed:{
-    contentConvent(){
-      return function(c){
-        return c ? c.replaceAll(/\r\n/g, '<br/>').replaceAll(/\n/g, '<br/>').replaceAll(/\s/g, ' &nbsp') : "";
-      } 
-    }
+  computed: {
+    contentConvent() {
+      return function (c) {
+        return c
+          ? c
+              .replaceAll(/\r\n/g, "<br/>")
+              .replaceAll(/\n/g, "<br/>")
+              .replaceAll(/\s/g, " &nbsp")
+          : "";
+      };
+    },
   },
   created() {
     this.getCourseDetail();

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