haojianlong 4 gadi atpakaļ
vecāks
revīzija
09666d7ce4
2 mainītis faili ar 14 papildinājumiem un 5 dzēšanām
  1. 1 1
      package.json
  2. 13 4
      src/views/ledger/facility/batchPoint.vue

+ 1 - 1
package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@saga-web/base": "2.1.27",
-    "@saga-web/cad-engine": "2.0.578",
+    "@saga-web/cad-engine": "2.0.581",
     "@saga-web/draw": "2.1.110",
     "@saga-web/graph": "2.1.133",
     "@saga-web/topology": "1.0.85",

+ 13 - 4
src/views/ledger/facility/batchPoint.vue

@@ -247,6 +247,13 @@ export default {
             this.selectedIcon.data.Z = this.equipZ;
             this.isChange = true;
             this.visible = false;
+            try {
+                const str = this.selectedIcon.textItemList[0].text.split('\n');
+                str[2] = this.equipZ
+                this.selectedIcon.textItemList[0].text = str.join('\n');
+            } catch (e) {
+                console.log(e);
+            }
         }
     },
     listChange(item, ev) {
@@ -310,13 +317,13 @@ export default {
                                 X: item.LocationJson.X, 
                                 Y: -item.LocationJson.Y, 
                                 Z: item.LocationJson.Z,
-                                text: [`${item.EquipLocalName || '--'}\n${item.EquipLocalID || '--'}\n${item.CADID || '--'}`]
+                                text: [`${item.EquipLocalName || '--'}\n${item.EquipLocalID || '--'}\n${item.LocationJson.Z || '--'}`]
                             });
 						}
                     });
                     this.scene.iconMove(this, this.iconMove);
                     this.scene.spaceClick(this, this.spaceClick);
-                    this.scene.iconClick(this, this.handleClickIcon);
+                    this.scene.iconChangeText(this, this.handleClickIcon);
 					this.view.update();
                     this.canvasLoading = false;
                     this.isChange = false;
@@ -341,17 +348,19 @@ export default {
                 X: e[0].x, 
                 Y: e[0].y, 
                 Z: 0,
-                text: [`${this.equipData.EquipLocalName || '--'}\n${this.equipData.EquipLocalID || '--'}\n${this.equipData.CADID || '--'}`]
+                text: [`${this.equipData.EquipLocalName || '--'}\n${this.equipData.EquipLocalID || '--'}\n0`]
             });
             // 保存按钮
             this.isChange = true;
             // 设置有坐标标识
             this.equipData.hasLocation = true;
             // 绑定事件
-            this.scene.iconClick(this, this.handleClickIcon)
+            this.scene.iconChangeText(this, this.handleClickIcon)
             // 重置打点动作
             this.isMarking = false;
         }
+        // 取消选中状态
+        this.scene && this.scene.selectContainer.clear()
     },
 	//初始化条件并查询设备
 	initParams() {