From ce5df72d7a09f943421827971f62bbd0d8c879f5 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 09 十二月 2025 16:50:13 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 6 +-
zy-acs-flow/src/map/http.js | 10 +-
zy-acs-flow/src/i18n/core/zhMap.js | 6 +-
zy-acs-flow/src/i18n/en.js | 4
zy-acs-flow/src/map/tool.js | 76 ++++++++++++------------
zy-acs-flow/src/i18n/zh.js | 4
zy-acs-flow/src/map/MapPage.jsx | 30 +++++-----
zy-acs-flow/src/i18n/core/enMap.js | 6 +-
8 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/zy-acs-flow/src/i18n/core/enMap.js b/zy-acs-flow/src/i18n/core/enMap.js
index bf48e23..ad59ddf 100644
--- a/zy-acs-flow/src/i18n/core/enMap.js
+++ b/zy-acs-flow/src/i18n/core/enMap.js
@@ -2,13 +2,13 @@
page: {
map: {
action: {
- addZone: 'Add Zone',
+ addArea: 'Add Area',
},
prompt: {
- zoneName: 'Please enter zone name',
+ areaName: 'Please enter area name',
},
msg: {
- zoneCreated: 'Zone "%{name}" created',
+ areaCreated: 'Area "%{name}" created',
},
},
},
diff --git a/zy-acs-flow/src/i18n/core/zhMap.js b/zy-acs-flow/src/i18n/core/zhMap.js
index c3c71b8..4c07dfd 100644
--- a/zy-acs-flow/src/i18n/core/zhMap.js
+++ b/zy-acs-flow/src/i18n/core/zhMap.js
@@ -2,13 +2,13 @@
page: {
map: {
action: {
- addZone: '娣诲姞鍖哄煙',
+ addArea: '娣诲姞鍖哄煙',
},
prompt: {
- zoneName: '璇疯緭鍏ュ尯鍩熷悕绉�',
+ areaName: '璇疯緭鍏ュ尯鍩熷悕绉�',
},
msg: {
- zoneCreated: '鍖哄煙 "%{name}" 宸插垱寤�',
+ areaCreated: '鍖哄煙 "%{name}" 宸插垱寤�',
},
},
},
diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js
index 68c743d..bff65a7 100644
--- a/zy-acs-flow/src/i18n/en.js
+++ b/zy-acs-flow/src/i18n/en.js
@@ -659,14 +659,14 @@
oneClickLocate: 'One-click Locate',
oneClickPatrol: 'One-click Patrol',
cancelPatrol: 'Cancel Patrol',
- addZone: 'Add Zone',
+ addArea: 'Add Area',
},
mode: {
observer: 'OBSERVER',
movable: 'MOVABLE',
settings: 'SETTINGS',
roadmap: 'ROADMAP',
- zoning: 'ZONING',
+ area: 'AREA',
},
insight: {
title: 'Insight',
diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js
index 1821f6b..575200b 100644
--- a/zy-acs-flow/src/i18n/zh.js
+++ b/zy-acs-flow/src/i18n/zh.js
@@ -659,14 +659,14 @@
oneClickLocate: '涓�閿畾浣�',
oneClickPatrol: '涓�閿贰閫�',
cancelPatrol: '鍙栨秷宸￠��',
- addZone: '娣诲姞鍖哄煙',
+ addArea: '娣诲姞鍖哄煙',
},
mode: {
observer: '瑙傚療妯″紡',
movable: '缂栬緫妯″紡',
settings: '閰嶇疆妯″紡',
roadmap: '璺嚎妯″紡',
- zoning: '鍖哄煙绠＄悊',
+ area: '鍖哄煙绠＄悊',
},
insight: {
title: '璇︽儏',
diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx
index 9fa5b90..6bfb5ad 100644
--- a/zy-acs-flow/src/map/MapPage.jsx
+++ b/zy-acs-flow/src/map/MapPage.jsx
@@ -49,7 +49,7 @@
const [deviceVisible, setDeviceVisible] = useState(false);
const [settingsVisible, setSettingsVisible] = useState(false);
const [batchSelectionVisible, setBatchSelectionVisible] = useState(false);
- const [zoneDrawing, setZoneDrawing] = useState(false);
+ const [areaDrawing, setAreaDrawing] = useState(false);
const [curSprite, setCurSprite] = useState(null);
const [batchSprites, setBatchSprites] = useState([]);
@@ -126,7 +126,7 @@
modeRef.current = mode;
Tool.removeSelectedEffect();
- Tool.clearZones();
+ Tool.clearAreas();
player.hideGridLines();
setInsightVisible(false);
@@ -170,10 +170,10 @@
Tool.beSettings(child, setCurSprite);
})
break
- case MAP_MODE.ZONING_MODE:
+ case MAP_MODE.AREA_MODE:
Tool.removeAgvGraphics();
- Tool.loadZones(curZone);
+ Tool.loadAreas(curZone);
break
default:
break
@@ -347,32 +347,32 @@
</>
)}
- {mode === MAP_MODE.ZONING_MODE && (
+ {mode === MAP_MODE.AREA_MODE && (
<>
<Button
- variant={zoneDrawing ? "outlined" : "contained"}
+ variant={areaDrawing ? "outlined" : "contained"}
color="primary"
sx={{ mr: 2 }}
- disabled={zoneDrawing}
+ disabled={areaDrawing}
onClick={() => {
- const started = Tool.startZoneDrawing({
- promptText: translate('page.map.prompt.zoneName'),
+ const started = Tool.startAreaDrawing({
+ promptText: translate('page.map.prompt.areaName'),
onComplete: ({ name, start, end, color }) => {
if (name) {
- Http.saveZoneData(curZone, { name, start, end, color });
- notify.success(translate('page.map.msg.zoneCreated', { name }));
+ Http.saveAreaData(curZone, { name, start, end, color });
+ notify.success(translate('page.map.msg.areaCreated', { name }));
}
},
onFinish: () => {
- setZoneDrawing(false);
+ setAreaDrawing(false);
}
});
if (started) {
- setZoneDrawing(true);
+ setAreaDrawing(true);
}
}}
>
- {translate('page.map.action.addZone')}
+ {translate('page.map.action.addArea')}
</Button>
</>
)}
@@ -394,7 +394,7 @@
<MenuItem value={MAP_MODE.OBSERVER_MODE}>{translate('page.map.mode.observer')}</MenuItem>
<MenuItem value={MAP_MODE.MOVABLE_MODE}>{translate('page.map.mode.movable')}</MenuItem>
<MenuItem value={MAP_MODE.SETTINGS_MODE}>{translate('page.map.mode.settings')}</MenuItem>
- <MenuItem value={MAP_MODE.ZONING_MODE}>{translate('page.map.mode.zoning')}</MenuItem>
+ <MenuItem value={MAP_MODE.AREA_MODE}>{translate('page.map.mode.area')}</MenuItem>
</Select>
</Box>
{/* content */}
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index a5a8df7..f867170 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -11,7 +11,7 @@
OBSERVER_MODE: "1",
MOVABLE_MODE: "2",
SETTINGS_MODE: "3",
- ZONING_MODE: "4",
+ AREA_MODE: "4",
})
export const DEVICE_TYPE = Object.freeze({
@@ -25,7 +25,7 @@
ROUTE: "ROUTE",
- ZONE: "ZONE",
+ AREA: "AREA",
})
export const DEVICE_Z_INDEX = Object.freeze({
@@ -39,7 +39,7 @@
DYNAMIC_ROUTE: 2,
- ZONE: 5,
+ AREA: 5,
})
export const DEVICE_SPRITE_TINT = Object.freeze({
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index 7fc2322..0d0e7a5 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -375,9 +375,9 @@
}
-export const fetchZoneList = async (zoneId) => {
+export const fetchAreaList = async (zoneId) => {
try {
- const res = await request.post('/map/zone/list', {
+ const res = await request.post('/map/area/list', {
zoneId: zoneId,
}, {
headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
@@ -396,11 +396,11 @@
}
}
-export const saveZoneData = async (zoneId, zoneData) => {
+export const saveAreaData = async (zoneId, areaData) => {
try {
- const res = await request.post('/map/zone/save', {
+ const res = await request.post('/map/area/save', {
zoneId: zoneId,
- zone: zoneData,
+ area: areaData,
});
const { code, msg } = res.data;
if (code !== 200) {
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 676dbf4..3ebb75d 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -14,7 +14,7 @@
ANIMATE_DURING_TIME,
AGV_ANGLE_OFFSET_VAL,
} from './constants';
-import { getRouteList, fetchZoneList } from './http';
+import { getRouteList, fetchAreaList } from './http';
import PointRoute from "./PointRoute";
import shelf from '/map/shelf.svg';
@@ -877,12 +877,12 @@
}
-// zone operator -------------------------------
+// area operator -------------------------------
-let zoneDrawingCleanup = null;
-const ZONE_COLOR = 0x3498db;
+let areaDrawingCleanup = null;
+const AREA_COLOR = 0x3498db;
-const addZoneLabel = (draft, text, from, to) => {
+const addAreaLabel = (draft, text, from, to) => {
const centerX = (from.x + to.x) / 2;
const centerY = (from.y + to.y) / 2;
const label = new PIXI.Text(text, {
@@ -897,18 +897,18 @@
draft.addChild(label);
};
-export const loadZones = (curArea) => {
+export const loadAreas = (curZone) => {
if (!mapContainer) return;
- clearZones();
- fetchZoneList(curArea).then((zones) => {
- zones.forEach((zone) => {
- const { name, color, id } = zone || {};
- const start = zone?.start || (zone?.startX != null ? { x: zone.startX, y: zone.startY } : null);
- const end = zone?.end || (zone?.endX != null ? { x: zone.endX, y: zone.endY } : null);
+ clearAreas();
+ fetchAreaList(curZone).then((areas) => {
+ areas.forEach((area) => {
+ const { name, color, id } = area || {};
+ const start = area?.start || (area?.startX != null ? { x: area.startX, y: area.startY } : null);
+ const end = area?.end || (area?.endX != null ? { x: area.endX, y: area.endY } : null);
if (!start || !end || !name) {
return;
}
- const g = createZoneGraphic({ name, start, end, color, id });
+ const g = createAreaGraphic({ name, start, end, color, id });
if (g) {
mapContainer.addChild(g);
}
@@ -916,28 +916,28 @@
});
};
-export const clearZones = () => {
+export const clearAreas = () => {
if (!mapContainer) return;
for (let i = mapContainer.children.length - 1; i >= 0; i--) {
const child = mapContainer.children[i];
- if (child?.data?.type === DEVICE_TYPE.ZONE) {
+ if (child?.data?.type === DEVICE_TYPE.AREA) {
mapContainer.removeChild(child);
child.destroy({ children: true, texture: false, baseTexture: false });
}
}
};
-const createZoneGraphic = ({ name, start, end, color, id }) => {
+const createAreaGraphic = ({ name, start, end, color, id }) => {
if (!mapContainer) return null;
const from = start || { x: 0, y: 0 };
const to = end || { x: 0, y: 0 };
- const zoneColor = color || ZONE_COLOR;
+ const areaColor = color || AREA_COLOR;
const draft = new PIXI.Graphics();
- draft.name = id ? `zone_${id}` : 'zone_' + generateID();
- draft.zIndex = DEVICE_Z_INDEX.ZONE;
- draft.lineStyle(4 / Math.abs(mapContainer.scale.x || 1), zoneColor, 0.8);
- draft.beginFill(zoneColor, 0.18);
+ draft.name = id ? `area_${id}` : 'area_' + generateID();
+ draft.zIndex = DEVICE_Z_INDEX.AREA;
+ draft.lineStyle(4 / Math.abs(mapContainer.scale.x || 1), areaColor, 0.8);
+ draft.beginFill(areaColor, 0.18);
draft.drawRect(
Math.min(from.x, to.x),
Math.min(from.y, to.y),
@@ -945,34 +945,34 @@
Math.abs(from.y - to.y),
);
draft.endFill();
- addZoneLabel(draft, name, from, to);
- draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.ZONE, name, color: zoneColor, id };
+ addAreaLabel(draft, name, from, to);
+ draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.AREA, name, color: areaColor, id };
return draft;
};
-export const startZoneDrawing = ({ promptText, onComplete, onFinish } = {}) => {
+export const startAreaDrawing = ({ promptText, onComplete, onFinish } = {}) => {
if (!mapContainer || !mapContainer.parent) {
return false;
}
- if (zoneDrawingCleanup) {
- zoneDrawingCleanup();
+ if (areaDrawingCleanup) {
+ areaDrawingCleanup();
}
const stage = mapContainer.parent;
stage.off('mousedown');
const draft = new PIXI.Graphics();
- draft.name = 'zone_' + generateID();
- draft.zIndex = DEVICE_Z_INDEX.ZONE;
+ draft.name = 'area_' + generateID();
+ draft.zIndex = DEVICE_Z_INDEX.AREA;
let drawing = false;
let startPoint = null;
- const zoneColor = ZONE_COLOR;
+ const areaColor = AREA_COLOR;
const originalCursor = stage.cursor;
stage.cursor = 'crosshair';
const drawRect = (from, to) => {
draft.clear();
- const strokeColor = zoneColor;
+ const strokeColor = areaColor;
draft.lineStyle(4 / Math.abs(mapContainer.scale.x || 1), strokeColor, 0.8);
draft.beginFill(strokeColor, 0.18);
draft.drawRect(
@@ -988,13 +988,13 @@
stage.off('pointermove', handleMove);
stage.off('pointerup', handleUp);
stage.off('pointerdown', handleDown);
- zoneDrawingCleanup = null;
+ areaDrawingCleanup = null;
stage.cursor = originalCursor;
if (onFinish) {
onFinish();
}
};
- zoneDrawingCleanup = cleanupListeners;
+ areaDrawingCleanup = cleanupListeners;
const handleDown = (event) => {
if (event.button !== undefined && event.button !== 0) {
@@ -1022,22 +1022,22 @@
drawRect(startPoint, endPoint);
cleanupListeners();
- const zoneName = prompt(promptText || 'Please enter zone name');
- if (!zoneName) {
+ const areaName = prompt(promptText || 'Please enter area name');
+ if (!areaName) {
mapContainer.removeChild(draft);
draft.destroy({ children: true, texture: false, baseTexture: false });
return;
}
- addZoneLabel(draft, zoneName, startPoint, endPoint);
- draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.ZONE, name: zoneName, color: zoneColor };
+ addAreaLabel(draft, areaName, startPoint, endPoint);
+ draft.data = { ...(draft.data || {}), type: DEVICE_TYPE.AREA, name: areaName, color: areaColor };
if (onComplete) {
onComplete({
- name: zoneName,
+ name: areaName,
start: startPoint,
end: endPoint,
- color: zoneColor,
+ color: areaColor,
graphics: draft
});
}
--
Gitblit v1.9.1