From d2c0bccd2e6dde4cf2a614a67bbf0ed45e2bcbaf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 十一月 2024 13:59:22 +0800
Subject: [PATCH] # 213
---
src/main/webapp/views/wcsmap/wcsmap.html | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/wcsmap/wcsmap.html b/src/main/webapp/views/wcsmap/wcsmap.html
index 16bc34e..d793959 100644
--- a/src/main/webapp/views/wcsmap/wcsmap.html
+++ b/src/main/webapp/views/wcsmap/wcsmap.html
@@ -39,6 +39,7 @@
style="position: absolute;top: 20px;right: 50px;background-color: #fff;height: 30px;width: 80px;text-align: center;line-height: 30px;border-radius: 4px;">
<div>FPS:{{mapFps}}</div>
</div>
+
</div>
</div>
</body>
@@ -53,15 +54,18 @@
el: '#app',
data: {
mapFps: 0,
+ floor: '1妤�',
sites: ['185', '186', '240', "250", "299"],
- conveyor: []
+ currMap: null,
+ conveyor: [],
+
},
created() {
mapData
},
mounted() {
- this.createMapData()
+ this.createMapData(mapData.conveyor)
this.createMap()
setInterval(() => {
@@ -70,9 +74,8 @@
},
methods: {
- createMapData() {
- this.conveyor = mapData.conveyor
- console.log(this.conveyor);
+ createMapData(conveyor) {
+ this.conveyor = conveyor
},
getSiteInfo() {
@@ -97,7 +100,7 @@
// }
if (site.siteStatus == 'site-auto-run-id') {
// 鑷姩+鏈夌墿+ID
- conve.background = 0xFC3030
+ // conve.background = 0xFC3030
} else if (site.siteStatus == 'site-auto-run') {
// 鑷姩+鏈夌墿
@@ -356,7 +359,7 @@
pixiApp.stage.addChild(text);
}
- for (let k of mapData.conveyor) {
+ for (let k of this.conveyor) {
let rectangle = new PIXI.Graphics();
rectangle.beginFill(k.background);
// rectangle.originColor = k.background;
@@ -370,7 +373,6 @@
rectangle.on('mouseover', onMouseOver)
function onMouseOver(event) {
rectangle.alpha = k.alpha ? k.alpha : 1
- console.log(event);
// 鍒涘缓鍐呭妗�
let tooltip = new PIXI.Graphics();
tooltip.beginFill(0xFFFFFF); // 鍐呭妗嗚儗鏅鑹�
--
Gitblit v1.9.1