@@ -59,7 +59,8 @@
- arrow forward
+ arrow forward
+ 🠊
diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts
index 20f937f..6b2978f 100644
--- a/src/app/plan-audit/plan-record/plan-record.component.ts
+++ b/src/app/plan-audit/plan-record/plan-record.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 10:19:31
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-20 15:12:24
+ * @LastEditTime: 2021-03-26 15:21:16
*/
import { Component, OnInit,Inject } from '@angular/core';
import { FormControl } from '@angular/forms';
@@ -24,7 +24,13 @@ export class PlanRecordComponent implements OnInit {
constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { }
+ pcshow
ngOnInit(): void {
+ if(window.matchMedia("(max-width: 1300px)").matches){
+ this.pcshow=false
+ }else{
+ this.pcshow=true
+ }
let level = sessionStorage.getItem("level");
if(level == "0"){//如果是总队
this.preparelevels = [
@@ -82,6 +88,7 @@ export class PlanRecordComponent implements OnInit {
organizationName
planData
id
+ itemid
companyId
fetchUrl
companyName
@@ -139,8 +146,9 @@ export class PlanRecordComponent implements OnInit {
tableClick(e,item){
this.showtype = -1
//e.target.parentElement.bgColor='#2196F3'
- //console.log(e,item)
+ console.log(item)
this.organizationName=''
+ this.itemid=item.itemId
this.id=item.id
this.fetchUrl=''
this.viewer={}
@@ -298,11 +306,11 @@ export class PlanRecordComponent implements OnInit {
})
sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
sessionStorage.setItem("companyId",this.companyId);
- sessionStorage.setItem("planId",this.id);
+ sessionStorage.setItem("planId",this.itemid);
sessionStorage.setItem("editable",'0');
sessionStorage.setItem("planName",data.name)
let companyId = sessionStorage.getItem("companyId")
- this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+ this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
//window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
} else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
this.showtype=2
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
index bf87355..346a7e3 100644
--- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
+++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts
@@ -4,7 +4,7 @@
* @Author: sueRimn
* @Date: 2020-12-25 16:13:50
* @LastEditors: sueRimn
- * @LastEditTime: 2021-03-25 08:45:05
+ * @LastEditTime: 2021-03-26 15:09:38
*/
import { Component, Inject, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms';
@@ -109,6 +109,7 @@ export class WaitExamineerComponent implements OnInit {
organizationName
planData
id
+ itemid
companyId
fetchUrl
companyName
@@ -147,6 +148,7 @@ export class WaitExamineerComponent implements OnInit {
radioClick(e,item){
this.showtype = -1
this.organizationName=''
+ this.itemid=item.itemId
this.id=item.id
this.fetchUrl=''
this.viewer={}
@@ -310,11 +312,11 @@ export class WaitExamineerComponent implements OnInit {
})
sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined);
sessionStorage.setItem("companyId",this.companyId);
- sessionStorage.setItem("planId",this.id);
+ sessionStorage.setItem("planId",this.itemid);
sessionStorage.setItem("editable",'0');
sessionStorage.setItem("planName",data.name)
let companyId = sessionStorage.getItem("companyId")
- this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`);
+ this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/keyUnit/viewunitinfoplans?id=${companyId}`);
//window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`)
} else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址'
this.showtype=2
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 @@
包含下级
+ 更多筛选条件![]()
+ 收起![]()
clear
@@ -38,13 +40,13 @@
-
+
-
+
@@ -54,7 +56,7 @@
-
+
@@ -63,7 +65,7 @@
-
+
@@ -72,12 +74,13 @@
-
+
- 🠊
+ arrow forward
+ 🠊
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 @@
- 🠊
+ arrow forward
+ 🠊
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
-->
@@ -31,7 +31,8 @@
- 🠊
+ arrow forward
+ 🠊
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 @@
- 🠊
+ arrow forward
+ 🠊
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
}
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 2768d0c..42c8ee2 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
@@ -14,7 +14,12 @@ export class BuildingTypeOneComponent implements OnInit {
constructor(private http:HttpClient,private router: Router,public echartsData:EchartsDataService) { }
ngOnInit(): void {
-
+ if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+ this.padHw=true
+ //this.padjt=
+ }else{
+ this.padHw=false
+ }
this.echartsData.getData(null,`/api/StatisticsAnalysis/BuildingTypes`)
window.setTimeout(()=>{
this.initCharts()
@@ -26,6 +31,7 @@ export class BuildingTypeOneComponent implements OnInit {
}
/* 首页饼状图 */
indexBzt
+ padHw
lengthdata=[]//提示数据
count=0//总数
indexData=[]//所有数据
@@ -65,8 +71,8 @@ export class BuildingTypeOneComponent implements OnInit {
},
legend: {
orient: 'vertical',
- right: 150,
- top:80,
+ right: this.padHw?150:250,
+ top:60,
textStyle:{
fontSize:18,
color:"#000000"
@@ -75,7 +81,7 @@ export class BuildingTypeOneComponent implements OnInit {
},
series: [
{
- //top:'15%',
+ top:this.padHw?'15%':'0',
name: '访问来源',
type: 'pie',
radius: '60%',
diff --git a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
index 3c59913..490c9b9 100644
--- a/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
+++ b/src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
@@ -20,7 +20,14 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
}
headname//标题
buildId//建筑id
+ padHw//是否是华为pad
ngOnInit(): void {
+ if(window.matchMedia("(max-width: 1300px)").matches&&window.matchMedia("(max-height: 700px)").matches){
+ this.padHw=true
+ //this.padjt=
+ }else{
+ this.padHw=false
+ }
if(sessionStorage.getItem('refresh') === 'true') {
sessionStorage.removeItem('refresh');
location.reload();
@@ -263,15 +270,15 @@ export class BuildingTypeTwoReverseComponent implements OnInit {
title: {
text: this.headname+this.tabledata[0].totalCount,
left: "center",
- //top: "12",
- bottom: '510',
+ top:this.padHw?"18":"0",
+ bottom:this.padHw?"0":'510',
textStyle: {
fontSize: 30
}
},
grid: {
top: 90,
- bottom: 30
+ bottom: 30,
},
xAxis: {
id:this.organizationId,