所有传orgId的地方修改
This commit is contained in:
@@ -54,7 +54,7 @@ const { RangePicker } = DatePicker;
|
||||
|
||||
export default function RobotTaskPage() {
|
||||
const { userInfo } = useSelector((state: RootState) => state.user);
|
||||
const { stationId } = useSelector((state: RootState) => state.station);
|
||||
const { stationId, currentStation } = useSelector((state: RootState) => state.station);
|
||||
const [excuteStatus, setExcuteStatus] = useState("stop"); //"stop" "running" "pause"
|
||||
// 机器人实时位置
|
||||
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
|
||||
@@ -334,7 +334,7 @@ export default function RobotTaskPage() {
|
||||
if (!stationId) return;
|
||||
|
||||
try {
|
||||
const deviceRes = await getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1, orgId: userInfo.orgId });
|
||||
const deviceRes = await getSiteDevice({ siteId: stationId, pageSize: 9999, pageNum: 1, orgId: currentStation?.orgId });
|
||||
const devData = deviceRes?.code === 200 ? (deviceRes.rows || []) : [];
|
||||
setDevices(devData);
|
||||
} catch (err) {
|
||||
@@ -551,7 +551,7 @@ export default function RobotTaskPage() {
|
||||
deviceId: selectedRobotForExecute.serialNumber,
|
||||
routeId: selectedRouteForExecute.id,
|
||||
siteId: stationId,
|
||||
...(userInfo?.orgId ? { orgId: userInfo.orgId } : {}),
|
||||
...(currentStation?.orgId ? { orgId: currentStation.orgId } : {}),
|
||||
};
|
||||
|
||||
const res = await excuetRoute(params);
|
||||
@@ -591,7 +591,7 @@ export default function RobotTaskPage() {
|
||||
const params = {
|
||||
userId: userInfo?.userId,
|
||||
siteId: stationId,
|
||||
orgId: userInfo?.orgId,
|
||||
orgId: currentStation?.orgId,
|
||||
pageNum: 1,
|
||||
pageSize: 99999999
|
||||
};
|
||||
@@ -626,7 +626,7 @@ export default function RobotTaskPage() {
|
||||
try {
|
||||
const params = {
|
||||
siteId: stationId,
|
||||
orgId: userInfo?.orgId,
|
||||
orgId: currentStation?.orgId,
|
||||
pageNum: 1,
|
||||
pageSize: 99999999
|
||||
};
|
||||
@@ -1802,6 +1802,8 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
|
||||
excuteDayStartTime: '',
|
||||
excuteDayEndTime: '',
|
||||
});
|
||||
const { currentStation } = useSelector((state: RootState) => state.station);
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
if (selectedPathWork) {
|
||||
@@ -1875,7 +1877,7 @@ const NewTaskModal = ({ isOpen, onClose, robots, selectedPathWork, handlGetTaskL
|
||||
const finishTime = formData.excuteDayEndTime;
|
||||
const finalData = {
|
||||
deviceId: formData.device.serialNumber,
|
||||
orgId: userInfo.orgId,
|
||||
orgId: currentStation?.orgId,
|
||||
planName: formData.planName,
|
||||
routeId: formData.path.id,
|
||||
siteId: stationId,
|
||||
|
||||
Reference in New Issue
Block a user