From bc75ce799387bde5e90b44c1dbcb5a4e7654eaa7 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 9 May 2022 11:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 2 +- .../gis-labeling/gis-labeling.component.ts | 8 +++----- .../plan-record/plan-record.component.html | 4 ++-- .../wait-examineer.component.html | 4 ++-- .../entry-plan-look.component.ts | 17 +++++++++++++++++ .../plan-management/plan-management.module.ts | 5 +++-- .../see-video/see-video.component.html | 5 +++++ .../see-video/see-video.component.scss | 0 .../see-video/see-video.component.ts | 19 +++++++++++++++++++ .../real-monitoring.component.ts | 3 ++- 10 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 src/app/plan-management/see-video/see-video.component.html create mode 100644 src/app/plan-management/see-video/see-video.component.scss create mode 100644 src/app/plan-management/see-video/see-video.component.ts diff --git a/proxy.config.json b/proxy.config.json index 56dbf3c..f10c8f1 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,6 +1,6 @@ { "/api": { - "target": "http://218.75.214.31:28085", + "target": "http://39.106.78.171:8890/", "secure": false, "changeOrigin": true } diff --git a/src/app/gis-management/gis-labeling/gis-labeling.component.ts b/src/app/gis-management/gis-labeling/gis-labeling.component.ts index 334d5b4..8ccd6ed 100644 --- a/src/app/gis-management/gis-labeling/gis-labeling.component.ts +++ b/src/app/gis-management/gis-labeling/gis-labeling.component.ts @@ -429,7 +429,6 @@ export class GisLabelingComponent implements OnInit {
基本信息
导航
-
全景漫游
三维场景
查看预案
分享
@@ -444,7 +443,7 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(item) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(item) })//导航点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(item) })//全景漫游点击事件 + //this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(item) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(item) })//三维场景点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(item) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(item) })//分享点击事件 @@ -1169,7 +1168,6 @@ export class GisLabelingComponent implements OnInit {
基本信息
导航
-
全景漫游
三维场景
查看预案
分享
@@ -1184,7 +1182,7 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 + //this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(e) })//分享点击事件 @@ -1197,7 +1195,7 @@ export class GisLabelingComponent implements OnInit { this.infoWindow.open(this.map); this.renderer2.listen(this.elementRef.nativeElement.querySelector('#baseInformation'),'click',(event)=>{ this.baseInformation(e) })//基本信息点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#route'),'click',(event)=>{ this.route(e) })//导航点击事件 - this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 + //this.renderer2.listen(this.elementRef.nativeElement.querySelector('#fullViewNavigation'),'click',(event)=>{ this.fullViewNavigation(e) })//全景漫游点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#threeeScene'),'click',(event)=>{ this.threeeScene(e) })//三维场景点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#seePlan'),'click',(event)=>{ this.seePlan(e) })//查看预案点击事件 this.renderer2.listen(this.elementRef.nativeElement.querySelector('#share'),'click',(event)=>{ this.share(e) })//分享点击事件 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 4e52bcf..76be3aa 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -177,8 +177,8 @@
-
- +
+
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 4a84f6c..c94363c 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -283,8 +283,8 @@
-
- +
+
diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 35d370b..d056900 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -15,6 +15,7 @@ import { Viewer } from 'photo-sphere-viewer'; import { STEPPER_GLOBAL_OPTIONS } from '@angular/cdk/stepper'; import Swiper from 'swiper'; import { MaskLayerService } from 'src/app/mask-layer.service'; +import { SeeVideoComponent } from '../see-video/see-video.component'; declare var CryptoJS @Component({ selector: 'app-entry-plan-look', @@ -122,6 +123,13 @@ export class EntryPlanLookComponent implements OnInit { data: data.attachmentUrls, }); dialogRef.afterClosed().subscribe(); + } else if (e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'mp4' || e.attachmentUrls[0].substr(e.attachmentUrls[0].length - 3, e.attachmentUrls[0].length) == 'MP4') { + let fetchUrl = e.attachmentUrls[0] + let data = `/api/Objects/PlanPlatform/` + fetchUrl + const dialogRef = this.dialog.open(SeeVideoComponent, {//调用open方法打开对话框并且携带参数过去 + data: data, + }); + dialogRef.afterClosed().subscribe(); } else { let fetchUrl = e.attachmentUrls[0] if (fetchUrl) { @@ -299,6 +307,9 @@ export class EntryPlanLookComponent implements OnInit { this.http.put(`/api/PlanComponents2D/${element.id}/Commit`, "").subscribe(data => { this.getAllPlanComponents() }, err => { + if (!err) { + err = "提交审核失败!" + } this.snackBar.open(err, '确定', config); }) } @@ -309,6 +320,9 @@ export class EntryPlanLookComponent implements OnInit { this.http.put(`/api/PlanComponents/${element.id}/Commit`, "").subscribe(data => { this.getAllPlanComponents() }, err => { + if (!err) { + err = "提交审核失败!" + } this.snackBar.open(err, '确定', config); }) } @@ -325,6 +339,9 @@ export class EntryPlanLookComponent implements OnInit { this.http.put(`/api/PlanComponents/${element.id}/Cancel`, "").subscribe(data => { this.getAllPlanComponents() }, err => { + if (!err) { + err = "撤销审核失败!" + } const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 99ba19b..32eb02a 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -63,14 +63,15 @@ import { typeAuditResult } from './type-plan/type-plan.component'; import { MaintainUpComponent } from './maintain-up/maintain-up.component' import { GkPsViewer } from './pass-plan/pass-plan.component' import { GkhtmlPsViewer } from './open-plan/open-plan.component'; -import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.component' +import { ReinforcePlanComponent } from './reinforce-plan/reinforce-plan.component'; +import { SeeVideoComponent } from './see-video/see-video.component' @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, - typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails,PassImgDetails,OpenImgDetails], + typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails,PassImgDetails,OpenImgDetails, SeeVideoComponent], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/plan-management/see-video/see-video.component.html b/src/app/plan-management/see-video/see-video.component.html new file mode 100644 index 0000000..bc3fa2f --- /dev/null +++ b/src/app/plan-management/see-video/see-video.component.html @@ -0,0 +1,5 @@ + +
+ +
+ \ No newline at end of file diff --git a/src/app/plan-management/see-video/see-video.component.scss b/src/app/plan-management/see-video/see-video.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/plan-management/see-video/see-video.component.ts b/src/app/plan-management/see-video/see-video.component.ts new file mode 100644 index 0000000..b3f0457 --- /dev/null +++ b/src/app/plan-management/see-video/see-video.component.ts @@ -0,0 +1,19 @@ +import { Component, Inject, OnInit } from '@angular/core'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { ImgDetails } from '../entry-plan-look/entry-plan-look.component'; + +@Component({ + selector: 'app-see-video', + templateUrl: './see-video.component.html', + styleUrls: ['./see-video.component.scss'] +}) +export class SeeVideoComponent implements OnInit { + + constructor(public dialog: MatDialog, public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data) { } + + ngOnInit(): void { + + } + +} diff --git a/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts b/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts index 900b9af..7fc4a3a 100644 --- a/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts +++ b/src/app/statistic-analysis/real-monitoring/real-monitoring.component.ts @@ -95,10 +95,11 @@ export class RealMonitoringComponent implements OnInit { await this.EchartsData.getData(paramBottom, '/api/StatisticsAnalysis/Plans/AuditApproved/Organizations') this.bottomTable = JSON.parse(JSON.stringify(this.EchartsData.allDate)) this.addNum = this.bottomTable[0].totalCount + this.addyuan = [] this.bottomTable[0].organizations.forEach((value, index, array) => { this.zhiNameData.push(array[index].organizationName) this.zhiNumData.push(array[index].count) - if (index > 0 && index < 4) { + if (index >= 0 && index < 3) { this.addyuan.push(array[index].organizationName) }