From 9910723e175413a664ae91824d6711d7853e49ac Mon Sep 17 00:00:00 2001
From: chenjingyu <bobsun@hotmail.com>
Date: Mon, 29 Mar 2021 10:43:06 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0pad=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../key-unit-management.component.html          |  4 ++--
 .../key-unit-management.component.scss          |  2 +-
 .../key-unit-management.component.ts            |  2 ++
 .../maintain-up/maintain-up.component.html      | 15 +++++++++------
 .../maintain-up/maintain-up.component.ts        | 17 +++++++++++++++++
 .../meet-plan/meet-plan.component.html          |  3 ++-
 .../meet-plan/meet-plan.component.ts            |  8 ++++++--
 .../onetwo-entry-plan.component.html            |  5 +++--
 .../onetwo-entry-plan.component.ts              |  4 +++-
 .../type-plan/type-plan.component.html          |  3 ++-
 .../type-plan/type-plan.component.ts            |  6 ++++--
 11 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.html b/src/app/key-unit/key-unit-management/key-unit-management.component.html
index ffb8368..276d48f 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.html
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.html
@@ -81,8 +81,8 @@
                     <mat-form-field class="example-full-width">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
                     </mat-form-field>
-                    🠚
-                    <!-- <mat-icon aria-hidden="false" style="width: 5px;padding: 0;margin:0">arrow forward</mat-icon> -->
+                    <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                     <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                     <mat-form-field class="example-full-width" style="margin-left: 5px;">
                         <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
                     </mat-form-field>
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.scss b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
index b26141d..1676076 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.scss
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.scss
@@ -2,7 +2,7 @@
     
 }
 //margin: 3px 40px;
-@media screen and (max-device-width:1290px){
+@media screen and (max-device-width:1290px) and (max-device-height:690px){
     
 }
 
diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
index 3ca590a..b203c4d 100644
--- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts
+++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts
@@ -21,6 +21,7 @@ export class KeyUnitManagementComponent implements OnInit {
 
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
   
+  padjt=false
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
   open="更多筛选条件"
@@ -28,6 +29,7 @@ export class KeyUnitManagementComponent implements OnInit {
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
+    this.padjt=!this.padjt
     this.padMore=!this.padMore
     this.padput=!this.padput
   }
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.html b/src/app/plan-management/maintain-up/maintain-up.component.html
index d07abdd..3d7fe2f 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.html
+++ b/src/app/plan-management/maintain-up/maintain-up.component.html
@@ -15,6 +15,8 @@
                       <input (click)="stopclose($event)" readonly matInput placeholder="请选择消防救援站" autocomplete="off" [(ngModel)]="js" name="js"  (focus)="openorganizationbox()">
                   </mat-form-field>
                   <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
+                  <span *ngIf="padMore" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>更多筛选条件<img [src]='imgsrcopen'> </span>
+                  <span *ngIf="padput" style="margin-left: 10px; color: #0080FF;" (click)='padInfo()'>收起<img [src]='imgsrcdown'> </span>
                   <div class="organizationbox" *ngIf="isorganizationbox">
                       <div (click)="closediv()" class="closediv"><mat-icon>clear</mat-icon></div>
                       <mat-tree [dataSource]="dataSource" [treeControl]="treeControl">
@@ -38,13 +40,13 @@
                   </div>
               </div>
   
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">统一社会信用代码:</label>
                   <mat-form-field class="example-full-width">
                       <input matInput placeholder="请输入统一社会信用代码" name="shehui" [(ngModel)]="shehui" autocomplete="off">
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">单位类型:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择单位类型' [(ngModel)]="unittype" name="unittype">
@@ -54,7 +56,7 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">关注单位:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择单位是否关注' [(ngModel)]="follow" name="follow">
@@ -63,7 +65,7 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField">
+              <div class="queryField" *ngIf="!padMore">
                   <label style="margin-right: 10px;">信息完整度排序:</label>
                   <mat-form-field>
                       <mat-select placeholder='请选择排序方式' [(ngModel)]="integritySort" name="integritySort">
@@ -72,12 +74,13 @@
                       </mat-select>
                   </mat-form-field>
               </div>
-              <div class="queryField" style="margin-left: 100px;">
+              <div class="queryField"  *ngIf="!padMore">
                   <label style="margin-right: 10px;">完整度查询:</label>
                   <mat-form-field class="example-full-width">
                       <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最小值" name="integrityScoreMin" [(ngModel)]="integrityScoreMin" autocomplete="off">
                   </mat-form-field>
-                  🠊
+                  <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+                  <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
                   <mat-form-field class="example-full-width" style="margin-left: 5px;">
                       <input type="number" oninput="if(value>100)value=100;if(value<0)value=0"  matInput placeholder="请输入完整度最大值" name="integrityScoreMax" [(ngModel)]="integrityScoreMax" autocomplete="off">
                   </mat-form-field>
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.ts b/src/app/plan-management/maintain-up/maintain-up.component.ts
index 44ea1e1..7b47e76 100644
--- a/src/app/plan-management/maintain-up/maintain-up.component.ts
+++ b/src/app/plan-management/maintain-up/maintain-up.component.ts
@@ -203,7 +203,24 @@ export class MaintainUpComponent implements OnInit {
     this.PageNumber = e.pageIndex+1
     this.getAllKeyUnit();
   }
+  padMore//pad收缩控制
+  padput=false//pad收起按钮
+  padjt=false
+  open="更多筛选条件"
+  down="收起"
+  imgsrcopen="../../../assets/images/routdown2.png"
+  imgsrcdown="../../../assets/images/routup2.png"
+  padInfo(){
+    this.padMore=!this.padMore
+    this.padput=!this.padput
+    this.padjt=!this.padjt
+  }
   ngOnInit(): void {
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+      this.padMore=true
+    }else{
+      this.padMore=false
+    }
     this.getunitdata();
     this.getOrganizations();
     this.getUnittype();
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html
index 280d8e3..ff00ab0 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.html
+++ b/src/app/plan-management/meet-plan/meet-plan.component.html
@@ -34,7 +34,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime" autocomplete="off" [(ngModel)]="endtime">
             </mat-form-field>
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts
index 10d1ec2..0b2c0b3 100644
--- a/src/app/plan-management/meet-plan/meet-plan.component.ts
+++ b/src/app/plan-management/meet-plan/meet-plan.component.ts
@@ -20,8 +20,10 @@ export class MeetPlanComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    if(window.matchMedia("(max-width: 1300px)").matches){
+    //console.log(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches)
+    if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
       this.padMore=true
+      //this.padjt=
     }else{
       this.padMore=false
     }
@@ -79,8 +81,9 @@ export class MeetPlanComponent implements OnInit {
   pageSizeOptions: number[] = [10] //设置每页条数
   PageNumber:any; //第几页
   
-  padMore=true//pad收缩控制
+  padMore//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   open="更多筛选条件"
   down="收起"
   imgsrcopen="../../../assets/images/routdown2.png"
@@ -88,6 +91,7 @@ export class MeetPlanComponent implements OnInit {
   padInfo(){
     this.padMore=!this.padMore
     this.padput=!this.padput
+    this.padjt=!this.padjt
   }
 
   //获取表格数据
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
index 927c709..fea010f 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 16:33:38
+ * @LastEditTime: 2021-03-29 09:51:14
 -->
 <div style="height: 100%;overflow-y: auto;">
     <div class="header" >
@@ -31,7 +31,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput name="endtime"  autocomplete="off"  [(ngModel)]="endtime">
             </mat-form-field>
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
index ff859ed..c7b7918 100644
--- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
+++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2020-12-24 14:15:10
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 15:16:17
+ * @LastEditTime: 2021-03-29 09:51:04
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -70,11 +70,13 @@ export class OnetwoEntryPlanComponent implements OnInit {
   }
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
     this.padMore=!this.padMore
     this.padput=!this.padput
+    this.padjt=!this.padjt
   }
 
   levels
diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html
index 6d27121..734537c 100644
--- a/src/app/plan-management/type-plan/type-plan.component.html
+++ b/src/app/plan-management/type-plan/type-plan.component.html
@@ -24,7 +24,8 @@
               <input type="date" matInput  name="addtime"  autocomplete="off" [(ngModel)]="addtime">
             </mat-form-field>
             <!-- <mat-icon aria-hidden="false" style="position: relative;right: 120px;top: 5px;">arrow forward</mat-icon> -->
-            <span style="margin-left: 15px;">🠊</span>
+            <mat-icon *ngIf="padjt" aria-hidden="false" style="position: relative;right: 120px;top: 5px;" id="padshow">arrow forward</mat-icon>
+            <span style="margin-left: 15px;" id="pcshow" *ngIf="!padMore&&!padjt">🠊</span>
             <mat-form-field class="example-full-width" style="margin-left: 10px;">
               <input type="date" matInput  autocomplete="off" name="endtime" [(ngModel)]="endtime">
             </mat-form-field>
diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts
index 5765e5b..b34996a 100644
--- a/src/app/plan-management/type-plan/type-plan.component.ts
+++ b/src/app/plan-management/type-plan/type-plan.component.ts
@@ -4,7 +4,7 @@
  * @Author: sueRimn
  * @Date: 2021-01-06 09:47:43
  * @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 15:16:56
+ * @LastEditTime: 2021-03-29 09:49:11
  */
 import { Component, OnInit, ViewChild, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http'
@@ -29,7 +29,7 @@ export class TypePlanComponent implements OnInit {
   constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { }
 
   ngOnInit(): void {
-    if(window.matchMedia("(max-width: 1290px)").matches){
+    if(window.matchMedia("(max-width: 1290px)").matches&&window.matchMedia("(max-height: 700px)").matches){
       this.padMore=true
     }else{
       this.padMore=false
@@ -65,9 +65,11 @@ export class TypePlanComponent implements OnInit {
   }
   padMore=true//pad收缩控制
   padput=false//pad收起按钮
+  padjt=false
   imgsrcopen="../../../assets/images/routdown2.png"
   imgsrcdown="../../../assets/images/routup2.png"
   padInfo(){
+    this.padjt=!this.padjt
     this.padMore=!this.padMore
     this.padput=!this.padput
   }