Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

zengyicheng 1 year ago
parent
f61fd99d9a 2414fcd1b7
commit
9e93536300
12 changed files with 82 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.97e66062df607de84fcee6bd7184ff57.css
  3. 0 0
      dist/static/css/app.97e66062df607de84fcee6bd7184ff57.css.map
  4. 0 0
      dist/static/css/app.e86c1a38fbf91fb6bee134d0e2f30158.css
  5. 0 0
      dist/static/css/app.e86c1a38fbf91fb6bee134d0e2f30158.css.map
  6. 0 0
      dist/static/js/app.6967cf2ef81b01f0ad19.js
  7. 0 0
      dist/static/js/app.6967cf2ef81b01f0ad19.js.map
  8. 0 0
      dist/static/js/app.9ad6a4a9dd3104aef159.js
  9. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  10. 20 1
      src/components/pages/addCourse.vue
  11. 40 0
      src/components/pages/easy/addCourse.vue
  12. 21 0
      src/components/pages/task/addCourse.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.e86c1a38fbf91fb6bee134d0e2f30158.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.9ad6a4a9dd3104aef159.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.97e66062df607de84fcee6bd7184ff57.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.6967cf2ef81b01f0ad19.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


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


+ 20 - 1
src/components/pages/addCourse.vue
View File 

@@ -664,6 +664,7 @@
 
                               <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
 
                               <div v-if="item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 6 ||
 
                                 item1.type == 7
 
                                 " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
 
@@ -692,6 +693,7 @@
 
                               <input v-if="item1.type == 2 ||
 
                                 item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 7
 
                                 " :placeholder="item1.name" @change="updataVideoT(
 
     $event,
 
@@ -4354,6 +4356,17 @@ export default {
 
             } else {
 
               if (type == 13) {
 
                 let _type = 2
 
+                var imgA = [
 
+                  "png",
 
+                  "jpg",
 
+                  "jpeg",
 
+                  "bmp",
 
+                  "gif",
 
+                  "webp",
 
+                  "psd",
 
+                  "svg",
 
+                  "tiff",
 
+                ]
 
                 var fileA = [
 
                   "PDF",
 
                   "DOC",
 
@@ -4415,7 +4428,13 @@ export default {
 
                   [data.Location.split(".").length - 1].toLocaleUpperCase()
 
                 ) != -1) {
 
                   _type = 2
 
-                } else {
 
+                } else if (imgA.indexOf(
 
+                  data.Location
 
+                    .split(".")
 
+                  [data.Location.split(".").length - 1].toLocaleLowerCase()
 
+                ) != -1) {
 
+                  _type = 13
 
+                }else {
 
                   _type = 12
 
                 }
 
                 _this.unitJson[unitIndex].chapterInfo[0].taskJson[

+ 40 - 0
src/components/pages/easy/addCourse.vue
View File 

@@ -237,6 +237,7 @@
 
                                   <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
 
                                   <div v-if="item1.type == 3 ||
 
                                     item1.type == 12 ||
 
+                                    item1.type == 13 ||
 
                                     item1.type == 6 ||
 
                                     item1.type == 7
 
                                     " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
 
@@ -265,6 +266,7 @@
 
                                   <input v-if="item1.type == 2 ||
 
                                     item1.type == 3 ||
 
                                     item1.type == 12 ||
 
+                                    item1.type == 13 ||
 
                                     item1.type == 7
 
                                     " :placeholder="item1.name" @change="updataVideoT(
 
     $event,
 
@@ -731,6 +733,7 @@
 
                               <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
 
                               <div v-if="item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 6 ||
 
                                 item1.type == 7
 
                                 " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
 
@@ -759,6 +762,7 @@
 
                               <input v-if="item1.type == 2 ||
 
                                 item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 7
 
                                 " :placeholder="item1.name" @change="updataVideoT(
 
     $event,
 
@@ -4298,6 +4302,17 @@ export default {
 
             } else {
 
               if (type == 13) {
 
                 let _type = 2
 
+                var imgA = [
 
+                  "png",
 
+                  "jpg",
 
+                  "jpeg",
 
+                  "bmp",
 
+                  "gif",
 
+                  "webp",
 
+                  "psd",
 
+                  "svg",
 
+                  "tiff",
 
+                ]
 
                 var fileA = [
 
                   "PDF",
 
                   "DOC",
 
@@ -4359,6 +4374,12 @@ export default {
 
                   [data.Location.split(".").length - 1].toLocaleUpperCase()
 
                 ) != -1) {
 
                   _type = 2
 
+                } else if (imgA.indexOf(
 
+                  data.Location
 
+                    .split(".")
 
+                  [data.Location.split(".").length - 1].toLocaleLowerCase()
 
+                ) != -1) {
 
+                  _type = 13
 
                 } else {
 
                   _type = 12
 
                 }
 
@@ -7272,9 +7293,18 @@ export default {
 
               this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index - 1]
 
             )
 
           );
 
+          let b = JSON.parse(
 
+            JSON.stringify(
 
+              this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index]
 
+            )
 
+          )
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index - 1] =
 
             this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index];
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index] = a;
 
+          if((index - 1) == 0){
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index - 1].chapterData = a.chapterData;
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].chapterData = b.chapterData;
 
+          }
 
         }
 
       } else {
 
         if (
 
@@ -7286,9 +7316,19 @@ export default {
 
               this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index + 1]
 
             )
 
           );
 
+          let b = JSON.parse(
 
+            JSON.stringify(
 
+              this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index]
 
+            )
 
+          )
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index + 1] =
 
             this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index];
 
           this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index] = a;
 
+
 
+          if((index) == 0){
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index + 1].chapterData = a.chapterData;
 
+            this.unitJson[this.unitIndex].chapterInfo[0].taskJson[index].chapterData = b.chapterData;
 
+          }
 
         }
 
       }
 
       this.$forceUpdate();

+ 21 - 0
src/components/pages/task/addCourse.vue
View File 

@@ -294,6 +294,7 @@
 
                                   <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
 
                                   <div v-if="item1.type == 3 ||
 
                                     item1.type == 12 ||
 
+                                    item1.type == 13 ||
 
                                     item1.type == 6 ||
 
                                     item1.type == 7
 
                                     " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
 
@@ -322,6 +323,7 @@
 
                                   <input v-if="item1.type == 2 ||
 
                                     item1.type == 3 ||
 
                                     item1.type == 12 ||
 
+                                    item1.type == 13 ||
 
                                     item1.type == 7
 
                                     " :placeholder="item1.name" @change="updataVideoT(
 
     $event,
 
@@ -736,6 +738,7 @@
 
                               <div v-if="item1.type == 2" class="chapter_upload_l_i1"></div>
 
                               <div v-if="item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 6 ||
 
                                 item1.type == 7
 
                                 " class="chapter_upload_l_i5" style="margin-left: 1px"></div>
 
@@ -764,6 +767,7 @@
 
                               <input v-if="item1.type == 2 ||
 
                                 item1.type == 3 ||
 
                                 item1.type == 12 ||
 
+                                item1.type == 13 ||
 
                                 item1.type == 7
 
                                 " :placeholder="item1.name" @change="updataVideoT(
 
     $event,
 
@@ -4299,6 +4303,17 @@ export default {
 
             } else {
 
               if (type == 13) {
 
                 let _type = 2
 
+                var imgA = [
 
+                  "png",
 
+                  "jpg",
 
+                  "jpeg",
 
+                  "bmp",
 
+                  "gif",
 
+                  "webp",
 
+                  "psd",
 
+                  "svg",
 
+                  "tiff",
 
+                ]
 
                 var fileA = [
 
                   "PDF",
 
                   "DOC",
 
@@ -4360,6 +4375,12 @@ export default {
 
                   [data.Location.split(".").length - 1].toLocaleUpperCase()
 
                 ) != -1) {
 
                   _type = 2
 
+                } else if (imgA.indexOf(
 
+                  data.Location
 
+                    .split(".")
 
+                  [data.Location.split(".").length - 1].toLocaleLowerCase()
 
+                ) != -1) {
 
+                  _type = 13
 
                 } else {
 
                   _type = 12
 
                 }

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