diff --git a/src/app/data-collection/fire-force/fire-force.component.html b/src/app/data-collection/fire-force/fire-force.component.html index ef0323f..b20ef31 100644 --- a/src/app/data-collection/fire-force/fire-force.component.html +++ b/src/app/data-collection/fire-force/fire-force.component.html @@ -150,9 +150,9 @@ (审核通过) (审核驳回) - open_in_browser提交审核 + open_in_browser提交审核 撤销审核 - save保存 + save保存 close关闭 diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.html b/src/app/data-collection/linkage-forces/linkage-forces.component.html index 37882f1..9a22f4c 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.html +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.html @@ -125,9 +125,9 @@ (审核通过) (审核驳回) - open_in_browser提交审核 + open_in_browser提交审核 撤销审核 - save保存 + save保存 close关闭 diff --git a/src/app/data-collection/water-collection/water-collection.component.html b/src/app/data-collection/water-collection/water-collection.component.html index f46cd80..143ed99 100644 --- a/src/app/data-collection/water-collection/water-collection.component.html +++ b/src/app/data-collection/water-collection/water-collection.component.html @@ -87,9 +87,9 @@ (审核通过) (审核驳回) - open_in_browser提交审核 + open_in_browser提交审核 撤销审核 - save保存 + save保存 close关闭 diff --git a/src/app/gis-management/fire-facilities/fire-facilities.component.html b/src/app/gis-management/fire-facilities/fire-facilities.component.html index 9623bec..1bc4861 100644 --- a/src/app/gis-management/fire-facilities/fire-facilities.component.html +++ b/src/app/gis-management/fire-facilities/fire-facilities.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-11-23 09:28:54 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-27 16:17:53 + * @LastEditTime: 2021-03-15 16:35:56 -->
@@ -45,9 +45,9 @@

楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}

- + - +
{{header}}{{body[header]? body[header] : '暂无数据'}}{{body[header]? body[header] : '暂无数据'}}
diff --git a/src/app/gis-management/plan-list/plan-list.component.scss b/src/app/gis-management/plan-list/plan-list.component.scss index a1939e9..b346dcf 100644 --- a/src/app/gis-management/plan-list/plan-list.component.scss +++ b/src/app/gis-management/plan-list/plan-list.component.scss @@ -21,11 +21,13 @@ padding: 20px; display: flex; flex-wrap: wrap; - justify-content: space-between; + justify-content: flex-start; .contantitem{ + margin-right: 6px; div{ width: 110px; height: 110px; + img{ width: 100%; height: 100%; diff --git a/src/app/key-unit/basicinfo-look/basicinfo.component.html b/src/app/key-unit/basicinfo-look/basicinfo.component.html index 1d9bfe4..9c17057 100644 --- a/src/app/key-unit/basicinfo-look/basicinfo.component.html +++ b/src/app/key-unit/basicinfo-look/basicinfo.component.html @@ -1,6 +1,6 @@
- + diff --git a/src/app/key-unit/basicinfo/basicinfo.component.html b/src/app/key-unit/basicinfo/basicinfo.component.html index dad7ced..fb514e0 100644 --- a/src/app/key-unit/basicinfo/basicinfo.component.html +++ b/src/app/key-unit/basicinfo/basicinfo.component.html @@ -1,6 +1,6 @@
- + diff --git a/src/app/plan-audit/fire-facilities/fire-facilities.component.html b/src/app/plan-audit/fire-facilities/fire-facilities.component.html index 9623bec..a2aae13 100644 --- a/src/app/plan-audit/fire-facilities/fire-facilities.component.html +++ b/src/app/plan-audit/fire-facilities/fire-facilities.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-11-23 09:28:54 * @LastEditors: sueRimn - * @LastEditTime: 2020-11-27 16:17:53 + * @LastEditTime: 2021-03-15 16:32:59 -->
@@ -45,9 +45,9 @@

楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}

- + - +
{{header}}{{body[header]? body[header] : '暂无数据'}}{{body[header]? body[header] : '暂无数据'}}
diff --git a/src/app/plan-audit/plan-audit-routing.module.ts b/src/app/plan-audit/plan-audit-routing.module.ts index b217fd5..312c7fe 100644 --- a/src/app/plan-audit/plan-audit-routing.module.ts +++ b/src/app/plan-audit/plan-audit-routing.module.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-02-02 15:48:12 + * @LastEditTime: 2021-03-15 15:53:17 */ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -19,7 +19,7 @@ const routes: Routes = [ { path: 'planaudit', component: PlanAuditComponent }, //{ path: 'planpass', component: PlanPassComponent }, { path: 'planrecord', component: PlanRecordComponent },//预案审核记录 - { path: 'waitexamineer', component: WaitExamineerComponent },//预案待审核 + { path: 'waitexamineergis', component: WaitExamineerComponent },//预案待审核 ]; @NgModule({ diff --git a/src/app/plan-audit/plan-list/plan-list.component.ts b/src/app/plan-audit/plan-list/plan-list.component.ts index 8dc7ae8..c8e41b2 100644 --- a/src/app/plan-audit/plan-list/plan-list.component.ts +++ b/src/app/plan-audit/plan-list/plan-list.component.ts @@ -71,7 +71,7 @@ export class PlanListComponent implements OnInit { export class OpenPlanToolDialog { constructor(public http: HttpClient,public snackBar: MatSnackBar,public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data,private render2: Renderer2,public dialog: MatDialog) {} + @Inject(MAT_DIALOG_DATA) public data,private render2: Renderer2,public dialog: MatDialog) {} @ViewChild( 'plan',{static: false} ) plan:any //子组件 @@ -88,7 +88,7 @@ export class OpenPlanToolDialog { buildingIndex: this.data.key, //总平面图/建筑 index storeyId: this.data.select.id } - this.http.get("/api/Buildings",{params:{companyId : sessionStorage.getItem('unitId')} }).subscribe((data:any)=>{ + this.http.get("/api/Buildings",{params:{companyId : sessionStorage.getItem('companyId')} }).subscribe((data:any)=>{ this.plan.allBuildings = data this.plan.seekPanelPoint(parameter) }) 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 6991fe5..34a1613 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -102,7 +102,7 @@ {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? - 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':'消防车辆'}} + 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}} {{item.title}} {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} {{item.verifyOrganizationName}} @@ -162,7 +162,7 @@ -
+
@@ -187,5 +187,17 @@ 查看详情
+ +
+ +
+ +
+ +
+ +
+ +
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 0c950d1..7fc0c71 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -66,12 +66,14 @@ .boxright{ height: 100%; width: 55%; + flex: 1; background-color: #FFFFFF; margin-left: 10px; + display: flex; + flex-direction: column; .word{ width: 100%; height: 100%; - //margin: 10px 10px 0 10px; iframe{ height: 94%; width: 97%; @@ -85,6 +87,12 @@ width: 97%; height: 94%; } + .waterAudit,.fireForceAudit,.LinkageForcesAudit{ + flex: 1; + width: 100%; + height: 100%; + box-sizing: border-box; + } } } th,td{ 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 47b1516..5133df8 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -132,6 +132,10 @@ export class PlanRecordComponent implements OnInit { } //表格点击事件 viewer//全景图对象 + waterData:any//需要传递给子组件的水源信息 + LinkageForceDetailInfo:any//需要传递给子组件的联动力量信息 + fireForceDetailInfo:any//需要传递给子组件的消防力量信息 + postlevel:any tableClick(e,item){ this.showtype = -1 //e.target.parentElement.bgColor='#2196F3' @@ -147,13 +151,31 @@ export class PlanRecordComponent implements OnInit { },0) }else if(item.contentType == 12){ //水源 - this.showtype = 12 + this.http.get(`/api/WaterSources/${item.itemId}`).subscribe((data)=>{ + this.waterData = data + this.showtype = 12 + }) }else if(item.contentType == 13){ //消防力量 - this.showtype = 13 + this.http.get(`/api/CustomFireForce/${item.itemId}`).subscribe((data:any)=>{ + if(data.forceType != 0){//如果是其他消防力量 + this.postlevel = 4 + }else{ + this.postlevel = data.level + } + console.log('xxx',data) + data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null} + this.fireForceDetailInfo = data.fireForceDetailInfo + this.showtype = 13 + }) }else if(item.contentType == 14){ //联动力量 - this.showtype = 14 + this.http.get(`/api/LinkageForces/${item.itemId}`).subscribe((data:any)=>{ + + data.location ? null : data.location={x:null,y:null} + this.LinkageForceDetailInfo = data + this.showtype = 14 + }) }else{ this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{ this.companyId=data.companyId 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 ceca217..e544d3b 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-10 08:36:31 + * @LastEditTime: 2021-03-15 15:51:30 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -28,6 +28,7 @@ export class WaitExamineerComponent implements OnInit { } ngOnInit(): void { + sessionStorage.setItem('gisplan','look') let level = sessionStorage.getItem("level"); if(level == "0"){//如果是总队 this.preparelevels = [ @@ -182,7 +183,7 @@ export class WaitExamineerComponent implements OnInit { }else{ this.postlevel = data.level } - console.log('xxx',this.postlevel) + console.log('xxx',data) data.fireForceDetailInfo.location ? null : data.fireForceDetailInfo.location={x:null,y:null} this.fireForceDetailInfo = data.fireForceDetailInfo this.showtype = 13 @@ -344,98 +345,97 @@ export class WaitExamineerComponent implements OnInit { var agreeList=[] var companyAgreeList=[] const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - console.log(this.shenheTable) - if(this.shenheTable.length==0){ - this.snackBar.open('请勾选要审核的条目!','确定',config); - } - //单个审核 - else if(this.shenheTable.length == 1){ - let isTrue = window.confirm('确定同意选中条目的审核吗？') - if(isTrue){ - //重点单位审核 - if(this.shenheTable[0].contentType == 11){ - let body:any = { - id:this.shenheTable[0].id, - itemId:this.shenheTable[0].itemId, - verifyState:4, - contentType:11, - title:this.shenheTable[0].title+'基本信息' - } - this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ + config.verticalPosition = 'top'; + config.duration = 3000 + console.log(this.shenheTable) + if(this.shenheTable.length==0){ + this.snackBar.open('请勾选要审核的条目!','确定',config); + } + //单个审核 + else if(this.shenheTable.length == 1){ + let isTrue = window.confirm('确定同意选中条目的审核吗？') + if(isTrue){ + //重点单位审核 + if(this.shenheTable[0].contentType == 11){ + let body:any = { + id:this.shenheTable[0].id, + itemId:this.shenheTable[0].itemId, + verifyState:4, + contentType:11, + title:this.shenheTable[0].title+'基本信息' + } + this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){ + console.log(1111,this.shenheTable[0]) + let body:any = { + id:this.shenheTable[0].id, + itemId:this.shenheTable[0].itemId, + verifyState:4, + contentType:this.shenheTable[0].contentType, + title:this.shenheTable[0].title + } + this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.showtype = -1 + this.getAlltabledate() + }) + }else{ + //预案审核 + if(this.shenheTable[0].verifyState==0){ + this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); this.getAlltabledate() }) - }else if(this.shenheTable[0].contentType == 12 || this.shenheTable[0].contentType == 13 || this.shenheTable[0].contentType == 14){ - console.log(1111,this.shenheTable[0]) - let body:any = { - id:this.shenheTable[0].id, - itemId:this.shenheTable[0].itemId, - verifyState:4, - contentType:this.shenheTable[0].contentType, - title:this.shenheTable[0].title - } - this.http.put(`/api/ContentVerifies`,body).subscribe(data=>{ + }else if(this.shenheTable[0].verifyState==3){ + this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); - this.showtype = -1 this.getAlltabledate() }) - }else{ - //预案审核 - if(this.shenheTable[0].verifyState==0){ - this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:16}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.getAlltabledate() - }) - }else if(this.shenheTable[0].verifyState==3){ - this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.getAlltabledate() - }) - } } - this.shenheTable=[] } - + this.shenheTable=[] } - //批量审核 - else{ - let isTrue = window.confirm('确定同意选中条目的审核吗？') - if(isTrue){ - if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位 - for(var i=0;i{ - this.snackBar.open('操作成功!','确定',config); - this.getAlltabledate() - }) - }else{ //批量审核预案 - for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else{ //批量审核预案 + for(var i=0;i{ - this.snackBar.open('操作成功!','确定',config); - this.getAlltabledate() - }) + agreeList.push(cart) } - this.shenheTable=[] + this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) } - + this.shenheTable=[] } - } + } + } //拒绝操作 refuse(){ const config = new MatSnackBarConfig(); 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 c23bacc..cc4d7f7 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 @@ -162,7 +162,7 @@ export class EntryPlanLookComponent implements OnInit { sessionStorage.setItem("editable","0") sessionStorage.setItem("planName",e.name) let companyId = sessionStorage.getItem("companyId") - window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`); + window.open(`/keyUnit/viewunitinfoplan?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`); } if(e.planMode == 3){ //如果是跳转网页 sessionStorage.setItem("url",e.url) @@ -179,7 +179,7 @@ export class EntryPlanLookComponent implements OnInit { sessionStorage.setItem("editable","1") sessionStorage.setItem("planName",e.name) let companyId = sessionStorage.getItem("companyId") - window.open(`/keyUnit/editunitinfo?id=${companyId}`); + window.open(`/keyUnit/editunitinfo?id=${companyId}&orName=${this.route.snapshot.queryParams.orName}&orId=${this.route.snapshot.queryParams.orId}`); } } allPlanComponents:any //所有预案组件 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 d5d4151..e00c887 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -322,7 +322,7 @@ export class EntryPlanComponent implements OnInit { routerTo(element){ this.level=='0'?this.operation=false:true sessionStorage.setItem("companyName",element.company.name) - window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=${this.operation}&pagetype=entryplan&unitName=${element.company.name}&orName=${element.company.organizationName}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}&usci=${element.company.usci}`); + window.open(`/planManagement/entryPlandetail?unitId=${element.company.id}&unitTypeId=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].id}&operation=${this.operation}&pagetype=entryplan&unitName=${element.company.name}&orName=${element.company.organizationName}&orId=${element.company.organizationId}&unitType=${element.company.buildingTypes.length == 0 ? null :element.company.buildingTypes[0].name}&unitAdd=${element.company.address}&usci=${element.company.usci}`); } //查询 onSubmit (value) { 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 b39c046..26632cf 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 @@ -134,13 +134,13 @@ export class AddUnitThreeLineDetailsComponent implements OnInit { //提示框 tooltip: { trigger: 'axis', - formatter: (params)=>{ + /* formatter: (params)=>{ if(params[0].seriesName == "year"){ return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name) }else{ return this.serviceData.tableTooltip(this.serviceData.tableDataZhi,params[0].name) } - }, + }, */ position:this.serviceData.tableTooltipNoShow2 }, // x轴 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 9084779..8e86a3a 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 @@ -340,13 +340,13 @@ export class AddUnitTwoTimeComponent implements OnInit { //提示框 tooltip: { trigger: 'axis', - formatter: (params)=>{ + /* formatter: (params)=>{ if(params[0].seriesName == "year"){ return this.serviceData.tableTooltip(this.serviceData.monthTooltip,params[0].name) }else{ return this.serviceData.tableTooltip(this.serviceData.tableDataZhi,params[0].name) } - }, + }, */ position: this.serviceData.tableTooltipNoShow2 }, // x轴 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 ba4f526..59da13e 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 @@ -151,11 +151,11 @@ export class AddUnitTwoTypeDetailsComponent implements OnInit { const pointInPixel= [params.offsetX, params.offsetY]; if (this.detailPlanEchart.containPixel('grid',pointInPixel)){ let xIndex=this.detailPlanEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; - if(this.echartsData.level=='0'||this.echartsData.level=='1'){ + 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.canshuId}}); + 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}}); }else{ - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex]}}); } } diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.html b/src/app/statistic-analysis/all-plan/all-plan.component.html new file mode 100644 index 0000000..c60fb08 --- /dev/null +++ b/src/app/statistic-analysis/all-plan/all-plan.component.html @@ -0,0 +1,54 @@ + +
+
+
+ +
+
+
+ {{titlename}} +
+
+ + + + + + + + + + + + + + + + + + + + + + + +
名称{{element.name}}修改时间{{element.modifiedTime|date:'yyyy-MM-dd'}}消防救援站{{element.organizationName}}类型{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}操作 + 详情 +
+ + + + +
+
+ diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.scss b/src/app/statistic-analysis/all-plan/all-plan.component.scss new file mode 100644 index 0000000..dceb5cf --- /dev/null +++ b/src/app/statistic-analysis/all-plan/all-plan.component.scss @@ -0,0 +1,73 @@ +.body{ + display: flex; + flex-direction: column; + .topbox{ + width: 100%; + height: 80px; + min-height: 80px; + border-bottom: 1px gray solid; + .btnbox{ + display: flex; + flex-direction:row-reverse; + float: right; + justify-content: center; + align-items: center; + height: 100%; + button{ + width: 88px; + height: 36px; + } + margin-right:4%; + + } + } + .title{ + width: 100%; + text-align: center; + margin-top: 2%; + span{ + text-align: center; + font-size: 28px; + } + } + .buttonbox{ + padding-left: 50px; + button{ + margin:0 10px + } + } + .tablebox{ + width: 100%; + text-align: center; + table{ + width: 50%; + text-align: center; + margin-left: 25%; + margin-top:20px; + th,td{ + text-align: center; + font-size: 15px; + color: #000000; + } + } + mat-paginator{ + width: 100%; + margin-left: 0%; + } + .mat-column-unitname{ + width: 15%; + } + .mat-column-integrity{ + width: 13%; + } + .mat-column-operation{ + width: 5%; + } + .mat-column-jurisdictionsquadron{ + width: 10%; + } + span:hover{ + text-decoration:underline + } + } +} \ No newline at end of file diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.spec.ts b/src/app/statistic-analysis/all-plan/all-plan.component.spec.ts new file mode 100644 index 0000000..d383a7d --- /dev/null +++ b/src/app/statistic-analysis/all-plan/all-plan.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { AllPlanComponent } from './all-plan.component'; + +describe('AllPlanComponent', () => { + let component: AllPlanComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ AllPlanComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(AllPlanComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/statistic-analysis/all-plan/all-plan.component.ts b/src/app/statistic-analysis/all-plan/all-plan.component.ts new file mode 100644 index 0000000..89f0fe4 --- /dev/null +++ b/src/app/statistic-analysis/all-plan/all-plan.component.ts @@ -0,0 +1,63 @@ +/* + * @Descripttion: + * @version: + * @Author: sueRimn + * @Date: 2021-03-15 11:32:30 + * @LastEditors: sueRimn + * @LastEditTime: 2021-03-15 13:51:48 + */ +import { Component, OnInit, ViewChild, Inject } from '@angular/core'; +import { HttpClient } from '@angular/common/http' +import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; +import { MatPaginator } from '@angular/material/paginator'; +import { FlatTreeControl } from '@angular/cdk/tree'; +import { FormControl } from '@angular/forms'; +import { Router,ActivatedRoute } from '@angular/router' +import { PageEvent } from '@angular/material/paginator'; +import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { TreeService } from '../../http-interceptors/tree.service' +import { MatTableDataSource } from '@angular/material/table'; +declare var CryptoJS + +@Component({ + selector: 'app-all-plan', + templateUrl: './all-plan.component.html', + styleUrls: ['./all-plan.component.scss'] +}) +export class AllPlanComponent implements OnInit { + + constructor(private http: HttpClient,public snackBar: MatSnackBar,public route: ActivatedRoute,private router: Router) { } + + ngOnInit(): void { + this.route.queryParams.subscribe(params => { + this.titlename = params['name']; + this.type = params['type']; + this.jsId=params['jsid'] + }); + } + displayedColumns: string[] = ['unitname','modifiedTime','organizationName','buildingTypes','operation']; + tabledataSource + titlename //上个页面传过来的名称 + type //上个页面传过来:1重点单位 2预案 + jsId //组织机构id + //分页 + @ViewChild(MatPaginator, {static: true}) + pageEvent: PageEvent; + paginator: MatPaginator; + length:any; //共多少条数据 + pageSize:any; //每页条数 + pageSizeOptions: number[] = [10] //设置每页条数 + PageNumber:any; //第几页 + //分页事件 + changePage(e){ + this.PageNumber = e.pageIndex+1 + //this.getAlltabledate() + } + //返回 + goBack () { + 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 1145a2f..4c88ae9 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 @@ -104,7 +104,7 @@ export class BuildingTypeOneComponent implements OnInit { this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_two_reverse'],{queryParams:{'level':params.name,'id':params.data.id}}); }else if(this.echartsData.level=='3'){ //中队跳转 - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'buildid':params.id}}); } }); 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 24a98d4..6edb22d 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 @@ -173,7 +173,6 @@ export class BuildingTypeThreeDetailsComponent implements OnInit { this.tiao=true } else{ - console.log(option.series[0].id) this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex]}}); } 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 4cbd064..092d9a5 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 @@ -321,12 +321,12 @@ export class BuildingTypeTwoReverseComponent implements OnInit { if (item.echart.containPixel('grid',pointInPixel)) { let xIndex=item.echart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; /*事件处理代码书写位置*/ - if(this.data.level=='0'||this.data.level=='1'){ + if((this.data.level=='0'||this.data.level=='1')&&this.tabledata[0].organizations[xIndex].subOrganizations.length>=1){ //总队，支队跳转 this.router.navigate(['/statisticanalysis/buildingType_one/buildingType_three_details'],{queryParams:{'organizationName':option.xAxis.data[xIndex],'buildingTypeName':this.headname,'buildId':this.buildId,'organizationId':option.xAxis.id[xIndex]}}) } else{ - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':option.xAxis.data[xIndex],'type':1,'jsid':option.xAxis.id[xIndex],'buildid':this.buildId}}); } //this.router.navigate(['/statisticanalysis/delete_one/delete_four'],{queryParams:{'level':this.option.xAxis.data[xIndex]+headName}}); } 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 fe03854..b68ff07 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-12 10:05:29 + * @LastEditTime: 2021-03-15 14:40:56 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -34,6 +34,7 @@ export class CompangInfoComponent implements OnInit{ this.titlename = params['name']; this.type = params['type']; this.jsId=params['jsid'] + this.BuildingTypeId=params['buildid'] }); this.getAlltabledate() } @@ -42,6 +43,7 @@ export class CompangInfoComponent implements OnInit{ titlename //上个页面传过来的名称 type //上个页面传过来:1重点单位 2预案 jsId //组织机构id + BuildingTypeId//建筑类型id //分页 @ViewChild(MatPaginator, {static: true}) pageEvent: PageEvent; @@ -67,6 +69,7 @@ export class CompangInfoComponent implements OnInit{ //重点单位 let paramsdata:any = { OrganizationId: this.jsId || '', + BuildingTypeId:this.BuildingTypeId|| '', PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], IntegrityScoreMin:0, diff --git a/src/app/statistic-analysis/echarts-data.service.ts b/src/app/statistic-analysis/echarts-data.service.ts index 2119436..87b7d79 100644 --- a/src/app/statistic-analysis/echarts-data.service.ts +++ b/src/app/statistic-analysis/echarts-data.service.ts @@ -486,24 +486,66 @@ export class EchartsDataService { apidata=[] biaogeTishiyuan(datas){ //localStorage.setItem('tishi',this.tishiData) + console.log(datas) let paramdata={ planStatus:datas.type } - if(localStorage.getItem('tishi')==undefined){ - this.http.get(`/api/StatisticsAnalysis/Plans/Status`).subscribe((data:any)=>{ - this.tishiData=data.organizations - localStorage.setItem('tishi',JSON.stringify(this.tishiData)) - }) + if(datas.name=='预案新增'){ + this.localData='' + if(localStorage.getItem('addtishi')==undefined){ + this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{ + this.tishiData=data.organizations + localStorage.setItem('addtishi',JSON.stringify(this.tishiData)) + }) + } + this.localData=localStorage.getItem('addtishi') + }else if(datas.name=='预案审核中'){ + this.localData='' + if(localStorage.getItem('shenheingtishi')==undefined){ + this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{ + this.tishiData=data.organizations + localStorage.setItem('shenheingtishi',JSON.stringify(this.tishiData)) + }) + } + this.localData=localStorage.getItem('shenheingtishi') + }else if(datas.name=='预案审核退回'){ + this.localData='' + if(localStorage.getItem('shenhetuitishi')==undefined){ + this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{ + this.tishiData=data.organizations + localStorage.setItem('shenhetuitishi',JSON.stringify(this.tishiData)) + }) + } + this.localData=localStorage.getItem('shenhetuitishi') + }else if(datas.name='预案审核通过'){ + this.localData='' + if(localStorage.getItem('yuansuccesstishi')==undefined){ + this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{ + this.tishiData=data.organizations + localStorage.setItem('yuansuccesstishi',JSON.stringify(this.tishiData)) + }) + } + this.localData=localStorage.getItem('yuansuccesstishi') + }else{ + this.localData='' + if(localStorage.getItem('yuanbiantishi')==undefined){ + this.http.get(`/api/StatisticsAnalysis/Plans/Status`,{params:paramdata}).subscribe((data:any)=>{ + this.tishiData=data.organizations + localStorage.setItem('yuanbiantishi',JSON.stringify(this.tishiData)) + }) + } + this.localData=localStorage.getItem('yuanbiantishi') } - this.localData=localStorage.getItem('tishi') - - /* window.setTimeout(()=>{ + + console.log(JSON.parse(this.localData) ) + this.localData=JSON.parse(this.localData) + window.setTimeout(()=>{ var countall=0//总计 var countbi=0//站比 var allCountbi=0//总站比 - for(var i=0;i
' this.res+='
'; @@ -513,19 +555,19 @@ export class EchartsDataService { this.res+='' this.res+='' this.res+=''; - for(var i=0;i' - this.res+='' + this.res+='' + this.res+='' this.res+='' } this.res+='' this.res+='' this.res+='
总占比
'+this.tishiData[i].count+''+this.localData[i].organizationName+''+this.localData[i].count+''+countbi+'%
总计'+countall+''+allCountbi.toFixed(2)+'%
' return this.res - },1000) */ + },1000) } 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 e6285d0..7897d67 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-12 16:25:28 + * @LastEditTime: 2021-03-15 11:19:36 */ import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; 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 3ee366c..a17b0f7 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 @@ -24,6 +24,7 @@ export class PageThereComponent implements OnInit { type tabledata organizationId=[] + lastid ngOnDestroy():void{ this.zhutu.clear() @@ -35,6 +36,7 @@ export class PageThereComponent implements OnInit { let datayuex:string; let headName:string; this.activatedRoute.queryParams.subscribe(param=>{ + this.lastid=param.id this.type=param.type this.headtext=param.headtext datayuex=param.level @@ -44,17 +46,17 @@ export class PageThereComponent implements OnInit { }); let paramdata={ planStatus:this.type, - TrendType:this.echartsData.selectType + OrganizationId:this.lastid } - this.echartsData.getData(paramdata,`/api/StatisticsAnalysis`) + this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Plans/Status`) window.setTimeout(()=>{ this.tabledata=JSON.parse(JSON.stringify(this.echartsData.allDate)) console.log(this.tabledata) - for(var i=0;i{ - return this.data.biaogeTishi(params.name) + /* this.data.biaogeTishiyuan(params) + return this.data.res */ }, position: this.data.tableTooltipNoShow2 }, @@ -166,9 +167,9 @@ export class PageTwoNameComponent implements OnInit { let xIndex=this.addEchart.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0]; /*事件处理代码书写位置*/ if(this.data.level=='0'||this.data.level=='1'){ - this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':_this.headname,'id':option.xAxis.id[xIndex],'type':this.type}}); + this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':_this.headname,'id':option.xAxis.id[xIndex],'type':this.type}}); }else{ - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1,'jsid':option.xAxis.id[xIndex]}}); } } 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 acd17d0..ee14fcf 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 @@ -347,7 +347,7 @@ export class echartsComponent implements OnInit { this.router.navigate(['/statisticanalysis/stataPageThere'],{queryParams:{'level':option.xAxis.data[xIndex],'headtext':this.headtext,'type':this.type}}); } else if(this.echartsData.level=='3'){ //中队跳转 - this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}}); + this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'type':1}}); } } 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 da1545a..b36f5ba 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-12 16:08:24 + * @LastEditTime: 2021-03-15 14:17:36 */ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; @@ -31,9 +31,9 @@ export class PageZhongDuiDetailsComponent implements OnInit { ngOnInit(): void { let level:string; this.route.queryParams.subscribe(param=>{ - this.headtext=param.headtext + //this.headtext=param.headtext level=param.level - this.headName=level+''+this.headtext; + this.headName=level; this.type=param.type this.lastid=param.id }); diff --git a/src/app/statistic-analysis/statistic-analysis-routing.module.ts b/src/app/statistic-analysis/statistic-analysis-routing.module.ts index ed3ef96..4a7a690 100644 --- a/src/app/statistic-analysis/statistic-analysis-routing.module.ts +++ b/src/app/statistic-analysis/statistic-analysis-routing.module.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-09-02 16:57:00 * @LastEditors: sueRimn - * @LastEditTime: 2021-03-06 09:50:16 + * @LastEditTime: 2021-03-15 14:04:09 */ import { Component, NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -34,6 +34,7 @@ import { AddUnitThreeBarDetailsComponent } from './addUnit/add-unit-three-bar-de import { HomeComponent } from './home/home.component'; import { yueDateComponent }from './scheduled-updates/scheduled-updates.component' import { CompangInfoComponent }from './compang-info/compang-info.component' +import { AllPlanComponent } from './all-plan/all-plan.component' import { from } from 'rxjs'; @@ -67,7 +68,8 @@ const routes: Routes = [ { path: 'scheduledUpdates/yueDate', component: yueDateComponent}, { path: 'scheduledUpdates/PublicEcharts', component: publicEchartsComponent}, { path: 'home', component: HomeComponent}, - { path: 'CompangInfo',component:CompangInfoComponent} + { path: 'CompangInfo',component:CompangInfoComponent}, + { path:'AllPlan',component:AllPlanComponent} ]; @NgModule({ diff --git a/src/app/statistic-analysis/statistic-analysis.module.ts b/src/app/statistic-analysis/statistic-analysis.module.ts index b8229e8..02981c7 100644 --- a/src/app/statistic-analysis/statistic-analysis.module.ts +++ b/src/app/statistic-analysis/statistic-analysis.module.ts @@ -69,11 +69,12 @@ import { PageThereComponent } from './state/page-there/page-there.component'; import { PageThereYearComponent } from './state/page-there-year/page-there-year.component'; import { DeleteTwoNewaddComponent } from './deleteUnit/delete-two-newadd/delete-two-newadd.component'; import { CompangInfoComponent } from './compang-info/compang-info.component'; +import { AllPlanComponent } from './all-plan/all-plan.component'; @NgModule({ - declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,yuebuildingDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent, CompangInfoComponent], + declarations: [PageOneComponent, PageTwoTimeComponent, PageTwoNameComponent, PageZhongDuiDetailsComponent,echartsComponent, DeleteOneComponent, DeleteTwoComponent, DeleteThereComponent, DeleteFourComponent, BuildingTypeOneComponent, ScheduledUpdatesComponent,publicEchartsComponent,verifiedComponent,notVerifiedComponent,detailedInformationComponent,moreTableComponent,yueDateComponent,yuebuildingDateComponent,indexConditionComponent, BuildingTypeTwoForwardComponent, BuildingTypeTwoReverseComponent, BuildingTypeThreeDetailsComponent, AddUnitOneComponent, AddUnitTwoTypeStatisticsComponent, AddUnitTwoTypeDetailsComponent, AddUnitTwoTimeComponent,AddUnitThreeLineDetailsComponent,AddUnitThreeBarDetailsComponent, HomeComponent, DeleteThereLineDetailsComponent, PageThereComponent, PageThereYearComponent, DeleteTwoNewaddComponent, CompangInfoComponent, AllPlanComponent], imports: [ CommonModule, StatisticAnalysisRoutingModule, diff --git a/src/app/ui/collection-tools-building/collection-tools.component.html b/src/app/ui/collection-tools-building/collection-tools.component.html index 8b7ff63..c7d7708 100644 --- a/src/app/ui/collection-tools-building/collection-tools.component.html +++ b/src/app/ui/collection-tools-building/collection-tools.component.html @@ -185,9 +185,9 @@

宽度(像素)

- +

高度(像素)

- +

角度

{ if(item.id == node.id){ item.isLook = !item.isLook } diff --git a/src/app/ui/collection-tools-plan/collection-tools.component.ts b/src/app/ui/collection-tools-plan/collection-tools.component.ts index 27792a0..05e59e8 100644 --- a/src/app/ui/collection-tools-plan/collection-tools.component.ts +++ b/src/app/ui/collection-tools-plan/collection-tools.component.ts @@ -687,7 +687,7 @@ export class CollectionToolsPlanComponent implements OnInit { } //gis模块平面图 - if(this.router.url.indexOf("gis") != -1 && sessionStorage.getItem("gisplan") == "look"){ + if((this.router.url.indexOf("gis") != -1 || this.router.url.indexOf("waitexamineergis") != -1) && sessionStorage.getItem("gisplan") == "look"){ this.isEditPattern = false this.isediticon = false this.canvasData.gameMode = GameMode.Assignment diff --git a/src/app/ui/collection-tools/changeOr.html b/src/app/ui/collection-tools/changeOr.html new file mode 100644 index 0000000..9a92ebc --- /dev/null +++ b/src/app/ui/collection-tools/changeOr.html @@ -0,0 +1,31 @@ +
+
+ + + + {{node.name}} + + + + + + {{node.name}} + + +
+ +
+ + +
+
diff --git a/src/app/ui/collection-tools/collection-tools.component.html b/src/app/ui/collection-tools/collection-tools.component.html index 9d261ba..4b65115 100644 --- a/src/app/ui/collection-tools/collection-tools.component.html +++ b/src/app/ui/collection-tools/collection-tools.component.html @@ -308,17 +308,26 @@
-
+

{{item.PropertyName}}({{item.PhysicalUnit}})

+
+

{{item.PropertyName}}({{item.PhysicalUnit}})

+
+ +
+ 更换 +
+
+
-
+

{{item.PropertyName}}({{item.PhysicalUnit}})

-
+

{{item.PropertyName}}({{item.PhysicalUnit}})

diff --git a/src/app/ui/collection-tools/collection-tools.component.scss b/src/app/ui/collection-tools/collection-tools.component.scss index 8da000d..2ca8282 100644 --- a/src/app/ui/collection-tools/collection-tools.component.scss +++ b/src/app/ui/collection-tools/collection-tools.component.scss @@ -285,7 +285,7 @@ .smallinput{ display: block; width: 19%; - margin-left: 8px; + margin-left: 12px; } .textarea{ display: block; @@ -400,7 +400,7 @@ div:focus { width: 18px; height: 18px; vertical-align: middle; - margin-left: 9px; + margin-left: 12px; margin-right: 3px; } @@ -506,4 +506,33 @@ div:focus { border-radius: 0px; } } +} + +//人或车所属单位输入框 +.orInput{ + position: relative; + .changeOr{ + position: absolute; + right: 14px; + font-size: 12px; + bottom: 2px; + border-radius: 3px; + background: #279FFF; + color: white; + padding: 1px 4px; + cursor: pointer; + } +} +.orBox{ + width: 500px; + height: 600px; + .treebox{ + width: 100%; + height: 552px; + overflow-y: auto; + } + .selectedNode{ + background-color: #6BC2FF; + color: #fff; + } } \ No newline at end of file diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 328f1ae..641f566 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -2,11 +2,11 @@ import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContaine import { HttpClient, HttpHeaders } from '@angular/common/http'; import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import {leftFunctionalDomainComponent,editPlaneFigureComponent,editDisposalNodeComponent,addDisposalNodeComponent, addBGCDisposalNodeComponent} from './leftFunctionalDomain' +import {leftFunctionalDomainComponent,editPlaneFigureComponent,editDisposalNodeComponent,addDisposalNodeComponent, addBGCDisposalNodeComponent} from './leftFunctionalDomain'; import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; import {FlatTreeControl} from '@angular/cdk/tree'; -import {WorkingAreaComponent} from '../../working-area/working-area.component' -import {CanvasShareDataService, DisposalNodeData} from '../../canvas-share-data.service' //引入服务 +import {WorkingAreaComponent} from '../../working-area/working-area.component'; +import {CanvasShareDataService, DisposalNodeData} from '../../canvas-share-data.service'; //引入服务 import Viewer from 'viewerjs'; import Swiper from 'swiper'; import { saveOneDialog } from './save'; @@ -17,6 +17,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { MaskLayerService } from 'src/app/mask-layer.service'; import * as ObjectID from 'bson-objectid'; import { AxMessageSystem } from 'src/app/working-area/model/axMessageSystem'; +import { TreeService } from 'src/app/http-interceptors/tree.service'; @Component({ selector: 'app-collection-tools', templateUrl: './collection-tools.component.html', @@ -119,6 +120,12 @@ export class CollectionToolsComponent implements OnInit { if(item.PropertyType == 4){//图片数值上线 this.imagesArrNum = item.PropertyValue } + if(item.PropertyName == '所属单位'){ + if(!item.PropertyValue){ + item.PropertyValue = this.organizationName + item.Tag = this.organizationId + } + } }) //如果存在图片则加载轮播图 @@ -147,9 +154,24 @@ export class CollectionToolsComponent implements OnInit { this.isImgNumCss = false } } - pattern:boolean = false//默认为基本信息编辑 - + //人或车选择所属单位 + changeOr(){ + let dialogRef = this.dialog.open(Organization); + dialogRef.afterClosed().subscribe(data=>{ + if(data && data.name){ + this.PropertyInfos.forEach(item => { + if(item.PropertyName == '所属单位'){ + item.PropertyValue = data.name + item.Tag = data.id + } + }) + } + }); + } + + + pattern:boolean = false//默认为基本信息编辑 //基本信息编辑模式 baseInfo(){ if (!this.pattern) { @@ -476,14 +498,6 @@ export class CollectionToolsComponent implements OnInit { this.canvas.refreshIcon(this.canvasAssetObj.Id) } - //查看图片详情 - lookImg(){ - const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - data: {imagesArr:this.imagesArr,index:this.clickedIndex} - }); - dialogRef.afterClosed().subscribe(data=>{ }); - } - //上传素材图片 selectFile(e){ let imgFile = e.target.files[0] || null //上传的文件 @@ -639,11 +653,11 @@ export class CollectionToolsComponent implements OnInit { }//多个素材共同属性 multipleAssetData:any//当前多选的素材 firstMultipleAssetData:any//当前多选的第一个素材 + organizationName:any = this.route.snapshot.queryParams.orName//当前预案单位所属机构名称 + organizationId:any = this.route.snapshot.queryParams.orId//当前预案单位所属机构名称 ngOnInit(): void { - this.canvasData.isInheritSky = { weather:'', airTemperature:'', windDirection:'', windScale:'', }; //缓存 节点 天气 AxMessageSystem.addListener('selectionChanged', ()=>{ - if(this.canvas.selection.size() == 1){//如果是单选 this.isMultipleAsset = false // console.log('单选',this.canvas.selection.first().assetData) @@ -2668,50 +2682,47 @@ export class EditBuilding { } } -//查看图片大图 +//选择所属单位 @Component({ - selector: 'viewdetails', - templateUrl: './viewdetails.html', + selector: 'app-organization', + templateUrl: './changeOr.html', styleUrls: ['./collection-tools.component.scss'] }) -export class ViewDetails { - // myControl = new FormControl(); - //注入MatDialogRef，可以用来关闭对话框 - //要访问对话框组件中的数据，必须使用MAT_DIALOG_DATA注入令牌 - constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,private element: ElementRef) {} - imagesArr = this.data.imagesArr - onNoClick(): void { - this.dialogRef.close(); +export class Organization { + + constructor(private tree:TreeService,private http:HttpClient,public dialog: MatDialog,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) { } + + private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数 + return { + expandable: !!node.children && node.children.length > 0, + name: node.name, + level: level, + id: node.id, + }; } + treeControl = new FlatTreeControl(node => node.level, node => node.expandable); + treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); + dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); + hasChild = (_: number, node: any) => node.expandable; ngOnInit(): void { - setTimeout(() => { - var mySwiper = new Swiper('.swiper-container',{ - loop: false, - initialSlide :this.data.index,//默认索引 - // 如果需要前进后退按钮 - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev', - } - //其他设置 - }); - }, 0); - } - closeDialog(){ - this.dialogRef.close(); + this.getAllOrganization() + } + selectedNodeId:any + selectedNodeName:any + selectedNode(node){ + this.selectedNodeId = node.id + this.selectedNodeName = node.name + } + getAllOrganization(){ + this.http.get('/api/Organizations').subscribe(data => { + this.dataSource.data = this.tree.toTree(data); + this.treeControl.expand(this.treeControl.dataNodes[0]); + }) } - count = 10 - zoomimg(e) { - if(this.count != 1 || e.wheelDelta >= 120){ - if(e.wheelDelta >= 120){ - this.count++ - }else{ - this.count-- - } - } - e.srcElement.style.zoom = this.count + '0%' - e.srcElement.style.maxWidth = null - e.srcElement.style.maxHeight = null + ok(){ + this.dialogRef.close({ + id:this.selectedNodeId, + name:this.selectedNodeName + }) } - -} +} \ No newline at end of file diff --git a/src/app/ui/collection-tools/viewdetails.html b/src/app/ui/collection-tools/viewdetails.html deleted file mode 100644 index 76638c2..0000000 --- a/src/app/ui/collection-tools/viewdetails.html +++ /dev/null @@ -1,24 +0,0 @@ -
-
- clear -
- -
-
- -
-
- -
-
-
\ No newline at end of file diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index c3c5fcd..81d6c1c 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -76,7 +76,7 @@ import { EditGroup } from './unit-information/editgroup.component'; import { EnterpriseuserComponent,seeenterpriseuser,editenterpriseuser } from './enterpriseuser/enterpriseuser.component'; import { AddEnterpriserUser } from './enterpriseuser/addenterpriseuser.component'; import { FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent } from './fire-fighting-facilities-formwork/fire-fighting-facilities-formwork.component'; -import { CollectionToolsComponent, CreateBuilding, EditBuilding, ViewDetails } from './collection-tools/collection-tools.component'; +import { CollectionToolsComponent, CreateBuilding, EditBuilding, Organization } from './collection-tools/collection-tools.component'; import { WorkingAreaComponent } from '../working-area/working-area.component'; import {leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,addBGCDisposalNodeComponent} from './collection-tools/leftFunctionalDomain' import { saveOneDialog, saveTwoDialog } from './collection-tools/save'; @@ -85,7 +85,7 @@ import { editPlaneFigureComponentPlan, leftFunctionalDomainComponentPlan } from import {CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding} from './collection-tools-building/collection-tools.component' import {leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent} from './collection-tools-building/leftFunctionalDomain' @NgModule({ - declarations: [UiComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,ViewDetails,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent], + declarations: [UiComponent, UserdataComponent, ChangepasswordComponent, OrganizationComponent, UnittypeComponent, AuthorityComponent, RoleComponent, UsermanagementComponent,IsnoPipe,ConfirmpswDirective,DialogOverviewExampleDialog,CreateAuthority,CreateRole,TimePipe,CreateNewUser,EditNewUser,allRoles,EditRole,CreateOrganization,EditOrganization,seeInformation,EditUser,editorialUnit,FireProtectionElementsComponent,Establish,EditingFireControl,FireFightingTemplateComponent, NavmenusComponent,CreateMenus,EditMenus,NewFireFighting,EditFireClassification, MaterialBankComponent, UnitInformationComponent,AddMatLibrary,EditMatLibrary,attributeComponent,AddOriginalCopy,addAttributeComponent,editAttribute,EditOriginalCopy,SelectOriginalCopy,EditUnitInfo,AddUnitInfo,AddGroups,EditGroup, EnterpriseuserComponent,AddEnterpriserUser,addUnitAttributeComponent,editUnitAttribute,seeenterpriseuser,editenterpriseuser, FireFightingFacilitiesFormworkComponent,addFireFightingFacilitiesFormworkComponent,editFireFightingFacilitiesFormworkComponent,addBuiltInComponent,addBuiltInAttributeComponent,addOptionalComponent,addOptionalAttributeComponent,editBuiltInAttributeComponent,editOptionalAttributeComponent, CollectionToolsComponent,WorkingAreaComponent,CreateBuilding,EditBuilding,leftFunctionalDomainComponent,editPlaneFigureComponent,saveOneDialog,saveTwoDialog,addDisposalNodeComponent,editDisposalNodeComponent,CollectionToolsPlanComponent,CreateBuildingPlan,EditBuildingPlan,leftFunctionalDomainComponentPlan,editPlaneFigureComponentPlan,addOffices,editOffices,addBGCDisposalNodeComponent,CollectionToolsBuildingComponent,CreateBuildingBuilding,EditBuildingBuilding,leftFunctionalDomainBuildingComponent,editPlaneFigureBuildingComponent,Organization], imports: [ CommonModule, diff --git a/src/styles.scss b/src/styles.scss index 1c8dd97..91fa3f2 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -206,4 +206,9 @@ table td.mat-footer-cell:last-of-type{ .clusterImgCollection{ width:30px; height:30px; +} +#unitBasicInfo{ + .mat-expansion-indicator::after{ + color: black; + } } \ No newline at end of file