Browse Source

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu 3 years ago
parent
commit
3424d876fc
2 changed files with 18 additions and 18 deletions
  1. 1 1
      package.json
  2. 17 17
      src/components/business_space/newGraphy/graphy.vue

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.589",
+    "@saga-web/cad-engine": "2.0.590",
     "@saga-web/draw": "2.1.111",
     "@saga-web/graph": "2.1.136",
     "axios": "^0.18.0",

+ 17 - 17
src/components/business_space/newGraphy/graphy.vue

@@ -775,9 +775,10 @@ export default {
       } catch (err) {
         console.log(err);
         let selectSpaces = this.scene.getSelectedSpaces();
+        console.log(selectSpaces);
         selectSpaces.map(t => {
-          zoneObj.outline.push(t.data.outLine);
-          let key = t.data.sourceId;
+          zoneObj.outline.push(t.data.OutLine);
+          let key = t.data.SourceId;
           let curISP = this.sourceIdToISP[key];
           if (curISP) {
             curISP && IspaceIdList.push(curISP.id);
@@ -880,13 +881,13 @@ export default {
           IspaceIdList.push(this.BIMIDToSID[t.data.SourceId]);
         }
         // 2020-12-20 演示用 -start
-        if (this.sourceIdToISP[t.data.sourceId] && this.sourceIdToISP[t.data.sourceId].infos) {
+        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.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
+          if (this.sourceIdToISP[t.data.SourceId].infos.roomLocalFuncTypeName) {
+            zoneObj.infos.roomLocalFuncTypeName = this.sourceIdToISP[t.data.SourceId].infos.roomLocalFuncTypeName
           }
         }
         // 2020-12-20 演示用 -end
@@ -1000,7 +1001,6 @@ export default {
         }
       } catch (err) {
         console.log(err)
-        let createSpaces = [];
         // 如果有划分,求交集
         if (this.scene.cutItem || this.scene.sceneMark) {
           let outlines = this.scene.getIntersectInSpace();
@@ -1036,23 +1036,23 @@ export default {
               }
             }
             return {
-              ispaceId: this.BIMIDToSID[t.data.sourceId],
-              localName: this.BIMIDToSIName[t.data.sourceId] || '',
+              ispaceId: this.BIMIDToSID[t.data.SourceId],
+              localName: this.BIMIDToSIName[t.data.SourceId] || '',
               outline: line,
               buildingId: this.buildFloor[0],
               floorId: this.buildFloor[1],
               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 || '' : ''
+                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 {
           createSpaces = arr.map(t => {
-            let line = t.data.outLine;
+            let line = t.data.OutLine;
             if (!line || !line.length) {
               return undefined
             } else {
@@ -1068,16 +1068,16 @@ export default {
               }
             }
             return {
-              ispaceId: this.BIMIDToSID[t.data.sourceId],
-              localName: this.BIMIDToSIName[t.data.sourceId] || '',
+              ispaceId: this.BIMIDToSID[t.data.SourceId],
+              localName: this.BIMIDToSIName[t.data.SourceId] || '',
               outline: [line],
               buildingId: this.buildFloor[0],
               floorId: this.buildFloor[1],
               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 || '' : ''
+                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
             }