Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

web/css/ztree/zTreeStyle.css

@@ -12,7 +12,7 @@ website:	http://code.google.com/p/jquerytree/
 .ztree {margin:0; padding:5px; color:#333}
 .ztree li{padding:0; margin:0; list-style:none; line-height:14px; text-align:left; white-space:nowrap; outline:0}
 .ztree li ul{ margin:0; padding:0 0 0 18px}
-.ztree li ul.line{ background:url(./img/line_conn.gif) 0 0 repeat-y;}
+.ztree li ul.line{ background:url(img/line_conn.gif) 0 0 repeat-y;}
 
 .ztree li a {padding:1px 3px 0 0; margin:0; cursor:pointer; height:17px; color:#333; background-color: transparent;
 	text-decoration:none; vertical-align:top; display: inline-block}
@@ -29,7 +29,7 @@ website:	http://code.google.com/p/jquerytree/
 .ztree li span.button {line-height:0; margin:0; width:16px; height:16px; display: inline-block; vertical-align:middle;
 	border:0 none; cursor: pointer;outline:none;
 	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+	background-image:url("img/zTreeStandard.png"); *background-image:url("img/zTreeStandard.gif")}
 
 .ztree li span.button.chk {width:13px; height:13px; margin:0 3px 0 0; cursor: auto}
 .ztree li span.button.chk.checkbox_false_full {background-position:0 0}
@@ -76,13 +76,13 @@ website:	http://code.google.com/p/jquerytree/
 .ztree li span.button.edit {margin-right:2px; background-position:-110px -48px; vertical-align:top; *vertical-align:middle}
 .ztree li span.button.remove {margin-right:2px; background-position:-110px -64px; vertical-align:top; *vertical-align:middle}
 
-.ztree li span.button.ico_loading{margin-right:2px; background:url(./img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
+.ztree li span.button.ico_loading{margin-right:2px; background:url(img/loading.gif) no-repeat scroll 0 0 transparent; vertical-align:top; *vertical-align:middle}
 
 ul.tmpTargetzTree {background-color:#FFE6B0; opacity:0.8; filter:alpha(opacity=80)}
 
 span.tmpzTreeMove_arrow {width:16px; height:16px; display: inline-block; padding:0; margin:2px 0 0 1px; border:0 none; position:absolute;
 	background-color:transparent; background-repeat:no-repeat; background-attachment: scroll;
-	background-position:-110px -80px; background-image:url("./img/zTreeStandard.png"); *background-image:url("./img/zTreeStandard.gif")}
+	background-position:-110px -80px; background-image:url("img/zTreeStandard.png"); *background-image:url("img/zTreeStandard.gif")}
 
 ul.ztree.zTreeDragUL {margin:0; padding:0; position:absolute; width:auto; height:auto;overflow:hidden; background-color:#cfcfcf; border:1px #00B83F dotted; opacity:0.8; filter:alpha(opacity=80)}
 .zTreeMask {z-index:10000; background-color:#cfcfcf; opacity:0.0; filter:alpha(opacity=0); position:absolute}

modules/GLJ/models/GLJList.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/unitPriceFile_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;

modules/GLJ/models/unitPriceFile.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/unitPriceFile_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/billsLib/billsLibControllers/billsLibControllers.js

@@ -2,9 +2,9 @@
  * Created by vian on 2017/3/22.
  */
 
-var billsLibDao = require("../billsLibModel/billsLibInterfaces");
+var billsLibDao = require("./../models/bills_lib_interfaces");
 //----
-var model = require("../billsLibModel/billsLibModel");
+var model = require("./../models/bills_lib_model");
 var counter = require("../../../public/counter/counter");
 var StdBillsLib = model.stdBillsLibMod;
 var Bills = model.billsMod;

modules/billsLib/billsLibModel/billsLibInterfaces.js

@@ -1,7 +1,7 @@
 /**
  * Created by vian on 2017/3/20.
  */
-var model = require("./billsLibModel");
+var model = require("./bills_lib_model");
 var counter = require("../../../public/counter/counter");
 var StdBillsLib = model.stdBillsLibMod;
 var Bills = model.billsMod;

modules/billsLib/billsLibModel/billsLibModel.js

@@ -2,7 +2,7 @@
  * Created by vian on 2017/3/17.
  */
 var dbm = require("../../../config/db/db_manager");
-var schemas = require("./billsLibSchemas.js");
+var schemas = require("./bills_lib_schemas.js");
 //var db = dbm.getLocalConnection("stdBillsEditor");
 var db = dbm.getCfgConnection("stdBillsEditor");
 var stdBillsLibMod = db.model("stdBillsLib", schemas.stdBillsLibSchema);

modules/billsLib/billsLibRoutes/billsLibRoutes.js

@@ -2,7 +2,7 @@
  * Created by vian on 2017/3/17.
  */
 var express = require("express");
-var billsController = require("../billsLibControllers/billsLibControllers");
+var billsController = require("./../controllers/bills_lib_controllers");
 var billsRouter =express.Router();
 
 billsRouter.post('/getMaxNumber', billsController.getMaxNumber);

modules/main/models/GLJ.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var Schema = mongoose.Schema;
 var counter = require("../../../public/counter/counter.js");
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/bills.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var Schema = mongoose.Schema;
 var async = require("async");
 var counter = require("../../../public/counter/counter.js");

modules/main/models/projectGLJ.js

@@ -4,7 +4,7 @@
 var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('../../main/models/projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/projectProperties.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;
 var commonConsts = consts.commonConst;

modules/main/models/ration.js

@@ -5,7 +5,7 @@ var mongoose = require("mongoose");
 var db = require("../db/project_db");
 var subSchema = require("./billsSubSchemas");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var counter = require("../../../public/counter/counter.js");
 var consts = require('./projectConsts');
 var projectConsts = consts.projectConst;

modules/pm/models/project.js

@@ -11,7 +11,7 @@ var mongoose = require("mongoose");
 var dbm = require("../../../config/db/db_manager");
 var db = dbm.getCfgConnection("usersManages");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var ProjectSchema = new Schema({
     "ID": Number,
     "ParentID": Number,

modules/rationRepository/controllers/rationController.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/5/2.
  */
 
-var rationItem = require('../models/rationItem');
+var rationItem = require('../models/ration_item');
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
 };

modules/rationRepository/controllers/rationRepositoryController.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/4/20.
  */
-var rationRepository = require("../models/repositoryMap");
+var rationRepository = require("../models/repository_map");
 
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});

modules/rationRepository/controllers/rationChapterTreeController.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/4/21.
  */
 
-var rationChapterTreeData = require('../models/rationChapterTree');
+var rationChapterTreeData = require('../models/ration_section_tree');
 var callback = function(req,res,err,message, data){
     res.json({error: err, message: message, data: data});
 }

modules/rationRepository/controllers/repositoryGljController.js

@@ -1,7 +1,7 @@
 /**
  * Created by Tony on 2017/5/5.
  */
-var gljRepository = require("../models/gljRepository");
+var gljRepository = require("../models/glj_repository");
 
 var callback = function(req,res,err,message, data){
     res.json({error: err, message: message, data: data});

modules/rationRepository/models/gljRepository.js

@@ -32,7 +32,7 @@ var gljSchema = mongoose.Schema({
 });
 var gljTypeModel = db.model("gljType",gljTypeSchema, "gljType");
 var gljItemModel = db.model("gljRepository",gljSchema, "gljRepository");
-var repositoryMap = require('./repositoryMap');
+var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');
 
 var gljItemDAO = function(){};

modules/rationRepository/models/rationChapterTree.js

@@ -17,7 +17,7 @@ var rationChapterTreeSchema = mongoose.Schema({//章节树  //生成唯一id改
     isDeleted: Boolean
 });
 var rationChapterTreeModel = chapterTreeDb.model("rationChapterTrees",rationChapterTreeSchema, "rationChapterTrees")
-var repositoryMap = require('./repositoryMap');
+var repositoryMap = require('./repository_map');
 var counter = require('../../../public/counter/counter');
 
 var rationChapterTreeDAO = function(){};

modules/rationRepository/routes/rationRepRoutes.js

@@ -5,10 +5,10 @@ var express = require("express");
 var apiRouter =express.Router();
 //var _rootDir = __dirname;
 
-var rationRepositoryController = require("../controllers/rationRepositoryController");
-var rationChapterTreeController = require("../controllers/rationChapterTreeController");
-var rationController = require("../controllers/rationController");
-var repositoryGljController = require("../controllers/repositoryGljController");
+var rationRepositoryController = require("../controllers/ration_repository_controller");
+var rationChapterTreeController = require("../controllers/ration_section_tree_controller");
+var rationController = require("../controllers/ration_controller");
+var repositoryGljController = require("../controllers/repository_glj_controller");
 var coeListController = require("../controllers/coe_controller");
 
 apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);

modules/reports/controllers/rpt_controller.js

@@ -2,14 +2,15 @@
  * Created by Tony on 2017/3/13.
  */
 
-var JV = require('../rpt_component/Jpc_ValueDefine');
+var JV = require('../rpt_component/jpc_value_define');
 var Template = require('../models/rpt_template');
-var TemplateData = require('../models/rpt_temp_data');
-var JpcEx = require('../rpt_component/JpcEx');
+var TemplateData = require('../models/rpt_tpl_data');
+var JpcEx = require('../rpt_component/jpc_ex');
 //var cache = require('../../../public/cache/cacheUtil');
 var rptUtil = require("../util/rpt_util");
 var rpt_xl_util = require('../util/rpt_excel_util');
 var fs = require('fs');
+var strUtil = require('../../../public/stringUtil');
 
 //统一回调函数
 var callback = function(req, res, err, data){
@@ -38,7 +39,7 @@ module.exports = {
             }
         }).then(function(tplData){
                 if (tplData) {
-                    var printCom = JpcEx.createInit();
+                    var printCom = JpcEx.createNew();
                     rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE] = pageSize;
                     var defProperties = rptUtil.getReportDefaultCache();
                     printCom.initialize(rptTpl);
@@ -78,7 +79,7 @@ module.exports = {
                     if (pageRst) {
                         rpt_xl_util.exportExcel(pageRst, rptName, null, function(newName){
                             res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-                            res.setHeader("Content-Disposition", "attachment; filename=" + rptName + ".xlsx");
+                            res.setHeader("Content-Disposition", "attachment; filename=" + strUtil.getPinYinCamelChars(rptName) + ".xlsx");
                             var filestream = fs.createReadStream(__dirname.slice(0, __dirname.length - 28) + '/tmp/' + newName + '.xlsx');
                             filestream.on('data', function(chunk) {
                                 res.write(chunk);

modules/reports/rpt_component/Jpc_Band.js

@@ -1,6 +1,6 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
+var JV = require('./jpc_value_define');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcBandHelper = require('./helper/jpc_helper_band');
 
 var JpcBand = {
     createNew: function(rptTpl, defProperties) {

modules/reports/rpt_component/Jpc_Data.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcData = {
     createNew: function() {
         var JpcDataRst = {};

modules/reports/rpt_component/Jpc_Field.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcField = {
     createNew: function(rptTpl) {
         var JpcFieldResult = {};

modules/reports/rpt_component/Jpc_Function.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcFunc = {
     createNew: function (rptTpl) {
         var me = this;

modules/reports/rpt_component/Jpc_Param.js

@@ -1,4 +1,4 @@
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JpcParam = {
     createNew: function(rptTpl) {
         var JpcParamResult = {};

modules/reports/rpt_component/Jpc_RTE.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2016/12/28.
  */
 
-var JV = require('./Jpc_ValueDefine');
+var JV = require('./jpc_value_define');
 var JE = {
     F: function(fID, $CURRENT_RPT) {
         var rst = null;

modules/reports/rpt_component/helper/Jpc_Helper_Area.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcAreaHelper = {
     outputArea: function(areaNode, band, unitFactor, rowAmount, rowIdx, colAmount, colIdx, multipleDispCol, multipleColIdx,syncHeight, syncWidth) {

modules/reports/rpt_component/helper/Jpc_Helper_Band.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcBandHelper = {
     getBandTypeValByString: function(bandType) {

modules/reports/rpt_component/helper/Jpc_Helper_Common.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcCommonHelper = {
     commonConstant: {},

modules/reports/rpt_component/helper/Jpc_Helper_Discrete.js

@@ -1,8 +1,8 @@
-var JV = require('../Jpc_ValueDefine');
-var JE = require('../Jpc_RTE');
-var JpcTextHelper = require('./Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./Jpc_Helper_Area');
+var JV = require('../jpc_value_define');
+var JE = require('../jpc_rte');
+var JpcTextHelper = require('./jpc_helper_text');
+var JpcCommonOutputHelper = require('./jpc_helper_common_output');
+var JpcAreaHelper = require('./jpc_helper_area');
 
 var JpcDiscreteHelper = {
     outputDiscreteInfo: function (discreteArray, bands, dataObj, unitFactor, pageStatus, segIdx, multiCols, multiColIdx, $CURRENT_RPT) {

modules/reports/rpt_component/helper/Jpc_Helper_Field.js

@@ -1,4 +1,4 @@
-var JV = require('../Jpc_ValueDefine');
+var JV = require('../jpc_value_define');
 
 var JpcFieldHelper = {
     getValue: function(dataField, valueIdx) {

modules/reports/rpt_component/helper/Jpc_Helper_Text.js

@@ -1,6 +1,6 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonOutputHelper = require('./Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./Jpc_Helper_Area');
+var JV = require('../jpc_value_define');
+var JpcCommonOutputHelper = require('./jpc_helper_common_output');
+var JpcAreaHelper = require('./jpc_helper_area');
 
 var JpcTextHelper = {
     outputText: function (textNode, band, unitFactor, rows, rowIdx, cols, colIdx, multiCols, multiColIdx) {

modules/reports/rpt_component/helper/Jpc_Helper_CommonOutput.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcFieldHelper = require('./Jpc_Helper_Field');
+var JV = require('../jpc_value_define');
+var JpcFieldHelper = require('./jpc_helper_field');
 
 var JpcCommonOutputHelper = {
     createCommonOutputWithoutDecorate: function (node, value, controls) {

modules/reports/rpt_component/helper/Jpc_Helper_CrossTab.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcCrossTabHelper = {
     getColIDX: function(cl, val) {

modules/reports/rpt_component/helper/Jpc_Helper_FlowTab.js

@@ -1,5 +1,5 @@
-var JV = require('../Jpc_ValueDefine');
-var JpcCommonHelper = require('./Jpc_Helper_Common');
+var JV = require('../jpc_value_define');
+var JpcCommonHelper = require('./jpc_helper_common');
 
 var JpcFlowTabHelper = {
     getMaxRowsPerPage: function(bands, rptTpl) {

modules/reports/rpt_component/Jpc_BillTab.js

@@ -1,16 +1,16 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcBillTabSrv = function(){};
-JpcBillTabSrv.prototype.createInit = function(){
+JpcBillTabSrv.prototype.createNew = function(){
     var JpcBillTabResult = {};
     JpcBillTabResult.initialize = function() {
         var me = this;

modules/reports/rpt_component/Jpc_CrossTab.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCrossTabHelper = require('./helper/Jpc_Helper_CrossTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCrossTabHelper = require('./helper/jpc_helper_cross_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcCrossTabSrv = function(){};
-JpcCrossTabSrv.prototype.createInit = function(){
+JpcCrossTabSrv.prototype.createNew = function(){
     function private_addTabValue(tabValuedIdxLst, sortedSequence, segIdx, preRec, nextRec, dispSerialIdxLst, sorted_sum_value_Lst, rst_sum_value_Lst) {
         if (tabValuedIdxLst) {
             var serial1stTier = null;
@@ -232,7 +232,7 @@ JpcCrossTabSrv.prototype.createInit = function(){
         var maxRowRec = 1, maxColRec = 1, counterRowRec = 0, counterColRec = 0, pageIdx = 0, segCnt = me.sortedContentSequence.length;
         var pageStatus = [true, true, false, true, false, false, false, false];
         //2. calculate the page info one by one
-        var bands = JpcBand.createInit(rptTpl, defProperties);
+        var bands = JpcBand.createNew(rptTpl, defProperties);
         function private_resetBandArea() {
             JpcBandHelper.setBandArea(bands, rptTpl, pageStatus);
             maxRowRec = JpcCrossTabHelper.getMaxRowsPerPage(bands, rptTpl);

modules/reports/rpt_component/JpcEx.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTab = require('./Jpc_FlowTab');
-var JpcBillTab = require('./Jpc_BillTab');
-var JpcCrossTab = require('./Jpc_CrossTab');
-var JpcField = require('./Jpc_Field');
-var JpcParam = require('./Jpc_Param');
-var JpcFunc = require('./Jpc_Function');
-var JpcData = require('./Jpc_Data');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JE = require('./Jpc_RTE'); //Important: for self-define function execution purpose
+var JV = require('./jpc_value_define');
+var JpcBand = require('./jpc_band');
+var JpcFlowTab = require('./jpc_flow_tab');
+var JpcBillTab = require('./jpc_bill_tab');
+var JpcCrossTab = require('./jpc_cross_tab');
+var JpcField = require('./jpc_field');
+var JpcParam = require('./jpc_param');
+var JpcFunc = require('./jpc_function');
+var JpcData = require('./jpc_data');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JE = require('./jpc_rte'); //Important: for self-define function execution purpose
 
 var JpcExSrv = function(){};
-JpcExSrv.prototype.createInit = function(){
+JpcExSrv.prototype.createNew = function(){
     function private_buildDftItems(rptTpl, dftCollection, propArray, nodeName) {
         var rst = {};
         if (dftCollection) {
@@ -85,29 +85,29 @@ JpcExSrv.prototype.createInit = function(){
     JpcResult.initialize = function(rptTpl) {
         var me = this;
         if (rptTpl[JV.NODE_FLOW_INFO]) {
-            me.flowTab = JpcFlowTab.createInit();
+            me.flowTab = JpcFlowTab.createNew();
             me.flowTab.initialize();
         }
         if (rptTpl[JV.NODE_BILL_INFO]) {
-            me.billTab = JpcBillTab.createInit();
+            me.billTab = JpcBillTab.createNew();
             me.billTab.initialize();
         }
         //var dt1 = new Date();
         if (rptTpl[JV.NODE_CROSS_INFO]) {
-            me.crossTab = JpcCrossTab.createInit();
+            me.crossTab = JpcCrossTab.createNew();
             me.crossTab.initialize();
         }
         me.totalPages = 0;
         me.runTimePageData = {};
-        me.fields = JpcField.createInit(rptTpl);
-        me.params = JpcParam.createInit(rptTpl);
-        me.formulas = JpcFunc.createInit(rptTpl);
+        me.fields = JpcField.createNew(rptTpl);
+        me.params = JpcParam.createNew(rptTpl);
+        me.formulas = JpcFunc.createNew(rptTpl);
     };
 
     JpcResult.analyzeData = function(rptTpl, dataObj, defProperties) {
         var me = this;
         //1. data object
-        var dataHelper = JpcData.createInit();
+        var dataHelper = JpcData.createNew();
         dataHelper.analyzeData(rptTpl, dataObj);
         //2. tab object
         //pre-condition: the data should be sorted in SQL/NoSQL level!
@@ -157,7 +157,7 @@ JpcExSrv.prototype.createInit = function(){
             rst[JV.NODE_FONT_COLLECTION] = private_buildDftFonts(rptTpl, (defProperties == null)?null:defProperties.fonts);
             rst[JV.NODE_PAGE_INFO] = JpcCommonHelper.getPageSize(rptTpl);
             rst.items = [];
-            var bands = JpcBand.createInit(rptTpl, defProperties);
+            var bands = JpcBand.createNew(rptTpl, defProperties);
             try {
                 for (var page = startPage; page <= endPage; page++) {
                     me.runTimePageData.currentPage = page;

modules/reports/rpt_component/Jpc_FlowTab.js

@@ -1,17 +1,17 @@
-var JV = require('./Jpc_ValueDefine');
-var JE = require('./Jpc_RTE');
-var JpcFieldHelper = require('./helper/Jpc_Helper_Field');
-var JpcBandHelper = require('./helper/Jpc_Helper_Band');
-var JpcBand = require('./Jpc_Band');
-var JpcFlowTabHelper = require('./helper/Jpc_Helper_FlowTab');
-var JpcCommonHelper = require('./helper/Jpc_Helper_Common');
-var JpcDiscreteHelper = require('./helper/Jpc_Helper_Discrete');
-var JpcTextHelper = require('./helper/Jpc_Helper_Text');
-var JpcCommonOutputHelper = require('./helper/Jpc_Helper_CommonOutput');
-var JpcAreaHelper = require('./helper/Jpc_Helper_Area');
+var JV = require('./jpc_value_define');
+var JE = require('./jpc_rte');
+var JpcFieldHelper = require('./helper/jpc_helper_field');
+var JpcBandHelper = require('./helper/jpc_helper_band');
+var JpcBand = require('./jpc_band');
+var JpcFlowTabHelper = require('./helper/jpc_helper_flow_tab');
+var JpcCommonHelper = require('./helper/jpc_helper_common');
+var JpcDiscreteHelper = require('./helper/jpc_helper_discrete');
+var JpcTextHelper = require('./helper/jpc_helper_text');
+var JpcCommonOutputHelper = require('./helper/jpc_helper_common_output');
+var JpcAreaHelper = require('./helper/jpc_helper_area');
 
 var JpcFlowTabSrv = function(){};
-JpcFlowTabSrv.prototype.createInit = function(){
+JpcFlowTabSrv.prototype.createNew = function(){
     function private_addPageValue(ValuedIdxLst, sortedSequence, preRec, nextRec,page_seg_map, segIdx, pageIdx) {
         var vIdx = [];
         for (var vi = 0; vi < nextRec; vi++) {
@@ -73,7 +73,7 @@ JpcFlowTabSrv.prototype.createInit = function(){
     JpcFlowTabResult.preSetupPages = function (rptTpl, dataOjb, defProperties) {
         var rst = 0, me = this, counterRowRec = 0, maxRowRec = 1, pageIdx = 0;
         JpcFieldHelper.findAndPutDataFieldIdx(rptTpl, rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_CONTENT][JV.PROP_FLOW_FIELDS], null, me.disp_fields_idx);
-        var bands = JpcBand.createInit(rptTpl, defProperties);
+        var bands = JpcBand.createNew(rptTpl, defProperties);
         var pageStatus = [true, true, false, false, false, false, false, false];
         if (rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN]) {
             me.multiCols = 1 * rptTpl[JV.NODE_FLOW_INFO][JV.PROP_MULTI_COLUMN];

modules/reports/util/rpt_excel_util.js

@@ -1,11 +1,11 @@
 /**
  * Created by Tony on 2017/4/1.
  */
-var JV = require('../rpt_component/Jpc_ValueDefine');
+var JV = require('../rpt_component/jpc_value_define');
 var fs = require('fs');
 var JSZip = require("jszip");
 var strUtil = require('../../../public/stringUtil');
-var jpcCmnHelper = require('../rpt_component/helper/Jpc_Helper_Common');
+var jpcCmnHelper = require('../rpt_component/helper/jpc_helper_common');
 var DPI = jpcCmnHelper.getScreenDPI()[0];
 const dftHeadXml = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>';
 

modules/templates/models/bills_template.js

@@ -8,7 +8,7 @@ var mongoose = require('mongoose');
 var dbm = require("../../../config/db/db_manager");
 var templatesDB = dbm.getCfgConnection("templates");
 var Schema = mongoose.Schema;
-var deleteSchema = require('../../../public/models/deleteSchema');
+var deleteSchema = require('../../../public/models/delete_schema');
 var BillsTemplateSchema = new Schema({
     ID: Number,
     ParentID: Number,

server.js

@@ -59,7 +59,7 @@ app.get('/template/bills', function (req, res) {
         return true;
     }
     if (checkAdmin(req.session.userAccount)) {
-        res.render('templates/html/bills.html',
+        res.render('maintain/templates/html/bills.html',
             {userAccount: req.session.userAccount,
                 userID: req.session.userID});
     } else {
@@ -81,7 +81,7 @@ var billsTemplateRouter = require('./modules/templates/routes/bills_template_rou
 app.use('/template/bills/api', billsTemplateRouter);
 
 app.get('/pm', function(req, res){
-    res.render('pm/html/project-management.html',
+    res.render('building_saas/pm/html/project-management.html',
         {userAccount: req.session.userAccount,
             userID: req.session.userID});
 });
@@ -93,7 +93,7 @@ app.get('/main',  function(req, res) {
         return true;
     }
     if (checkProjectRight(req.session.userID, req.query.project)) {
-        res.render('main/html/main.html',
+        res.render('building_saas/main/html/main.html',
             {
                 userAccount: req.session.userAccount,
                 userID: req.session.userID
@@ -118,7 +118,7 @@ app.get('/report',  function(req, res) {
         res.redirect('/login');
     }
     else {
-        res.render('report/html/RptHome.html',
+        res.render('maintain/report/html/RptHome.html',
             {userAccount: req.session.userAccount,
                 userID: req.session.userID});
     }
@@ -130,23 +130,23 @@ app.use("/report_api", rpt_Router);
 //var rations_Router = require("./modules/rationLibEditor/routes/rationLibEditor_route");
 //app.use("/rationLibEditor",rations_Router);
 
-var rationRepository_Router = require("./modules/rationRepository/routes/rationRepRoutes");
+var rationRepository_Router = require("./modules/ration_repository/routes/ration_rep_routes");
 app.get('/rationRepository/main', function(req, res) {
-    res.render('rationRepository/main.html',
+    res.render('maintain/ration_repository/main.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
         });
 });
 app.get('/rationRepository/ration', function(req, res) {
-    res.render('rationRepository/dinge.html',
+    res.render('maintain/ration_repository/dinge.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
         });
 });
 app.get('/rationRepository/lmm', function(req, res) {
-    res.render('rationRepository/gongliao.html',
+    res.render('maintain/ration_repository/gongliao.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
@@ -154,7 +154,7 @@ app.get('/rationRepository/lmm', function(req, res) {
 });
 
 app.get('/rationRepository/coeList', function(req, res) {
-    res.render('rationRepository/fuzhu.html',
+    res.render('maintain/ration_repository/fuzhu.html',
         {
             userAccount: req.session.userAccount,
             userID: req.session.userID
@@ -168,21 +168,21 @@ app.get("/stdBillsmain", function(req, res){
         res.redirect('/login');
     }
     else {
-        res.render("billsLib/html/main.html",
+        res.render("maintain/bills_lib/html/main.html",
             {userAccount: req.session.userAccount,
                 userID: req.session.userID});
     }
 });
 app.get("/stdBills", function(req, res){
-    res.render("billsLib/html/qingdan.html");
+    res.render("maintain/bills_lib/html/qingdan.html");
 });
 app.get('/stdJobs', function(req, res){
-    res.render('billsLib/html/neirong.html');
+    res.render('maintain/bills_lib/html/neirong.html');
 });
 app.get('/stdItems', function(req, res){
-    res.render('billsLib/html/tezheng.html');
+    res.render('maintain/bills_lib/html/tezheng.html');
 });
-var billsLibRouter = require("./modules/billsLib/billsLibRoutes/billsLibRoutes");
+var billsLibRouter = require("./modules/bills_lib/routes/bills_lib_routes");
 app.use("/stdBillsEditor", billsLibRouter);
 //-----------------
 

test/unit/idTree/idTreeTest.js

@@ -30,7 +30,7 @@ var getKeyIDs = function (node) {
 }
 
 test('loading idTree Module: ', function (t) {
-    var idTreeCode = fs.readFileSync(__dirname + '../../../../public/web/idTree.js', 'utf8', 'r');
+    var idTreeCode = fs.readFileSync(__dirname + '../../../../public/web/id_tree.js', 'utf8', 'r');
     eval(idTreeCode);
     idTreeUtil = idTree;
     t.pass('pass for loading idTree Module');

test/unit/reports/testRpt.js

@@ -3,10 +3,10 @@
  */
 var test = require('tape');
 var mongoose = require('mongoose');
-var JV = require('../../../modules/reports/rpt_component/Jpc_ValueDefine');
+var JV = require('../../../modules/reports/rpt_component/jpc_value_define');
 var Template = require('../../../modules/reports/models/rpt_template');
-var TemplateData = require('../../../modules/reports/models/rpt_temp_data');
-var JpcEx = require('../../../modules/reports/rpt_component/JpcEx');
+var TemplateData = require('../../../modules/reports/models/rpt_tpl_data');
+var JpcEx = require('../../../modules/reports/rpt_component/jpc_ex');
 var rptUtil = require("../../../modules/reports/util/rpt_util");
 var fs = require('fs');
 

web/building_saas/css/main.css

@@ -0,0 +1,288 @@
+/*building SAAS 0.1*/
+/*bootstrap 初始化*/
+body {
+    font-size: 0.9rem;
+    overflow: hidden;
+}
+.dropdown-menu {
+    font-size: 0.9rem
+}
+/*自定义css*/
+.header {
+    background: #e1e1e1
+}
+.header .header-logo {
+    background: #ff6501;
+    color: #fff;
+    float: left;
+    padding-top: .25rem;
+    padding-bottom: .25rem;
+    margin-right: 1rem;
+    font-size: 1.25rem;
+    line-height: inherit
+}
+.top-msg{
+  position: fixed;
+  top:0;
+  width:100%;
+  z-index: 999
+}
+.in-1{padding-left:0px!important}
+.in-2{padding-left:21px!important}
+.in-3{padding-left:42px!important}
+.in-4{padding-left:63px!important}
+.in-5{padding-left:84px!important}
+.in-6{padding-left:105px!important}
+.main {
+    position: relative;
+    background: #f7f7f9;
+}
+.main-nav {
+    position: absolute;
+    text-align: center;
+    z-index: 999;
+    padding: 2px 0 0 2px
+}
+.main-nav .nav a {
+    display: block;
+    width: 28px;
+    text-align: center;
+    line-height: 18px;
+    color: #999;
+    padding: 10px 0;
+    border-right: 1px solid #ccc;
+}
+.main-nav .nav a:hover {
+    background: #fff;
+    color: #333;
+    text-decoration: none;
+}
+.main-nav .nav a.active {
+    border: 1px solid #ccc;
+    border-right: 1px solid #fff;
+    background: #fff;
+    color: #333
+}
+.main-nav .nav-tabs{
+  border-bottom: none
+}
+.content {
+    border-left: 1px solid #ccc;
+    margin-left: 29px;
+    background: #fff
+}
+.tools-btn {
+    height: 30px;
+    line-height: 30px;
+}
+.toolsbar .tools-btn.btn:hover {
+    background: #f7f7f9;
+}
+.main-side {
+    border-top: 1px solid #ccc;
+    border-left: 1px solid #ccc;
+    overflow-y: hidden;
+}
+.sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
+  height:200px
+}
+.top-content, .fluid-content {
+    overflow: auto;
+    border-bottom: 1px solid #ccc;
+}
+.bottom-content .nav {
+    background: #f7f7f9;
+    padding:0 0 0 2px
+}
+.bottom-content .nav-tabs .nav-link, .side-tabs .nav-tabs .nav-link {
+    border-radius: 0;
+    padding: 0.2em 0.5em
+}
+.side-tabs .nav-tabs .nav-item {
+  z-index: 999
+}
+.side-tabs .nav-tabs {
+    border-bottom: none;
+    margin-bottom: -1px
+}
+.side-tabs .nav-tabs .nav-link {
+    border-radius: 0;
+    padding: 0em 0.5em;
+    line-height: 30px;
+    z-index: 999
+}
+.bottom-content .nav-tabs .nav-link.active {
+    border-top: 1px solid #f7f7f9
+}
+.side-tabs .nav-tabs .nav-link.active {
+    border-top: none;
+    border-bottom:1px solid #fff
+}
+.side-tabs a.active, .sub-nav a.active {
+    background: #ccc
+}
+.poj-manage {
+    background: #fff
+}
+.slide-sidebar {
+    border-left: 1px solid #E1E1E1;
+    box-shadow: 0px 15px 15px rgba(0, 0, 0, 0.1);
+    background: none repeat scroll 0% 0% #ffffff;
+    overflow: hidden;
+    position: absolute;
+    right: 0px;
+    top: 0;
+    z-index: 999;
+    width: 0px;
+}
+.new-msg {
+    -webkit-animation: tada 1s infinite .2s ease both;
+    -moz-animation: tada 1s infinite .2s ease both;
+}
+@-webkit-keyframes tada {
+    0% {
+        -webkit-transform: scale(1)
+    }
+    10%, 20% {
+        -webkit-transform: scale(0.9) rotate(-3deg)
+    }
+    30%, 50%, 70%, 90% {
+        -webkit-transform: scale(1.1) rotate(3deg)
+    }
+    40%, 60%, 80% {
+        -webkit-transform: scale(1.1) rotate(-3deg)
+    }
+    100% {
+        -webkit-transform: scale(1) rotate(0)
+    }
+}
+@-moz-keyframes tada {
+    0% {
+        -moz-transform: scale(1)
+    }
+    10%, 20% {
+        -moz-transform: scale(0.9) rotate(-3deg)
+    }
+    30%, 50%, 70%, 90% {
+        -moz-transform: scale(1.1) rotate(3deg)
+    }
+    40%, 60%, 80% {
+        -moz-transform: scale(1.1) rotate(-3deg)
+    }
+    100% {
+        -moz-transform: scale(1) rotate(0)
+    }
+}
+.has-danger {
+    -webkit-animation: shake 1s .2s ease both;
+    -moz-animation: shake 1s .2s ease both;
+    animation: shake 1s .2s ease both;
+}
+@-webkit-keyframes shake {
+    0%, 100% {
+        -webkit-transform: translateX(0);
+    }
+    10%, 30%, 50%, 70%, 90% {
+        -webkit-transform: translateX(-10px);
+    }
+    20%, 40%, 60%, 80% {
+        -webkit-transform: translateX(10px);
+    }
+}
+@-moz-keyframes shake {
+    0%, 100% {
+        -moz-transform: translateX(0);
+    }
+    10%, 30%, 50%, 70%, 90% {
+        -moz-transform: translateX(-10px);
+    }
+    20%, 40%, 60%, 80% {
+        -moz-transform: translateX(10px);
+    }
+}
+@keyframes shake {
+    0%, 100% {
+        transform: translateX(0);
+    }
+    10%, 30%, 50%, 70%, 90% {
+        transform: translateX(-10px);
+    }
+    20%, 40%, 60%, 80% {
+        transform: translateX(10px);
+    }
+}
+.bottom-content .tab-content .main-data-bottom{
+    height: 200px;
+    overflow: auto;
+}
+.bottom-content .tab-content .ovf-hidden{
+    overflow: hidden;
+}
+.form-signin {
+    max-width: 500px;
+    margin: 150px auto;
+}
+.poj-list, .side-content {
+    overflow: auto;
+}
+.poj-list span.poj-icon {
+  padding-right:7px;
+  color:#ccc
+}
+.poj-list a.tree-open,.poj-list a.tree-close{
+  width:15px;
+  display: inline-block;
+}
+.print-toolsbar{
+  padding:5px
+}
+.print-toolsbar .panel {
+  display:inline-block;
+  vertical-align:top;
+  background:#f7f7f9
+}
+.print-toolsbar .panel .panel-foot{
+  text-align: center;
+  font-size: 12px
+}
+.print-list {
+  border-right:1px solid #ccc
+}
+.print-list .form-list {
+  overflow: auto
+}
+.print-list .list-tools{
+  height:50px;
+  padding:10px 0;
+  border-bottom:1px solid #f2f2f2
+}
+.pageContainer {
+  background: #ededed;
+  text-align: center
+}
+.pageContainer .page{
+  border:9px solid transparent;
+  display: inline-block;
+}
+.pageContainer .page img{
+  width:inherit;
+  height: inherit;
+}
+.modal-fixed-height {
+  height: 400px;
+  overflow-y: auto;
+}
+.sidebar-tools-bar {
+  background:#fff
+}
+.side-search-box{
+  position: absolute;
+  background:#fff;
+  top:33px;
+  left:0;
+  border-bottom:1px solid #ddd
+}
+.side-search-box .result-box{
+  height:300px;
+  overflow: auto;
+}

web/fee_rates/fee_rate.html

@@ -6,10 +6,10 @@
     <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>
-    <link rel="stylesheet" href="/web/css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="/web/css/main.css">
-    <link rel="stylesheet" href="/web/css/font-awesome/font-awesome.min.css">
-    <link rel="stylesheet" href="/web/css/spreadjs/gc.spread.views.dataview.10.0.0.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">
+    <link rel="stylesheet" href="/lib/spreadjs/views/gc.spread.views.dataview.10.0.0.css">
     <script src="/lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js" type="text/javascript"></script>
     <script src="/lib/spreadjs/views/gc.spread.views.dataview.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>
@@ -116,8 +116,8 @@
     <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="/lib/global.js"></script>
-    <script src="/web/fee_rates/fee_rate.js"></script>
+    <script src="/web/building_saas/js/global.js"></script>
+    <script src="/web/building_saas/fee_rates/fee_rate.js"></script>
 </body>
 <script type="text/javascript">
     autoFlashHeight();

web/building_saas/js/global.js

@@ -0,0 +1,42 @@
+/*全局自适应高度*/
+function autoFlashHeight(){
+    var headerHeight = $(".header").height();
+    var toolsbarHeight = $(".toolsbar").height();
+    var bottomContentHeight = $(".bottom-content").height();
+    var sidebarToolsBarHeight = $(".sidebar-tools-bar").height();
+    $(".main-data-side-f").height($(window).height()-headerHeight-toolsbarHeight-2);
+    $(".main-data-side-s").height($(window).height()-headerHeight-toolsbarHeight-sidebarToolsBarHeight-202);
+    $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
+    $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
+    $(".side-content").height($(window).height()-headerHeight );
+    $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
+    $(".form-list").height($(window).height()-headerHeight-50 );
+};
+$(window).resize(autoFlashHeight);
+/*全局自适应高度结束*/
+$(function(){
+/*侧滑*/
+$(".open-sidebar").click(function(){
+    $(".slide-sidebar").animate({width:"800"}).addClass("open");
+});
+$("body").click(function(event){
+        var e = event || window.event; //浏览器兼容性
+        if(!$(event.target).is('a')) {
+            var elem = event.target || e.srcElement;
+            while (elem) { //循环判断至跟节点，防止点击的是div子元素
+                if (elem.className == "open-sidebar" || elem.className == 'slide-sidebar open') {
+                    return false;
+                }
+                elem = elem.parentNode;
+            }
+            $(".slide-sidebar").animate({width:"0"}).removeClass("open")// 关闭处理
+        }
+
+    });
+/*侧滑*/
+/*工具提示*/
+$('*[data-toggle=tooltip]').mouseover(function() {
+ $(this).tooltip('show');
+  });
+/*工具提示*/
+});

web/main/html/main.html

@@ -6,17 +6,17 @@
     <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>
-    <link rel="stylesheet" href="web/css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="web/css/main.css">
-    <link rel="stylesheet" href="web/css/font-awesome/font-awesome.min.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="web/css/ztree/zTreeStyle.css" type="text/css">
+    <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
     <!--SpreadJs-->
-    <link rel="stylesheet" href="web/css/spreadjs/gc.spread.sheets.excel2013lightGray.10.0.1.css" type="text/css">
+    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css" type="text/css">
     <!-- jquery.contextmenu -->
     <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" type="text/css">
-    <script src="lib/jquery/jquery.min.js"></script>
-    <script src="lib/global.js"></script>
+    <script src="/lib/jquery/jquery.min.js"></script>
+    <script src="/web/building_saas/js/global.js"></script>
     <script>
         // 这里的变量供页面调用
         var userAccount = '<%- userAccount %>';
@@ -389,16 +389,16 @@
                       <div class="print-view poj-list">
                         <div class="pageContainer">
                           <div class="page">
-                            <img src="web/img/baobiao.png">
+                            <img src="/web/building_saas/img/baobiao.png">
                           </div>
                           <div class="page">
-                            <img src="web/img/baobiao.png">
+                            <img src="/web/building_saas/img/baobiao.png">
                           </div>
                           <div class="page">
-                            <img src="web/img/baobiao.png">
+                            <img src="/web/building_saas/img/baobiao.png">
                           </div>
                           <div class="page">
-                            <img src="web/img/baobiao.png">
+                            <img src="/web/building_saas/img/baobiao.png">
                           </div>
                         </div>
                       </div>
@@ -473,41 +473,41 @@
         autoFlashHeight();
     </script>
 
-    <script src="lib/tether/tether.min.js"></script>
-    <script src="lib/bootstrap/bootstrap.min.js"></script>
+    <script src="/lib/tether/tether.min.js"></script>
+    <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script type="text/javascript" src="/lib/bootstrap/bootstrap-select.min.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>
     <!-- Common -->
     <script type="text/javascript" src="/public/web/common_ajax.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>
+    <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 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>
     <!-- Model -->
-    <script type="text/javascript" src="web/main/js/models/mainConsts.js"></script>
-    <script type="text/javascript" src="web/main/js/models/project.js"></script>
-    <script type="text/javascript" src="web/main/js/models/bills.js"></script>
-    <script type="text/javascript" src="web/main/js/models/ration.js"></script>
-    <script type="text/javascript" src="web/main/js/models/glj.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
+    <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="public/web/idTree.js"></script>
-    <script type="text/javascript" src="web/main/js/models/cache_tree.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="/test/tmp_data/data_15690.js"></script>
     <!-- Controller -->
-    <script type="text/javascript" src="public/web/tree_sheet_controller.js"></script>
-    <script type="text/javascript" src="public/web/tree_sheet_helper.js"></script>
-    <script type="text/javascript" src="/web/scripts/sheetDataHelper.js"></script>
+    <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>
     <!-- Test Data -->
-    <script type="text/javascript" src="test/tmp_data/bills_grid_setting.js"></script>
+    <script type="text/javascript" src="/test/tmp_data/bills_grid_setting.js"></script>
     <!-- view -->
-    <script type="text/javascript" src="web/main/js/main_ajax.js"></script>
-    <script type="text/javascript" src="web/main/js/main.js"></script>
-    <script type="text/javascript" src="/web/main/js/views/std_bills_lib.js"></script>
-    <script type="text/javascript" src="/web/main/js/views/std_ration_lib.js"></script>
-    <script type="text/javascript" src="/public/web/urlUtil.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/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="/public/web/url_util.js"></script>
     <SCRIPT type="text/javascript">
   		<!--
   		var setting = {
@@ -574,7 +574,7 @@
   		});
   		//-->
   	</SCRIPT>
-    <script type="text/javascript" src="web/main/js/gljView.js"></script>
+    <script type="text/javascript" src="/web/building_saas/main/js/views/gljView.js"></script>
 </body>
 <script>