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 6a62535..ffb8368 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,7 +81,8 @@ - arrow forward + 🠚 + 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 80371fd..bf87355 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-23 16:36:07 + * @LastEditTime: 2021-03-25 08:45:05 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -37,7 +37,7 @@ export class WaitExamineerComponent implements OnInit { {name:"大队",value:"2"}, {name:"中队",value:"3"} ] - this.PlanLevel=0 + //this.PlanLevel=0 } if(level == "1"){//如果是支队 this.preparelevels = [ @@ -45,20 +45,20 @@ export class WaitExamineerComponent implements OnInit { {name:"大队",value:"2"}, {name:"中队",value:"3"} ] - this.PlanLevel=1 + //this.PlanLevel=1 } if(level == "2"){//如果是大队 this.preparelevels = [ {name:"大队",value:"2"}, {name:"中队",value:"3"} ] - this.PlanLevel=2 + //this.PlanLevel=2 } if(level == "3"){//如果是中队 this.preparelevels = [ {name:"中队",value:"3"} ] - this.PlanLevel=3 + //this.PlanLevel=3 } var scrollflaga = true; var win=document.getElementById('tbodydiv') @@ -134,19 +134,8 @@ export class WaitExamineerComponent implements OnInit { record(){ this.level='' this.projectlevel='' + this.PlanLevel='' let level = sessionStorage.getItem("level"); - if(level == "0"){//如果是总队 - this.PlanLevel=0 - } - if(level == "1"){//如果是支队 - this.PlanLevel=1 - } - if(level == "2"){//如果是大队 - this.PlanLevel=2 - } - if(level == "3"){//如果是中队 - this.PlanLevel=3 - } this.getAlltabledate() } //radio点击事件 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 a7a79a8..94e4276 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-24 13:36:02 + * @LastEditTime: 2021-03-25 14:48:39 -->
@@ -76,12 +76,12 @@ 操作 改名 - 编辑 + 编辑 查看 下载 删除 审批结果 - 提交审核 + 提交审核 撤销审核 diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 8670c13..5bc72a0 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -136,8 +136,10 @@ export class EntryPlanLookComponent implements OnInit { uid: identityJsonparse.sub, nickName: identityJsonparse.name, avatar: "", - privilege: [ + privilege: e.auditStatus!='1'&&e.auditStatus!='16'?[ 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' + ]:[ + 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } @@ -275,15 +277,20 @@ export class EntryPlanLookComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(element.auditStatus == 4){ + /* if(element.auditStatus == 4){ this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - }else{ + } */ if(element.planType == 1){//如果提交审核的是二维预案 - this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{ - this.getAllPlanComponents() - },err => { - this.snackBar.open(err,'确定',config); - }) + if(element.auditStatus ==8){ + this.http.put(`/api/PlanComponents2D/${element.id}/Commit`,"").subscribe(data=>{ + this.getAllPlanComponents() + },err => { + this.snackBar.open(err,'确定',config); + }) + } + else{ + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); + } }else{ this.http.put(`/api/PlanComponents/${element.id}/Commit`,"").subscribe(data=>{ this.getAllPlanComponents() @@ -291,7 +298,7 @@ export class EntryPlanLookComponent implements OnInit { this.snackBar.open(err,'确定',config); }) } - } + } //撤销审核 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 2db3eb0..280d8e3 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -33,7 +33,8 @@ - arrow forward + + 🠊 @@ -137,7 +138,7 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 下载 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 09c942c..10d1ec2 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -160,15 +160,15 @@ export class MeetPlanComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(element.auditStatus == 4){ + /* if(element.auditStatus == 4){ this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - }else{ + } */ this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ this.getAlltabledate() },err => { this.snackBar.open(err,'确定',config); }) - } + } //撤销审核 @@ -208,8 +208,10 @@ export class MeetPlanComponent implements OnInit { uid: identityJsonparse.sub, nickName: identityJsonparse.name, avatar: "", - privilege: [ + privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[ 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' + ]:[ + 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } 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 f6e7ea0..927c709 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-23 14:24:41 + * @LastEditTime: 2021-03-25 16:33:38 -->
@@ -30,7 +30,8 @@ - arrow forward + + 🠊 @@ -134,7 +135,7 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 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 b5b5012..ff859ed 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-23 15:18:08 + * @LastEditTime: 2021-03-25 15:16:17 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -186,18 +186,18 @@ export class OnetwoEntryPlanComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(element.auditStatus == 4){ + /* if(element.auditStatus == 4){ const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - }else{ + } */ this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ this.getAlltabledate() },err => { this.snackBar.open(err,'确定',config); }) - } + } //撤销审核 @@ -233,8 +233,10 @@ export class OnetwoEntryPlanComponent implements OnInit { uid: identityJsonparse.sub, nickName: identityJsonparse.name, avatar: "", - privilege: [ + privilege:element.auditStatus!='1'&&element.auditStatus!='16'?[ 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' + ]:[ + 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } 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 0e980c5..eb4f771 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -81,7 +81,8 @@ - arrow forward + + 🠊 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 aa6f003..6d27121 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -23,7 +23,8 @@ - arrow forward + + 🠊 @@ -114,7 +115,7 @@ 操作 查看预案 - 提交审核 + 提交审核 撤销审核 审批结果 下载 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 9f4a014..5765e5b 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-23 14:22:18 + * @LastEditTime: 2021-03-25 15:16:56 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -170,15 +170,15 @@ export class TypePlanComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 - if(element.auditStatus == 4){ + /* if(element.auditStatus == 4){ this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); - }else{ + } */ this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ this.getAlltabledate() },err => { this.snackBar.open(err,'确定',config); }) - } + } //撤销审核 @@ -214,8 +214,10 @@ export class TypePlanComponent implements OnInit { uid: identityJsonparse.sub, nickName: identityJsonparse.name, avatar: "", - privilege: [ + privilege: element.auditStatus!='1'&&element.auditStatus!='16'?[ 'FILE_READ','FILE_WRITE','FILE_DOWNLOAD', 'FILE_PRINT' + ]:[ + 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' ], }, } 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 36cdc25..c9b4b9c 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 @@ -15,6 +15,10 @@ export class AddUnitOneComponent implements OnInit { tabledata ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } /* this.buildData.push(this.echartsData.getData(null,`/api/StatisticsAnalysis/BuildingTypes`)) this.orData=this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies`) */ this.echartsData.getData(null,`/api/StatisticsAnalysis/Companies`) @@ -134,7 +138,7 @@ export class AddUnitOneComponent implements OnInit { tid=="pieone"?this.echartsData.zuzhiorBuilding="zhi":this.echartsData.zuzhiorBuilding="building" if((this.echartsData.level=='0'||this.echartsData.level=='1'||this.echartsData.level=='2')&&this.tishiData.length>0){ //总队,支队，大队跳转 - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':params.name,'id':params.data.id}}); + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':params.name,'id':params.data.id,'type':tid=="pieone"?'zhi':'build'}}); }else{ //中队跳转 this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'buildid':tid!="pieone"?params.data.id:'','jsid':tid=="pieone"?params.data.id:''}}); 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 9e8e487..d52757d 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 @@ -24,6 +24,10 @@ export class AddUnitThreeBarDetailsComponent implements OnInit { organizationId=[] ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.dateInit () this.route.queryParams.subscribe(params => { this.time = params['time']; @@ -225,7 +229,8 @@ export class AddUnitThreeBarDetailsComponent implements OnInit { }else{ } */ - window.history.go(-1) + //sessionStorage.setItem('refresh', 'true'); + history.go(-1); } tableTooltip(params:any){ diff --git a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts index d82a84e..c12d22b 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts @@ -20,6 +20,10 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { qopao lastId ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.serviceData.selectType=0 this.dateInit () this.route.queryParams.subscribe(params => { @@ -211,7 +215,8 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { } //返回按钮 backBtn(){ - window.history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); } tableTooltip(params:any){ 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 060f144..f74a51e 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 @@ -18,12 +18,13 @@ export class AddUnitTwoTimeComponent implements OnInit { lastId tabledata zongcount=0 + zhiorbuild ngOnInit(): void { this.serviceData.selectType=0 this.dateInit () this.route.queryParams.subscribe(param=>{ this.headname=param.level - //this.type=param.type + this.zhiorbuild=param.type this.lastId=param.id }); this.getdata() @@ -68,10 +69,10 @@ export class AddUnitTwoTimeComponent implements OnInit { }, 1000); } forward(){ - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':this.headname,'id':this.lastId}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':this.headname,'id':this.lastId,'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } reverse(){ - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time'],{queryParams:{'level':this.headname,'id':this.lastId}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time'],{queryParams:{'level':this.headname,'id':this.lastId,'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } selectType:string = 'month'; //选择当前的 查询类型 按月/年 diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts index f0d86ac..8856154 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts @@ -21,7 +21,8 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit { } //返回 goBack () { - history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); this.echartsData.statefulInspectionToggle = true } @@ -32,18 +33,24 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit { canshuId tabledata thisorId=[] + zhiorbuild ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.route.queryParams.subscribe(params => { this.organizationName = params['organizationName']; this.buildingTypeName = params['buildingTypeName']; this.lastId=params['id'] this.canshuId=params['zhuId'] + this.zhiorbuild=params['type'] }); let paramsdata:any = { - //id:this.echartsData.zuzhiorBuilding=='zhi'? this.canshuId:this.lastId, - organizationId:this.echartsData.zuzhiorBuilding=='zhi'?this.lastId:this.canshuId + //id:this.zhiorbuild=='zhi'? this.canshuId:this.lastId, + organizationId:this.zhiorbuild=='zhi'?this.lastId:this.canshuId } - this.echartsData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}`) + this.echartsData.getData(paramsdata,`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.zhiorbuild=='zhi'?this.canshuId:this.lastId}`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) //console.log(this.tabledata) @@ -157,9 +164,9 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit { if((this.echartsData.level=='0'||this.echartsData.level=='1')&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){ //总队和支队跳转 - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'time':'','buildingTpye':option.xAxis.data[xIndex]+this.organizationName,'zhuid':option.xAxis.id[xIndex],'id':this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}}); + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time/three_barDetails'],{queryParams:{'time':'','buildingTpye':option.xAxis.data[xIndex]+this.organizationName,'zhuid':option.xAxis.id[xIndex],'id':this.zhiorbuild=='zhi'?this.canshuId:this.lastId,'type':this.zhiorbuild=='zhi'?'zhi':'build'}}); }else{ - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.echartsData.zuzhiorBuilding=='zhi'?this.canshuId:this.lastId}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.zhiorbuild=='zhi'?this.canshuId:this.lastId}}); } } diff --git a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts index cc0b817..aa44e1f 100644 --- a/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts +++ b/src/app/statistic-analysis/addUnit/add-unit-two-type-statistics/add-unit-two-type-statistics.component.ts @@ -12,10 +12,10 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { constructor(private router: Router,public data:EchartsDataService,private route:ActivatedRoute) { } forward(){ - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':this.headname,'id':this.lastId}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_type'],{queryParams:{'level':this.headname,'id':this.lastId,'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } reverse(){ - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time'],{queryParams:{'level':this.headname,'id':this.lastId}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_time'],{queryParams:{'level':this.headname,'id':this.lastId,'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } url = "/statisticanalysis/addUnit_one/addUnit_two_type" //当前路由地址 setTimeoutObj//延时器需要清除 @@ -23,21 +23,26 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { lastId organizationId=[] buildingTypeId=[] + zhiorbuild ngOnInit(): void { - //this.data.zuzhiorBuilding=="zhi" + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.route.queryParams.subscribe(param=>{ this.headname=param.level this.lastId=param.id + this.zhiorbuild=param.type }); let paramsdata:any = { id:this.lastId, //organizationId:'1' } - this.data.getData(this.data.zuzhiorBuilding=="zhi"?paramsdata:null,this.data.zuzhiorBuilding=="zhi"?`/api/StatisticsAnalysis/Companies/Organizations/${this.lastId}`:`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.lastId}`) + this.data.getData(this.zhiorbuild=="zhi"?paramsdata:null,this.zhiorbuild=="zhi"?`/api/StatisticsAnalysis/Companies/Organizations/${this.lastId}`:`/api/StatisticsAnalysis/Companies/BuildingTypes/${this.lastId}`) this.setTimeoutObj = window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.data.allDate)) //console.log(this.tabledata) - if(this.data.zuzhiorBuilding=="zhi"){ + if(this.zhiorbuild=="zhi"){ for(var i=0;i{ - return this.data.tableTooltip(this.data.zuzhiorBuilding=="zhi"?this.data.buildingType:this.data.tableDataZhi,params.name) + return this.data.tableTooltip(this.zhiorbuild=="zhi"?this.data.buildingType:this.data.tableDataZhi,params.name) }, position: this.data.tableTooltipNoShow2 }, @@ -219,7 +224,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { fontSize:18, color:"#000000" }, - data:this.data.zuzhiorBuilding=="zhi"? this.zhiNameData:this.buildingData + data:this.zhiorbuild=="zhi"? this.zhiNameData:this.buildingData }, series: [ { @@ -238,7 +243,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { } }, }, - data:this.data.zuzhiorBuilding=="zhi"? [ + data:this.zhiorbuild=="zhi"? [ {value: 500, name: this.zhiNameData[0]}, {value: 800, name: this.zhiNameData[1]}, {value: 900, name: this.zhiNameData[2]}, @@ -308,9 +313,9 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { bottom: 30 }, xAxis: { - id:this.data.zuzhiorBuilding=="zhi"?this.buildingTypeId:this.organizationId, + id:this.zhiorbuild=="zhi"?this.buildingTypeId:this.organizationId, type: 'category', - data:this.data.zuzhiorBuilding=="zhi"?this.buildingData: this.zhiNameData, + data:this.zhiorbuild=="zhi"?this.buildingData: this.zhiNameData, axisLabel:{ //this.axisLabel, interval: 0, @@ -335,12 +340,12 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - return this.data.zuzhiorBuilding=="zhi"?this.data.biaogeTishiZhi(params): this.data.biaogeTishida(params) + return this.zhiorbuild=="zhi"?this.data.biaogeTishiZhi(params): this.data.biaogeTishida(params) }, position: this.data.tableTooltipNoShow2 }, series: [{ - data: this.data.zuzhiorBuilding=="zhi"?this.buildnumData: this.zhiNumData, + data: this.zhiorbuild=="zhi"?this.buildnumData: this.zhiNumData, type: 'bar', markPoint: { data: this.tiaoshiPao @@ -357,10 +362,10 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { const pointInPixel= [params.offsetX, params.offsetY]; if (item.echart.containPixel('grid',pointInPixel)){ let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; - if(this.data.zuzhiorBuilding=='zhi'){ + if(this.zhiorbuild=='zhi'){ if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].buildingTypes[xIndex].organizations.length>=1){ //总队，支队跳转 - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex]}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex],'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } else{ this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':this.lastId,'buildid':option.xAxis.id[xIndex]}}); @@ -368,7 +373,7 @@ export class AddUnitTwoTypeStatisticsComponent implements OnInit { }else{ if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){ //总队，支队跳转 - this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex]}}) + this.router.navigate(['/statisticanalysis/addUnit_one/addUnit_two_typeDetails'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'id':this.lastId,'zhuId':option.xAxis.id[xIndex],'type':this.zhiorbuild=='zhi'?'zhi':'build'}}) } else{ this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.lastId}}); diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts index 383c2da..bf99285 100644 --- a/src/app/statistic-analysis/all-plan/all-plan.component.ts +++ b/src/app/statistic-analysis/all-plan/all-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-15 11:32:30 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-22 10:44:47 + * @LastEditTime: 2021-03-25 10:41:45 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -58,7 +58,8 @@ export class AllPlanComponent implements OnInit { } //返回 goBack () { - history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); //this.echartsData.statefulInspectionToggle = true } //获得所有预案 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 d918096..2768d0c 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 @@ -31,6 +31,10 @@ export class BuildingTypeOneComponent implements OnInit { indexData=[]//所有数据 tabledata initCharts(){ + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) //console.log(this.tabledata) for(var i=0;i { this.organizationName = params['organizationName']; this.buildingTypeName = params['buildingTypeName']; @@ -51,8 +57,11 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { } this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhongNumData,this.zhongNameData) this.detailEcharts() + },1000) } + + ngOnDestroy(): void { this.detailPlanEchart.clear() this.detailPlanEchart.dispose() diff --git a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts index 3bead7d..15509a6 100644 --- a/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts +++ b/src/app/statistic-analysis/buildingType/building-type-two-forward/building-type-two-forward.component.ts @@ -33,7 +33,8 @@ export class BuildingTypeTwoForwardComponent implements OnInit { } //返回 goBack () { - history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); this.data.statefulInspectionToggle = true } axisLabel = { 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 c142747..3c59913 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 @@ -21,6 +21,10 @@ export class BuildingTypeTwoReverseComponent implements OnInit { headname//标题 buildId//建筑id ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.route.queryParams.subscribe(param=>{ this.headname=param.level this.buildId=param.id @@ -161,7 +165,8 @@ export class BuildingTypeTwoReverseComponent implements OnInit { //返回 goback(){ - window.history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); } /* 顶部饼状图 */ indexBzt diff --git a/src/app/statistic-analysis/compang-info/compang-info.component.ts b/src/app/statistic-analysis/compang-info/compang-info.component.ts index b68ff07..9f7a586 100644 --- a/src/app/statistic-analysis/compang-info/compang-info.component.ts +++ b/src/app/statistic-analysis/compang-info/compang-info.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-03-05 15:57:08 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-15 14:40:56 + * @LastEditTime: 2021-03-25 10:34:49 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -59,7 +59,8 @@ export class CompangInfoComponent implements OnInit{ } //返回 goBack () { - history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); //this.echartsData.statefulInspectionToggle = true } diff --git a/src/app/statistic-analysis/state/page-one/page-one.component.ts b/src/app/statistic-analysis/state/page-one/page-one.component.ts index cb01654..779b1f1 100644 --- a/src/app/statistic-analysis/state/page-one/page-one.component.ts +++ b/src/app/statistic-analysis/state/page-one/page-one.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-01 15:24:39 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-19 14:06:41 + * @LastEditTime: 2021-03-25 11:17:04 */ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; @@ -23,6 +23,10 @@ export class PageOneComponent implements OnInit { constructor(private router: Router,public echartsData:EchartsDataService) { } ngOnInit() { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.echartsData.getData(null,`/api/StatisticsAnalysis/Plans`) window.setTimeout(()=>{ this.initCharts() diff --git a/src/app/statistic-analysis/state/page-there/page-there.component.ts b/src/app/statistic-analysis/state/page-there/page-there.component.ts index 12fd22c..bd5122a 100644 --- a/src/app/statistic-analysis/state/page-there/page-there.component.ts +++ b/src/app/statistic-analysis/state/page-there/page-there.component.ts @@ -114,6 +114,8 @@ export class PageThereComponent implements OnInit { dateNum = [270, 253, 244, 199, 189, 173, 160, 198,200] //返回 goBack () { + //this.zhutu.clear() + this.zhutu.dispose() history.go(-1) this.echartsData.statefulInspectionToggle = true } @@ -183,9 +185,9 @@ export class PageThereComponent implements OnInit { }, tooltip: { trigger: 'item', - /* formatter: (params)=>{ - return this.echartsData.biaogeTishi(params.name) - }, */ + formatter: (params)=>{ + return this.echartsData.biaogeTishida(params) + }, position: this.echartsData.tableTooltipNoShowq /* backgroundColor:'rgba(255,255,255,1)', borderWidth:'1', diff --git a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts index 61ef7dd..b310fdc 100644 --- a/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts +++ b/src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts @@ -15,6 +15,10 @@ export class PageTwoNameComponent implements OnInit { @ViewChild('zhongDuiChild') zhongDuiChild:PageZhongDuiDetailsComponent; //父组件中获得子组件的引用 ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.route.queryParams.subscribe(param=>{ this.headname=param.level this.type=param.type @@ -142,8 +146,7 @@ export class PageTwoNameComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - /* this.data.biaogeTishiyuan(params) - return this.data.res */ + return this.data.biaogeTishida(params) }, position: this.data.tableTooltipNoShow2 }, diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts index 19bb245..4e1d71e 100644 --- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts +++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts @@ -51,8 +51,11 @@ export class PageTwoTimeComponent implements OnInit { //返回 goBack () { + //this.echartsComponent.twoExample.clear() + //this.echartsComponent.dispose() this.echartsData.statefulInspectionToggle = true - window.history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); } selectType:string = 'month'; //选择当前的 查询类型 按月/年 @@ -165,6 +168,10 @@ export class echartsComponent implements OnInit { this.tiaoshiPao=JSON.parse(arrshuzu) } ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } this.activatedRoute.queryParams.subscribe(param=>{ this.headtext=param.level this.type=param.type diff --git a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts index 1c16967..4b5a37c 100644 --- a/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts +++ b/src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-05 13:50:45 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-16 09:12:53 + * @LastEditTime: 2021-03-25 10:56:10 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; @@ -29,6 +29,10 @@ export class PageZhongDuiDetailsComponent implements OnInit { tabledata organizationId=[] ngOnInit(): void { + if(sessionStorage.getItem('refresh') === 'true') { + sessionStorage.removeItem('refresh'); + location.reload(); + } let level:string; this.route.queryParams.subscribe(param=>{ //this.headtext=param.headtext @@ -60,7 +64,9 @@ export class PageZhongDuiDetailsComponent implements OnInit { } //返回 goBack () { - history.go(-1) + sessionStorage.setItem('refresh', 'true'); + history.go(-1); + //this.echartsData.statefulInspectionToggle = true } detailPlanEchart @@ -105,7 +111,7 @@ export class PageZhongDuiDetailsComponent implements OnInit { tooltip: { trigger: 'item', formatter: (params)=>{ - return this.tableTooltip(params) + return this.data.biaogeTishida(params) } }, series: [{ diff --git a/src/app/working-area/model/axLegend.ts b/src/app/working-area/model/axLegend.ts index f2158ac..a1c8281 100644 --- a/src/app/working-area/model/axLegend.ts +++ b/src/app/working-area/model/axLegend.ts @@ -61,7 +61,7 @@ export class AxLegend extends AxShape { this.removeChildren(); let index = 1; const offset = 25; - let number = this.assetData.PropertyInfos[0].PropertyValue; + let number = Number(this.assetData.PropertyInfos[0].PropertyValue); const width = 300; const height = 50; for (let i = 0; i < number; i++) { diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 60b6c20..157d794 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -166,7 +166,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 重大调整-主版本号增加 * 日期变更-日期版本号增加 */ - public VERSION = '1.4.1.20210303_rc'; + public VERSION = '1.4.2.20210325_rc'; /** * 数据初始化 */ @@ -1180,7 +1180,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV TemplateId: null, FloorId: this.canvasData.selectStorey.id, Angle: 0, - Enabled: null, + Enabled: true, FillMode: null, FireElementId: null, FixedSize: null, @@ -1207,7 +1207,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV PhysicalUnit: '', PropertyName: '列', PropertyType: 2, - PropertyValue: 2, + PropertyValue: '2', }, ], Scale: 1,