Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/ShangHai-YuAn

src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:22:35
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-07 10:41:43
+ * @LastEditTime: 2020-09-07 16:05:31
 -->
 <!-- <div class="head">
     <select style="width: 80px;height: 30px; margin-left: 600px;margin-top: 20px;">
@@ -26,30 +26,34 @@
       <button mat-raised-button (click)='goBack()' style="float: right; margin-top: 20px;margin-right: 50px;">返回</button>
       
 </div> -->
-<div class="header">
-  <div class="queryField">
-    <form #form="ngForm" (ngSubmit)="Submit(form.value)">
-      <span>查询年份:</span>
-      <mat-form-field>
-        <mat-select [(ngModel)]="selectOneYear" name='selectOneYear'>
-          <mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <span>查询月份:</span>
-      <mat-form-field>
-        <mat-select [(ngModel)]="selectStartMonth" name='selectStartMonth'>
-          <mat-option *ngFor="let item of selectMonth" [value]="item">{{item}}</mat-option>
-        </mat-select>
-      </mat-form-field>
-      <button type="submit" mat-raised-button color="primary">查询</button>
-    </form>
-  </div>
+<div class="box">
+  <div class="header">
+    <div class="queryField">
+      <form #form="ngForm" (ngSubmit)="Submit(form.value)">
+        <span>查询年份:</span>
+        <mat-form-field>
+          <mat-select [(ngModel)]="selectOneYear" name='selectOneYear'>
+            <mat-option *ngFor="let item of years" [value]="item">{{item}}</mat-option>
+          </mat-select>
+        </mat-form-field>
+        <span>查询月份:</span>
+        <mat-form-field>
+          <mat-select [(ngModel)]="selectStartMonth" name='selectStartMonth'>
+            <mat-option *ngFor="let item of selectMonth" [value]="item">{{item}}</mat-option>
+          </mat-select>
+        </mat-form-field>
+        <button type="submit" mat-raised-button color="primary">查询</button>
+      </form>
+    </div>
 
-  <div class="btnbox">
-    <button mat-stroked-button (click)="goBack ()">返回</button>
+    <div class="btnbox">
+      <button mat-stroked-button (click)="goBack()">返回</button>
+    </div>
+  </div>
+  <div class="zhu">
+    <div id="zhidui">
+    
+    </div>
   </div>
-</div>
-<div class="zhu">
-  <div id="zhidui" ></div>
 </div>
 

src/app/statistic-analysis/deleteUnit/delete-there/delete-there.component.scss

@@ -1,61 +1,76 @@
-/* .head{
-    //display: flex;
-    border-bottom:2px solid #d4dde4;
-    width: 100%;
-    height: 68px;
-    background-color:white ;
-} */
+.box{
+  width: 100%;
+  height: 92%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  position: relative;
+  .echartsbox{
+      width: 100%;
+      height: 100%;
+      // overflow: auto;
+  }
+  #Line{
+      width: 50%;
+      height: 420px;
+      margin: 50px auto;
+  }
+}
+.publicCss{
+  height: 350px;
+  width: 50%;
+  display: inline-block;
+  box-sizing: border-box;
+  padding: 20px;
+}
+
 //头部搜索栏
 .header {
-    border-bottom: 1px solid #999;
-    height: 80px;
-    min-height: 81px;;
-    box-sizing: border-box;
-    // padding: 0 15px;
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    align-items:center;
-    justify-content:center;
-    .queryField {
-      margin: 0 10px;
-      font-size: 14px;
-      .mat-form-field {
-        width: 130px;
-        max-height: 50px;;
-        margin: 0 15px 0 10px;
-      }
+  border-bottom: 1px solid #999;
+  height: 80px;
+  min-height: 81px;;
+  box-sizing: border-box;
+  // padding: 0 15px;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items:center;
+  justify-content:center;
+  .queryField {
+    margin: 0 10px;
+    font-size: 14px;
+    .mat-form-field {
+      width: 130px;
+      max-height: 50px;;
+      margin: 0 15px 0 10px;
     }
-    .btnbox{
-        height: 80px;
-        display: flex;
-        flex-direction:column;
-        justify-content: space-around;
-        position: fixed;
-        top: 64px;
-        right: 4%;
-        width: 88px;
-        button{
-            width: 88px;
-            height: 36px;
-        }
+  }
+  .btnbox{
+      height: 80px;
+      display: flex;
+      flex-direction:column;
+      justify-content: space-around;
+      position: fixed;
+      top: 64px;
+      right: 4%;
+      width: 88px;
+      button{
+          width: 88px;
+          height: 36px;
+      }
 
-    }
   }
-.chaxun{
-     margin-left: 20px;
-     padding: 15px 32px;
 }
 .zhu{
-    width: 100%;
-    height: 100%;
-    position: relative;
-    #zhidui{
-        width: 100%;
-        height: 350px;
-        position: absolute;
-        left: 50%;
-        top: 45%;
-        transform: translate(-50%,-50%);
-    }
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  #zhidui{
+      width: 100%;
+      height: 350px;
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%,-50%);
+  }
 }

src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.html

@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-09-02 16:21:18
  * @LastEditors: sueRimn
- * @LastEditTime: 2020-09-07 08:56:53
+ * @LastEditTime: 2020-09-07 15:57:47
 -->
 <body>
 
@@ -71,6 +71,7 @@
     </div> -->
 
   </div>
+  <div style="overflow-y:auto;height: 83%;margin-top: 70px;">
 <div class="heads" id="heads"></div>
 <section class="mainbox">
     <div class="column">
@@ -110,5 +111,8 @@
           </div>
     </div>
 </section>
-<div style="padding-top: 50px; height: 50px; width: 100%;"></div>
+
+
+</div>
+<div style="padding-top: 150px; height: 50px; width: 100%;"></div>
 </body>

src/app/statistic-analysis/deleteUnit/delete-two/delete-two.component.scss

@@ -1,13 +1,15 @@
 body{
-    overflow:auto;
+  overflow: hidden;
 }
+
 //头部搜索栏
 .header {
+  width: 90%;
+  position: fixed ;
   border-bottom: 1px solid #999;
-  height: 70px;
-  min-height: 70px;
+  height: 68px;
+  //min-height: 81px;
   box-sizing: border-box;
-  padding: 0 15px;
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
@@ -22,11 +24,7 @@ body{
       margin: 0 15px 0 10px;
     }
   }
-  /* .fixedCss{
-    position: fixed;
-    top: 81px;
-    right: 32px;
-  } */
+  
 }
 
 /* 最上面的折线图 */
@@ -35,11 +33,12 @@ body{
     margin:0 auto;
     width: 800px;
     height: 450px;
-    padding-top: 50px;
+    //padding-top: 150px;
+    margin-top: 50px;
 }
 /* 其余折线图 */
 .mainbox {
-    margin-top: 100px;
+    margin-top: 80px;
     //padding-top: 50px;
     padding-bottom: 50px;
     min-width: 1024px;