|
@@ -145,7 +145,8 @@ public class MesClient extends JFrame {
|
|
|
//读文件配置
|
|
//读文件配置
|
|
|
readProperty();
|
|
readProperty();
|
|
|
// 客户端类型由 ClientType.CODE 硬编码(此处 QIMI),不再由此处传入
|
|
// 客户端类型由 ClientType.CODE 硬编码(此处 QIMI),不再由此处传入
|
|
|
- ClientRuntimeAgent.start(mes_server_ip, mes_gw, mes_line_sn);
|
|
|
|
|
|
|
+ // 禁用自动更新,改为手动更新
|
|
|
|
|
+ // ClientRuntimeAgent.start(mes_server_ip, mes_gw, mes_line_sn);
|
|
|
|
|
|
|
|
// 显示界面
|
|
// 显示界面
|
|
|
mesClientFrame = new MesClient();
|
|
mesClientFrame = new MesClient();
|
|
@@ -851,7 +852,9 @@ public class MesClient extends JFrame {
|
|
|
setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
|
|
setIconImage(Toolkit.getDefaultToolkit().getImage(MesClient.class.getResource("/bg/logo.png")));
|
|
|
setTitle("气密检测客户端");
|
|
setTitle("气密检测客户端");
|
|
|
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
|
|
- setBounds(0, 0, 1024, 768);
|
|
|
|
|
|
|
+ // 自适应屏幕分辨率,避免工控机出现滚动条
|
|
|
|
|
+ setExtendedState(JFrame.MAXIMIZED_BOTH);
|
|
|
|
|
+ // setBounds(0, 0, 1024, 768);
|
|
|
|
|
|
|
|
JMenuBar menuBar = new JMenuBar();
|
|
JMenuBar menuBar = new JMenuBar();
|
|
|
menuBar.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 26));
|
|
menuBar.setFont(new Font("Microsoft YaHei UI", Font.PLAIN, 26));
|
|
@@ -1139,7 +1142,8 @@ public class MesClient extends JFrame {
|
|
|
|
|
|
|
|
indexPanelA.add(bottomPanel, BorderLayout.SOUTH);
|
|
indexPanelA.add(bottomPanel, BorderLayout.SOUTH);
|
|
|
|
|
|
|
|
- centerPanelChildren(indexPanelA, 1024, 550);
|
|
|
|
|
|
|
+ // 移除固定尺寸限制,让面板自适应
|
|
|
|
|
+ // centerPanelChildren(indexPanelA, 1024, 550);
|
|
|
tabbedPane.addTab("工作面板", new ImageIcon(MesClient.class.getResource("/bg/a_side.png")), indexScrollPaneA, null);
|
|
tabbedPane.addTab("工作面板", new ImageIcon(MesClient.class.getResource("/bg/a_side.png")), indexScrollPaneA, null);
|
|
|
tabbedPane.setEnabledAt(0, true);
|
|
tabbedPane.setEnabledAt(0, true);
|
|
|
|
|
|
|
@@ -1155,9 +1159,12 @@ public class MesClient extends JFrame {
|
|
|
searchScrollPaneDj = new JScrollPane(indexPanelC);
|
|
searchScrollPaneDj = new JScrollPane(indexPanelC);
|
|
|
// indexPanelC.setLayout(new GridLayout(0, 1, 0, 0));
|
|
// indexPanelC.setLayout(new GridLayout(0, 1, 0, 0));
|
|
|
indexPanelC.setLayout(null);
|
|
indexPanelC.setLayout(null);
|
|
|
|
|
+ // 设置内容区域尺寸适配1024宽度屏幕
|
|
|
|
|
+ indexPanelC.setPreferredSize(new Dimension(980, 600));
|
|
|
|
|
|
|
|
JPanel panel2 = new JPanel();
|
|
JPanel panel2 = new JPanel();
|
|
|
- panel2.setBounds(0, 0, 990, 50);
|
|
|
|
|
|
|
+ // 改用自适应宽度,避免工控机出现横向滚动条
|
|
|
|
|
+ panel2.setBounds(0, 0, 1000, 50);
|
|
|
// panel2.setLayout(new GridLayout(0, 1, 0, 0));
|
|
// panel2.setLayout(new GridLayout(0, 1, 0, 0));
|
|
|
panel2.setLayout(null);
|
|
panel2.setLayout(null);
|
|
|
//记录查询搜索框
|
|
//记录查询搜索框
|
|
@@ -1205,7 +1212,7 @@ public class MesClient extends JFrame {
|
|
|
|
|
|
|
|
JButton btnPrevious = new JButton("上一页");
|
|
JButton btnPrevious = new JButton("上一页");
|
|
|
btnPrevious.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
btnPrevious.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
|
- btnPrevious.setBounds(680, 5, 100, 40);
|
|
|
|
|
|
|
+ btnPrevious.setBounds(680, 5, 90, 40);
|
|
|
panel2.add(btnPrevious);
|
|
panel2.add(btnPrevious);
|
|
|
|
|
|
|
|
// 页码显示
|
|
// 页码显示
|
|
@@ -1213,13 +1220,13 @@ public class MesClient extends JFrame {
|
|
|
pageLabel.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
pageLabel.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
|
pageLabel.setHorizontalAlignment(SwingConstants.CENTER); // 设置文本居中对齐
|
|
pageLabel.setHorizontalAlignment(SwingConstants.CENTER); // 设置文本居中对齐
|
|
|
pageLabel.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1)); // 添加灰色边框
|
|
pageLabel.setBorder(BorderFactory.createLineBorder(Color.GRAY, 1)); // 添加灰色边框
|
|
|
- pageLabel.setBounds(780, 5, 100, 40); // 设置位置和大小
|
|
|
|
|
|
|
+ pageLabel.setBounds(775, 5, 90, 40); // 调整位置适配1024屏幕
|
|
|
panel2.add(pageLabel);
|
|
panel2.add(pageLabel);
|
|
|
|
|
|
|
|
// “下一页”按钮
|
|
// “下一页”按钮
|
|
|
JButton btnNext = new JButton("下一页");
|
|
JButton btnNext = new JButton("下一页");
|
|
|
btnNext.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
btnNext.setFont(new Font("微软雅黑", Font.PLAIN, 18));
|
|
|
- btnNext.setBounds(880, 5, 100, 40);
|
|
|
|
|
|
|
+ btnNext.setBounds(870, 5, 90, 40); // 调整位置,总宽度控制在960以内
|
|
|
panel2.add(btnNext);
|
|
panel2.add(btnNext);
|
|
|
|
|
|
|
|
// 分页逻辑变量
|
|
// 分页逻辑变量
|
|
@@ -1240,7 +1247,8 @@ public class MesClient extends JFrame {
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
JPanel panel = new JPanel();
|
|
JPanel panel = new JPanel();
|
|
|
- panel.setBounds(0, 49, 990, 518);
|
|
|
|
|
|
|
+ // 改用自适应宽度
|
|
|
|
|
+ panel.setBounds(0, 49, 1000, 518);
|
|
|
panel.setLayout(new GridLayout(0, 1, 0, 0));
|
|
panel.setLayout(new GridLayout(0, 1, 0, 0));
|
|
|
indexPanelC.add(panel);
|
|
indexPanelC.add(panel);
|
|
|
|
|
|
|
@@ -1321,8 +1329,11 @@ public class MesClient extends JFrame {
|
|
|
indexPanelC.addComponentListener(new ComponentAdapter() {
|
|
indexPanelC.addComponentListener(new ComponentAdapter() {
|
|
|
@Override
|
|
@Override
|
|
|
public void componentResized(ComponentEvent e) {
|
|
public void componentResized(ComponentEvent e) {
|
|
|
|
|
+ // 同时调整顶部按钮区和表格区的宽度
|
|
|
|
|
+ panel2.setBounds(0, 0, indexPanelC.getWidth(), 50);
|
|
|
panel.setBounds(0, 49, indexPanelC.getWidth(), Math.max(0, indexPanelC.getHeight() - 49));
|
|
panel.setBounds(0, 49, indexPanelC.getWidth(), Math.max(0, indexPanelC.getHeight() - 49));
|
|
|
panel.revalidate();
|
|
panel.revalidate();
|
|
|
|
|
+ panel2.revalidate();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|
|
@@ -1340,6 +1351,8 @@ public class MesClient extends JFrame {
|
|
|
indexPanelD = new JPanel();
|
|
indexPanelD = new JPanel();
|
|
|
searchScrollPaneD = new JScrollPane(indexPanelD);
|
|
searchScrollPaneD = new JScrollPane(indexPanelD);
|
|
|
indexPanelD.setLayout(null);
|
|
indexPanelD.setLayout(null);
|
|
|
|
|
+ // 设置内容区域尺寸适配1024宽度屏幕(减去滚动条和边距,安全值980)
|
|
|
|
|
+ indexPanelD.setPreferredSize(new Dimension(980, 520));
|
|
|
|
|
|
|
|
PrintService[] printServices = PrintServiceLookup.lookupPrintServices(null, null);
|
|
PrintService[] printServices = PrintServiceLookup.lookupPrintServices(null, null);
|
|
|
String[] printerNames = (printServices != null && printServices.length > 0) ?
|
|
String[] printerNames = (printServices != null && printServices.length > 0) ?
|
|
@@ -1544,10 +1557,11 @@ public class MesClient extends JFrame {
|
|
|
labelFont.setColumns(10);
|
|
labelFont.setColumns(10);
|
|
|
labelFont.setBounds(536, 335, 200, 30);
|
|
labelFont.setBounds(536, 335, 200, 30);
|
|
|
indexPanelD.add(labelFont);
|
|
indexPanelD.add(labelFont);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
saveBtn = new JButton("编辑配置");
|
|
saveBtn = new JButton("编辑配置");
|
|
|
saveBtn.setFont(new Font("微软雅黑", Font.PLAIN, 20));
|
|
saveBtn.setFont(new Font("微软雅黑", Font.PLAIN, 20));
|
|
|
- saveBtn.setBounds(787, 267, 156, 57);
|
|
|
|
|
|
|
+ // 调整按钮位置适配1024屏幕
|
|
|
|
|
+ saveBtn.setBounds(400, 490, 156, 57);
|
|
|
indexPanelD.add(saveBtn);
|
|
indexPanelD.add(saveBtn);
|
|
|
saveBtn.addActionListener(new ActionListener() {
|
|
saveBtn.addActionListener(new ActionListener() {
|
|
|
public void actionPerformed(ActionEvent e) {
|
|
public void actionPerformed(ActionEvent e) {
|
|
@@ -1658,7 +1672,7 @@ public class MesClient extends JFrame {
|
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2 = new JLabel("工位号");
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2 = new JLabel("工位号");
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2.setHorizontalAlignment(SwingConstants.CENTER);
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2.setHorizontalAlignment(SwingConstants.CENTER);
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
- lblNewLabel_3_1_1_1_1_1_1_1_1_2.setBounds(762, 22, 200, 30);
|
|
|
|
|
|
|
+ lblNewLabel_3_1_1_1_1_1_1_1_1_2.setBounds(680, 22, 120, 30);
|
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2);
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2);
|
|
|
|
|
|
|
|
// ngTime = new JTextField();
|
|
// ngTime = new JTextField();
|
|
@@ -1669,15 +1683,15 @@ public class MesClient extends JFrame {
|
|
|
oprno = new JTextField();
|
|
oprno = new JTextField();
|
|
|
oprno.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
oprno.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
oprno.setColumns(10);
|
|
oprno.setColumns(10);
|
|
|
- oprno.setBounds(762, 54, 200, 30);
|
|
|
|
|
|
|
+ oprno.setBounds(810, 22, 150, 30);
|
|
|
indexPanelD.add(oprno);
|
|
indexPanelD.add(oprno);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2_1 = new JLabel("工位名称");
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2_1 = new JLabel("工位名称");
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setHorizontalAlignment(SwingConstants.CENTER);
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setHorizontalAlignment(SwingConstants.CENTER);
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
- lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setBounds(762, 94, 200, 30);
|
|
|
|
|
|
|
+ lblNewLabel_3_1_1_1_1_1_1_1_1_2_1.setBounds(680, 62, 120, 30);
|
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2_1);
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2_1);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// ngNumber = new JTextField();
|
|
// ngNumber = new JTextField();
|
|
|
// ngNumber.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
// ngNumber.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
// ngNumber.setColumns(10);
|
|
// ngNumber.setColumns(10);
|
|
@@ -1686,13 +1700,13 @@ public class MesClient extends JFrame {
|
|
|
oprnoTitle = new JTextField();
|
|
oprnoTitle = new JTextField();
|
|
|
oprnoTitle.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
oprnoTitle.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
oprnoTitle.setColumns(10);
|
|
oprnoTitle.setColumns(10);
|
|
|
- oprnoTitle.setBounds(762, 123, 200, 30);
|
|
|
|
|
|
|
+ oprnoTitle.setBounds(810, 62, 150, 30);
|
|
|
indexPanelD.add(oprnoTitle);
|
|
indexPanelD.add(oprnoTitle);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1 = new JLabel("产线编号");
|
|
JLabel lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1 = new JLabel("产线编号");
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setHorizontalAlignment(SwingConstants.CENTER);
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setHorizontalAlignment(SwingConstants.CENTER);
|
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
- lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setBounds(762, 163, 200, 30);
|
|
|
|
|
|
|
+ lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1.setBounds(680, 102, 120, 30);
|
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1);
|
|
indexPanelD.add(lblNewLabel_3_1_1_1_1_1_1_1_1_2_1_1);
|
|
|
//
|
|
//
|
|
|
// ngUpgradeTime = new JTextField();
|
|
// ngUpgradeTime = new JTextField();
|
|
@@ -1704,10 +1718,11 @@ public class MesClient extends JFrame {
|
|
|
lineSn = new JTextField();
|
|
lineSn = new JTextField();
|
|
|
lineSn.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
lineSn.setFont(new Font("微软雅黑", Font.PLAIN, 16));
|
|
|
lineSn.setColumns(10);
|
|
lineSn.setColumns(10);
|
|
|
- lineSn.setBounds(762, 195, 200, 30);
|
|
|
|
|
|
|
+ lineSn.setBounds(810, 102, 150, 30);
|
|
|
indexPanelD.add(lineSn);
|
|
indexPanelD.add(lineSn);
|
|
|
|
|
|
|
|
- centerPanelChildren(indexPanelD, 972, 520);
|
|
|
|
|
|
|
+ // 移除固定尺寸限制,让面板自适应
|
|
|
|
|
+ // centerPanelChildren(indexPanelD, 972, 520);
|
|
|
tabbedPane.addTab("软件设置", new ImageIcon(MesClient.class.getResource("/bg/menu_setting.png")), indexPanelD, null);
|
|
tabbedPane.addTab("软件设置", new ImageIcon(MesClient.class.getResource("/bg/menu_setting.png")), indexPanelD, null);
|
|
|
tabbedPane.addChangeListener(new ChangeListener() {
|
|
tabbedPane.addChangeListener(new ChangeListener() {
|
|
|
@Override
|
|
@Override
|