需要计算条件修改;查询楼层轮廓线,更新楼层轮廓线,查询业务空间轮廓线,更新业务空间轮廓线接口修改

package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.9",
-    "@saga-web/cad-engine": "2.0.560",
+    "@saga-web/cad-engine": "2.0.561",
     "@saga-web/draw": "2.1.75",
     "@saga-web/graphy": "2.1.47",
     "@saga-web/topology": "1.0.83",

src/api/scan/request.js

@@ -1670,6 +1670,16 @@ export function floorUpdate(param, success) {
   let url = `${baseUrl}/datacenter/floor/update`;
   http.postJson(url, param, success)
 }
+//楼层接口-----更新楼层轮廓
+export function floorUpdateOutline(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/update-outline`;
+  http.postJson(url, param, success)
+}
+//楼层接口-----查询楼层轮廓
+export function floorQueryOutline(param, success) {
+  let url = `${baseUrl}/datacenter/object/floor/query-outline`;
+  http.postJson(url, param, success)
+}
 
 /****关系-竖井****/
 //字典查询接口 竖井所有类型
@@ -1987,6 +1997,16 @@ export function zoneQuery(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/query`
   http.postJson(url,param,success)
 }
+//查询分区对象轮廓线
+export function zoneQueryOutline(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/query`
+  http.postJson(url,param,success)
+}
+//更新分区对象轮廓线
+export function zoneUpdateOutline(param,success) {
+  let url = `${baseUrl}/datacenter/object/zone/update-outline`
+  http.postJson(url,param,success)
+}
 //查询分区对象信息
 export function zoneCount(param,success) {
   let url = `${baseUrl}/datacenter/object/zone/count`

src/components/business_space/newGraphy/graphy.vue

@@ -131,8 +131,9 @@ import {
   queryZone,
   zoneCount,
   zoneCreate,
-  zoneQuery,
+  zoneQueryOutline,
   zoneUpdate,
+  zoneUpdateOutline,
   handleZoneUpdateBd
 } from "@/api/scan/request"
 
@@ -383,7 +384,7 @@ export default {
         pa.BuildingId = this.buildFloor[0];
         pa.FloorId = this.buildFloor[1];
       }
-      zoneQuery(pa, res => {
+      zoneQueryOutline(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间
@@ -1033,6 +1034,7 @@ export default {
         Projection: ['BIMLocation', 'ObjectType', 'Outline', 'Height', 'BuildingId', 'FloorId']
       }
       zoneUpdate(pa, res => {
+        zoneUpdateOutline(pa, res => { console.log(res) })
         this.updateZoneBF(zoneObj, IspaceIdList);
       })
     },

src/components/data_admin/buildTask/draw/drawModel.vue

@@ -11,7 +11,7 @@
 import { DivideFloorScene, FloorView } from "@saga-web/cad-engine/lib"
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
-import { floorQuery, queryEquip } from "@/api/scan/request";
+import { queryEquip } from "@/api/scan/request";
 export default {
   components: {
     canvasFun
@@ -67,17 +67,6 @@ export default {
         this.getGraphtSuc(res);
       })
     },
-    getFloorData() {
-      let pa = {
-        Filters: `FloorID='${this.FloorID}'`
-      }
-      floorQuery(pa, res => {
-        let newArr = res.Content[0].Outline.map(t => {
-          return new SPoint(t.X, t.Y);
-        })
-        this.drawMainScene.addSceneMark(newArr)
-      })
-    },
     getSelectedSpaces() {//获取选中区域
       if (this.view && this.view.scene) {
         let list = this.view.scene.getSelectedSpaces();

src/components/ledger/lib/cenoteGraphy.vue

@@ -22,7 +22,7 @@ import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, Opt } from "@saga-web/cad-engine/lib";
 import { FloorView } from "@saga-web/cad-engine/lib/FloorView";
 import { colorArr } from '@/utils/spaceColor';
-import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQuery } from '@/api/scan/request';
+import { getFloorMsgByFloorID, shaftSpaceQuery, shaftZoneLinkReplace, zoneQueryOutline } from '@/api/scan/request';
 import { resolve, reject } from 'q';
 export default {
   data() {
@@ -144,7 +144,7 @@ export default {
           pa.BuildingId = this.buildingData[0];
           pa.FloorId = this.buildingData[1];
         }
-        zoneQuery(pa, res => {
+        zoneQueryOutline(pa, res => {
           resolve(res);
         })
       })

src/components/point/report/objectInstance.vue

@@ -44,7 +44,7 @@ import {
   floorQuery, //数据中心查询楼层
   buildingQuery, //数据中心建筑查询
   projectQuery, //数据中心查询项目信息
-  zoneQuery, //数据中心所有空间实例
+  zoneQueryOutline, //数据中心所有空间实例
   queryLinkSys, //数据中心系统查询
   queryTenant, //数据中心查询租户
   partsQuery, //数据中心部件查询
@@ -117,7 +117,7 @@ export default {
             } else if (item.TypeCode == 'Sp') {
               //获取空间信息
               if (item.SpaceType) {
-                zoneQuery({
+                zoneQueryOutline({
                   Filters: `RoomID='${item.TypeCode + item.ProjectId + item.ObjectID}'`,
                   ZoneType: item.SpaceType
                 }, zoneMsg => {

src/views/ledger/rentlist/manageTenantZone.vue

@@ -85,7 +85,7 @@ import { mapGetters, mapActions } from "vuex";
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import { DivideFloorScene, SpaceItem, ZoneItem, FloorView, Opt } from "@saga-web/cad-engine/lib";
 import { colorArr } from "@/utils/spaceColor"
-import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQuery } from '@/api/scan/request'
+import { buildingQuery, queryTnRelateFloor, queryRentTableData, tnRelateZone, zoneQueryOutline } from '@/api/scan/request'
 export default {
   data() {
     return {
@@ -316,7 +316,7 @@ export default {
         }
         this.canvasLoading = false;
         let promise1 = new Promise((resolve) => {
-          zoneQuery(pa, res => {
+          zoneQueryOutline(pa, res => {
             resolve(res);
           })
         })

src/views/ledger/spacelist/index.vue

@@ -235,7 +235,7 @@
     // 获取关系是否需要计算
     getRelations() {
       let pa = {
-        Filters: `not ZoneType isNull;ComputationalState>1`
+        Filters: `RelationType in ["bd2sp","fl2sp"];ComputationalState>1`
       }
       getrelationTypeProject(pa, res => {
         if (res.Content.length) {

src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -13,7 +13,7 @@ import { SGraphyView } from "@saga-web/graphy/lib";
 import { DivideFloorScene, FloorView, Opt } from "@saga-web/cad-engine/lib"
 import { SColor, SPoint } from "@saga-web/draw/lib";
 import canvasFun from "@/components/business_space/newGraphy/canvasFun"
-import { floorQuery } from "@/api/scan/request";
+import { floorQueryOutline } from "@/api/scan/request";
 export default {
   components: {
     canvasFun
@@ -120,7 +120,7 @@ export default {
       let pa = {
         Filters: `FloorID='${this.FloorID}'`
       }
-      floorQuery(pa, res => {
+      floorQueryOutline(pa, res => {
         this.floorData = res.Content[0];
         this.getOtherFloorOutLine();
         this.initGraphy(this.floorData.StructureInfo.FloorMap, 2)
@@ -133,7 +133,7 @@ export default {
         Filters: `ModelId='${modelid}'`
       }
       this.shadeList = [];
-      floorQuery(pa, res => {
+      floorQueryOutline(pa, res => {
         res.Content.map(t => {
           if (t.FloorID != this.FloorID && t.Outline && t.Outline.length) {
             let line = t.Outline.map(item => {

src/views/ready/buildfloor/repetitionGraphy.vue

@@ -20,7 +20,7 @@
 <script>
 import drawFloor from "./drawGraphy/drawFloor";
 import checkGraphy from "./drawGraphy/checkGraphy"; //查看图片
-import { floorUpdate, floorQueryAndSign } from "@/api/scan/request";
+import { floorUpdateOutline, floorQueryAndSign } from "@/api/scan/request";
 import { getFileNameById } from "@/api/model/file";
 export default {
   components: {
@@ -82,7 +82,7 @@ export default {
         Content: [{ FloorID: this.FloorID, Outline: Outline }],
         Projection: ['Outline']
       }
-      floorUpdate(pa, res => {
+      floorUpdateOutline(pa, res => {
         this.isEdit = false;
         this.$message.success("更新成功");
       })

src/views/relation/overview/detail/index.vue

@@ -45,7 +45,7 @@
 <script>
 import {
   buildingQuery, //数据中心-建筑查询
-  zoneQuery, // 业务空间查询
+  zoneQueryOutline, // 业务空间查询
   queryDictionaryHead, //空间类型查询
   createSpaceNeighborhood, //创建邻接关系
   querySpaceNeighborhood, // 查询邻接关系
@@ -298,7 +298,7 @@ export default {
       } else {
         this.$message.warning("请选择建筑楼层");
       }
-      zoneQuery(pa, res => {
+      zoneQueryOutline(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间

src/views/screen/splitscreen/integrateresults/index.vue

@@ -42,7 +42,7 @@
 import { SGraphyView } from "@saga-web/graphy/lib";
 import { LocationPointScene, DivideFloorScene } from "@saga-web/cad-engine";
 import { SColor } from "@saga-web/draw/lib";
-import { queryEquip, floorQuery, zoneQuery } from '@/api/scan/request';
+import { queryEquip, floorQuery, zoneQueryOutline } from '@/api/scan/request';
 //组件
 import realtimeData from '@/components/screen/integrateresults/realtimeData';
 import exampleList from '@/components/screen/integrateresults/exampleList';
@@ -107,7 +107,7 @@ export default {
               ZoneType: example.SubTypeCode
             }
             //获取空间信息
-            zoneQuery(pa, zoneMsg => {
+            zoneQueryOutline(pa, zoneMsg => {
               if (zoneMsg.Content[0] && zoneMsg.Content[0].Outline) {
                 let canvasOption = {
                   RoomLocalName: zoneMsg.Content[0].RoomLocalName,

src/views/screen/splitscreen/spaceledger/index.vue

@@ -105,7 +105,7 @@
 </template>
 
 <script>
-  import {BeatchQueryParam, floorQuery, getDataDictionary, zoneQuery} from '@/api/scan/request'
+  import {BeatchQueryParam, floorQuery, getDataDictionary, zoneQuery, zoneQueryOutline} from '@/api/scan/request'
   import eqToSpaceTable from '@/components/business_space/newTables/eqToSpaceTable'
   import syInSpaceTable from '@/components/business_space/newTables/syInSpaceTable'
   import {DivideFloorScene, FloorView} from "@saga-web/cad-engine/lib";
@@ -174,13 +174,25 @@
       }
       zoneQuery(params, res => {
         this.spaceDetails = res.Content[0];
-        if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
-          this.getSpaceFloor();
-        }
+        this.getOutline();
+        // if (this.spaceDetails.Outline && this.spaceDetails.Outline[0] && this.spaceDetails.Outline[0].length) {
+        //   this.getSpaceFloor();
+        // }
         this.setFrame();
         this.getInFormationPoitnName();
       })
     },
+    getOutline(){
+      zoneQueryOutline({
+        Filters: `RoomID="${this.$route.query.RoomID}"`,
+        ZoneType: this.$route.query.zone
+      },res => {
+        if(res.Content[0]&&res.Content[0].Outline&&res.Content[0].Outline.length){
+          this.spaceDetails.Outline = res.Content[0].Outline;
+          this.getSpaceFloor();
+        }
+      })
+    },
     setFrame() {
       // 设置静态数据tab的iframe地址
       this.proId = localStorage.getItem('projectId');