Browse Source

bug fixed

zhangweicheng 7 years ago
parent
commit
4247bc54de
2 changed files with 5 additions and 6 deletions
  1. 2 2
      config/gulpConfig.js
  2. 3 4
      web/building_saas/main/html/main.html

+ 2 - 2
config/gulpConfig.js

@@ -56,8 +56,8 @@ module.exports = {
         'web/building_saas/glj/js/common_spread.js',
         'web/building_saas/glj/js/composition_spread.js',
         'web/building_saas/glj/js/project_glj_spread.js',
-        //'web/building_saas/glj/js/socket.io.slim.js',
-        //'public/web/socket/connection.js',
+        'web/building_saas/glj/js/socket.io.slim.js',
+        'public/web/socket/connection.js',
         'public/web/uuid.js',
         'public/web/sheet/sheet_common.js',
         'web/building_saas/main/js/models/calc_program.js',

+ 3 - 4
web/building_saas/main/html/main.html

@@ -1055,9 +1055,6 @@
         <script src="/lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js" type="text/javascript"></script>
         <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
         <script>GC.Spread.Views.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-         <script src="/web/building_saas/glj/js/socket.io.slim.js"></script>
-         <script src="/public/web/socket/connection.js"></script>
-
         <!-- inject:js -->
         <!--<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>-->
         <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
@@ -1069,6 +1066,8 @@
         <script type="text/javascript" src="/web/building_saas/glj/js/composition_spread.js"></script>
         <script type="text/javascript" src="/web/building_saas/glj/js/project_glj_spread.js"></script>
 
+        <script src="/web/building_saas/glj/js/socket.io.slim.js"></script>
+        <script src="/public/web/socket/connection.js"></script>
         <script src="/public/web/uuid.js"></script>
 
         <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
@@ -1176,7 +1175,7 @@
         <!-- endinject -->
 
         <script type="text/javascript">
-            autoFlashHeight();
+
         </script>
 
         <SCRIPT type="text/javascript">