#

luxiaotao1123

2024-09-25 8b9a7701bfa5b94e121dccdf5a982ea1820bb81e

#

 zy-acs-flow/src/page/action/ActionList.jsx

@@ -68,7 +68,7 @@
    <ReferenceInput source="agvId" label="table.field.action.agvId" reference="agv" alwaysOn>
        <AutocompleteInput label="table.field.action.agvId" optionText="uuid" filterToQuery={(val) => ({ uuid: val })} />
    </ReferenceInput>,
    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn />,
    <TextInput source="groupId" label="table.field.action.groupId" alwaysOn resettable />,
    <ReferenceInput source="busId" label="table.field.action.busId" reference="bus">
        <AutocompleteInput label="table.field.action.busId" optionText="busNo" filterToQuery={(val) => ({ seqNum: val })} />
    </ReferenceInput>,
@@ -127,7 +127,7 @@
                title={"menu.action"}
                empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
                filters={filters}
                sort={{ field: "create_time", order: "desc" }}
                sort={{ field: "io_time", order: "desc" }}
                actions={(
                    <TopToolbar>
                        <FilterButton />

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

@@ -31,7 +31,7 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<Action, BaseParam> pageParam = new PageParam<>(baseParam, Action.class);
        return R.ok().add(actionService.page(pageParam, pageParam.buildWrapper(true)));
        return R.ok().add(actionService.page(pageParam, pageParam.buildWrapper(true, "io_time")));
    }

    @PreAuthorize("hasAuthority('manager:action:list')")