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

src/components/easy2/commpont/markDialog.vue

@@ -1672,6 +1672,7 @@ export default {
 .AreaCss >>> .el-textarea__inner {
   min-height: 150px !important;
   /* max-height: 150px; */
+  color: #606266;
   padding-bottom: 20px;
 }
 .AreaBtn {

src/components/easy2/studyStudent.vue

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

src/components/easy3/studyStudent.vue

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

src/components/studyStudent.vue

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