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

.gitignore

@@ -2,6 +2,6 @@ node_modules/
 .git/
 dist/
 .idea/
-tmp/
+tmp/*.xlsx
 test/unit/logs
 *.log

tmp/forDeployment.js

@@ -0,0 +1,3 @@
+/**
+ * Created by Tony on 2017/11/28.
+ */

web/building_saas/main/js/views/project_property_projFeature.js

@@ -21,7 +21,7 @@ let projFeatureView = {
         },
         combos: [
             {row: 1, key: 'projType', items: ['住宅', '公共建筑', '厂房', '办公楼']},
-            {row: 2, key: 'structureType', items: ['排架结构', '框架结构']},
+            {row: 2, key: 'structureType', items: ['排架结构', '框架结构', '现浇、框架结构', '预制、砖混结构', '外砖内模', '内浇外挂', '钢结构']},
             {row: 3, key: 'baseType', items: ['带基', '框排架柱距6m以内', '框排架柱距6m以外', '满基筏式', '满基板式', '满基箱式', '独立基础']},
             {row: 4, key: 'buildingFeature', items: ['点式', '凹式', '凸式', 'Y式', '其他']}
         ],

web/building_saas/pm/js/pm_main.js

@@ -83,7 +83,8 @@ let ProjTreeSetting = {
                     if (node.data.projType === projectType.tender) {
                         $('a:eq(1)', td).bind('click', function () {
                             BeforeOpenProject(node.id(), {'fullFolder': GetFullFolder(node.parent)}, function () {
-                                window.location.href = '/main?project=' + node.id();
+                                //window.location.href = '/main?project=' + node.id();
+                                window.open('/main?project=' + node.id());
                             });
                             return false;
                         });