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'

lsc 2 weeks ago
parent
cd7d3d0308 6af6655f04
commit
299250bc34
14 changed files with 73 additions and 24 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css
  3. 0 0
      dist/static/css/app.04e80e5412965b9c726e0d5de9477644.css.map
  4. 0 0
      dist/static/css/app.db882188fc25ddb57d0257f07bfeebc8.css
  5. 0 0
      dist/static/css/app.db882188fc25ddb57d0257f07bfeebc8.css.map
  6. 0 0
      dist/static/js/app.6ea52106497e30cadfaf.js
  7. 0 0
      dist/static/js/app.6ea52106497e30cadfaf.js.map
  8. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  9. 3 4
      package-lock.json
  10. 12 5
      src/components/easy2/studyStudent.vue
  11. 11 4
      src/components/easy3/studyStudent.vue
  12. 24 2
      src/components/index.vue
  13. 11 4
      src/components/studyStudent.vue
  14. 11 4
      src/components/studySutdentClass/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.04e80e5412965b9c726e0d5de9477644.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.440dad95a023c74b2e6b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.db882188fc25ddb57d0257f07bfeebc8.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.6ea52106497e30cadfaf.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.04e80e5412965b9c726e0d5de9477644.css


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


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


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


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


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


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


+ 3 - 4
package-lock.json
View File 

@@ -13532,13 +13532,12 @@
 
     },
 
     "node_modules/katex": {
 
       "version": "0.16.22",
 
-      "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
 
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
 
       "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
 
       "funding": [
 
         "https://opencollective.com/katex",
 
         "https://github.com/sponsors/katex"
 
       ],
 
-      "license": "MIT",
 
       "dependencies": {
 
         "commander": "^8.3.0"
 
       },
 
@@ -35178,7 +35177,7 @@
 
     },
 
     "katex": {
 
       "version": "0.16.22",
 
-      "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
 
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
 
       "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
 
       "requires": {
 
         "commander": "^8.3.0"
 
@@ -48425,7 +48424,7 @@
 
         },
 
         "katex": {
 
           "version": "0.16.22",
 
-          "resolved": "https://registry.npmmirror.com/katex/-/katex-0.16.22.tgz",
 
+          "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
 
           "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
 
           "requires": {
 
             "commander": "^8.3.0"

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

@@ -11939,7 +11939,9 @@
 
             '&tType=' +
 
             tType +
 
             '&screenType=' +
 
-            screenType
 
+            screenType+
 
+            '&role=' +
 
+            role
 
         )
 
       "
 
     ></classRoomHelper>
 
@@ -11957,7 +11959,9 @@
 
         '&tType=' +
 
         tType +
 
         '&screenType=' +
 
-        screenType
 
+        screenType+
 
+        '&role=' +
 
+        role
 
     )"></studentClassRoomHelper>
 
     <div
 
       class="pButton"
 
@@ -16459,6 +16463,7 @@ export default {
 
       id: this.$route.query.courseId,
 
       userid: this.$route.query.userid,
 
       classId: this.$route.query.cid,
 
+      role: this.$route.query.role,
 
       // courseTypeLine: this.$route.query.type,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
@@ -24881,8 +24886,10 @@ export default {
 
         var a = document.getElementsByClassName("box_course")[0].offsetHeight;
 
         // document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
         if (this.showType == 2 || this.showType == 3) {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + 0 + "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+            document.getElementsByClassName("navBox")[0].style.height =
 
+              a - 40 + 0 + "px";
 
+          }
 
         } else {
 
           if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
               document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";
 
@@ -25400,7 +25407,7 @@ export default {
 
       this.tipsIndex = i;
 
       this.downDialogVisible = true;
 
     },
 
-    uploadWorks() {
 
+    uploadWorks(i) {
 
       this.$confirm("确定导出作业吗？", "提示", {
 
         confirmButtonText: "确定",
 
         cancelButtonText: "取消",

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

@@ -8613,7 +8613,9 @@
 
           '&tType=' +
 
           tType +
 
           '&screenType=' +
 
-          screenType
 
+          screenType+
 
+            '&role=' +
 
+            role
 
       )"></classRoomHelper>
 
     <studentClassRoomHelper v-else-if="['2'].includes(tType)" @studentFreePreview="studentFreePreview" @OpenJobPreview="OpenJobPreview" :videoStart="videoStart" :IsFollow="IsFollow" :sIsOpen="sIsOpen" :IsLookOpen="IsLookOpen" :splitScreenData="splitScreenData" @splitScreenBehavior="splitScreenBehavior" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
     '/courseDetail?userid=' +
 
@@ -8629,7 +8631,9 @@
 
       '&tType=' +
 
       tType +
 
       '&screenType=' +
 
-      screenType
 
+      screenType+
 
+            '&role=' +
 
+            role
 
   )"></studentClassRoomHelper>
 
     <div
 
       class="pButton"
 
@@ -12775,6 +12779,7 @@ export default {
 
       id: this.$route.query.courseId,
 
       userid: this.$route.query.userid,
 
       classId: this.$route.query.cid,
 
+      role: this.$route.query.role,
 
       // courseTypeLine: this.$route.query.type,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
@@ -20249,8 +20254,10 @@ export default {
 
         var a = document.getElementsByClassName("box_course")[0].offsetHeight;
 
         // document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
         if (this.showType == 2 || this.showType == 3) {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + 0+ "px";
 
+            if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+              document.getElementsByClassName("navBox")[0].style.height =
 
+                a - 40 + 0+ "px";
 
+            }
 
         } else {
 
           if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
               document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";

+ 24 - 2
src/components/index.vue
View File 

@@ -1,8 +1,12 @@
 
 <template>
 
   <div class="pb_content">
 
     <div class="pb_content_body">
 
-      <div class="student_head">
 
+      <div class="student_head" style="position: relative;">
 
+        <div v-if="gotype" 
+        class="backBtn"
 
+        @click.stop="backliyuan">返回</div>
 
         <!-- <img src="../assets/banner.png" alt="" /> -->
 
+         <!-- //pbl.cocorobo.cn/pbl-teacher-table/dist -->
 
         <el-carousel trigger="click" style="width: 100%; height: 100%">
 
           <el-carousel-item v-for="item in bannerList" :key="item.id">
 
             <!-- <h3 class="small">{{ item }}</h3> -->
 
@@ -240,6 +244,7 @@ export default {
 
 
   data() {
 
     return {
 
+      gotype:sessionStorage.getItem('gotype'),
 
       zoneList: [],
 
       zoneClass: [],
 
       page: 1,
 
@@ -254,6 +259,7 @@ export default {
 
       tType: this.$route.query.tType,
 
       org: this.$route.query.org,
 
       screenType: this.$route.query.screenType,
 
+      role: this.$route.query.role,
 
       CourseType: [],
 
       CourseType2: [],
 
       CourseTypeJson: {},
 
@@ -293,6 +299,14 @@ export default {
 
     },
 
   },
 
   methods: {
 
+    backliyuan(){
 
+      let betaL = window.location.href.includes("beta") ? "beta" : "cloud"
 
+      if (betaL == 'beta') {
 
+        window.location.href = `https://beta.pbl.cocorobo.cn/pbl-teacher-table/dist/#/CourseCon?userid=${this.userid}&oid=${this.oid}&org=${this.org}&role=${this.role}&tType=${this.tType}`
 
+      }else{
 
+        window.location.href = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/CourseCon?userid=${this.userid}&oid=${this.oid}&org=${this.org}&role=${this.role}&tType=${this.tType}`
 
+      }
 
+    },
 
     search(){
 
       if(this.typeCheck){
 
         this.selectAll()
 
@@ -1314,5 +1328,13 @@ export default {
 
   -webkit-box-shadow: none !important;
 
   box-shadow: none !important;
 
 }
 
-
 
+.backBtn{
 
+  font-size: 16px;
 
+  font-weight: normal;
 
+  cursor: pointer;
 
+  position: absolute;
 
+  top: 20px;
 
+  right: 20px;
 
+  z-index: 999999;
 
+}
 
 </style>

+ 11 - 4
src/components/studyStudent.vue
View File 

@@ -8572,7 +8572,9 @@
 
                       '&tType=' +
 
                       tType +
 
                       '&screenType=' +
 
-                      screenType
 
+                      screenType+
 
+                      '&role=' +
 
+                      role
 
                   )"></classRoomHelper>
 
       <studentClassRoomHelper v-else-if="['2'].includes(tType)" @studentFreePreview="studentFreePreview" @OpenJobPreview="OpenJobPreview" :videoStart="videoStart" :IsFollow="IsFollow" :sIsOpen="sIsOpen" :IsLookOpen="IsLookOpen" :splitScreenData="splitScreenData" @splitScreenBehavior="splitScreenBehavior" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
                     '/courseDetail?userid=' +
 
@@ -8588,7 +8590,9 @@
 
                       '&tType=' +
 
                       tType +
 
                       '&screenType=' +
 
-                      screenType
 
+                      screenType+
 
+                      '&role=' +
 
+                      role
 
                   )"></studentClassRoomHelper>
 
     </div>
 
     <div
 
@@ -12735,6 +12739,7 @@ export default {
 
       id: this.$route.query.courseId,
 
       userid: this.$route.query.userid,
 
       classId: this.$route.query.cid,
 
+      role: this.$route.query.role,
 
       // courseTypeLine: this.$route.query.type,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
@@ -20185,8 +20190,10 @@ export default {
 
         var a = document.getElementsByClassName("box_course")[0].offsetHeight;
 
         // document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
         if (this.showType == 2 || this.showType == 3) {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + 0+ "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+            document.getElementsByClassName("navBox")[0].style.height =
 
+              a - 40 + 0+ "px";
 
+          }
 
         } else {
 
           if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
               document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";

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

@@ -11790,7 +11790,9 @@
 
         '&tType=' +
 
         tType +
 
         '&screenType=' +
 
-        screenType
 
+        screenType+
 
+            '&role=' +
 
+            role
 
     )"></classRoomHelper>
 
   <studentClassRoomHelper v-else-if="['2'].includes(tType)" @studentFreePreview="studentFreePreview" @OpenJobPreview="OpenJobPreview" :videoStart="videoStart" :IsFollow="IsFollow" :sIsOpen="sIsOpen" :IsLookOpen="IsLookOpen" :splitScreenData="splitScreenData" @splitScreenBehavior="splitScreenBehavior" @startRecording="startRecording" @stopRecording="stopRecording" :fileList="vChapterData[taskCount]" :worksStudent="worksStudent" :courseType="parseInt(courseType)" :taskCount="taskCount" :tcid="tcid" :navList="navList" v-show="orgArray.includes(org) || oidArray.includes(oid)" :courseDetail="courseDetail" :tType="tType" @setWidth="setClassRoomHelperWidth" @refresh="refreshCourse" @goStep="nextOrpreSteps" @authority="juriVisible = true" @review="setPz" @backPage="goTo(
 
     '/courseDetail?userid=' +
 
@@ -11806,7 +11808,9 @@
 
       '&tType=' +
 
       tType +
 
       '&screenType=' +
 
-      screenType
 
+      screenType+
 
+            '&role=' +
 
+            role
 
   )"></studentClassRoomHelper>
 
     <div
 
       class="pButton"
 
@@ -16026,6 +16030,7 @@ export default {
 
       id: this.$route.query.courseId,
 
       userid: this.$route.query.userid,
 
       classId: this.$route.query.cid,
 
+      role: this.$route.query.role,
 
       // courseTypeLine: this.$route.query.type,
 
       oid: this.$route.query.oid,
 
       org: this.$route.query.org,
 
@@ -24312,8 +24317,10 @@ export default {
 
         var a = document.getElementsByClassName("box_course")[0].offsetHeight;
 
         // document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
         if (this.showType == 2 || this.showType == 3) {
 
-          document.getElementsByClassName("navBox")[0].style.height =
 
-            a - 40 + 0+ "px";
 
+          if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
+            document.getElementsByClassName("navBox")[0].style.height =
 
+              a - 40 + 0+ "px";
 
+          }
 
         } else {
 
             if (document.getElementsByClassName("navBox") && document.getElementsByClassName("navBox")[0]) {
 
               document.getElementsByClassName("navBox")[0].style.height = a - 40 + "px";

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