From 2bd4b1457e146fb9a7b7c7a3f8b4d8a33d5a2953 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Wed, 3 Nov 2021 10:23:28 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=89=E4=B8=AD=E6=97=B6=E5=9B=BE=E6=A0=87?=
=?UTF-8?q?=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/babylon/controller/serve-manager.ts | 2 +-
.../facilityinfoinscene-window.ts | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts
index 7bb055c..12c7167 100644
--- a/src/app/babylon/controller/serve-manager.ts
+++ b/src/app/babylon/controller/serve-manager.ts
@@ -152,7 +152,7 @@ export class ServeManager {
//队列性，批量上传
uploadFile(index: number, files: File[], resPath_out, onOneSuccess: (name: string, path: string, file: File) => void, onEnd: () => void) {
if (index < files.length) {
- //console.log("上传文件", files[index].name);
+ console.log("上传文件", files[index].name);
ServeManager.instance.openFileSelect(files[index], resPath_out, (name: string, path: string, file: File) => {
onOneSuccess(name, path, file);
this.uploadFile(index + 1, files, resPath_out, onOneSuccess, onEnd);
diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
index 9949ae3..59a7fd6 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
@@ -1,6 +1,7 @@
import { EventManager } from "@angular/platform-browser";
import { AbstractMesh, Ray, RayHelper, Vector3 } from "@babylonjs/core";
import { classToClass } from "class-transformer";
+import { PlanComponent } from "src/app/pages/plan/plan.component";
import { ModelChangeType } from "../../controller/data-manager";
import { Event_KeyboardInput } from "../../controller/event-manager/events/event-keyboard-input";
import { Event_ModelInfoChange } from "../../controller/event-manager/events/event-modelinfo-change";
@@ -23,7 +24,7 @@ import { FacilityInfoUIItem } from "./facilityinfo-ui-item";
//所有放在场景中的设备 信息界面
export class FacilityInfoInSceneWindow extends UIBase {
static instance: FacilityInfoInSceneWindow;
- // three: ThreeDimensionalHomeComponent;//前端组件
+ three: PlanComponent;//前端组件
// scrollView: ScrollViewer;
// content: StackPanel;
@@ -211,7 +212,7 @@ export class FacilityInfoInSceneWindow extends UIBase {
}
/**
- * 根据类型获取数目
+ * 根据类型获取设备在UI中的显示状态
* @param facilityType
*/
getFacilityUIShowType(facilityType: FacilityType): boolean {
@@ -221,7 +222,7 @@ export class FacilityInfoInSceneWindow extends UIBase {
// return item.isShow;
// }
// }
- return false;
+ return true;
}
From da0ffcefae1905af53187e1273291910456109e0 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Wed, 3 Nov 2021 10:35:01 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=AE=BE=E5=A4=87?=
=?UTF-8?q?=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../facilityinfoinscene-window/facilityinfoinscene-window.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
index 59a7fd6..b7f7b00 100644
--- a/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
+++ b/src/app/babylon/view/facilityinfoinscene-window/facilityinfoinscene-window.ts
@@ -150,7 +150,7 @@ export class FacilityInfoInSceneWindow extends UIBase {
//选中，通知前端
selectFacilityItemToThree(facilityInfoUIItem: FacilityInfoUIItem[], isChecked?: boolean) {
- // this.three = ThreeDimensionalHomeComponent.instance;
+ this.three = PlanComponent.instance;
// if (this.isMultiselect) { // 多选
// if (isChecked) { //选中
// facilityInfoUIItem.forEach(element => {
From 92d7282cf216bad2f499cef77318da01366e0623 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 3 Nov 2021 11:01:34 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BF=AB=E6=8D=B7?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/plan/plan.component.html | 6 +++++-
src/app/pages/plan/plan.component.scss | 9 ++++++---
src/app/pages/plan/plan.component.ts | 10 ++++++++++
3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/app/pages/plan/plan.component.html b/src/app/pages/plan/plan.component.html
index f33d257..90b4ec4 100644
--- a/src/app/pages/plan/plan.component.html
+++ b/src/app/pages/plan/plan.component.html
@@ -37,6 +37,10 @@
+
+
+
+
@@ -44,7 +48,7 @@
-
+
diff --git a/src/app/pages/plan/plan.component.scss b/src/app/pages/plan/plan.component.scss
index 8d961d3..b3eca9e 100644
--- a/src/app/pages/plan/plan.component.scss
+++ b/src/app/pages/plan/plan.component.scss
@@ -5,6 +5,18 @@
position: relative;
canvas{ width: 100%; height: 100%; border: none; outline: none; }
}
+.loading{ //loading
+ position: fixed;
+ left: 0;
+ top: 0;
+ z-index: 99999;
+ width: 100%;
+ height: 100%;
+ background: rgba(0,0,0,0.5);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
.anticon{ font-size: 16px; cursor: pointer; } //字体图标
//文本溢出
.overflowText{
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 4d568a7..163312e 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -32,6 +32,7 @@ export class PlanComponent implements OnInit {
public game: Game = new Game();
public beforeOneSatus; //当前 satus
public canvas: HTMLCanvasElement; //canvas 实例
+ public isShowLoading: boolean = false; //显隐 loading加载条
ngOnInit(): void {
PlanComponent.instance = this;
From 6addcc862c2c8cef49c992018201db7608d6c1f6 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 3 Nov 2021 14:41:56 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B6=88=E6=81=AF?=
=?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/plan/plan.component.ts | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts
index 163312e..d84cc07 100644
--- a/src/app/pages/plan/plan.component.ts
+++ b/src/app/pages/plan/plan.component.ts
@@ -16,6 +16,7 @@ import { FacilityUIItem } from 'src/app/babylon/view/facility-window/facility-ui
import { FacilityWindow } from 'src/app/babylon/view/facility-window/facility-window';
import { FacilityInfoUIItem } from 'src/app/babylon/view/facilityinfoinscene-window/facilityinfo-ui-item';
import { EventManager } from '@angular/platform-browser';
+import { NzMessageService } from 'ng-zorro-antd/message';
@@ -26,7 +27,7 @@ import { EventManager } from '@angular/platform-browser';
})
export class PlanComponent implements OnInit {
- constructor(private element: ElementRef, private buildingBISrv: BuildingBasicInfosService, private objectsSrv: ObjectsService, private eventManager: EventManager) { }
+ constructor(private element: ElementRef, private buildingBISrv: BuildingBasicInfosService, private objectsSrv: ObjectsService, private eventManager: EventManager, private message: NzMessageService) { }
static instance: PlanComponent;
public game: Game = new Game();
@@ -256,6 +257,11 @@ export class PlanComponent implements OnInit {
ToolbarWindow.instance.onBtnSave();
}
+ //通用 消息通知栏
+ openSnackBar(title: string) {
+ this.message.info(title);
+ }
+
}