zhongzewei 7 年之前
父节点
当前提交
60102cf0aa
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 3 1
      config/gulpConfig.js
  2. 3 3
      web/building_saas/main/html/main.html

+ 3 - 1
config/gulpConfig.js

@@ -17,7 +17,9 @@ module.exports = {
         'public/web/commonAlert.js'
     ],
     common_css:[
+        'lib/jquery-ui/jquery-ui.css',
         'lib/bootstrap/css/bootstrap.min.css',
+        'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
         'web/building_saas/css/main.css',
         'web/building_saas/css/custom.css',
         'lib/font-awesome/font-awesome.min.css'
@@ -48,7 +50,7 @@ module.exports = {
         'lib/ztree/css/zTreeStyle.css',
         //'lib/jquery-ui/jquery-ui.css',
         //'lib/spreadjs/sheets/css/gc.spread.sheets.sc.css',
-        //'lib/jquery-contextmenu/jquery.contextMenu.css'
+        'lib/jquery-contextmenu/jquery.contextMenu.css'
     ],
     main_jspaths:[
         'lib/JSExpressionEval_src/*.js',

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

@@ -7,16 +7,16 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横云计价</title>
 
+    <!-- inject:css -->
+    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">
-
-    <!-- inject:css -->
-    <!--<link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">-->
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/web/building_saas/css/custom.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
+
     <!--zTree-->
     <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
     <!--SpreadJs-->