merge

public/index.html

@@ -27,9 +27,9 @@
   <script type="text/javascript">
     // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
   //  window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
-   window.staticHost = 'http://43.138.50.94:9600/'; 
+  //  window.staticHost = 'http://43.138.50.94:9600/'; 
     // window.staticHost = 'http://192.168.0.103:9600/';
-    // window.staticHost = 'http://192.168.2.124:9600/';
+    window.staticHost = 'http://192.168.2.124:9600';
 
     // document.title = "hello";
   </script>

public/static/views/onlineShareExcel.html

@@ -173,9 +173,9 @@
                         toolBar += '<button id="closeExcel" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;">返回</button><button id="fullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;">全屏显示</button><button id="exitFullScreen" class="btn btn-primary" style="padding:3px 6px;font-size: 12px;margin-right: 10px;display:none">退出全屏</button>';
                         var eJson = res.body.excelJson;
                         console.log(7);
-                        // var cellData = luckysheet.transToCellData(eJson[0].data);
+                        var cellData = luckysheet.transToCellData(eJson[0].data);
                         console.log(8);
-                        // eJson[0].celldata = cellData;
+                        eJson[0].celldata = cellData;
                         console.log(res.body.excelJson);
                         initExcel(res.body.excelJson, '', excelId);
                     }
@@ -205,17 +205,17 @@
                         showsheetbar: false, // 底部sheet显示/隐藏
                         loadUrl:
                             window.location.protocol +
-                            "//43.138.50.94:7777" +
+                            "//192.168.2.124:7777" +
                             "/sheet/worksheet/" +
                             ids,
                         loadSheetUrl:
                             window.location.protocol +
-                            "//43.138.50.94:7777" +
+                            "//192.168.2.124:7777" +
                             "/sheet/loadsheet/" +
                             ids,
                         updateUrl:
                             "ws://" +
-                            "//43.138.50.94:7777" +
+                            "//192.168.2.124:7777" +
                             "/ws/" +
                             JSON.parse(window.sessionStorage.userInfo).loginName +
                             "/" +