update

Dockerfile

@@ -4,7 +4,9 @@ COPY . ConstructionCost
 
 WORKDIR ConstructionCost
 
-RUN cnpm install 
+RUN cnpm install
+
+RUN gulp build
 
 EXPOSE 6060
 

Dockerfile_qa

@@ -6,6 +6,8 @@ WORKDIR ConstructionCost
 
 RUN cnpm install
 
+RUN gulp build
+
 EXPOSE 6060
 
 ENV NODE_ENV=qa

config/gulpConfig.js

@@ -26,5 +26,83 @@ module.exports = {
         'public/web/common_ajax.js',
         'web/building_saas/pm/js/**/*.js',
         'lib/ztree/*.js'
+    ],
+    main_css:[
+        'lib/ztree/css/zTreeStyle.css',
+        'lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css',
+        'lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css',
+        'lib/jquery-contextmenu/jquery.contextMenu.css'
+    ],
+    main_jspaths:[
+        'lib/JSExpressionEval_src/*.js',
+        '!lib/JSExpressionEval_src/JsHashMap.js',
+        'lib/jquery-contextmenu/*.js',
+        'lib/lodash/lodash.js',
+        'web/building_saas/glj/js/project_glj.js',
+        'web/building_saas/glj/js/composition.js',
+        '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',
+        'public/web/uuid.js',
+        'public/web/sheet/sheet_common.js',
+        'web/building_saas/main/js/models/calc_program.js',
+        'web/building_saas/main/js/views/calc_program_manage.js',
+        'public/web/common_ajax.js',
+        'public/web/url_util.js',
+        'public/web/number_util.js',
+        'public/web/sheet/sheet_common.js',
+       // 'lib/ztree/*.js',
+        'lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1',
+       // 'lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js',
+       // "lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js",
+      //  'lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js',
+        'web/building_saas/main/js/models/main_consts.js',
+        'web/building_saas/main/js/models/project.js',
+        'web/building_saas/main/js/models/bills.js',
+        'web/building_saas/main/js/models/ration.js',
+        'web/building_saas/main/js/models/glj.js',
+        'web/building_saas/main/js/models/project_glj.js',
+        'web/building_saas/main/js/models/fee_rate.js',
+        'web/building_saas/main/js/models/ration_glj.js',
+        'web/building_saas/main/js/models/ration_coe.js',
+        'web/building_saas/main/js/models/ration_ass.js',
+        'web/building_saas/main/js/models/volume_price.js',
+        'public/web/id_tree.js',
+        'test/tmp_data/test_ration_calc/ration_calc_base.js',
+        'web/building_saas/main/js/models/cache_tree.js',
+        'web/building_saas/main/js/calc/calc_fees.js',
+        'web/building_saas/main/js/calc/ration_calc.js',
+        'web/building_saas/main/js/calc/bills_calc.js',
+        'public/calc_util.js',
+        'public/web/tree_sheet/tree_sheet_controller.js',
+        'public/web/tree_sheet/tree_sheet_helper.js',
+        'public/web/sheet/sheet_data_helper.js',
+        'web/building_saas/main/js/views/main_tree_col.js',
+        'web/building_saas/main/js/views/project_info.js',
+        'web/building_saas/main/js/views/project_view.js',
+        'web/building_saas/main/js/views/options_view.js',
+        'web/building_saas/main/js/main_ajax.js',
+        'web/building_saas/main/js/main.js',
+        'web/building_saas/main/js/controllers/project_controller.js',
+        'web/building_saas/main/js/views/side_tools.js',
+        'web/building_saas/main/js/views/std_bills_lib.js',
+        'web/building_saas/main/js/views/std_ration_lib.js',
+        'web/building_saas/main/js/models/quantity_detail.js',
+        'web/building_saas/main/js/views/glj_view_contextMenu.js',
+        'web/building_saas/main/js/views/calc_program_view.js',
+        'public/web/treeDataHelper.js',
+        'public/web/ztree_common.js',
+        'public/web/rpt_tpl_def.js',
+        'web/building_saas/main/js/rpt/rpt_main.js',
+        'web/building_saas/main/js/rpt/rpt_cfg_const.js',
+        'web/building_saas/main/js/views/character_content_view.js',
+        'web/building_saas/main/js/views/glj_view.js',
+        'web/building_saas/main/js/views/sub_view.js',
+        'web/building_saas/main/js/views/fee_rate_view.js',
+        'web/building_saas/main/js/views/sub_fee_rate_views.js',
+        'web/building_saas/main/js/views/project_property_labour_coe_view.js'
     ]
-}
+}
+

gulpfile.js

@@ -30,7 +30,7 @@ gulp.task('minify', function (){
     if(taskObject.jspaths){
         return gulp.src(taskObject.jspaths)
             .pipe($.plumber())
-            .pipe(uglify())
+           // .pipe(uglify())
             .pipe($.concat(taskObject.concatName+"."+version+".js"))
             .pipe(gulp.dest(taskObject.scriptsDest));
     }
@@ -44,7 +44,7 @@ gulp.task('copy',function () {
             .pipe(gulp.dest(taskObject.htmlDest));
 })
 
-gulp.task('inject',['copy','minify','css'], function () {
+gulp.task('inject',['minify','css'], function () {
     var target = gulp.src(taskObject.htmlDest+'/'+taskObject.htmlName);
     var sources = gulp.src(taskObject.injectList, {read: false});
 
@@ -131,9 +131,18 @@ gulp.task('main',function () {
         jspaths:main_jspaths,
         pm_csspaths:main_csspaths,
         concatName:'main.all.min',
+        cssDest:'web/dest/css',
+        srcHtml:'web/src/html/main/main.html',
+        htmlDest:'web/building_saas/main/html',
+        htmlName:'main.html',
+        injectList:['web/dest/scripts/main.all.min.'+version+'.js',
+            'web/dest/css/common.all.min.'+version+'.css',
+            'web/dest/css/main.all.min.'+version+'.css']
     }
     task_init(options);
     runSequence('inject','htmlmin');
-
 })
 
+gulp.task('build',['common'],function () {
+    runSequence('header',['login','pm','main']);
+});

modules/ration_glj/facade/ration_glj_facade.js

@@ -55,29 +55,52 @@ async function getQuantityByProjectGLJ(condition) {
         ]
     }
 
+    let results = await  ration_glj.find(query,['projectGLJID','quantity','rationID'],{sort: {projectGLJID: 1}});
+    let rationList = _.uniq(_.map(results,'rationID'));
 
-    let results = await   ration_glj.find(query,['projectGLJID','quantity']);
-    return combineQuantity(results);
+    let rationQuery={
+        $and:[
+            {'projectID':condition.projectID},
+            {'ID':{$in:rationList}},
+            {'deleteInfo': null}
+        ]
+    }
+    let rations = await ration.find(rationQuery,['ID','quantity']);
+    //deleteInfo: null
+    console.log("rationList-----");
+    console.log(rationList);
+
+    return combineQuantity(results,rations);
 }
 
-function combineQuantity(results) {
-    var resultMap = {};
+function combineQuantity(results,rations) {
+    let resultList=[];
     _.forEach(results,function (data) {
-        if(resultMap.hasOwnProperty(data.projectGLJID)){
+        let tmp = {
+            projectGLJID:data.projectGLJID,
+            quantity: data.quantity
+        }
+        let ration=_.find(rations,{ID:data.rationID});
+        if(ration){
+            tmp.rationID=ration.ID;
+            tmp.rationQuantity=ration.quantity?Number(ration.quantity):undefined;
+        }
+        resultList.push(tmp);
+      /*  if(resultMap.hasOwnProperty(data.projectGLJID)){
             resultMap[data.projectGLJID] += data.quantity;
         }else {
             resultMap[data.projectGLJID] = data.quantity;
-        }
-    })
+        }*/
+    });
 
-    var resultList =[];
+ /*   var resultList =[];
     for(let key in resultMap){
        let newObject = {
             'projectGLJID':key,
             'quantity':resultMap[key]
         }
         resultList.push(newObject)
-    }
+    }*/
     return resultList;
 }
 

web/building_saas/fee_rates/fee_rate.html

@@ -165,8 +165,4 @@
 
 
 </body>
-
-<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>
 </html>

web/building_saas/glj/html/glj_index.html

@@ -119,8 +119,3 @@
         </div>
     </div>
 </div>
-<script type="text/javascript" src="/web/building_saas/glj/js/project_glj.js"></script>
-<script type="text/javascript" src="/web/building_saas/glj/js/composition.js"></script>
-<script type="text/javascript" src="/web/building_saas/glj/js/common_spread.js"></script>
-<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>

web/building_saas/main/html/calc_program_manage.html

@@ -87,8 +87,5 @@
     </div>
 </body>
 
-<script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
-<script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
-<script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
 
 </html>

web/building_saas/main/html/main.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>造价书-Smartcost</title>
+    <!-- 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="/lib/font-awesome/font-awesome.min.css">
@@ -16,6 +17,7 @@
     <link rel="stylesheet" href="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css">
     <!-- jquery.contextmenu -->
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
+    <!-- endinject -->
     <script>
         // 这里的变量供页面调用
         var userAccount = '<%- userAccount %>';
@@ -556,13 +558,40 @@
         </div>
     </div>
     <!-- JS. -->
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
+    <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+
+    <script src="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js" type="text/javascript"></script>
+    <!--<script src="/lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js" type="text/javascript"></script>-->
+    <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>
+
+
+
+    <!-- inject:js -->
+
+    <script type="text/javascript" src="/web/building_saas/glj/js/project_glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/glj/js/composition.js"></script>
+    <script type="text/javascript" src="/web/building_saas/glj/js/common_spread.js"></script>
+    <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>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/calc_program.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
+
+    <!-- JS. -->
     <script src="/lib/jquery/jquery.min.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
-    <script type="text/javascript">
-        autoFlashHeight();
-    </script>
+
     <!--expression calculate-->
     <script src="/lib/JSExpressionEval_src/Date.js"></script>
     <script src="/lib/JSExpressionEval_src/Stack.js"></script>
@@ -578,15 +607,9 @@
     <script type="text/javascript" src="/public/web/number_util.js"></script>
     <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
     <!--报表 zTree -->
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
+
     <!-- SpreadJs -->
-    <script type="text/javascript" src="/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
-    <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-    <script src="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js" type="text/javascript"></script>
-    <!--<script src="/lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js" type="text/javascript"></script>-->
-    <script src="/lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js" type="text/javascript"></script>
-    <script>GC.Spread.Views.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
+
     <!--<script src="/lib/spreadjs/views/locale/gc.spread.views.dataview.locale.zh-CN.10.0.0.min.js" type="text/javascript"></script>-->
     <!-- Model -->
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
@@ -602,7 +625,7 @@
     <script type="text/javascript" src="/web/building_saas/main/js/models/volume_price.js"></script>
 
     <script type="text/javascript" src="/public/web/id_tree.js"></script>
-	<script type="text/javascript" src="/test/tmp_data/test_ration_calc/ration_calc_base.js"></script>
+    <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/cache_tree.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/calc/calc_fees.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/calc/ration_calc.js"></script>
@@ -639,16 +662,12 @@
     <script type="text/javascript" src="/web/building_saas/main/js/views/fee_rate_view.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_fee_rate_views.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_labour_coe_view.js"></script>
+    <!-- endinject -->
 
-
-   <!-- <script src="/web/building_saas/fee_rates/fee_rate.js"></script>-->
     <script type="text/javascript">
-        /* autoFlashHeight();
-        loadStdFeeRateLibNames(region);*/
-        //loadProjectFeeRates(feeRateFileID);
+        autoFlashHeight();
     </script>
-
-
+    
     <script src="/public/debug.js"></script>
 
     <SCRIPT type="text/javascript">

web/building_saas/pm/html/project-management.html

@@ -6,11 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>项目管理-Smartcost</title>
+    <!-- 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="/lib/font-awesome/font-awesome.min.css">
     <!--zTree-->
     <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
+    <!-- endinject -->
 
     <script>
         // 这里的变量供页面调用
@@ -493,6 +495,7 @@
     </div>
 </div>
 <!-- JS. -->
+<!-- inject:js -->
 <script src="/lib/jquery/jquery.min.js"></script>
 <script src="/lib/tether/tether.min.js"></script>
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
@@ -505,118 +508,8 @@
 <!-- zTree -->
 <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
-<SCRIPT type="text/javascript">
-    <!--
-    var setting = {	};
+<!-- endinject -->
 
-    var zNodes =[
-        { name:"父节点1 - 展开", open:true,
-            children: [
-                { name:"父节点11 - 折叠",
-                    children: [
-                        { name:"叶子节点111"},
-                        { name:"叶子节点112"},
-                        { name:"叶子节点113"},
-                        { name:"叶子节点114"}
-                    ]},
-                { name:"父节点12 - 折叠",
-                    children: [
-                        { name:"叶子节点121"},
-                        { name:"叶子节点122"},
-                        { name:"叶子节点123"},
-                        { name:"叶子节点124"}
-                    ]},
-                { name:"父节点13 - 没有子节点", isParent:true}
-            ]},
-        { name:"父节点2 - 折叠",
-            children: [
-                { name:"父节点21 - 展开", open:true,
-                    children: [
-                        { name:"叶子节点211"},
-                        { name:"叶子节点212"},
-                        { name:"叶子节点213"},
-                        { name:"叶子节点214"}
-                    ]},
-                { name:"父节点22 - 折叠",
-                    children: [
-                        { name:"叶子节点221"},
-                        { name:"叶子节点222"},
-                        { name:"叶子节点223"},
-                        { name:"叶子节点224"}
-                    ]},
-                { name:"父节点23 - 折叠",
-                    children: [
-                        { name:"叶子节点231"},
-                        { name:"叶子节点232"},
-                        { name:"叶子节点233"},
-                        { name:"叶子节点234"}
-                    ]}
-            ]},
-        { name:"父节点3 - 没有子节点", isParent:true}
-
-    ];
-
-    $(document).ready(function(){
-        $.fn.zTree.init($("#treeDemo"), setting, zNodes);
-    });
-    //-->
-</SCRIPT>
-<SCRIPT type="text/javascript">
-    <!--
-    var setting = {	};
-
-    var zNodes =[
-        { name:"父节点1 - 展开", open:true,
-            children: [
-                { name:"父节点11 - 折叠",
-                    children: [
-                        { name:"叶子节点111"},
-                        { name:"叶子节点112"},
-                        { name:"叶子节点113"},
-                        { name:"叶子节点114"}
-                    ]},
-                { name:"父节点12 - 折叠",
-                    children: [
-                        { name:"叶子节点121"},
-                        { name:"叶子节点122"},
-                        { name:"叶子节点123"},
-                        { name:"叶子节点124"}
-                    ]},
-                { name:"父节点13 - 没有子节点", isParent:true}
-            ]},
-        { name:"父节点2 - 折叠",
-            children: [
-                { name:"父节点21 - 展开", open:true,
-                    children: [
-                        { name:"叶子节点211"},
-                        { name:"叶子节点212"},
-                        { name:"叶子节点213"},
-                        { name:"叶子节点214"}
-                    ]},
-                { name:"父节点22 - 折叠",
-                    children: [
-                        { name:"叶子节点221"},
-                        { name:"叶子节点222"},
-                        { name:"叶子节点223"},
-                        { name:"叶子节点224"}
-                    ]},
-                { name:"父节点23 - 折叠",
-                    children: [
-                        { name:"叶子节点231"},
-                        { name:"叶子节点232"},
-                        { name:"叶子节点233"},
-                        { name:"叶子节点234"}
-                    ]}
-            ]},
-        { name:"父节点3 - 没有子节点", isParent:true}
-
-    ];
-
-    $(document).ready(function(){
-        $.fn.zTree.init($("#treeDemo2"), setting, zNodes);
-    });
-    //-->
-</SCRIPT>
 </body>
 <script type="text/javascript">
     autoFlashHeight();

web/common/html/header.html

@@ -57,6 +57,8 @@
         </div>
     </div>
 </div>
+<!-- inject:js -->
 <script src="/lib/jquery/jquery.min.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/moment.min.js"></script>
-<script type="text/javascript" src="/web/building_saas/js/message.js"></script>
+<script type="text/javascript" src="/web/building_saas/js/message.js"></script>
+<!-- endinject -->

web/users/html/login.html

@@ -5,11 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>用户登录-Smartcost</title>
+    <!-- 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="/lib/font-awesome/font-awesome.min.css">
-    <script src="/lib/jquery/jquery.min.js"></script>
-    <script src="/public/web/url_util.js"></script>
+    <!-- endinject -->
 </head>
 <body>
     <div class="container">
@@ -69,10 +69,13 @@
         </div>
     </div>
     <!-- JS. -->
-
+    <!-- inject:js -->
+    <script src="/lib/jquery/jquery.min.js"></script>
+    <script src="/public/web/url_util.js"></script>
     <script src="/lib/tether/tether.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
+    <!-- endinject -->
 </body>
 
 </html>