瀏覽代碼

修改业务空间图 部分 接口

haojianlong 5 年之前
父節點
當前提交
fca0e07fba
共有 2 個文件被更改,包括 34 次插入45 次删除
  1. 33 44
      src/components/business_space/newGraphy/graphy.vue
  2. 1 1
      src/components/ledger/cenote/elevationMap.vue

+ 33 - 44
src/components/business_space/newGraphy/graphy.vue

@@ -118,14 +118,14 @@ import dialogZone from "../../ledger/addDialog/dialogZone";
 import {
   buildingQuery,
   queryZone,
-  updateZone,
-  createZone,
-  countZone,
   getIspNotInSpace,
   createRelateInZoneAndISp,
   groupCreRelaZoneAndISp,
-  getZoneQuery,
   queryAllZoneType, // 定制分区类型
+  zoneCreate,
+  searchZoneQuery,
+  handleZoneObjectUpdate,
+  countObjZone
 } from "@/api/scan/request"
 
 export default {
@@ -137,8 +137,8 @@ export default {
   },
   data() {
     return {
-      zoneValue:'',
-      addZone:[],
+      zoneValue: '',
+      addZone: [],
       canvasWidth: 800,
       canvasHeight: 600,
       type: 1, // 默认操作模式
@@ -221,7 +221,7 @@ export default {
       // 查询未关联平面图的业务空间
       this.getBSPunrelaISP();
     },
-    // 获取当前楼层的元空间
+    // 获取当前楼层的元空间-元空间接口不变
     getFloorISpace() {
       let pa = {
         zone: 'Ispace',
@@ -301,7 +301,6 @@ export default {
       queryAllZoneType(pa, res => {
         if (res.Content[0].ZoneType && res.Content[0].ZoneType.length) {
           this.options = res.Content[0].ZoneType.map(t => {
-
             t.value = t.Code;
             t.label = t.Name;
             return t;
@@ -364,17 +363,16 @@ export default {
     getBusinessSpace() {
       this.canvasLoading = true
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Filters: ``,
-          Orders: "createTime desc, RoomID asc",
-          PageSize: 1000
-        }
+        ZoneType: this.tab.code,
+        Filters: `not RoomID isNull`,
+        Orders: "createTime desc, RoomID asc",
+        PageSize: 1000
       }
       if (this.buildFloor.length && this.buildFloor.length > 1) {
-        pa.data.Filters = `BuildingId='${this.buildFloor[0]}';FloorId='${this.buildFloor[1]}'`
+        pa.BuildingId = this.buildFloor[0];
+        pa.FloorId = this.buildFloor[1];
       }
-      queryZone(pa, res => {
+      searchZoneQuery(pa, res => {
         // 所有业务空间
         this.businessSpaceList = res.Content;
         // 已关联元空间的业务空间
@@ -720,15 +718,16 @@ export default {
     },
     // 确认业务空间
     confirmZoneSpace() {
-      this.curZoneItem.data.State = 0;
+      let space = {
+        RoomID: this.curZoneItem.data.RoomID,
+        State: 0,
+        ObjectType: this.tab.code
+      }
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Content: [this.curZoneItem.data],
-          Projection: ['State']
-        },
+        Content: [space],
+        Projection: ['State']
       }
-      updateZone(pa, res => {
+      handleZoneObjectUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
         this.$emit('updateState');
         this.$message.success('更新成功');
@@ -952,16 +951,14 @@ export default {
     // 批量创建
     groupCreateBSP(spaces) {
       spaces = spaces.map(t => {
+        t.ObjectType = this.tab.code;
         t.BIMLocation = this.getAverageVal(t.Outline);
         return t;
       })
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Content: spaces
-        }
+        Content: spaces,
       }
-      createZone(pa, res => {
+      zoneCreate(pa, res => {
         res.EntityList.map(t => {
           spaces = spaces.map(item => {
             if (t.RoomLocalName == item.RoomLocalName) {
@@ -976,39 +973,31 @@ export default {
     // 单个创建
     createSingleBSP(space, IspaceIdList) {
       space.BIMLocation = space.Outline ? this.getAverageVal(space.Outline) : null;
+      space.ObjectType = this.tab.code;
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Content: [space]
-        }
+        Content: [space]
       }
-      createZone(pa, res => {
+      zoneCreate(pa, res => {
         this.relationInBSPandISP(res.EntityList[0].RoomID, IspaceIdList)
       })
     },
     // 更新业务空间区域
     updateBSPOutline(zoneObj, IspaceIdList) {
       zoneObj.BIMLocation = zoneObj.Outline ? this.getAverageVal(zoneObj.Outline) : null;
+      zoneObj.ObjectType = this.tab.code;
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Content: [zoneObj],
-          Projection: ['Outline', 'BIMLocation', 'State']
-        },
+        Content: [zoneObj]
       }
-      updateZone(pa, res => {
+      handleZoneObjectUpdate(pa, res => {
         this.relationInBSPandISP(zoneObj.RoomID, IspaceIdList)
       })
     },
     // 查询未关联平面图的业务空间(项目下+当前分区)
     getBSPunrelaISP() {
       let pa = {
-        zone: this.tab.code,
-        data: {
-          Filters: `Outline isNull`
-        }
+        Filters: `Outline isNull;ObjectType="${this.tab.code}"`
       }
-      countZone(pa, res => {
+      countObjZone(pa, res => {
         this.num = res.Count;
       })
     },

+ 1 - 1
src/components/ledger/cenote/elevationMap.vue

@@ -41,7 +41,7 @@
       elevationData: [],
       groupWidth: {},
       checkedList: [],
-      load: true
+      load: false,
     }
   },
   computed: {