From b0536df735216d89b8a29862a4072ec9715cf682 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 17 四月 2025 10:45:01 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/device/shuttle/index.jsx | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-flow/src/pages/device/shuttle/index.jsx b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
index 43eff9c..dea6fef 100644
--- a/zy-asrs-flow/src/pages/device/shuttle/index.jsx
+++ b/zy-asrs-flow/src/pages/device/shuttle/index.jsx
@@ -6,6 +6,7 @@
PageContainer,
} from '@ant-design/pro-components';
import './index.less'
+import { WEBSOCKET_BASE_URL } from '@/config/setting';
const Main = () => {
const [deviceInfos, setDeviceInfos] = useState([]);
@@ -21,8 +22,7 @@
const [moveLocType, setMoveLocType] = useState(1);
useEffect(() => {
- var newWs = new WebSocket("ws://127.0.0.1:9090/wcs/ws/shuttle/websocket");
- setWs(newWs);
+ connect();
return () => {
if (ws) {
@@ -58,6 +58,7 @@
ws.onclose = function (e) {
console.log("close");
+ reconnect();
}
ws.onerror = function (e) {
@@ -65,6 +66,18 @@
}
}
}, [ws]);
+
+ const connect = () => {
+ var newWs = new WebSocket(WEBSOCKET_BASE_URL + "/ws/shuttle/websocket");
+ setWs(newWs);
+ }
+
+ const reconnect = () => {
+ setTimeout(() => {
+ console.log('WebSocketClient: Attempting to reconnect...');
+ connect();
+ }, 3000);
+ }
const sendWs = (message) => {
if (ws.readyState == WebSocket.OPEN) {
@@ -163,6 +176,25 @@
}
}
+ const shuttleMoveLocClose = async () => {
+ try {
+ const resp = await Http.doPost('api/basShuttle/moveLocClose', {
+ shuttleNo: currentData.shuttleNo,
+ });
+ if (resp.code === 200) {
+ message.success("璇锋眰鎴愬姛");
+ return true;
+ } else {
+ message.warning(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.warning("璇锋眰澶辫触");
+ return false;
+ }
+ }
+
+
const xStartChange = (e) => {
setXStart(e.target.value)
}
@@ -259,7 +291,12 @@
key: '13',
label: '鑷姩',
children: item.mode ? 'Y' : 'N',
- }
+ },
+ {
+ key: '14',
+ label: '搴撲綅鍙�',
+ children: item.currentLocNo,
+ },
];
return <div key={item.id} style={{ width: '45%' }}>
<div style={{ marginBottom: '10px' }}>
@@ -288,8 +325,6 @@
</p>
<p>
</p>
- <p>
- </p>
<div className="commandItem">
<Button onClick={() => shuttleOperator('moveLoc')}>绉诲姩鍒扮洰鏍囦綅缃�</Button>
<Button onClick={() => shuttleOperator('takeMove')}>鍙栨斁璐т綔涓�</Button>
@@ -304,6 +339,7 @@
<Button onClick={() => shuttleOperator('palletDown')}>鎵樼洏涓嬮檷</Button>
<Button onClick={() => shuttleOperator('chargeOpen')}>鍏呯數寮�</Button>
<Button onClick={() => shuttleOperator('chargeClose')}>鍏呯數鍏�</Button>
+ <Button onClick={() => shuttleOperator('requestWaiting')}>鐢宠纭</Button>
<Button onClick={() => shuttleOperator('reset')}>澶嶄綅</Button>
</div>
</Card>
@@ -325,6 +361,7 @@
/>
</div>
<Button onClick={() => shuttleMoveLoc()}>璺戝簱</Button>
+ <Button onClick={() => shuttleMoveLocClose()}>璺戝簱鍏抽棴</Button>
</div>
</Card>
</div>
--
Gitblit v1.9.1