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 | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/wcsmap/wcsmap.html b/src/main/webapp/views/wcsmap/wcsmap.html
index 2a548c3..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,12 +74,12 @@
},
methods: {
- createMapData() {
- this.conveyor = mapData.conveyor
- console.log(this.conveyor);
+ createMapData(conveyor) {
+ this.conveyor = conveyor
},
getSiteInfo() {
+ let _this = this
$.ajax({
url: baseUrl + "/console/latest/data/site",
headers: { 'token': localStorage.getItem('token') },
@@ -87,11 +91,16 @@
// updateColor(item, item.originColor);
for (let site of sites) {
if (site.siteId == item.title) {
- var conve = this.conveyor.find(con => con.title == site.siteId)
-
+ var conve = _this.conveyor.find(con => con.title == site.siteId)
+ // var conve;
+ // for (let cc of this.conveyor) {
+ // if (cc.title == site.siteId) {
+ // conve = cc
+ // }
+ // }
if (site.siteStatus == 'site-auto-run-id') {
// 鑷姩+鏈夌墿+ID
- conve.background = 0xFC3030
+ // conve.background = 0xFC3030
} else if (site.siteStatus == 'site-auto-run') {
// 鑷姩+鏈夌墿
@@ -109,7 +118,7 @@
// 闈炶嚜鍔�/鎵嬪姩
conve.background = 0xB8B8B8
}
- this.updateColor(item, conve)
+ _this.updateColor(item, conve)
}
}
// for (let k of this.sites) {
@@ -287,7 +296,44 @@
text.resolution = pixiApp.renderer.resolution;
pixiApp.stage.addChild(text);
}
-
+ let track = mapData.track
+ for (let j in track) {
+ let k = track[j]
+ let x = k.x
+ for (let i = 0; i < k.anfme; i++) {
+ let rectangle = new PIXI.Graphics();
+ rectangle.beginFill(0xa6a6a6);
+ // rectangle.lineStyle(1, 0xffffff);
+ rectangle.drawRect(0, 0, k.unitX - 1, k.unitY - 1);
+ rectangle.y = k.y + 6 * i;
+ rectangle.x = x;
+ objectsContainer.addChild(rectangle);
+ }
+ }
+ for (let k of mapData.jar) {
+ let rectangle = new PIXI.Graphics();
+ rectangle.beginFill(k.background);
+ rectangle.originColor = k.background;
+ rectangle.drawRect(0, 0, k.width, k.height);
+ rectangle.x = k.x;
+ rectangle.y = k.y;
+ objectsContainer.addChild(rectangle);
+ var hel = `${k.title}`
+ var text = new PIXI.Text(hel, {
+ fontFamily: 'Arial',
+ fontSize: 18,
+ fill: '#FFFFFF', // 鐧借壊
+ align: 'center',
+ })
+ text.x = k.titleX;
+ text.y = k.titleY;
+ // pixiApp.stage.addChild(text)
+ // let text = new PIXI.Text('Hello!', { fontFamily: 'Arial', fontSize: 20, fill: 0x000000 ,resolution: pixiApp.renderer.resolution,antialias: true});
+ // text.x = 1000;
+ // text.y = 2000;
+ text.resolution = pixiApp.renderer.resolution;
+ pixiApp.stage.addChild(text);
+ }
for (let k of mapData.legend) {
let rectangle = new PIXI.Graphics();
rectangle.beginFill(k.background);
@@ -313,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;
@@ -327,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