From 8bf779ef588c0c81eb5a1be043e97299035abbe2 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 16 May 2023 11:01:53 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E7=BC=96=E8=BE=91=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/app/examiner/examiner-index/examiner-index.component.ts | 3 ++- .../examinee-capacity/examinee-capacity.component.html | 4 ++-- .../examinee-papers/examinee-papers.component.html | 2 +- .../examinee-papers/examinee-papers.component.ts | 4 +++- .../station-examinee/station-examinee.component.html | 6 +++--- .../station-examinee/station-examinee.component.ts | 4 +++- src/app/ui/enterpriseuser/enterpriseuser.component.ts | 5 +++-- 8 files changed, 18 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 34586ad..bffbc51 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "scripts": { "ng": "ng", - "start": "ng serve --proxy-config proxy.config.json --open --port 4300 ", + "start": "ng serve --proxy-config proxy.config.json --open --host 192.168.1.51 --port 4300 ", "build": "ng build", "test": "ng test", "lint": "ng lint", diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index f12bd50..4e9520b 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -318,6 +318,7 @@ export class FinishDia { private router: Router, private http: HttpClient, public dialog: MatDialog, + public dialog2: NzModalRef, public snackBar: MatSnackBar, private modal: NzModalRef ) {} @@ -418,6 +419,6 @@ export class FinishDia { } close() { - // this.dialogRef.close(); + this.dialog2.close() } } diff --git a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html index 212c0e1..4b5d7d5 100644 --- a/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html +++ b/src/app/examiner/statistic-analysis/abilityAnalysis/examinee-capacity/examinee-capacity.component.html @@ -32,8 +32,8 @@ {{key + 1}} - {{item.organizationsName}} - {{item.startTime|date:'yyyy-MM-dd HH:mm'}} + 李四 + xxx救援站
diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html index 6b81781..79a3ca5 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html +++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.html @@ -36,7 +36,7 @@ 85分 - 详情 + 详情 diff --git a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts index 1e5b2db..feccd3d 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/examinee-papers/examinee-papers.component.ts @@ -104,7 +104,9 @@ export class ExamineePapersComponent implements OnInit { this.PageNumber = e.pageIndex + 1; this.getAlltabledate(); } - + To(){ + + } //查询按钮 Submit() {} //重置按钮 diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html index 79d84c2..358fcc6 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html +++ b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.html @@ -32,15 +32,15 @@ {{key + 1}} - {{item.organizationsName}} - {{item.startTime|date:'yyyy-MM-dd HH:mm'}} + 张三 + 广西总队 3次 85分 - 详情 + 详情 diff --git a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts index c7d8077..47fd940 100644 --- a/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts +++ b/src/app/examiner/statistic-analysis/examStatistics/station-examinee/station-examinee.component.ts @@ -103,7 +103,9 @@ export class StationExamineeComponent implements OnInit { this.PageNumber = e.pageIndex + 1; this.getAlltabledate(); } - + To() { + this.router.navigate(["/home/statistic-examination/examinee-papers"]); //登陆成功跳转页面 + } //查询按钮 Submit() {} //重置按钮 diff --git a/src/app/ui/enterpriseuser/enterpriseuser.component.ts b/src/app/ui/enterpriseuser/enterpriseuser.component.ts index 601d987..48924e4 100644 --- a/src/app/ui/enterpriseuser/enterpriseuser.component.ts +++ b/src/app/ui/enterpriseuser/enterpriseuser.component.ts @@ -305,13 +305,14 @@ export class editenterpriseuser { //提交创建表单 onSubmit (e) { + console.log(666,e) if (this.organizationId && this.organizationName) { e.phone = String(e.phone) e.roleType = 2 - e.name = this.data.userData.name + // e.name = this.data.userData.name e.id = this.data.userData.id e.enabled = this.data.userData.enabled - e.creationTime = new Date() + // e.creationTime = new Date() e.organizationId = this.organizationId e.organizationName = this.organizationName this.http.put(`/api/ExamUsers/${this.data.userData.id}`,e).subscribe(data => {