From 77d58298d00c11ade8862ca8acb0fdef5a45322e Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 21 三月 2025 17:39:38 +0800
Subject: [PATCH] 修改
---
src/main/java/com/example/client/service/SubunitAddOrUpdate.java | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/example/client/service/SubunitAddOrUpdate.java b/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
index 88e566d..1d91113 100644
--- a/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
+++ b/src/main/java/com/example/client/service/SubunitAddOrUpdate.java
@@ -5,10 +5,12 @@
import com.example.client.model.TableButton;
import com.example.client.utils.BoxIteUtils;
import com.example.client.utils.CommonTable;
+import com.example.client.utils.Compute;
import com.example.client.utils.GBC;
import com.example.server.cabin.service.CabinService;
import com.example.server.progressTrack.model.DjJdgzDismantTrack;
import com.example.server.progressTrack.model.DjJdgzNetworkLevel3;
+import com.example.server.progressTrack.model.DjJdgzTrackRecord;
import com.example.server.progressTrack.service.DjJdgzDismantTrackService;
import com.example.server.progressTrack.service.DjJdgzNetworkLevel3Service;
import com.example.server.teamGroup.service.SysTeamGroupClassService;
@@ -41,15 +43,17 @@
private CabinService cabinService;
private List<ColumnDto> columnDto;
private JTable trackTable;
+ private DjJdgzNetworkLevel3 nowLevel3;
public JPanel createTrack(Integer width, Integer height, DjJdgzNetworkLevel3 djJdgzNetworkLevel3,JFrame frame) {
- JPanel panel = new JPanel();
+ nowLevel3 = djJdgzNetworkLevel3;
+ JPanel panel = new JPanel(new BorderLayout());
panel.setPreferredSize(new Dimension(width, height));
JPanel topJpanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
- topJpanel.setPreferredSize(new Dimension(width - 10, 37));
+ topJpanel.setPreferredSize(new Dimension(width - 10, 40));
JPanel centerJpanel = new JPanel();
- centerJpanel.setPreferredSize(new Dimension(width - 20, height - 100));
+ centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40,frame)));
panel.add(topJpanel, BorderLayout.NORTH);
panel.add(centerJpanel, BorderLayout.CENTER);
@@ -59,7 +63,7 @@
topJpanel.add(btnInsert);
JComboBoxItem[] cabinList = cabinService.getList();
- List<DjJdgzDismantTrack> list = djJdgzDismantTrackService.getList(djJdgzNetworkLevel3.getId(), null);
+ List<DjJdgzDismantTrack> list = djJdgzDismantTrackService.getList(nowLevel3.getId(), null);
List<TableButton> buttonList = new ArrayList<>();
buttonList.add(new TableButton("edit", "缂栬緫"));
buttonList.add(new TableButton("del", "鍒犻櫎"));
@@ -76,7 +80,7 @@
trackTable = CommonTable.createCommonTable(list, columnDto);
trackTable.setPreferredSize(new Dimension(width , height));
trackTable.setRowHeight(25);
- trackTable.setAutoCreateRowSorter(true);
+
trackTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
tableModelListener(trackTable, frame,list,columnDto);
@@ -84,25 +88,34 @@
btnInsert.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
+ frame.setEnabled(false);
SysUser user = (SysUser) CacheUtils.get("user", "user");
- if (user.getTeamgroup()==null||user.getTeamgroup().equals(djJdgzNetworkLevel3.getTeamgroupId())) {
+ if (user.getTeamgroup()==null||user.getTeamgroup().equals(nowLevel3.getTeamgroupId().toString())) {
DjJdgzDismantTrack djJdgzDismantTrack = new DjJdgzDismantTrack();
- djJdgzDismantTrack.setLevel3NetworkId(djJdgzNetworkLevel3.getId());
+ djJdgzDismantTrack.setLevel3NetworkId(nowLevel3.getId());
insert(frame,djJdgzDismantTrack);
}else{
- JOptionPane.showMessageDialog(null, "涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
+ JOptionPane.showMessageDialog(null, "褰撳墠鐢ㄦ埛涓嶅彲鎿嶄綔鍏朵粬涓撲笟鏁版嵁", "鎻愮ず", JOptionPane.WARNING_MESSAGE);
}
-
-
}
});
JScrollPane scrollPane = new JScrollPane(trackTable, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
scrollPane.setViewportView(trackTable);
- scrollPane.setPreferredSize(new Dimension(width - 20, height - 130));
+ scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(40,frame)));
centerJpanel.add(scrollPane);
-
+ frame.addComponentListener(new ComponentAdapter() {
+ @Override
+ public void componentResized(ComponentEvent e) {
+ centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(40,frame)));
+ scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeightWithScroll(40,frame)));
+ centerJpanel.revalidate();
+ centerJpanel.repaint();
+ scrollPane.revalidate();
+ scrollPane.repaint();
+ }
+ });
return panel;
}
@@ -164,15 +177,17 @@
list.add(data);
djJdgzDismantTrackService.save(list);
+ this.refreshTable(data.getLevel3NetworkId(),null);
frame1.dispose();
jFrame.setEnabled(true);//灏嗕富鐣岄潰鍐嶈缃负鍙搷浣滅殑
});
}
public void refreshTable(Long level3Id,JFrame jFrame){
+ nowLevel3 = level3Service.get(level3Id);
List<DjJdgzDismantTrack> list = djJdgzDismantTrackService.getList(level3Id, null);
CommonTable.refreshTable(list, columnDto, trackTable);
trackTable.setRowHeight(25);
- trackTable.setAutoCreateRowSorter(true);
+
trackTable.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
tableModelListener(trackTable, jFrame,list,columnDto);
}
@@ -189,15 +204,15 @@
Object newValue = table.getModel().getValueAt(row, column);
// 杈撳嚭鍙樺寲淇℃伅
if (newValue.equals("edit")){
+ jFrame.setEnabled(false);
DjJdgzDismantTrack data = list.get(row);
insert(jFrame,data);
- jFrame.setEnabled(false);
}else if(newValue.equals("del")) {
int n = JOptionPane.showConfirmDialog(null, "鏄惁鍒犻櫎?", "鎻愮ず", JOptionPane.YES_NO_OPTION);
if (n == 0) {
DefaultTableModel model = (DefaultTableModel) table.getModel();
DjJdgzDismantTrack data = list.get(row);
- djJdgzDismantTrackService.deleteLogic(data.getId());
+ djJdgzDismantTrackService.delete(data.getId());
list.remove(row);
model.removeRow(row);
}
--
Gitblit v1.9.1