Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

src/app/examiner/examiner-index/examiner-index.component.html

@@ -4,14 +4,29 @@
  * @Author: sueRimn
  * @Date: 2020-12-11 09:06:03
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-15 11:36:19
+ * @LastEditTime: 2020-12-15 14:40:26
 -->
 <div class="content">
     <div class="header">
         <div class="queryBox">
             <div class="queryField">
                 <label style="margin-right: 10px;font-size: 18px;">消防救援站:</label>
-                <input placeholder="请输入用户账号" [(ngModel)]="accound" />
+                <!-- <input list="cars" placeholder="请输入用户账号" [(ngModel)]="accound" />
+                <datalist id="cars" (onchange)="getoption()">
+	            <option *ngFor="let item of helpName" [value]="item.id" id={{item.id}} >{{item.name}}</option>
+                </datalist> -->
+                <select [(ngModel)]="accound">
+                    <option style="height: 10px;font-size: 16px;" *ngFor="let item of helpName" [value]="item.id">{{item.name}}</option>
+                </select>
+                <!-- <mat-form-field appearance="fill">
+                    <mat-label>请选择</mat-label>
+                    <mat-select [(ngModel)]="accound">
+                      <mat-option *ngFor="let food of helpName" [value]="food.id">
+                        {{food.name}}
+                      </mat-option>
+                    </mat-select>
+                  </mat-form-field> -->
+                  
             </div>
             <div class="queryField">
                 <button   style="background-color: #07CDCF;" (click)="findClick()">查询</button>

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;

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)
       })
     }

src/app/examiner/examiner-new-one/examiner-new-one.component.scss

@@ -144,8 +144,8 @@ table {
             height: 200px;
             background: white;
             position: absolute;
-            top: 48px;
+            top: 70px;
-            left: 27px;
+            //left: 27px;
             z-index: 999;
             border: 1px solid grey;
             overflow-y: auto;

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<this.selectedunitArr.length;i++){
       workDate.push(this.selectedunitArr[i].buildingTypes)
     }
     console.log(workDate) */
-    sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+    const config = new MatSnackBarConfig();
-    this.router.navigateByUrl("/examiner/create-test-score")
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    if(this.selectedunitArr.length==0){
+      this.snackBar.open('请选择单位','确定',config);
+    }
+    else{
+      sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+      this.router.navigateByUrl("/examiner/create-test-score")
+    }
+    
   }
   //编辑单位信息
   editunit(){

src/app/examiner/examiner-routing.ts

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-10 12:11:26
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-14 17:23:10
+ * @LastEditTime: 2020-12-15 14:31:45
  */
 import { Routes, RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
@@ -12,13 +12,15 @@ import { ExaminerIndexComponent } from './examiner-index/examiner-index.componen
 import { ExaminerNewOneComponent} from './examiner-new-one/examiner-new-one.component'
 import { MarkPapersIndexComponent} from './mark-papers-index/mark-papers-index.component'
 import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component'
+import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component'
 
 const routes: Routes = [
     // { path: '', component:CreateExamComponent }
     { path: 'createexam-index', component:ExaminerIndexComponent },
     { path: 'examiner-new-one', component:ExaminerNewOneComponent },
     { path: 'mark-papers-index',component:MarkPapersIndexComponent},
-    { path: 'mark-papers-two',component:MarkPapersTwoComponent}
+    { path: 'mark-papers-two',component:MarkPapersTwoComponent},
+    { path: 'statistic-anaily',component:StatisticAnalysisComponent}
 
   //{ path: 'createexam-index', component:ExaminerIndexComponent },
 ]

src/app/examiner/examiner.module.ts

@@ -55,10 +55,11 @@ import { NzDatePickerModule } from 'ng-zorro-antd/date-picker';
 import { PlanLevel } from '../pipes/size.pipe';
 import { MarkPapersIndexComponent } from './mark-papers-index/mark-papers-index.component';
 import { MarkPapersTwoComponent } from './mark-papers-two/mark-papers-two.component';
+import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analysis.component';
 
 
 @NgModule({
-  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent],
+  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent],
   imports: [
     CommonModule,
     examinerRoutingModule,

src/app/examiner/statistic-analysis/statistic-analysis.component.html

@@ -0,0 +1,9 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-15 14:19:50
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-15 14:32:36
+-->
+<p>统计分析</p>

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<StatisticAnalysisComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ StatisticAnalysisComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(StatisticAnalysisComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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 {
+  }
+
+}

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
 -->
 
 <mat-sidenav-container class="example-container" autosize [class.myapp-dark-theme]="darktheme">
@@ -29,7 +29,7 @@
             <li [routerLink]="['/home/mark-papers-index']" routerLinkActive="clickStyle">
               <img src="../../assets/images/papers.png" style="background-color: #07CDCF;"><label>阅卷</label>
             </li>
-            <li [routerLink]="['/home/createexam-index3']" routerLinkActive="clickStyle">
+            <li [routerLink]="['/home/statistic-anaily']" routerLinkActive="clickStyle">
               <img src="../../assets/images/Statistics.png" style="background-color: #07CDCF;"><label>统计分析</label>
             </li>
           </ul>