[合并]合并代码

src/app/examiner/create-test-score/create-test-score.component.ts

@@ -1150,29 +1150,16 @@ export class FinishDialog{
   }
 
 
-  startTime:string
-  endTime:string
+  startTime:string//考试开始时间
+  endTime:string//考试结束时间
+  examType:string//考试类型
   
-  date=null
-  timeDefaultValue = setHours(new Date(), 0);
-  disabledDateTime: DisabledTimeFn = () => {
-    var second=[]
-    for(var i=1;i<60;i++){
-      second.push(i)
-    }
-    return {
-      nzDisabledHours: () => [],
-      nzDisabledMinutes: () => [],
-      nzDisabledSeconds: () => second
-    };
-  };
-
-  //确定
+  //弹窗确定点击事件
   onNoClick(): void {
+    //this.dialogRef.close();
+    console.log(this.examType)
     const config = new MatSnackBarConfig();
-    config.verticalPosition = 'top';
-    config.duration = 3000
-    if(this.startTime!=undefined&&this.endTime!=undefined){
+    if(this.startTime!=undefined&&this.endTime!=undefined&&this.examType!=undefined){
       if(this.startTime>this.endTime){
         this.snackBar.open('开始时间不能大于结束时间','确定',config);
       }
@@ -1212,10 +1199,30 @@ export class FinishDialog{
       }
     }
     else{
-      this.snackBar.open('请输入开始或结束时间','确定',config);
+      if(this.startTime==undefined)
+      this.snackBar.open('请输入开始时间','确定',config);
+      else if(this.endTime==undefined)
+      this.snackBar.open('请输入结束时间','确定',config);
+      else if(this.examType==undefined)
+      this.snackBar.open('请输入试卷类型','确定',config);
     }
     
   }
+
+  //ngzerro组件
+  timeDefaultValue = setHours(new Date(), 0);
+  disabledDateTime: DisabledTimeFn = () => {
+    var second=[]
+    for(var i=1;i<60;i++){
+      second.push(i)
+    }
+    return {
+      nzDisabledHours: () => [],
+      nzDisabledMinutes: () => [],
+      nzDisabledSeconds: () => second
+    };
+  };
+  
   onChange(result: Date[]): void {
     console.log('onChange: ', result);
   }

src/app/examiner/create-test-score/finishDialog.html

@@ -4,12 +4,12 @@
  * @Author: sueRimn
  * @Date: 2020-12-13 10:57:48
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-14 10:23:32
+ * @LastEditTime: 2020-12-14 14:08:52
 -->
 <div class="box">
     <div class="diaone">
-        <div><label>请填写试卷名称：</label></div>
-        <div><input  placeholder="请填写"></div>
+        <div><label>请填写试卷类型：</label></div>
+        <div><input  placeholder="请填写" [(ngModel)]="examType"></div>
     </div>
     <div class="diatwo">
         <div class="starttime">

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

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-11 09:06:03
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-12-11 16:47:41
+ * @LastEditTime: 2020-12-14 14:22:11
 -->
 <div class="content">
     <div class="header">

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

@@ -11,6 +11,7 @@ table {
     height: 100%;
     overflow: hidden;
     background: #F2F5F6;
+    overflow-y: auto;
   }
   .header {
     width: 100%;
@@ -57,7 +58,7 @@ table {
     } //queryBox
   }
   .centertable{
-    width: 1632px;
+    width: 95%;
     margin-right: 40px;
     margin-left: 40px;
     background-color: #FFFFFF;

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

@@ -13,14 +13,16 @@ table {
     overflow: hidden;
     background: #F2F5F6;
     display: flex;
+    overflow-y: auto;
     .contentLeft{
-      width: 1270px;
-      height: 850px;
+      width: 80%;
+      height: 94%;
       margin: 20px 20px 10px 50px;
       background-color: #FFFFFF;
       border-radius: 16px ;
       .contenttable{
-        width: 1200px;
+        width: 95%;
+        height: 80%;
         //margin-right: 40px;
         margin-left: 30px;
         //background-color: none;
@@ -48,7 +50,7 @@ table {
     
     .contentRight{
       width: 320px;
-      height: 850px;
+      height: 94%;
       margin: 20px 20px 10px 10px;
       background-color: #FFFFFF;
       border-radius: 16px ;