-
+
+
+
+
diff --git a/src/app/examiner/examiner-index/examiner-index.component.scss b/src/app/examiner/examiner-index/examiner-index.component.scss
index 4a42ddb..389689f 100644
--- a/src/app/examiner/examiner-index/examiner-index.component.scss
+++ b/src/app/examiner/examiner-index/examiner-index.component.scss
@@ -29,7 +29,8 @@ table {
.queryField {
margin: 0 25px;
font-size: 14px;
- input {
+ input,select {
+ font-size: 15px;
width: 320px;
height: 44px;
line-height: 34px;
diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts
index 45ac416..076bb9d 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-15 12:25:15
+ * @LastEditTime: 2020-12-15 14:10:50
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import {HttpClient} from '@angular/common/http'
@@ -118,7 +118,7 @@ export class ExaminerIndexComponent implements OnInit {
this.snackBar.open('请输入消防救援队名称','确定',config);
}
else{
- this.http.get(`/api/Papers/1`).subscribe((data:any)=>{
+ this.http.get(`/api/Papers/${this.accound}`).subscribe((data:any)=>{
console.log(data)
})
}
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.scss b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
index 3bfce84..c676e02 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.scss
@@ -144,8 +144,8 @@ table {
height: 200px;
background: white;
position: absolute;
- top: 48px;
- left: 27px;
+ top: 70px;
+ //left: 27px;
z-index: 999;
border: 1px solid grey;
overflow-y: auto;
diff --git a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
index 246448f..4a1c835 100644
--- a/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
+++ b/src/app/examiner/examiner-new-one/examiner-new-one.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-11 16:34:26
* @LastEditors: sueRimn
- * @LastEditTime: 2020-12-15 08:46:14
+ * @LastEditTime: 2020-12-15 13:44:05
*/
import { Component, OnInit, ViewChild, Inject } from '@angular/core';
import { HttpClient } from '@angular/common/http'
@@ -341,14 +341,23 @@ export class ExaminerNewOneComponent implements OnInit {
}
//下一步事件
nextClick(){
- console.log(this.selectedunitArr)
+ //console.log(this.selectedunitArr)
/* var workDate=[]
for(var i=0;i
+;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ StatisticAnalysisComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(StatisticAnalysisComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.ts b/src/app/examiner/statistic-analysis/statistic-analysis.component.ts
new file mode 100644
index 0000000..c17eb42
--- /dev/null
+++ b/src/app/examiner/statistic-analysis/statistic-analysis.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-statistic-analysis',
+ templateUrl: './statistic-analysis.component.html',
+ styleUrls: ['./statistic-analysis.component.scss']
+})
+export class StatisticAnalysisComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+}
diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html
index 475b22a..2dff347 100644
--- a/src/app/navigation/navigation.component.html
+++ b/src/app/navigation/navigation.component.html
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-10 10:21:40
* @LastEditors: sueRimn
- * @LastEditTime: 2020-12-15 12:28:31
+ * @LastEditTime: 2020-12-15 14:32:13
-->
@@ -29,7 +29,7 @@
-
+
统计分析
diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.scss b/src/app/examiner/statistic-analysis/statistic-analysis.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/examiner/statistic-analysis/statistic-analysis.component.spec.ts b/src/app/examiner/statistic-analysis/statistic-analysis.component.spec.ts new file mode 100644 index 0000000..d6c86c5 --- /dev/null +++ b/src/app/examiner/statistic-analysis/statistic-analysis.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { StatisticAnalysisComponent } from './statistic-analysis.component'; + +describe('StatisticAnalysisComponent', () => { + let component: StatisticAnalysisComponent; + let fixture: ComponentFixture
