|
@@ -183,6 +183,8 @@ public class MesClient extends JFrame {
|
|
|
public static MesRadio mesRadioHj;
|
|
public static MesRadio mesRadioHj;
|
|
|
public static JPanel indexPanelC;
|
|
public static JPanel indexPanelC;
|
|
|
public static MesWebView jfxPanel2 = null;
|
|
public static MesWebView jfxPanel2 = null;
|
|
|
|
|
+ public static JPanel indexPanelDjB;
|
|
|
|
|
+ public static MesWebView jfxPanelDjB = null;
|
|
|
|
|
|
|
|
// 开班点检(本地UI,不再加载网页)
|
|
// 开班点检(本地UI,不再加载网页)
|
|
|
public static JLabel[] dj_a_lamps = new JLabel[6];
|
|
public static JLabel[] dj_a_lamps = new JLabel[6];
|
|
@@ -303,24 +305,18 @@ public class MesClient extends JFrame {
|
|
|
+ sessionid + "&oprno=" + oprno + "&lineSn=" + mes_line_sn;
|
|
+ sessionid + "&oprno=" + oprno + "&lineSn=" + mes_line_sn;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- /** 开班点检网页:A/B 面各一个 ulist(OP040A、OP040B) */
|
|
|
|
|
|
|
+ /** 开班点检网页:A/B 面各一个顶层 Tab(铺满可用区域) */
|
|
|
public static void initProcessCheckWebViews(){
|
|
public static void initProcessCheckWebViews(){
|
|
|
if(jfxPanel2 != null || indexPanelC == null){
|
|
if(jfxPanel2 != null || indexPanelC == null){
|
|
|
return;
|
|
return;
|
|
|
}
|
|
}
|
|
|
- JTabbedPane djTabs = new JTabbedPane();
|
|
|
|
|
- djTabs.setBounds(0, 0, 990, 550);
|
|
|
|
|
|
|
+ jfxPanel2 = new MesWebView(buildProcessCheckUlistUrl(getOprno030A()));
|
|
|
|
|
+ indexPanelC.add(jfxPanel2, BorderLayout.CENTER);
|
|
|
|
|
|
|
|
- MesWebView panelA = new MesWebView(buildProcessCheckUlistUrl(getOprno030A()));
|
|
|
|
|
- panelA.setSize(990, 550);
|
|
|
|
|
- djTabs.addTab("A面点检 " + getOprno030A(), panelA);
|
|
|
|
|
-
|
|
|
|
|
- MesWebView panelB = new MesWebView(buildProcessCheckUlistUrl(getOprno030B()));
|
|
|
|
|
- panelB.setSize(990, 550);
|
|
|
|
|
- djTabs.addTab("B面点检 " + getOprno030B(), panelB);
|
|
|
|
|
-
|
|
|
|
|
- indexPanelC.add(djTabs);
|
|
|
|
|
- jfxPanel2 = panelA;
|
|
|
|
|
|
|
+ if(indexPanelDjB != null){
|
|
|
|
|
+ jfxPanelDjB = new MesWebView(buildProcessCheckUlistUrl(getOprno030B()));
|
|
|
|
|
+ indexPanelDjB.add(jfxPanelDjB, BorderLayout.CENTER);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
public static String getDisplayOprno030A(){
|
|
public static String getDisplayOprno030A(){
|
|
@@ -1215,6 +1211,7 @@ public class MesClient extends JFrame {
|
|
|
toolBar.add(space_4);
|
|
toolBar.add(space_4);
|
|
|
|
|
|
|
|
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("Microsoft YaHei UI", Font.BOLD, 22));
|
|
tabbedPane.setFont(new Font("Microsoft YaHei UI", Font.BOLD, 22));
|
|
|
contentPane.add(tabbedPane);
|
|
contentPane.add(tabbedPane);
|
|
@@ -1523,12 +1520,13 @@ public class MesClient extends JFrame {
|
|
|
indexPanelGz.setLayout(null);
|
|
indexPanelGz.setLayout(null);
|
|
|
|
|
|
|
|
|
|
|
|
|
- indexPanelC = new JPanel();
|
|
|
|
|
- searchScrollPaneDj = new JScrollPane(indexPanelC);
|
|
|
|
|
- indexPanelC.setLayout(null);
|
|
|
|
|
|
|
+ indexPanelC = new JPanel(new BorderLayout());
|
|
|
// initStartShiftCheckPanel(indexPanelC);
|
|
// initStartShiftCheckPanel(indexPanelC);
|
|
|
|
|
|
|
|
- tabbedPane.addTab("开班点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPaneDj, null);
|
|
|
|
|
|
|
+ tabbedPane.addTab("A面点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), indexPanelC, null);
|
|
|
|
|
+
|
|
|
|
|
+ indexPanelDjB = new JPanel(new BorderLayout());
|
|
|
|
|
+ tabbedPane.addTab("B面点检", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), indexPanelDjB, null);
|
|
|
|
|
|
|
|
|
|
|
|
|
indexPanelB = new JPanel();
|
|
indexPanelB = new JPanel();
|