فهرست منبع

Merge remote-tracking branch 'origin/dev' into dev

shaun-sheep 4 سال پیش
والد
کامیت
7fa1ec7eb4
2فایلهای تغییر یافته به همراه162 افزوده شده و 74 حذف شده
  1. 161 73
      src/components/business_space/newGraphy/graphy.vue
  2. 1 1
      src/components/business_space/newGraphy/unRelateBSP.vue

+ 161 - 73
src/components/business_space/newGraphy/graphy.vue

@@ -115,70 +115,70 @@
   </div>
 </template>
 <script>
-  import canvasFun from "./canvasFun"
-  import {mapGetters} from "vuex";
-  import {SColor, SPoint} from "@saga-web/draw/lib";
-  import {DivideFloorScene, FloorView, Opt, SpaceItem, ZoneItem} from "@saga-web/cad-engine/lib";
-  import {colorArr} from "@/utils/spaceColor"
-  import unRelateBSP from "./unRelateBSP";
-  import createBSP from "./createBSP";
-  // import dialogZone from "../../ledger/addDialog/dialogZone";
-  import {
-    createRelateInZoneAndISp,
-    getIspNotInSpace,
-    groupCreRelaZoneAndISp,
-    handleZoneUpdateBd,
-    queryAllZoneType,
-    queryZone,
-    zoneCount,
-    zoneCreate,
-    zoneQuery,
-    zoneQueryOutline,
-    zoneUpdate,
-    zoneUpdateOutline
-  } from "@/api/scan/request"
+import canvasFun from "./canvasFun"
+import { mapGetters } from "vuex";
+import { SColor, SPoint } from "@saga-web/draw/lib";
+import { DivideFloorScene, FloorView, Opt, SpaceItem, ZoneItem } from "@saga-web/cad-engine/lib";
+import { colorArr } from "@/utils/spaceColor"
+import unRelateBSP from "./unRelateBSP";
+import createBSP from "./createBSP";
+// import dialogZone from "../../ledger/addDialog/dialogZone";
+import {
+  createRelateInZoneAndISp,
+  getIspNotInSpace,
+  groupCreRelaZoneAndISp,
+  handleZoneUpdateBd,
+  queryAllZoneType,
+  queryZone,
+  zoneCount,
+  zoneCreate,
+  zoneQuery,
+  zoneQueryOutline,
+  zoneUpdate,
+  zoneUpdateOutline
+} from "@/api/scan/request"
 
-  export default {
-    components: {
-      canvasFun,
-      unRelateBSP,
-      createBSP,
-      // dialogZone
-    },
-    data() {
-      return {
-        canvasWidth: 800,
-        canvasHeight: 600,
-        type: 1, // 默认操作模式
-        search: '',//搜索
-        buildFloor: ['', ''],
-        FloorObj: {}, //楼层对象
-        FloorMap: '', //楼层底图
-        tab: {},
-        config: {
-          isEdit: false,
-          divide: true,
-          groupSelect: true
-        },
-        canvasLoading: false,
-        view: null,
-        scene: null,
-        Outline: [], // 当前选中的多个空间组成的轮廓线->三维数组
-        businessSpaceList: [], // 所有业务空间
-        num: 0, // 未关联元空间的业务空间统计
-        BSPRelaISPList: [], // 已关联元空间的业务空间
-        // 未关联元空间的业务空间弹窗
-        isAction: false,
-        curOutline: [],
-        BIMIDToSID: {}, //bimid映射元空间id
-        BIMIDToSIName: {}, //bimid映射元空间名称
-        curZoneItem: {}, //当前选中的业务空间item
-        allUnRelatISP: [], //
-        zoneList: [], // 业务空间-canvas图中
-        groupCreateDialogVis: false, //批量创建业务空间弹窗
-        groupCreateType: 1, //批量创建方式
-        zoneDisable: true, // 重新划分是否禁用
-        sourceIdToISP: {},
+export default {
+  components: {
+    canvasFun,
+    unRelateBSP,
+    createBSP,
+    // dialogZone
+  },
+  data() {
+    return {
+      canvasWidth: 800,
+      canvasHeight: 600,
+      type: 1, // 默认操作模式
+      search: '',//搜索
+      buildFloor: ['', ''],
+      FloorObj: {}, //楼层对象
+      FloorMap: '', //楼层底图
+      tab: {},
+      config: {
+        isEdit: false,
+        divide: true,
+        groupSelect: true
+      },
+      canvasLoading: false,
+      view: null,
+      scene: null,
+      Outline: [], // 当前选中的多个空间组成的轮廓线->三维数组
+      businessSpaceList: [], // 所有业务空间
+      num: 0, // 未关联元空间的业务空间统计
+      BSPRelaISPList: [], // 已关联元空间的业务空间
+      // 未关联元空间的业务空间弹窗
+      isAction: false,
+      curOutline: [],
+      BIMIDToSID: {}, //bimid映射元空间id
+      BIMIDToSIName: {}, //bimid映射元空间名称
+      curZoneItem: {}, //当前选中的业务空间item
+      allUnRelatISP: [], //
+      zoneList: [], // 业务空间-canvas图中
+      groupCreateDialogVis: false, //批量创建业务空间弹窗
+      groupCreateType: 1, //批量创建方式
+      zoneDisable: true, // 重新划分是否禁用
+      sourceIdToISP: {},
       areaValue: 40,
       areaMarks: { 0: '0m²', 100: '1m²' },
       options: [], //其他分区类型
@@ -429,6 +429,7 @@
           })
           // 绘制业务空间
           let tempArr = this.BSPRelaISPList.map((t, i) => {
+            console.log(t);
             return {
               RoomLocalName: t.localName || t.name,
               OutLine: t.outline,
@@ -559,6 +560,17 @@
           if (t.customParam) {
             obj.customParam = t.customParam
           }
+          // 2020-12-20 演示用 -start
+          if (t.infos) {
+            obj.infos = {}
+            if (t.infos.roomLocalFuncTypeID) {
+              obj.infos.roomLocalFuncTypeID = t.infos.roomLocalFuncTypeID
+            }
+            if (t.infos.roomLocalFuncTypeName) {
+              obj.infos.roomLocalFuncTypeName = t.infos.roomLocalFuncTypeName
+            }
+          }
+          // 2020-12-20 演示用 -end
           return obj;
         } else {
           return undefined
@@ -638,6 +650,18 @@
           if (curISP) {
             curISP && IspaceIdList.push(curISP.id);
             zoneObj.height = this.spaceHeight;
+            // 2020-12-20 演示用 -start
+            console.log(curISP);
+            if (curISP.infos) {
+              zoneObj.infos = {}
+              if (curISP.infos.roomLocalFuncTypeID) {
+                zoneObj.infos.roomLocalFuncTypeID = curISP.infos.roomLocalFuncTypeID
+              }
+              if (curISP.infos.roomLocalFuncTypeName) {
+                zoneObj.infos.roomLocalFuncTypeName = curISP.infos.roomLocalFuncTypeName
+              }
+            }
+            // 2020-12-20 演示用 -end
           }
         }
       } catch (err) {
@@ -650,6 +674,18 @@
           if (curISP) {
             IspaceIdList.push(curISP.id);
             zoneObj.height = this.spaceHeight;
+            // 2020-12-20 演示用 -start
+            console.log(curISP);
+            if (curISP.infos) {
+              zoneObj.infos = {}
+              if (curISP.infos.roomLocalFuncTypeID) {
+                zoneObj.infos.roomLocalFuncTypeID = curISP.infos.roomLocalFuncTypeID
+              }
+              if (curISP.infos.roomLocalFuncTypeName) {
+                zoneObj.infos.roomLocalFuncTypeName = curISP.infos.roomLocalFuncTypeName
+              }
+            }
+            // 2020-12-20 演示用 -end
           }
         })
         // 如果有划分,求交集
@@ -710,6 +746,17 @@
           if (curISP) {
             curISP && IspaceIdList.push(curISP.id);
             zoneObj.height = this.spaceHeight;
+            // 2020-12-20 演示用 -start
+            if (curISP.infos) {
+              zoneObj.infos = {}
+              if (curISP.infos.roomLocalFuncTypeID) {
+                zoneObj.infos.roomLocalFuncTypeID = curISP.infos.roomLocalFuncTypeID
+              }
+              if (curISP.infos.roomLocalFuncTypeName) {
+                zoneObj.infos.roomLocalFuncTypeName = curISP.infos.roomLocalFuncTypeName
+              }
+            }
+            // 2020-12-20 演示用 -end
           }
         }
       } catch (err) {
@@ -722,6 +769,17 @@
           if (curISP) {
             curISP && IspaceIdList.push(curISP.id);
             zoneObj.height = this.spaceHeight;
+            // 2020-12-20 演示用 -start
+            if (curISP.infos) {
+              zoneObj.infos = {}
+              if (curISP.infos.roomLocalFuncTypeID) {
+                zoneObj.infos.roomLocalFuncTypeID = curISP.infos.roomLocalFuncTypeID
+              }
+              if (curISP.infos.roomLocalFuncTypeName) {
+                zoneObj.infos.roomLocalFuncTypeName = curISP.infos.roomLocalFuncTypeName
+              }
+            }
+            // 2020-12-20 演示用 -end
           }
         })
         // 如果有划分,求交集
@@ -778,13 +836,13 @@
     confirmZoneSpace() {
       let ObjectType = this.tab.code == 'OtherZone' ? this.OtherValue : this.tab.code;
       let space = {
-        RoomID: this.curZoneItem.data.id,
-        State: 0,
-        ObjectType: ObjectType
+        id: this.curZoneItem.data.RoomID,
+        state: 0,
+        classCode: ObjectType
       }
       let pa = {
         content: [space],
-        projection: ['State']
+        projection: ['state']
       }
       zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
@@ -809,11 +867,18 @@
         if (this.BIMIDToSID[t.data.SourceId]) {
           IspaceIdList.push(this.BIMIDToSID[t.data.SourceId]);
         }
-
-        // if (t.Height && (zoneObj.Height == 0 || t.Height < zoneObj.Height)) {
-        //   zoneObj.Height = t.Height > 100 ? (t.Height / 1000).toFixed(2) : t.Height;
+        // 2020-12-20 演示用 -start
+        if (this.sourceIdToISP[t.data.sourceId] && this.sourceIdToISP[t.data.sourceId].infos) {
+          zoneObj.infos = {};
+          if (this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeID) {
+            zoneObj.infos.roomLocalFuncTypeID = this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeID
+          }
+          if (this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeName) {
+            zoneObj.infos.roomLocalFuncTypeName = this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeName
+          }
+        }
+        // 2020-12-20 演示用 -end
         zoneObj.height = this.spaceHeight
-        // }
       })
       // 类空间
       selectLikeSpace.map(t => {
@@ -905,6 +970,17 @@
             // zoneObj.Height = zoneObj.Height == 0 ? curISP.Height : zoneObj.Height > curISP.Height ? curISP.Height : zoneObj.Height;
             zoneObj.ispaceId = curISP.id;
             zoneObj.localName = curISP.localName || '';
+            // 2020-12-20 演示用 -start
+            if (curISP.infos) {
+              zoneObj.infos = {}
+              if (curISP.infos.roomLocalFuncTypeID) {
+                zoneObj.infos.roomLocalFuncTypeID = curISP.infos.roomLocalFuncTypeID
+              }
+              if (curISP.infos.roomLocalFuncTypeName) {
+                zoneObj.infos.roomLocalFuncTypeName = curISP.infos.roomLocalFuncTypeName
+              }
+            }
+            // 2020-12-20 演示用 -end
           }
           zoneObj.buildingId = this.buildFloor[0];
           zoneObj.floorId = this.buildFloor[1];
@@ -953,7 +1029,13 @@
               outline: line,
               buildingId: this.buildFloor[0],
               floorId: this.buildFloor[1],
-              height: this.spaceHeight
+              height: this.spaceHeight,
+              // 2020-12-20 演示用 -start
+              infos: {
+                roomLocalFuncTypeID: this.sourceIdToISP[t.data.sourceId].infos ? this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeID || '' : '',
+                roomLocalFuncTypeName: this.sourceIdToISP[t.data.sourceId].infos ? this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeName || '' : ''
+              }
+              // 2020-12-20 演示用 -end
             }
           }).filter(item => item)
         } else {
@@ -979,7 +1061,13 @@
               outline: [line],
               buildingId: this.buildFloor[0],
               floorId: this.buildFloor[1],
-              height: this.spaceHeight
+              height: this.spaceHeight,
+              // 2020-12-20 演示用 -start
+              infos: {
+                roomLocalFuncTypeID: this.sourceIdToISP[t.data.sourceId].infos ? this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeID || '' : '',
+                roomLocalFuncTypeName: this.sourceIdToISP[t.data.sourceId].infos ? this.sourceIdToISP[t.data.sourceId].infos.roomLocalFuncTypeName || '' : ''
+              }
+              // 2020-12-20 演示用 -end
             }
           }).filter(item => item);
         }

+ 1 - 1
src/components/business_space/newGraphy/unRelateBSP.vue

@@ -156,7 +156,7 @@ export default {
         pa.filters += `;localName contain "${this.keycode}" or name contain "${this.keycode}"`
       }
       zoneQuery(pa, res => {
-        this.page.total = res.Total;
+        this.page.total = res.total;
         this.tableData = res.content.map(t => {
           t.BNAME = this.bfData[t.buildingId];
           t.FNAME = this.bfData[t.floorId];