From 4badb63198ca36bde020be59f83c42627feb8b27 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Mon, 1 Nov 2021 14:42:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/babylon/controller/data-manager.ts              | 6 ++----
 src/app/babylon/controller/serve-manager.ts             | 3 +++
 src/app/babylon/view/building-window/building-window.ts | 4 ++--
 src/app/service/objects.service.ts                      | 7 +++++++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/babylon/controller/data-manager.ts b/src/app/babylon/controller/data-manager.ts
index 1d3b41f..be125dc 100644
--- a/src/app/babylon/controller/data-manager.ts
+++ b/src/app/babylon/controller/data-manager.ts
@@ -283,10 +283,9 @@ export class DataManager {
     key: string
   ): string {
     let result =
-      institutionKey.toLocaleLowerCase()
-    '/' +
-      ServeManager.ngAssetsPath +
+      institutionKey.toLocaleLowerCase() +
       '/' +
+      ServeManager.ngAssetsPath +
       buildingKey.toLocaleLowerCase() +
       '/' +
       key +
@@ -302,7 +301,6 @@ export class DataManager {
       institutionKey.toLocaleLowerCase() +
       '/' +
       ServeManager.ngAssetsPath +
-      '/' +
       buildingKey.toLocaleLowerCase() +
       '/' +
       ConfigManager.c_reaPath_facilityProperty +
diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts
index e86c6a5..eaf15e5 100644
--- a/src/app/babylon/controller/serve-manager.ts
+++ b/src/app/babylon/controller/serve-manager.ts
@@ -152,6 +152,8 @@ export class ServeManager {
     //#region 文件上传
     //队列性，批量上传
     uploadFile(index: number, files: File[], resPath_out, onOneSuccess: (name: string, path: string, file: File) => void, onEnd: () => void) {
+
+        console.log("上传路径", resPath_out);
         if (index < files.length) {
             ServeManager.instance.openFileSelect(files[index], resPath_out, (name: string, path: string, file: File) => {
                 onOneSuccess(name, path, file);
@@ -197,6 +199,7 @@ export class ServeManager {
                 let fileName = dataObj.fileName;
                 let filePath: string = dataObj.objectName;//此路径不全，前面缺少ObjectsService.baseUrl，这部分不可序列化，要在运行时拼接
                 filePath = filePath.replace(fileName, "");//去掉结尾的文件名
+                console.log("上传完成，地址为", filePath);
                 //filePath = ObjectsService.baseUrl + filePath;
                 ServeManager.instance.onGetPostFileResult(fileName, filePath, file);
                 resolve('success')
diff --git a/src/app/babylon/view/building-window/building-window.ts b/src/app/babylon/view/building-window/building-window.ts
index de90e15..e747aec 100644
--- a/src/app/babylon/view/building-window/building-window.ts
+++ b/src/app/babylon/view/building-window/building-window.ts
@@ -97,9 +97,9 @@ export class BuildingWindow extends UIBase {
         let resPath_out = DataManager.getResPath_building(
             DataManager.institutionData.normalData.key.toLowerCase(),
             normalData.key.toLocaleLowerCase(),
-            buildingData.normalData.key
+            "outDoor"
         );
-        // console.log("新资源路径" + resPath_out);
+        console.log("新资源路径" + resPath_out);
         let buildingWindow = this;
 
         let manifestFile: File = null;
diff --git a/src/app/service/objects.service.ts b/src/app/service/objects.service.ts
index 3ef0e38..bc5ba11 100644
--- a/src/app/service/objects.service.ts
+++ b/src/app/service/objects.service.ts
@@ -55,6 +55,13 @@ export class ObjectsService {
     ObjectsService.baseUrl = ObjectsService.c_apiRoot + bucketName;
   }
 
+  /**
+   * 组装完整路径
+   */
+  static getFullPath() {
+
+  }
+
   /**
    * 获取桶名
    */