From 8b9a7701bfa5b94e121dccdf5a982ea1820bb81e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 25 九月 2024 16:28:02 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/page/action/ActionList.jsx | 4 ++--
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ActionController.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/src/page/action/ActionList.jsx b/zy-acs-flow/src/page/action/ActionList.jsx
index da7ee0b..dae0a72 100644
--- a/zy-acs-flow/src/page/action/ActionList.jsx
+++ b/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 />
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ActionController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ActionController.java
index 7560bae..7d8cab5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/ActionController.java
+++ b/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')")
--
Gitblit v1.9.1