diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts index 4602630..c83168a 100644 --- a/src/app/babylon/controller/data-manager.ts +++ b/src/app/babylon/controller/data-manager.ts @@ -305,6 +305,25 @@ export class DataManager { return result; } + /** + * 获取 上传标绘物所需文件时,保存的路径 (无法区分节点) + * @param institutionKey 单位id + * @param resType 资源类型 + * @param key 唯一key + */ + static getResPath_mark(institutionKey: string, resType: ResType, key: string) { + let result = + institutionKey.toLocaleLowerCase() + + '/' + + ServeManager.ngAssetsPath + + "mark/" + //表示是应急标绘下的 + resType + + '/' + + key + + '/'; + return result; + } + // //获取设备资源完整路径 // static getResPath_facility(facilityPosType: FacilityPosType, type: FacilityType): string { // let result = "mesh/facilities/"; @@ -587,5 +606,12 @@ export enum ModelChangeType { Update, } +/** + * 资源类型 + */ +export enum ResType { + Texture = "texture", + Video = "video", +} diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 5e8c3f0..87a3a9e 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -158,7 +158,14 @@ export class ServeManager { //#region 文件上传 - //队列性,批量上传 + /** + * 队列性,批量上传 + * @param index + * @param files + * @param resPath_out + * @param onOneSuccess + * @param onEnd + */ 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); diff --git a/src/app/babylon/tool/speaking-tool.ts b/src/app/babylon/tool/speaking-tool.ts index eb33fd5..2516888 100644 --- a/src/app/babylon/tool/speaking-tool.ts +++ b/src/app/babylon/tool/speaking-tool.ts @@ -20,6 +20,7 @@ export class SpeakingTool { * @param msg */ speak(msg: string) { + console.log("阅读" + msg); if (this.isIE()) { }