[修改]完成弹窗放到考官首页面

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-20 10:31:09
+ * @LastEditTime: 2020-12-21 10:44:17
  */
 import { Component, OnInit, ViewChild, Inject,Input  } from '@angular/core';
 import {HttpClient} from '@angular/common/http'
@@ -237,7 +237,11 @@ export class ExaminerIndexComponent implements OnInit {
   }
   //新增考题跳转
   newExamination(){
-    this.router.navigate(['/home/createexam-index/examiner-new-one'])
+    //this.router.navigate(['/home/createexam-index/examiner-new-one'])
+    const dialogRef = this.dialog.open(FinishDia, {
+      width: '650px',
+      //data: paperDataInfo
+    });
   }
   //辖区中队div是否显示
   isorganizationbox:boolean = false
@@ -268,3 +272,100 @@ export class ExaminerIndexComponent implements OnInit {
   }
 
 }
+
+@Component({
+  selector: 'finish-dialog',
+  templateUrl: 'finishDia.html',
+  styleUrls: ['finishDia.scss']
+})
+export class FinishDia{
+
+  constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef<FinishDia>,@Inject(MAT_DIALOG_DATA) public data: any) {}
+  ngOnInit(): void {
+    this.getProfiles()
+  }
+  //获取登录账号的个人资料
+  Profiles:any 
+  getProfiles(){
+    this.http.get('/api/ExamAccounts/Profiles').subscribe(data => {
+      console.log(data)
+      this.Profiles = data
+    })
+  }
+
+
+  startTime:string//考试开始时间
+  endTime:string//考试结束时间
+  examName:string//考试名称
+  indexid:string//创建考试的id
+  tabledate
+  
+  //弹窗确定点击事件
+  onNoClick(): void {
+    const config = new MatSnackBarConfig();
+    config.verticalPosition = 'top';
+    config.duration = 3000
+    if(this.startTime!=undefined&&this.endTime!=undefined&&this.examName!=undefined){
+      if(this.startTime>this.endTime){
+        this.snackBar.open('开始时间不能大于结束时间','确定',config);
+      }
+      else{
+        //截取字符串，得到日期部分"2009-12-02",用split把字符串分隔成数组
+        var begin1=this.startTime.substr(0,10).split("-");
+        var end1=this.endTime.substr(0,10).split("-");
+        //将拆分的数组重新组合，并实例成化新的日期对象
+        var date1=new Date(begin1[1] + - + begin1[2] + - + begin1[0]);
+        var date2=new Date(end1[1] + - + end1[2] + - + end1[0]);
+        //得到两个日期之间的差值m，以分钟为单位
+        var m=Number(Math.abs(Number(date2)-Number(date1))/1000/60);
+        //小时数和分钟数相加得到总的分钟数
+        var min1=parseInt(this.startTime.substr(11,2))*60+parseInt(this.startTime.substr(14,2));
+        var min2=parseInt(this.endTime.substr(11,2))*60+parseInt(this.endTime.substr(14,2));
+        //两个分钟数相减得到时间部分的差值，以分钟为单位
+        var n=min2-min1;
+        //将日期和时间两个部分计算出来的差值相加，即得到两个时间相减后的分钟数
+        var minutes=m+n;
+        
+        console.log(this.startTime,this.endTime)
+        let params = {
+          id: null,
+          title: this.examName,
+          duration: minutes,
+          modifiedTime: new Date(),
+          deleted: false,
+          startTime: this.startTime,
+          endTime: this.endTime,
+          organizationId: this.Profiles.organizationId,
+          creatorId: this.Profiles.id,
+          paperDataInfo: null
+        }
+        console.log(params)
+        this.http.post('/api/Papers',params).subscribe(data => {
+          this.snackBar.open('创建成功','确定',config);
+          this.dialogRef.close();
+          //sessionStorage.removeItem("checkedWork")
+          this.tabledate=data
+          console.log(this.tabledate)
+          sessionStorage.setItem("indexId",this.tabledate.id)
+          this.router.navigate(['/home/createexam-index/examiner-new-one']) //跳转试卷列表页面
+        },err => {
+          this.snackBar.open('创建失败','确定',config);
+        })
+      }
+    }
+    else{
+      if(this.startTime==undefined)
+      this.snackBar.open('请输入开始时间','确定',config);
+      else if(this.endTime==undefined)
+      this.snackBar.open('请输入结束时间','确定',config);
+      else if(this.examName==undefined)
+      this.snackBar.open('请输入试卷名称','确定',config);
+    }
+    
+  }
+
+  
+  close(){
+    this.dialogRef.close();
+  }
+}

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

@@ -0,0 +1,32 @@
+<!--
+ * @Descripttion: 
+ * @version: 
+ * @Author: sueRimn
+ * @Date: 2020-12-21 09:15:06
+ * @LastEditors: sueRimn
+ * @LastEditTime: 2020-12-21 09:15:07
+-->
+<div class="box">
+    <div class="diaone">
+        <div style="margin-bottom: 5px;"><label>请填写试卷名称:</label></div>
+        <div><input  placeholder="请填写" [(ngModel)]="examName"></div>
+    </div>
+    <div class="diatwo">
+        <div class="starttime">
+        <div style="margin-bottom: 5px;"><label>请选择开始时间:</label></div>
+        <!-- <div><nz-range-picker class="datepicker" nzFormat="yyyy-MM-dd HH:mm"   [nzShowTime]="{ nzHideDisabledOptions: true, nzDefaultOpenValue: timeDefaultValue }" [nzDisabledTime]="disabledDateTime" [(ngModel)]="date" (ngModelChange)="onChange($event)"></nz-range-picker>
+        </div> -->
+        <div><input type="datetime-local" name="start_time" value="" [(ngModel)]="startTime" /></div>
+        </div>
+        <div class="endtime">
+            <div style="margin-bottom: 5px;"><label>请选择结束时间:</label></div>
+            <div><input type="datetime-local" name="end_time" value=""  [(ngModel)]="endTime"/></div>
+        </div>
+        
+    </div>
+    
+    <div mat-dialog-actions style="margin-top: 20px;">
+        <button mat-button (click)="onNoClick()" style="background-color: #07CDCF;margin-left: 200px;color: #fff;">确定</button>
+        <button mat-button type="button" (click)="close()" style=" background-color: #FF8678;margin-left: 25px;color: #fff;">取消</button>
+    </div>
+</div>

src/app/examiner/examiner-index/finishDia.scss

@@ -0,0 +1,44 @@
+.box{
+    display: flex;
+    flex-direction: column;
+    margin-left: 20px;
+    input{
+        width: 260px;
+        height: 40px;
+        line-height: 34px;
+        border-radius: 5px;
+        padding-left: 5px;
+        outline: none;
+        border: 1px solid rgb(226, 211, 211);
+      }
+    .diaone{
+        display: flex;
+        flex-direction: column;
+        
+        button { 
+            border: none;
+            color: white;
+            padding: 5px 25px;
+            text-align: center;
+            text-decoration: none;
+            display: inline-block;
+            font-size: 16px;
+            margin: 4px 2px;
+            cursor: pointer;
+            border-radius: 8px;
+            outline:0 none !important;
+           }
+    }
+    .diatwo{
+        margin-top: 20px;
+        display: flex;
+        flex-direction: row;
+        .endtime{
+            margin-left: 20px;
+        }
+        .datepicker{
+            height: 44px;
+            border-radius: 5px;
+        }
+    }
+}

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 13:44:05
+ * @LastEditTime: 2020-12-21 10:52:07
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -30,11 +30,13 @@ export class ExaminerNewOneComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
+    
     this.getunitdata();
     this.getOrganizations();
     this.getUnittype();
     this.getAllKeyUnit();
   }
+  indexid=sessionStorage.getItem("indexId") //上个页面传过来的id
 
   removeClass=document.getElementsByClassName("mat-form-field-underline")
   private _transformer = (node, level: number) => {   //初始化tree
@@ -305,7 +307,7 @@ export class ExaminerNewOneComponent implements OnInit {
       }
     )
   }
-  selectedunitArr:any =JSON.parse(sessionStorage.getItem("checkedWork"))||[] //选中单位的数组
+  selectedunitArr:any =JSON.parse(sessionStorage.getItem(this.indexid))||[] //选中单位的数组
   deleteByid=""//根据id取消选中
   //勾选框事件
   checkChange(e,element){
@@ -354,7 +356,7 @@ export class ExaminerNewOneComponent implements OnInit {
       this.snackBar.open('请选择单位','确定',config);
     }
     else{
-      sessionStorage.setItem("checkedWork",JSON.stringify(this.selectedunitArr) )
+      sessionStorage.setItem(this.indexid,JSON.stringify(this.selectedunitArr) )
       this.router.navigateByUrl("/examiner/create-test-score")
     }
     

src/app/examiner/examiner.module.ts

@@ -56,10 +56,11 @@ 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';
+import { FinishDia }from './examiner-index/examiner-index.component'
 
 
 @NgModule({
-  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent],
+  declarations: [CreateTestScoreComponent,AddPlanDialog,AddPlanTwoDialog,LookTreeNodeDialog,ExaminerIndexComponent, ExaminerNewOneComponent,FinishDialog,PlanLevel,MarkPapersIndexComponent, MarkPapersTwoComponent, StatisticAnalysisComponent,FinishDia],
   imports: [
     CommonModule,
     examinerRoutingModule,