#

src/components/pages/studentManageNew/component/table.vue

@@ -185,7 +185,7 @@
     </div>
     <div class="tabList" v-loading="isLoading">
       <el-table
-        :data="tableData"
+        :data="tableDataList"
         ref="tableData"
         :header-cell-style="{ background: '#E7EAF0' }"
         :key="boxType"
@@ -719,7 +719,10 @@ export default {
       moveClaInfo: {}, // 移动班级学生信息
       moveClaCascaderDataPath: [], // 移动班级学生级联选中数据路径
 
-      tableData: [], //表格数据
+      tableData: [], //班级学生表格数据
+      interestTableData: [], //兴趣班表格数据
+      allTableData: [], //全部学生表格数据
+
       selectedData: [], //选中数据
 
       page: 1,
@@ -758,6 +761,19 @@ export default {
     }
   },
   computed: {
+    tableDataList() {
+      if (this.boxType == 0) {
+        return this.tableData;
+      } else if (this.boxType == 1 && this.interestType == 0) {
+        return this.interestTableData;
+      } else if (this.boxType == 1 && this.interestType == 1) {
+        return this.tableData;
+      } else if (this.boxType == 2) {
+        return this.allTableData;
+      } else {
+        return [];
+      }
+    },
     studentColumns() {
       return [
         { label: this.lang.StudentName, prop: "username" },
@@ -1529,6 +1545,8 @@ export default {
       this.total = 0;
       // 清除表格数据
       this.tableData = [];
+      this.interestTableData = [];
+      this.allTableData = [];
       // 清除选中数据
       this.selectedData = [];
 
@@ -1646,7 +1664,7 @@ export default {
         .then(res => {
           this.isLoading = false;
           this.total = res.data[0].length > 0 ? res.data[0][0].num : 0;
-          this.tableData = res.data[0];
+          this.interestTableData = res.data[0];
         })
         .catch(err => {
           this.isLoading = false;
@@ -1684,7 +1702,7 @@ export default {
             });
             e.classname = kk.join("/");
           });
-          this.tableData = res.data[0];
+          this.allTableData = res.data[0];
         })
         .catch(err => {
           this.isLoading = false;

src/components/pages/studentManageNew/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="box">
+  <div class="box" v-loading="boxLoading">
     <div class="rigbox">
       <div class="centerCss">
         <img src="../../../assets/stuImg/riqi.svg" alt="" />
@@ -7,7 +7,7 @@
       </div>
       <!-- v-if="orglist.includes(org)" -->
 
-      <template v-loading="boxLoading">
+      <!-- <div > -->
       <div style="display: flex; gap: 10px;">
         <div v-if="orglist.includes(org) || this.role == 1" class="Clabtn" @click="openaddClass(1)">
           <img src="../../../assets/stuImg/jia.svg" alt="" />
@@ -44,7 +44,7 @@
             </el-menu-item-group>
           </el-submenu>
         </el-menu>
-      </template>
+      <!-- </div> -->
 
       <div class="line"></div>
       <div class="centerCss">
@@ -183,7 +183,6 @@ export default {
       if (!this.addgraName) {
         this.$message.error(this.lang.EnterGradeName)
       }
-      this.boxLoading = true;
       let params = {
         name: this.addgraName,
         oid: this.oid,
@@ -197,7 +196,6 @@ export default {
               message: this.lang.Cannotsameother,
               type: "error",
             });
-            this.boxLoading = false;
 
           } else {
             this.$message({
@@ -217,14 +215,12 @@ export default {
             message: this.lang.Additionfailed,
             type: "error",
           });
-          this.boxLoading = false;
 
           console.error(err);
         });
     },
     //获取年级列表
     getGrade(val = 0) {
-      this.boxLoading = true;
       let params = {
         oid: this.oid,
       };