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 276d48f..8b91086 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 @@ -40,7 +40,10 @@ - +
+ + +
@@ -56,9 +59,14 @@ - + 更多筛选条件 + 收起
-
+
+ + +
+
@@ -67,7 +75,7 @@
-
+
@@ -76,7 +84,7 @@
-
+
@@ -89,10 +97,7 @@
-
- - -
+
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 1676076..8b8b4f2 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 @@ -1,40 +1,33 @@ -@media screen and (min-device-width:1280px){ - -} -//margin: 3px 40px; -@media screen and (max-device-width:1290px) and (max-device-height:690px){ - -} + .header { width: 100%; - padding: 12px 10px; + padding: 12px 0 12px 10px; // margin-bottom: 10px; box-sizing: border-box; // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px; + padding: 5px 0; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - @media screen and (min-device-width:1280px){ - margin: 3px 40px; - } - //margin: 3px 40px; - @media screen and (max-device-width:1280px){ - margin-left: 20px; - } + margin: 3px 10px; input { - width: 180px; + //width: 180px; height: 22px; line-height: 22px; border-radius: 3px;} + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 110px; + } + } } } //queryBox 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 b203c4d..afacdf5 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 @@ -11,6 +11,7 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' import { MatSort } from '@angular/material/sort'; import { MatTableDataSource } from '@angular/material/table'; +import { truncateSync } from 'fs'; @Component({ selector: 'app-key-unit-management', @@ -21,15 +22,19 @@ export class KeyUnitManagementComponent implements OnInit { constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 padjt=false padMore=true//pad收缩控制 padput=false//pad收起按钮 - open="更多筛选条件" - down="收起" imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } padInfo(){ - this.padjt=!this.padjt this.padMore=!this.padMore this.padput=!this.padput } @@ -221,9 +226,15 @@ export class KeyUnitManagementComponent implements OnInit { this.getUnittype(); this.getAllKeyUnit(); if(window.matchMedia("(max-width: 1290px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } } //获得所有重点单位 diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index ecc0ced..ec5d4b5 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -128,7 +128,7 @@ display: flex; flex-direction: column; .company{ - @media screen and (min-device-width:1300px){ + @media screen and (min-device-width:1400px){ overflow-y: auto; } flex: 1; 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 3d7fe2f..c24c072 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.html +++ b/src/app/plan-management/maintain-up/maintain-up.component.html @@ -39,7 +39,11 @@
- +
+ + +
+
@@ -55,8 +59,14 @@ + 更多筛选条件 + 收起
-
+
+ + +
+
@@ -65,7 +75,7 @@
-
+
@@ -74,7 +84,7 @@
-
+
@@ -87,10 +97,7 @@
-
- - -
+
diff --git a/src/app/plan-management/maintain-up/maintain-up.component.scss b/src/app/plan-management/maintain-up/maintain-up.component.scss index ef26154..fb5328a 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.scss +++ b/src/app/plan-management/maintain-up/maintain-up.component.scss @@ -3,25 +3,30 @@ .header { width: 100%; - padding: 12px 10px; + padding: 12px 0; // margin-bottom: 10px; box-sizing: border-box; // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px; + padding: 5px 0 0 5px; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - margin: 3px 40px; + margin: 3px 10px; input { width: 180px; height: 22px; line-height: 22px; border-radius: 3px;} + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 130px; + } + } } } //queryBox 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 7b47e76..557935b 100644 --- a/src/app/plan-management/maintain-up/maintain-up.component.ts +++ b/src/app/plan-management/maintain-up/maintain-up.component.ts @@ -203,23 +203,33 @@ export class MaintainUpComponent implements OnInit { this.PageNumber = e.pageIndex+1 this.getAllKeyUnit(); } - padMore//pad收缩控制 - padput=false//pad收起按钮 + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 padjt=false - open="更多筛选条件" - down="收起" + padMore=true//pad收缩控制 + padput=false//pad收起按钮 imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } 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){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.getunitdata(); this.getOrganizations(); 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 ff00ab0..0d548f6 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -19,16 +19,39 @@ 市级 - 更多筛选条件 - 收起 + 更多筛选条件 + 收起 +
+
+ + +
+
+ + + + + {{item.name}} + + + 包含下级
+ 更多筛选条件 + 收起
-
+
+ + +
+
@@ -39,20 +62,17 @@ +
-
+ + +
-
-
+
@@ -63,25 +83,12 @@
-
- - - - - {{item.name}} - - - 包含下级 -
-
+
diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index b85f11d..d1742a7 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -6,19 +6,25 @@ // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px 0 25px; + padding: 5px 25px 0 15px; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - margin: 3px 40px; + margin: 3px 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; + } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 140px; + } + } } } //queryBox 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 0b2c0b3..2d846b6 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -21,11 +21,16 @@ export class MeetPlanComponent implements OnInit { ngOnInit(): void { //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){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true - //this.padjt= + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.levels = sessionStorage.getItem("level"); if(this.levels == "0"){//如果是总队 @@ -78,20 +83,24 @@ export class MeetPlanComponent implements OnInit { paginator: MatPaginator; length:any; //共多少条数据 pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [13] //设置每页条数 PageNumber:any; //第几页 - padMore//pad收缩控制 - padput=false//pad收起按钮 + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 padjt=false - open="更多筛选条件" - down="收起" + padMore=true//pad收缩控制 + padput=false//pad收起按钮 imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } 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 fea010f..dc73477 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-29 09:51:14 + * @LastEditTime: 2021-03-30 15:54:25 -->
@@ -25,6 +25,10 @@ 更多筛选条件 收起
+
+ + +
@@ -40,16 +44,16 @@
- + 更多筛选条件 + 收起 +
+
+ +
-
+
@@ -60,7 +64,7 @@
-
+
@@ -75,10 +79,7 @@
-
- - -
+
diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index cdbb1c2..8d66c55 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -6,19 +6,25 @@ // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px 0 25px; + padding: 5px 25px 0 15px; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - margin: 0 40px; + margin: 0 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; + } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 160px; + } + } } } //queryBox 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 c7b7918..f4755bb 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-29 09:51:04 + * @LastEditTime: 2021-03-30 15:54:05 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -33,10 +33,16 @@ export class OnetwoEntryPlanComponent 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){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.levels = sessionStorage.getItem("level"); if(this.levels == "0"){//如果是总队 @@ -68,15 +74,21 @@ export class OnetwoEntryPlanComponent implements OnInit { this.url=window.location.href.substring(window.location.href.length-1,window.location.href.length) this.getAlltabledate() } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 + padjt=false padMore=true//pad收缩控制 padput=false//pad收起按钮 - padjt=false imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } padInfo(){ this.padMore=!this.padMore this.padput=!this.padput - this.padjt=!this.padjt } levels @@ -100,7 +112,7 @@ export class OnetwoEntryPlanComponent implements OnInit { paginator: MatPaginator; length:any; //共多少条数据 pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [13] //设置每页条数 PageNumber:any; //第几页 //获取表格数据 diff --git a/src/app/plan-management/open-plan/open-plan.component.html b/src/app/plan-management/open-plan/open-plan.component.html index 3bb6661..9e06713 100644 --- a/src/app/plan-management/open-plan/open-plan.component.html +++ b/src/app/plan-management/open-plan/open-plan.component.html @@ -19,8 +19,23 @@ + 更多筛选条件 + 收起
-
+
+ + +
+
+ + + + {{item.name}} + + + 包含下级 +
+
@@ -32,25 +47,13 @@
-
- - - - - {{item.name}} - - - 包含下级 -
- + +
+ +
-
- -
+
diff --git a/src/app/plan-management/open-plan/open-plan.component.scss b/src/app/plan-management/open-plan/open-plan.component.scss index 9b77e69..06ae319 100644 --- a/src/app/plan-management/open-plan/open-plan.component.scss +++ b/src/app/plan-management/open-plan/open-plan.component.scss @@ -6,19 +6,25 @@ // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px; + padding: 5px 15px; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - margin: 3px 40px; + margin: 3px 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; + } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 140px; + } + } } } //queryBox diff --git a/src/app/plan-management/open-plan/open-plan.component.ts b/src/app/plan-management/open-plan/open-plan.component.ts index 32765c6..8f894fd 100644 --- a/src/app/plan-management/open-plan/open-plan.component.ts +++ b/src/app/plan-management/open-plan/open-plan.component.ts @@ -51,6 +51,17 @@ export class OpenPlanComponent implements OnInit { tabledataSource:any //表格数据 preparelevels:any //编制级别 ngOnInit(): void { + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false + this.padMore=true + this.pcfind=false + this.padjt=true + }else{ + this.pcfind=true + this.pcMore=true + this.padMore=false + this.padjt=false + } this.getunitdata(); this.getOrganizations(); this.getUnittype(); @@ -84,6 +95,22 @@ export class OpenPlanComponent implements OnInit { } } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 + padjt=false + padMore=true//pad收缩控制 + padput=false//pad收起按钮 + imgsrcopen="../../../assets/images/routdown2.png" + imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } + padInfo(){ + this.padMore=!this.padMore + this.padput=!this.padput + } allPlanInfo:any //存储所有预案信息 //获得所有预案信息 diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index eb4f771..2314d86 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -40,7 +40,19 @@
- +
+ + +
+
+ + + + {{item.name}} + + + 包含下级 +
@@ -50,8 +62,14 @@ + 更多筛选条件 + 收起
-
+
+ + +
+
@@ -61,22 +79,11 @@ 其他预案 +
-
- - - - - {{item.name}} - - - 包含下级 -
-
+ +
@@ -89,10 +96,7 @@
-
- - -
+
diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss index 3e7cd43..55d68b0 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -4,7 +4,7 @@ box-sizing: border-box; .queryBox { box-sizing: border-box; - padding: 5px 25px 0 25px; + padding: 5px 5px 0 5px; // margin-left: 50px; display: flex; flex-direction: row; @@ -12,13 +12,21 @@ align-items:center; // justify-content:center; .queryField { - margin: 0 40px; + margin: 0 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 110px; + } + } + + } + } //queryBox .butclass{ diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 27fe7f4..f365153 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -41,7 +41,7 @@ export class PassPlanComponent implements OnInit { paginator: MatPaginator; length:any; //共多少条数据 pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [13] //设置每页条数 PageNumber:any; //第几页 displayedColumns: string[] = ['planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; @@ -52,10 +52,16 @@ export class PassPlanComponent implements OnInit { preparelevels:any ngOnInit(): void { - if(window.matchMedia("(max-width: 1300px)").matches){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.getunitdata(); this.getOrganizations(); @@ -91,10 +97,18 @@ export class PassPlanComponent implements OnInit { this.url=window.location.href.substring(window.location.href.length-1,window.location.href.length) //console.log(this.url) } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 + padjt=false padMore=true//pad收缩控制 padput=false//pad收起按钮 imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } padInfo(){ this.padMore=!this.padMore this.padput=!this.padput diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html index bac14ac..f95a6c0 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.html +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.html @@ -40,7 +40,23 @@
- +
+ + +
+
+ + + + 总队 + 支队 + 大队 + 中队 + + + + 包含下级 +
@@ -63,32 +79,10 @@
-
- - - - 总队 - 支队 - 大队 - 中队 - - - - 包含下级 -
- + -
+
diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss index 3e7cd43..e2cd811 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.scss @@ -4,7 +4,7 @@ box-sizing: border-box; .queryBox { box-sizing: border-box; - padding: 5px 25px 0 25px; + padding:5px 5px 0 5px; // margin-left: 50px; display: flex; flex-direction: row; @@ -12,12 +12,18 @@ align-items:center; // justify-content:center; .queryField { - margin: 0 40px; + margin: 0 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; + } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 110px; + } + } } } //queryBox diff --git a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts index ea8d246..afd1999 100644 --- a/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts +++ b/src/app/plan-management/reinforce-plan/reinforce-plan.component.ts @@ -51,10 +51,16 @@ export class ReinforcePlanComponent implements OnInit { preparelevels:any ngOnInit(): void { - if(window.matchMedia("(max-width: 1300px)").matches){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.getunitdata(); this.getOrganizations(); @@ -88,10 +94,18 @@ export class ReinforcePlanComponent implements OnInit { ] } } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 + padjt=false padMore=true//pad收缩控制 padput=false//pad收起按钮 imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } padInfo(){ this.padMore=!this.padMore this.padput=!this.padput 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 734537c..48e5edb 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -15,9 +15,13 @@ - 更多筛选条件 + 更多筛选条件 收起
+
+ + +
@@ -41,8 +45,14 @@ 审核退回 + 更多筛选条件 + 收起
-
+
+ + +
+
@@ -57,10 +67,6 @@
-
- - -
diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index dab8169..22fe107 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -6,19 +6,25 @@ // border-bottom: 1px solid black; .queryBox { box-sizing: border-box; - padding: 5px 25px 0 25px; + padding: 5px 25px 0 15px; display: flex; flex-direction: row; flex-wrap: wrap; align-items:center; // justify-content:center; .queryField { - margin: 3px 40px; + margin: 3px 10px; input { width: 180px; height: 22px; line-height: 22px; - border-radius: 3px;} + border-radius: 3px; + } + @media screen and (max-device-width:1400px){ + mat-form-field{ + width: 150px; + } + } } } //queryBox 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 b34996a..1db23a1 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-29 09:49:11 + * @LastEditTime: 2021-03-30 16:36:01 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -29,10 +29,16 @@ 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&&window.matchMedia("(max-height: 700px)").matches){ + if(window.matchMedia("(max-width: 1400px)").matches){ + this.pcMore=false this.padMore=true + this.pcfind=false + this.padjt=true }else{ + this.pcfind=true + this.pcMore=true this.padMore=false + this.padjt=false } this.levels = sessionStorage.getItem("level"); if(this.levels == "0"){//如果是总队 @@ -63,13 +69,19 @@ export class TypePlanComponent implements OnInit { } this.getAlltabledate() } + pcMore//pc更多 + pcput=false//pc收起 + pcfind//pc查询 + padjt=false padMore=true//pad收缩控制 padput=false//pad收起按钮 - padjt=false imgsrcopen="../../../assets/images/routdown2.png" imgsrcdown="../../../assets/images/routup2.png" + pcInfo(){ + this.pcMore=!this.pcMore + this.pcput=!this.pcput + } padInfo(){ - this.padjt=!this.padjt this.padMore=!this.padMore this.padput=!this.padput } @@ -93,7 +105,7 @@ export class TypePlanComponent implements OnInit { paginator: MatPaginator; length:any; //共多少条数据 pageSize:any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [13] //设置每页条数 PageNumber:any; //第几页 //获取表格数据