Parcourir la source

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

zhangyu il y a 4 ans
Parent
commit
90fa520059
2 fichiers modifiés avec 11 ajouts et 8 suppressions
  1. 3 3
      package.json
  2. 8 5
      src/components/business_space/newGraphy/graphy.vue

+ 3 - 3
package.json

@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.588",
-    "@saga-web/draw": "2.1.110",
-    "@saga-web/graph": "2.1.133",
+    "@saga-web/cad-engine": "2.0.589",
+    "@saga-web/draw": "2.1.111",
+    "@saga-web/graph": "2.1.136",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 8 - 5
src/components/business_space/newGraphy/graphy.vue

@@ -451,7 +451,7 @@ export default {
             this.view._needDraw = true;
             this.fit();
           } catch (err) {
-            console.log(err,'------------');
+            console.log(err, '------------');
             console.log(this)
           }
           this.canvasLoading = false;
@@ -681,8 +681,8 @@ export default {
         console.log(err)
         let selectSpaces = this.scene.getSelectedSpaces();
         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) {
             IspaceIdList.push(curISP.id);
@@ -855,7 +855,7 @@ export default {
       }
       let pa = {
         content: [space],
-        projection: ['state']
+        // projection: ['state']
       }
       zoneUpdate(pa, res => {
         this.curZoneItem.isInfected = false;
@@ -1181,7 +1181,10 @@ export default {
       zoneObj.floorId = this.buildFloor[1];
       let pa = {
         content: [zoneObj],
-        projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
+        // projection: ['bimLocation', 'classCode', 'outline', 'height', 'buildingId', 'floorId']
+      }
+      if (!zoneObj.outline) {
+        pa.nullItems = ['outline']
       }
       zoneUpdate(pa, res => {
         zoneUpdateOutline(pa, res => { console.log(res) })