Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

web/building_saas/main/js/views/project_view.js

@@ -1900,6 +1900,7 @@ var projectObj = {
         if(node === tree.selected){
              style.backColor = colorSetting[mapping.SELECTED]['backColor'];
         }
+        if(_ && !_.isEmpty(node.data.bookmarkBackground)) style.backColor = "#"+ node.data.bookmarkBackground;//设置书签和批注背景色
         //大项费用加粗（数字与中文字符大小不一问题由字体造成，暂时不考虑分别设置大小）
        /* if(node.sourceType === this.project.Bills.getSourceType() && node.data.type === billType.DXFY){
             style.font = 'bold 0.9rem Arial';