From 15727a778b6fe1840592b9a6ebdfd7f8b382afd7 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 22 Mar 2021 15:07:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=BB=9F=E8=AE=A1=E9=A6=96=E9=A1=B5=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E6=9C=80=E5=90=8E=E4=B8=80=E7=BA=A7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=A0=E5=8F=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit/key-site-look/key-site.component.scss | 1 + .../key-unit-management.component.ts | 12 ++++-------- .../entry-plan-look/entry-plan-look.component.html | 6 +++--- .../addUnit/add-unit-one/add-unit-one.component.ts | 9 ++++----- .../add-unit-three-bar-details.component.ts | 7 ++----- .../add-unit-three-line-details.component.ts | 2 +- .../add-unit-two-time/add-unit-two-time.component.ts | 8 +++----- .../add-unit-two-type-details.component.ts | 5 ++--- .../add-unit-two-type-statistics.component.ts | 6 +++++- .../all-plan/all-plan.component.ts | 4 +--- .../building-type-one/building-type-one.component.ts | 6 ++---- .../building-type-three-details.component.ts | 7 ++----- .../building-type-two-reverse.component.ts | 3 --- 13 files changed, 30 insertions(+), 46 deletions(-) diff --git a/src/app/key-unit/key-site-look/key-site.component.scss b/src/app/key-unit/key-site-look/key-site.component.scss index 08d9639..438b588 100644 --- a/src/app/key-unit/key-site-look/key-site.component.scss +++ b/src/app/key-unit/key-site-look/key-site.component.scss @@ -1,3 +1,4 @@ + .content { width: 100%; height: 100%; 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 5009c92..37cfe21 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 @@ -59,7 +59,7 @@ export class KeyUnitManagementComponent implements OnInit { //表头排序 sortData (e) { let data = this.tabledataSource.filteredData; - console.log(data.filteredData) + //console.log(data.filteredData) // data.filteredData.forEach(element => { // if(element.key.indexOf(".") != -1){ // let typeArr = element.key.split('.') @@ -431,8 +431,6 @@ export class KeyUnitManagementComponent implements OnInit { //勾选框事件 verifyState //判断是否可以修改 checkChange(e,element){ - console.log(e) - console.log(element) if(element.contentVerify!=null){ this.verifyState=element.contentVerify.verifyState @@ -534,7 +532,7 @@ export class KeyUnitManagementComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - console.log(this.deleteAll) + //console.log(this.deleteAll) if(this.verifyState==0||this.verifyState==3){ this.snackBar.open('审核中，不能删除','确定',config); }else{ @@ -574,7 +572,7 @@ export class KeyUnitManagementComponent implements OnInit { } }else if(this.deleteAll.length > 1){ - let isTrue = confirm('您确定要提交删除审核吗') + let isTrue = confirm('重点单位删除需审核员审核，审核通过方可删除') if(isTrue){ for(var i=0;i{ this.snackBar.open('操作成功','确定',config); this.getAllKeyUnit() @@ -748,7 +746,6 @@ export class KeyUnitManagementComponent implements OnInit { } //审核结果 auditResult(element){ - // console.log(element) const dialogRef = this.dialog.open(companyAuditResult, { width:"400px", //height:"300px", @@ -866,7 +863,6 @@ export class upname{ id:this.oldid, name: this.unitname } - console.log(paramsdata) this.http.put(`/api/Companies/${this.oldid}/UpdateName`,paramsdata).subscribe((data:any)=>{ this.snackBar.open("修改名字成功",'确定',config); },err => { diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index 39c1835..e229b0c 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-20 16:29:51 + * @LastEditTime: 2021-03-22 10:56:29 -->
@@ -74,13 +74,13 @@ 操作 - 改名 + 改名 编辑 查看 下载 删除 审批结果 - 提交审核 + 提交审核 撤销审核 diff --git a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts index 8662ee3..c6fae9e 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-one/add-unit-one.component.ts @@ -20,7 +20,7 @@ export class AddUnitOneComponent implements OnInit { this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) this.initCharts("pieone") this.initCharts("pietwo") },1000) @@ -80,7 +80,6 @@ export class AddUnitOneComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - console.log(params) return tid=="pieone"?this.biaogeTishi(params.data,'one'):this.biaogeTishi(params.data,'two') //return this.echartsData.tableTooltip(tid=="pieone"?this.echartsData.buildingType:this.echartsData.tableDataZhi,params.name) }, @@ -136,7 +135,7 @@ export class AddUnitOneComponent implements OnInit { this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':params.name,'id':params.data.id}}); }else{ //中队跳转 - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'buildid':tid!="pieone"?params.data.id:'','jsid':tid=="pieone"?params.data.id:''}}); } @@ -146,7 +145,7 @@ export class AddUnitOneComponent implements OnInit { res tishiData biaogeTishi(datas,type){ - console.log(datas) + //console.log(datas) this.res='' this.tishiData='' if(type=='two'){ @@ -163,7 +162,7 @@ export class AddUnitOneComponent implements OnInit { } } - console.log(this.tishiData) + //console.log(this.tishiData) var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts index 10106d2..9e8e487 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-three-bar-details/add-unit-three-bar-details.component.ts @@ -38,7 +38,7 @@ export class AddUnitThreeBarDetailsComponent implements OnInit { this.serviceData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildId}`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i=1){ //总队不跳 - console.log(params) this.zhiNameData=[] this.zhiNumData=[] this.organizationId=[] @@ -187,7 +185,7 @@ export class AddUnitThreeBarDetailsComponent implements OnInit { this.serviceData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildId}`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i { this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i=this.serviceData.selectStartMonth||this.tabledata[0].companyStatistics.trendStatistics.added[i].month<=this.serviceData.selectEndMonth){ this.date.push(this.tabledata[0].companyStatistics.trendStatistics.added[i].month) diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts index 8e86a3a..060f144 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts @@ -19,7 +19,6 @@ export class AddUnitTwoTimeComponent implements OnInit { tabledata zongcount=0 ngOnInit(): void { - console.log(this.serviceData.zuzhiorBuilding) this.serviceData.selectType=0 this.dateInit () this.route.queryParams.subscribe(param=>{ @@ -53,7 +52,7 @@ export class AddUnitTwoTimeComponent implements OnInit { this.serviceData.getData(this.serviceData.zuzhiorBuilding=='zhi'?parbuild:parzhi,`/api/StatisticsAnalysis`) this.setTimeoutObj = window.setTimeout(() => { this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i=this.serviceData.selectStartMonth||this.tabledata[0].companyStatistics.trendStatistics.added[i].month<=this.serviceData.selectEndMonth){ this.date.push(this.tabledata[0].companyStatistics.trendStatistics.added[i].month) @@ -95,7 +94,7 @@ export class AddUnitTwoTimeComponent implements OnInit { monthSubmit (e) { this.serviceData.selectStartMonth=this.selectStartMonth this.serviceData.selectEndMonth=this.selectEndMonth - console.log(this.selectStartMonth,this.selectEndMonth) + //console.log(this.selectStartMonth,this.selectEndMonth) this.date=[] this.dateNum=[] this.zongcount=0 @@ -109,7 +108,6 @@ export class AddUnitTwoTimeComponent implements OnInit { this.zongcount=this.zongcount+this.tabledata[0].companyStatistics.trendStatistics.added[i].count } } - console.log(this.dateNum) //this.oneInit (this.date,this.dateNum) this.tiaoshiPao=this.serviceData.qipao(this.tiaoshiPao,this.dateNum,this.date) this.twoInit (this.date,this.dateNum,'month') @@ -153,7 +151,7 @@ export class AddUnitTwoTimeComponent implements OnInit { this.serviceData.getData(paramdata,`/api/StatisticsAnalysis`) this.setTimeoutObj = window.setTimeout(() => { this.tabledata=JSON.parse(JSON.stringify(this.serviceData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i=1){ var arrshuzu='['; for(var i=0;i{ this.tabledata=JSON.parse(JSON.stringify(this.data.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) if(this.data.zuzhiorBuilding=="zhi"){ for(var i=0;i,@Inject(MAT_DIALOG_DATA) public data: any) {} ngOnInit(): void { - console.log(this.data) const viewer = new Viewer({ container: document.querySelector('#viewer'), panorama:'/api/Objects/PlanPlatform/'+ this.data, diff --git a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts index 0fa0ea9..d918096 100644 --- a/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts @@ -32,7 +32,7 @@ export class BuildingTypeOneComponent implements OnInit { tabledata initCharts(){ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i{return {name: v.buildingTypeName,value:v.count,id:v.buildingTypeId}}) - console.log(this.indexData) + //console.log(this.indexData) this.indexBzt = echarts.init(document.getElementById('indexBzt'),'walden'); let options={ title: { @@ -123,13 +123,11 @@ export class BuildingTypeOneComponent implements OnInit { tishiData res:string biaogeTishiZhi(datas){ - console.log(datas,this.tabledata) for(var a in this.tabledata.buildingTypes){ if(this.tabledata.buildingTypes[a].buildingTypeId==datas.id){ this.tishiData=this.tabledata.buildingTypes[a].organizations } } - console.log(this.tishiData) var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 diff --git a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts index 24e54bc..3c4182a 100644 --- a/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts @@ -43,7 +43,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { this.echartsData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildingTypeId}`) window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i=1){ //总队不跳转 - console.log(params) this.zhongNameData=[] this.zhongNumData=[] this.organizationId=[] @@ -152,7 +151,7 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { this.echartsData.getData(paramsdatee,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.buildingTypeId}`) window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) - console.log(this.tabledata) + //console.log(this.tabledata) for(var i=0;i{ - console.log(params) return this.tableTooltip(params) }, position: this.data.tableTooltipNoShow2 @@ -341,13 +340,11 @@ export class BuildingTypeTwoReverseComponent implements OnInit { res tishiData tableTooltip(datas){ - console.log(datas) for(var a in this.data.obdata[0].organizations){ if(this.data.obdata[0].organizations[a].organizationName==datas.name){ this.tishiData=this.data.obdata[0].organizations[a].subOrganizations } } - console.log(this.tishiData) var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 From deffdec6e0cd7863a5a03921b56c7a7be63b6929 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 23 Mar 2021 16:02:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=99=BD=E8=89=B2pad=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.html | 18 +- .../key-unit-management.component.scss | 17 +- .../key-unit-management.component.ts | 15 ++ .../entry-plan-look.component.html | 185 +++++++++--------- .../entry-plan-look.component.scss | 2 + .../entry-plan/entry-plan.component.html | 14 +- .../entry-plan/entry-plan.component.ts | 13 ++ .../meet-plan/meet-plan.component.html | 16 +- .../meet-plan/meet-plan.component.ts | 16 +- .../onetwo-entry-plan.component.html | 19 +- .../onetwo-entry-plan.component.ts | 15 +- .../open-plan/open-plan.component.html | 5 +- .../pass-plan/pass-plan.component.html | 20 +- .../pass-plan/pass-plan.component.ts | 13 ++ .../reinforce-plan.component.html | 14 +- .../reinforce-plan.component.ts | 13 ++ .../type-plan/type-plan.component.html | 12 +- .../type-plan/type-plan.component.ts | 15 +- 18 files changed, 276 insertions(+), 146 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 6dd6d4d..6a62535 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 @@ -15,6 +15,8 @@ 包含下级 + 更多筛选条件 + 收起
clear
@@ -36,15 +38,16 @@
+
- -
+ +
-
+
@@ -53,8 +56,9 @@ +
-
+
@@ -63,7 +67,7 @@
-
+
@@ -72,12 +76,12 @@
-
+
- 🠊 + arrow forward 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 ef26154..adf9eda 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,4 +1,10 @@ - +@media screen and (min-device-width:1280px){ + +} +//margin: 3px 40px; +@media screen and (max-device-width:1290px){ + +} .header { @@ -16,7 +22,14 @@ align-items:center; // justify-content:center; .queryField { - margin: 3px 40px; + @media screen and (min-device-width:1280px){ + margin: 3px 40px; + } + //margin: 3px 40px; + @media screen and (max-device-width:1280px){ + margin-left: 20px; + } + input { width: 180px; height: 22px; 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 37cfe21..3ca590a 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,16 @@ export class KeyUnitManagementComponent implements OnInit { constructor(private http:HttpClient,private router:Router,private route:ActivatedRoute,private tree: TreeService,public dialog: MatDialog,public snackBar: MatSnackBar) { } + padMore=true//pad收缩控制 + padput=false//pad收起按钮 + open="更多筛选条件" + down="收起" + imgsrcopen="../../../assets/images/routdown2.png" + imgsrcdown="../../../assets/images/routup2.png" + padInfo(){ + this.padMore=!this.padMore + this.padput=!this.padput + } private _transformer = (node, level: number) => { //初始化tree return { expandable: !!node.children && node.children.length > 0, @@ -208,6 +218,11 @@ export class KeyUnitManagementComponent implements OnInit { this.getOrganizations(); this.getUnittype(); this.getAllKeyUnit(); + if(window.matchMedia("(max-width: 1290px)").matches){ + this.padMore=true + }else{ + this.padMore=false + } } //获得所有重点单位 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index e229b0c..788e2d9 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -4,100 +4,101 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-22 10:56:29 + * @LastEditTime: 2021-03-23 15:09:09 --> -
-
- 单位名称：{{unitdata.unitname == "null" ? "无" : unitdata.unitname}} -
-
- 消防救援站：{{unitdata.organizationName == "null" ? "无" : unitdata.organizationName}} -
-
- 单位类型：{{unitdata.unittype == "null" ? "无" : unitdata.unittype}} -
-
- 单位地址：{{unitdata.unitaddress == "null" ? "无" : unitdata.unitaddress}} -
- - 查看详情 -
- -
-
- - -
- - - {{downloadFileName}} - 下载中... - +
+
+
+ 单位名称：{{unitdata.unitname == "null" ? "无" : unitdata.unitname}} +
+
+ 消防救援站：{{unitdata.organizationName == "null" ? "无" : unitdata.organizationName}} +
+
+ 单位类型：{{unitdata.unittype == "null" ? "无" : unitdata.unittype}} +
+
+ 单位地址：{{unitdata.unitaddress == "null" ? "无" : unitdata.unitaddress}}
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
预案名称{{element.name}}添加人{{element.creatorName}}修改时间 - {{element.modifiedTime | date:'yyyy-MM-dd'}} - 预案类型{{element.planType | plantype}}审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? - '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}是否公开{{element.openRange}}编制级别{{element.planLevel | planlevel}}操作 - 改名 - 编辑 - 查看 - 下载 - 删除 - 审批结果 - 提交审核 - 撤销审核 - 操作 - 查看 - 下载 -
- - + 查看详情
-
\ No newline at end of file + +
+
+ + +
+ + + {{downloadFileName}} + 下载中... + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
预案名称{{element.name}}添加人{{element.creatorName}}修改时间 + {{element.modifiedTime | date:'yyyy-MM-dd'}} + 预案类型{{element.planType | plantype}}审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? + '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}}是否公开{{element.openRange}}编制级别{{element.planLevel | planlevel}}操作 + 改名 + 编辑 + 查看 + 下载 + 删除 + 审批结果 + 提交审核 + 撤销审核 + 操作 + 查看 + 下载 +
+ + +
+
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss index 9324d93..59234db 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss @@ -15,6 +15,7 @@ // margin-bottom: 30px; } .body{ + overflow: auto; .btn{ button{ width: 80px; @@ -23,6 +24,7 @@ } } .tablebox{ + overflow: auto; table{ width: 100%; margin-left: 0%; diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html index 4c4bddc..099f1fd 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -16,6 +16,8 @@ 包含下级 + 更多筛选条件 + 收起
clear
@@ -39,7 +41,7 @@
-
+
@@ -49,7 +51,7 @@
-
+
@@ -60,7 +62,7 @@
-
+
@@ -71,7 +73,7 @@
-
+
@@ -85,7 +87,7 @@ 包含下级
-
+
@@ -94,7 +96,7 @@
-
+
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index e00c887..1e4032f 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -170,6 +170,11 @@ export class EntryPlanComponent implements OnInit { } level ngOnInit(): void { + if(window.matchMedia("(max-width: 1300px)").matches){ + this.padMore=true + }else{ + this.padMore=false + } this.getunitdata(); this.getOrganizations(); this.getUnittype(); @@ -202,6 +207,14 @@ export class EntryPlanComponent implements OnInit { ] } } + padMore=true//pad收缩控制 + padput=false//pad收起按钮 + imgsrcopen="../../../assets/images/routdown2.png" + imgsrcdown="../../../assets/images/routup2.png" + padInfo(){ + this.padMore=!this.padMore + this.padput=!this.padput + } 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 9f5133c..2db3eb0 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -19,24 +19,26 @@ 市级 + 更多筛选条件 + 收起
-
+
-
+
- 🠊 - + arrow forward +
-
+
@@ -17,26 +17,25 @@
- - -
+ 更多筛选条件 + 收起
-
+
- 🠊 - + arrow forward +
-
+