#

luxiaotao1123

2024-09-21 d4b0141e5f04b6db457675da77dc691a2f5b073f

#

 zy-acs-flow/.env

@@ -1,5 +1,5 @@
COOL_BASE_IP = '10.242.136.69'
# COOL_BASE_IP = '10.242.136.69'
# COOL_BASE_IP = 'localhost'
# COOL_BASE_IP = '192.168.4.36'
COOL_BASE_IP = '192.168.4.36'

COOL_BASE_PORT = 9090

 zy-acs-flow/src/page/agv/AgvCard.jsx

@@ -38,8 +38,8 @@
                    justifyContent: 'space-between',
                    padding: '1em',
                    ...(!record.online && {
                        animation: 'pulse 2s infinite',
                        '@keyframes pulse': {
                        animation: 'cardBorderPulse 2s infinite',
                        '@keyframes cardBorderPulse': {
                            '0%': {
                                boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
                            },

 zy-acs-flow/src/page/agv/AgvShow.jsx

@@ -47,7 +47,22 @@
    return (
        <>
            <Box mt={2} display="flex">
                <Box flex="1">
                <Box flex="1" sx={{
                    ...(!record.online && {
                        animation: 'showBorderPulse 2s infinite',
                        '@keyframes showBorderPulse': {
                            '0%': {
                                boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
                            },
                            '50%': {
                                boxShadow: '0 0 3px 2px rgba(255, 0, 0, 0.3)',
                            },
                            '100%': {
                                boxShadow: '0 0 2px 1px rgba(255, 0, 0, 0.1)',
                            },
                        },
                    })
                }}>
                    <Card>
                        <CardContent sx={{ pt: 0 }}>
                            <Box display="flex" mb={1} sx={{

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvController.java

@@ -61,6 +61,7 @@
        PageResult<AgvResult> page = agvService.pageRel(pageParam);
        for (AgvResult result : page.getRecords()) {
            result.sync(agvDetailService.selectByAgvId(result.getId()), codeService, taskService, agvService);
            if (result.getUuid().equals("2")) { result.setOnline(true); }
        }
        return R.ok().add(page);
    }
@@ -83,6 +84,7 @@
        Agv agv = agvService.getById(id);
        if (null != agv) {
            agv.setOnline(agvService.judgeOnline(agv.getId()));
            if (agv.getUuid().equals("2")) { agv.setOnline(true); }
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
            if (null != agvDetail) {
                agv.setAgvDetail(agvDetail);