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 e34a82a..516a831 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.scss @@ -20,7 +20,7 @@ } .detailsbox{ width: 100%; - height:500px; + flex: 1; position: relative; .tabsbox{ width: 100%; diff --git a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts index 756937d..f118381 100644 --- a/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts +++ b/src/app/plan-audit/fireforce-audit/fireforce-audit.component.ts @@ -1,7 +1,9 @@ import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; import { MatSnackBar } from '@angular/material/snack-bar'; import Viewer from 'viewerjs' +import { ViewDetailsComponent } from '../view-details/view-details.component'; declare var CryptoJS declare var AMap: any; @Component({ @@ -11,7 +13,7 @@ declare var AMap: any; }) export class FireforceAuditComponent implements OnInit { - constructor(public snackBar: MatSnackBar,private http:HttpClient) { } + constructor(public snackBar: MatSnackBar,private http:HttpClient,public dialog: MatDialog) { } selectedFireForceLevel:any = 0 FireForceDetailInfo:any = { @@ -183,15 +185,22 @@ export class FireforceAuditComponent implements OnInit { } if(suffix == 'docx' || suffix == 'doc' || suffix == 'pdf'){ let fetchUrl = item.objectName + let docIdWordArray = CryptoJS.enc.Utf8.parse(`PlanPlatform/` + fetchUrl); + let docId = CryptoJS.enc.Base64.stringify(docIdWordArray); + + let jwt = sessionStorage.getItem("token"); + let rawJwt = CryptoJS.enc.Base64.parse(jwt.split('.')[1]); + let identityJson = CryptoJS.enc.Utf8.stringify(rawJwt); + let identityJsonparse=JSON.parse(identityJson) let json={ doc: { - docId: new Date(), + docId: docId, title: item.fileName, fetchUrl: `http://${location.host}/api/Objects/PlanPlatform/`+fetchUrl }, user: { - uid: "test", - nickName: "test", + uid: identityJsonparse.sub, + nickName: identityJsonparse.name, avatar: "", privilege: [ 'FILE_READ','FILE_DOWNLOAD', 'FILE_PRINT' @@ -204,11 +213,11 @@ export class FireforceAuditComponent implements OnInit { window.open(`http://121.5.10.84/apps/editor/openPreview?data=${base64}`) } if(suffix == 'mp4'){ - // const dialogRef = this.dialog.open(ViewDetails, {//调用open方法打开对话框并且携带参数过去 - // data: {item:item,type:"video"}, - // id:'videodialog' - // }); - // dialogRef.afterClosed().subscribe(); + const dialogRef = this.dialog.open(ViewDetailsComponent, {//调用open方法打开对话框并且携带参数过去 + data: {item:item,type:"video"}, + id:'videodialog' + }); + dialogRef.afterClosed().subscribe(); } } @@ -230,3 +239,6 @@ export class FireforceAuditComponent implements OnInit { } } } + + + diff --git a/src/app/plan-audit/plan-audit.module.ts b/src/app/plan-audit/plan-audit.module.ts index a3180dc..3407d59 100644 --- a/src/app/plan-audit/plan-audit.module.ts +++ b/src/app/plan-audit/plan-audit.module.ts @@ -69,10 +69,11 @@ import { FunctionPartitionComponent } from './function-partition/function-partit 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 { show3D } from './wait-examineer/wait-examineer.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], + WaitExamineerComponent,AllaroundComponent,ImgDetails,FireFacilitiesComponent,ImagesData2,previewBigImg2,PlanListComponent,OpenPlanToolDialog,KeySiteLookComponent,KeySiteImgs2,FunctionPartitionComponent,CadDrawComponent,RealisticPictureLookComponent,previewImg3,show3D, WaterAuditComponent, FireforceAuditComponent, LinkageforcesAuditComponent, ViewDetailsComponent], imports: [ CommonModule, PlanAuditRoutingModule, diff --git a/src/app/plan-audit/view-details/view-details.component.html b/src/app/plan-audit/view-details/view-details.component.html new file mode 100644 index 0000000..7f1b9b4 --- /dev/null +++ b/src/app/plan-audit/view-details/view-details.component.html @@ -0,0 +1 @@ + diff --git a/src/app/plan-audit/view-details/view-details.component.scss b/src/app/plan-audit/view-details/view-details.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/plan-audit/view-details/view-details.component.spec.ts b/src/app/plan-audit/view-details/view-details.component.spec.ts new file mode 100644 index 0000000..e847990 --- /dev/null +++ b/src/app/plan-audit/view-details/view-details.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ViewDetailsComponent } from './view-details.component'; + +describe('ViewDetailsComponent', () => { + let component: ViewDetailsComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ViewDetailsComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ViewDetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/plan-audit/view-details/view-details.component.ts b/src/app/plan-audit/view-details/view-details.component.ts new file mode 100644 index 0000000..d80d5be --- /dev/null +++ b/src/app/plan-audit/view-details/view-details.component.ts @@ -0,0 +1,24 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, Inject, OnInit } from '@angular/core'; +import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; + +@Component({ + selector: 'app-view-details', + templateUrl: './view-details.component.html', + styleUrls: ['./view-details.component.scss'] +}) +export class ViewDetailsComponent implements OnInit { + + constructor(private http: HttpClient,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data) {} + Url:string + onNoClick(): void { + this.dialogRef.close(); + } + ngOnInit(): void { + this.Url = '/api/Objects/PlanPlatform/' + this.data.item.objectName + } + closeDialog(){ + this.dialogRef.close(); + } + +} 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 524a57a..f80bba2 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -280,9 +280,9 @@ --> - +