From d30e385951ce03335a5023f0775fd144da3c0b88 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 18 三月 2025 11:18:31 +0800
Subject: [PATCH] 修改

---
 src/main/java/com/example/client/service/Level1ManageService.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/example/client/service/Level1ManageService.java b/src/main/java/com/example/client/service/Level1ManageService.java
index 2116af0..a393660 100644
--- a/src/main/java/com/example/client/service/Level1ManageService.java
+++ b/src/main/java/com/example/client/service/Level1ManageService.java
@@ -4,6 +4,7 @@
 import com.example.client.dto.JComboBoxItem;
 import com.example.client.model.TableButton;
 import com.example.client.utils.CommonTable;
+import com.example.client.utils.Compute;
 import com.example.client.utils.GBC;
 import com.example.server.progressTrack.model.DjJdgzNetworkLevel1;
 import com.example.server.progressTrack.model.DjJdgzShip;
@@ -41,13 +42,14 @@
     private List<ColumnDto> columnDto;
 
     public JPanel createTable(Integer width, Integer height, JFrame jFrame) {
-        JPanel panel = new JPanel();
+        JPanel panel = new JPanel(new BorderLayout());
 
         JPanel topJpanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        topJpanel.setPreferredSize(new Dimension(width, 37));
+        topJpanel.setPreferredSize(new Dimension(width, 40));
         topJpanel.setBackground(Color.WHITE);
         JPanel centerJpanel = new JPanel();
-        centerJpanel.setPreferredSize(new Dimension(width - 20, height - 100));
+
+        centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40,jFrame)));
         centerJpanel.setBackground(Color.WHITE);
         panel.add(topJpanel, BorderLayout.NORTH);
         panel.add(centerJpanel, BorderLayout.CENTER);
@@ -75,7 +77,7 @@
 
         table = CommonTable.createCommonTable(list, columnDto);
         table.setRowHeight(25);
-        table.setAutoCreateRowSorter(true);
+
         table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
         final Boolean[] isFirstLoadData = {true};
@@ -87,7 +89,7 @@
                 if (!isFirstLoadData[0]) {
                     CommonTable.refreshTable(list, columnDto,table);
                     table.setRowHeight(25);
-                    table.setAutoCreateRowSorter(true);
+
                     table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 
                     tableModelListener(table,jFrame);
@@ -116,8 +118,19 @@
         JScrollPane scrollPane = new JScrollPane(table, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
         scrollPane.setViewportView(table);
         scrollPane.getViewport().setBackground(Color.WHITE);
-        scrollPane.setPreferredSize(new Dimension(width - 20, height - 100));
+        scrollPane.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40,jFrame)));
         centerJpanel.add(scrollPane);
+        jFrame.addComponentListener(new ComponentAdapter() {
+            @Override
+            public void componentResized(ComponentEvent e) {
+                centerJpanel.setPreferredSize(new Dimension(width - 20, Compute.ComputeHeight(40,jFrame)));
+                scrollPane.setPreferredSize(new Dimension(width - 20,Compute.ComputeHeightWithScroll(40,jFrame)));
+                centerJpanel.revalidate();
+                centerJpanel.repaint();
+                scrollPane.revalidate();
+                scrollPane.repaint();
+            }
+        });
 
         return panel;
     }
@@ -140,9 +153,9 @@
         frame1.setLayout(layout);
         JComboBoxItem[] shipList = djJdgzShipService.getListByItem();
         JComboBoxItem[] levelList = {
-                new JComboBoxItem(1, "涓�绾�"),
-                new JComboBoxItem(2, "浜岀骇"),
-                new JComboBoxItem(3, "涓夌骇"),
+                new JComboBoxItem(1L, "涓�绾�"),
+                new JComboBoxItem(1L, "浜岀骇"),
+                new JComboBoxItem(1L, "涓夌骇"),
         };
 
         JLabel JLabel1 = new JLabel("鐜勫彿");
@@ -205,12 +218,12 @@
             data.setStartDate(sdFormat.format(beginDate.getDate()));
             data.setYear((Integer) yearPicker.getValue());
             data.setAdventDay(7);
-            data.setProjectName(ship.getName()+"-"+yearPicker.getValue() + "-" + level.getName());
+            data.setProjectName(level.getName()+"淇悊"+ship.getName()+"椤圭洰");
             level1Service.insert(data);
             list = level1Service.getList(ship.getId());
             CommonTable.refreshTable(list,columnDto,table);
             table.setRowHeight(25);
-            table.setAutoCreateRowSorter(true);
+
             table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
             tableModelListener(table,jFrame);
             frame1.dispose();

--
Gitblit v1.9.1