+
+
+
+
+
+
+
+
+
+ 单位列表
总分:
单位名称
总分
单位名称
总分
+
add_circle_outline 添加预案
-
+
@@ -285,7 +285,7 @@
{{item.isPublic ? '已公开' : '未公开'}}
{{item.planLevel | planlevel}}
-
+
编辑
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index df5b58a..3bf3704 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -830,6 +830,7 @@ export class CreateTestScoreComponent implements OnInit {
x += i.score
})
}
+ element.planScore = x
examScore2 += Number(x)
})
this.examScore = examScore + examScore2
From 964a15643de63b1445b39891098a96daf008e844 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 23 Dec 2020 11:41:04 +0800
Subject: [PATCH 10/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E8=80=83=E5=8D=B7?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../examination-details.component.html | 8 +++--
.../examination-details.component.scss | 18 +++++++++-
.../examination-details.component.ts | 35 ++++++++++++++++---
3 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html
index 274315c..94bf9a0 100644
--- a/src/app/student/examination-details/examination-details.component.html
+++ b/src/app/student/examination-details/examination-details.component.html
@@ -3,9 +3,11 @@
| 预案名称 | diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts index 54b1ef1..547eef2 100644 --- a/src/app/examiner/create-test-score/create-test-score.component.ts +++ b/src/app/examiner/create-test-score/create-test-score.component.ts @@ -27,42 +27,64 @@ export class CreateTestScoreComponent implements OnInit { }, 0); } - async ngOnInit(): Promise{{item.status=="2"?"已结束":item.status=="0"?"未开考":"开考中"}} | - 编辑 + 编辑 详情 删除 | diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index c9e0d3b..fd0ca95 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -34,11 +34,18 @@ export class ExaminerIndexComponent implements OnInit { this.getunitdata(); this.getOrganizations(); this.getUnittype(); - this.getAlltabledate() - setInterval(()=>this.getAlltabledate(),60000) - //this.getHelp() + this.getAlltabledate(); + this.getProfiles() + } + //获取登录账号的个人资料 + Profiles:any + getProfiles(){ + this.http.get('/api/ExamAccounts/Profiles').subscribe((data:any) => { + console.log(data) + this.Profiles = data + sessionStorage.setItem('creatorData',JSON.stringify(data)) + }) } - displayedColumns: string[] = ['name','startTime','endTime', 'examzhong','scc']; tabledataSource:any accound @@ -115,6 +122,14 @@ export class ExaminerIndexComponent implements OnInit { ) } + + + //编辑试卷 + editPaper(item){ + // console.log(item) + sessionStorage.setItem("paperId",item.id) + this.router.navigateByUrl("/examiner/create-test-score?pattern=edit") + } //获得所有组织机构 getOrganizations(){ this.http.get('/api/Organizations').subscribe( @@ -135,25 +150,25 @@ export class ExaminerIndexComponent implements OnInit { ) } - //获得查询支队信息 - help(){ - let paramsdata:any = { - PageNumber: this.PageNumber || '1', - PageSize: this.pageSizeOptions[0], - Sort: null, - SortType: null, + //获得查询支队信息 + help(){ + let paramsdata:any = { + PageNumber: this.PageNumber || '1', + PageSize: this.pageSizeOptions[0], + Sort: null, + SortType: null, + } + //console.log(paramsdata) + this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ + this.tabledataSource=data + console.log(this.tabledataSource) + }) + } + //分页事件 + chagePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAlltabledate() } - //console.log(paramsdata) - this.http.get("/api/Papers",{params:paramsdata}).subscribe((data:any)=>{ - this.tabledataSource=data - console.log(this.tabledataSource) - }) - } - //分页事件 - chagePage(e){ - this.PageNumber = e.pageIndex+1 - this.getAlltabledate() - } //获取表格信息 getAlltabledate(){ let paramsdata:any = { From 08d1b720e82951c03ee43c12de0e780d42b6548d Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Wed, 23 Dec 2020 10:01:28 +0800 Subject: [PATCH 05/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E8=80=83=E7=94=9F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examination-details.component.html | 14 +++++- .../examination-details.component.scss | 43 +++++++++++++++++++ .../examination-details.component.ts | 15 ++++++- .../student-index/student-index.component.ts | 8 +++- 4 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html index 5431c31..aa1ab18 100644 --- a/src/app/student/examination-details/examination-details.component.html +++ b/src/app/student/examination-details/examination-details.component.html @@ -1 +1,13 @@ -是否公开 | 编制级别 | 设置分数 | -操作 | +操作 |
| {{item.title}} | @@ -287,8 +287,8 @@- | - 编辑 + | + 编辑 删除 | {{item.status=="2"?"已结束":item.status=="0"?"未开考":"开考中"}} | 编辑 - 详情 + 详情 删除 | diff --git a/src/app/examiner/examiner-index/examiner-index.component.ts b/src/app/examiner/examiner-index/examiner-index.component.ts index fd0ca95..2f420a1 100644 --- a/src/app/examiner/examiner-index/examiner-index.component.ts +++ b/src/app/examiner/examiner-index/examiner-index.component.ts @@ -126,10 +126,13 @@ export class ExaminerIndexComponent implements OnInit { //编辑试卷 editPaper(item){ - // console.log(item) sessionStorage.setItem("paperId",item.id) this.router.navigateByUrl("/examiner/create-test-score?pattern=edit") } + lookPaper(item){ + sessionStorage.setItem("paperId",item.id) + this.router.navigateByUrl("/examiner/create-test-score?pattern=look") + } //获得所有组织机构 getOrganizations(){ this.http.get('/api/Organizations').subscribe( From a468b08346a5117729ef5597658aa5a0fedae8c1 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Wed, 23 Dec 2020 10:14:50 +0800 Subject: [PATCH 07/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E8=80=83=E7=94=9F=E8=8E=B7=E5=8F=96=E8=AF=95=E5=8D=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../examination-details.component.html | 4 +++- .../examination-details.component.ts | 21 ++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html index aa1ab18..274315c 100644 --- a/src/app/student/examination-details/examination-details.component.html +++ b/src/app/student/examination-details/examination-details.component.html @@ -7,7 +7,9 @@||
| {{item.name}} | -{{item.score}} | +{{item.score}}+{{item.planScore || 0}} |
-
-
-
+
+
+
单位列表
总分:
单位名称
总分
单位名称
总分
单位列表
总分:
单位名称
总分
+
{{item.companyInfo.name}}
+
diff --git a/src/app/student/examination-details/examination-details.component.scss b/src/app/student/examination-details/examination-details.component.scss
index a23667a..ad3fe6b 100644
--- a/src/app/student/examination-details/examination-details.component.scss
+++ b/src/app/student/examination-details/examination-details.component.scss
@@ -19,10 +19,20 @@
}
.right {
flex: 80%;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
}
}
}
+//文本溢出
+.overflowText {
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+}
+
//左侧
.headerLeft{
display: flex;
@@ -36,8 +46,14 @@
align-items: center;
justify-content: center;
cursor: pointer;
- >div {flex: 1; overflow: hidden; text-align: center;}
+ >div {flex: 1; text-align: center;}
height: 36px;
padding: 0 25px;
margin: 0 30px;
+ font-size: 14px;
+ border-radius: 3px;
+}
+.selectPaper {
+ background-color: #07CDCF;
+ color: #fff;
}
\ No newline at end of file
diff --git a/src/app/student/examination-details/examination-details.component.ts b/src/app/student/examination-details/examination-details.component.ts
index af843a9..cfff501 100644
--- a/src/app/student/examination-details/examination-details.component.ts
+++ b/src/app/student/examination-details/examination-details.component.ts
@@ -15,25 +15,50 @@ export class ExaminationDetailsComponent implements OnInit {
async ngOnInit(): Promise {
await this.getTestInfo()
- console.log(2)
}
-
- paperData:any//试卷信息
+
+ paperData:any //试卷信息
+ paperCompanyData:any = []; //考生具体考卷
+ selectPaper:any = {id:null}; //选择当前考卷
+
//获取考卷
async getTestInfo () {
let id = this.route.snapshot.queryParams.paperId
await new Promise((resolve, reject) => {
this.http.get(`/api/Papers/${id}`).subscribe((data:any)=>{
- console.log(data)
this.paperData = data
+ this.paperData.paperDataInfo.forEach(element => {
+ element.adjoinData? element.adjoinData = JSON.parse(element.adjoinData) : null
+ element.basicInfoData? element.basicInfoData = JSON.parse(element.basicInfoData) : null
+ element.facilityData? element.facilityData = JSON.parse(element.facilityData) : null
+ element.functionalDivisionData? element.functionalDivisionData = JSON.parse(element.functionalDivisionData) : null
+ element.importLocationData? element.importLocationData = JSON.parse(element.importLocationData) : null
+ });
+ this.paperCompanyData = JSON.parse( JSON.stringify(data.paperDataInfo) ) //具体考卷
+ this.selectPaper = this.paperCompanyData[0] || {id:null} //当前选择考卷
+ this.handlePaperData()
resolve(1)
})
})
-
+
+ }
+
+ //处理考卷 数据格式
+ handlePaperData () {
+ console.log(this.selectPaper)
+ }
+
+ //切换 选择考卷
+ togglePaper (e) {
+ if (this.selectPaper.id != e.id) {
+ this.selectPaper = e
+ this.handlePaperData()
+ }
}
//获得单位预案设定
getUnitPlans(){
}
+
}
From cb632ef7883e56c8b31e4c0e9573c676d5767d80 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 23 Dec 2020 14:03:45 +0800
Subject: [PATCH 11/15] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=88=9D=E5=A7=8B?=
=?UTF-8?q?=E5=8C=96=E6=97=B6=E8=AE=A1=E7=AE=97=E8=AF=95=E5=8D=B7=E5=90=84?=
=?UTF-8?q?=E9=A1=B9=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../create-test-score.component.ts | 3 +-
.../examination-details.component.html | 7 ++-
.../examination-details.component.ts | 46 +++++++++++++++++--
3 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index 3bf3704..b1cbe14 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -617,8 +617,6 @@ export class CreateTestScoreComponent implements OnInit {
examScore:any = 0//整个试卷的总分
-
-
//计算分数
calculateScore(key){
//key代表第几个建筑
@@ -638,6 +636,7 @@ export class CreateTestScoreComponent implements OnInit {
x += i.score
})
}
+ element.planScore = x
examScore2 += Number(x)
})
this.examScore = examScore + examScore2
diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html
index 94bf9a0..97f2d70 100644
--- a/src/app/student/examination-details/examination-details.component.html
+++ b/src/app/student/examination-details/examination-details.component.html
@@ -3,10 +3,13 @@
-
+
单位列表
总分:
单位列表
总分:
+
+
单位名称
总分
-
{{item.companyInfo.name}}
+ {{item.companyInfo.name}}
+ {{item.score}}+{{item.planScore || 0}}
diff --git a/src/app/student/examination-details/examination-details.component.ts b/src/app/student/examination-details/examination-details.component.ts
index cfff501..4dcc752 100644
--- a/src/app/student/examination-details/examination-details.component.ts
+++ b/src/app/student/examination-details/examination-details.component.ts
@@ -15,6 +15,7 @@ export class ExaminationDetailsComponent implements OnInit {
async ngOnInit(): Promise {
await this.getTestInfo()
+ this.getUnitPlans()//将试卷的预案考题放进数据中
}
paperData:any //试卷信息
@@ -37,7 +38,7 @@ export class ExaminationDetailsComponent implements OnInit {
this.paperCompanyData = JSON.parse( JSON.stringify(data.paperDataInfo) ) //具体考卷
this.selectPaper = this.paperCompanyData[0] || {id:null} //当前选择考卷
this.handlePaperData()
- resolve(1)
+ resolve()
})
})
@@ -57,8 +58,47 @@ export class ExaminationDetailsComponent implements OnInit {
}
//获得单位预案设定
- getUnitPlans(){
-
+ async getUnitPlans(){
+ for (let index = 0; index < this.paperCompanyData.length; index++) {
+ const item = this.paperCompanyData[index];
+ let params = {
+ paperId : item.paperId,
+ companyId : item.companyInfo.id
+ }
+ await new Promise((resolve,reject)=>{
+ this.http.get(`/api/PaperPlans`,{params:params}).subscribe(data => {
+ item.planList = []
+ item.planList = data
+ resolve()
+ })
+ })
+ }
+ this.calculateScore()
}
+ examScore:any = 0//整个试卷的总分
+ //计算分数
+ calculateScore(){
+ let examScore = 0
+ let examScore2 = 0
+ this.paperCompanyData.forEach(item => {
+ //计算每个单位基本信息部分总分
+ item.score = item.basicInfoScore + item.adjoinScore + item.importLocationScore + item.functionalDivisionScore + item.facilityScore
+ //计算整个试卷基本信息总分
+ examScore += item.score
+ //计算整个试卷预案试题总分
+ let x = 0
+ if(item.planList){
+ item.planList.forEach(i => {
+ x += i.score
+ })
+ }
+ item.planScore = x
+ examScore2 += x
+ })
+ //计算总分
+ this.examScore = examScore + examScore2
+ console.log(678,this.paperCompanyData)
+ }
+
}
From 6c2faf9f5d06b5e4a3e9a42a806ea9e701981f51 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 23 Dec 2020 14:56:59 +0800
Subject: [PATCH 12/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BE=AE=E8=B0=83?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../examination-details.component.html | 9 ++++++---
.../examination-details.component.scss | 3 ++-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html
index 97f2d70..54425b8 100644
--- a/src/app/student/examination-details/examination-details.component.html
+++ b/src/app/student/examination-details/examination-details.component.html
@@ -3,9 +3,12 @@
diff --git a/src/app/student/examination-details/examination-details.component.scss b/src/app/student/examination-details/examination-details.component.scss
index ad3fe6b..1c5646e 100644
--- a/src/app/student/examination-details/examination-details.component.scss
+++ b/src/app/student/examination-details/examination-details.component.scss
@@ -22,6 +22,10 @@
overflow: hidden;
display: flex;
flex-direction: column;
+ .centerRight {
+ flex: 1;
+ overflow: hidden;
+ }
}
}
}
@@ -56,4 +60,54 @@
.selectPaper {
background-color: #07CDCF;
color: #fff;
+}
+
+//中间内容区
+.headerRight {
+ width: 100%;
+ height: 50px;
+ line-height: 50px;
+ box-sizing: border-box;
+ padding-right: 10px;
+ overflow: hidden;
+ background-color: #F2F5F6;
+ button {
+ width: 80px;
+ height: 32px;
+ border-radius: 5px;
+ background-color: #07CDCF;
+ color: #fff;
+ border: none;
+ outline: none;
+ float: right;
+ margin: 9px 25px 0 0;
+ }
+ label {
+ cursor: pointer;
+ display: inline-block;
+ width: 120px;
+ text-align: center;
+ color: #1E2323;
+ opacity: 0.5;
+ }
+ .selectPaperType {
+ color: #07CDCF;
+ opacity: 1;
+ background-color: #fff;
+ border-top: 3px solid #07CDCF;
+ }
+}
+
+.mark { color: #FF8678; }
+.mariginRight { margin-right: 25px; }
+.paperCenter {
+ width: 100%;
+ height: 100%;
+ box-sizing: border-box;
+ padding: 5px;
+ overflow-y: auto;
+ .panelHeader {
+ background-color: #F5FDFE;
+ label { display: inline-block; }
+ }
}
\ No newline at end of file
diff --git a/src/app/student/examination-details/examination-details.component.ts b/src/app/student/examination-details/examination-details.component.ts
index cfff501..8c9847e 100644
--- a/src/app/student/examination-details/examination-details.component.ts
+++ b/src/app/student/examination-details/examination-details.component.ts
@@ -20,6 +20,7 @@ export class ExaminationDetailsComponent implements OnInit {
paperData:any //试卷信息
paperCompanyData:any = []; //考生具体考卷
selectPaper:any = {id:null}; //选择当前考卷
+ selectPaperType:string = '1'; //选择当前考卷内容
//获取考卷
async getTestInfo () {
@@ -56,9 +57,21 @@ export class ExaminationDetailsComponent implements OnInit {
}
}
+ //切换 选择考卷内容
+ togglePaperType (e) {
+ if (this.selectPaperType != e) {
+ this.selectPaperType = e
+ }
+ }
+
//获得单位预案设定
getUnitPlans(){
}
+ //交卷
+ uploadPaper () {
+ console.log('交卷')
+ }
+
}
-
+
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ CollectionToolsComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(CollectionToolsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.ts
new file mode 100644
index 0000000..3198a21
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/collection-tools.component.ts
@@ -0,0 +1,1882 @@
+import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContainerRef } from '@angular/core';
+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 {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 Viewer from 'viewerjs';
+import Swiper from 'swiper';
+import { saveOneDialogExaminee } from './save';
+import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree';
+import { Observable, of } from 'rxjs';
+import { delay } from 'rxjs/operators';
+import { windows } from 'src/app/interface';
+import { GameMode } from 'src/app/working-area/model/gameMode';
+import { ActivatedRoute, Router } from '@angular/router';
+import { examinationQuestionsExaminee,uploadDisposalNodesExaminee,uploadQuestionsExaminee } from './examinationQuestions'
+
+
+
+@Component({
+ selector: 'app-collection-tools',
+ templateUrl: './collection-tools.component.html',
+ styleUrls: ['./collection-tools.component.scss']
+})
+export class CollectionToolsExamineeComponent implements OnInit {
+
+ @ViewChild('canvas',{static: true}) canvas:WorkingAreaComponent; //父组件中获得子组件的引用
+
+ constructor(private http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private element: ElementRef,public canvasData: CanvasShareDataService,private router:Router,private route:ActivatedRoute) { }
+ @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+ // tree配置
+ private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数
+ return {
+ expandable: !!node.children && node.children.length > 0,
+ name: node.name || node.Name,
+ level: level,
+ id: node.id || node.Id,
+ children:node.children,
+ isTemplate:node.isTemplate,
+ isNewElement:node.isNewElement,
+ isLook:node.isLook,
+ isLookPattern:node.isLookPattern || null
+ };
+ }
+ 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;
+
+ colors = ['#076eec','#4dd0e1','#00ee76','#ffff00','#eeb422',
+ '#FF6A6A','#ff0000','#ff6eb4','#00bfff','#54ff9f',
+ '#009688','#836fff','#ff8c00','#ee00ee','#ffa07a',
+ '#00C500','#00ffff','#6495ed','#ffdAb9','#AA00FF']
+ selected = "1" //图标大小选择框
+
+ allBuildings //该单位所有建筑
+ beforeOneCheckedBuilding:any = {name:"总平面图"}; //当前点击选择的建筑
+ beforeOneCheckedBuildingIsShow:boolean = false; //建筑是否显示
+ togglebeforeOneCheckedBuilding () { this.beforeOneCheckedBuildingIsShow = !this.beforeOneCheckedBuildingIsShow }
+ checkedBuildingIndex:number = -1 //当前点击选择的建筑index
+ isEditPat:boolean = true //当前是否是编辑模式
+
+ assetName:String//素材名称
+ assetWidth:number//素材宽度
+ assetHeight:number//素材高度
+ sliderValue:number = 0//角度滑竿的值
+ sliderValueThickness:number = 0//厚度滑竿的值
+ isHighLight:boolean = false//是否高亮选择框
+ PropertyInfos = [] //去除图片链接真正用于循环的内容
+ imagesArrNum //素材属性图片数量上限
+ imagesArr = [] //属性中的图片链接集合
+ clickedIndex //点击图片时的索引值
+
+ //传入素材对象，设置右侧属性栏内容
+ canvasAssetObj //传入的素材属性对象
+ isImgNumCss = false //控制上传文件input显隐
+ mySwiper:any //轮播图实例
+
+ gallery//viewerJs实例
+ //设置属性框
+ setAssetsProperty(obj){
+ //初始化viewerJs实例
+ setTimeout(() => {
+ obj.PropertyInfos.forEach(item => {
+ if(item.PropertyType == 4){
+ this.gallery = new Viewer(document.getElementById('viewerjs'),{
+ url: 'data-original'
+ });
+ }
+ })
+ }, 0);
+
+ //从颜色中取出透明度
+ let color = obj.Color
+ let strh = color.substring(color.length -2,color.length)
+ let opacity = Math.round(parseInt(strh,16)/255 * 100)
+ this.colorDivSliderValue = opacity
+
+ this.isShowProperty = true
+ this.isShowAttribute = false
+ let _this = this
+ this.imagesArr = []
+ this.imagesArrNum = ""
+
+ this.canvasAssetObj = obj //将选中素材对象存到本地变量
+
+ this.assetName = obj.Name
+ this.assetWidth = obj.Width
+ this.assetHeight = obj.Height
+ this.sliderValue = obj.Angle
+ this.selectedcolor = obj.Color
+ this.PropertyInfos = obj.PropertyInfos
+ this.sliderValueThickness = obj.Thickness
+ this.PropertyInfos.forEach(item => {
+ if(item.PropertyType == 3){ //如果是图片链接类型
+ this.imagesArr.push(item)
+ }
+ if(item.PropertyType == 4){//图片数值上线
+ this.imagesArrNum = item.PropertyValue
+ }
+ })
+
+ //如果存在图片则加载轮播图
+ if(this.imagesArr.length){
+ setTimeout(() => {
+ this.mySwiper = new Swiper('.swiper-container',{
+ loop: false,
+ // grabCursor: true,
+ // 如果需要前进后退按钮
+ navigation: {
+ nextEl: '.swiper-button-next',
+ prevEl: '.swiper-button-prev',
+ },
+ on:{
+ click: function(){
+ _this.clickedIndex = this.clickedIndex
+ },
+ }
+ });
+ }, 0);
+ }
+ //判断此时图片数量是否达到上限
+ if(this.imagesArr.length < this.imagesArrNum){//如果不超出
+ this.isImgNumCss = true
+ }else{
+ this.isImgNumCss = false
+ }
+ }
+ pattern:boolean = false//默认为基本信息编辑
+
+ //基本信息编辑模式
+ baseInfo(){
+ if (!this.pattern) {
+ this.basicInfo = true
+ this.canvas.setNameVisible(this.basicInfo,1)
+
+ this.pattern = true
+ this.canvasData.gameMode = GameMode.BasicInformation
+ this.canvasData.selectPanelPoint = new DisposalNodeData();
+ this.mateDeleteCustomize()
+ this.getAllLibrary()
+ this.checkedBuildingIndex = -1
+ this.getSitePlan() //总平面图一层
+ }
+ }
+
+ //想定作业编辑模式
+ wantWork(){
+ if (this.pattern) {
+ //让基本信息图标显示
+ this.basicInfo = false
+ this.canvas.setNameVisible(this.basicInfo,0)
+
+ this.pattern = false
+ this.canvasData.gameMode = GameMode.Assignment
+ this.getAllLibrary('plan')
+ this.getDisposalNode()
+ }
+ }
+
+ //ngzorro tree 拖拽
+ nzEvent(event: NzFormatEmitEvent): void {
+ if(this.isDrag){
+ let parentId
+ if(this.pos == 0){
+ parentId = event.node.key
+ }else{
+ if(event.node.level == 0){
+ parentId = null
+ }else{
+ parentId = event.node.origin.parentId
+ }
+ }
+
+
+ let orders = {}
+ let originalData = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] )) //tree原始数据
+ let targetNodeData = []//拖动移入节点的数据，用于遍历求出放在该数组的第几位
+
+ //找到需要重新排序的数组
+ if(this.pos == 0){
+ originalData.forEach(item => {
+ if(item.parentId == event.node.key){
+ targetNodeData.push(item)
+ }
+ })
+ }else{
+ if(event.node.origin.parentId){//如果拖动目标为非一级节点
+ originalData.forEach(item => {
+ if(item.parentId == event.node.origin.parentId){
+ targetNodeData.push(item)
+ }
+ })
+ }else{//如果拖动目标为一级节点
+ originalData.forEach(item => {
+ if(!item.parentId){
+ targetNodeData.push(item)
+ }
+ })
+ }
+ }
+
+
+ let idArr = []
+ targetNodeData.forEach(i => {
+ idArr.push(i.id)
+ })
+ console.log(6666666666666,event);
+ if(this.pos == 0 && event.node.origin.children.length == 1){
+ console.log("移入,没有兄弟")
+ let key = event.dragNode.key
+ orders[key] = 0
+ parentId = event.node.key
+ }else{
+ console.log("移入,多个兄弟")
+ let array = []
+ targetNodeData.forEach(item => {
+ if(item.id != event.dragNode.key){ //将拖动项先移除掉
+ array.push(item)
+ }
+ })
+ if(event.dragNode.isEnd[event.dragNode.isEnd.length - 1]){ //如果移入到最后一个
+ console.log("最后")
+ array.push(event.dragNode.origin)
+ }else if(event.dragNode.isStart[event.dragNode.isStart.length - 1]){//如果移入到第一个
+ console.log("第一")
+ array.unshift(event.dragNode.origin)
+ }else{//如果移入中间位置
+ console.log("中间")
+ array.splice(event.node.origin.order, 0, event.dragNode.origin)
+ }
+ array.forEach((item,key) => {
+ orders[item.id] = key
+ })
+ }
+
+ let obj ={
+ id : event.dragNode.origin.id,
+ parentId : parentId,
+ orders : orders
+ }
+
+ this.http.put("/api/DisposalNodes/Sort",obj).subscribe(data => {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('排序成功','确定',config)
+ this.refurbishTreeData()
+ })
+ }
+ }
+
+ isDrag //是否可以拖动
+ pos//放置位置
+ beforeDrop = (arg: NzFormatBeforeDropEvent) => {
+ if(arg.dragNode.origin.isDataNode && arg.node.level === 0){//如果为数据节点则不允许拖到一级节点
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('数据节点不允许拖拽到一级节点','确定',config)
+ this.isDrag = false
+ return of(false);
+ }else if(!arg.dragNode.origin.isDataNode && arg.node.level === 2){
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('处置节点不允许拖拽到三级节点','确定',config)
+ this.isDrag = false
+ return of(false);
+ }else{
+ this.isDrag = true
+ this.pos = arg.pos
+ return of(true)
+ }
+ }
+ //ngzorro tree 拖拽
+
+ //天气栏目
+ weatherBtn = true
+ weatherBtnShow(){
+ this.weatherBtn = !this.weatherBtn
+ }
+ weatherBtnHidden(){
+ this.weatherBtn = !this.weatherBtn
+ }
+
+ //底部切换按钮div
+ detailsAndattentBtn = true
+ //节点详情
+ details(){
+ this.detailsAndattentBtn = true
+ }
+ //注意事项
+ attent(){
+ this.detailsAndattentBtn = false
+ }
+
+ //消防要素div边框高度调节
+ firecategoriesDivMouseDown(e){
+ document.onmousemove = (ev) => {
+ let bodyHeight = document.body.clientHeight //网页宽度
+ let maxHeight = this.element.nativeElement.querySelector('#rightDiv').clientHeight - 35 //最大宽度
+ if(bodyHeight - ev.clientY >= maxHeight){
+ this.element.nativeElement.querySelector('#firecategories').style.height = maxHeight+ 'px'
+ this.element.nativeElement.querySelector('#property').style.height = 35+ 'px'
+ }else{
+ this.element.nativeElement.querySelector('#firecategories').style.height = (bodyHeight - ev.clientY) + 'px' ;
+ this.element.nativeElement.querySelector('#property').style.height = (this.element.nativeElement.querySelector('#rightDiv').clientHeight - this.element.nativeElement.querySelector('#firecategories').clientHeight) + 'px'
+ }
+ }
+ document.onmouseup = () => {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ }
+ }
+
+ //左侧div边框宽度调节
+ leftDivMouseDown(e){
+ document.onmousemove = (ev) => {
+ let bodyWidth = document.body.clientWidth //网页宽度
+ let maxWidth = bodyWidth - 260 - this.element.nativeElement.querySelector('#rightDiv').clientWidth //最大宽度
+ if(ev.clientX - 240 >= maxWidth){
+ this.element.nativeElement.querySelector('#leftDiv').style.width = maxWidth + 'px'
+ }else{
+ this.element.nativeElement.querySelector('#leftDiv').style.width = ev.clientX - 260 + 'px';
+ }
+ }
+ document.onmouseup = () => {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ }
+ }
+
+ //底部div高度调节
+ bottomDivMouseDown(e){
+ document.onmousemove = (ev) => {
+ let bodyHeight = document.body.clientHeight //网页高度
+ let maxHeight = this.element.nativeElement.querySelector('#rightDiv').clientHeight //最大高度
+ if(bodyHeight - ev.clientY >= maxHeight){
+ this.element.nativeElement.querySelector('#bottomDiv').style.height = maxHeight + 'px'
+ }else{
+ this.element.nativeElement.querySelector('#bottomDiv').style.height = (bodyHeight - ev.clientY) + 'px' ;
+ }
+ }
+ document.onmouseup = () => {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ }
+ }
+
+ //右侧div边框宽度调节
+ rightDivMouseDown(e){
+ document.onmousemove = (ev) => {
+ let bodyWidth = document.body.clientWidth //网页宽度
+ let maxWidth = bodyWidth - 240 - this.element.nativeElement.querySelector('#leftDiv').clientWidth //最大宽度
+ if(bodyWidth - ev.clientX >= maxWidth){
+ this.element.nativeElement.querySelector('#rightDiv').style.width = maxWidth + 'px'
+ }else{
+ this.element.nativeElement.querySelector('#rightDiv').style.width = bodyWidth - ev.clientX + 'px';
+ }
+ }
+ document.onmouseup = () => {
+ document.onmousemove = null;
+ document.onmouseup = null;
+ }
+ }
+
+ //放大图标
+ iconScale(){
+ let number = Number(this.selected)
+ this.canvas.setIconScale(number)
+ }
+
+ //素材宽度输入框改变
+ assetWidthIunput(){
+ this.canvasAssetObj.Width = this.assetWidth
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+ //素材高度输入框改变
+ assetHeightIunput(){
+ this.canvasAssetObj.Height = this.assetHeight
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+ //素材角度输入框改变
+ assetAngleIunput(){
+ this.canvasAssetObj.Angle = this.sliderValue
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+ //素材厚度输入框改变
+ assetThicknessIunput(){
+ this.canvasAssetObj.Thickness = this.sliderValueThickness
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+ //素材是否高亮改变----->本地操作行为
+ assetHighLightIunput(){
+
+ }
+
+ //动态属性素材input框值改变
+ assetInputChange(i,e){
+ let index = this.canvasAssetObj.PropertyInfos.findIndex((item)=>{
+ return i.PropertyName == item.PropertyName
+ })
+ this.canvasAssetObj.PropertyInfos[index].PropertyValue = e.target.value
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+ //动态属性素材布尔值框改变radio
+ assetRadioChange(i,boolean){
+ let index = this.canvasAssetObj.PropertyInfos.findIndex((item)=>{
+ return i.PropertyName == item.PropertyName
+ })
+ this.canvasAssetObj.PropertyInfos[index].PropertyValue = boolean
+ this.canvasData.isChange = true
+ }
+
+ colorIndex//默认素材颜色
+ selectedcolor//点击选择的颜色
+ //选择素材颜色
+ selectcolor(item,key){
+ //在当前透明度基础上改变颜色
+ this.selectedcolor = item + this.selectedcolor.substring(this.selectedcolor.length-2)
+ this.canvasAssetObj.Color = this.selectedcolor
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+ //颜色选择滑竿的值
+ colorDivSliderValue
+ colorDivSliderChange(){
+ let colorOpacity = Math.round(255 * this.colorDivSliderValue * 0.01)
+ //根据滑竿值改变16进制颜色后两位
+ function replacepos(text,start,stop,replacetext){
+ let mystr = text.substring(0,stop-1)+replacetext+text.substring(stop+1);
+ return mystr;
+ }
+ this.selectedcolor = replacepos(this.selectedcolor,7,8,colorOpacity.toString(16))
+ this.canvasAssetObj.Color = this.selectedcolor
+ this.canvasData.isChange = true
+ this.canvas.refreshIcon(this.canvasAssetObj.Id)
+ }
+
+
+ //上传素材图片
+ selectFile(e){
+ let imgFile = e.target.files[0] || null //上传的文件
+ this.startUploading(imgFile)
+ }
+ objectName:any //上传对象名
+ startUploading (imgFile) {
+ let _this = this
+ let file = imgFile || null //获取上传的文件
+ let fileSize = file.size || null //上传文件的总大小
+ let shardSize = 5 * 1024 * 1024 //5MB一个分片
+ let companyId = sessionStorage.getItem("companyId")
+ if (file && fileSize <= shardSize) { //上传文件<=5MB时
+ let formData = new FormData()
+ formData.append("file",file)
+ this.http.post(`api/Objects/WebPlan2D/${companyId}`,formData).subscribe((data:any)=>{
+ this.objectName = data.objectName
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传成功','确定',config)
+
+ //在原始素材对象和需要循环图片的对象中分别push最新上传的图片
+ let imgObj = {
+ "Tag": null,
+ "Order": 0,
+ "Enabled": false,
+ "Visible": false,
+ "Required": false,
+ "RuleName": null,
+ "RuleValue": null,
+ "PhysicalUnit": null,
+ "PropertyName": "图片",
+ "PropertyType": 3,
+ "PropertyValue": "/api/Objects/WebPlan2D/" + this.objectName
+ }
+
+ this.imagesArr.push(imgObj)
+ this.canvasAssetObj.PropertyInfos.push(imgObj)
+
+ setTimeout(() => {
+ this.mySwiper = new Swiper('.swiper-container',{
+ loop: false,
+ // grabCursor: true,
+ // 如果需要前进后退按钮
+ navigation: {
+ nextEl: '.swiper-button-next',
+ prevEl: '.swiper-button-prev',
+ },
+ on:{
+ click: function(){
+ _this.clickedIndex = this.clickedIndex
+ },
+ }
+ });
+
+ this.mySwiper.slideTo(this.imagesArr.length - 1)
+ this.gallery.update()
+ }, 0);
+
+ //判断上传素材属性图片是否超出数量 超出数量则隐藏input框
+ if(this.imagesArr.length < this.imagesArrNum){//不超出input才会显示
+ this.isImgNumCss = true
+ }else{
+ this.isImgNumCss = false
+ }
+
+ this.canvasData.isChange = true
+ })
+ } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传图片文件不允许大于5mb','确定',config);
+ }
+
+ }
+
+ //不能上传图片提示
+ imgNumBeyond(){
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('图片数量已达上限','确定',config);
+ }
+
+ //删除素材属性图片
+ deleteImg(){
+ if(this.imagesArr.length == 0){
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('没有可删除的图片，请先上传','确定',config)
+ }else{
+ // 在素材原始对象中将删除的图片去掉
+ this.canvasAssetObj.PropertyInfos = [...this.canvasAssetObj.PropertyInfos.filter((item)=>{
+ return item.PropertyValue != this.imagesArr[this.mySwiper.activeIndex].PropertyValue
+ })]
+ //在图片循环数组中将图片去掉
+ this.imagesArr.splice(this.mySwiper.activeIndex, 1);
+ //更新swiper视图
+ setTimeout(() => {
+ this.mySwiper.update();
+ this.gallery.update()
+ }, 0);
+
+ //将上传的input框显示出来
+ this.isImgNumCss = true;
+ //清除图片缓存
+ if((document.getElementById('inputimg'))){
+ (document.getElementById('inputimg')).value = null //清空input框缓存
+ }
+
+ this.canvasData.isChange = true
+ }
+ }
+
+ //动态属性方向select选择框
+ direction(i,e){
+ let index = this.canvasAssetObj.PropertyInfos.findIndex((item)=>{
+ return i.PropertyName == item.PropertyName
+ })
+ this.canvasAssetObj.PropertyInfos[index].PropertyValue = e.target.value
+ this.canvasData.isChange = true
+ }
+
+ //动态属性供给区域select选择框
+ supplyArea(i,e){
+ let index = this.canvasAssetObj.PropertyInfos.findIndex((item)=>{
+ return i.PropertyName == item.PropertyName
+ })
+ this.canvasAssetObj.PropertyInfos[index].PropertyValue = e.target.value
+ this.canvasData.isChange = true
+ }
+
+ //动态属性供给类型select选择框
+ supplyType(i,e){
+ let index = this.canvasAssetObj.PropertyInfos.findIndex((item)=>{
+ return i.PropertyName == item.PropertyName
+ })
+ this.canvasAssetObj.PropertyInfos[index].PropertyValue = e.target.value
+ this.canvasData.isChange = true
+ }
+
+ isSixShow = true
+ isSixbtn = true //控制想定作业编辑按钮
+ isxxx = true //控制查看编辑模式的编辑模式按钮
+ examMsg = { //单位,考试信息
+ conpanyName: sessionStorage.getItem('companyName') || '暂无数据', //单位名称
+ keynote: '', //考试要点
+ }
+
+ ngOnInit(): void {
+
+ this.getAllLibrary('plan') //获取素材库
+ this.getAllBuildings() //获取所有建筑
+ this.getAllFirePlan() //获取当前单位灾情
+
+ let that = this
+ window.setTimeout(()=>{
+ document.getElementById("functionalDomainContent").oncontextmenu = function (event) {
+ // that.canvas.cancelPaint()
+ that.selectImageIndex = -1
+ event.preventDefault();
+ };
+ })
+
+ this.canvasData.getMessage().subscribe((message: any)=>{
+ if(message == "send a message"){
+ this.refurbishTreeData()
+ }
+ })
+
+ }
+
+ ngAfterViewInit(): void {
+
+ this.getSitePlan() //获取总平面图/楼层
+
+ // 监听canvas组件选中素材事件
+ this.canvas.on("select",obj=>{
+ //选中素材属性注入函数
+ this.setAssetsProperty(obj.assetData)
+ })
+ // 监听canvas组件取消选中素材事件
+ this.canvas.on("deselect",obj=>{
+ this.isShowProperty = false
+ })
+ // 监听canvas组件新增素材事件
+ this.canvas.on("createIcon",obj=>{
+ this.renovateTreeData(false)
+ })
+ // 监听canvas组件删除素材事件
+ this.canvas.on("deleteIcon",obj=>{
+ this.renovateTreeData(false)
+ })
+
+ }
+
+ copyAssetData:any //存储用于复制的素材
+ //复制素材
+ copyAsset(){
+ this.canvas.copy()
+ }
+ //粘贴素材
+ pasteAsset(){
+ let companyId = sessionStorage.getItem("companyId")
+ let buildingId = this.beforeOneCheckedBuilding.id
+ let floorId = this.selectingSitePlan.id
+ this.canvas.paste(companyId,buildingId,floorId)
+ }
+
+ basicInfo:boolean = true //基本信息名称显隐
+ wantToWork:boolean = true //想定作业名称显隐
+ //点击基本信息名称
+ basicInfoClick(){
+ this.basicInfo = !this.basicInfo
+ this.canvas.setNameVisible(this.basicInfo,0)
+ }
+
+ //点击想定作业名称
+ wantToWorkClick(){
+ this.wantToWork = !this.wantToWork
+ this.canvas.setNameVisible(this.wantToWork,1)
+ }
+
+ isEditPattern:boolean = true //是否为编辑模式
+ //进入编辑模式
+ editpat(){
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('进入编辑模式','确定',config);
+ this.isEditPattern = true
+ }
+
+ //进入查看模式
+ lookpat(){
+ let config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('进入查看模式','确定',config);
+ this.isEditPattern = false
+ }
+
+ //保存平面图
+ saveNum :any = []
+ saveSite(){
+ if (this.selectingSitePlan && this.selectingSitePlan.id) {
+ this.saveNum = []
+ let SitePlanData = JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData));
+ SitePlanData.data = JSON.stringify(SitePlanData.data)
+ let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+ CompanyData.data = JSON.stringify(CompanyData.data)
+
+ let object = this.canvasData.originalcompanyBuildingData.data
+ let adjoinArr = [] //毗邻数组
+
+ if(this.pattern){//如果是基本信息编辑模式
+ return true
+ }else{//如果是想定作业编辑模式
+ const dialogRef = this.dialog.open(saveOneDialogExaminee, {
+ data: {
+ allDisposalNode: this.canvasData.allDisposalNode,
+ selectedBuildingData:this.beforeOneCheckedBuilding,
+ selectedSiteData:this.selectingSitePlan,
+ siteOrbuilding:this.checkedBuildingIndex,
+ disasterId: this.allFirePlan[0].id || ''
+ }
+ });
+
+ dialogRef.afterClosed().subscribe(result => {
+ console.log('The dialog was closed');
+ });
+ }
+
+ } else { //if
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('暂无楼层数据','确定',config);
+ }
+ }
+
+ //获得所有的建筑物
+ getAllBuildings(){
+ this.http.get("/api/Buildings",{
+ params:{
+ companyId : this.params.companyId
+ }
+ }).subscribe(data=>{
+ this.allBuildings = data
+ })
+ }
+
+
+ //选择建筑
+ checkedBuilding(item,index){
+ if (this.checkedBuildingIndex!=index) {
+
+ if (this.canvasData.isChange) { //true 数据被改动
+ let isTrue = confirm('是否保存当前编辑数据')
+ if (isTrue) { //先保存数据 在切换
+ let isSuccess = this.saveSite()//true的时候 先保存数据
+ if (isSuccess != false) {
+ this.beforeOneCheckedBuilding = item
+ this.checkedBuildingIndex = index
+ if (index==-1) { //总平面图数据
+ this.getSitePlan()
+ } else { //建筑楼层/区域数据
+ this.getBuildingSitePlan(item)
+ }
+ }
+ } else {
+ this.beforeOneCheckedBuilding = item
+ this.checkedBuildingIndex = index
+ if (index==-1) { //总平面图数据
+ this.getSitePlan()
+ } else { //建筑楼层/区域数据
+ this.getBuildingSitePlan(item)
+ }
+ }
+ } else { //flase 数据未被改动
+ this.beforeOneCheckedBuilding = item
+ this.checkedBuildingIndex = index
+ if (index==-1) { //总平面图数据
+ this.getSitePlan()
+ } else { //建筑楼层/区域数据
+ this.getBuildingSitePlan(item)
+ }
+ } //if
+
+ } //if
+ }
+
+
+ //删除建筑
+ deleteBuilding(e,item){
+ e.stopPropagation();
+ if(confirm("是否删除该建筑") == true){
+ let isHave = this.canvasData.allDisposalNode.find(items=>{ return items.buildingId === item.id })
+ if (isHave == undefined) {
+ this.http.delete(`/api/Buildings/${item.id}`).subscribe(data=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('删除成功','确定',config);
+ this.http.get("/api/Buildings",{
+ params:{
+ companyId :this.params.companyId
+ }
+ }).subscribe(data=>{
+ this.allBuildings = data
+ this.beforeOneCheckedBuilding = {name:"总平面图"}
+ this.checkedBuildingIndex = -1
+ this.getSitePlan()
+ })
+ },err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('删除失败','确定',config);
+ this.getAllBuildings()
+ })
+ } else { //建筑 含有数据节点时
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('含有数据节点的建筑不允许删除','确定',config);
+ }
+ }
+ }
+
+ storeyData //将建筑素材和当前楼层素材合二为一
+
+ //处理 tree 数据结构
+ handleTreeData (storeyData) {
+ //storeyData为当前楼层拥有的消防设施
+ this.storeyData = storeyData
+ let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板
+ console.log(data)
+ let treeData = [] //tree型 处理完成后的数据
+ data.forEach(element => {
+ element.key = element.id
+ element.isTemplate = true //添加模板标识
+ element.isLook = true //添加是否可见标识
+ element.name != '其他' ? element.children = [] : null
+ if(storeyData){
+ for(let key in storeyData.data){
+ storeyData.data[key].isLookPattern = true
+ if(element.id == storeyData.data[key].FireElementId){
+ storeyData.data[key].isTemplate = false
+ storeyData.data[key].isLook = true
+
+ element.isNewElement = true //该节点children是否存在新添加的真实素材 标识
+
+ //定义查看模式下能看到的元素
+ element.isLookPattern = true
+ if(element.parentId){
+ data.forEach(i => {
+ if(i.id == element.parentId){
+ i.isLookPattern = true
+ }
+ })
+ }
+ element.children.push(storeyData.data[key])
+ }
+ }
+ }
+ data.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} });
+ });
+ data.forEach(element => {
+ if (!element.parentId) { treeData.push(element) }
+ });
+
+ function recursionFilterEmpty(originalList, result) {
+ for(let i = 0, length = originalList.length; i < length; i++) {
+ const item = originalList[i];
+ if (item.PropertyInfos) {
+ // 最内层
+ result.push(item);
+ } else if (item.children && item.children.length) {
+ const newChildren = [];
+ // 递归调用，底层的真实数据会全部 push 进 newChildren 中
+ recursionFilterEmpty(item.children, newChildren);
+ if (newChildren.length) {
+ // 替换原始数据
+ item.children = newChildren;
+ // 子项有真实的数据，就保留这一项
+ result.push(item);
+ } // 如果没有这一项就会被删除
+ }
+ }
+ }
+
+ function filterEmpty(listData) {
+ const result = [];
+ recursionFilterEmpty(listData, result);
+ return result;
+ }
+
+
+ // console.log(filterEmpty(treeData))
+ this.dataSource.data = filterEmpty(treeData)
+
+ this.treeControl.expandAll()
+
+ }
+
+ //点击树节点
+ clickTreeNode(node){
+
+ if(this.canvasData.originalcompanyBuildingData.data[node.id]){
+ this.setAssetsProperty(this.canvasData.originalcompanyBuildingData.data[node.id])
+ }else if(this.canvasData.originaleveryStoreyData.data[node.id]){
+ this.setAssetsProperty(this.canvasData.originaleveryStoreyData.data[node.id])
+ }
+
+ // console.log(node)
+
+ // canvas上的素材高亮
+ let iconHighLightArr:any = []
+ if(node.isTemplate){//如果是模板,则开始向下找
+ node.children.forEach(item => {
+ if(item.isTemplate){//如果子节点依旧是模板,则继续开始向下找
+ item.children.forEach(i => {
+ iconHighLightArr.push(i.Id)
+ })
+ }else{
+ iconHighLightArr.push(item.Id)
+ }
+ })
+ }else{
+ iconHighLightArr.push(node.id)
+ }
+ // console.log(456,iconHighLightArr)
+ this.canvas.setHighlight(iconHighLightArr)
+ }
+
+ //点击树节点的显示隐藏icon
+ clickLookItem(node){
+
+ //修改真实素材islook属性
+ for(let key in this.storeyData.data){
+ if(key == node.id){
+ this.storeyData.data[key].isLook = !this.storeyData.data[key].isLook
+ }
+ }
+
+ //所有消防要素模板变化islook值
+ if(node.isTemplate && node.name == "其他"){
+ this.allFireElements.forEach(item=>{
+ if(item.name == "其他"){
+ item.isLook = !item.isLook
+ }
+ })
+ }
+ if(node.isTemplate){
+ this.allFireElements.forEach(item=>{
+ if(item.id == node.id){
+ item.isLook = !item.isLook
+ }
+ })
+ }
+
+
+ //子节点跟随父节点的islook变化
+ if(node.children && node.children.length != 0){
+ node.children.forEach(item=>{
+ item.isLook = !node.isLook
+ if(item.children && item.children.length != 0){
+ item.children.forEach(i=>{
+ i.isLook = !node.isLook
+ })
+ }
+ })
+ }
+
+
+ const nodes = this.treeControl.dataNodes;
+ const expandNodes = [];
+ nodes.forEach((item) => {
+ if(item.expandable && this.treeControl.isExpanded(item)){
+ expandNodes.push(item.id);
+ }
+ });
+
+ this.dataSource.data = [...this.dataSource.data]
+
+ let newNodes = this.treeControl.dataNodes;
+ newNodes = newNodes.filter(n => {
+ return expandNodes.indexOf(n.id) >= 0;
+ });
+ newNodes.forEach(item => {
+ this.treeControl.expand(item);
+ });
+
+ //canvas上的素材显隐
+ let iconVisibleArr:any = []
+ if(node.isTemplate){//如果是模板,则开始向下找
+ node.children.forEach(item => {
+ if(item.isTemplate){//如果子节点依旧是模板,则继续开始向下找
+ item.children.forEach(i => {
+ iconVisibleArr.push(i.Id)
+ })
+ }else{
+ iconVisibleArr.push(item.Id)
+ }
+ })
+ }else{
+ iconVisibleArr.push(node.id)
+ }
+ console.log(1,iconVisibleArr)
+ console.log(2,node.isLook)
+ this.canvas.setIconVisible(iconVisibleArr,!node.isLook)
+
+ }
+
+ //打开消防设施考题设定
+ openFireExamination () {
+ let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
+ let buildFloorData = {
+ buildingData:this.beforeOneCheckedBuilding,
+ floorData:this.selectingSitePlan
+ }
+ let data = { treeData: treeData,oldRealData:this.storeyData ,buildFloorData:buildFloorData}
+ let dialogRef = this.dialog.open(examinationQuestionsExaminee,{data});
+ }
+
+ //上传考题
+ openUploadQuestions () {
+ let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
+ let nodes = JSON.parse( JSON.stringify( JSON.parse(sessionStorage.getItem('examNodeList')) ) )
+ if (nodes) {
+ let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes ,allFireElements:this.allFireElements}
+ let dialogRef = this.dialog.open(uploadQuestionsExaminee,{data});
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('未选择考核处置节点','确定',config);
+ }
+ }
+
+ //封装 刷新 tree 数据
+ async renovateTreeData (isRefresh:boolean = true) {
+ this.allFireElements[this.allFireElements.length-1].children = []
+ this.beforeOneCheckedBuildingIsShow = false
+ isRefresh? await this.canvas.refresh() : null
+ this.canvas.setNameVisible(this.basicInfo,0)
+ this.canvas.setNameVisible(this.wantToWork,1)
+ isRefresh? this.canvasData.isChange = false : null //服务中 数据是否改动 改为false
+ isRefresh? this.isShowProperty = true : null
+ isRefresh? this.isShowAttribute = true : null
+
+ let beforeOneId = this.selectingSitePlan.id || '' //当前 选中 平面图 楼层/区域 id
+ let companyBuildingData = JSON.parse(JSON.stringify( this.canvasData.originalcompanyBuildingData || {} )) // 当前 单位/建筑 数据
+ let storeyData = JSON.parse(JSON.stringify( this.canvasData.originaleveryStoreyData || {} )) //当前 楼层 数据
+
+ // for(let key in companyBuildingData.data){
+ // if (companyBuildingData.data[key].FloorId === beforeOneId) { //处理 单位/建筑 数据是否归于当前楼层下
+ // storeyData.data[key] = companyBuildingData.data[key]
+ // }
+ // }
+ console.log(566,storeyData.data)
+ for(let key in storeyData.data){ //筛选数据
+ storeyData.data[key].key = storeyData.data[key].Id
+ let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
+ //没有匹配全部放入到 其他 数组
+ if (!noMatch) {
+ this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
+ }
+ }
+ this.handleTreeData(storeyData) //处理tree数据结构
+ }
+
+
+
+ //陈鹏飞↓↓↓
+ //陈鹏飞↓↓↓
+ //陈鹏飞↓↓↓
+ params = {companyId: sessionStorage.getItem('companyId')}
+ allFireElements:any = []; //当前 单位/建筑 下的消防要素
+
+ isShowAttribute:boolean = true; //属性栏 是否显示 默认数据
+ isShowProperty:boolean = false //属性栏 是否有东西
+
+ toggleExpandPanel:boolean = false; //左侧可展开面板展开或关闭
+ toggleExpandPanelRight:boolean = false; //右侧可展开面板展开或关闭
+ togglePlane:boolean = true; //可展开面板平面图 显隐
+ toggleMaterialBank:boolean = true; //可展开面板素材库 显隐
+ toggleHandlePlans:boolean = true; //可展开面板处置预案 显隐
+ //可展开面板展开或关闭
+ toggle () {
+ this.toggleExpandPanel = !this.toggleExpandPanel
+ }
+ //可展开面板展开或关闭
+ toggle2 () {
+ this.toggleExpandPanelRight = !this.toggleExpandPanelRight
+ }
+ //可展开面板 平面图 展开或关闭
+ togglePlanarGraph () {
+ this.togglePlane = !this.togglePlane
+ }
+ //可展开面板 素材库 展开或关闭
+ toggleMaterial () {
+ this.toggleMaterialBank = !this.toggleMaterialBank
+ }
+ //可展开面板 处置预案 展开或关闭
+ toggleHandlePlan () {
+ this.toggleHandlePlans = !this.toggleHandlePlans
+ }
+
+ sitePlanData:any = []; //总平面图 楼层/区域 数据
+ selectingSitePlan:any; //选中的 平面图 楼层/区域
+ selectSitePlanIndex:number; //选中的 平面图 楼层/区域 index
+
+ //获取总平面图
+ getSitePlan () {
+ let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+ let planData = this.getSitePlanCompanyData() //获取 单位 数据
+ this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
+ this.sitePlanData = data
+ this.selectingSitePlan = this.sitePlanData[0] || {}
+ this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
+ this.selectSitePlanIndex = 0
+
+ Promise.all([fireData,planData]).then((res)=>{
+ this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+ })
+
+ })
+ }
+
+ //获取建筑 楼层/区域
+ getBuildingSitePlan (item) {
+ let params = { buildingId: item.id }
+ let fireData = this.getFireElements(item.buildingTypes[0].id || '') //获取建筑下 消防要素
+ let planData = this.getBuildingData(params) //获取 建筑 数据
+ this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
+ this.sitePlanData = data
+ this.selectingSitePlan = this.sitePlanData[0] || {}
+ this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
+ this.selectSitePlanIndex = 0
+
+ Promise.all([fireData,planData]).then((res)=>{
+ this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+ })
+
+ })
+ }
+
+ //根据单位类型获得所有的消防要素
+ getFireElements (e) {
+ let params = {ids:e}
+ return new Promise ((resolve,reject)=>{
+ this.http.get('/api/Companies/FireElements',{params}).subscribe((data:any)=>{
+ this.allFireElements = data //所有消防要素
+ let other = {
+ children: [],
+ computed: true,
+ id: '',
+ name: '其他',
+ order: 999,
+ parentId: null,
+ tag: "INPUT",
+ isLookPattern : true
+ }
+ this.allFireElements.push(other)
+ resolve('success')
+ })
+ })
+ }
+
+ //获取 单位 数据
+ getSitePlanCompanyData () {
+ return new Promise ((resolve,reject)=>{
+ this.http.get('/api/CompanyData',{params:this.params}).subscribe((data:any)=>{
+ this.canvasData.originalcompanyBuildingData = data || {} // 单位原数据
+ this.canvasData.originalcompanyBuildingData.data? this.canvasData.originalcompanyBuildingData.data = JSON.parse(this.canvasData.originalcompanyBuildingData.data) : this.canvasData.originalcompanyBuildingData.data = {}
+ this.canvasData.originalcompanyBuildingData.version? null : this.canvasData.originalcompanyBuildingData.version = "2.0"
+ this.canvasData.originalcompanyBuildingData.companyId? null : this.canvasData.originalcompanyBuildingData.companyId = sessionStorage.getItem('companyId')
+ resolve('success')
+ })
+ })
+ }
+
+ //获取 平面图 楼层数据
+ getSitePlanStorey (e) {
+ let params = {sitePlanId: e.id}
+ this.http.get(`/api/SitePlanData`,{params}).subscribe((data:any)=>{
+ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+ this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+ this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
+ this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = e.id || null
+ this.renovateTreeData()
+ })
+ }
+
+ //获取 建筑 数据
+ getBuildingData (e) {
+ return new Promise ((resolve,reject)=>{
+ this.http.get(`/api/BuildingData`,{params:e}).subscribe((data:any)=>{
+ this.canvasData.originalcompanyBuildingData = data || {} // 建筑原数据
+ this.canvasData.originalcompanyBuildingData.data? this.canvasData.originalcompanyBuildingData.data = JSON.parse(this.canvasData.originalcompanyBuildingData.data) : this.canvasData.originalcompanyBuildingData.data = {}
+ this.canvasData.originalcompanyBuildingData.version? null : this.canvasData.originalcompanyBuildingData.version = "2.0"
+ this.canvasData.originalcompanyBuildingData.buildingId? null : this.canvasData.originalcompanyBuildingData.buildingId = e.buildingId
+ resolve('success')
+ })
+ })
+ }
+
+ //获取 建筑 楼层数据
+ getBuildingStorey (e) {
+ let params = {buildingAreaId: e.id}
+ this.http.get(`/api/BuildingAreaData`,{params}).subscribe((data:any)=>{
+ this.canvasData.originaleveryStoreyData = data || {} // 楼层原数据
+ this.canvasData.originaleveryStoreyData.data? this.canvasData.originaleveryStoreyData.data = JSON.parse(this.canvasData.originaleveryStoreyData.data) : this.canvasData.originaleveryStoreyData.data = {}
+ this.canvasData.originaleveryStoreyData.version? null : this.canvasData.originaleveryStoreyData.version = "2.0"
+ this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = e.id || null
+ this.renovateTreeData()
+ })
+ }
+
+ //点击选中 平面图 楼层/区域 时
+ selectSitePlan (item,index) {
+
+ if (this.selectSitePlanIndex != index) {
+ this.canvasData.selectPanelPoint = new DisposalNodeData();
+ if (this.canvasData.isChange) { //true 数据被改动
+ let isTrue = confirm('是否保存当前编辑数据')
+ if (isTrue) { //先保存数据 在切换
+ let isSuccess = this.saveSite()//true的时候 先保存数据
+ if (isSuccess != false) {
+ this.selectingSitePlan = item
+ this.selectSitePlanIndex = index
+ this.canvasData.selectStorey = item //服务中 存一份数据
+ if (this.checkedBuildingIndex==-1) { //总平面图时
+ this.getSitePlanStorey(item) //获取 平面图 楼层数据
+ } else { //楼层/区域时
+ this.getBuildingStorey(item) //获取 建筑 楼层数据
+ }
+ }
+ } else { //不保存数据 直接切换
+ this.selectingSitePlan = item
+ this.selectSitePlanIndex = index
+ this.canvasData.selectStorey = item //服务中 存一份数据
+ if (this.checkedBuildingIndex==-1) { //总平面图时
+ this.getSitePlanStorey(item) //获取 平面图 楼层数据
+ this.getSitePlanCompanyData()
+ } else { //楼层/区域时
+ this.getBuildingStorey(item) //获取 建筑 楼层数据
+ let params = { buildingId: this.beforeOneCheckedBuilding.id }
+ this.getBuildingData(params)
+ }
+ }
+
+ } else { //false 数据没被改动
+ this.selectingSitePlan = item
+ this.selectSitePlanIndex = index
+ this.canvasData.selectStorey = item //服务中 存一份数据
+ if (this.checkedBuildingIndex==-1) { //总平面图时
+ this.getSitePlanStorey(item) //获取 平面图 楼层数据
+ } else { //楼层/区域时
+ this.getBuildingStorey(item) //获取 建筑 楼层数据
+ }
+ } //if
+
+ }
+ }
+
+
+ //平面图 楼层/区域 上移
+ moveUp (item,index) {
+ if (index != 0) {
+ let replaceIndex = this.sitePlanData[index].order
+ this.sitePlanData[index].order = this.sitePlanData[index-1].order
+ this.sitePlanData[index-1].order = replaceIndex
+ if (this.checkedBuildingIndex==-1) { //总平面图
+ this.http.put(`/api/SitePlans/${this.sitePlanData[index-1].id}`,this.sitePlanData[index-1]).subscribe(data=>{
+ this.http.put(`/api/SitePlans/${this.sitePlanData[index].id}`,this.sitePlanData[index]).subscribe(data=>{
+ this.selectSitePlanIndex = this.selectSitePlanIndex-1
+ this.renovateSitePlan()
+ })
+ })
+ } else { //楼层/区域
+ this.http.put(`/api/BuildingAreas/${this.sitePlanData[index-1].id}`,this.sitePlanData[index-1],{params:this.params}).subscribe(data=>{
+ this.http.put(`/api/BuildingAreas/${this.sitePlanData[index].id}`,this.sitePlanData[index],{params:this.params}).subscribe(data=>{
+ this.selectSitePlanIndex = this.selectSitePlanIndex-1
+ this.renovateBuilding()
+ })
+ })
+ }
+
+ } //if index
+ }
+
+ //平面图 楼层/区域 下移
+ moveDown (item,index) {
+ if (index != this.sitePlanData.length-1) {
+ let replaceIndex = this.sitePlanData[index].order
+ this.sitePlanData[index].order = this.sitePlanData[index+1].order
+ this.sitePlanData[index+1].order = replaceIndex
+ if (this.checkedBuildingIndex==-1) { //总平面图
+ this.http.put(`/api/SitePlans/${this.sitePlanData[index+1].id}`,this.sitePlanData[index+1]).subscribe(data=>{
+ this.http.put(`/api/SitePlans/${this.sitePlanData[index].id}`,this.sitePlanData[index]).subscribe(data=>{
+ this.selectSitePlanIndex = this.selectSitePlanIndex+1
+ this.renovateSitePlan()
+ })
+ })
+ } else { //楼层/区域
+ this.http.put(`/api/BuildingAreas/${this.sitePlanData[index+1].id}`,this.sitePlanData[index+1],{params:this.params}).subscribe(data=>{
+ this.http.put(`/api/BuildingAreas/${this.sitePlanData[index].id}`,this.sitePlanData[index],{params:this.params}).subscribe(data=>{
+ this.selectSitePlanIndex = this.selectSitePlanIndex+1
+ this.renovateBuilding()
+ })
+ })
+ }
+
+ } //if index
+ }
+
+ //旋转底图
+ revolveImg (item) {
+ item.imageAngle==270? item.imageAngle = 0 : item.imageAngle = item.imageAngle+90
+ if (this.checkedBuildingIndex==-1) { //总平面图
+ this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
+ let isSuccess = this.renovateSitePlan()
+ isSuccess.then(res=>{
+ this.canvas.refreshBackgroundImage()
+ })
+ })
+ } else { //楼层/区域
+ this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
+ let isSuccess = this.renovateBuilding()
+ isSuccess.then(res=>{
+ this.canvas.refreshBackgroundImage()
+ })
+ })
+ }
+
+ }
+
+ //删除 平面图 楼层/区域
+ deletePlaneData (item) {
+ const isDelete = confirm('您确定要删除吗');
+ if (isDelete) {
+ if (this.checkedBuildingIndex==-1) { //总平面图
+ let isHave = this.canvasData.allDisposalNode.find(items=>{ return items.sitePlanId === item.id })
+ if (isHave == undefined) {
+ this.http.delete(`/api/SitePlans/${item.id}`).subscribe(data=>{
+ this.deleteShareData(item,-1)
+ })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('含有数据节点的楼层不允许删除','确定',config);
+ }
+ } else { //楼层/区域
+ let isHave = this.canvasData.allDisposalNode.find(items=>{ return items.buildingAreaId === item.id })
+ if (isHave == undefined) {
+ this.http.delete(`/api/BuildingAreas/${item.id}`).subscribe(data=>{
+ this.deleteShareData(item,1)
+ })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('含有数据节点的楼层不允许删除','确定',config);
+ }
+ }
+ }
+ }
+
+ //删除当前 单位/建筑的 共享数据中 已删除data
+ deleteShareData (e,isCompany) {
+ this.sitePlanData.forEach((element,index) => {
+ if (element.id===e.id) {
+ this.sitePlanData.splice(index,1)
+ return
+ }
+ });
+ let data = this.canvasData.originalcompanyBuildingData;
+ for(let key in data.data){
+ if (data.data[key].FloorId === e.id) { //处理 单位/建筑 数据是否归于当前楼层下
+ delete data.data[key]
+ }
+ }
+ let newData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
+ newData.data = JSON.stringify(newData.data) // 转换JSON 数据格式
+ this.selectingSitePlan = this.sitePlanData[0] || {}
+ this.canvasData.selectStorey = this.sitePlanData[0] || {} //服务中 存一份数据
+ this.selectSitePlanIndex = 0
+ this.canvasData.isChange = false
+ if (isCompany===-1) {
+ this.http.post("/api/CompanyData",newData).subscribe(data => {})
+ this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+ } else {
+ this.http.post("/api/BuildingData",newData,{params:this.params}).subscribe(data => {})
+ this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+ }
+ }
+
+ //复制图层 平面图 楼层/区域
+ duplicateLayer (item) {
+ if (this.checkedBuildingIndex==-1) { //总平面图
+ item.id = ""
+ item.modifiedTime = new Date()
+ item.name = item.name + '(副本)'
+ item.order = this.sitePlanData[this.sitePlanData.length-1].order+1
+ this.http.post('/api/SitePlans',item).subscribe((data:any)=>{
+ let newData = {
+ version: this.canvasData.originaleveryStoreyData.version || "2.0",
+ id: "",
+ data: JSON.stringify( JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data)) ) || null,
+ sitePlanId: data.id
+ }
+ this.http.post('/api/SitePlanData',newData,{params:this.params}).subscribe(data=>{
+ this.renovateSitePlan()
+ })
+
+ })
+ } else { //楼层/区域
+ item.id = ""
+ item.modifiedTime = new Date()
+ item.name = item.name + '(副本)'
+ item.order = this.sitePlanData[this.sitePlanData.length-1].order+1
+ this.http.post('/api/BuildingAreas',item,{params:this.params}).subscribe((data:any)=>{
+ let newData = {
+ version: this.canvasData.originaleveryStoreyData.version || "2.0",
+ id: "",
+ data: JSON.stringify( JSON.parse(JSON.stringify(this.canvasData.originaleveryStoreyData.data)) ) || null,
+ buildingAreaId: data.id
+ }
+ this.http.post('/api/BuildingAreaData',newData,{params:this.params}).subscribe(data=>{
+ this.renovateBuilding()
+ })
+
+ })
+ }
+ }
+
+ //平面图 楼层/区域 替换底图
+ replaceBaseMap (e,item) {
+ e.stopPropagation();
+ let file = e.target.files[0] || null //获取上传的文件
+ let fileSize = file.size || null //上传文件的总大小
+ let maxSize = 5 * 1024 * 1024 //5MB一个分片
+
+ if (file && fileSize<=maxSize) { //上传文件<=5MB时
+ let formData = new FormData()
+ formData.append("file",file)
+ this.http.post(`/api/Objects/WebPlan2D/${sessionStorage.getItem('companyId')}`,formData).subscribe((data:any)=>{
+ this.renovateBaseMap(data.objectName,item)
+ })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传底图需小于5MB','确定',config);
+ }
+ }
+
+ //封装 替换底图 function
+ renovateBaseMap (e,item) {
+ item.imageUrl = '/api/Objects/WebPlan2D/' + e
+ if (this.checkedBuildingIndex ==-1) { //总平面图
+ this.http.put(`/api/SitePlans/${item.id}`,item).subscribe(data=>{
+ let isSuccess = this.renovateSitePlan()
+ isSuccess.then(res=>{
+ this.canvas.refreshBackgroundImage()
+ })
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传底图成功','确定',config);
+ })
+ } else { //楼层/区域
+ this.http.put(`/api/BuildingAreas/${item.id}`,item,{params:this.params}).subscribe(data=>{
+ let isSuccess = this.renovateBuilding()
+ isSuccess.then(res=>{
+ this.canvas.refreshBackgroundImage()
+ })
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('上传底图成功','确定',config);
+ })
+ }
+ }
+
+ //封装 刷新总平面图 数据
+ renovateSitePlan () {
+ return new Promise ((resolve,reject)=>{
+ this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
+ this.sitePlanData = data
+ this.selectingSitePlan = this.sitePlanData[this.selectSitePlanIndex]
+ this.canvasData.selectStorey = this.sitePlanData[this.selectSitePlanIndex] //服务中 存一份数据
+ this.canvasData.originaleveryStoreyData.sitePlanId? null : this.canvasData.originaleveryStoreyData.sitePlanId = this.selectingSitePlan.id || null
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('数据更新成功','确定',config);
+ resolve('success')
+ })
+ })
+ }
+
+ //封装 刷新 楼层/区域 数据
+ renovateBuilding () {
+ let params = {
+ buildingId: this.beforeOneCheckedBuilding.id
+ }
+ return new Promise ((resolve,reject)=>{
+ this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
+ this.sitePlanData = data
+ this.selectingSitePlan = this.sitePlanData[this.selectSitePlanIndex]
+ this.canvasData.selectStorey = this.sitePlanData[this.selectSitePlanIndex] //服务中 存一份数据
+ this.canvasData.originaleveryStoreyData.buildingAreaId? null : this.canvasData.originaleveryStoreyData.buildingAreaId = this.selectingSitePlan.id || null
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('数据更新成功','确定',config);
+ resolve('success')
+ })
+ })
+ }
+
+ allLibrary:any = []; //所有素材库 + 素材
+ selectLibrary:any; //选中的素材库
+ selectImage:any; //选中的素材库图片
+ selectImageIndex:number; //选中的素材库图片index
+
+ //获取素材库
+ getAllLibrary (type:string='input') {
+ this.http.get(`/api/AssetLibraries?tag=${type}`).subscribe((data:any)=>{
+ data.forEach(element => {
+ element.images = []
+ });
+ this.allLibrary = data
+ this.selectImageIndex = -1
+ // this.canvas.cancelPaint()
+ })
+ }
+
+ //素材库展开面板展开时
+ opened (e) {
+ if (!e.images.length) { //当前素材库没加载素材时
+ this.http.get(`/api/Assets?libraryId=${e.id}`).subscribe((data:any)=>{
+ e.images = data
+ })
+ }
+ }
+
+ //点击选中素材库图片时
+ selectImg (item,items,index) {
+ this.selectLibrary = item.name
+ this.selectImage = items
+ this.selectImageIndex = index
+ this.canvasData.selectTemplateData = items
+ this.canvas.beginPaint()
+ }
+
+
+
+ //处置预案
+ examType = this.route.snapshot.queryParams.openType // 预案类型 1=已存在/2=自定义
+ allFirePlan:any = []; //所有灾情
+ selectDisposalNode:string = ''; //当前点击tree节点 css选中样式
+
+ //获取所有灾情
+ getAllFirePlan () {
+ let api
+ this.examType == 1? api='/api/Disasters' : api='/api/ExamDisasters'
+ let params = {componentId: sessionStorage.getItem('planId')}
+ this.http.get(api,{params:params}).subscribe((data:any)=>{
+ if (!data.length) { //该 单位没有灾情时
+ let msg = {
+ name: '灾情',
+ modifiedTime: new Date(),
+ examPlanComponentId: sessionStorage.getItem('planId')
+ }
+ this.http.post('/api/ExamDisasters',msg).subscribe(data=>{
+ this.allFirePlan.push(data)
+ this.getDisposalNode()
+ })
+ } else { //单位 有灾情时
+ this.allFirePlan = data
+ this.getDisposalNode()
+ }
+ })
+ }
+
+ //获取所有处置节点
+ getDisposalNode () {
+ let api
+ this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes'
+ this.selectDisposalNode = ''
+ let params
+ this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''}
+ this.http.get(api,{params:params}).subscribe(data=>{ //处置节点
+ this.canvasData.allDisposalNode = data
+ this.handleHybridTree()
+ })
+ }
+
+ treeData:any = []; //渲染tree处理完成数据
+ defaultExpandedKeys:any = []; //首次渲染 tree展开状态
+ //处理 节点 Tree数据
+ handleHybridTree () {
+ this.defaultExpandedKeys = []
+ let treeData = []
+ let data = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] ))
+ data.forEach(element => {
+ this.defaultExpandedKeys.push(element.id)
+ element.title = element.name //name
+ element.key = element.id //id
+ element.children = [] //children
+ if (element.sitePlanId || element.buildingAreaId) { //是数据节点
+ element.isLeaf = true
+ element.isDataNode = true
+ } else { //不是数据节点
+ element.isLeaf = false
+ element.isDataNode = false
+ }
+ data.forEach(item=>{
+ item.parentId === element.id? element.children.push(item) : null
+ })
+ });
+ data.forEach(element=>{
+ !element.parentId? treeData.push(element) : null
+ })
+ this.treeData = [...treeData]
+ this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+ }
+
+ //刷新 treeData 保存已展开节点
+ refurbishTreeData () {
+ let api
+ this.examType == 1? api='/api/DisposalNodes' : api='/api/ExamDisposalNodes'
+ this.defaultExpandedKeys = []
+ let params
+ this.examType == 1? params = {disasterId: this.allFirePlan[0].id || ''} : params = {examDisasterId: this.allFirePlan[0].id || ''}
+ this.http.get(api,{params:params}).subscribe(nodeData=>{ //处置节点
+ this.canvasData.allDisposalNode = nodeData
+ let oldTreeData = this.nzTreeComponent.getExpandedNodeList()
+ oldTreeData.forEach(item=>{
+ this.defaultExpandedKeys.push(item.key)
+ })
+ let treeData = []
+ let data = JSON.parse(JSON.stringify( this.canvasData.allDisposalNode || [] ))
+ data.forEach(element => {
+ element.title = element.name //name
+ element.key = element.id //id
+ element.children = [] //children
+ if (element.sitePlanId || element.buildingAreaId) { //是数据节点
+ element.isLeaf = true
+ element.isDataNode = true
+ } else { //不是数据节点
+ element.isLeaf = false
+ element.isDataNode = false
+ }
+ data.forEach(item=>{
+ item.parentId === element.id? element.children.push(item) : null
+ })
+ });
+ data.forEach(element=>{
+ !element.parentId? treeData.push(element) : null
+ })
+ this.treeData = [...treeData]
+ this.defaultExpandedKeys = [...this.defaultExpandedKeys]
+ })
+ }
+
+ sitePlanIcon = {fire:0,force:0} // 总平面图 火源/力量 图标 是否展示
+
+ //刷新 建筑楼层 匹配 火源/力量 图标
+ mateFireForce () {
+ let data = this.canvasData.allNodeMarkers.markers || {}
+ for(let key in data){ //遍历 火/力量 图标
+ this.sitePlanData.forEach(element => { //楼层
+ if (element.id==key) { // 相匹配时
+ data[key].fireCount != 0? element.fire=1 : element.fire=0
+ data[key].forceCount != 0? element.force=1 : element.force=0
+ }
+ });
+ this.allBuildings.forEach(element => { //建筑
+ if (element.id==key) { // 相匹配时
+ data[key].fireCount != 0? element.fire=1 : element.fire=0
+ data[key].forceCount != 0? element.force=1 : element.force=0
+ }
+ });
+ if (this.params.companyId==key) { //总平面图时
+ data[key].fireCount != 0? this.sitePlanIcon.fire=1 : this.sitePlanIcon.fire=0
+ data[key].forceCount != 0? this.sitePlanIcon.force=1 : this.sitePlanIcon.force=0
+ }
+ }
+
+ let buildingMSG = this.canvasData.allNodeMarkers.highlightMarkers || {}
+ for (let key in buildingMSG) {
+ if (key === this.canvasData.selectPanelPoint.DisposalNodeId) {
+ for (let keys in buildingMSG[key]) {
+ this.sitePlanData.forEach(element => { //楼层
+ if (element.id === keys) {
+ buildingMSG[key][keys].fireCount != 0? element.fire=2 : null
+ buildingMSG[key][keys].forceCount != 0? element.force=2 : null
+ }
+ });
+ this.allBuildings.forEach(element => { //建筑
+ if (element.id === keys) { // 相匹配时
+ buildingMSG[key][keys].fireCount != 0? element.fire=2 : null
+ buildingMSG[key][keys].forceCount != 0? element.force=2 : null
+ }
+ });
+ if (this.params.companyId === keys) { //总平面图时
+ buildingMSG[key][keys].fireCount != 0? this.sitePlanIcon.fire=2 : null
+ buildingMSG[key][keys].forceCount != 0? this.sitePlanIcon.force=2 : null
+ }
+ }
+ }
+ }
+ }
+
+ // 切换 基本信息时 刷新 删除 建筑楼层 自定义属性
+ mateDeleteCustomize () {
+ this.defaultExpandedKeys = []
+ this.sitePlanIcon = {fire:0,force:0}
+ this.sitePlanData.forEach(element => { //楼层
+ delete element.fire
+ delete element.force
+ });
+ this.allBuildings.forEach(element => { //建筑
+ delete element.fire
+ delete element.force
+ });
+ }
+
+ //选择 考试节点
+ countValue (e) {
+ e.stopPropagation()
+ if (this.canvasData.allDisposalNode.length) {
+ let data = {treeData: JSON.parse( JSON.stringify(this.treeData) ), oldTreeData: JSON.parse( JSON.stringify(this.canvasData.allDisposalNode) )}
+ let dialogRef = this.dialog.open(uploadDisposalNodesExaminee,{data});
+ dialogRef.afterClosed().subscribe(data=>{
+ if (data) {
+ sessionStorage.setItem('examNodeList',JSON.stringify(data))
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('节点保存成功','确定',config);
+ }
+ })
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('暂无处置节点','确定',config);
+ }
+ }
+
+ //复制 处置预案 节点
+ copyPanelPoint (e,item,treeData) {
+ e.stopPropagation()
+ if (confirm(`确定要复制 ${item.title} ?`)) {
+ let params = {id: item.origin.id}
+ let order
+ if (item.level==0) {
+ treeData.length? order = treeData[treeData.length-1].order+1 : order = 0
+ } else {
+ let parent = item.getParentNode() //获取父节点
+ parent.origin.children.length? order = parent.origin.children[parent.origin.children.length-1].order+1 : order = 0
+ }
+ let data = {
+ name: item.title + '(副本)',
+ level: item.level,
+ order: order,
+ description: '',
+ disasterId: item.origin.disasterId || '',
+ parentId: item.origin.parentId || null,
+ planComponentId: item.origin.planComponentId || '',
+ }
+ this.http.post('/api/DisposalNodes/Clone',data,{params:params}).subscribe(data=>{
+ this.refurbishTreeData()
+ })
+ } //isTrue
+ }
+
+ //删除 处置预案 节点
+ deletePanelPoint (e,item) {
+ e.stopPropagation()
+ if (confirm(`确定要删除 ${item.name} ?`)) {
+ this.http.delete(`/api/DisposalNodes/${item.id}`).subscribe(data=>{
+ this.refurbishTreeData()
+ })
+ }
+ }
+
+ //点击 处置Tree节点
+ selectanelPoint (e) {
+ if (!e.buildingAreaId && !e.sitePlanId) { //当前节点 不是 数据节点 时
+ let msg = this.canvasData.findDisposalNode(e.id)
+ this.canvasData.selectPanelPointBaseData = msg
+ this.selectDisposalNode == msg.id? this.selectDisposalNode = '' : this.selectDisposalNode = msg.id //选中 节点
+
+ } else if (e.buildingAreaId || e.sitePlanId) { //当前节点 是 数据节点 时
+ let msg = this.canvasData.findDisposalNode(e.parentId)
+ this.canvasData.selectPanelPointBaseData = msg
+ this.selectDisposalNode = e.parentId //选中 节点
+
+ if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时
+ let api
+ this.examType == 1? api='/api/DisposalNodeData' : api='/api/ExamDisposalNodeData'
+ let params = {nodeId: e.id}
+ let parameter = { //查询 节点 对应 建筑/楼层 index,id
+ buildingIndex: e.sitePlanId? -1 : this.allBuildings.findIndex(item=>{ return item.id===e.buildingId }), //总平面图/建筑 index
+ storeyId: e.sitePlanId? e.sitePlanId : e.buildingAreaId, //楼层id
+ }
+ this.http.get(api,{params:params}).subscribe(data=>{
+ this.canvasData.selectPanelPoint = this.canvasData.deserialize(JSON.stringify(data || new DisposalNodeData())) //选择 当前 节点
+ this.canvasData.selectPanelPoint.Data = this.canvasData.deserialize(this.canvasData.selectPanelPoint.Data)
+ this.seekPanelPoint(parameter)
+ })
+ } //if
+
+ } //else if
+ }
+
+ //查找 数据节点 对应 建筑/楼层
+ seekPanelPoint (paramsData) {
+ this.checkedBuildingIndex = paramsData.buildingIndex
+ if (paramsData.buildingIndex ==-1) { //总平面图时
+ this.beforeOneCheckedBuilding={name:"总平面图"}
+ let fireData = this.getFireElements(sessionStorage.getItem('buildingTypeId')) //获取单位下 消防要素
+ let planData = this.getSitePlanCompanyData() //获取 单位 数据
+ this.http.get('/api/SitePlans',{params:this.params}).subscribe(data=>{
+ this.sitePlanData = data
+ let index = this.sitePlanData.findIndex(item=>{ return item.id===paramsData.storeyId })
+ this.selectingSitePlan = this.sitePlanData[index] || {}
+ this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据
+ this.selectSitePlanIndex = index
+
+ Promise.all([fireData,planData]).then((res)=>{
+ this.getSitePlanStorey(this.selectingSitePlan) //获取 平面图 楼层数据
+ })
+ }) //get
+ } else { //建筑时
+ this.beforeOneCheckedBuilding=this.allBuildings[paramsData.buildingIndex]
+ let params = { buildingId: this.beforeOneCheckedBuilding.id }
+ let fireData = this.getFireElements(this.beforeOneCheckedBuilding.buildingTypes[0].id || '') //获取建筑下 消防要素
+ let planData = this.getBuildingData(params) //获取 建筑 数据
+ this.http.get('/api/BuildingAreas',{params}).subscribe(data=>{
+ this.sitePlanData = data
+ let index = this.sitePlanData.findIndex(item=>{ return item.id===paramsData.storeyId })
+ this.selectingSitePlan = this.sitePlanData[index] || {}
+ this.canvasData.selectStorey = this.sitePlanData[index] || {} //服务中 存一份数据
+ this.selectSitePlanIndex = index
+
+ Promise.all([fireData,planData]).then((res)=>{
+ this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据
+ })
+ }) //get
+ }
+ }
+
+
+
+}
diff --git a/src/app/ui/collection-tools-examinee/examinationQuestions.html b/src/app/ui/collection-tools-examinee/examinationQuestions.html
new file mode 100644
index 0000000..8bbd8fd
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/examinationQuestions.html
@@ -0,0 +1,30 @@
+,
+ @Inject(MAT_DIALOG_DATA) public data) {}
+
+ @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+
+ defaultCheckedKeys = []; //指定选中复选框的树节点 key值
+ defaultExpandedKeys = []; //展开指定的树节点 key值
+ defaultSelectedKeys = []; //指定选中的树节点 key值
+ renderData:any
+ ngOnInit(): void {
+ this.renderData = this.data.treeData
+ if(JSON.parse(sessionStorage.getItem('tree型数据')) && JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]){
+ this.defaultCheckedKeys = JSON.parse(sessionStorage.getItem('tree型数据'))[this.data.buildFloorData.floorData.id]
+ }
+ this.data.treeData.forEach(element => {
+ if(element.isTemplate){
+ element.isLeaf = false
+ }else{
+ element.isLeaf = true
+ }
+ if(element.children && element.children.length != 0){
+ element.children.forEach(ele => {
+ if(ele.isTemplate){
+ ele.isLeaf = false
+ }else{
+ ele.isLeaf = true
+ }
+ if(ele.children && ele.children.length != 0){
+ ele.children.forEach(item => {
+ if(item.isTemplate){
+ item.isLeaf = false
+ }else{
+ item.isLeaf = true
+ }
+
+ });
+ }})
+ }
+ })
+ }
+
+
+ nzEvent($event){
+ console.log($event)
+ }
+
+
+
+ //提交
+ submit () {
+
+ let oldTreeData = this.nzTreeComponent.getCheckedNodeList()
+
+ let alltreedata = JSON.parse(sessionStorage.getItem("tree型数据"))
+ let keyArr = []
+ oldTreeData.forEach(element => {
+ keyArr.push(element.origin.key)
+ })
+ if(alltreedata){
+ //如果已经保存过当前楼层则替换
+ alltreedata[this.data.buildFloorData.floorData.id] = keyArr
+ sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata))
+ }else{
+ alltreedata = {}
+ alltreedata[this.data.buildFloorData.floorData.id] = keyArr
+ sessionStorage.setItem('tree型数据',JSON.stringify(alltreedata))
+ }
+
+
+ let checkList = [] //只存真实素材
+ for (const key in this.data.oldRealData.data) {
+ let element = this.data.oldRealData.data[key]
+ let isChecked = (this.nzTreeComponent.getTreeNodeByKey(key)).isChecked
+ isChecked? checkList.push(element) : null
+ }
+ //存储真实素材数据
+ let basicAssetsId = []
+ if(checkList && checkList.length != 0){
+ checkList.forEach(item => {
+ basicAssetsId.push(item.TemplateId)
+ })
+ }
+ basicAssetsId = Array.from(new Set(basicAssetsId))
+ console.log(123,this.data.buildFloorData)
+ let obj = {
+ name:this.data.buildFloorData.buildingData.name + '-' + this.data.buildFloorData.floorData.name,
+ key:this.data.buildFloorData.floorData.id,
+ buildingId:this.data.buildFloorData.buildingData.id,
+ children:checkList,
+ basicAssetsId:basicAssetsId
+ }
+
+ let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
+
+ if(data && data.length != 0){
+ console.log(1)
+ let ind = null
+ data.forEach((item,index) => {
+ if(item.key == obj.key){
+ ind = index + 1
+ }
+ })
+ if(ind){
+ if(checkList.length != 0){
+ data[ind - 1].children = checkList
+ }else{
+ data.splice(ind - 1,1)
+ }
+
+ }else{
+ data.push(obj)
+ }
+ sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data))
+
+ }else{
+ console.log(2)
+ data = []
+ data[0] = obj
+ sessionStorage.setItem("消防设施"+sessionStorage.getItem('paperId'),JSON.stringify(data))
+ }
+
+
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('当层消防设施考题设置完成','确定',config);
+ this.dialogRef.close()
+ }
+
+}
+
+
+//上传按钮
+@Component({
+ selector: 'dialog-upload-questions',
+ templateUrl: './uploadQuestions.html',
+ styleUrls: ['./collection-tools.component.scss',]
+})
+export class uploadQuestionsExaminee {
+
+ constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data,private route:ActivatedRoute) {}
+
+ defaultCheckedKeys = []; //指定选中复选框的树节点 key值
+ defaultExpandedKeys = []; //展开指定的树节点 key值
+ defaultSelectedKeys = []; //指定选中的树节点 key值
+ renderData:any
+
+ ngOnInit(): void {
+ let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
+ data ? data.forEach(item => {
+ let realData = item.children
+ item.children = this.processingData(this.data.allFireElements,realData)
+ }) :null
+ this.renderData = data
+ this.getProfiles()
+ this.nodeInit()
+ }
+
+ //处理数据 将消防要素模板与真实素材结合
+ processingData(allFireElements,realData){
+ allFireElements[allFireElements.length-1].children = []
+ realData.forEach(item => {
+ item.isLeaf = true
+ let noMatch = allFireElements.find( every=> every.id === item.FireElementId )
+ if (!noMatch) {
+ allFireElements[allFireElements.length-1].children.push(item)
+ }
+ })
+ let treeData = [] //tree型 处理完成后的数据
+ allFireElements.forEach(element => {
+ element.key = element.id
+ element.name != '其他' ? element.children = [] : null
+ if(realData){
+ realData.forEach(item => {
+ if(element.id == item.FireElementId){
+ element.children.push(item)
+ }
+ })
+ }
+ allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} });
+ });
+ allFireElements.forEach(element => {
+ if (!element.parentId) { treeData.push(element) }
+ });
+ function recursionFilterEmpty(originalList, result) {
+ for(let i = 0, length = originalList.length; i < length; i++) {
+ const item = originalList[i];
+ if (item.PropertyInfos) {
+ // 最内层
+ result.push(item);
+ } else if (item.children && item.children.length) {
+ const newChildren = [];
+ // 递归调用，底层的真实数据会全部 push 进 newChildren 中
+ recursionFilterEmpty(item.children, newChildren);
+ if (newChildren.length) {
+ // 替换原始数据
+ item.children = newChildren;
+ // 子项有真实的数据，就保留这一项
+ result.push(item);
+ } // 如果没有这一项就会被删除
+ }
+ }
+ }
+ function filterEmpty(listData) {
+ const result = [];
+ recursionFilterEmpty(listData, result);
+ return result;
+ }
+ return filterEmpty(treeData)
+ }
+
+
+ //获取登录账号的个人资料
+ Profiles:any
+ getProfiles(){
+ this.http.get('/api/ExamAccounts/Profiles').subscribe(data => {
+ this.Profiles = data
+ })
+ }
+
+ nodeTreeData:any = []; //处置节点tree
+ //节点初始化
+ nodeInit () {
+ let treeData = []
+ this.data.node.forEach(element => {
+ element.title = element.name //name
+ element.key = element.id //id
+ element.children = [] //children
+ if (element.sitePlanId || element.buildingAreaId) { //是数据节点
+ element.isLeaf = true
+ element.isDataNode = true
+ } else { //不是数据节点
+ element.isLeaf = false
+ element.isDataNode = false
+ }
+ this.data.node.forEach(item=>{
+ item.parentId === element.id? element.children.push(item) : null
+ })
+ });
+ this.data.node.forEach(element=>{
+ !element.parentId? treeData.push(element) : null
+ })
+ this.nodeTreeData = [...treeData]
+ }
+
+ nzEvent($event){
+ console.log($event)
+ }
+ //上传
+ submit () {
+ console.log(this.data.question)
+ let body:any = {
+ id: this.route.snapshot.queryParams.paperplanId,
+ paperId: sessionStorage.getItem('paperId'),
+ planComponentId: sessionStorage.getItem('planId'),
+ examPlanType: this.route.snapshot.queryParams.openType == 1 ? 0 : 1,
+ creatorId: this.Profiles.id,
+ modifiedTime: new Date(),
+ isPublic: true,
+ title: this.route.snapshot.queryParams.planName,
+ mainPoint: this.data.question.keynote,
+ score: 0,
+ examFacilityAssetsData: sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) ? sessionStorage.getItem('消防设施' + sessionStorage.getItem('paperId')) : null,
+ examDisposalNodesData: sessionStorage.getItem('examNodeList') ? sessionStorage.getItem('examNodeList') : null,
+ companyId:sessionStorage.getItem('companyId')
+ }
+
+
+ this.http.put(`/api/PaperPlans/${this.route.snapshot.queryParams.paperplanId}`,body).subscribe(data => {
+
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('设置完成,页面将于一秒后关闭','确定',config);
+ setTimeout(() => {
+ window.close()
+ }, 1000);
+
+ })
+
+
+ }
+
+}
+
+
+
+//保存考的节点
+@Component({
+ selector: 'dialog-disposal-nodes',
+ templateUrl: './uploadDisposalNodes.html',
+ styleUrls: ['./collection-tools.component.scss',]
+})
+export class uploadDisposalNodesExaminee {
+
+ constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) {}
+ @ViewChild('nzTreeComponent', { static: false }) nzTreeComponent!: NzTreeComponent;
+
+ ngOnInit(): void {
+ this.treeData = [...this.data.treeData]
+ }
+ treeData:any = []; //tree
+
+ //提交 保存考试节点
+ submit () {
+ let checkList = []
+ this.data.oldTreeData.forEach(element => {
+ let isChecked = (this.nzTreeComponent.getTreeNodeByKey(element.id)).isChecked
+ isChecked? checkList.push(element) : null
+ });
+ let galfList = this.nzTreeComponent.getHalfCheckedNodeList()
+ this.data.oldTreeData.forEach(element => {
+ galfList.forEach(elements => {
+ element.id == elements.origin.id? checkList.push(element) : null
+ });
+ });
+ if (checkList.length) {
+ this.dialogRef.close(checkList);
+ } else {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('请选择节点','确定',config);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/panel.scss b/src/app/ui/collection-tools-examinee/panel.scss
new file mode 100644
index 0000000..245e998
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/panel.scss
@@ -0,0 +1,291 @@
+.matIcons {
+ color: #8E909F;
+}
+
+
+
+//平面图 素材库 公共样式 头部
+.planarGraphHeader{
+ height: 35px;
+ min-height: 35px;
+ cursor: pointer;
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ padding: 0 24px;
+ // border-radius: 5px;
+ font-family: Roboto, "Helvetica Neue", sans-serif;
+ font-size: 15px;
+ font-weight: 400;
+ color: #fff;
+ background: #07CDCF;
+}
+//平面图头部字体图标样式
+.hover {
+ width: 18px;
+ height: 18px;
+ margin-left: 90px;
+ border: 1px solid #999;
+ border-radius: 3px;
+ .mat-icon {font-size: 18px; color: #999;}
+}
+.hover:hover {
+ background-color: #4DA5FA;
+ .mat-icon {color: #fff;}
+}
+
+//平面图
+.sitePlanContent {
+ position: relative;
+ width: 100%;
+ height: 35px;
+ line-height: 35px;
+ box-sizing: border-box;
+ padding: 0 10px 0 25px;
+ .mat-icon {
+ font-size: 20px;
+ }
+}
+
+//火源/力量 图标
+.fireForce {
+ display: block;
+ float: right;
+ margin: 8px 5px 0 0;
+ width: 40px;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
+ position: relative;
+ overflow: hidden;
+ img{
+ width: 20px;
+ height: 20px;
+ }
+}
+//替换底图 inputfile
+.a-upload {
+ display: block;
+ float: right;
+ margin: 8px 18px 0 0;
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ text-align: center;
+ position: relative;
+ overflow: hidden;
+ input {
+ position: absolute;
+ width: 20px;
+ height: 20px;
+ left: 0;
+ top: 0;
+ opacity: 0;
+ }
+}
+.a-upload:hover {
+ .mat-icon {
+ color: #fff;
+ }
+}
+//上传底图 inputfile
+#a-uploadImg {
+ display: block;
+ width: 300px;
+ height: 170px;
+ position: fixed;
+ top: 40%;
+ left: 48%;
+ overflow: hidden;
+ border-radius: 5px;
+ border: 1px solid #999;
+ z-index: 999;
+ input {
+ position: absolute;
+ width: 300px;
+ height: 170px;
+ left: 0;
+ top: 0;
+ opacity: 0;
+ }
+ img {
+ width: 100%;
+ height: auto;
+ }
+}
+#a-uploadImg:hover {
+ border: 5px solid skyblue;
+}
+
+//hover时显示右边操作栏
+.sitePlanContent:hover {
+ #rightOperate {
+ display: block;
+ }
+}
+//右边操作栏
+#rightOperate{
+ width: 50px;
+ height: 100px;
+ position: absolute;
+ top: -32px;
+ right: -48px;
+ z-index: 99999;
+ border-radius: 0 100px 100px 0;
+ background-color: #F0F4F7;
+ // #F0F4F7 cdced1
+ display: none;
+ .functionButton {
+ height: 25%;
+ line-height: 25px;
+ }
+ .bigFunctionIcon {
+ font-size: 24px;
+ }
+ .functionIcon {
+ color: #999;
+ }
+ .functionIcon:hover {
+ color: #4DA5FA;
+ }
+}
+
+//处置预案 素材库 公用div
+.publiclBankPlan {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ padding-bottom: 10px;
+}
+
+
+
+// 基本信息/想定作业 切换
+.scenarioAssignment {
+ overflow-y: auto;
+}
+.selectEditMode {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+}
+.materialBankDIV{
+ flex: 1;
+ overflow-x: hidden;
+ overflow-y: auto;
+}
+// 基本信息/想定作业 切换
+//处置预案
+#terrNodePublic {
+ height: 35px;
+ line-height: 35px;
+ display: flex;
+ .textNode {flex: 1;}
+}
+//字体图标
+.planIconDiv {
+ display: inline-block;
+ .mat-icon{
+ font-size: 20px;
+ width: 20px;
+ height: 20px;
+ color: #666;
+ margin-right: 3px;
+ }
+}
+
+
+
+.mat-expansion-panel-header {
+ height: 40px !important;
+}
+//素材库溢出隐藏
+#materialBank {
+ margin: 1px 0;
+}
+//素材库图片flex
+.mat-expansion-panel-header {background-color: #d6f4f5;}
+#panelLibrary .text{
+ box-sizing: border-box;
+ margin-left: 10px;
+}
+.panelLibraryFlex {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: space-between; /* 水平居中 */
+ .imgBox {
+ width: 70px;
+ height: 100px;
+ display: inline-block;
+ text-align: center;
+ border-radius: 3px;
+ margin: 5px 0;
+ img {
+ width: 70px;
+ height: auto;
+ max-height: 70px;
+ cursor:pointer;
+ }
+ p {
+ font-size: 12px;
+ cursor:pointer;
+ }
+ }
+}
+
+//文本溢出
+.overflowText {
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
+}
+// 楼层/区域 是避难层时
+.isRefugeStorey {
+ color: #FF8678;
+ background-color: #fff;
+}
+//选中平面图时
+.selectSitePlan {
+ color: #fff;
+ background-color: #07CDCF;
+}
+//选中素材库图片时
+.selectImg {
+ color: #fff;
+ background-color: #4DA5FA;
+}
+//选中 处置节点时
+.selectanelPoint {
+ background-color: #F4C235;
+}
+
+
+
+//左侧功能区弹出框样式
+.keyMargin {
+ width: 100%;
+ margin: 5px 0;
+ .mat-form-field {
+ width: 100%;
+ }
+}
+.submitBottom {
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap;
+ justify-content: space-between; /* 水平居中 */
+}
+.functionalDomainContent {
+ width: 300px;
+ height: 100%;
+ textarea {
+ border-radius: 5px;
+ border: 1px solid #999;
+ width: 100%;
+ height: 120px;
+ resize:none;
+ }
+}
diff --git a/src/app/ui/collection-tools-examinee/save.ts b/src/app/ui/collection-tools-examinee/save.ts
new file mode 100644
index 0000000..9c1e269
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/save.ts
@@ -0,0 +1,301 @@
+import { Component, OnInit, Inject } from '@angular/core';
+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 {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务
+// 保存想定作业第一个弹窗
+@Component({
+ selector: 'dialog-overview-example-dialog',
+ templateUrl: 'saveOne.html',
+ styleUrls: ['./collection-tools.component.scss']
+})
+export class saveOneDialogExaminee {
+
+ constructor(
+ private http:HttpClient,
+ public dialog: MatDialog,
+ public snackBar: MatSnackBar,
+ public dialogRef: MatDialogRef,
+ @Inject(MAT_DIALOG_DATA) public data) {}
+
+ onNoClick(): void {
+ this.dialogRef.close()
+ }
+ allDisposalNode = this.data.allDisposalNode
+
+ saveType(type){
+ this.dialogRef.close()
+ const dialogRef = this.dialog.open(saveTwoDialogExaminee, {
+ data: {type: type,
+ allDisposalNode: this.data.allDisposalNode,
+ selectedBuildingData:this.data.selectedBuildingData,
+ selectedSiteData:this.data.selectedSiteData,
+ siteOrbuilding:this.data.siteOrbuilding,
+ disasterId:this.data.disasterId}
+ });
+ dialogRef.afterClosed().subscribe(result => {
+ });
+ }
+
+}
+
+ // 保存想定作业第二个弹窗
+@Component({
+ selector: 'dialog-overview-example-dialog',
+ templateUrl: 'saveTwo.html',
+ styleUrls: ['./collection-tools.component.scss']
+})
+ export class saveTwoDialogExaminee {
+
+ constructor(
+ private http:HttpClient,
+ public dialogRef: MatDialogRef,
+ public canvasData: CanvasShareDataService,
+ public snackBar: MatSnackBar,
+ @Inject(MAT_DIALOG_DATA) public data) {}
+
+ type = this.data.type
+ allDisposalNode = this.data.allDisposalNode
+ allPlanDisposalNode = []
+ allRootDisposalNode = [{name:"根节点",id:null}]
+ allDisposalNodeChild = []
+ ngOnInit(): void {
+ //所有非数据节点
+ this.allDisposalNode.forEach(item => {
+ if(!item.sitePlanId && !item.buildingAreaId){
+ this.allPlanDisposalNode.push(item)
+ }
+ })
+
+ //所有一级节点
+ this.allDisposalNode.forEach(item => {
+ if(!item.parentId){
+ this.allRootDisposalNode.push(item)
+ }
+ })
+ this.allDisposalNodeChild = JSON.parse(JSON.stringify(this.allDisposalNode))
+ this.allDisposalNodeChild.forEach(item => {
+ item.children = []
+ this.allDisposalNodeChild.forEach(i => {
+ if(i.parentId == item.id){
+ item.children.push(i)
+ }
+ })
+ })
+
+ }
+ onNoClick(): void {
+ this.dialogRef.close();
+ }
+ nodeItem
+ itemChildNum = 0 //点击处置节点子数据节点的数量
+ clickNode(item){
+ console.log(item)
+ this.nodeItem = item
+ this.allDisposalNodeChild.forEach(item => {
+ if(item.id == this.nodeItem.id){
+ this.itemChildNum = item.children.length
+ }
+ })
+ }
+
+ selectedBuildingData = this.data.selectedBuildingData
+ selectedSiteData = this.data.selectedSiteData
+ onSubmit(value,type){
+ // console.log(type)
+ let name = this.selectedBuildingData.name + '-' + this.selectedSiteData.name
+ //如果保存到已有节点
+ var postdata = {
+ id: "",
+ name: name,
+ level: 0,
+ order: this.itemChildNum,
+ description: "",
+ notes: "",
+ weather: null,
+ airTemperature: null,
+ windDirection: null,
+ windScale: null,
+ imageNames: null,
+ imageUrls: null,
+ parentId: this.nodeItem ? this.nodeItem.id : null,
+ examDisasterId: this.data.disasterId,
+ ExamPlanComponentId: sessionStorage.getItem('planId') || '',
+ companyId: this.data.siteOrbuilding == -1 ? sessionStorage.getItem('companyId') : null,
+ sitePlanId: this.data.siteOrbuilding==-1 ? this.selectedSiteData.id : null,
+ buildingId: this.selectedBuildingData.id || null,
+ buildingAreaId: this.data.siteOrbuilding!=-1 ? this.selectedSiteData.id : null
+ }
+ if(type == 'old'){
+ let istrue = this.canvasData.findDisposalNode(this.nodeItem.id,name)
+ let putdata = this.nodeItem
+ putdata.weather = this.canvasData.selectPanelPointBaseData.weather
+ putdata.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature)
+ putdata.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale)
+ putdata.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection)
+ putdata.description = this.canvasData.selectPanelPointBaseData.description
+ putdata.notes = this.canvasData.selectPanelPointBaseData.notes
+
+
+ if(istrue){//如果该处置节点下已有同名数据节点 则只修改 2个接口
+ new Promise((resolve,reject)=>{
+ // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => {
+ resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点")
+ // })
+ }).then((values)=>{
+ this.canvasData.sendMessage('send a message');//发布一条消息
+ // 保存平面图数据到当前节点
+ let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint))
+ postdata.Data = JSON.stringify(postdata.Data)
+ this.http.post(`/api/ExamDisposalNodeData`,postdata).subscribe(data => {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+ },err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage('send a message');//发布一条消息
+ })
+
+ }else{//需要3个接口
+ new Promise((resolve,reject)=>{
+ // this.http.put(`/api/DisposalNodes/${value.nodeId}`,putdata).subscribe(data => {
+ resolve("更新处置节点成功,将天气 节点详情等信息保存到点击的节点")
+ // })
+ }).then((values)=>{
+ console.log(values)
+ postdata.level = putdata.level + 1
+ new Promise((resolve,reject) => {
+ this.http.post(`/api/ExamDisposalNodes`,postdata).subscribe(data => {
+ resolve(data)
+ })
+ }).then((data:any)=>{
+ console.log(7788,data)
+ let objData = {
+ id: "",
+ data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null,
+ version: this.canvasData.selectPanelPoint.Version || "2.0",
+ ExamDisposalNodeId: data.id,
+ ExamPlanComponentId: sessionStorage.getItem("planId"),
+ }
+ this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+ },err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage('send a message');//发布一条消息
+ })
+ })
+ }
+
+ }else{//如果保存到新建节点
+ let dispositionNodeData //处置节点data
+ let order
+ let oneLevelNum = []
+ //将order赋值为所有一级节点最后一个+1
+ this.allDisposalNode.forEach(item => {
+ if(!item.parentId){
+ oneLevelNum.push(item)
+ }
+ })
+ if(oneLevelNum.length == 0){
+ order = 0
+ }else{
+ order = oneLevelNum[oneLevelNum.length - 1].order + 1
+ }
+
+ if(this.nodeItem){//如果点击了下拉选择框
+ if(this.nodeItem.id != null){
+ this.allDisposalNodeChild.forEach(item => {
+ if(item.id == this.nodeItem.id){
+ order = item.children.length
+ }
+ })
+ }
+ }
+ dispositionNodeData = {
+ id: null,
+ name: value.name,
+ level: this.nodeItem && this.nodeItem.id != null ? this.nodeItem.level + 1 : 0,
+ order: order,
+ description: null,
+ notes: null,
+ weather: null,
+ airTemperature: 0,
+ windDirection: 0,
+ windScale: 0,
+ imageNames: null,
+ imageUrls: null,
+ parentId: this.nodeItem ? this.nodeItem.id : null,
+ examDisasterId: this.data.disasterId,
+ ExamPlanComponentId: sessionStorage.getItem('planId') || '',
+ companyId: null,
+ sitePlanId: null,
+ buildingId: null,
+ buildingAreaId: null
+ }
+
+ dispositionNodeData.weather = this.canvasData.selectPanelPointBaseData.weather
+ dispositionNodeData.airTemperature = Number(this.canvasData.selectPanelPointBaseData.airTemperature)
+ dispositionNodeData.windScale = Number(this.canvasData.selectPanelPointBaseData.windScale)
+ dispositionNodeData.windDirection = Number(this.canvasData.selectPanelPointBaseData.windDirection)
+ dispositionNodeData.description = this.canvasData.selectPanelPointBaseData.description
+ dispositionNodeData.notes = this.canvasData.selectPanelPointBaseData.notes
+ //1.先创建一个处置节点 然后 .then 2.创建数据节点到刚创建的处置节点 3.然后拿着创建好的数据节点的id 将平面图data保存
+ new Promise((resolve,reject) => {
+ this.http.post("/api/ExamDisposalNodes",dispositionNodeData).subscribe((data:any) => {
+ resolve(data.id)
+ })
+ }).then((id) => {
+ let dataNodeData
+ console.log("qnm",id)
+ new Promise((resolve,reject) => {
+ postdata.parentId = id
+ postdata.level = dispositionNodeData.level + 1
+ this.http.post("/api/ExamDisposalNodes",postdata).subscribe((data:any) => {
+ resolve(data)
+ })
+ }).then((data:any) => {
+ // 保存平面图数据到当前节点
+ // console.log(6666,data)
+ // let postdata =JSON.parse(JSON.stringify(this.canvasData.selectPanelPoint))
+ // postdata.Data = JSON.stringify(postdata.Data)
+ let objData = {
+ id: null,
+ data: JSON.stringify(this.canvasData.selectPanelPoint.Data) || null,
+ version: this.canvasData.selectPanelPoint.Version || "2.0",
+ ExamDisposalNodeId: data.id,
+ ExamPlanComponentId: sessionStorage.getItem("planId"),
+ }
+
+ this.http.post(`/api/ExamDisposalNodeData`,objData).subscribe(data => {
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存成功','确定',config)
+
+ },err=>{
+ const config = new MatSnackBarConfig();
+ config.verticalPosition = 'top';
+ config.duration = 3000
+ this.snackBar.open('保存失败','确定',config)
+ })
+ this.dialogRef.close();
+ this.canvasData.sendMessage("send a message")
+ })
+ })
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/saveOne.html b/src/app/ui/collection-tools-examinee/saveOne.html
new file mode 100644
index 0000000..9017f65
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/saveOne.html
@@ -0,0 +1,5 @@
+
单位列表
总分:
-
-
+
单位列表
+ 总分:
+
+
+ 单位名称
总分
{{item.companyInfo.name}}
diff --git a/src/app/student/examination-details/examination-details.component.scss b/src/app/student/examination-details/examination-details.component.scss
index ad3fe6b..2ac143c 100644
--- a/src/app/student/examination-details/examination-details.component.scss
+++ b/src/app/student/examination-details/examination-details.component.scss
@@ -39,7 +39,8 @@
align-items: center;
>div {flex: 1;}
height: 36px;
- padding: 0 25px;
+ padding: 0 30px;
+ margin: 3px 0;
}
.centerLeft {
display: flex;
From d6aa474687910aa00db012d5f9b28eeea5c0b94e Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 23 Dec 2020 16:09:27 +0800
Subject: [PATCH 13/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E8=80=83=E9=A2=98=E5=AE=8C=E5=96=84=E6=B6=88=E9=98=B2=E8=A6=81?=
=?UTF-8?q?=E7=B4=A0tree(=E5=A2=9E=E5=8A=A0=E4=B8=8A=E7=BA=A7=E6=B6=88?=
=?UTF-8?q?=E9=98=B2=E8=A6=81=E7=B4=A0=E6=A8=A1=E6=9D=BF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../collection-tools.component.ts | 9 +--
.../collection-tools/examinationQuestions.ts | 64 ++++++++++++++++++-
2 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts
index 30c1264..47d6369 100644
--- a/src/app/ui/collection-tools/collection-tools.component.ts
+++ b/src/app/ui/collection-tools/collection-tools.component.ts
@@ -903,7 +903,6 @@ export class CollectionToolsComponent implements OnInit {
let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板
console.log(data)
let treeData = [] //tree型 处理完成后的数据
-
data.forEach(element => {
element.key = element.id
element.isTemplate = true //添加模板标识
@@ -964,7 +963,7 @@ export class CollectionToolsComponent implements OnInit {
}
- console.log(filterEmpty(treeData))
+ // console.log(filterEmpty(treeData))
this.dataSource.data = filterEmpty(treeData)
this.treeControl.expandAll()
@@ -1096,7 +1095,7 @@ export class CollectionToolsComponent implements OnInit {
let treeData = JSON.parse( JSON.stringify(this.dataSource.data) )
let nodes = JSON.parse( JSON.stringify( JSON.parse(sessionStorage.getItem('examNodeList')) ) )
if (nodes) {
- let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes }
+ let data = { treeData: treeData, question: JSON.parse( JSON.stringify(this.examMsg) ), node: nodes ,allFireElements:this.allFireElements}
let dialogRef = this.dialog.open(uploadQuestions,{data});
} else {
const config = new MatSnackBarConfig();
@@ -1126,9 +1125,11 @@ export class CollectionToolsComponent implements OnInit {
// storeyData.data[key] = companyBuildingData.data[key]
// }
// }
- for(let key in storeyData.data){ //筛选数据 没有匹配全部放入到 其他 数组
+ console.log(566,storeyData.data)
+ for(let key in storeyData.data){ //筛选数据
storeyData.data[key].key = storeyData.data[key].Id
let noMatch = this.allFireElements.find( every=> every.id===storeyData.data[key].FireElementId )
+ //没有匹配全部放入到 其他 数组
if (!noMatch) {
this.allFireElements[this.allFireElements.length-1].children.push(storeyData.data[key])
}
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts
index db4bc15..a2e7370 100644
--- a/src/app/ui/collection-tools/examinationQuestions.ts
+++ b/src/app/ui/collection-tools/examinationQuestions.ts
@@ -55,9 +55,14 @@ export class examinationQuestions {
}
})
}
+
+
nzEvent($event){
console.log($event)
}
+
+
+
//提交
submit () {
@@ -161,15 +166,68 @@ export class uploadQuestions {
ngOnInit(): void {
let data = JSON.parse(sessionStorage.getItem("消防设施"+sessionStorage.getItem('paperId')))
data ? data.forEach(item => {
- item.children.forEach(i => {
- i.isLeaf = true
- })
+ let realData = item.children
+ item.children = this.processingData(this.data.allFireElements,realData)
}) :null
this.renderData = data
this.getProfiles()
this.nodeInit()
}
+ //处理数据 将消防要素模板与真实素材结合
+ processingData(allFireElements,realData){
+ allFireElements[allFireElements.length-1].children = []
+ realData.forEach(item => {
+ item.isLeaf = true
+ let noMatch = allFireElements.find( every=> every.id === item.FireElementId )
+ if (!noMatch) {
+ allFireElements[allFireElements.length-1].children.push(item)
+ }
+ })
+ let treeData = [] //tree型 处理完成后的数据
+ allFireElements.forEach(element => {
+ element.key = element.id
+ element.name != '其他' ? element.children = [] : null
+ if(realData){
+ realData.forEach(item => {
+ if(element.id == item.FireElementId){
+ element.children.push(item)
+ }
+ })
+ }
+ allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} });
+ });
+ allFireElements.forEach(element => {
+ if (!element.parentId) { treeData.push(element) }
+ });
+ function recursionFilterEmpty(originalList, result) {
+ for(let i = 0, length = originalList.length; i < length; i++) {
+ const item = originalList[i];
+ if (item.PropertyInfos) {
+ // 最内层
+ result.push(item);
+ } else if (item.children && item.children.length) {
+ const newChildren = [];
+ // 递归调用，底层的真实数据会全部 push 进 newChildren 中
+ recursionFilterEmpty(item.children, newChildren);
+ if (newChildren.length) {
+ // 替换原始数据
+ item.children = newChildren;
+ // 子项有真实的数据，就保留这一项
+ result.push(item);
+ } // 如果没有这一项就会被删除
+ }
+ }
+ }
+ function filterEmpty(listData) {
+ const result = [];
+ recursionFilterEmpty(listData, result);
+ return result;
+ }
+ return filterEmpty(treeData)
+ }
+
+
//获取登录账号的个人资料
Profiles:any
getProfiles(){
From ae8b5d855706cceccfae9dd4cf995e94d5f7a378 Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Thu, 24 Dec 2020 10:22:08 +0800
Subject: [PATCH 14/15] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E5=88=9B=E5=BB=BA?=
=?UTF-8?q?=E8=80=83=E7=94=9F=E7=BC=96=E5=88=B6=E5=B7=A5=E5=85=B7=E6=96=87?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/app-routing.module.ts | 2 +
.../create-test-score.component.ts | 45 +-
.../collection-tools.component.html | 298 +++
.../collection-tools.component.scss | 480 +++++
.../collection-tools.component.spec.ts | 25 +
.../collection-tools.component.ts | 1882 +++++++++++++++++
.../examinationQuestions.html | 30 +
.../examinationQuestions.ts | 346 +++
.../ui/collection-tools-examinee/panel.scss | 291 +++
src/app/ui/collection-tools-examinee/save.ts | 301 +++
.../ui/collection-tools-examinee/saveOne.html | 5 +
.../ui/collection-tools-examinee/saveTwo.html | 53 +
.../uploadDisposalNodes.html | 14 +
.../uploadQuestions.html | 51 +
.../collection-tools/examinationQuestions.ts | 8 +-
src/app/ui/ui.module.ts | 5 +-
16 files changed, 3808 insertions(+), 28 deletions(-)
create mode 100644 src/app/ui/collection-tools-examinee/collection-tools.component.html
create mode 100644 src/app/ui/collection-tools-examinee/collection-tools.component.scss
create mode 100644 src/app/ui/collection-tools-examinee/collection-tools.component.spec.ts
create mode 100644 src/app/ui/collection-tools-examinee/collection-tools.component.ts
create mode 100644 src/app/ui/collection-tools-examinee/examinationQuestions.html
create mode 100644 src/app/ui/collection-tools-examinee/examinationQuestions.ts
create mode 100644 src/app/ui/collection-tools-examinee/panel.scss
create mode 100644 src/app/ui/collection-tools-examinee/save.ts
create mode 100644 src/app/ui/collection-tools-examinee/saveOne.html
create mode 100644 src/app/ui/collection-tools-examinee/saveTwo.html
create mode 100644 src/app/ui/collection-tools-examinee/uploadDisposalNodes.html
create mode 100644 src/app/ui/collection-tools-examinee/uploadQuestions.html
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 726e301..f0766fe 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -17,6 +17,7 @@ import {AuthGuard} from './auth.guard'
import { CreateTestScoreComponent } from './examiner/create-test-score/create-test-score.component';
import { CollectionToolsComponent } from './ui/collection-tools/collection-tools.component';
import { ExaminationDetailsComponent } from './student/examination-details/examination-details.component';
+import { CollectionToolsExamineeComponent } from './ui/collection-tools-examinee/collection-tools.component';
@@ -32,6 +33,7 @@ const routes: Routes = [
},
{ path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //创建试卷具体分数页面
{ path:'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //考官编制工具
+ { path:'canvasToolExaminee', component:CollectionToolsExamineeComponent,canActivate: [AuthGuard], }, //考生编制工具
{ path:'examinationDetails', component:ExaminationDetailsComponent,canActivate: [AuthGuard], }, //考生试卷 考试基本信息/作战部署
{ path:'adminLogin', component:LoginComponent}, //管理员登录路由
{ path:'login', component:LockscreenComponent}, //教员学员登录路由
diff --git a/src/app/examiner/create-test-score/create-test-score.component.ts b/src/app/examiner/create-test-score/create-test-score.component.ts
index b1cbe14..0a306db 100644
--- a/src/app/examiner/create-test-score/create-test-score.component.ts
+++ b/src/app/examiner/create-test-score/create-test-score.component.ts
@@ -1206,22 +1206,23 @@ export class CreateTestScoreComponent implements OnInit {
})
//判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况
- for (let index = 0; index < paperDataInfo.length; index++) {
- const element = paperDataInfo[index];
- element.planList ? element.planList.forEach(item => {
+ for (let index = 0; index < this.unitId.length; index++) {
+ const element = this.unitId[index];
+ element.planList ?
+ element.isPlanScore = element.planList.some(item=>{
if(!item.score || item.score == 0){
- element.isPlanScore = false
- }else{
- element.isPlanScore = true
+ return false
+ } else{
+ return true
}
- }) : null
-
+ }): null
+ console.log('xixi',element.isPlanScore)
//判断存在总分填写后没有勾选题目
- if( (element.basicInfoScore != 0 && JSON.parse(element.basicInfoData).length == 0) ||
- (element.adjoinScore != 0 && JSON.parse(element.adjoinData).length == 0) ||
- (element.importLocationScore != 0 && JSON.parse(element.importLocationData).length == 0) ||
- (element.functionalDivisionScore != 0 && JSON.parse(element.functionalDivisionData).length == 0) ||
- (element.facilityScore != 0 && JSON.parse(element.facilityData).length == 0) ){
+ if( (element.basicInfoScore != 0 && element.basicInfoNodesKey.length == 0) ||
+ (element.aroundScore != 0 && element.aroundNodesKey.length == 0) ||
+ (element.keySiteScore != 0 && element.keySiteNodesKey.length == 0) ||
+ (element.funDivScore != 0 && element.funDivNodesKey.length == 0) ||
+ (element.fireFacScore != 0 && element.fireFacNodesKey.length == 0) ){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -1230,11 +1231,11 @@ export class CreateTestScoreComponent implements OnInit {
}else
//勾选了题目存在没有填写总分
if(
- (element.basicInfoScore == 0 && JSON.parse(element.basicInfoData).length != 0) ||
- (element.adjoinScore == 0 && JSON.parse(element.adjoinData).length != 0) ||
- (element.importLocationScore == 0 && JSON.parse(element.importLocationData).length != 0) ||
- (element.functionalDivisionScore == 0 && JSON.parse(element.functionalDivisionData).length != 0) ||
- (element.facilityScore == 0 && JSON.parse(element.facilityData).length != 0) ){
+ (element.basicInfoScore == 0 && element.basicInfoNodesKey.length != 0) ||
+ (element.aroundScore == 0 && element.aroundNodesKey.length != 0) ||
+ (element.keySiteScore == 0 && element.keySiteNodesKey.length != 0) ||
+ (element.funDivScore == 0 && element.funDivNodesKey.length != 0) ||
+ (element.fireFacScore == 0 && element.fireFacNodesKey.length != 0) ){
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
@@ -1252,9 +1253,9 @@ export class CreateTestScoreComponent implements OnInit {
}
//设置paperPlan的分数
- console.log(123,this.unitId)
+ // console.log(123,this.unitId)
- console.log(456,paperDataInfo)
+ // console.log(456,paperDataInfo)
let _this = this
async function setPlansScore(){
for (let index = 0; index < _this.unitId.length; index++) {
@@ -1274,10 +1275,6 @@ export class CreateTestScoreComponent implements OnInit {
}
}
-
-
-
-
setPlansScore().then(()=>{
console.log('修改分数成功2222')
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.html b/src/app/ui/collection-tools-examinee/collection-tools.component.html
new file mode 100644
index 0000000..60d854c
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/collection-tools.component.html
@@ -0,0 +1,298 @@
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.scss b/src/app/ui/collection-tools-examinee/collection-tools.component.scss
new file mode 100644
index 0000000..e97085a
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/collection-tools.component.scss
@@ -0,0 +1,480 @@
+@import './panel.scss';
+::-webkit-scrollbar {
+ display: none; /* Chrome Safari */
+}
+.content {
+ width: 100%;
+ height: 100%;
+ overflow: hidden;
+ box-sizing: border-box;
+ padding: 3px;
+ display: flex;
+ flex-direction: column;
+ .buildingbtnchecked{
+ background-color: #07CDCF;
+ color: white;
+ }
+}
+
+//header头部
+.header {
+ position: relative;
+ width: 100%;
+ height: 46px;
+ min-height: 46px;
+ display: flex;
+ align-items:center;
+ background-color: #fff;
+ box-shadow: inset 0px -3px 5px 0px rgb(165, 163, 163);
+ .headerTitle {
+ width: 235px;
+ overflow: hidden;
+ color: #07CDCF;
+ box-sizing: border-box;
+ padding-left: 25px;
+ font-size: 20px;
+ font-weight: 550;
+ }
+ .headerCenter {
+ flex: 1;
+ overflow: hidden;
+ input {
+ width: 99%;
+ height: 30px;
+ background-color: #e7f0f0;
+ border-radius: 5px;
+ }
+ }
+ .headerRight {
+ width: 350px;
+ overflow: hidden;
+ box-sizing: border-box;
+ padding-left: 10px;
+ button {
+ font-size: 14px;
+ color: #07CDCF;
+ background-color: #fff;
+ border: none;
+ outline: none;
+ cursor:pointer;
+ }
+ .mat-icon {
+ font-size: 22px;
+ vertical-align: middle;
+ margin-right: 3px;
+ }
+ }
+}
+
+//头部操作栏
+.headerOperate {
+ img {
+ width: 24px;
+ height: 24px;
+ vertical-align: middle;
+ margin-left: 1px;
+ }
+ span{
+ font-size: 18px;
+ }
+ flex: 5%;
+ display: flex;
+ align-items:center;
+ min-height: 40px;
+ box-sizing: border-box;
+ margin: 3px 0;
+ background-color: white;
+ button{
+ border: 0.5px solid rgb(208, 211, 214);
+ margin: 0 2px;
+ }
+ .editdeletebtn{
+ display: none;
+ }
+ .bigeditdeletebtn:hover{
+ .editdeletebtn{
+ display: inline-block;
+ }
+ }
+}
+
+//功能区
+// icon统一样式
+.mat-icon {
+ cursor:pointer;
+ vertical-align: middle;
+}
+//左右两侧功能栏 统一样式
+.publicCss {
+ border-radius: 5px;
+ position: absolute;
+ height: 100%;
+ top: 0;
+}
+.functionalDomain {
+ flex: 1;
+ overflow: hidden;
+ .functionalDomainContent {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ }
+ .centerBuildingDiv {
+ position: absolute;
+ max-width: 400px;
+ top: 40px;
+ left: 240px;
+ z-index: 150;
+ display: flex;
+ }
+ .functionalDomainLeft {
+ background-color: #fff;
+ display: flex;
+ flex-direction: column;
+ margin-left: 0px;
+ transition: margin-left 0.5s;
+ min-width: 235px;
+ border: 1px solid #cacdd1;
+ width: 235px;
+ left: 0;
+ z-index: 111;
+ .leftDragDiv{
+ position: absolute;
+ right: 0;
+ height: 100%;
+ width: 3px;
+ z-index: 1000;
+ cursor: e-resize;
+ }
+ }
+ .functionalDomainRight {
+ z-index: 111;
+ margin-right: 0px;
+ transition: margin-right 0.5s;
+ border: 1px solid #cacdd1;
+ width: 235px;
+ min-width: 235px;
+ right: 0;
+ }
+ //右边导航栏显示隐藏
+ .togglePanel2 {
+ margin-right: -2000px;
+ transition: margin-right 1s;
+ }
+ //左侧导航栏显示隐藏
+ .togglePanel {
+ margin-left: -2000px;
+ transition: margin-left 1s;
+ }
+
+}
+
+//中间建筑/楼层
+.centerTotal {
+ width: 197px;
+ background-color: #fff;
+ box-shadow: 0px 0px 5px 3px rgb(165, 163, 163);
+ border-radius: 5px;
+ box-sizing: border-box;
+ padding: 5px 0;
+ .centerTotalHeader {
+ height: 30px;
+ line-height: 30px;
+ box-sizing: border-box;
+ padding: 0 5px;
+ font-size: 14px;
+ .mat-icon:hover {cursor: move;;}
+ .mat-icon {
+ font-size: 24px;
+ color: rgb(175, 164, 164);
+ margin: 0 30px 0 10px;
+ }
+ }
+ .everyTotal {
+ width: 100%;
+ height: 30px;
+ line-height: 30px;
+ box-sizing: border-box;
+ padding: 0 5px;
+ margin: 3px 0;
+ cursor:pointer;
+ font-size: 16px;
+ }
+}
+//中间建筑/楼层
+
+//右边操作栏
+.titleS{
+ width: 100%;
+ height: 35px;
+ line-height: 35px;
+ padding-left: 5px;
+ box-sizing: border-box;
+ color: #07CDCF;
+ .mat-icon {vertical-align: middle; margin-right: 5px; font-size: 22px;}
+}
+input { border: none; outline: none; background-color: #d6dddf; box-sizing: border-box; padding-left: 5px; }
+
+//右侧属性
+.property{
+ display: flex;
+ flex-flow: column;
+ .siteproperty{
+ height: 100%;
+ overflow-y: auto;
+ p{
+ color: #9c9fa5;
+ padding-left: 5px;
+ }
+ .siteproperty_size{
+ background-color: #F2F5F6;
+ width: 93%;
+ margin: 0 auto;
+ border-radius: 3px;
+ min-height: 21px;
+ }
+ .rightAttribute{
+ width: 12%;
+ height: 99.5%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ border: 2px solid #464646;
+ }
+ }
+ .assetsproperty{
+ overflow-y: auto;
+ height: 100%;
+ p{
+ color: #9c9fa5;
+ margin:1px 0 3px 8px;
+ font-size: 14px;
+ }
+ span{
+ font-size: 15px;
+ }
+ input{
+ height: 24px;
+ border-radius: 3px;
+ }
+ .biginput{
+ display: block;
+ width: 88%;
+ margin: 0 auto;
+ }
+ .smallinput{
+ display: block;
+ width: 19%;
+ margin-left: 8px;
+ }
+ .textarea{
+ display: block;
+ width: 88%;
+ height: 50px;
+ margin: 0 auto;
+ }
+ .swiper-button-next{
+ right: 6px;
+ }
+ .swiper-button-prev{
+ left: 6px;
+ }
+ .swiper-container{
+ // --swiper-theme-color: #ff6600;/* 设置Swiper风格 */
+ // --swiper-navigation-color: #00ff33;/* 单独设置按钮颜色 */
+ --swiper-navigation-size:20px;/* 设置按钮大小 */
+ }
+ .hoverred:hover{
+ color: rgb(187, 28, 28);
+ }
+ .selectDiv{
+ height: 21px;
+ position: relative;
+ margin-bottom: 5px;
+ select{
+ width: 98px;
+ height: 22px;
+ vertical-align: middle;
+ position: absolute;
+ right: 10px;
+ top: 1px;
+ border: 1px solid rgb(208, 211, 214);
+ border-radius: 2px;
+ }
+ }
+ .colorBigDiv{
+ width: 88%;
+ margin-left: 8px;
+ .colorBigTemplateDiv{
+ span{
+ color: #9c9fa5;
+ font-size: 14px;
+ height: 26px;
+ line-height: 26px;
+ }
+ .colorTemplateDiv{
+ width: 65%;
+ height: 22px;
+ display: inline-block;
+ vertical-align: middle;
+ margin-left: 26px;
+ }
+ }
+
+ .colorDiv{
+ .colorLi{
+ width: 24px;
+ height: 24px;
+ list-style: none;
+ float: left;
+ border: 2px solid white;
+ }
+ .coloractive{
+ border: 2px solid black;
+ }
+ }
+ }
+
+ }
+}
+//右侧消防要素
+.firecategories{
+ position: relative;
+ display: flex;
+ flex-flow: column;
+ .firecategoriesTree{
+ overflow-y: auto;
+ height: 100%;
+ }
+}
+
+// 解决轮播图蓝框问题
+div:focus {
+ outline: none;
+}
+//没有图片时显示无图片背景图
+.noImgCss{
+ background: url(../../../assets/images/noImg.png) no-repeat center center;
+ background-size: 88% 100%;/*按比例缩放*/
+}
+.input{
+ width: 18px;
+ height: 18px;
+ vertical-align: middle;
+ margin-left: 9px;
+ margin-right: 3px;
+}
+
+// tree
+.isLookCss{
+ margin-left: auto;
+ color: #07CDCF;
+ .icongray{
+ color: #D9D0DC;
+ }
+}
+.mat-tree-node{
+ padding-right: 3px;
+ min-height: 30px;
+ height: 30px;
+ font-size: 12px;
+ cursor: pointer;
+}
+.treeNode:hover{
+ background-color: #ccebf8;
+}
+.isLookPattern{
+ display: none;
+}
+.treeText{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ display: inline-block;
+ width: 65px;
+}
+
+.bigBox{
+ width: 700px;
+ height: 40px;
+ position: absolute;
+ overflow: hidden;
+ right: 0;
+}
+.weatherBox{
+ height: 40px;
+ width: 700px;
+ line-height: 40px;
+ position: absolute;
+ right: 0;
+ transition: right linear .5s;
+ .openbtn{
+ font-size: 45px;
+ height: 45px;
+ width: 40px;
+ }
+ .name{
+ font-size: 16px;
+ vertical-align: middle;
+ margin-left: 3px;
+ }
+ input{
+ width: 140px;
+ height: 22px;
+ margin-left: 3px;
+ }
+ select{
+ width: 96px;
+ height: 25px;
+ margin-left: 3px;
+ vertical-align: middle;
+ }
+}
+.open{
+ right: 0px;
+}
+.close{
+ right:-622px;
+}
+.bottomCss{
+ position: absolute;
+ left: 232px;
+ right: 0px;
+ bottom: 0;
+ height: 158px;
+ width: auto;
+ z-index: 111;
+ background-color: white;
+ border: 1px solid #464646;
+ .dragDiv{
+ width: 100%;
+ height: 3px;
+ position: absolute;
+ top: 0;
+ z-index: 111;
+ cursor: n-resize;
+ }
+ .title{
+ height: 35px;
+ background-color: #464646;
+ div{
+ background-color: #464646;
+ float: left;
+ width: 80px;
+ color: white;
+ font-size: 13px;
+ padding-left: 5px;
+ cursor: pointer;
+ }
+ .detailsAndattentBtn{
+ background-color: #595959;
+ }
+ }
+ .body{
+ textarea{
+ width: 100%;
+ border-radius: 0px;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/collection-tools.component.spec.ts b/src/app/ui/collection-tools-examinee/collection-tools.component.spec.ts
new file mode 100644
index 0000000..acc7d5e
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/collection-tools.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CollectionToolsComponent } from './collection-tools.component';
+
+describe('CollectionToolsComponent', () => {
+ let component: CollectionToolsComponent;
+ let fixture: ComponentFixture
+
+
+
+
+ {{examMsg.conpanyName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ open_with
+
+
+
+ {{item.name}}
+
+
+
+ 总平面图
+
+ {{item.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ {{items.name}}
+
+
+
+
+
+ keyboard_arrow_up
+ keyboard_arrow_down
+
+
+
+
+
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
+ {{node.name}}
+
+ ({{node.children.length}})
+ visibility
+
+
+
+
+
+
+
+
+
+
+
+
+ info 属性
+
+
+
+
+
+ 面积(平方米)
+{{canvasData.selectStorey.area}}
+ 详情
+
+ {{canvasData.selectStorey.details}}
+
+
+
+
+ {{assetName}}
+ +
+
+
+ 宽度(像素)
+ +高度(像素)
+ +角度
+
+
+
+
+
+
+ 厚度
+
+
+
+ 是否高亮
+
+
+ 选中高亮
+
+
+
+
+ 颜色
+
+
+
+
+
+
+ 透明度
+ -
+
+
+
+
+
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+ {{item.PropertyName}}({{item.PhysicalUnit}})
+ +
+
+
+
+
+ {{item.PropertyName}}
+ {{imagesArr.length ? imagesArr.length : 0}} / {{item.PropertyValue}} + +添加
+
+
+
+ delete
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ {{item.PropertyName}}
+ +
+
+
+ {{item.PropertyName}}
+ 是 + 否 +
+
+
+ {{item.PropertyName}}
+ +
+
+ {{item.PropertyName}}
+ +
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/examinationQuestions.ts b/src/app/ui/collection-tools-examinee/examinationQuestions.ts
new file mode 100644
index 0000000..e79c55b
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/examinationQuestions.ts
@@ -0,0 +1,346 @@
+import { Component, OnInit, Inject, ViewChild } from '@angular/core';
+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 {CanvasShareDataService,DisposalNodeData} from '../../canvas-share-data.service' //引入服务
+import { FlatTreeControl } from '@angular/cdk/tree';
+import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree';
+import { NzFormatBeforeDropEvent, NzFormatEmitEvent,NzTreeComponent } from 'ng-zorro-antd/tree';
+import { ActivatedRoute } from '@angular/router';
+
+@Component({
+ selector: 'dialog-examination-questions',
+ templateUrl: './examinationQuestions.html',
+ styleUrls: ['./collection-tools.component.scss',]
+})
+export class examinationQuestionsExaminee {
+
+ constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef消防设施考题设定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+处置节点保存
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/saveTwo.html b/src/app/ui/collection-tools-examinee/saveTwo.html
new file mode 100644
index 0000000..fec97ff
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/saveTwo.html
@@ -0,0 +1,53 @@
+
+
+新增节点
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/uploadDisposalNodes.html b/src/app/ui/collection-tools-examinee/uploadDisposalNodes.html
new file mode 100644
index 0000000..f20c4e1
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/uploadDisposalNodes.html
@@ -0,0 +1,14 @@
+保存到已有节点
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools-examinee/uploadQuestions.html b/src/app/ui/collection-tools-examinee/uploadQuestions.html
new file mode 100644
index 0000000..a891755
--- /dev/null
+++ b/src/app/ui/collection-tools-examinee/uploadQuestions.html
@@ -0,0 +1,51 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/collection-tools/examinationQuestions.ts b/src/app/ui/collection-tools/examinationQuestions.ts
index a2e7370..8f22a0a 100644
--- a/src/app/ui/collection-tools/examinationQuestions.ts
+++ b/src/app/ui/collection-tools/examinationQuestions.ts
@@ -283,18 +283,20 @@ export class uploadQuestions {
companyId:sessionStorage.getItem('companyId')
}
+
this.http.put(`/api/PaperPlans/${this.route.snapshot.queryParams.paperplanId}`,body).subscribe(data => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('设置完成,页面将于一秒后关闭','确定',config);
- // setTimeout(() => {
- // window.close()
- // }, 1000);
+ setTimeout(() => {
+ window.close()
+ }, 1000);
})
+
}
}
diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts
index e2a3352..bada7e3 100644
--- a/src/app/ui/ui.module.ts
+++ b/src/app/ui/ui.module.ts
@@ -62,8 +62,11 @@ import {AddEnterpriserUser} from './enterpriseuser/addenterpriseuser.component'
import {EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser} from './enterpriseuser/enterpriseuser.component'
import {AddTeacher} from './teacherManagement/addenterpriseuser.component'
import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManagement/enterpriseuser.component'
+import { CollectionToolsExamineeComponent } from './collection-tools-examinee/collection-tools.component';
+import { examinationQuestionsExaminee, uploadDisposalNodesExaminee, uploadQuestionsExaminee } from './collection-tools-examinee/examinationQuestions';
+import { saveOneDialogExaminee, saveTwoDialogExaminee } from './collection-tools-examinee/save';
@NgModule({
- declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher,uploadDisposalNodes],
+ declarations: [ChangepasswordComponent,ConfirmpswDirective, ChangeuserdataComponent,testState,CollectionToolsComponent,CreateBuilding,EditBuilding,ViewDetailss,leftFunctionalDomainComponent,editPlaneFigureComponent,addDisposalNodeComponent,editDisposalNodeComponent,saveOneDialog,saveTwoDialog,WorkingAreaComponent,examinationQuestions,uploadQuestions,AddEnterpriserUser,EnterpriseuserComponent,editenterpriseuser,seeenterpriseuser,AddTeacher,TeacherManagementComponent,editTeacher,seeTeacher,uploadDisposalNodes,CollectionToolsExamineeComponent,examinationQuestionsExaminee,uploadQuestionsExaminee,uploadDisposalNodesExaminee,saveOneDialogExaminee,saveTwoDialogExaminee],
imports: [
NzDatePickerModule,
CommonModule,
From 1797683649b0c4d97060a97e8eaf7b88c930ae51 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Thu, 24 Dec 2020 10:22:14 +0800
Subject: [PATCH 15/15] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E8=80=83=E7=94=9F?=
=?UTF-8?q?=E8=80=83=E8=AF=95=E7=95=8C=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../examination-details.component.html | 22 +++++++-
.../examination-details.component.scss | 54 +++++++++++++++++++
.../examination-details.component.ts | 13 +++++
3 files changed, 88 insertions(+), 1 deletion(-)
diff --git a/src/app/student/examination-details/examination-details.component.html b/src/app/student/examination-details/examination-details.component.html
index 94bf9a0..2da6af4 100644
--- a/src/app/student/examination-details/examination-details.component.html
+++ b/src/app/student/examination-details/examination-details.component.html
@@ -10,7 +10,27 @@
上传
+ 考试要点
+
+
+
+ 考核消防设施
+
+
+
+
+
+
+
+
+
+
+
+ 考核处置节点
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 作战部署
+