diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index c213bb4..d60878d 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-11 09:06:03 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 15:18:12 + * @LastEditTime: 2021-01-04 16:13:12 */ import { Component, OnInit, ViewChild, Inject,Input } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -215,19 +215,27 @@ export class ExaminerIndexComponent implements OnInit { } //查询按钮 findClick(){ - /* const config = new MatSnackBarConfig(); + const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(this.accound==undefined){ + let paramsdata:any = { + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + OrganizationId: this.jsId || '', + HasChildren:this.jscheck || '', + Sort: null, + SortType: null, + } + if(this.jsId==undefined){ this.snackBar.open('请输入消防救援队名称','确定',config); } else{ - this.http.get(`/api/Papers/${this.accound}`).subscribe((data:any)=>{ + this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ console.log(data) }) } - console.log(this.accound) */ - //console.log(this.jscheck,this.jsId) + //console.log(this.accound) + console.log(this.jscheck,this.jsId) this.PageNumber = 1 this.pageEvent.pageIndex = 0 this.getAlltabledate() diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.html b/src/app/examiner/mark-papers-index/mark-papers-index.component.html index c305def..a8afb70 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.html +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 14:52:17 + * @LastEditTime: 2021-01-04 16:43:45 -->
@@ -18,7 +18,7 @@
- +
diff --git a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts index 60d99be..4d9fe2d 100644 --- a/src/app/examiner/mark-papers-index/mark-papers-index.component.ts +++ b/src/app/examiner/mark-papers-index/mark-papers-index.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-14 16:30:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-29 14:52:09 + * @LastEditTime: 2021-01-04 16:53:04 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import {HttpClient} from '@angular/common/http' @@ -49,10 +49,29 @@ export class MarkPapersIndexComponent implements OnInit { pageSize:any; //每页条数 pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any //第几页 + //查询 + findClick(){ + let paramsdata:any = { + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + Title:this.markName||'', + StartTime:this.markDate||'', + Sort: null, + SortType: null, + } + this.http.get(`/api/Papers`,{params:paramsdata}).subscribe((data:any)=>{ + console.log(data) + this.dataSource=data.items + }) + this.PageNumber = 1 + this.pageEvent.pageIndex = 0 + //this.getAlltabledate() + } //重置功能 resert(){ - this.markName=undefined - this.markDate=undefined + this.markName='' + this.markDate='' + this.getAlltabledate() } //点击阅卷跳转 markTwo(e,id,name){