update

src/components/easy2/studyStudent.vue

@@ -14221,6 +14221,13 @@ export default {
   font-size: 14px;
 }
 
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
+
 /* table 样式 */
 .cont>>>table {
   border-top: 1px solid #ccc;
@@ -14231,8 +14238,12 @@ export default {
 .cont>>>table th {
   border-bottom: 1px solid #ccc;
   border-right: 1px solid #ccc;
-  padding: 15px 5px;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
   max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
 }
 
 .cont>>>table th {
@@ -14251,6 +14262,26 @@ export default {
   background-color: #f1f1f1;
 }
 
+/* code 样式 */
+.cont>>>code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont>>>pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont>>>ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
 .addPzCheck {
   display: flex;
   flex-direction: row;
@@ -14273,27 +14304,6 @@ export default {
   border-bottom: 2px solid #2f80f3;
 }
 
-/* code 样式 */
-.cont>>>code {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-  background-color: #f1f1f1;
-  border-radius: 3px;
-  padding: 3px 5px;
-  margin: 0 3px;
-}
-
-.cont>>>pre code {
-  display: block;
-}
-
-/* ul ol 样式 */
-.cont>>>ul,
-ol {
-  margin: 10px 0 10px 20px;
-}
-
 .scoreBox,
 .scoreDetailBox {
   display: flex;

src/components/easy3/studyStudent.vue

@@ -14089,35 +14089,6 @@ export default {
 }
 
 /* table 样式 */
-.cont>>>table {
-  border-top: 1px solid #ccc;
-  border-left: 1px solid #ccc;
-}
-
-.cont>>>table td,
-.cont>>>table th {
-  border-bottom: 1px solid #ccc;
-  border-right: 1px solid #ccc;
-  padding: 15px 5px;
-  max-width: 0px;
-}
-
-.cont>>>table th {
-  border-bottom: 2px solid #ccc;
-  text-align: center;
-}
-
-/* blockquote 样式 */
-.cont>>>blockquote {
-  display: block;
-  border-left: 8px solid #d0e5f2;
-  padding: 5px 10px;
-  margin: 10px 0;
-  line-height: 1.4;
-  font-size: 100%;
-  background-color: #f1f1f1;
-}
-
 .addPzCheck {
   display: flex;
   flex-direction: row;
@@ -14141,26 +14112,6 @@ export default {
 }
 
 /* code 样式 */
-.cont>>>code {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-  background-color: #f1f1f1;
-  border-radius: 3px;
-  padding: 3px 5px;
-  margin: 0 3px;
-}
-
-.cont>>>pre code {
-  display: block;
-}
-
-/* ul ol 样式 */
-.cont>>>ul,
-ol {
-  margin: 10px 0 10px 20px;
-}
-
 .scoreBox,
 .scoreDetailBox {
   display: flex;
@@ -14952,4 +14903,65 @@ ol {
   width: 20px;
   height: 20px;
 }
+/* code 样式 */
+.cont {
+  /* -webkit-user-modify: read-write; */
+  overflow-wrap: break-word;
+  -webkit-line-break: after-white-space;
+}
+
+/* table 样式 */
+.cont>>>table {
+  border-top: 1px solid #ccc;
+  border-left: 1px solid #ccc;
+}
+
+.cont>>>table td,
+.cont>>>table th {
+  border-bottom: 1px solid #ccc;
+  border-right: 1px solid #ccc;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
+  max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
+}
+
+.cont>>>table th {
+  border-bottom: 2px solid #ccc;
+  text-align: center;
+}
+
+/* blockquote 样式 */
+.cont>>>blockquote {
+  display: block;
+  border-left: 8px solid #d0e5f2;
+  padding: 5px 10px;
+  margin: 10px 0;
+  line-height: 1.4;
+  font-size: 100%;
+  background-color: #f1f1f1;
+}
+
+/* code 样式 */
+.cont>>>code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont>>>pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont>>>ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
 </style>

src/components/group/group.vue

@@ -32,6 +32,10 @@
                             <span>开放选座</span>
                             <el-switch v-model="islock" active-text="" class="switchCss" @change="lockChair"></el-switch>
                         </div>
+                        <!-- <div class="group_switch">
+                            <span>开启分组</span>
+                            <el-switch v-model="isopen" class="switchCss" @change="openChair"></el-switch>
+                        </div> -->
                         <div type="primary" @click="updateGroup" class="returnBtn" style="background-color: #225bc7">
                             分组设置
                         </div>
@@ -408,6 +412,7 @@ export default {
                 islock: 1,
             },
             islock: false,
+            isopen:true,
             timer: null,
             groupStudent: {},
             groupStudentUid: {},
@@ -474,6 +479,7 @@ export default {
                 islock: 1,
             }
             this.islock = false
+            this.isopen = true
             this.getCourseGroup();
         },
         guid() {
@@ -524,6 +530,7 @@ export default {
                                 islock: 1,
                             }
                             this.islock = false
+                            this.isopen = true
                             this.$message.success("操作成功");
                             this.getCourseGroup();
                             this.$forceUpdate()
@@ -545,7 +552,27 @@ export default {
         },
         lockChair() {
             this.groupJson2 = JSON.parse(JSON.stringify(this.groupJson));
-            this.groupJson2.islock = this.groupJson2.islock == 1 ? 2 : 1;
+            if(this.groupJson2.isopen == 2){
+                this.$message.error("请开启分组后才能开放选座")
+                this.islock = false
+                return
+            }else{
+                this.groupJson2.islock = this.groupJson2.islock == 1 ? 2 : 1;
+            }
+            this.updateGroupJson();
+        },
+        openChair() {
+            this.groupJson2 = JSON.parse(JSON.stringify(this.groupJson));
+            if(!this.groupJson2.isopen){
+                this.groupJson2.isopen = 2;
+            }else{
+                this.groupJson2.isopen = this.groupJson2.isopen == 1 ? 2 : 1;
+            }
+            if(this.groupJson2.isopen == 2){
+                this.groupJson2.islock = 2
+            }else{
+                this.groupJson2.islock = 1
+            }
             this.updateGroupJson();
         },
         updateGroupJson() {
@@ -600,6 +627,11 @@ export default {
                     if (res.data && res.data[0].length) {
                         this.groupJson = JSON.parse(res.data[0][0].group);
                         this.islock = this.groupJson.islock == 1 ? true : false;
+                        if(!this.groupJson.isopen){
+                            this.isopen = true
+                        }else{
+                            this.isopen = this.groupJson.isopen == 1 ? true : false;
+                        }
                         this.groupid = res.data[0][0].id;
                         let groupPerson = res.data[1]
                         let group = JSON.parse(res.data[0][0].group).group

src/components/studyStudent.vue

@@ -14514,8 +14514,12 @@ export default {
 .cont>>>table th {
   border-bottom: 1px solid #ccc;
   border-right: 1px solid #ccc;
-  padding: 15px 5px;
+  /* padding: 20px 5px; */
+  padding: 5px 10px;
   max-width: 0px;
+  height: 30px;
+  vertical-align: baseline;
+  box-sizing: border-box;
 }
 
 .cont>>>table th {
@@ -14534,6 +14538,27 @@ export default {
   background-color: #f1f1f1;
 }
 
+/* code 样式 */
+.cont>>>code {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+  background-color: #f1f1f1;
+  border-radius: 3px;
+  padding: 3px 5px;
+  margin: 0 3px;
+}
+
+.cont>>>pre code {
+  display: block;
+}
+
+/* ul ol 样式 */
+.cont>>>ul,
+ol {
+  margin: 10px 0 10px 20px;
+}
+
 .addPzCheck {
   display: flex;
   flex-direction: row;
@@ -14563,26 +14588,6 @@ export default {
   -webkit-line-break: after-white-space;
 }
 
-.cont>>>code {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-  background-color: #f1f1f1;
-  border-radius: 3px;
-  padding: 3px 5px;
-  margin: 0 3px;
-}
-
-.cont>>>pre code {
-  display: block;
-}
-
-/* ul ol 样式 */
-.cont>>>ul,
-ol {
-  margin: 10px 0 10px 20px;
-}
-
 .scoreBox,
 .scoreDetailBox {
   display: flex;