Inicio Explorar Axuda
Iniciar sesión
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

SanHQin hai 8 meses
pai
2f132fbb5e 6b602da4e3
achega
0e8eba4597
Modificáronse 19 ficheiros con 44 adicións e 42 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.879dadc99b5505aaebf1e14b408b739e.css
  3. 0 0
      dist/static/css/app.879dadc99b5505aaebf1e14b408b739e.css.map
  4. 0 0
      dist/static/js/app.b2109b3c4437498b7f0f.js
  5. 0 0
      dist/static/js/app.b2109b3c4437498b7f0f.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 7 5
      src/components/courseDetail.vue
  8. 3 3
      src/components/easy2/studyStudent jiu.vue
  9. 3 3
      src/components/easy2/studyStudent.vue
  10. 3 3
      src/components/easy3/studyStudent jiu.vue
  11. 3 3
      src/components/easy3/studyStudent.vue
  12. 3 3
      src/components/noTerminal/studyStudent.vue
  13. 3 3
      src/components/studyStudent.vue
  14. 3 3
      src/components/studyStudentJiu.vue
  15. 3 3
      src/components/trainCourse/easy2/studyStudent.vue
  16. 3 3
      src/components/trainCourse/easy3/studyStudent.vue
  17. 3 3
      src/components/trainCourse/studyStudent.vue
  18. 3 3
      src/components/横板极简和任务模式/easy2/studyStudent.vue
  19. 3 3
      src/components/横板极简和任务模式/easy3/studyStudent.vue

+ 1 - 1
dist/index.html
Ver ficheiro 

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

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.879dadc99b5505aaebf1e14b408b739e.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.879dadc99b5505aaebf1e14b408b739e.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.b2109b3c4437498b7f0f.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.b2109b3c4437498b7f0f.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 7 - 5
src/components/courseDetail.vue
Ver ficheiro 

@@ -247,7 +247,7 @@
 
                 <div class="jdAndTask">
 
                   <div>第{{ index + 1 }}阶段</div>
 
                   <div
 
-                    v-if="courseDetail.state == 2 || courseDetail.state == 3 || courseDetail.state == 4"
 
+                    v-if="courseDetail.state == 2 || courseDetail.state == 3 || courseDetail.state == 4 || courseDetail.state == 5"
 
                   >
 
                     任务查看
 
                   </div>
 
@@ -1251,7 +1251,7 @@ export default {
 
               this.screenType
 
           );
 
         }
 
-      } else if (this.courseDetail.state == 2) {
 
+      } else if (this.courseDetail.state == 2 || this.courseDetail.state == 5) {
 
         if (this.classList.length) {
 
           this.goTo(
 
             "/studystudentE2?type=" +
 
@@ -1350,9 +1350,11 @@ export default {
 
 						}).then(() => {
 
 							if(this.courseDetail.state == 1 || this.courseDetail.state == 2){
 
 								window.parent.postMessage({ tools: "openNewCourseUpdate",cid:this.id }, "*");
 
-							}else if(this.courseDetail.state == 3 || this.courseDetail.state == 4){
 
+							}else if(this.courseDetail.state == 3){
 
 								window.parent.postMessage({ tools: "openCourseEUpdate",cid:this.id }, "*");
 
-							}
 
+							}else if(this.courseDetail.state == 4 || this.courseDetail.state == 5){
 
+								window.parent.postMessage({ tools: "openCourseAiUpdate",cid:this.id }, "*");
 
+              }
 
 
 						})
 
 					}else{
 
@@ -1433,7 +1435,7 @@ export default {
 
                   "&screenType=" +
 
                   this.screenType
 
               );
 
-            } else if (this.courseDetail.state == 2) {
 
+            } else if (this.courseDetail.state == 2 || this.courseDetail.state == 5) {
 
               this.goTo(
 
                 "/studystudentE2?type=" +
 
                   i +

+ 3 - 3
src/components/easy2/studyStudent jiu.vue
Ver ficheiro 

@@ -13787,17 +13787,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/easy2/studyStudent.vue
Ver ficheiro 

@@ -14423,17 +14423,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/easy3/studyStudent jiu.vue
Ver ficheiro 

@@ -13807,17 +13807,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/easy3/studyStudent.vue
Ver ficheiro 

@@ -14462,17 +14462,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/noTerminal/studyStudent.vue
Ver ficheiro 

@@ -6638,15 +6638,15 @@ export default {
 
                   if (
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
-                    this.arrayToArray(f[g].classid.split(","), this.tcid.split(",")).length == 0
 
+                    this.arrayToArray((f[g].classid ? f[g].classid.split(",") : []), this.tcid.split(",")).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/studyStudent.vue
Ver ficheiro 

@@ -14396,17 +14396,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/studyStudentJiu.vue
Ver ficheiro 

@@ -14325,17 +14325,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/trainCourse/easy2/studyStudent.vue
Ver ficheiro 

@@ -13951,17 +13951,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/trainCourse/easy3/studyStudent.vue
Ver ficheiro 

@@ -13941,17 +13941,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/trainCourse/studyStudent.vue
Ver ficheiro 

@@ -13922,17 +13922,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/横板极简和任务模式/easy2/studyStudent.vue
Ver ficheiro 

@@ -13787,17 +13787,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

+ 3 - 3
src/components/横板极简和任务模式/easy3/studyStudent.vue
Ver ficheiro 

@@ -13807,17 +13807,17 @@ export default {
 
                     f[g].ttype == 2 &&
 
                     this.tcid &&
 
                     this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length == 0
 
                   ) {
 
                     continue;
 
                   }
 
                   if (gA == f[g].group && f[g].tool == i && (this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.tcid.split(",")
 
                     ).length !== 0 || this.arrayToArray(
 
-                      f[g].classid.split(","),
 
+                      (f[g].classid ? f[g].classid.split(",") : []),
 
                       this.classId ? this.classId.split(",") : []
 
                     ).length !== 0 || (!this.tcid && this.tType == '1') || (this.courseDetail.juri === '') || f[g].ttype == 1)) {
 
                     this.groupStudent[i][gA].push(f[g]);

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio