陈鹏飞 4 years ago
parent
commit
13fde86963
  1. 4
      src/app/data-collection/fire-force/fire-force.component.html
  2. 4
      src/app/data-collection/linkage-forces/linkage-forces.component.html
  3. 4
      src/app/data-collection/water-collection/water-collection.component.html
  4. 6
      src/app/gis-management/fire-facilities/fire-facilities.component.html
  5. 4
      src/app/gis-management/plan-list/plan-list.component.scss
  6. 2
      src/app/key-unit/basicinfo-look/basicinfo.component.html
  7. 2
      src/app/key-unit/basicinfo/basicinfo.component.html
  8. 6
      src/app/plan-audit/fire-facilities/fire-facilities.component.html
  9. 4
      src/app/plan-audit/plan-audit-routing.module.ts
  10. 4
      src/app/plan-audit/plan-list/plan-list.component.ts
  11. 16
      src/app/plan-audit/plan-record/plan-record.component.html
  12. 10
      src/app/plan-audit/plan-record/plan-record.component.scss
  13. 28
      src/app/plan-audit/plan-record/plan-record.component.ts
  14. 158
      src/app/plan-audit/wait-examineer/wait-examineer.component.ts
  15. 4
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
  16. 2
      src/app/plan-management/entry-plan/entry-plan.component.ts
  17. 4
      src/app/statistic-analysis/addUnit/add-unit-three-line-details/add-unit-three-line-details.component.ts
  18. 4
      src/app/statistic-analysis/addUnit/add-unit-two-time/add-unit-two-time.component.ts
  19. 6
      src/app/statistic-analysis/addUnit/add-unit-two-type-details/add-unit-two-type-details.component.ts
  20. 54
      src/app/statistic-analysis/all-plan/all-plan.component.html
  21. 73
      src/app/statistic-analysis/all-plan/all-plan.component.scss
  22. 25
      src/app/statistic-analysis/all-plan/all-plan.component.spec.ts
  23. 63
      src/app/statistic-analysis/all-plan/all-plan.component.ts
  24. 2
      src/app/statistic-analysis/buildingType/building-type-one/building-type-one.component.ts
  25. 1
      src/app/statistic-analysis/buildingType/building-type-three-details/building-type-three-details.component.ts
  26. 4
      src/app/statistic-analysis/buildingType/building-type-two-reverse/building-type-two-reverse.component.ts
  27. 5
      src/app/statistic-analysis/compang-info/compang-info.component.ts
  28. 72
      src/app/statistic-analysis/echarts-data.service.ts
  29. 2
      src/app/statistic-analysis/state/page-one/page-one.component.ts
  30. 26
      src/app/statistic-analysis/state/page-there/page-there.component.ts
  31. 7
      src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts
  32. 2
      src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts
  33. 6
      src/app/statistic-analysis/state/page-zhong-dui-details/page-zhong-dui-details.component.ts
  34. 6
      src/app/statistic-analysis/statistic-analysis-routing.module.ts
  35. 3
      src/app/statistic-analysis/statistic-analysis.module.ts
  36. 4
      src/app/ui/collection-tools-building/collection-tools.component.html
  37. 1
      src/app/ui/collection-tools-building/collection-tools.component.ts
  38. 2
      src/app/ui/collection-tools-plan/collection-tools.component.ts
  39. 31
      src/app/ui/collection-tools/changeOr.html
  40. 15
      src/app/ui/collection-tools/collection-tools.component.html
  41. 33
      src/app/ui/collection-tools/collection-tools.component.scss
  42. 121
      src/app/ui/collection-tools/collection-tools.component.ts
  43. 24
      src/app/ui/collection-tools/viewdetails.html
  44. 4
      src/app/ui/ui.module.ts
  45. 5
      src/styles.scss

4
src/app/data-collection/fire-force/fire-force.component.html

@ -150,9 +150,9 @@
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="submitAudit" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5 || selectedFireForce.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="selectedFireForce.contentVerify && selectedFireForce.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>
<span class="save state" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="save state" *ngIf="!selectedFireForce.contentVerify || selectedFireForce.contentVerify.verifyState == 5 || selectedFireForce.contentVerify.verifyState == 4" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="close" (click)="close()"><mat-icon>close</mat-icon>关闭</span>
</div>
</div>

4
src/app/data-collection/linkage-forces/linkage-forces.component.html

@ -125,9 +125,9 @@
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="submitAudit" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5 || LinkageForceDetailInfo.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="LinkageForceDetailInfo.contentVerify && LinkageForceDetailInfo.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>
<span class="save state" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="save state" *ngIf="!LinkageForceDetailInfo.contentVerify || LinkageForceDetailInfo.contentVerify.verifyState == 5 || LinkageForceDetailInfo.contentVerify.verifyState == 4" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="close" (click)="close()"><mat-icon>close</mat-icon>关闭</span>
</div>
</div>

4
src/app/data-collection/water-collection/water-collection.component.html

@ -87,9 +87,9 @@
<span class="state" style="color: rgb(92, 214, 78);" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 4">(审核通过)</span>
<span class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 5">(审核驳回)</span>
<span class="submitAudit" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="submitAudit" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5 || waterData.contentVerify.verifyState == 4" (click)="submitAudit()"><mat-icon>open_in_browser</mat-icon>提交审核</span>
<span class="state" *ngIf="waterData.contentVerify && waterData.contentVerify.verifyState == 3" (click)="cancelAudit()">撤销审核</span>
<span class="save state" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="save state" *ngIf="!waterData.contentVerify || waterData.contentVerify.verifyState == 5 || waterData.contentVerify.verifyState == 4" (click)="save()"><mat-icon>save</mat-icon>保存</span>
<span class="close" (click)="close()"><mat-icon>close</mat-icon>关闭</span>
</div>
</div>

6
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
-->
<div class="content">
@ -45,9 +45,9 @@
<div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
<p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
<table>
<tr *ngFor="let header of items.header">
<tr *ngFor="let header of tableMsg.header">
<th >{{header}}</th>
<td *ngFor="let body of items.body">{{body[header]? body[header] : '暂无数据'}}</td>
<td *ngFor="let body of tableMsg.body">{{body[header]? body[header] : '暂无数据'}}</td>
</tr>
</table>
</div>

4
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%;

2
src/app/key-unit/basicinfo-look/basicinfo.component.html

@ -1,6 +1,6 @@
<div style="height: 100%;display: flex; flex-direction: column;overflow: hidden;">
<!-- header -->
<mat-accordion>
<mat-accordion id="unitBasicInfo">
<mat-expansion-panel expanded>
<mat-expansion-panel-header style="color: black;">
<mat-panel-title>

2
src/app/key-unit/basicinfo/basicinfo.component.html

@ -1,6 +1,6 @@
<div style="height: 100%;display: flex; flex-direction: column;overflow: hidden;">
<!-- header -->
<mat-accordion>
<mat-accordion id="unitBasicInfo">
<mat-expansion-panel expanded>
<mat-expansion-panel-header style="color: black;">
<mat-panel-title>

6
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
-->
<div class="content">
@ -45,9 +45,9 @@
<div *ngFor="let tableMsg of items.loopTable" class="detailsTable">
<p style="text-align: center; font-size: 16px; margin: 5px 0;">楼层/区域名称: {{tableMsg.name? tableMsg.name: '暂无名称'}}</p>
<table>
<tr *ngFor="let header of items.header">
<tr *ngFor="let header of tableMsg.header">
<th >{{header}}</th>
<td *ngFor="let body of items.body">{{body[header]? body[header] : '暂无数据'}}</td>
<td *ngFor="let body of tableMsg.body">{{body[header]? body[header] : '暂无数据'}}</td>
</tr>
</table>
</div>

4
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({

4
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<OpenPlanToolDialog>,
@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)
})

16
src/app/plan-audit/plan-record/plan-record.component.html

@ -102,7 +102,7 @@
<td style="width: 15%;">
<!-- <input type="radio" name="yuan" value={{item.id}} [(ngModel)]="checked" (click)='radioClick(item)'> -->
{{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'?'重点单位':'消防车辆'}}</td>
'Ⅴ级预案':item.contentType=='6'?'应急预案(国家级)':item.contentType=='7'?'应急预案(市级)':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}}</td>
<td style="width: 15%;">{{item.title}}</td>
<td style="width: 10%;" [ngClass]="{'green': item.operation == '1','red':item.operation == '2','blue':item.operation == '0'}">{{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}</td>
<td style="width: 15%;">{{item.verifyOrganizationName}}</td>
@ -162,7 +162,7 @@
</ng-template>
</mat-tab>
</mat-tab-group>
<div class="word" *ngIf="showtype==0">
<div class="word" *ngIf="showtype==0">
<iframe [src]='iframeSrc'></iframe>
</div>
<div id="viewer" *ngIf="showtype==1"></div>
@ -187,5 +187,17 @@
<span style="color: #2196F3;cursor:pointer;" (click)='oopen3Dshow()'>查看详情</span>
</div>
</div>
<!-- 水源审核 -->
<div class="waterAudit" *ngIf="showtype == 12">
<app-water-audit [waterData]="waterData"></app-water-audit>
</div>
<!-- 消防力量审核 -->
<div class="fireForceAudit" *ngIf="showtype == 13">
<app-fireforce-audit [FireForceDetailInfo]="fireForceDetailInfo" [level]="postlevel"></app-fireforce-audit>
</div>
<!-- 联动力量审核 -->
<div class="LinkageForcesAudit" *ngIf="showtype == 14">
<app-linkageforces-audit [LinkageForceDetailInfo]="LinkageForceDetailInfo"></app-linkageforces-audit>
</div>
</div>
</div>

10
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{

28
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

158
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.shenheTable.length;i++){
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:4
}
companyAgreeList.push(body)
}
//批量审核
else{
let isTrue = window.confirm('确定同意选中条目的审核吗?')
if(isTrue){
if(this.shenheTable[0].contentType==11||this.shenheTable[0].contentType==12){ //批量审批水源和重点单位
for(var i=0;i<this.shenheTable.length;i++){
var body={
id:this.shenheTable[i].id,
itemId:this.shenheTable[i].itemId,
verifyState:4
}
this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else{ //批量审核预案
for(var i=0;i<this.shenheTable.length;i++){
var cart={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?2:16,
auditOpinion:''
}
agreeList.push(cart)
companyAgreeList.push(body)
}
this.http.put(`/api/ContentVerifies/Batch`,companyAgreeList).subscribe(data=>{
this.snackBar.open('操作成功!','确定',config);
this.getAlltabledate()
})
}else{ //批量审核预案
for(var i=0;i<this.shenheTable.length;i++){
var cart={
planComponentId:this.shenheTable[i].itemId,
auditStatus:this.shenheTable[i].verifyState==3?2:16,
auditOpinion:''
}
this.http.put(`/api/PlanAudits/Batch`,agreeList).subscribe(data=>{
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();

4
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 //所有预案组件

2
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) {

4
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轴

4
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轴

6
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]}});
}
}

54
src/app/statistic-analysis/all-plan/all-plan.component.html

@ -0,0 +1,54 @@
<!--
* @Descripttion:
* @version:
* @Author: sueRimn
* @Date: 2021-03-05 15:57:08
* @LastEditors: sueRimn
* @LastEditTime: 2021-03-15 13:52:29
-->
<div class="body">
<div class="topbox">
<div class="btnbox">
<button mat-stroked-button (click)="goBack ()">返回</button>
</div>
</div>
<div class="title">
<span>{{titlename}}</span>
</div>
<div class="tablebox">
<table mat-table [dataSource]="tabledataSource" class="mat-elevation-z8">
<ng-container matColumnDef="unitname">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">名称</th>
<td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container>
<ng-container matColumnDef="modifiedTime">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">修改时间</th>
<td mat-cell *matCellDef="let element">{{element.modifiedTime|date:'yyyy-MM-dd'}}</td>
</ng-container>
<ng-container matColumnDef="organizationName">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">消防救援站</th>
<td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
</ng-container>
<ng-container matColumnDef="buildingTypes">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">类型</th>
<td mat-cell *matCellDef="let element">{{element.buildingTypes.length != 0 ? element.buildingTypes[0].name : ''}}</td>
</ng-container>
<ng-container matColumnDef="operation">
<th mat-header-cell *matHeaderCellDef style="width: 10%;">操作</th>
<td mat-cell *matCellDef="let element" style="white-space: nowrap;cursor: pointer;">
<span style="color: blue;" >详情</span>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
<mat-paginator style="width: 50%;margin-left: 25%;" pageEvent [length]="length"
[pageSize]="pageSize"
[pageSizeOptions]="pageSizeOptions"
(page)="changePage($event)">
</mat-paginator>
</div>
</div>

73
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
}
}
}

25
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<AllPlanComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ AllPlanComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(AllPlanComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

63
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
}
}

2
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}});
}
});

1
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]}});
}

4
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}});
}

5
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,

72
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.tishiData.length;i++){
countall+=this.tishiData[i].count
for(var i=0;i<this.localData.length;i++){
countall+=this.localData[i].count
}
this.res= '<div class="tishi" style=" backgroundColor:rgba(255,255,255,1);width:100%;height:100%;"><div style="padding:10px 0 5px 0"><span style="color:#FFFFFF;font-size:27px;text-align: center;display:block;">'+datas.name+'</span></div>'
this.res+='</br><div style="width:300px;height:100%;padding:0 20px 15px 20px"><table style="width:300px;font-size:16px; color:#FFFFFF;border-collapse:collapse;"cellspacing="0"; >';
@ -513,19 +555,19 @@ export class EchartsDataService {
this.res+='<td style="text-align:center;width:30%;">总占比</td>'
this.res+='</tr></thead>'
this.res+='<tbody>';
for(var i=0;i<this.tishiData.length;i++){
countbi=Math.round(this.tishiData[i].count/countall* 10000)/ 100.00
for(var i=0;i<this.localData.length;i++){
countbi=Math.round(this.localData[i].count/countall* 10000)/ 100.00
allCountbi=allCountbi+countbi
this.res+='<tr>'
this.res+='<td style="text-align:center;">'+this.tishiData[i].organizationName+'</td>'
this.res+='<td style="text-align:center;">'+this.tishiData[i].count+'</td>'
this.res+='<td style="text-align:center;">'+this.localData[i].organizationName+'</td>'
this.res+='<td style="text-align:center;">'+this.localData[i].count+'</td>'
this.res+='<td style="text-align:center;">'+countbi+'%</td></tr>'
}
this.res+='</tbody>'
this.res+='<tfoot style="font-size:18px;"><td style="text-align:center;">总计</td><td style="text-align:center;">'+countall+'</td><td style="text-align:center;">'+allCountbi.toFixed(2)+'%</td></tfoot>'
this.res+='</table></div></div>'
return this.res
},1000) */
},1000)
}

2
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';

26
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<this.tabledata[0].planStatistics.organizationStatistics.organizations.length;i++){
this.zhiNameData.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].organizationName)
this.zhiNumData.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].count)
this.organizationId.push(this.tabledata[0].planStatistics.organizationStatistics.organizations[i].organizationId)
}
for(var i=0;i<this.tabledata[0].organizations.length;i++){
this.zhiNameData.push(this.tabledata[0].organizations[i].organizationName)
this.zhiNumData.push(this.tabledata[0].organizations[i].count)
this.organizationId.push(this.tabledata[0].organizations[i].organizationId)
}
this.tiaoshiPao=this.echartsData.qipao(this.tiaoshiPao,this.zhiNumData,this.zhiNameData)
this.zhuzhuangtu(headName)
},1000)
@ -159,9 +161,9 @@ export class PageThereComponent implements OnInit {
}
},
/* grid: {
left: '5%',
bottom:'35%'
}, */
//left: '5%',
bottom:'5%'
}, */
xAxis: {
id:this.organizationId,
type: 'category',
@ -210,9 +212,9 @@ export class PageThereComponent implements OnInit {
let xIndex=this.zhutu.convertFromPixel({seriesIndex:0},[params.offsetX, params.offsetY])[0];
/*事件处理代码书写位置*/
if(this.echartsData.level=='0'||this.echartsData.level=='1'){
this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':headName,'id':this.option.xAxis.id[xIndex],'type':this.type}});
this.router.navigate(['/statisticanalysis/PageZhongDuiDetails'],{queryParams:{'level':this.option.xAxis.data[xIndex],'id':this.option.xAxis.id[xIndex],'type':this.type}});
}else{
this.router.navigate(['/statisticanalysis/CompangInfo'],{queryParams:{'name':params.name,'type':1}});
this.router.navigate(['/statisticanalysis/AllPlan'],{queryParams:{'name':params.name,'type':1}});
}
}

7
src/app/statistic-analysis/state/page-two-name/page-two-name.component.ts

@ -142,7 +142,8 @@ export class PageTwoNameComponent implements OnInit {
tooltip: {
trigger: 'item',
formatter: (params)=>{
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]}});
}
}

2
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}});
}
}

6
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
});

6
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({

3
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,

4
src/app/ui/collection-tools-building/collection-tools.component.html

@ -185,9 +185,9 @@
<div *ngIf="canvasAssetObj.InteractiveMode == 0">
<p>宽度(像素)</p>
<input type="text" class="biginput" [(ngModel)]="assetWidth" (input)="assetWidthIunput()" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
<input type="number" class="biginput" [(ngModel)]="assetWidth" (input)="assetWidthIunput()" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
<p>高度(像素)</p>
<input type="text" class="biginput" [(ngModel)]="assetHeight" (input)="assetHeightIunput()" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
<input type="number" class="biginput" [(ngModel)]="assetHeight" (input)="assetHeightIunput()" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
<p>角度</p>
<div style="width: 100%;display: flex;vertical-align: top;height: 22px;">
<input type="number" class="smallinput" [(ngModel)]="sliderValue"

1
src/app/ui/collection-tools-building/collection-tools.component.ts

@ -1410,6 +1410,7 @@ export class CollectionToolsBuildingComponent implements OnInit {
}
//所有消防要素模板变化islook值
console.log(node)
if(node.isTemplate){
this.allFireElements.forEach(item=>{
if(item.id == node.id){ item.isLook = !item.isLook }

2
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

31
src/app/ui/collection-tools/changeOr.html

@ -0,0 +1,31 @@
<div class="orBox" (mousewheel)="$event.stopPropagation()">
<div class="treebox">
<mat-tree [dataSource]="dataSource" [treeControl]="treeControl" >
<mat-tree-node [ngClass]="{'selectedNode': node.id == selectedNodeId}" *matTreeNodeDef="let node;" matTreeNodePadding (click)="selectedNode(node)">
<button mat-icon-button disabled ></button>
{{node.name}}
</mat-tree-node>
<mat-tree-node [ngClass]="{'selectedNode': node.id == selectedNodeId}" *matTreeNodeDef="let node;when: hasChild" matTreeNodePadding (click)="selectedNode(node)">
<button mat-icon-button
matTreeNodeToggle
[attr.aria-label]="'toggle ' + node.name">
<mat-icon class="mat-icon-rtl-mirror">
{{treeControl.isExpanded(node) ? 'expand_more' : 'chevron_right'}}
</mat-icon>
</button>
{{node.name}}
</mat-tree-node>
</mat-tree>
</div>
<div mat-dialog-actions class="btnbox" style="justify-content: center;">
<button mat-raised-button color="primary" (click)="ok()">
确定
</button>
<button mat-raised-button mat-dialog-close>
取消
</button>
</div>
</div>

15
src/app/ui/collection-tools/collection-tools.component.html

@ -308,17 +308,26 @@
</div>
<div *ngFor="let item of PropertyInfos;index as key ">
<!-- 单行文本 -->
<div *ngIf="item.PropertyType == 0">
<div *ngIf="item.PropertyType == 0 && item.PropertyName != '所属单位'">
<p>{{item.PropertyName}}<span style="font-size: 14px;" *ngIf="item.PhysicalUnit">({{item.PhysicalUnit}})</span></p>
<input type="text" class="biginput" [value]="item.PropertyValue" (input)="assetInputChange(item,$event)" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
</div>
<div *ngIf="item.PropertyName == '所属单位'">
<p>{{item.PropertyName}}<span style="font-size: 14px;" *ngIf="item.PhysicalUnit">({{item.PhysicalUnit}})</span></p>
<div class="orInput">
<input readonly type="text" class="biginput" [value]="item.PropertyValue" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
<div class="changeOr" (click)="changeOr()">
更换
</div>
</div>
</div>
<!-- 多行文本 -->
<div *ngIf="item.PropertyType == 1">
<div *ngIf="item.PropertyType == 1 && item.PropertyName != '所属单位'">
<p>{{item.PropertyName}}<span style="font-size: 14px;" *ngIf="item.PhysicalUnit">({{item.PhysicalUnit}})</span></p>
<textarea class="textarea" name="" id="" [value]="item.PropertyValue" (input)="assetInputChange(item,$event)" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)"></textarea>
</div>
<!-- 数值 -->
<div *ngIf="item.PropertyType == 2">
<div *ngIf="item.PropertyType == 2 && item.PropertyName != '所属单位'">
<p>{{item.PropertyName}}<span style="font-size: 14px;" *ngIf="item.PhysicalUnit">({{item.PhysicalUnit}})</span></p>
<input type="number" class="biginput" [value]="item.PropertyValue" (input)="assetInputChange(item,$event)" [disabled]="!isEditPattern || (canvasAssetObj.GameMode == 0 && !pattern)">
</div>

33
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;
}
}

121
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<ViewDetails>,@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<Organization>,@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<any>(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
})
}
}
}

24
src/app/ui/collection-tools/viewdetails.html

@ -1,24 +0,0 @@
<div style="position: relative;width: 1400px;height: 800px;line-height: 800px;" class="swiper-container">
<div style="position: absolute;right: -2px;top: -392px;cursor: pointer;z-index: 999;width: 24px;height: 24px;" (click)="closeDialog()">
<span><mat-icon>clear</mat-icon></span>
</div>
<div class="swiper-wrapper">
<div class="swiper-slide" style="text-align: center;" *ngFor="let img of imagesArr">
<img id="bigimg" (mousewheel)="zoomimg($event)" style="
max-width: 96%;
max-height: 100%;
min-width: 1px;
min-height: 1px;
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
margin: auto;" [src]="img.PropertyValue" alt="">
</div>
</div>
<!-- 如果需要导航按钮 -->
<div class="swiper-button-next"></div>
<div class="swiper-button-prev"></div>
</div>

4
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,

5
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;
}
}
Loading…
Cancel
Save