13 Achegas e3fe9c1e9b ... c47d221a7a

Autor SHA1 Mensaxe Data
  17491 c47d221a7a 首页新增Tab"绑定关系" hai 4 días
  17491 182ea67ed5 首页增加"绑定关系"Tab hai 4 días
  wangxichen 45439a25b6 关闭客户端和复位时,加入确认按键 hai 4 días
  wangxichen 1c8c2b28c6 优化 hai 4 días
  wangxichen acac63416d 优化 hai 4 días
  wangxichen 7e1e7f86ce 优化 hai 5 días
  wangxichen bc4c317142 手动模式 hai 5 días
  wangxichen 53a1d1f8c7 UI编辑 hai 5 días
  wangxichen 3532806a5c UI编辑 hai 6 días
  wangxichen e631a2cd14 优化 hai 6 días
  wangxichen 6a5fb39521 Merge remote-tracking branch 'origin/master' hai 6 días
  wangxichen d0b4cf0443 V2通讯协议+镭雕工位(OP040)对接新供应商镭雕软件 hai 6 días
  wangxichen 2eb319980b 初始化 hai 2 semanas
Modificáronse 2 ficheiros con 15 adicións e 0 borrados
  1. 7 0
      src/com/mes/ui/LoginFarme.java
  2. 8 0
      src/com/mes/ui/MesClient.java

+ 7 - 0
src/com/mes/ui/LoginFarme.java

@@ -201,6 +201,13 @@ public class LoginFarme extends JFrame {
                         MesClient.indexPanelB.add(MesClient.jfxPanel);
                     }
 
+                    if(MesClient.jfxPanel3 == null){
+                        String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProductLaser/list?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn+"#钢印码和客户码对应关系";
+                        MesClient.jfxPanel3 = new MesWebView(url);
+                        MesClient.jfxPanel3.setSize(990, 550);
+                        MesClient.indexPanelD.add(MesClient.jfxPanel3);
+                    }
+
                     if(MesClient.jfxPanel2 == null){
                         String url = "http://"+ MesClient.mes_server_ip+":8980/js/a/mes/mesProcessCheckRecord/ulist?__sid="+MesClient.sessionid+"&oprno="+MesClient.mes_gw+"&lineSn="+MesClient.mes_line_sn;
                         MesClient.jfxPanel2 = new MesWebView(url);

+ 8 - 0
src/com/mes/ui/MesClient.java

@@ -94,6 +94,8 @@ public class MesClient extends JFrame {
     public static MesWebView jfxPanel = null;
     public static JPanel indexPanelC;
     public static MesWebView jfxPanel2 = null;
+    public static JPanel indexPanelD;
+    public static MesWebView jfxPanel3 = null;
     public static MesRadio mesRadioHj;
 
     public static JTable table;
@@ -1094,6 +1096,12 @@ public class MesClient extends JFrame {
 
 		tabbedPane.addTab("工作记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, null);
 
+        indexPanelD = new JPanel();
+        JScrollPane relationScrollPane = new JScrollPane(indexPanelD);
+        indexPanelD.setLayout(null);
+
+        tabbedPane.addTab("绑定关系", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), relationScrollPane, null);
+
         VisualUiEditorPanel visualEditorPanel = new VisualUiEditorPanel(indexPanelA);
         final JDialog visualEditorToolWindow = new JDialog(this, false);
         visualEditorToolWindow.setTitle("UI");