xushiting пре 2 година
родитељ
комит
925d12a56f

+ 6 - 4
src/views/draw-file/board/editCAD/Controls/UIControl.js

@@ -285,22 +285,24 @@ export default class UIControl{
 
     initTopTable(value){
         let center = {
-            x:800,
-            y:550
+            x:700,
+            y:200
         }
         center = coordinate.getXYFromScreen(center)
         let table = tableService.createTable(center)
         table.setValue(value)
+        this.layer.renderer.autoRedraw()
     }
 
     initDownTable(value){
         let center = {
-            x:800,
-            y:250
+            x:700,
+            y:520
         }
         center = coordinate.getXYFromScreen(center)
         let table = tableService.createTable(center)
         table.setValue(value)
+        this.layer.renderer.autoRedraw()
     }
     /******************************************************************************************************************************************************************/
 }

+ 3 - 1
src/views/draw-file/board/editCAD/Geometry/Table.js

@@ -19,7 +19,9 @@ export default class Table extends Geometry {
         this.cells = [];           //cell的数组,里面存放cell.vectorId
         this.geoType = VectorType.Table
         this.setId(vectorId)
-        this.init();
+        if(!vectorId){
+            this.init();
+        }
     }
 
     //初始化两个cell

+ 2 - 1
src/views/draw-file/board/editCAD/Load.js

@@ -32,6 +32,7 @@ export default class Load {
             floorplanService.addBgImage(bgImage)
             return;
         }
+        floorplanService.setCurrentId(floorsData.currentId)
         for (let i = 0; i < floorsData.floors.length; ++i) {
             let floor = floorsData.floors[i]
             floorplanService.initFloor(i)
@@ -57,7 +58,7 @@ export default class Load {
             }
 
             for (let key in floor.cells) {
-                let cell = tableService.createCell(floor.cells[key].parent,floor.cells[key].cellId, i)
+                let cell = tableService.createCell(floor.cells[key].parent,floor.cells[key].vectorId, i)
                 cell.width = floor.cells[key].width
                 cell.height = floor.cells[key].height
                 cell.value = floor.cells[key].value