用户登录时记录时间和使用编办版本

modules/all_models/user.js

@@ -63,10 +63,12 @@ let schema = {
         default: -1
     },
     // 最后登录时间
-    last_login: {
+    latest_login: {
         type: Number,
         default: 0
     },
+    //最近使用编办
+    latest_used:String,
     create_time: Number,
     upgrade_list:[upgrade],
     user_type:{

modules/common/helper/mongoose_helper.js

@@ -221,6 +221,7 @@ class MongooseHelper {
         if (condition === null || condition._id === undefined) {
             return condition;
         }
+        condition._id = condition._id.toString();
         let result = mongoose.Types.ObjectId(condition._id);
         condition._id = result;
 

modules/users/controllers/boot_controller.js

@@ -29,8 +29,8 @@ class BootController extends BaseController {
         if (sessionCompilation === undefined && compilationId !== '') {
             let compilationModel = new CompilationModel();
             let compilationData = await compilationModel.getCompilationById(compilationId);
-
             request.session.sessionCompilation = compilationData;
+            if(sessionUser.latest_used !== compilationId) userModel.updateLatestUsed(sessionUser.id,compilationId);
         }
 
         // 判断是否已填写信息

modules/users/controllers/login_controller.js

@@ -90,6 +90,7 @@ class LoginController {
                 preferenceSetting.select_version !== '') {
                 let compilationData = await compilationModel.getCompilationById(preferenceSetting.select_version);
                 request.session.sessionCompilation = compilationData;
+                if(request.session.sessionUser.latest_used !== preferenceSetting.select_version) await userModel.updateLatestUsed(request.session.sessionUser.id,preferenceSetting.select_version);
             }
 
         } catch (error) {

modules/users/models/user_model.js

@@ -91,6 +91,7 @@ class UserModel extends BaseModel {
         let userDataFromDb2 = await this.findDataBySsoId(userData.ssoId);
         let userDataFromDb = await this.findDataByName(userData.username);  //后面新增的账号可淘汰这方法，当前使用是为了兼容旧的账号
         let result = false;
+        userData.latest_login = new Date().getTime();
         if (userDataFromDb === null && userDataFromDb2 === null) {
             // 不存在用户则入库
             this.setScene();//恢复场景，用户有可能公司real_name等信息为空，不能设置为必填
@@ -103,7 +104,8 @@ class UserModel extends BaseModel {
             let UpdateData = {
                 email : userData.email,
                 mobile : userData.mobile,
-                ssoId : userData.ssoId
+                ssoId : userData.ssoId,
+                latest_login:userData.latest_login
             };
             let updateResult = await this.updateUser(condition,UpdateData);
             if (updateResult.ok === 1) {
@@ -113,6 +115,7 @@ class UserModel extends BaseModel {
         }
         request.session.sessionUser.id = userDataFromDb._id;
         request.session.sessionUser.real_name = userDataFromDb.real_name;
+        request.session.sessionUser.latest_used = userDataFromDb.latest_used;//设置最近使用的编办
 
         return result;
     }
@@ -196,17 +199,24 @@ class UserModel extends BaseModel {
         return this.db.create(insertData);
     }
 
+    //更新最近使用编办ID
+    async updateLatestUsed(userID,compilationID){
+        if(userID && compilationID){
+            return await this.db.update({'_id':userID},{'latest_used':compilationID});
+        }
+    }
+
     /**
      * 更新用户数据
      *
      * @param {object} updateData
      * @return {Promise}
      */
-    updateUser(condition, updateData) {
+    async updateUser(condition, updateData) {
         if (Object.keys(condition).length <= 0 || Object.keys(updateData).length <= 0) {
             return null;
         }
-        return this.db.update(condition, updateData);
+        return await this.db.update(condition, updateData);
     }
 
     async addVersion(condition, versionInfo){

web/building_saas/main/html/main.html

@@ -1455,144 +1455,132 @@
     <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.11.1.2.min.js"></script>
     <script src="/lib/spreadjs/sheets/interop/gc.spread.excelio.11.1.2.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey =  '<%- LicenseKey %>';</script>
-
     <script type="text/javascript" src="/lib/jquery-ui/jquery-ui-datepickerCN.js"></script>
     <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
     <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
-
-        <script src="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js" type="text/javascript"></script>
-        <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 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 src="/lib/js-xlsx/xlsx.core.min.js"></script>
-        <script src="/lib/lz-string/lz-string.min.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>
-        <script type="text/javascript" src="/public/web/common_util.js"></script>
-
-        <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>
-
-        <!--expression calculate-->
-        <script src="/lib/JSExpressionEval_src/Date.js"></script>
-        <script src="/lib/JSExpressionEval_src/Stack.js"></script>
-        <script src="/lib/JSExpressionEval_src/Tokanizer.js"></script>
-        <script src="/lib/JSExpressionEval_src/Evaluator.js"></script>
-        <!--end expression calculate-->
-        <!--<script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
-        <script type="text/javascript" src="/lib/jquery-ui/jquery-ui-datepickerCN.js"></script>
-        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
-        <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>-->
+    <script src="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.min.js" type="text/javascript"></script>
+    <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 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 src="/lib/js-xlsx/xlsx.core.min.js"></script>
+    <script src="/lib/lz-string/lz-string.min.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>
+    <script type="text/javascript" src="/public/web/common_util.js"></script>
+    <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>
+    <!--expression calculate-->
+    <script src="/lib/JSExpressionEval_src/Date.js"></script>
+    <script src="/lib/JSExpressionEval_src/Stack.js"></script>
+    <script src="/lib/JSExpressionEval_src/Tokanizer.js"></script>
+    <script src="/lib/JSExpressionEval_src/Evaluator.js"></script>
+    <!--end expression calculate-->
+    <!--<script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
+    <script type="text/javascript" src="/lib/jquery-ui/jquery-ui-datepickerCN.js"></script>
+    <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.js"></script>
+    <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>-->
         <!--<script type="text/javascript" src="/lib/lodash/lodash.js"></script>-->
     <!-- Common -->
-        <script type="text/javascript" src="/public/web/common_ajax.js"></script>
-        <script type="text/javascript" src="/public/web/url_util.js"></script>
-        <script type="text/javascript" src="/public/web/number_util.js"></script>
-        <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+    <script type="text/javascript" src="/public/web/common_ajax.js"></script>
+    <script type="text/javascript" src="/public/web/url_util.js"></script>
+    <script type="text/javascript" src="/public/web/number_util.js"></script>
+    <script type="text/javascript" src="/public/web/sheet/sheet_common.js"></script>
+    <!-- JS. -->
+    <!--<script src="/lib/popper/popper.min.js"></script>
+    <script src="/lib/bootstrap/bootstrap.min.js"></script>-->
+    <script src="/web/building_saas/js/global.js"></script>
+    <!--报表 zTree -->
 
-        <!-- JS. -->
-        <!--<script src="/lib/popper/popper.min.js"></script>
-        <script src="/lib/bootstrap/bootstrap.min.js"></script>-->
-        <script src="/web/building_saas/js/global.js"></script>
-        <!--报表 zTree -->
-
-        <!-- SpreadJs -->
-
-        <!--<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/project.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/bills.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/ration.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/glj.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/project_glj.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/composition.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/fee_rate.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/ration_glj.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/ration_coe.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/ration_ass.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/ration_installation.js"></script>
-        <!--<script type="text/javascript" src="/web/building_saas/main/js/models/volume_price.js"></script>-->
-        <script type="text/javascript" src="/web/building_saas/main/js/models/labour_coe.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/models/calc_base.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/installation_fee.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
+    <!-- SpreadJs -->
 
-
-
-        <script type="text/javascript" src="/public/web/id_tree.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>-->
-        <!--<script type="text/javascript" src="/web/building_saas/main/js/calc/bills_calc.js"></script>-->
-        <!--<script type="text/javascript" src="/public/calc_util.js"></script>-->
-        <!-- Controller -->
-        <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
-        <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
-        <script type="text/javascript" src="/public/web/sheet/sheet_data_helper.js"></script>
-
-        <!-- view -->
-        <script type="text/javascript" src="/web/building_saas/main/js/views/glj_col.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/main_tree_col.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_info.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/options_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_bills_quantity_decimal.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_decimal_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_basicInfo.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_projFeature.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_indicativeInfo.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_display_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/main_ajax.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/controllers/project_controller.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/controllers/block_controller.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/side_tools.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/std_billsGuidance_lib.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/std_ration_lib.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/models/quantity_detail.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view_contextMenu.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_view.js"></script>
-        <script type="text/javascript" src='/web/building_saas/main/js/views/confirm_modal.js'></script>
-        <script type="text/javascript" src='/web/building_saas/main/js/views/zlfb_view.js'></script>
-        <script type="text/javascript" src='/web/building_saas/main/js/views/installation_fee_view.js'></script>
-        <script type="text/javascript" src='/web/building_saas/main/js/views/project_glj_view.js'></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/importBills.js"></script>
-        <!--报表-->
-        <script type="text/javascript" src="/public/web/rpt_tpl_def.js"></script>
-        <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
-        <script type="text/javascript" src="/public/web/ztree_common.js"></script>
-        <script type="text/javascript" src="/web/building_saas/report/js/rpt_main.js"></script>
-        <script type="text/javascript" src="/web/building_saas/report/js/rpt_cfg_const.js"></script>
-        <script type="text/javascript" src="/web/building_saas/report/js/jpc_output_value_define.js"></script>
-        <script type="text/javascript" src="/web/building_saas/report/js/jpc_output.js"></script>
-        <script type="text/javascript" src="/web/building_saas/report/js/rpt_print.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/character_content_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/zmhs_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/tender_price_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>
-        <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/quantity_edit_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/calc_base_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_labour_coe_view.js"></script>
-        <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/main.js"></script>
-         <script type="text/javascript" src="/public/web/storageUtil.js"></script>
-        <!-- endinject -->
+    <!--<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/project.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/bills.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/project_glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/composition.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/fee_rate.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_coe.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_ass.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/ration_installation.js"></script>
+    <!--<script type="text/javascript" src="/web/building_saas/main/js/models/volume_price.js"></script>-->
+    <script type="text/javascript" src="/web/building_saas/main/js/models/labour_coe.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/models/calc_base.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/installation_fee.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_manage.js"></script>
+    <script type="text/javascript" src="/public/web/id_tree.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>-->
+    <!--<script type="text/javascript" src="/web/building_saas/main/js/calc/bills_calc.js"></script>-->
+    <!--<script type="text/javascript" src="/public/calc_util.js"></script>-->
+    <!-- Controller -->
+    <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_controller.js"></script>
+    <script type="text/javascript" src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
+    <script type="text/javascript" src="/public/web/sheet/sheet_data_helper.js"></script>
+    <!-- view -->
+    <script type="text/javascript" src="/web/building_saas/main/js/views/glj_col.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/main_tree_col.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_info.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/options_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_bills_quantity_decimal.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_decimal_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_basicInfo.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_projFeature.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_indicativeInfo.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_display_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/main_ajax.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/main.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/controllers/project_controller.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/controllers/block_controller.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/side_tools.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/std_billsGuidance_lib.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/std_bills_lib.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/std_ration_lib.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/quantity_detail.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view_contextMenu.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/calc_program_view.js"></script>
+    <script type="text/javascript" src='/web/building_saas/main/js/views/confirm_modal.js'></script>
+    <script type="text/javascript" src='/web/building_saas/main/js/views/zlfb_view.js'></script>
+    <script type="text/javascript" src='/web/building_saas/main/js/views/installation_fee_view.js'></script>
+    <script type="text/javascript" src='/web/building_saas/main/js/views/project_glj_view.js'></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/importBills.js"></script>
+    <!--报表-->
+    <script type="text/javascript" src="/public/web/rpt_tpl_def.js"></script>
+    <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
+    <script type="text/javascript" src="/public/web/ztree_common.js"></script>
+    <script type="text/javascript" src="/web/building_saas/report/js/rpt_main.js"></script>
+    <script type="text/javascript" src="/web/building_saas/report/js/rpt_cfg_const.js"></script>
+    <script type="text/javascript" src="/web/building_saas/report/js/jpc_output_value_define.js"></script>
+    <script type="text/javascript" src="/web/building_saas/report/js/jpc_output.js"></script>
+    <script type="text/javascript" src="/web/building_saas/report/js/rpt_print.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/character_content_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/zmhs_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/tender_price_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>
+    <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/quantity_edit_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/calc_base_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/project_property_labour_coe_view.js"></script>
+    <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/main.js"></script>
+    <script type="text/javascript" src="/public/web/storageUtil.js"></script>
+    <!-- endinject -->
 
     <% if (overWriteUrl != undefined) { %>
          <script type="text/javascript" src="<%= overWriteUrl%>"></script>

web/building_saas/main/js/models/main_consts.js

@@ -40,6 +40,7 @@ let gljType = {//这里还是要有所有的类型
     DISMANTLING_FREIGHT_FEE:309,//安拆费及场外运费
     VERIFICATION_FEE:310,//校验费
     OTHER_FEE:311,//其他费用
+    OTHER_MACHINE_USED:312,//其他施工机具使用费
     // ==============机械类型=================
     MAIN_MATERIAL: 4,// 主材
     EQUIPMENT: 5,// 设备

web/over_write/js/chongqing_2018.js

@@ -2,30 +2,6 @@
  * Created by zhang on 2018/8/14.
  */
 
-if(typeof gljType !== 'undefined'){
-    gljType = {
-        LABOUR: 1,// 人工
-        GENERAL_MATERIAL: 201, // 普通材料
-        CONCRETE: 202,// 混凝土
-        MORTAR: 203,// 砂浆
-        MIX_RATIO: 204,// 配合比
-        COMMERCIAL_CONCRETE: 205, // 商品混凝土
-        COMMERCIAL_MORTAR: 206, // 商品砂浆
-        OTHER_MATERIAL: 207, // 其它材料
-        GENERAL_MACHINE: 301,// 机械台班
-        MACHINE_LABOUR: 303, // 机上人工
-        INSTRUMENT: 304,// 仪器仪表
-        FUEL_POWER_FEE:305,//燃料动力费
-        DEPRECIATION_FEE:306,//折旧费
-        INSPECTION_FEE:307,//检修费
-        MAINTENANCE:308,//维护费
-        DISMANTLING_FREIGHT_FEE:309,//安拆费及场外运费
-        VERIFICATION_FEE:310,//校验费
-        OTHER_FEE:311,//其他费用
-        MAIN_MATERIAL: 4// 主材
-    };
-}
-
 if(typeof projectGljObject !== 'undefined'){
     projectGljObject.displayTypeMap=[
         {ID:'LABOUR',text:'人工'},