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

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

lsc 5 days ago
parent
16c9ad853a f0574d38e6
commit
c92b9394e4
13 changed files with 98 additions and 26 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.c99d9d40f2288893850b2a6d5682f03a.css
  3. 0 0
      dist/static/css/app.c99d9d40f2288893850b2a6d5682f03a.css.map
  4. 0 0
      dist/static/js/app.aa554e3f283a74832a18.js
  5. 0 0
      dist/static/js/app.aa554e3f283a74832a18.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 2 3
      src/components/courseDetail.vue
  8. 22 5
      src/components/easy2/studyStudent.vue
  9. 23 4
      src/components/easy3/studyStudent.vue
  10. 1 1
      src/components/index.vue
  11. 23 5
      src/components/studyStudent.vue
  12. 24 4
      src/components/studySutdentClass/studyStudent.vue
  13. 2 3
      src/components/trainCourse/courseDetail.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.530472fbcc0fa6213a021cb6f624773e.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.18967cc23bc6523de691.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.c99d9d40f2288893850b2a6d5682f03a.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.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.aa554e3f283a74832a18.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.c99d9d40f2288893850b2a6d5682f03a.css


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


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


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


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


+ 2 - 3
src/components/courseDetail.vue
View File 

@@ -169,19 +169,18 @@
 
                     }}
 
                   </div>
 
                 </div>
 
-                <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
+                <!-- <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../assets/icon/newIcon/CourseInfo.png" alt="" />
 
                   </div>
 
                   <div>导出信息</div>
 
                 </div>
 
-                <!--  -->
 
                 <div class="now_study" @click="uploadCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../assets/icon/newIcon/uploadCourse.png" alt="" />
 
                   </div>
 
                   <div>导出文件</div>
 
-                </div>
 
+                </div> -->
 
                 <!-- <div
 
                   class="now_group"
 
                   v-if="groupInfo && courseDetail.state == 1"

+ 22 - 5
src/components/easy2/studyStudent.vue
View File 

@@ -106,7 +106,7 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>
 
@@ -16405,6 +16405,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -16875,6 +16877,21 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     getAIJ() {
 
       this.ajax.get(this.$store.state.api + "getAIJ", "").then(res => {
 
         let oid = res.data[0];
 
@@ -26655,7 +26672,7 @@ export default {
 
       console.log(error)
 
     }
 
 
-
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -26684,15 +26701,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   }
 
 };
 
 </script>

+ 23 - 4
src/components/easy3/studyStudent.vue
View File 

@@ -103,7 +103,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
             </div>
 
           </div>
 
         </div>
 
@@ -12758,6 +12759,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -13152,6 +13155,21 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -21968,6 +21986,7 @@ export default {
 
     } catch (error) {
 
       console.log(error)
 
     }
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -21997,15 +22016,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   },
 
 };
 
 </script>

+ 1 - 1
src/components/index.vue
View File 

@@ -3,7 +3,7 @@
 
     <div class="pb_content_body" :style="{marginTop : gotype ? '75px' : 0}">
 
       <div v-if="gotype" class="r_pub_button_retrun" @click.stop="backliyuan">
 
         <img src="../assets/icon/course/backPage.svg" alt="">
 
-        课程中心
 
+        AI通识课
 
       </div>
 
       <div class="student_head" v-else>

+ 23 - 5
src/components/studyStudent.vue
View File 

@@ -75,7 +75,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
             </div>
 
           </div>
 
         </div>
 
@@ -12686,6 +12687,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       startTime: "",
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
@@ -13079,6 +13082,21 @@ export default {
 
     };
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -21893,7 +21911,7 @@ export default {
 
         this.updateToolDetail(this.toolDetailIndex);
 
       }
 
     });
 
-
 
+    this.getCode2()
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -21925,15 +21943,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
     try{
 
       if (this.screenType == 2) {
 
         window.topU.postMessage({ allScreen: 4 }, "*");

+ 24 - 4
src/components/studySutdentClass/studyStudent.vue
View File 

@@ -103,7 +103,8 @@
 
             style="padding: 0 0 8px 0"
 
           >
 
             <div>
 
-              <span>识别码：{{ inviteCode }}</span>
 
+              <span>识别码：{{ Code2 ? Code2 + inviteCode : inviteCode }}</span>
 
+              <!-- <span>识别码：{{ inviteCode }}</span> -->
 
             </div>
 
           </div>
 
         </div>
 
@@ -16000,6 +16001,8 @@ export default {
 
   },
 
   data() {
 
     return {
 
+      // 学校或者组织随机码
 
+      Code2:'',
 
       // 是否允许学生查看内容资料 2不可以 1可以
 
       IsStulook:false,
 
       homeWorkLoading:false,
 
@@ -16454,6 +16457,21 @@ export default {
 
     }
 
   },
 
   methods: {
 
+    // 获取学校或组织随机码
 
+    getCode2(){
 
+      let params = {
 
+        oid: this.oid,
 
+        org: this.org
 
+      };
 
+      this.ajax
 
+        .get(this.$store.state.api + "getCode2", params)
 
+        .then(res => {
 
+            this.Code2 = res.data[0][0].code2
 
+        })
 
+        .catch(err => {
 
+          console.error(err);
 
+        });
 
+    },
 
     //查看应用中心作业
 
     openCocoFlow(w){
 
       this.$refs.cocoFlowDiaRef.openAppWork(w)
 
@@ -25998,6 +26016,8 @@ export default {
 
     } catch (error) {
 
       console.log(error)
 
     }
 
+    this.getCode2()
 
+
 
     this.setOperationTime();
 
     this.selectEva();
 
     this.getCourseDetail(10);
 
@@ -26027,15 +26047,15 @@ export default {
 
           a - 40 + "px";
 
       }
 
     });
 
-    let _this = this;
 
-    setTimeout(() => {
 
+    // let _this = this;
 
+    // setTimeout(() => {
 
       // _this.vedioTime = [];
 
       // for (var i = 0; i < _this.vedio[_this.taskCount].length; i++) {
 
       //   _this.vedioTime[i] = document.getElementsByClassName(
 
       //     "vjs-duration-display"
 
       //   )[i].textContent;
 
       // }
 
-    }, 1000);
 
+    // }, 1000);
 
   },
 
 };
 
 </script>

+ 2 - 3
src/components/trainCourse/courseDetail.vue
View File 

@@ -168,19 +168,18 @@
 
                     }}
 
                   </div>
 
                 </div>
 
-                <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
+                <!-- <div class="now_study" @click="exportCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../../assets/icon/newIcon/CourseInfo.png" alt="" />
 
                   </div>
 
                   <div>导出信息</div>
 
                 </div>
 
-                <!--  -->
 
                 <div class="now_study" @click="uploadCourse" v-if="tType != 2">
 
                   <div class="returnIndexImg">
 
                     <img src="../../assets/icon/newIcon/uploadCourse.png" alt="" />
 
                   </div>
 
                   <div>导出文件</div>
 
-                </div>
 
+                </div> -->
 
                 <!-- <div
 
                   class="now_group"
 
                   v-if="groupInfo && courseDetail.state == 1"

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