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'

qgt 5 days ago
parent
1bf1004d0b 9e288d696d
commit
8146b5ad4a
12 changed files with 16 additions and 16 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.530472fbcc0fa6213a021cb6f624773e.css
  3. 0 0
      dist/static/css/app.530472fbcc0fa6213a021cb6f624773e.css.map
  4. 0 0
      dist/static/js/app.18967cc23bc6523de691.js
  5. 0 0
      dist/static/js/app.18967cc23bc6523de691.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 2 2
      src/components/easy2/studyStudent.vue
  8. 2 2
      src/components/easy3/studyStudent.vue
  9. 3 3
      src/components/pptEasyClass/index.vue
  10. 2 2
      src/components/pptEasyClass/index_old.vue
  11. 2 2
      src/components/studyStudent.vue
  12. 4 4
      src/mixins/mixin.js

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     body{
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.40f8d521288aeb80faad8093cd7ec1fb.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.6b6ed9f9f3e1d8ffcd79.js></script></body></html><script>function stopSafari() {
 
+    }</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() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


+ 2 - 2
src/components/easy2/studyStudent.vue
View File 

@@ -26403,7 +26403,7 @@ export default {
 
     clearInterval(this.opertimer);
 
     this.opertimer = null;
 
     this.updateSplitScreenData(1);
 
-    if(this.courseDetail.userid == this.userid && this.tcid2 && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
+    if(this.courseDetail.userid == this.userid && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
       let endTime = new Date().toLocaleString("zh-CN", { 
           hour12: false, 
           timeZone: "Asia/Shanghai" 
@@ -26412,7 +26412,7 @@ export default {
 
       this.syncClassData({
 
         courseId: this.id,
 
         title: this.courseDetail.title,
 
-        courseGrade: this.tcid2,
 
+        courseGrade: this.tcid2 ? this.tcid2 : '',
 
         courseTime: courseTime,
 
         startTime: this.startTime,
 
         endTime: endTime,

+ 2 - 2
src/components/easy3/studyStudent.vue
View File 

@@ -21719,7 +21719,7 @@ export default {
 
     clearInterval(this.opertimer);
 
     this.opertimer = null;
 
 		this.updateSplitScreenData(1);
 
-    if(this.courseDetail.userid == this.userid && this.tcid2 && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
+    if(this.courseDetail.userid == this.userid && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
       let endTime = new Date().toLocaleString("zh-CN", { 
           hour12: false, 
           timeZone: "Asia/Shanghai" 
@@ -21728,7 +21728,7 @@ export default {
 
       this.syncClassData({
 
         courseId: this.id,
 
         title: this.courseDetail.title,
 
-        courseGrade: this.tcid2,
 
+        courseGrade: this.tcid2 ? this.tcid2 : '',
 
         courseTime: courseTime,
 
         startTime: this.startTime,
 
         endTime: endTime,

+ 3 - 3
src/components/pptEasyClass/index.vue
View File 

@@ -210,7 +210,7 @@ export default {
 
       }
 
     },
 
     afterClass() {
 
-      this.$confirm('确定下课吗，会让所有正在上课的学生全部退出登录？', '提示', {
 
+      this.$confirm('此操作将使当前课程内所有学生退出登录，是否继续？', '提示', {
 
         confirmButtonText: '确定',
 
         cancelButtonText: '取消',
 
         type: 'warning'
 
@@ -253,7 +253,7 @@ export default {
 
   destroyed() {
 
     clearInterval(this.opertimer);
 
     this.opertimer = null;
 
-    if (this.courseDetail.userid == this.userid && this.tcid2 && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840') {
 
+    if (this.courseDetail.userid == this.userid && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840') {
 
       let endTime = new Date().toLocaleString("zh-CN", {
 
         hour12: false,
 
         timeZone: "Asia/Shanghai"
 
@@ -262,7 +262,7 @@ export default {
 
       this.syncClassData({
 
         courseId: this.id,
 
         title: this.courseDetail.title,
 
-        courseGrade: this.tcid2,
 
+        courseGrade: this.tcid2 ? this.tcid2 : '',
 
         courseTime: courseTime,
 
         startTime: this.startTime,
 
         endTime: endTime,

+ 2 - 2
src/components/pptEasyClass/index_old.vue
View File 

@@ -209,7 +209,7 @@ export default {
 
   destroyed() {
 
     clearInterval(this.opertimer);
 
     this.opertimer = null;
 
-    if (this.courseDetail.userid == this.userid && this.tcid2 && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840') {
 
+    if (this.courseDetail.userid == this.userid && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840') {
 
       let endTime = new Date().toLocaleString("zh-CN", {
 
         hour12: false,
 
         timeZone: "Asia/Shanghai"
 
@@ -218,7 +218,7 @@ export default {
 
       this.syncClassData({
 
         courseId: this.id,
 
         title: this.courseDetail.title,
 
-        courseGrade: this.tcid2,
 
+        courseGrade: this.tcid2 ? this.tcid2 : '',
 
         courseTime: courseTime,
 
         startTime: this.startTime,
 
         endTime: endTime,

+ 2 - 2
src/components/studyStudent.vue
View File 

@@ -21665,7 +21665,7 @@ export default {
 
     clearInterval(this.opertimer);
 
     this.opertimer = null;
 
 		this.updateSplitScreenData(1);
 
-    if(this.courseDetail.userid == this.userid && this.tcid2 && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
+    if(this.courseDetail.userid == this.userid && this.org == '16ace517-b5c7-4168-a9bb-a9e0035df840'){
 
       let endTime = new Date().toLocaleString("zh-CN", { 
           hour12: false, 
           timeZone: "Asia/Shanghai" 
@@ -21674,7 +21674,7 @@ export default {
 
       this.syncClassData({
 
         courseId: this.id,
 
         title: this.courseDetail.title,
 
-        courseGrade: this.tcid2,
 
+        courseGrade: this.tcid2 ? this.tcid2 : '',
 
         courseTime: courseTime,
 
         startTime: this.startTime,
 
         endTime: endTime,

+ 4 - 4
src/mixins/mixin.js
View File 

@@ -93,7 +93,7 @@ export const myMixin = {
 
         console.log(e);
 
         return this.syncClassData(classData);
 
       }
 
-      let courseGrade = await this.ajax.get(this.$store.state.api + "getClassById", { id: classData.courseGrade });
 
+      let courseGrade = classData.courseGrade ? await this.ajax.get(this.$store.state.api + "getClassById", { id: classData.courseGrade }) : '';
 
       let coursePackageName = await this.ajax.get(this.$store.state.api + "getCopyCourseName", { id: classData.courseId });
 
       let params = {
 
         "serverName": "深教AI6",
 
@@ -107,7 +107,7 @@ export const myMixin = {
 
         "coursePackageName": coursePackageName.data[0][0].title,
 
         "courseId": classData.courseId,
 
         "courseName": classData.title,
 
-        "courseGrade": courseGrade.data[0][0].name,
 
+        "courseGrade": courseGrade ? courseGrade.data[0][0].name : '无年级',
 
         "courseTime": classData.courseTime,
 
         "startTime": classData.startTime,
 
         "endTime": classData.endTime
 
@@ -137,7 +137,7 @@ export const myMixin = {
 
         console.log(e);
 
         return this.syncClassData(classData);
 
       }
 
-      let courseGrade = await this.ajax.get(this.$store.state.api + "getClassById", { id: classData.courseGrade });
 
+      let courseGrade = classData.courseGrade ? await this.ajax.get(this.$store.state.api + "getClassById", { id: classData.courseGrade }) : '';
 
       let coursePackageName = await this.ajax.get(this.$store.state.api + "getCopyCourseName", { id: classData.courseId });
 
       let params = {
 
         "serverName": "深教AI6",
 
@@ -151,7 +151,7 @@ export const myMixin = {
 
         "coursePackageName": coursePackageName.data[0][0].title,
 
         "courseId": classData.courseId,
 
         "courseName": classData.title,
 
-        "courseGrade": courseGrade.data[0][0].name,
 
+        "courseGrade": courseGrade ? courseGrade.data[0][0].name : '无年级',
 
         "courseTime": classData.courseTime,
 
         "startTime": classData.startTime,
 
         "endTime": classData.endTime

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