Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

logs/log4js.json

@@ -1,4 +1,5 @@
-{
+{        
+  "disableClustering": true, 
   "customBaseDir" :"../logs/ConstructionCost/",
   "customDefaultAtt" :{
     "type": "dateFile",

package.json

@@ -63,9 +63,9 @@
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd server.js",
-    "server": "node --max-old-space-size=2048 server.js",
+    "server": "pm2-docker pm2_server.json",
     "socket": "node socket.js",
-    "import": "node --max-old-space-size=2048 importserver.js",
+    "import": "pm2-docker pm2_import.json",
     "dev_server": "SET NODE_ENV=qa&& babel-node server.js",
     "dev_socket": "SET NODE_ENV=qa&& babel-node socket.js",
     "dev_import": "SET NODE_ENV=qa&& babel-node importserver.js"

pm2_import.json

@@ -0,0 +1,12 @@
+{
+  "apps": {
+      "name": "constructionimport",
+      "script": "importserver.js",
+      "output": "/home/logs/out.log",
+      "error": "/home/logs/err.log",
+      "log_date_format": "YYYY-MM-DD HH:mm Z",
+      "exec_mode": "cluster_mode",                
+      "instances": 3, 
+      "merge_logs": true
+    }
+}

pm2_server.json

@@ -0,0 +1,13 @@
+{
+  "apps": {
+      "name": "constructionimport",
+      "script": "server.js",
+      "args":"--max-old-space-size=2048",
+      "output": "/home/logs/out.log",
+      "error": "/home/logs/err.log",
+      "log_date_format": "YYYY-MM-DD HH:mm Z",
+      "exec_mode": "cluster_mode",                
+      "instances": 3, 
+      "merge_logs": true
+    }
+}

web/building_saas/pm/js/pm_newMain.js

@@ -940,6 +940,7 @@ const projTreeObj = {
             return lineNum * defaultHeight;
         };
         TreeNodeCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
+            if(style.backColor == undefined) style.backColor = "white"  
             if (style.backColor) {
                 ctx.save();
                 ctx.fillStyle = style.backColor;