Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHaiYuan-AnXin

src/app/plan-audit/plan-record/plan-record.component.html

@@ -4,13 +4,13 @@
  * @Author: sueRimn
  * @Date: 2020-12-25 10:19:31
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-24 14:35:51
+ * @LastEditTime: 2021-03-24 16:06:43
 -->
 <div class="box">
     <div class="boxleft">
         <div class="lefthead">
           <form (ngSubmit)="onSubmit(form.value)" #form="ngForm">
-            <div class="headdiv" style="margin-top: 30px;">
+            <div class="headdiv">
               <span>操作类型:</span>
               <input type="radio" name="level" value="" [(ngModel)]="level"><span>全部</span> 
               <input type="radio" name="level"  value="1" [(ngModel)]="level"><span>更新</span>
@@ -56,11 +56,11 @@
             </div>
             <div class="headfour">
               <span>时间：</span>
-                  <mat-form-field class="example-full-width">
+                  <mat-form-field class="example-full-width" style="margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="addtime">
                   </mat-form-field>
                   <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon>
-                  <mat-form-field class="example-full-width" style="margin-left: 10px;">
+                  <mat-form-field class="example-full-width" style="margin-left: 10px;margin-bottom: 0;">
                     <input type="date" matInput  name="companyName"  autocomplete="off" [(ngModel)]="endtime">
                   </mat-form-field>
                   <button mat-raised-button color="primary"  type="submit" >查询</button>
@@ -126,7 +126,7 @@
         
     </div>
     <div class="boxright">
-      <div class="company">
+      <div class="company" *ngIf="showtype == 3">
         <mat-tab-group  *ngIf="showtype == 3" style="flex: 1;overflow-y: auto;margin-top: 10px;" [selectedIndex]="selected.value" (selectedIndexChange)="selected.setValue($event)">
           <mat-tab label="基本信息">
             <ng-template matTabContent>

src/app/plan-audit/plan-record/plan-record.component.scss

@@ -14,10 +14,10 @@
             flex-direction: column;
             .headdiv{
                 @media screen and (min-device-width:1300px){
-                    margin: 0 0 0 28px;
+                    margin: 30px 0 0 28px;
                 }
                 @media screen and (max-device-width:1300px){
-                    margin-left: 0;
+                    margin-top: 10px;
                 }
                 height: 40px;
                 display: flex;
@@ -52,7 +52,7 @@
                 @media screen and (max-device-width:1300px){
                     margin-left: 0;
                 }
-                height: 40px;
+                //height: 40px;
                 display: flex;
                 flex-direction: row;
                 span{
@@ -68,6 +68,7 @@
                     }
                     position: relative;
                     top: 5px;
+                    left: 2px;
                 }
                 .count{
                     @media screen and (min-device-width:1300px){
@@ -79,6 +80,7 @@
                 }
             }
             .headthree{
+                height: 45px;
                 @media screen and (min-device-width:1300px){
                     margin-left: 30px;
                 }
@@ -88,6 +90,7 @@
                 }
             }
             .headfour{
+                
                 span{
                     @media screen and (min-device-width:1300px){
                         margin-left: 30px;

src/app/plan-audit/wait-examineer/wait-examineer.component.html

@@ -43,8 +43,8 @@
                   <mat-option *ngFor="let item of preparelevels" [value]="item.value">{{item.name}}</mat-option>
                 </mat-select>
               </mat-form-field>
-                <button mat-raised-button color="primary" style="margin-left: 80px;" type="submit" >查询</button>
+                <button mat-raised-button color="primary"  type="submit" >查询</button>
-                <button mat-raised-button color="primary" style="margin-left: 20px;" (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
+                <button mat-raised-button color="primary"  (click)='record()'><img src="../../../assets/images/refresh.png"  > 重置</button>
           </div>
           </form>
             

src/app/plan-audit/wait-examineer/wait-examineer.component.scss

@@ -62,6 +62,12 @@
                     width: 80px;
                     height: 36px;
                     font-size: 16px;
+                    @media screen and (min-device-width:1300px){
+                        margin-left: 30px;
+                    }
+                    @media screen and (max-device-width:1300px){
+                        margin-left: 90px;
+                    }
                 }
                 img{
                     height: 14px;