From 5fd87f5c1094b0b1e0f3edb724a80bc89b5b938c Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Sat, 27 Nov 2021 10:07:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=BA=94?= =?UTF-8?q?=E6=80=A5=E8=8A=82=E7=82=B9=E5=90=8D=E5=AD=97=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=9A=84=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/mode-manager.ts | 3 ++- src/app/babylon/tool/babylon-tool.ts | 3 --- src/app/babylon/view/building-window/building-window.ts | 2 +- src/app/babylon/view/mark-window/mark-window.ts | 2 +- src/app/service/objects.service.ts | 1 + tsconfig.json | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/babylon/controller/mode-manager.ts b/src/app/babylon/controller/mode-manager.ts index 5038bc5..49ab662 100644 --- a/src/app/babylon/controller/mode-manager.ts +++ b/src/app/babylon/controller/mode-manager.ts @@ -23,7 +23,7 @@ export class ModeManager { /** * 制作模式代表内部编辑人员,可新增单位、上传模型,查看模式代表交付的模式 */ - public static s_isMakeMode = false; + public static s_isMakeMode = true; /** * 调试模式 @@ -53,6 +53,7 @@ export class ModeManager { /** * 获取当前模式的类型(查看或编辑,用户权限有关) + * 编辑模式可放置毗邻、图片标注等, 以及所有输入文本类, 和应急处置的修改 */ static get currentMode(): ModeType { return ModeManager.s_currentMode; diff --git a/src/app/babylon/tool/babylon-tool.ts b/src/app/babylon/tool/babylon-tool.ts index 7ae6949..334fb1b 100644 --- a/src/app/babylon/tool/babylon-tool.ts +++ b/src/app/babylon/tool/babylon-tool.ts @@ -10,11 +10,9 @@ import { ISceneLoaderPluginAsync, ISceneLoaderProgressEvent, Mesh, - MeshBuilder, NodeMaterial, PBRMaterial, QuadraticEase, - Quaternion, Scene, SceneLoader, Skeleton, @@ -22,7 +20,6 @@ import { } from '@babylonjs/core'; import { - AdvancedDynamicTexture, Button, Container, Control, diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts index ffbb7c3..01a900e 100644 --- a/src/app/babylon/view/building-window/building-window.ts +++ b/src/app/babylon/view/building-window/building-window.ts @@ -1,5 +1,5 @@ -import { AbstractMesh, GizmoManager, Material, Mesh, PBRMaterial, Texture } from "@babylonjs/core"; +import { AbstractMesh, Material, Mesh, PBRMaterial, Texture } from "@babylonjs/core"; import { PlanComponent } from "src/app/pages/plan/plan.component"; import { ConfigManager } from "../../controller/config-manager"; import { DataManager } from "../../controller/data-manager"; diff --git a/src/app/babylon/view/mark-window/mark-window.ts b/src/app/babylon/view/mark-window/mark-window.ts index e7b6907..ac46cbe 100644 --- a/src/app/babylon/view/mark-window/mark-window.ts +++ b/src/app/babylon/view/mark-window/mark-window.ts @@ -248,7 +248,7 @@ export class MarkWindow extends UIBase { let copyNodeData = classToClass(this.currentMarkNodeDataCopy);//覆盖数据 copyNodeData.id = oldNodeData.id; copyNodeData.index = oldNodeData.index; - copyNodeData.name = oldNodeData.name; + // copyNodeData.name = oldNodeData.name; markPlaneData.setNodeData(nodeId, copyNodeData);//覆盖数据 this.saveAllMarkPlanData(); diff --git a/src/app/service/objects.service.ts b/src/app/service/objects.service.ts index c983d62..c1a2de2 100644 --- a/src/app/service/objects.service.ts +++ b/src/app/service/objects.service.ts @@ -68,6 +68,7 @@ export class ObjectsService { * 获取桶名 */ getBucketName() { + return this.obsRootByEnv.get(ObjectsService.currentEnvironmentType); } diff --git a/tsconfig.json b/tsconfig.json index b5f130c..e5e0592 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -33,6 +33,7 @@ }, "include": [ "src/**/*.d.ts", + "src/**/*.ts", "typings.d.ts" ] }