diff --git a/src/views/modules/h5/localTeacher.vue b/src/views/modules/h5/localTeacher.vue
index 0abb2cf..75ca54c 100644
--- a/src/views/modules/h5/localTeacher.vue
+++ b/src/views/modules/h5/localTeacher.vue
@@ -5,7 +5,7 @@
                 <el-input v-model="dataForm.userName" placeholder="姓名" clearable></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button @click="getDataList()">查询</el-button>
+                <el-button @click="getData()">查询</el-button>
                 <!--                <el-button v-if="isAuth('stu:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>-->
                 <el-button v-if="isAuth('teach:user:delete')" type="danger" @click="deleteHandle()"
                            :disabled="dataListSelections.length <= 0">批量删除
@@ -17,7 +17,7 @@
 
         </el-form>
 
-        <el-table  @sort-change="sortChange"  :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
+        <el-table  @sort-change="sortChange" @filter-change="filterChange" :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
                   style="width: 100%;">
             <el-table-column type="selection" header-align="center" align="center" width="50">
             </el-table-column>
@@ -120,6 +120,7 @@ export default {
             dataListSelections: [],
             addOrUpdateVisible: false,
             groupIdes: [],
+            majorIds: 0,
             json_fields: {
                 "序号": "index",
                 "姓名": "userName",
@@ -198,6 +199,19 @@ export default {
             }
 
         },
+        filterChange(value) {
+            const majorFilter = value.majorId || []
+            const majorIds = majorFilter.join(',')
+            this.majorIds = majorIds
+            console.log("11111",this.majorIds)
+
+            // 重置页码到第一页
+            this.pageIndex = 1
+            // 恢复默认分页选项
+            this.myPageSize = [5, 10, 20, 50, 100, 500]
+
+            this.getDataList('', '', this.majorIds)
+        },
         //  Excel导出
         async getExportExcel(){
             let excelData=[]
@@ -235,10 +249,18 @@ export default {
             //     return "未分组"
             // }
         },
+        async getData(){
+        if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
+        },
         // 获取数据列表
-        getDataList(prop='', sort='', arr='') {
+        async getDataList(prop='', sort='', arr='') {
             this.dataListLoading = true
-            this.$http({
+           await this.$http({
                 url: this.$http.adornUrl('/teach/list'),
                 method: 'get',
                 params: this.$http.adornParams({
@@ -258,18 +280,29 @@ export default {
                     this.totalCount = 0
                 }
                 this.dataListLoading = false
+                this.queryCount(0)
             })
         },
         // 每页数
         sizeChangeHandle(val) {
             this.pageSize = val
             this.pageIndex = 1
-            this.getDataList()
+            if(this.majorIds === 0){
+                console.log(this.majorId);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 当前页
         currentChangeHandle(val) {
             this.pageIndex = val
-            this.getDataList()
+            if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 多选
         selectionChangeHandle(val) {
diff --git a/src/views/modules/h5/student.vue b/src/views/modules/h5/student.vue
index 439ca32..1a85752 100644
--- a/src/views/modules/h5/student.vue
+++ b/src/views/modules/h5/student.vue
@@ -5,7 +5,7 @@
                 <el-input v-model="dataForm.userName" placeholder="姓名" clearable></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button @click="getDataList()">查询</el-button>
+                <el-button @click="getData()">查询</el-button>
 <!--                <el-button v-if="isAuth('stu:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>-->
                 <el-button v-if="isAuth('stu:user:delete')" type="danger" @click="deleteHandle()"
                            :disabled="dataListSelections.length <= 0">批量删除
@@ -15,7 +15,7 @@
                 <el-button type='primary'>导出</el-button>
             </download-excel>
         </el-form>
-        <el-table     @sort-change="sortChange"  :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
+        <el-table     @sort-change="sortChange" @filter-change="filterChange" :data="dataList" border v-loading="dataListLoading" @selection-change="selectionChangeHandle"
                   style="width: 100%;">
             <el-table-column type="selection" header-align="center" align="center" width="50">
             </el-table-column>
@@ -119,6 +119,7 @@ export default {
             dataListSelections: [],
             addOrUpdateVisible: false,
             groupIdes: [],
+            majorIds: 0,
             json_fields: {
                 "序号":"index",
                 "姓名": "userName",
@@ -190,6 +191,19 @@ export default {
             }
 
         },
+        filterChange(value) {
+            const majorFilter = value.majorId || []
+            const majorIds = majorFilter.join(',')
+            this.majorIds = majorIds
+            console.log("11111",this.majorIds)
+
+            // 重置页码到第一页
+            this.pageIndex = 1
+            // 恢复默认分页选项
+            this.myPageSize = [5, 10, 20, 50, 100, 500]
+
+            this.getDataList('', '', this.majorIds)
+        },
         //  Excel导出
         async getExportExcel(){
             let excelData=[]
@@ -224,6 +238,14 @@ export default {
             //     return "未分组"
             // }
         },
+        async getData(){
+        if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
+        },
         // 获取数据列表
         getDataList(prop='', sort='', arr='') {
             this.dataListLoading = true
@@ -247,18 +269,29 @@ export default {
                     this.totalCount = 0
                 }
                 this.dataListLoading = false
+                this.queryCount(0)
             })
         },
         // 每页数
         sizeChangeHandle(val) {
             this.pageSize = val
             this.pageIndex = 1
-            this.getDataList()
+            if(this.majorIds === 0){
+                console.log(this.majorId);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 当前页
         currentChangeHandle(val) {
             this.pageIndex = val
-            this.getDataList()
+            if(this.majorIds === 0){
+                console.log(this.majorId);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 多选
         selectionChangeHandle(val) {
diff --git a/src/views/modules/h5/waiTeacher.vue b/src/views/modules/h5/waiTeacher.vue
index e7ec822..6c4cd74 100644
--- a/src/views/modules/h5/waiTeacher.vue
+++ b/src/views/modules/h5/waiTeacher.vue
@@ -5,8 +5,8 @@
                 <el-input v-model="dataForm.userName" placeholder="姓名" clearable></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button @click="getDataList()">查询</el-button>
-                                <el-button v-if="isAuth('stu:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
+                <el-button @click="getData()">查询</el-button>
+                <el-button v-if="isAuth('stu:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
                 <el-button v-if="isAuth('wai:user:delete')" type="danger" @click="deleteHandle()"
                            :disabled="dataListSelections.length <= 0">批量删除
                 </el-button>
@@ -232,6 +232,7 @@ export default {
             dataListSelections: [],
             addOrUpdateVisible: false,
             groupIdes: [],
+            majorIds: 0,
             json_fields: {
                 "序号": "index",
                 "姓名": "userName",
@@ -336,6 +337,8 @@ export default {
         filterChange(value) {
             const majorFilter = value.majorId || []
             const majorIds = majorFilter.join(',')
+            this.majorIds = majorIds
+            //console.log(this.majorIds)
 
             // 重置页码到第一页
             this.pageIndex = 1
@@ -507,6 +510,14 @@ export default {
             //     return "未分组"
             // }
         },
+       async getData(){
+        if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
+        },
         // 获取数据列表
        async getDataList(prop = '', sort = '', arr = '') {
             this.dataListLoading = true
@@ -537,12 +548,23 @@ export default {
         sizeChangeHandle(val) {
             this.pageSize = val
             this.pageIndex = 1  // 切换分页大小时重置到第一页
-            this.getDataList()
+            if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 当前页
         currentChangeHandle(val) {
             this.pageIndex = val
-            this.getDataList()
+            console.log("1111",val)
+            if(this.majorIds === 0){
+                console.log(this.majorIds);
+                this.getDataList()
+                return;
+            }
+            this.getDataList('','',this.majorIds)
         },
         // 多选
         selectionChangeHandle(val) {