From 0de061e057444d3fae6561af33b965bc1ed33684 Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Mon, 4 Jan 2021 10:45:38 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E8=80=83=E5=AE=98=E9=98=85?= =?UTF-8?q?=E5=8D=B7=E9=A2=84=E6=A1=88=E5=9F=BA=E7=A1=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app-routing.module.ts | 6 +- .../review-files/review-files.component.html | 12 +- .../review-files/review-files.component.ts | 73 +- .../examination-details.component.ts | 1 + .../collection-tools.component.html | 303 +++++ .../collection-tools.component.scss | 498 +++++++ .../collection-tools.component.spec.ts | 25 + .../collection-tools.component.ts | 1153 +++++++++++++++++ .../examinationQuestions.html | 26 + .../examinationQuestions.ts | 290 +++++ src/app/ui/collection-tools-read/panel.scss | 294 +++++ .../uploadDisposalNodes.html | 14 + .../uploadQuestions.html | 32 + src/app/ui/ui.module.ts | 4 +- .../working-area/working-area.component.ts | 1 + src/styles.scss | 2 +- 16 files changed, 2703 insertions(+), 31 deletions(-) create mode 100644 src/app/ui/collection-tools-read/collection-tools.component.html create mode 100644 src/app/ui/collection-tools-read/collection-tools.component.scss create mode 100644 src/app/ui/collection-tools-read/collection-tools.component.spec.ts create mode 100644 src/app/ui/collection-tools-read/collection-tools.component.ts create mode 100644 src/app/ui/collection-tools-read/examinationQuestions.html create mode 100644 src/app/ui/collection-tools-read/examinationQuestions.ts create mode 100644 src/app/ui/collection-tools-read/panel.scss create mode 100644 src/app/ui/collection-tools-read/uploadDisposalNodes.html create mode 100644 src/app/ui/collection-tools-read/uploadQuestions.html diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 445207e..c1feec7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -19,6 +19,7 @@ import { CollectionToolsComponent } from './ui/collection-tools/collection-tools import { ExaminationDetailsComponent } from './student/examination-details/examination-details.component'; import { CollectionToolsExamineeComponent } from './ui/collection-tools-examinee/collection-tools.component'; import { ReviewFilesComponent } from './examiner/review-files/review-files.component'; +import { CollectionToolsReadComponent } from './ui/collection-tools-read/collection-tools.component'; @@ -33,11 +34,12 @@ const routes: Routes = [ ] }, { path:'examiner/create-test-score', component:CreateTestScoreComponent,canActivate: [AuthGuard],}, //考官 创建考卷 - { path:'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //考官 编制工具 { path:'reviewFiles', component: ReviewFilesComponent,canActivate: [AuthGuard], }, //考官 阅卷 { path:'examinationDetails', component:ExaminationDetailsComponent,canActivate: [AuthGuard], }, //考生试卷 考试基本信息/作战部署 + { path:'canvasTool', component:CollectionToolsComponent,canActivate: [AuthGuard], }, //考官 编制工具 { path:'canvasToolExaminee', component:CollectionToolsExamineeComponent,canActivate: [AuthGuard], }, //考生 编制工具 - + { path:'canvasToolRead', component:CollectionToolsReadComponent,canActivate: [AuthGuard], }, //考官 阅卷 编制工具 + { path:'adminLogin', component:LoginComponent}, //管理员登录路由 { path:'login', component:LockscreenComponent}, //教员学员登录路由 ]; diff --git a/src/app/examiner/review-files/review-files.component.html b/src/app/examiner/review-files/review-files.component.html index 3cee59f..e60587b 100644 --- a/src/app/examiner/review-files/review-files.component.html +++ b/src/app/examiner/review-files/review-files.component.html @@ -18,7 +18,7 @@
- +
@@ -143,20 +143,20 @@ 预案名称 添加人 修改时间 - 是否公开 编制级别 - 设置分数 + 得分 + 状态 操作 {{item.title}} {{item.creatorName}} {{item.modifiedTime | date:'yyyy-MM-dd'}} - {{item.isPublic ? '已公开' : '未公开'}} {{item.planLevel | planlevel}} - {{item.score}}分 + xxxx + 已阅 - 进入 + 阅卷 diff --git a/src/app/examiner/review-files/review-files.component.ts b/src/app/examiner/review-files/review-files.component.ts index 80e249f..615fff3 100644 --- a/src/app/examiner/review-files/review-files.component.ts +++ b/src/app/examiner/review-files/review-files.component.ts @@ -14,8 +14,9 @@ export class ReviewFilesComponent implements OnInit { constructor(public canvasData:CanvasShareDataService, public http:HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public route:ActivatedRoute) { } - ngOnInit(): void { - this.getTest() + async ngOnInit(): Promise { + await this.getTest() + this.getUnitPlans()//将试卷的预案考题放进数据中 } examId:any = this.route.snapshot.queryParams.examId //考卷id @@ -24,25 +25,47 @@ export class ReviewFilesComponent implements OnInit { paperCompanyData:any = []; //考生具体考卷 selectPaper:any = {id:null}; //选择当前考卷 selectPaperType:string = '1'; //选择当前考卷内容 基本信息/作战部署 - + paperId:any//试卷id //获取考生试卷 - getTest () { - this.http.get(`/api/Examinations/${this.examId}`).subscribe((data:any)=>{ - this.paperData = data - this.paperData.examinationDataInfo.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 - element.score = element.adjoinScore + element.basicInfoScore + element.facilityScore + element.functionalDivisionScore + element.importLocationScore - this.examScore = this.examScore + element.score - }); - this.paperCompanyData = JSON.parse( JSON.stringify(data.examinationDataInfo) ) //具体考卷 - this.selectPaper = this.paperCompanyData[0] + async getTest () { + await new Promise((resolve, reject) => { + this.http.get(`/api/Examinations/${this.examId}`).subscribe((data:any)=>{ + this.paperData = data + this.paperId = this.paperData.paperId + this.paperData.examinationDataInfo.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 + element.score = element.adjoinScore + element.basicInfoScore + element.facilityScore + element.functionalDivisionScore + element.importLocationScore + this.examScore = this.examScore + element.score + }); + this.paperCompanyData = JSON.parse( JSON.stringify(data.examinationDataInfo) ) //具体考卷 + this.selectPaper = this.paperCompanyData[0] + resolve(1) + }) }) } - + //获得单位预案设定 + async getUnitPlans(){ + for (let index = 0; index < this.paperCompanyData.length; index++) { + const item = this.paperCompanyData[index]; + let params = { + paperId : this.paperData.paperId, + companyId : item.companyInfo.id + } + await new Promise((resolve,reject)=>{ + this.http.get(`/api/PaperPlans`,{params:params}).subscribe(data => { + console.log(111,data) + item.planList = [] + item.planList = data + resolve(1) + }) + }) + } + // this.calculateScore() + } //基本信息表格 是否展示当前行 rowIsShow (children,tag) { let isShow:boolean = false @@ -74,9 +97,17 @@ export class ReviewFilesComponent implements OnInit { this.snackBar.open('阅卷结果提交成功','确定',config); } - //进入作战部署 阅卷 - enterExam(item){ - + //作战部署 阅卷 + readExam(item){ + console.log(this.selectPaper) + sessionStorage.setItem('companyName',this.selectPaper.companyInfo.name) + sessionStorage.setItem('planId',item.planComponentId) + sessionStorage.setItem('buildingTypeId',this.selectPaper.companyInfo.buildingTypes[0].id) + sessionStorage.setItem('companyId',this.selectPaper.companyInfo.id) + let openType + item.examPlanType == 0 ? openType = 1 : openType = 2 + window.open(`/canvasToolRead?planName=${item.title}&paperplanId=${item.id}&openType=${openType}&paperId=${this.paperId}&examId=${this.route.snapshot.queryParams.examId}&planComponentId=${item.planComponentId}`) } + } diff --git a/src/app/student/examination-details/examination-details.component.ts b/src/app/student/examination-details/examination-details.component.ts index 26510a1..f79eaf6 100644 --- a/src/app/student/examination-details/examination-details.component.ts +++ b/src/app/student/examination-details/examination-details.component.ts @@ -97,6 +97,7 @@ export class ExaminationDetailsComponent implements OnInit { async getUnitPlans(){ for (let index = 0; index < this.paperCompanyData.length; index++) { const item = this.paperCompanyData[index]; + console.log(888,item) let params = { paperId : item.paperId, companyId : item.companyInfo.id diff --git a/src/app/ui/collection-tools-read/collection-tools.component.html b/src/app/ui/collection-tools-read/collection-tools.component.html new file mode 100644 index 0000000..5519d75 --- /dev/null +++ b/src/app/ui/collection-tools-read/collection-tools.component.html @@ -0,0 +1,303 @@ +
+ +
+
{{examMsg.conpanyName}}
+
+
+ 考试要点 : {{planData.mainPoint}} +
+
+
+ + + +
+
+ + +
+
+ + + + + + +
+
+
+ open_with + +
+
+ {{item.name}} +
+
+
+
+
总平面图
+
+ {{item.name}} +
+
+
+ + +
+ +
+ + +
+ +
+ +
+
+ + +
+ + +
+
+ keyboard_arrow_up + keyboard_arrow_down + +
+
+
+

考试题目

+ + +
+ +
+ +
+ +
+

考生答案

+ + +
+ +
+ +
+ +
+
+ + + + +
+
+ keyboard_arrow_up + keyboard_arrow_down + +
+
+ + + + +
+ + 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}} + + +
+
+
+
+ +
+
+
+
+
+ +
+

{{item.PropertyName}}

+ +
+ +
+

{{item.PropertyName}}

+ 是 + 否 +
+ +
+

{{item.PropertyName}}

+ +
+ +
+

{{item.PropertyName}}

+ +
+
+
+ +
+
+ +
+
+ + +
\ No newline at end of file diff --git a/src/app/ui/collection-tools-read/collection-tools.component.scss b/src/app/ui/collection-tools-read/collection-tools.component.scss new file mode 100644 index 0000000..89dc490 --- /dev/null +++ b/src/app/ui/collection-tools-read/collection-tools.component.scss @@ -0,0 +1,498 @@ +@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; + .mainPointDiv{ + box-sizing: border-box; + padding-left: 8px; + cursor: default; + span{ + font-family: Source Han Sans CN; + color: #FF8678; + font-size: 15px; + } + + } + } + .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%; + } + .answerDivDrag{ + position: absolute; + width: 230px; + min-height: 50px; + max-height: 560px; + overflow-y: auto; + top: 0px; + right: 96px; + z-index: 150; + border: 1px solid #07CDCF; + border-radius: 5px; + // display: flex; + } + .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-read/collection-tools.component.spec.ts b/src/app/ui/collection-tools-read/collection-tools.component.spec.ts new file mode 100644 index 0000000..acc7d5e --- /dev/null +++ b/src/app/ui/collection-tools-read/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; + + 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-read/collection-tools.component.ts b/src/app/ui/collection-tools-read/collection-tools.component.ts new file mode 100644 index 0000000..d3abad7 --- /dev/null +++ b/src/app/ui/collection-tools-read/collection-tools.component.ts @@ -0,0 +1,1153 @@ +import { Component, OnInit, Inject, ViewChild,ElementRef,Renderer2, ViewContainerRef, ɵConsole } 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 { 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 { examinationQuestionsRead,uploadDisposalNodesRead,uploadQuestionsRead } from './examinationQuestions' + + +@Component({ + selector: 'app-collection-tools', + templateUrl: './collection-tools.component.html', + styleUrls: ['./collection-tools.component.scss'] +}) +export class CollectionToolsReadComponent 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('nzTreeComponent2', { 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实例 + selectedcolor:any//选择素材的颜色代码 + //设置属性框 + 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.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//默认为基本信息编辑 + + + + //左侧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边框宽度调节 + 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; + } + } + + examMsg = { //单位,考试信息 + conpanyName: sessionStorage.getItem('companyName') || '暂无数据', //单位名称 + keynote: '', //考试要点 + } + + async ngOnInit(): Promise { + + this.getAllBuildings() //获取所有建筑 + this.getAllFirePlan() //获取当前单位灾情 + + await this.getPaperPlanData()//获得当前考题题目 + this.getExaminationQuestions() + let that = this + window.setTimeout(()=>{ + document.getElementById("functionalDomainContent").oncontextmenu = function (event) { + event.preventDefault(); + }; + }) + + this.canvasData.getMessage().subscribe((message: any)=>{ + if(message == "send a message"){ + this.refurbishTreeData() + } + }) + + } + paperId:any = this.route.snapshot.queryParams.paperId + planData:any //当前考题题目 + Facilities:any //当前预案考题所有楼层要考的基本信息素材 + //获得单位预案设定 + async getPaperPlanData(){ + let params = { + paperId : this.paperId + } + await new Promise((resolve,reject)=>{ + this.http.get(`/api/PaperPlans`,{params:params}).subscribe((data:any) => { + data.forEach(item => { + item.id == this.route.snapshot.queryParams.paperplanId ? + this.planData = item : null + }) + + let questions = JSON.parse(this.planData.examDisposalNodesData) + this.handleHybridTree(questions,'题目') + this.Facilities = JSON.parse(this.planData.examFacilityAssetsData) + console.log('当前预案设定需要隐藏的基本信息图标',this.Facilities) + resolve(1) + }) + }) + } + + + 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=>{ + console.log(obj.assetData) + }) + // 监听canvas组件删除素材事件 + this.canvas.on("deleteIcon",obj=>{ + }) + + + } + + //保存平面图 + saveNum :any = [] + async saveSite(){ + + } + + //获得所有的建筑物 + getAllBuildings(){ + this.http.get("/api/Buildings",{ + params:{ + companyId : this.params.companyId + } + }).subscribe(data=>{ + this.allBuildings = data + }) + } + + + //选择建筑 + checkedBuilding(item,index){ + if (this.checkedBuildingIndex!=index) { + this.beforeOneCheckedBuilding = item + this.checkedBuildingIndex = index + if (index==-1) { //总平面图数据 + this.getSitePlan() + } else { //建筑楼层/区域数据 + this.getBuildingSitePlan(item) + } + } //if + } + + + + storeyData //将建筑素材和当前楼层素材合二为一 + + //处理 tree 数据结构 + handleTreeData (storeyData) { + //storeyData为当前楼层拥有的消防设施 + this.storeyData = storeyData + let data = JSON.parse(JSON.stringify(this.allFireElements)) //所有消防要素模板 + let treeData = [] //tree型 处理完成后的数据 + this.allFireElements.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]) + } + } + } + this.allFireElements.forEach(item => { if (item.parentId == element.id) {element.children.push(item)} }); + }); + this.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; +   } + + 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]) + } + + // 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) + } + this.canvas.setHighlight(iconHighLightArr) + } + + //点击树节点的显示隐藏icon + clickLookItem(node){ + + console.log(this.allFireElements) + //子节点跟随父节点的islook变化 +   if(node.origin.children && node.origin.children.length != 0){ + node.origin.isLook = !node.origin.isLook +      node.origin.children.forEach(item=>{ +        item.isLook = node.origin.isLook  +        if(item.children && item.children.length != 0){ +          item.children.forEach(i=>{ +            i.isLook = node.origin.isLook  +          }) +        } +      }) +     }else{ +   node.origin.isLook = !node.origin.isLook + } + + //canvas上的素材显隐 + let iconVisibleArr:any = [] + if(node.origin.children && node.origin.children.length != 0){//如果是模板,则开始向下找 + node.origin.children.forEach(item => { + if(item.children && item.children.length != 0){//如果子节点依旧是模板,则继续开始向下找 + item.children.forEach(i => { + iconVisibleArr.push(i.Id) + }) + }else{ + iconVisibleArr.push(item.Id) + } + }) + }else{ + iconVisibleArr.push(node.origin.Id) + } + + console.log(iconVisibleArr) + console.log(678,this.renderData) + + this.canvas.setIconVisible(iconVisibleArr,true) + } + + //打开消防设施考题设定 + openFireExamination () { + + let buildFloorData = { + buildingData:this.beforeOneCheckedBuilding, + floorData:this.selectingSitePlan + } + let data = { oldRealData:this.storeyData ,buildFloorData:buildFloorData,Facilities:this.Facilities,allFireElements:this.allFireElements} + let dialogRef = this.dialog.open(examinationQuestionsRead,{data}); + } + + + answerDivDrag:boolean = false//查看答案窗口的显隐 + answertreeData:any + lookAnswerDiv(){ + this.answerDivDrag = !this.answerDivDrag + + let question = JSON.parse(this.planData.examDisposalNodesData) + let questionDataArr = [] + question.forEach(item => { + item.sitePlanId ? questionDataArr.push(item) : null + }); + + function array_diff(a, b) { + for(var i=0;i { + + 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 + } + arr.forEach(item=>{ + item.parentId === element.id? element.children.push(item) : null + }) + }); + arr.forEach(element=>{ + !element.parentId? treeData.push(element) : null + }) + console.log(789,treeData) + this.answertreeData = treeData + + } + + //考官获得设置考题的所有处置节点 + allExaminationQuestions:any + getExaminationQuestions(){ + 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.allExaminationQuestions = nodeData + }) + } + /** + * 获得所有素材库 + */ + basicAssetLibraries:any = []//基本信息素材库 + getAllAssetLibraries(Facilitiesitem){ + + console.log('具体到当前楼层需要隐藏的基本信息图标',Facilitiesitem.children) + let arr = [] + Facilitiesitem.children.forEach(item => { + arr.push(item.Id) + }) + this.canvasData.hiddenBasicInfoFacilities = arr + this.canvas.loadExamineeData() + + + } + //上传考题 + openUploadQuestions () { + + let data = {allFireElements:this.allFireElements,Facilities:this.Facilities} + let dialogRef = this.dialog.open(uploadQuestionsRead,{data}); + + } + + + renderData:any = []//当前层默认隐藏的基本信息考试题目 + //封装 刷新 tree 数据 + async renovateTreeData (isRefresh:boolean = true) { + + this.allFireElements[this.allFireElements.length-1].children = [] + this.beforeOneCheckedBuildingIsShow = false + isRefresh? await this.canvas.refresh() : null + 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 || {} )) //当前 楼层 数据 + + if(this.Facilities){ + this.Facilities.some((item,key)=>{ + if(item.key == this.selectingSitePlan.id){ + let arr = [] + item.children.forEach(i => { + arr.push(i.Id) + }) + this.canvasData.hiddenBasicInfoFacilities = arr + console.log('这层有',item) + let allFireElements = JSON.parse(JSON.stringify(this.allFireElements)) + this.renderData = this.processingData(allFireElements,item.children) + + this.canvas.loadExamineeData() + return true + } else{ + console.log('这层没有tree') + this.renderData = [] + this.canvas.loadExamineeData(false) + return false + } + }) + console.log("llllllll") + + + + // if(this.clickedNodeType == 0){ + // this.canvas.loadExamineeData(false) + // }else{ + // this.canvas.loadExamineeData() + // } + + + + }else{ + this.canvas.loadExamineeData() + } + 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数据结构 + } + //处理数据 将消防要素模板与真实素材结合 + processingData(allFireElements,realData){ + allFireElements[allFireElements.length-1].children = [] + + realData.forEach(item => { + item.isLook = false + 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.length != 0){ + 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) { + element.isLook = false + 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) + + } + + + //陈鹏飞↓↓↓ + //陈鹏飞↓↓↓ + //陈鹏飞↓↓↓ + 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 + console.log('建筑楼层数据',this.sitePlanData) + this.Facilities ? this.sitePlanData.forEach(item => { + this.Facilities.forEach(i =>{ + if(item.id == i.key){ + item.isLabel = true + } + }) + }) : null + 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 + console.log('预案平台当前有哪些楼层',this.sitePlanData) + this.Facilities ? this.sitePlanData.forEach(item => { + this.Facilities.forEach(i =>{ + if(item.id == i.key){ + item.isLabel = true + } + }) + }) : null + 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)=>{ + console.log('预案平台楼层原始素材',data) + 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 + + let examParams = { + sitePlanId : e.id, + examinationId : this.route.snapshot.queryParams.examId, + planComponentId : this.route.snapshot.queryParams.planComponentId + } + this.http.get('/api/ExamSitePlanData',{params:examParams}).subscribe((data2:any)=>{ + console.log('考生新添加的基本信息素材数据',data2) + this.canvasData.examOriginaleveryStoreyData = data2 || {} // 楼层原数据 + this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} + this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" + this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = e.id || null + this.renovateTreeData() + }) + + + + }) + } + //获取 建筑 楼层数据 + 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 + let examParams = { + buildingAreaId : e.id, + examinationId : this.route.snapshot.queryParams.examId, + planComponentId : this.route.snapshot.queryParams.planComponentId + } + this.http.get('/api/ExamBuildingAreaData',{params:examParams}).subscribe((data:any)=>{ + this.canvasData.examOriginaleveryStoreyData = data || {} // 楼层原数据 + this.canvasData.examOriginaleveryStoreyData.data? this.canvasData.examOriginaleveryStoreyData.data = JSON.parse(this.canvasData.examOriginaleveryStoreyData.data) : this.canvasData.examOriginaleveryStoreyData.data = {} + this.canvasData.examOriginaleveryStoreyData.version? null : this.canvasData.examOriginaleveryStoreyData.version = "2.0" + this.canvasData.examOriginaleveryStoreyData.buildingAreaId? null : this.canvasData.examOriginaleveryStoreyData.buildingAreaId = 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') + }) + }) + } + + + + //点击选中 平面图 楼层/区域 时 + selectSitePlan (item,index) { + + if (this.selectSitePlanIndex != index) { + this.clickedNodeType = 1 + this.canvasData.selectPanelPoint = new DisposalNodeData(); + this.selectingSitePlan = item + this.selectSitePlanIndex = index + this.canvasData.selectStorey = item //服务中 存一份数据 + if (this.checkedBuildingIndex==-1) { //总平面图时 + this.getSitePlanStorey(item) //获取 平面图 楼层数据 + } else { //楼层/区域时 + this.getBuildingStorey(item) //获取 建筑 楼层数据 + } + } + } + + + + //删除当前 单位/建筑的 共享数据中 已删除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) //获取 建筑 楼层数据 + } + } + + + + //处置预案 + examType = Number(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: this.route.snapshot.queryParams.planComponentId} + 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 + api='/api/ExamDisposalNodes' + this.selectDisposalNode = '' + let params + params = {examDisasterId: this.allFirePlan[0].id || '',disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} + this.http.get(api,{params:params}).subscribe(data=>{ //处置节点 + this.canvasData.allDisposalNode = data + this.handleHybridTree(this.canvasData.allDisposalNode,'答案') + }) + } + + treeData:any = []; //渲染tree处理完成数据 + questionstreeData:any = [];//渲染tree处理完成数据(题目) + defaultExpandedKeys:any = []; //首次渲染 tree展开状态 + //处理 节点 Tree数据 + handleHybridTree (disposalNodedata,type) { + // this.defaultExpandedKeys = [] + let treeData = [] + let data = JSON.parse(JSON.stringify( disposalNodedata || [] )) + 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 + }) + type == '题目' ? this.questionstreeData = [...treeData] : this.treeData = [...treeData] + + } + + //刷新 treeData 保存已展开节点 + refurbishTreeData () { + let api + api='/api/ExamDisposalNodes' + this.defaultExpandedKeys = [] + let params + params = {examDisasterId: this.allFirePlan[0].id,disposalNodeType:1,examinationId:this.route.snapshot.queryParams.examId} + 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] + }) + } + + + // 切换 基本信息时 刷新 删除 建筑楼层 自定义属性 + mateDeleteCustomize () { + this.defaultExpandedKeys = [] + 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(uploadDisposalNodesRead,{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); + } + } + + + + clickedNodeType:any = 1//点击节点的类型 如果是考官节点 则为0 考生为1 + //点击 处置Tree节点 + selectanelPoint (e,type) { + this.clickedNodeType = type + 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 //选中 节点 + + this.Facilities ? this.sitePlanData.forEach(item => { + this.Facilities.forEach(i =>{ + if(item.id == i.key){ + item.isLabel = true //标记当层需要标注基本信息素材 + } + }) + }) : null + + if (this.canvasData.selectPanelPoint.DisposalNodeId != e.id) { //选择节点 不是当前节点时 + let api + type == 0 ? 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) + console.log(456,this.canvasData.selectPanelPoint.Data) + // this.canvasData.selectPanelPoint.Data.DefinedIncrement == null ? this.canvasData.selectPanelPoint.Data.DefinedIncrement = {} : null + 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 + + this.Facilities ? this.sitePlanData.forEach(item => { + this.Facilities.forEach(i =>{ + if(item.id == i.key){ + item.isLabel = true + } + }) + }) : null + 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 + this.Facilities ? this.sitePlanData.forEach(item => { + this.Facilities.forEach(i =>{ + if(item.id == i.key){ + item.isLabel = true + } + }) + }) : null + Promise.all([fireData,planData]).then((res)=>{ + this.getBuildingStorey(this.selectingSitePlan) //获取 建筑 楼层数据 + }) + }) //get + } + } + + + +} diff --git a/src/app/ui/collection-tools-read/examinationQuestions.html b/src/app/ui/collection-tools-read/examinationQuestions.html new file mode 100644 index 0000000..d92a7ee --- /dev/null +++ b/src/app/ui/collection-tools-read/examinationQuestions.html @@ -0,0 +1,26 @@ +
+
需要标记的消防设施
+
+ + + + +
+ +
+ + +
+
+ +
+
\ No newline at end of file diff --git a/src/app/ui/collection-tools-read/examinationQuestions.ts b/src/app/ui/collection-tools-read/examinationQuestions.ts new file mode 100644 index 0000000..087c8c2 --- /dev/null +++ b/src/app/ui/collection-tools-read/examinationQuestions.ts @@ -0,0 +1,290 @@ +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 examinationQuestionsRead { + + 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; + + renderData:any + ngOnInit(): void { + let data = JSON.parse(JSON.stringify(this.data.Facilities)) + data ? data.forEach(item => { + let realData = item.children + let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) + item.children = this.processingData(allFireElements,realData) + }) :null + this.renderData = data + } + //处理数据 将消防要素模板与真实素材结合 + 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.length != 0){ + 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) + + } + + + nzEvent($event){ + console.log($event) + } + + + +} + + +//上传按钮 +@Component({ + selector: 'dialog-upload-questions', + templateUrl: './uploadQuestions.html', + styleUrls: ['./collection-tools.component.scss',] +}) +export class uploadQuestionsRead { + + constructor(private http:HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data,private route:ActivatedRoute) {} + + + + + renderData:any + labeledOfBasicIcon:any //当前页面各建筑各楼层已标注的基本信息集合 + async ngOnInit(): Promise { + let params = { + examinationId : this.route.snapshot.queryParams.examId, + planComponentId : this.route.snapshot.queryParams.planComponentId + } + let SitePlanData + let BuildingPlanData + await new Promise((resolve,reject) => { + this.http.get('/api/ExamSitePlanData/ExamData',{params}).subscribe(data => { + SitePlanData = data + resolve(1) + }) + }) + await new Promise((resolve,reject) => { + this.http.get('/api/ExamBuildingAreaData/ExamData',{params}).subscribe(data => { + BuildingPlanData = data + resolve(2) + }) + }) + this.labeledOfBasicIcon = [...SitePlanData,...BuildingPlanData] + + + let data = JSON.parse(JSON.stringify(this.data.Facilities)) + console.log('一共有哪几层需要标注',data) + data ? data.forEach(item => { + let realData = item.children + let allFireElements = JSON.parse(JSON.stringify(this.data.allFireElements)) + item.children = this.processingData(allFireElements,realData,item.key) + }) :null + + this.renderData = data + } + + + + //处理数据 将消防要素模板与真实素材结合 + processingData(allFireElements,realData,key){ + + //key为当前处理数据的层id + + + allFireElements[allFireElements.length-1].children = [] + + //数组根据某个属性去重 （一类素材只保留一个） + const res = new Map(); + realData = realData.filter((a) => !res.has(a.TemplateId) && res.set(a.TemplateId, 1)) + console.log('当层需要标记的',realData) + this.labeledOfBasicIcon.forEach(item => { + if(item.sitePlanId == key || item.buildingAreaId == key ){ + let data = JSON.parse(item.data) + console.log('当层已经标记的',data) + let arr = [] + for (const key in data) { + arr.push(data[key]) + } + realData.forEach(i => { + let isexist = arr.some((ele)=>{ + return ele.TemplateId == i.TemplateId + }) + isexist ? i.xxx = true : null + console.log(666,isexist) + }) + } + }) + + + 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.length != 0){ + 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) + + } + + nzEvent($event){ + console.log($event) + } + //上传 + submit () { + // this.dialogRef.close(); + 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 uploadDisposalNodesRead { + + 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-read/panel.scss b/src/app/ui/collection-tools-read/panel.scss new file mode 100644 index 0000000..7f06bf7 --- /dev/null +++ b/src/app/ui/collection-tools-read/panel.scss @@ -0,0 +1,294 @@ +.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; +} +.selectSitePlanColor { + color: #FF8678; +} +//选中素材库图片时 +.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-read/uploadDisposalNodes.html b/src/app/ui/collection-tools-read/uploadDisposalNodes.html new file mode 100644 index 0000000..f20c4e1 --- /dev/null +++ b/src/app/ui/collection-tools-read/uploadDisposalNodes.html @@ -0,0 +1,14 @@ +
+
+ + +
+ +
+ +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/ui/collection-tools-read/uploadQuestions.html b/src/app/ui/collection-tools-read/uploadQuestions.html new file mode 100644 index 0000000..366e670 --- /dev/null +++ b/src/app/ui/collection-tools-read/uploadQuestions.html @@ -0,0 +1,32 @@ +
+
提交
+
考核消防设施:
+ +
+ + + + +
+ +
+ + +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/ui/ui.module.ts b/src/app/ui/ui.module.ts index bada7e3..6a528c3 100644 --- a/src/app/ui/ui.module.ts +++ b/src/app/ui/ui.module.ts @@ -65,8 +65,10 @@ import {TeacherManagementComponent,editTeacher,seeTeacher} from './teacherManage 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'; +import { CollectionToolsReadComponent } from './collection-tools-read/collection-tools.component'; +import { examinationQuestionsRead, uploadDisposalNodesRead, uploadQuestionsRead } from './collection-tools-read/examinationQuestions'; @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,CollectionToolsExamineeComponent,examinationQuestionsExaminee,uploadQuestionsExaminee,uploadDisposalNodesExaminee,saveOneDialogExaminee,saveTwoDialogExaminee], + 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,CollectionToolsReadComponent,examinationQuestionsRead,uploadQuestionsRead,uploadDisposalNodesRead], imports: [ NzDatePickerModule, CommonModule, diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 90f51ee..3a25511 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -571,6 +571,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * 创建节点图形 */ public createNodeShape(nodeData: any) { + console.log(789,nodeData) if (nodeData !== undefined && nodeData !== null) { Object.keys(nodeData).forEach((key) => { Object.keys(nodeData[key]).forEach((tempKey) => { diff --git a/src/styles.scss b/src/styles.scss index 5f379de..4815574 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -118,7 +118,7 @@ table td.mat-footer-cell:last-of-type{ } -#nodeTree,#basicinfodiv,#uploadfiretree{ +#nodeTree,#basicinfodiv,#uploadfiretree,#readbasictree{ .ant-tree .ant-tree-switcher { line-height: 22px; }