merge

public/static/views/onlineShareExcel.html

@@ -205,14 +205,14 @@
                         showsheetbar: false, // 底部sheet显示/隐藏
                         loadUrl:
                             window.location.protocol +
+                            "//192.168.2.124:9600" +
+                            "/market/cOnlineExcel/worksheet/" +
+                            ids+'/'+JSON.parse(window.sessionStorage.userInfo).loginNo,
+                        loadSheetUrl:
+                            window.location.protocol +
                             "//192.168.2.124:7777" +
-                            "/sheet/worksheet/" +
+                            "/sheet/loadsheet/" +
                             ids,
-                        // loadSheetUrl:
-                        //     window.location.protocol +
-                        //     "//192.168.2.124:7777" +
-                        //     "/sheet/loadsheet/" +
-                        //     ids,
                         updateUrl:
                             "ws://" +
                             "//192.168.2.124:7777" +