From 29fdc63069ee0ab03f4357a4e81710c31d1c8669 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Fri, 26 Mar 2021 15:25:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=92=8C=E5=BE=85=E5=AE=A1=E6=A0=B8=E4=BA=8C?= =?UTF-8?q?=E7=BB=B4=E9=A2=84=E6=A1=88=E6=9F=A5=E7=9C=8B=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 6 ++++-- .../plan-record/plan-record.component.html | 5 +++-- .../plan-record/plan-record.component.ts | 16 ++++++++++++---- .../wait-examineer/wait-examineer.component.ts | 8 +++++--- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 0c8811d..cb3680e 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-11 14:48:03 * @LastEditors: sueRimn - * @LastEditTime: 2021-02-02 15:22:22 + * @LastEditTime: 2021-03-26 15:18:46 */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -16,7 +16,7 @@ import { PlanPassComponent } from '../app/plan-audit/plan-pass/plan-pass.compone //路由守卫 import {AuthGuard} from './auth.guard' import {MTokenK1Component} from './m-token-k1/m-token-k1.component' //K1秘钥 - +import {ViewUnitDetailsPlanComponent} from './key-unit/view-unit-details-plan/view-unit-details-plan.component' const routes: Routes = [ @@ -37,8 +37,10 @@ const routes: Routes = [ }, {path:'login',component:LoginComponent}, + { path:'keyUnit/viewunitinfoplans', component:ViewUnitDetailsPlanComponent,canActivate: [AuthGuard],}, {path:'getNoMToken',component:MTokenK1Component, canActivate: [AuthGuard],}, //K1秘钥验证失败是跳转页面 { path: 'planAudit/planpass', component: PlanPassComponent }, + ]; @NgModule({ diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index 868e13e..bb7363e 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-24 16:06:43 + * @LastEditTime: 2021-03-26 14:49:40 -->
@@ -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 From 9910723e175413a664ae91824d6711d7853e49ac Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 29 Mar 2021 10:43:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E6=9B=B4=E6=96=B0pad=E7=AB=AF=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=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 @@ - 🠚 - + 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 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 @@ 包含下级 + 更多筛选条件 + 收起
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 } From 0f3dc476ff45f5149b2c6055feb8fdd1e7be9731 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Mon, 29 Mar 2021 13:46:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=BB=BA=E7=AD=91?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1=E9=A6=96=E9=A1=B5=E5=8D=8E?= =?UTF-8?q?=E4=B8=BApad=E8=87=AA=E9=80=82=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../building-type-one.component.ts | 14 ++++++++++---- .../building-type-two-reverse.component.ts | 13 ++++++++++--- 2 files changed, 20 insertions(+), 7 deletions(-) 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,