建筑楼层管理相关接口更改

src/components/old-adm/business_space/lib/uploadFiles.vue

@@ -154,14 +154,13 @@ export default {
                 /* method */
                 "POST",
                 /* target url */
-                "/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
+                window.__systemConf.baseServiceUrl + "/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
                 /*, async, default to true */
               );
               //xhr.overrideMimeType("application/octet-stream");
               xhr.send(reader.result);
               xhr.onreadystatechange = function () {
                 if (xhr.readyState == 4) {
-                  console.log(xhr)
                   if (xhr.status == 200) {
                     let fileObject = {
                       key: key.split("=")[1],

src/components/old-adm/business_space/lib/uploadImgs.vue

@@ -71,8 +71,8 @@ export default {
   data() {
     return {
       baseUrl: "",
-      imageGetUrl: "/image-service/common/image_get?systemId=dataPlatform",
-      imageUploadUrl: "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
+      imageGetUrl: window.__systemConf.baseServiceUrl + "/image-service/common/image_get?systemId=dataPlatform",
+      imageUploadUrl: window.__systemConf.baseServiceUrl + "/image-service/common/image_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true",
       imagesArr: []
     };
   },

src/components/old-adm/ready/components/addBuild.vue

@@ -205,7 +205,6 @@ export default {
       });
     },
     changeItem(val) {
-      console.log(val)
       let _key = Object.keys(val)[0] + '';
       this.form[_key] = val[_key];
 

src/components/old-adm/ready/components/formItems.vue

@@ -10,7 +10,7 @@
     >
       <div
         v-for="item in InforsList"
-        :key="item.infoPointCode"
+        :key="item.id"
         style="width: 50%; display: inline-block"
       >
         <el-form-item
@@ -111,8 +111,8 @@
             v-else-if="item.dataType == 'ENUM'"
           >
             <el-option
-              v-for="op in item.options"
-              :key="op.code"
+              v-for="(op, index) in item.options"
+              :key="index"
               :label="op.name"
               :value="op.code"
             ></el-option>
@@ -204,6 +204,7 @@ export default {
           }
         }).filter(_c=>{return !!_c;});
         this.InforsList = arr;
+        console.log('[ arr ] >', arr)
       });
     },
     submitForm(call) {

src/controller/old-adm/ScanController.ts

@@ -29,9 +29,12 @@ class ScanController {
     *@return {*}
   */
   static async BeatchQueryParam(params, fn) {
-    let data = params.data
-    const res = await ScanController.http.postRequest(`/rwd/iot/data/current?projectId=${params.projectId}&groupCode=${params.groupCode}&appId=${params.appId}`, data)
-    return fn ? fn(res) : res
+    let data = params.data;
+    const res = await ScanController.http.postRequest(
+      `/rwd/iot/data/current?projectId=${params.projectId}&groupCode=${params.groupCode}&appId=${params.appId}`,
+      data
+    );
+    return fn ? fn(res) : res;
   }
   /** 
 
@@ -42,7 +45,10 @@ class ScanController {
   *@return {*}
   */
   static async countPartsDie(params) {
-    const res = await ScanController.http.postRequest('/equip-component/equip-query/count', params)
+    const res = await ScanController.http.postRequest(
+      "/equip-component/equip-query/count",
+      params
+    );
   }
   /**
 
@@ -53,7 +59,10 @@ class ScanController {
   *@return {*}
   */
   static async createPropertys(params) {
-    return await ScanController.http.postRequest('/equip-component/equip-query/creat-propertys', params)
+    return await ScanController.http.postRequest(
+      "/equip-component/equip-query/creat-propertys",
+      params
+    );
   }
   /**
 
@@ -63,9 +72,12 @@ class ScanController {
 
   *@return {*}
   */
-    static async deleteProperty(params) {
-      return await ScanController.http.postRequest('/datacenter/object/property/delete', params)
-    }
+  static async deleteProperty(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/object/property/delete",
+      params
+    );
+  }
   /**
 
   *@description: 查询资产 同时关联设备信息
@@ -74,41 +86,56 @@ class ScanController {
 
   *@return {*}
   */
-    static async propertyLinkEq(params) {
-      return await ScanController.http.postRequest('/equip-component/property/property-query', params)
-    }
+  static async propertyLinkEq(params) {
+    return await ScanController.http.postRequest(
+      "/equip-component/property/property-query",
+      params
+    );
+  }
   /** 
   @description: 修改资产的附件功能
   @param {*}
   @return {*}
   */
-    static async propertyUpdate(params) {
-      return await ScanController.http.postRequest('/equip-component/property/update', params)
-    }
+  static async propertyUpdate(params) {
+    return await ScanController.http.postRequest(
+      "/equip-component/property/update",
+      params
+    );
+  }
   /**
-  *@description: 查询资产
-  *@param {*}
-  *@return {*}
-  */
-    static async queryProperty(params) {
-      return await ScanController.http.postRequest('/datacenter/object/property/query', params)
-    }
+   *@description: 查询资产
+   *@param {*}
+   *@return {*}
+   */
+  static async queryProperty(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/object/property/query",
+      params
+    );
+  }
   /**
-  *@description: 更新资产信息
-  *@param {*}
-  *@return {*}
-  */
-    static async updateProperty(params) {
-      return await ScanController.http.postRequest('/datacenter/object/property/update', params)
-    }
+   *@description: 更新资产信息
+   *@param {*}
+   *@return {*}
+   */
+  static async updateProperty(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/object/property/update",
+      params
+    );
+  }
   /**
-    *@description: 删除系统信息
-    *@param {*}
-    *@return {*}
-  */
-    static async deleteGeneralSys(params) {
-      return await ScanController.http.postRequest('/datacenter/object/general-system/delete', params)
-    }
+   *@description: 删除系统信息
+   *@param {*}
+   *@return {*}
+   */
+  static async deleteGeneralSys(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/object/general-system/delete",
+      params
+    );
+  }
   /**
 
   *@description: 更新系统信息
@@ -116,7 +143,10 @@ class ScanController {
   *@return {*}
   */
   static async updateGeneralSys(params) {
-    return await ScanController.http.postRequest('/datacenter/object/general-system/update', params)
+    return await ScanController.http.postRequest(
+      "/datacenter/object/general-system/update",
+      params
+    );
   }
   /**
   @description: 创建资产所需(Family族id3位编码)-根据设备类型(4位编码)或部件类型(6位编码)查询,!!设备与设备族的关系
@@ -124,7 +154,10 @@ class ScanController {
   @return {*}
   */
   static async getEquipBelongs(params) {
-    return await ScanController.http.postRequest('/datacenter/dict/family/query', params)
+    return await ScanController.http.postRequest(
+      "/datacenter/dict/family/query",
+      params
+    );
   }
 
   /**
@@ -132,56 +165,74 @@ class ScanController {
   @param {*}
   @return {*}
   */
-    static async buildingQuery(params) {
-      return await ScanController.http.postRequest('/datacenter/object/building/query', params)
-    }
-    /**
+  static async buildingQuery(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/object/building/query",
+      params
+    );
+  }
+  /**
   @description: 关系-竖井所在建筑
   @param {*}
   @return {*}
   */
-    static async shaftLinkBuild(params) {
-      return await ScanController.http.postRequest('/datacenter/rel/sh-in-bd/link-bd', params)
-    }
-    /** 
-  *@description: 查询系统信息 - 建筑楼层 - 系统一对多
-  *@param {*} params
-  *@return {*}
-  */
+  static async shaftLinkBuild(params) {
+    return await ScanController.http.postRequest(
+      "/datacenter/rel/sh-in-bd/link-bd",
+      params
+    );
+  }
+  /**
+   *@description: 查询系统信息 - 建筑楼层 - 系统一对多
+   *@param {*} params
+   *@return {*}
+   */
   static async querySysLinkBuild(params, fn) {
-    let url = '/datacenter/object/general-system/query-new';
+    let url = "/datacenter/object/general-system/query-new";
     if (params.buildingId) {
-      url += `?buildingId=${params.buildingId}`
+      url += `?buildingId=${params.buildingId}`;
     }
     if (params.floorId) {
-      url += `&floorId=${params.floorId}`
+      url += `&floorId=${params.floorId}`;
     }
     const res = await ScanController.http.postRequest(url, params);
-    return fn ? fn(res) : res
+    return fn ? fn(res) : res;
   }
   static async countGeneralSys(params: any, fn: any) {
-    const res = await ScanController.http.postRequest('/datacenter/object/general-system/count', params)
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      "/datacenter/object/general-system/count",
+      params
+    );
+    return fn ? fn(res) : res;
   }
   /**
-  *@description: 获取楼层信息
-  *@param {*}
-  *@return {*}
-  */
+   *@description: 获取楼层信息
+   *@param {*}
+   *@return {*}
+   */
   static async getFloorMsgByFloorID(params?: any) {
-    return await ScanController.http.postRequest('/datacenter/object/floor/query', params)
+    return await ScanController.http.postRequest(
+      "/datacenter/object/floor/query",
+      params
+    );
   }
   /**
-    *@description: //设备清单 - 查询系统关联专业 - 查询系统信息 - 查询系统所属专业类型
-    *@param {*}
-    *@return {*}
-  */ 
+   *@description: //设备清单 - 查询系统关联专业 - 查询系统信息 - 查询系统所属专业类型
+   *@param {*}
+   *@return {*}
+   */
   static async queryLinkSys(params) {
-    return await ScanController.http.postRequest('/datacenter/object/general-system/query', params)
+    return await ScanController.http.postRequest(
+      "/datacenter/object/general-system/query",
+      params
+    );
   }
   static async getAllProject(params, fn) {
-    const res = await ScanController.http.postRequest('/datacenter/object/project/query/obj', params)
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      "/datacenter/object/project/query/obj",
+      params
+    );
+    return fn ? fn(res) : res;
   }
 
   /**
@@ -189,28 +240,40 @@ class ScanController {
    * @param {*} params
    * @param {*} fn
    * @return {*}
-   */  
+   */
   static async sysRelateBuild(params, fn) {
-    const res = await ScanController.http.postRequest('/datacenter/rel/sy-in-bd/link-bd', params);
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      "/datacenter/rel/sy-in-bd/link-bd",
+      params
+    );
+    return fn ? fn(res) : res;
   }
   /**
    * @description: 创建系统所在建筑关系,系统一对多,覆盖
    * @param {*} params
    * @param {*} fn
    * @return {*}
-   */  
+   */
   static async sysRelateFloor(params, fn) {
-    const res = await ScanController.http.postRequest('/datacenter/rel/sy-in-fl/link-fl', params);
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      "/datacenter/rel/sy-in-fl/link-fl",
+      params
+    );
+    return fn ? fn(res) : res;
   }
   static async getEquipInSys(params, fn) {
-    const res = await ScanController.http.postRequest(`/equip-component/equip-query/sys-equip`, params)
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      `/equip-component/equip-query/sys-equip`,
+      params
+    );
+    return fn ? fn(res) : res;
   }
   static async sysLinkEquip(params, fn) {
-    const res = await ScanController.http.postRequest(`/datacenter/rel/sy-in-eq/link-sy-eq`, params)
-    return fn ? fn(res) : res
+    const res = await ScanController.http.postRequest(
+      `/datacenter/rel/sy-in-eq/link-sy-eq`,
+      params
+    );
+    return fn ? fn(res) : res;
   }
   /**
    * 设备清单 - 更新设备
@@ -228,7 +291,7 @@ class ScanController {
       datacenter_pre + "/sy-in-eq/unlinks-sy-eq",
       params
     );
-    return fn ? fn(res) : res
+    return fn ? fn(res) : res;
   }
   static async zoneQuery() {}
   static async TypePartsDie() {}
@@ -296,7 +359,7 @@ class ScanController {
    */
   static async deleteBuildInfo(params) {
     return await this.http.postRequest(
-      floor_pre + "/building/single/delete",
+      object_pre + "/building/single/delete",
       params
     );
   }
@@ -327,7 +390,24 @@ class ScanController {
       params
     );
   }
+  /**
+   * 建筑楼层管理-修改楼层
+   */
+  static async manageUpdateFloor(params) {
+    return await this.http.postRequest(floor_pre + "/update", params);
+  }
+  /**
+   * 楼层接口-----更新楼层轮廓
+   */
+  static async floorUpdateOutline(params) {
+    return await this.http.postRequest(floor_pre + "/update-outline", params);
+  }
+  /**
+   * 楼层接口-----查询楼层轮廓
+   */
+  static async floorQueryOutline(params) {
+    return await this.http.postRequest(floor_pre + "/query-outline", params);
+  }
 }
 
-
-export default ScanController;
+export default ScanController;

src/controller/old-adm/dicController.ts

@@ -1,4 +1,5 @@
 import { baseHttpUtils } from "@/utils/http/baseHttpUtils";
+import { dict_pre } from "./preTypes";
 class Dic {
   static http = new baseHttpUtils();
 
@@ -6,32 +7,44 @@ class Dic {
    * @description: all - 查询数据字典 --列表表头 api/dict
    * @param {*} params
    * @return {*}
-   */  
+   */
   static async getDataDictionary(params, fn) {
     const res = await Dic.http.postRequest(`/datacenter/dict/query`, params);
-    return fn ? fn(res) : res
+    return fn ? fn(res) : res;
   }
 
   /**
    * @description: 统计-根据条件统计返回信息点
    * @param {*} params
    * @return {*}
-   */  
+   */
   static async deliveredInfos(params, fn) {
-    const res = await Dic.http.postRequest('/equip-component/dict/delivered/infos', params)
-    return fn ? fn(res) : res
+    const res = await Dic.http.postRequest(
+      "/equip-component/dict/delivered/infos",
+      params
+    );
+    return fn ? fn(res) : res;
   }
-  static async getEquipLkSys() {}
-  
   /**
-  *  @description: 头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
-  *  @param {*}
-  *  @return {*}
-  */
+   * 字典-项目下已有的设备类型带系统
+   * @param params
+   * @returns
+   */
+  static async getEquipLkSys(params) {
+    return await Dic.http.postRequest(
+      dict_pre + "/system/equip/category",
+      params
+    );
+  }
+
+  /**
+   *  @description: 头部信息查询(查询所有设备类型-所有部件类型-所有系统类型-所有专业类型)
+   *  @param {*}
+   *  @return {*}
+   */
   static async queryPhysicsAllType(params) {
-    return await Dic.http.postRequest('/datacenter/dict/category', params)
+    return await Dic.http.postRequest("/datacenter/dict/category", params);
   }
-  
 }
 
 export default Dic;

src/controller/old-adm/preTypes.ts

@@ -10,3 +10,5 @@ export const equipcomponentdic_pre = `${equipcomponent_pre}/dict`;
 export const graphhic_pre = `${datacenter_pre}/graphic`;
 
 export const floor_pre = `${object_pre}/floor`;
+
+export const model_pre = "/revit-algorithm";

src/router/system.js

@@ -12,6 +12,8 @@ import facilityLedger from "@/components/old-adm/ledger/facility/index";
 import systemLedger from '@/components/old-adm/ledger/system/index';
 import batchPointAssets from '@/components/old-adm/ledger/facility/batchPoint' //批量维护设备位置
 import buildFloor from '@/components/old-adm/ready/buildfloor/index'
+import repetitionGraphy from '@/components/old-adm/ready/buildfloor/repetitionGraphy'
+
 
 export default [
   {
@@ -40,6 +42,12 @@ export default [
         meta: {keepAlive: false, breadcrumbs: [{label: '建筑楼层管理'}]}
       },
       {
+        path: 'repetitionGraphy',
+        name: 'repetitionGraphy',
+        component: repetitionGraphy,
+        meta: {keepAlive: false, breadcrumbs: [{label: '建筑楼层管理', path: '/ready/buildfloor'}, {label: '平面图维护'}]}
+      },
+      {
         path: "/ledger/facility",
         name: "facilityLedger",
         component: facilityLedger,