From ba52838f42b0cb96b220869a46a1046d52227634 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 十月 2024 11:02:08 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/index.jsx | 64 +++++++++++++++++++-------------
zy-acs-flow/src/map/tool.js | 6 ++
2 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/index.jsx b/zy-acs-flow/src/map/insight/index.jsx
index 6d1237a..3bc802c 100644
--- a/zy-acs-flow/src/map/insight/index.jsx
+++ b/zy-acs-flow/src/map/insight/index.jsx
@@ -6,6 +6,7 @@
import {
DEVICE_TYPE,
} from '../constants';
+import JsonShow from '../JsonShow';
import ShelfInsight from './shelf';
import AgvInsight from './agv';
import PointInsight from './point';
@@ -61,32 +62,11 @@
borderRadius: '8px',
}}>
<CardContent sx={{ height: '100%' }}>
- {deviceType === DEVICE_TYPE.SHELF && (
- <>
- <ShelfInsight
- sprite={sprite}
- setTitle={setTitle}
- />
- </>
- )}
-
- {deviceType === DEVICE_TYPE.AGV && (
- <>
- <AgvInsight
- sprite={sprite}
- setTitle={setTitle}
- />
- </>
- )}
-
- {deviceType === DEVICE_TYPE.POINT && (
- <>
- <PointInsight
- sprite={sprite}
- setTitle={setTitle}
- />
- </>
- )}
+ <DeviceContent
+ deviceType={deviceType}
+ sprite={sprite}
+ setTitle={setTitle}
+ />
</CardContent>
</Card>
</Box>
@@ -97,5 +77,37 @@
)
}
+const DeviceContent = ({ deviceType, sprite, setTitle }) => {
+ switch (deviceType) {
+ case DEVICE_TYPE.SHELF:
+ return (
+ <ShelfInsight
+ sprite={sprite}
+ setTitle={setTitle}
+ />
+ )
+ case DEVICE_TYPE.AGV:
+ return (
+ <AgvInsight
+ sprite={sprite}
+ setTitle={setTitle}
+ />
+ )
+ case DEVICE_TYPE.POINT:
+ return (
+ <PointInsight
+ sprite={sprite}
+ setTitle={setTitle}
+ />
+ )
+ default:
+ return (
+ <JsonShow
+ data={sprite?.data}
+ height={550}
+ />
+ )
+ }
+}
export default Insight;
\ No newline at end of file
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index e47361a..8ecc0f9 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -324,11 +324,15 @@
text.y = 3;
background.addChild(text);
tooltip = new PIXI.Container();
+ tooltip.name = "tooltip";
tooltip.addChild(background);
return tooltip;
}
function onSpriteMouseOver(event) {
+ if (tooltip) {
+ app.stage.removeChild(tooltip);
+ }
tooltip = createSpriteTooltip(this);// this => sprite
tooltip.x = event.data.global.x + 10;
tooltip.y = event.data.global.y + 10;
@@ -479,7 +483,7 @@
const pointRoute = new PointRoute(POINT_ROUTE_DIRECTION[route.direction]);
pointRoute.setPoint(startPoint, endPoint);
pointRoute.clear();
- pointRoute.lineStyle(10, 0x2d3436);
+ pointRoute.lineStyle(8, themeMode === 'light' ? '#2d3436' : '#dcdde1');
pointRoute.moveTo(startPoint.position.x, startPoint.position.y);
pointRoute.lineTo(endPoint.position.x, endPoint.position.y);
pointRoute.alpha = 1;
--
Gitblit v1.9.1