提交

src/views/Index.vue

@@ -368,7 +368,7 @@ export default {
         device:1,
         orderField: orderType == 1 ? '' : 'studys',
         orderAsc: false,
-        topOrder:true,
+        // topOrder:true,
         pageIndex: pageIndex
       };
       let isTopList = [];

src/views/article/ManageList.vue

@@ -35,7 +35,7 @@
         </div>
         <div style="padding: 0px 5px">
           <el-button
-            @click="getArticleList"
+            @click="getsearch"
             icon="el-icon-search"
             type="primary"
             >搜索</el-button
@@ -167,9 +167,15 @@ export default {
     },
   },
   methods: {
+    getsearch(){
+      this.pageData.pageIndex = 1;
+	  this.getArticleList()
+
+    },
     reset() {
       this.pageData.status = ''
       this.pageData.keyword = ''
+      this.pageData.pageIndex = 1;
 	  this.getArticleList()
     },
     //获取文章列表数据

src/views/article/MyList.vue

@@ -91,6 +91,7 @@ export default {
   methods: {
      search(){
       this.isSearh = true;
+      this.pageData.pageIndex = 1;
       this.getArticleList()
     },
     saveSuccess(data){
@@ -127,7 +128,7 @@ export default {
     },
 
     reset(){
-
+       this.pageData.pageIndex = 1;
        this.pageData.keyword = '',
        this.pageData.status = ''
        this.getArticleList();

src/views/article/contactMine.vue

@@ -141,6 +141,7 @@ export default {
   components: {},
   methods: {
     getList() {
+     this.dataList.pageIndex = 1;
      this.isSearh = true;
      this.getData();
     },
@@ -187,6 +188,7 @@ export default {
       })
     },
      reset(){
+     this.dataList.pageIndex = 1;
      this.dataList.send = '',
      this.type = 0;
      this.getData();

src/views/course/Courseware.vue

@@ -33,7 +33,7 @@
             </el-col>
              <el-col :span="8" >
               <div class="grid-content bg-purple" >
-                <el-button type="primary" style="margin-left: 0px" @click="getSearch()" icon="el-icon-search">搜索</el-button>
+                <el-button type="primary" style="margin-left: 0px" @click="search()" icon="el-icon-search">搜索</el-button>
                 <el-button @click="reset()" style="margin-left: 20pxpx" type="primary" icon="el-icon-refresh-right">重置</el-button>
               </div>
               
@@ -356,6 +356,11 @@ export default {
     });
   },
   methods: {
+    search(){
+     this.params.pageIndex = 1;
+	    this.getSearch();
+
+    },
     reset() {
       this.params.self = null;
       this.params.name = '';
@@ -365,6 +370,7 @@ export default {
       this.params.resOwner1 = '';
       this.params.resOwner2 = '';
       this.params.resOwner3 = '';
+     this.params.pageIndex = 1;
 	    this.getSearch();
     },
     ...mapActions({

src/views/course/TeacherList.vue

@@ -178,6 +178,7 @@ export default {
       this.params.keyword = '';
       this.params.status = '';
       this.params.type = '';
+      this.params.pageIndex = 1;
       this.getList();
        this.isSearh = false;
     },

src/views/course/WaitAudit.vue

@@ -22,7 +22,7 @@
               </el-select>
           </el-col>
            <el-col  :span="8">
-              <el-button type="primary"  @click="searchData()"  icon="el-icon-search">搜索</el-button>
+              <el-button type="primary"  @click="getseatch();"  icon="el-icon-search">搜索</el-button>
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
@@ -289,6 +289,10 @@ export default {
     this.loadSysTypes();
   },
   methods: {
+   getseatch(){
+     this.params.pageIndex= 1;
+     this.searchData();
+   },
     reset(){
       this.resOwner = ''
       this.params.sysType = ''
@@ -300,6 +304,7 @@ export default {
       this.params.sysType1 = '';
       this.params.sysType2 = '';
       this.params.sysType3 = '';
+      this.params.pageIndex= 1;
 	    this.searchData();
     },
     ...mapActions({

src/views/course/WaitAudited.vue

@@ -181,6 +181,10 @@ export default {
    
   },
   methods: {
+    getseatch(){
+     this.params.pageIndex= 1;
+     this.searchData();
+   },
     reset(){
        this.resOwner = ''
       this.params.sysType = ''
@@ -192,6 +196,7 @@ export default {
       this.params.sysType1 = '';
       this.params.sysType2 = '';
       this.params.sysType3 = '';
+      this.params.pageIndex= 1;
 	    this.searchData();
     },
     ...mapActions({

src/views/exam/ExamList.vue

@@ -21,7 +21,7 @@
                 <el-input placeholder="关键词" v-model="params.keyWord" clearable></el-input>
               </div>
               <div style="padding: 0px 5px">
-                <el-button  @click="loadData()" icon="el-icon-search" type="primary" >搜索</el-button>
+                <el-button  @click="search()" icon="el-icon-search" type="primary" >搜索</el-button>
               </div>
               <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div>
                <div style="margin-left:5px">
@@ -836,10 +836,16 @@ export default {
         ele.select();
         document.execCommand("Copy");
     },
+    search(){
+      this.params.pageIndex = 1;
+      this.loadData();
+
+    },
     reset(){
       this.params.keyWord = ''
       this.params.published = ''
       this.ownership = ''
+      this.params.pageIndex = 1;
       this.loadData();
 
     },

src/views/exam/MyExamTask.vue

@@ -113,11 +113,13 @@
       },
     search(){
       this.isSearh = true;
+      this.pageIndex =1;
       this.query()
     },
     reset() {
        this.testName = '';
        this.status='';
+       this.pageIndex =1;
        this.query();
        this.isSearh = false;
     },

src/views/exam/Question.vue

@@ -29,7 +29,7 @@
                   clearable></el-input>
           </el-col>
           <el-col :span="14">
-              <el-button type="primary" @click="loadData(1)" style="margin-left: 20px" icon="el-icon-search" >搜索</el-button>
+              <el-button type="primary" @click="getsearch(1)" style="margin-left: 20px" icon="el-icon-search" >搜索</el-button>
               <el-button  icon="el-icon-refresh-right" type="primary" @click="reset"> 重置 </el-button>
               <el-button type="primary" @click="addQuestion(1)" style="margin-left: 10px" icon="el-icon-plus"> 添加 </el-button>
               <div  style="display: inline-block;margin-left: 10px;">
@@ -395,10 +395,16 @@ export default {
         }
       })
     },
+    getsearch(){
+      this.params.pageIndex = 1;
+     this.loadData(1)
+
+    },
     reset(){
-     this.params.ownership = []
+     this.params.ownership = [];
-     this.params.type = ''
+     this.params.type = '';
-     this.params.title = ''
+     this.params.title = '';
+      this.params.pageIndex = 1;
      this.loadData(1)
     },
     ...mapActions({

src/views/exam/TestPaper.vue

@@ -15,7 +15,7 @@
                 </el-select>
               </div>
               <div style="padding: 0px 5px;"><el-input placeholder="关键词" v-model="params.keyWord" clearable></el-input></div>
-              <div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="searchData" type="primary" >搜索</el-button></div>
+              <div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="getsearch" type="primary" >搜索</el-button></div>
               <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button></div>
               <div style="padding-left:5px;"><el-button icon="el-icon-plus" type="primary" @click="addPaper()" >新建试卷</el-button></div>
             </div>
@@ -427,10 +427,15 @@ export default {
             }
           })
     },
+    getsearch(){
+     this.params.pageIndex = 1;
+     this.searchData();
+    },
     reset(){
       this.ownership = []
       this.params.paperType = ''
       this.params.keyWord = ''
+     this.params.pageIndex = 1;
       this.searchData();
     },
  ...mapActions({

src/views/examine/NotApproved.vue

@@ -22,7 +22,7 @@
             </el-select>
           </el-col>
           <el-col  :span="8">
-              <el-button type="primary"  @click="searchData()"  icon="el-icon-search">搜索</el-button>
+              <el-button type="primary"  @click="getsearch()"  icon="el-icon-search">搜索</el-button>
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
@@ -289,6 +289,10 @@ export default {
     this.loadSysTypes();
   },
   methods: {
+    getsearch(){
+      this.params.pageIndex= 1;
+      this.searchData();
+    },
     reset(){
       this.resOwner = ''
       this.params.sysType = ''
@@ -300,6 +304,7 @@ export default {
       this.params.sysType1 = '';
       this.params.sysType2 = '';
       this.params.sysType3 = '';
+       this.params.pageIndex= 1;
 	    this.searchData();
     },
     ...mapActions({

src/views/examine/Reviewed.vue

@@ -23,7 +23,7 @@
               </el-select>
           </el-col>
            <el-col :span="8">
-              <el-button type="primary"  @click="searchData()" icon="el-icon-search">搜索</el-button>
+              <el-button type="primary"  @click="getsearch()" icon="el-icon-search">搜索</el-button>
               <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
           </el-col>
         </el-row>
@@ -235,6 +235,10 @@ export default {
    
   },
   methods: {
+    getsearch(){
+     this.params.pageIndex = 1;
+     this.searchData();
+    },
     reset(){
        this.resOwner = ''
       this.params.sysType = ''
@@ -246,6 +250,7 @@ export default {
       this.params.sysType1 = '';
       this.params.sysType2 = '';
       this.params.sysType3 = '';
+      this.params.pageIndex = 1;
 	    this.searchData();
     },
     ...mapActions({

src/views/manage/TeacherList.vue

@@ -21,7 +21,7 @@
          </div>
       </div>
          <div style="margin-top:10px;padding: 0px 5px;">
-            <el-button icon="el-icon-search" type="primary"  @click="loadData(1)">搜索</el-button>
+            <el-button icon="el-icon-search" type="primary"  @click="getsearch()">搜索</el-button>
             <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
             <el-button icon="el-icon-circle-plus-outline" type="primary"  @click="openDialog">新建教师</el-button>
             <el-button icon="el-icon-folder-opened" type="primary" @click="exportsExcel">导出</el-button>
@@ -297,9 +297,14 @@
         });
         this.levelData=array;
       },
+      getsearch(){
+        this.pageIndex = 1;
+       this.loadData(1);
+      },
       reset (){
        this.queryName = '';
        this.$refs.teacherTable.clearFilter();
+        this.pageIndex = 1;
        this.loadData(1);
       },
       openDialog(){

src/views/manage/UserGroupList.vue

@@ -128,8 +128,10 @@
     },
     methods: {
       reset(){
+        this.page.pageIndex = 1;
         this.query.name = ''
         this.query.status = ''
+
         this.loadData(this.page,this.query);
       },
       handleSizePushChange(val){

src/views/qa/ManageList.vue

@@ -32,7 +32,7 @@
           </el-select>
         </div>
         <div style="padding: 0px 10px;"><el-input placeholder="请输入标题" v-model="queryObj.keyword" clearable></el-input></div>
-        <el-button icon="el-icon-search" @click="getQaList" type="primary" >搜索</el-button>
+        <el-button icon="el-icon-search" @click="search" type="primary" >搜索</el-button>
           <el-button icon="el-icon-refresh-right" type="primary"  @click="reset">重置</el-button>
       </div>
         <div style="display: flex;justify-content:flex-start;align-items: center;margin-top:10px">
@@ -163,13 +163,17 @@ export default {
     }
   },
   methods: {
-
+  search(){
+    this.queryObj.pageIndex = 1;
+    this.getQaList();
+  },
     reset(){
       this.queryObj.orderField = ''
       this.queryObj.status = ''
       this.queryObj.isResolve = ''
       this.queryObj.keyword = ''
       this.queryObj.isEssence = ''
+    this.queryObj.pageIndex = 1;
 	  this.getQaList();
     },
     //查询问答列表数据

src/views/qa/MyList.vue

@@ -94,12 +94,14 @@ export default {
 
     reset(){
      this.queryObj.keyWord = '',
-     this.queryObj.isResolve = ''
+     this.queryObj.isResolve = '';
+     this.queryObj.pageIndex =1;
      this.getData();
      this.isSearh = false;
     },
     getList() {
       this.isSearh = true;
+      this.queryObj.pageIndex =1;
       this.getData();
     },
     //获取列表数据

src/views/qa/MyReplys.vue

@@ -85,6 +85,7 @@ export default {
   },
   methods: {
    getList() {
+    this.queryObj.pageIndex = 1;
     this.isSearh = true;
     this.getData();
    },
@@ -104,6 +105,7 @@ export default {
         });
     },
      reset(){
+      this.queryObj.pageIndex = 1;
       this.queryObj.keyWord = '';
       this.queryObj.isResolve = '';
       this.getData();

src/views/qa/NeedReplys.vue

@@ -116,10 +116,12 @@ export default {
   methods: {
     
     getlist(){
+      this.dataList.pageIndex = 1;
       this.isSearh = true;
       this.getData();
     },
     reset(){
+      this.dataList.pageIndex = 1;
        this.dataList.send = ''
        this.getData()
        this.isSearh = false;

src/views/qa/TeacherList.vue

@@ -108,10 +108,12 @@ export default {
   components: {},
   methods: {
     getList(){
+    this.dataList.pageIndex = 1;
      this.isSearh = true;
      this.getData();
     },
     reset(){
+      this.dataList.pageIndex = 1;
       this.dataList.send = ''
       this.getData();
       this.isSearh = false;

src/views/share/MyList.vue

@@ -149,6 +149,9 @@
     },
     methods:{
       queryData(){
+        this.qaList.pageIndex = 1;
+        this.articleList.pageIndex = 1;
+        this.courseList.pageIndex = 1;
         this.isSearh = true;
         if (this.tabName == 'qa') {
           this.findQa();
@@ -161,6 +164,9 @@
         }
       },
        resData() {
+        this.qaList.pageIndex = 1;
+        this.articleList.pageIndex = 1;
+        this.courseList.pageIndex = 1;
         this.keyword = '';
         this.isRead = '';
         this.queryData();

src/views/share/ToList.vue

@@ -170,6 +170,9 @@ export default {
   },
   methods: {
     queryData() {
+      this.qaList.pageIndex = 1;
+      this.articleList.pageIndex = 1;
+      this.courseList.pageIndex = 1;
       this.isSearh= true;
       if (this.tabName == 'qa') {
         this.findQa();
@@ -185,6 +188,9 @@ export default {
     resData() {
       this.keyword = '';
       this.isRead = '';
+      this.qaList.pageIndex = 1;
+      this.articleList.pageIndex = 1;
+      this.courseList.pageIndex = 1;
       this.queryData();
       this.isSearh= false;
     },

src/views/user/MyAssess.vue

@@ -7,7 +7,7 @@
       <el-col :span="24">
 
         <el-input clearable placeholder="搜索名称" v-model="keyword"></el-input>
-        <el-button type="primary" icon="el-icon-search" @click="findList()">搜索</el-button>
+        <el-button type="primary" icon="el-icon-search" @click="getData()">搜索</el-button>
         <el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
       </el-col>
       <el-col  :span="8" v-for="(item,index) in testList" :key="index">
@@ -82,6 +82,10 @@
       jumpRouter(item) {
         window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=quizsummary`)
       },
+      getData() {
+        this.page=1;
+        this.findList();
+      },
       findList(){
         let params={
           keyword:this.keyword,
@@ -110,7 +114,8 @@
         this.findList()
       },
       reset(){
-        this.keyword = ''
+        this.keyword = '';
+        this.page=1;
         this.findList();
       },
       getItem(item){

src/views/user/MyFavorites.vue

@@ -278,6 +278,10 @@ export default {
   },
   methods: {
     queryData() {
+      this.qaList.pageIndex = 1;
+      this.articleList.pageIndex = 1;
+      this.courseList.pageIndex = 1;
+      this.dataList.pageIndex = 1;
       this.isSearh = true;
       if (this.tabName == 'qa') {
         this.findQa();
@@ -296,6 +300,10 @@ export default {
       }
     },
     resData() {
+      this.qaList.pageIndex = 1;
+      this.articleList.pageIndex = 1;
+      this.courseList.pageIndex = 1;
+      this.dataList.pageIndex = 1;
       this.keyword = '';
       this.isRead = '';
       this.courseList.type = '';