diff --git a/src/core/manager/EnvManager.ts b/src/core/manager/EnvManager.ts index e91f732..53339ee 100644 --- a/src/core/manager/EnvManager.ts +++ b/src/core/manager/EnvManager.ts @@ -77,6 +77,9 @@ export default class EnvManager { this.stopSubscribe.push( worldModel.backendMessageReceiver.subscribe('ServerState', this.onServerUpdateMessage.bind(this)) ) + this.stopSubscribe.push( + worldModel.backendMessageReceiver.subscribe('DeviceStatus', this.onDeviceStatusMessage.bind(this)) + ) await this.loadInvToModel() this.client.on('connect', this.onMqttConnect) @@ -91,6 +94,16 @@ export default class EnvManager { } /** + * 处理设备状态消息 + */ + onDeviceStatusMessage(type, topic, data: AgvStatusVo) { + const object3D = Model.find3D(data.id) + if (object3D) { + object3D.agvStatusVo = data + } + } + + /** * 监听在服务器停机之后,客户端连接也必须停机 */ onServerUpdateMessage(type: BackendTopicType, topic: string, data: ServerStatusVo) { diff --git a/src/editor/widgets/monitor/MonitorView.vue b/src/editor/widgets/monitor/MonitorView.vue index fa70c88..782c60d 100644 --- a/src/editor/widgets/monitor/MonitorView.vue +++ b/src/editor/widgets/monitor/MonitorView.vue @@ -37,7 +37,7 @@
-
+
diff --git a/src/modules/amr/ptr/PtrObject.ts b/src/modules/amr/ptr/PtrObject.ts index cd07072..b9f7fe9 100644 --- a/src/modules/amr/ptr/PtrObject.ts +++ b/src/modules/amr/ptr/PtrObject.ts @@ -85,6 +85,7 @@ export default class PtrObject extends THREE.Object3D { private __TaskStatus: CEventId = 0 private __PickMode: CPickMode = 0 + private agvStatusVo : AgvStatusVo; get TaskMode(): CTaskMode { return this.__TaskMode