diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index d356320..3f0da5c 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1554,4 +1554,12 @@ export default {
       data
     });
   },
+  // 删除班级信息
+  removeClass(data) {
+    return service({
+      url: setUpUrls.removeClass,
+      method: "POST",
+      data
+    });
+  },
 };
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 8b44bea..ced6ae2 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -402,4 +402,7 @@ export default {
   tenantAbnormalDeviceCount: "/api_html/tenant/abnormalDeviceCount",
   //设备异常备注
   abnormalRemark: "/api_html/school/manager/abnormalRemark",
+
+  //  删除班级信息
+  removeClass: "/api_html/school/manager/delClass",
 }
diff --git a/src/views/standard/setUp/clazz.vue b/src/views/standard/setUp/clazz.vue
index a6a431e..f995960 100644
--- a/src/views/standard/setUp/clazz.vue
+++ b/src/views/standard/setUp/clazz.vue
@@ -26,7 +26,12 @@
           ></el-button>
         </el-tooltip>
         <el-tooltip effect="dark" content="分班" placement="bottom">
-          <img @click="toArchived" src="../../../assets/images/fenban.png" class="fenban" alt="" />
+          <img
+            @click="toArchived"
+            src="../../../assets/images/fenban.png"
+            class="fenban"
+            alt=""
+          />
         </el-tooltip>
       </template>
     </back-box>
@@ -76,11 +81,7 @@
       </div>
     </div>
     <el-dialog title="导入班级名单" :visible.sync="diaUp" width="600">
-      <up-load
-        :url="url"
-        @upSuccess="upSuccess"
-        fileName="班级名单"
-      >
+      <up-load :url="url" @upSuccess="upSuccess" fileName="班级名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入班级名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -124,7 +125,11 @@
       <div class="dialog-footer" slot="footer">
         <el-button @click="_SaveClass" type="primary">确 定</el-button>
         <el-button @click="diaClass = false">取 消</el-button>
-        <el-popconfirm title="确定删除该班级吗？" @confirm="_RemoveClass">
+        <el-popconfirm
+          v-if="!formClass.teacherCount && !formClass.studentCount"
+          title="确定删除该班级吗？"
+          @confirm="_RemoveClass"
+        >
           <el-button class="el-button-del" slot="reference" type="danger" plain
             >删 除</el-button
           >
@@ -201,7 +206,7 @@
 </template>
 
 <script>
-import { downloadFile } from "@/utils";
+import { downloadFile, formatDate } from "@/utils";
 import draggable from "vuedraggable";
 export default {
   components: {
@@ -224,6 +229,8 @@ export default {
         className: "",
         classCode: "",
         intoSchoolYear: "",
+        studentCount: "",
+        teacherCount: "",
       },
       rulesClass: {
         className: [
@@ -243,10 +250,10 @@ export default {
     this._QuerySubject();
   },
   methods: {
-    toArchived(){
+    toArchived() {
       this.$router.push({
-        path:'/archived'
-      })
+        path: "/archived",
+      });
     },
     openSubject(obj) {
       this.formClass.gradeName = obj.gradeName;
@@ -275,6 +282,8 @@ export default {
       this._QueryData();
     },
     setClass(obj, gradeName) {
+      this.formClass.studentCount = obj.studentCount;
+      this.formClass.teacherCount = obj.teacherCount;
       this.formClass.gradeName = gradeName;
       this.formClass.classId = obj.id;
       this.formClass.className = obj.className;
@@ -284,24 +293,17 @@ export default {
         : "";
       this.diaClass = true;
     },
-    _RemoveClass() {
-      this.$refs.formClass.validate(async (valid) => {
-        if (valid) {
-          const { data, status, info } = await this.$request.removeClass({
-            classId: this.formClass.classId,
-          });
-          if (status === 0) {
-            this.$message.success("修改成功");
-            this.diaClass = false;
-            this._QueryData();
-          } else {
-            this.$message.error(info);
-          }
-        } else {
-          this.$message.warning("输入有误请检查！");
-          return false;
-        }
+    async _RemoveClass() {
+      const { data, status, info } = await this.$request.removeClass({
+        classId: this.formClass.classId,
       });
+      if (status === 0) {
+        this.$message.success("修改成功");
+        this.diaClass = false;
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
     },
     _SaveClass() {
       this.$refs.formClass.validate(async (valid) => {
@@ -309,7 +311,8 @@ export default {
           const { data, status, info } = await this.$request.updateClass({
             classId: this.formClass.classId,
             className: this.formClass.className,
-            intoSchoolYear: this.formClass.intoSchoolYear,
+            classCode: this.formClass.classCode,
+            intoSchoolYear: formatDate(this.formClass.intoSchoolYear, "yyyy"),
           });
           if (status === 0) {
             this.$message.success("修改成功");
@@ -468,9 +471,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.fenban{
-  width:28px;
-  margin-left:10px;
+.fenban {
+  width: 28px;
+  margin-left: 10px;
   cursor: pointer;
 }
 .page-tit {