merge

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);
                     }