jingbo 3 天之前
父节点
当前提交
9e3409583c
共有 3 个文件被更改,包括 12 次插入9 次删除
  1. 6 5
      src/com/mes/ui/LoginFrame.java
  2. 4 2
      src/com/mes/ui/MesClient.java
  3. 2 2
      src/resources/config/config.properties

+ 6 - 5
src/com/mes/ui/LoginFrame.java

@@ -165,23 +165,24 @@ public class LoginFrame extends JFrame {
                     MesClient.getUser();
 
 
-                    String url1 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProductRecord/work" + "?oprno=OP310B" + "&lineSn=" + Config.line_sn;
+                    String url1 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProductRecord/work" + "?oprno=OP400A" + "&lineSn=" + Config.line_sn;
                     MesWebView jfxPanel = new MesWebView(url1);
                     jfxPanel.setSize(990, 550);
                     MesClient.indexPanelB.add(jfxPanel);
+                    System.out.println(url1);
 
-                    String url5 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProductRecord/work" + "?oprno=OP320" + "&lineSn=" + Config.line_sn;
+                    String url5 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProductRecord/work" + "?oprno=OP400B" + "&lineSn=" + Config.line_sn;
                     MesWebView webView5 = new MesWebView(url5);
                     webView5.setSize(990, 550);
                     MesClient.panel5.add(webView5);
+                    System.out.println(url5);
 
-
-                    String url2 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProcessCheckRecord/ulist?ucode=" + user_id + "&oprno=OP320" + "&lineSn=" + Config.line_sn;
+                    String url2 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProcessCheckRecord/ulist?ucode=" + user_id + "&oprno=OP400" + "&lineSn=" + Config.line_sn;
                     MesWebView jfxPanel2 = new MesWebView(url2);
                     jfxPanel2.setSize(990, 550);
                     MesClient.indexPanelC.add(jfxPanel2);
 
-                    String url4 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProcessUserRecord/submitView?oprno=OP320";
+                    String url4 = "http://" + Config.server_ip + ":8980/js/a/mes/mesProcessUserRecord/submitView?oprno=OP400";
                     MesWebView webView4 = new MesWebView(url4);
                     webView4.setSize(990, 550);
                     MesClient.panel4.removeAll();

+ 4 - 2
src/com/mes/ui/MesClient.java

@@ -798,12 +798,14 @@ public class MesClient extends JFrame {
         indexPanelB = new JPanel();
         searchScrollPane = new JScrollPane(indexPanelB);
         indexPanelB.setLayout(null);
-        tabbedPane.addTab("OP310B记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, null);
+        //获取配置文件mes.gw_1值
+
+        tabbedPane.addTab(Config.gw_1+"记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), searchScrollPane, null);
 
         panel5 = new JPanel();
         scrollPane5 = new JScrollPane(panel5);
         panel5.setLayout(null);
-        tabbedPane.addTab("OP320记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), scrollPane5, null);
+        tabbedPane.addTab(Config.gw_2+"记录", new ImageIcon(MesClient.class.getResource("/bg/menu_data_preprocess.png")), scrollPane5, null);
 
         // 员工工作记录
         panel4 = new JPanel();

+ 2 - 2
src/resources/config/config.properties

@@ -8,5 +8,5 @@ mes.heart_beat_cycle=60
 
 mes.line_sn=XT
 
-portName1=COM7
-portName2=COM14
+portName1=COM8
+portName2=COM9