diff --git a/src/app/data-collection/fire-force/fire-force.component.scss b/src/app/data-collection/fire-force/fire-force.component.scss index f0a7e5d..7c301fa 100644 --- a/src/app/data-collection/fire-force/fire-force.component.scss +++ b/src/app/data-collection/fire-force/fire-force.component.scss @@ -6,7 +6,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/data-collection/linkage-forces/linkage-forces.component.scss b/src/app/data-collection/linkage-forces/linkage-forces.component.scss index e157894..4eb6f15 100644 --- a/src/app/data-collection/linkage-forces/linkage-forces.component.scss +++ b/src/app/data-collection/linkage-forces/linkage-forces.component.scss @@ -6,7 +6,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/data-collection/water-collection/water-collection.component.scss b/src/app/data-collection/water-collection/water-collection.component.scss index 774617c..f0376c1 100644 --- a/src/app/data-collection/water-collection/water-collection.component.scss +++ b/src/app/data-collection/water-collection/water-collection.component.scss @@ -6,7 +6,6 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #000000; } diff --git a/src/app/gis-management/basic-info/basic-info.component.scss b/src/app/gis-management/basic-info/basic-info.component.scss index 7e2a4bc..282cfe8 100644 --- a/src/app/gis-management/basic-info/basic-info.component.scss +++ b/src/app/gis-management/basic-info/basic-info.component.scss @@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} width: 100%; height: 100%; overflow-y: auto; - // font-family: Source Han Sans CN; color: #333333; padding: 10px; box-sizing: border-box; @@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; @@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; diff --git a/src/app/gis-management/gis-labeling/shareUrl.scss b/src/app/gis-management/gis-labeling/shareUrl.scss index 1c21446..dab5edb 100644 --- a/src/app/gis-management/gis-labeling/shareUrl.scss +++ b/src/app/gis-management/gis-labeling/shareUrl.scss @@ -8,7 +8,6 @@ position: relative; .name{ font-size: 20px; - // font-family: Source Han Sans CN; font-weight: 400; color: #FFFFFF; } @@ -37,7 +36,6 @@ line-height: 36px; background: #EEF1F5; font-size: 16px; - // font-family: Source Han Sans CN; font-weight: 400; color: #333333; opacity: 0.4; diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 75909dc..660976b 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -568,7 +568,7 @@ export class KeyUnitManagementComponent implements OnInit { //跳转查看基本信息页面 unitdetails(element){ - console.log(element) + // console.log(element) sessionStorage.setItem("editable","0") sessionStorage.setItem("companyName",element.name) sessionStorage.setItem("companyId",element.id) diff --git a/src/app/pages/lockscreen/lockscreen.component.scss b/src/app/pages/lockscreen/lockscreen.component.scss index 041d3ab..932df87 100644 --- a/src/app/pages/lockscreen/lockscreen.component.scss +++ b/src/app/pages/lockscreen/lockscreen.component.scss @@ -22,7 +22,6 @@ width: 100%; height: 100%; color: #fff; - font-family: Roboto, sans-serif; background: url('../../../assets/images/background.jpg'); &::before { position: fixed; diff --git a/src/app/plan-audit/basic-info/basic-info.component.scss b/src/app/plan-audit/basic-info/basic-info.component.scss index c44b0de..abf4034 100644 --- a/src/app/plan-audit/basic-info/basic-info.component.scss +++ b/src/app/plan-audit/basic-info/basic-info.component.scss @@ -18,7 +18,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} width: 100%; height: 760px; overflow-y: auto; - // font-family: Source Han Sans CN; color: #333333; padding: 10px; box-sizing: border-box; @@ -31,7 +30,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; @@ -54,7 +52,6 @@ table { text-align: center; border-collapse: collapse; padding:2px;} p{ height: 14px; font-size: 14px; - // font-family: Source Han Sans CN; font-weight: 400; line-height: 14px; color: #333333; diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html index 070bd78..5744a5b 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.html @@ -36,25 +36,25 @@ * 队站名称: - + 联系电话: - + 传真: - + 辖区面积: - + @@ -69,17 +69,17 @@ 地址: - + 经度: - + 纬度: - + @@ -89,19 +89,19 @@ 现役官兵人数: - + 政府专职消防员数: - + 消防文员数: - +

联系方式

@@ -110,25 +110,25 @@ 总队长名称: - + 总队长联系方式: - + 总队政委姓名: - + 总队政委联系方式: - + @@ -136,25 +136,25 @@ 支队长姓名: - + 支队长联系方式: - + 支队政委姓名: - + 支队政委联系方式: - + @@ -167,19 +167,19 @@ * 队站名称: - + 值班电话: - + 辖区面积: - + @@ -194,17 +194,17 @@ 地址: - + 经度: - + 纬度: - + @@ -214,19 +214,19 @@ 现役人数: - + 政府专职消防员数: - + 每日执勤人数: - +

联系方式

@@ -235,73 +235,73 @@ 站长姓名: - + 站长联系方式: - + 指导员姓名: - + 指导员联系方式: - + 副指导员姓名: - + 副指导员联系方式: - + 副站长一姓名: - + 副站长一联系方式: - + 副站长二姓名: - + 副站长二联系方式: - + 副站长三姓名: - + 副站长三联系方式: - + @@ -326,33 +326,33 @@ * 队伍名称: - + 管辖单位: - + 队长: - - + + 值班电话: - + 传真: - + @@ -367,17 +367,17 @@ 地址: - + 经度: - + 纬度: - + @@ -388,20 +388,20 @@ 每日执勤人数: - + 消防队员总人数: - + 执勤车辆数:
- + 辆
@@ -410,7 +410,7 @@ 灭火剂总量:
- + 个
diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss index 516a831..6178b1b 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss @@ -132,6 +132,7 @@ margin-left: 5px; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } textarea{ width: 89%; diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html index 03f770c..8aa823a 100644 --- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html +++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.html @@ -43,25 +43,25 @@ * 名称: - + 单位联系电话: - + 单位传真: - + 备注: - +

位置信息

@@ -70,21 +70,21 @@ 行政区: - + 地址: - + 经度: - + 纬度: - + @@ -94,19 +94,19 @@ 联系人: - + 职务: - + 电话: - +

应急信息

@@ -115,13 +115,13 @@ 服务内容: - + 资源说明: - + diff --git a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss index ade0459..5af678b 100644 --- a/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss +++ b/src/app/plan-audit/linkageforces-audit/linkageforces-audit.component.scss @@ -6,7 +6,7 @@ box-sizing: border-box; padding: 10px; font-size: 16px; - // font-family: Source Han Sans CN; + font-family: Regular; font-weight: 400; color: #000000; } @@ -136,6 +136,7 @@ margin-left: 5px; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } textarea{ width: 89%; @@ -143,6 +144,7 @@ height: 85%; border: 1px solid #EBEBEB; border-radius: 5px; + font-family: Regular; } .longinput{ width: 74%; @@ -154,6 +156,7 @@ width: 100%; box-sizing: border-box; padding-right: 50px; + font-family: Regular; } .unit{ position: absolute; diff --git a/src/app/plan-audit/plan-audit.module.ts b/src/app/plan-audit/plan-audit.module.ts index 3407d59..ab63a2e 100644 --- a/src/app/plan-audit/plan-audit.module.ts +++ b/src/app/plan-audit/plan-audit.module.ts @@ -70,10 +70,13 @@ import { CadDrawComponent } from './cad-draw/cad-draw.component' import { RealisticPictureLookComponent }from './realistic-picture-look/realistic-picture.component' import { previewImg3 } from './realistic-picture-look/realistic-picture.component' import { show3D } from './wait-examineer/wait-examineer.component'; +import { recordshow3D } from './plan-record/plan-record.component' import { ViewDetailsComponent } from './view-details/view-details.component' @NgModule({ declarations: [DetachmentLevelComponent, PlanAuditComponent, PlanPassComponent,PlanOpen, PlanRecordComponent, BasicInfoComponent, - WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog,KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent, FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent], + WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog, + KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent, + FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent,recordshow3D], imports: [ CommonModule, PlanAuditRoutingModule, diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index 01c7c8f..70079c6 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-02-02 15:58:22 + * @LastEditTime: 2021-02-20 10:40:25 -->
@@ -172,9 +172,30 @@ --> -
+
-
-
+
+
+
+
+ 单位名称: + {{compantData.name?compantData.name : '暂无数据'}} +
+
+ 消防救援站: + {{organizationName}} +
+
+ 单位类型: + {{compantData.buildingTypes.length?compantData.buildingTypes[0].name : '暂无数据'}} +
+
+ 单位地址: + {{compantData.address?compantData.address : '暂无数据'}} +
+
+ 查看详情 +
+
diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 7762377..958df3b 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -92,6 +92,18 @@ th,td{ .green{color: #00C756;} .red{color: #FF4D4D;} .blue{color: #2196F3;} +.twoD { + width: 100%; + box-sizing: border-box; + display: flex; + flex-direction: column; + align-items: left; + .planBox { + margin: 30px 30px; + color: black; + :first-child {margin-right: 10px;} + } + } //滚动条样式 ::-webkit-scrollbar{ diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index ce41344..42013c4 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -4,11 +4,12 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-02-06 10:15:00 + * @LastEditTime: 2021-02-20 10:39:50 */ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit,Inject } from '@angular/core'; import { FormControl } from '@angular/forms'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; import { HttpClient } from '@angular/common/http' import { DomSanitizer } from '@angular/platform-browser'; import { Viewer } from 'photo-sphere-viewer'; @@ -21,7 +22,7 @@ declare var CryptoJS }) export class PlanRecordComponent implements OnInit { - constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer) { } + constructor(private http:HttpClient,public snackBar: MatSnackBar,private sanitizer: DomSanitizer,public dialog: MatDialog) { } ngOnInit(): void { let level = sessionStorage.getItem("level"); @@ -73,7 +74,17 @@ export class PlanRecordComponent implements OnInit { count//一共多少条 tableDate showPvt=false//全景图是否显示 + shenheTable=[]//选中要审核的对象 + chuorzhong//判断初审还是终审 + radioid//选中的id showtype=0//0:word,1:全景图，2:二维三维，3:重点单位 + compantData={name:'',buildingTypes:[],address:''} + organizationName + planData + id + companyId + fetchUrl + companyName //获取表格数据 getAlltabledate(){ @@ -120,34 +131,75 @@ export class PlanRecordComponent implements OnInit { this.getAlltabledate() } //表格点击事件 + viewer//全景图对象 tableClick(e,item){ //e.target.parentElement.bgColor='#2196F3' - let filename:string - let fetchUrl + console.log(e,item) + this.organizationName='' + this.id=item.id + this.fetchUrl='' + this.viewer={} this.http.get(`/api/PlanComponents/${item.itemId}`).subscribe((data:any)=>{ + console.log(data) + this.companyId=data.companyId + this.companyName=data.companyName if(data.planType!=2&&data.planType!=1){ - fetchUrl=data.attachmentUrls[0] - var index=fetchUrl.indexOf("\/") - if(fetchUrl.substr(0,index)=='psw'){ + this.fetchUrl=data.attachmentUrls[0] + var index=this.fetchUrl.indexOf("\/") + if(this.fetchUrl.substr(0,index)=='psw'){ this.showtype=1 window.setTimeout(()=>{ - const viewer = new Viewer({ + this.viewer = new Viewer({ container: document.querySelector('#viewer'), - panorama:'/api/Objects/PlanPlatform/'+ fetchUrl, + panorama:'/api/Objects/PlanPlatform/'+ this.fetchUrl, }); }) }else{ - this.showtype=0 - this.http.get(`/api/ObjectMetadata/PlanPlatform/${fetchUrl}`).subscribe((data:any)=>{ + this.lookWord() + } + }else{ + this.organizationName=item.organizationName + this.planData = data + this.handleData() + return + + //this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1` + //this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); + //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`) + } + + + }) + + if(e.checked){ + this.shenheTable.push(item) + } + else{ + for(var i=0;i{ filename=data.fileName let json={ doc: { - docId: item.id, + docId: this.id, title: filename, //title: filename, - fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl + fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+this.fetchUrl }, user: { uid: "test", @@ -165,15 +217,68 @@ export class PlanRecordComponent implements OnInit { this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); //window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`) }) - } - }else{ - this.showtype=2 - this.src=`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1` - this.iframeSrc=this.sanitizer.bypassSecurityTrustResourceUrl(this.src); - //window.open(`/planAudit/planpass?id=${data.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`) - } - - }) + } + + + //查看二维三维预案 + thirdPartyURL + planType + twoOrthree + handleData () { + this.compantData={name:'',buildingTypes:[],address:''} + this.planType = this.planData.planMode + let data = this.planData + console.log(data) + if(data.planType==1){ + this.twoOrthree=2 + }else if(data.planType==2){ + this.twoOrthree=3 + } + if (this.planData.planMode==0) { //预案planMode=0时, 查看word + //this.lookWord() + } else if (this.planData.planMode==1) { //预案planMode=1时, 解析文档 + + } else if (this.planData.planMode==2) { //预案planMode=2时, 跳查看页面组件 + this.showtype=2 + this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{ + data && data.company? this.compantData = data.company : null + }) + sessionStorage.setItem("buildingTypeId", this.compantData.buildingTypes.length? this.compantData.buildingTypes[0].id: undefined); + sessionStorage.setItem("companyId",this.companyId); + sessionStorage.setItem("planId",this.id); + sessionStorage.setItem("editable",'0'); + sessionStorage.setItem("planName",data.name) + let companyId = sessionStorage.getItem("companyId") + this.thirdPartyURL=this.sanitizer.bypassSecurityTrustResourceUrl(`/planAudit/planpass?id=${this.companyId}&companyName=${data.companyName}&auditPlanId=${data.id}&auditStatus=${data.auditStatus}&planType=1`); + //window.open(`/keyUnit/viewunitinfoplan?id=${companyId}`) + } else if (this.planData.planMode==3) { //预案planMode=3时, 第三方网址' + this.showtype=2 + this.http.get(`/api/Plans/${data.companyId}`).subscribe((data:any)=>{ + data && data.company? this.compantData = data.company : null + }) + //this.dialog.open(show3D,{width:'1350px',height:'700px',data:{url:data.url}}); //打开图片弹窗 + this.thirdPartyURL = this.sanitizer.bypassSecurityTrustResourceUrl(data.url) + } + } + //打开三维预案弹窗 + oopen3Dshow(){ + this.dialog.open(recordshow3D,{width:'1650px',height:'850px',data:{url:this.thirdPartyURL,twoOrthree:this.twoOrthree}}); + } + +} + +@Component({ + selector: 'app-wait-examineer-show3D', + templateUrl: './show3D.html', + styleUrls: ['./plan-record.component.scss'] +}) +export class recordshow3D{ + constructor(private sanitizer: DomSanitizer,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data,public dialog: MatDialog) {} + ngOnInit(): void { + console.log(this.data) + this.threedUrl=this.sanitizer.bypassSecurityTrustResourceUrl(this.data.url.changingThisBreaksApplicationSecurity) + } + threedUrl } diff --git a/src/app/plan-audit/plan-record/show3D.html b/src/app/plan-audit/plan-record/show3D.html new file mode 100644 index 0000000..df039d1 --- /dev/null +++ b/src/app/plan-audit/plan-record/show3D.html @@ -0,0 +1,11 @@ + +
+ +
\ No newline at end of file diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 9719e05..2c3a4ea 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -269,9 +269,9 @@ --> - +