Browse Source

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

shaun-sheep 4 years ago
parent
commit
689d123650

+ 6 - 6
src/components/business_space/business/handsontable.vue

@@ -208,7 +208,7 @@ export default {
 
     getData() {
       this.zoneParam = {
-        objectType: this.zoneCode,
+        classCode: this.zoneCode,
         pageNumber: this.page.pageNumber,
         pageSize: this.page.pageSize,
         orders: "createTime desc, localName desc, localId desc, id asc"
@@ -225,16 +225,16 @@ export default {
       } else if (this.buildFloorSelectd.length === 2) {
         switch (this.buildFloorSelectd[1]) {
           case 'noKnow':
-            this.zoneParam.BuildingId = this.buildFloorSelectd[0];
-            this.zoneParam.FloorId = 'isnull';
+            this.zoneParam.buildingId = this.buildFloorSelectd[0];
+            this.zoneParam.floorId = 'isnull';
             break;
           case 'all':
-            this.zoneParam.BuildingId = this.buildFloorSelectd[0];
+            this.zoneParam.buildingId = this.buildFloorSelectd[0];
             // params.FloorId = '';
             break;
           default:
-            this.zoneParam.BuildingId = this.buildFloorSelectd[0];
-            this.zoneParam.FloorId = this.buildFloorSelectd[1]
+            this.zoneParam.buildingId = this.buildFloorSelectd[0];
+            this.zoneParam.floorId = this.buildFloorSelectd[1]
 
         }
       }

+ 3 - 3
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -201,9 +201,9 @@ export default {
       this.scaleItem = new EditLineItem(null)
       this.scaleItem.strokeColor = SColor.Red;
       this.drawMainScene.addItem(this.scaleItem)
-      if (data && data.Line && data.Line.length == 2) {
-        this.scaleItem.line = data.Line;
-        this.scaleItem.text = data.Text;
+      if (data && data.line && data.line.length == 2) {
+        this.scaleItem.line = data.line;
+        this.scaleItem.text = data.text;
         // todo
         this.scaleItem.pointChange();
       }