|
@@ -875,6 +875,7 @@ public class MesClient extends JFrame {
|
|
|
toolBar.add(plc_status_menu);
|
|
toolBar.add(plc_status_menu);
|
|
|
|
|
|
|
|
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
|
tabbedPane = new JTabbedPane(JTabbedPane.TOP);
|
|
|
|
|
+ tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
|
|
|
tabbedPane.setMinimumSize(new Dimension(400, 50));
|
|
tabbedPane.setMinimumSize(new Dimension(400, 50));
|
|
|
tabbedPane.setFont(new Font("宋体", Font.BOLD, 22));
|
|
tabbedPane.setFont(new Font("宋体", Font.BOLD, 22));
|
|
|
contentPane.add(tabbedPane);
|
|
contentPane.add(tabbedPane);
|
|
@@ -1034,11 +1035,9 @@ public class MesClient extends JFrame {
|
|
|
|
|
|
|
|
// searchScrollPane = new JScrollPane((Component) null);
|
|
// searchScrollPane = new JScrollPane((Component) null);
|
|
|
|
|
|
|
|
- indexPanelC = new JPanel();
|
|
|
|
|
- searchScrollPaneDj = new JScrollPane(indexPanelC);
|
|
|
|
|
- indexPanelC.setLayout(null);
|
|
|
|
|
|
|
+ indexPanelC = new JPanel(new BorderLayout());
|
|
|
|
|
|
|
|
- tabbedPane.addTab("开班点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPaneDj, null);
|
|
|
|
|
|
|
+ tabbedPane.addTab("开班点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), indexPanelC, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
// ========== 工作记录 Tab(改造:当前工位Tab + 所有工位Tab) ==========
|
|
// ========== 工作记录 Tab(改造:当前工位Tab + 所有工位Tab) ==========
|