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

modules/options/models/optionTypes.js

@@ -15,8 +15,8 @@ const optionSetting = {
         DEFAULT: {
             backColor: 'White',
             foreColor: 'Black',
-            stringFont: '0.9rem Arial',
-            numFont: '0.9rem Arial'
+            stringFont: '14px Arial',
+            numFont: '14px Arial'
         },
         SELECTED: {
             backColor: '#FFFACD',
@@ -27,8 +27,8 @@ const optionSetting = {
         DXFY: {
             backColor: 'default',
             foreColor: 'default',
-            stringFont: 'bold 0.9rem Arial',
-            numFont: 'bold 0.9rem Arial'
+            stringFont: 'bold 14px Arial',
+            numFont: 'bold 14px Arial'
         },
         FB: {
             backColor: '#C4CAFB',

public/web/sheet/sheet_data_helper.js

@@ -333,7 +333,7 @@ var SheetDataHelper = {
                     $(div).css("position", "absolute")
                         .css("border", "1px #C0C0C0 solid")
                         .css("box-shadow", "1px 2px 5px rgba(0,0,0,0.4)")
-                        .css("font", "0.9rem Calibri")
+                        .css("font", "14px Calibri")
                         .css("background", "Black")
                         .css("color", "White")
                         .css("padding", 5)

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -20,7 +20,7 @@
     <style type="text/css">
         .ztree * {
             font-family: Calibri;
-            font-size: 0.9rem;
+            font-size: 14px;
         }
         .modal-lg{max-width: 1000px}
     </style>

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -37,7 +37,7 @@
         }
         .ztree * {
             font-family: Calibri;
-            font-size: 0.9rem;
+            font-size: 14px;
         }
         .nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active{
             border: 2px solid #ff6501;

web/building_saas/css/custom.css

@@ -33,7 +33,7 @@ div.resize-x{
 legend.legend{
   display:block;
   width:auto;
-  font-size:0.9rem;
+  font-size:14px;
   top:-15px;
   background: white;
 }
@@ -83,7 +83,7 @@ legend.legend{
   line-height: 18px;
   border-radius:4px;
   text-align:left;
-  font:0.9rem Calibri;
+  font:14px Calibri;
   box-shadow:2px 2px 6px #ccc;
   color:#fff;
 }

web/building_saas/css/main.css

@@ -1,7 +1,7 @@
 /*building SAAS 0.1*/
 /*bootstrap 初始化*/
 body {
-  font-size: 0.9rem;
+  font-size: 14px;
   overflow: hidden;
   font-family: "Helvetica Neue","Hiragino Sans GB",stheiti,"Microsoft Yahei","微软雅黑",tahoma,sans-serif
 }
@@ -9,7 +9,7 @@ a{
 outline: none
 }
 .dropdown-menu {
-  font-size: 0.9rem
+  font-size: 14px
 }
 .btn.disabled, .btn:disabled {
 color:#999

web/building_saas/main/html/main.html

@@ -31,7 +31,7 @@
   <style type="text/css">
     .ztree * {
       font-family: Calibri;
-      font-size: 0.9rem;
+      font-size: 14px;
     }
   </style>
   <script>
@@ -397,7 +397,7 @@
                         <div class=" ovf-hidden" style="" id="mbzmSpread"></div>
                       </div>
                       <div class="main-data-bottom ovf-hidden" style="display: none" id="comments">
-                        <textarea style="font-size: 0.9rem" class="form-control" rows="8" readonly=""></textarea>
+                        <textarea style="font-size: 14px" class="form-control" rows="8" readonly=""></textarea>
                       </div>
                       <div id="tzjnrCon" class="container-fluid main-data-bottom"
                         style="background: #F1F1F1; overflow: hidden">

web/building_saas/main/js/views/billsElf.js

@@ -668,7 +668,7 @@ const BillsSub = (function() {
             let options = getOptions(node.data, bills.selected.sub.datas);
             top = options.length > 6 ? top - 6 * height : top - options.length * height;
             let $editInput = $(`<div style="height: ${height}px; background: ${cellStyle.backColor};overflow: hidden; white-space: nowrap; text-overflow: ellipsis">${node.data.options}</div>`),
-                $optDiv = $(`<div style="position: fixed; width: ${cellRect.width}px; top: ${top}px;background: ${cellStyle.backColor};border: 1px solid; overflow: auto; height: ${options.length > 6 ? height*6+5 : height*options.length+5}px; font-size: 0.9rem;"></div>`);
+                $optDiv = $(`<div style="position: fixed; width: ${cellRect.width}px; top: ${top}px;background: ${cellStyle.backColor};border: 1px solid; overflow: auto; height: ${options.length > 6 ? height*6+5 : height*options.length+5}px; font-size: 14px;"></div>`);
             for(let opt of options){
                 let $opt = $(`<div title="${opt.name ? opt.name : ''}" class="elf-options" style="cursor: pointer; height: ${height}px;overflow: hidden; white-space: nowrap; text-overflow: ellipsis"></div>`),
                     $optInput = $(`<input rank="${opt.rank}" value="${opt.ID}" style="cursor: pointer; margin-left: 5px; vertical-align: middle" type="checkbox" 

web/building_saas/main/js/views/calc_base_view.js

@@ -291,6 +291,7 @@ let calcBaseView = {
             if(!toggle || toggle !== 'calcBase'){
                 return;
             }
+            debugger;
             //bills
             if(me.curType === me.type.bills){
                 let selected = projectObj.project.mainTree.selected;

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

@@ -2196,7 +2196,7 @@ var projectObj = {
         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';
+            style.font = 'bold 14px Arial';
         }*/
         style.borderLeft = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
         style.borderTop = new GC.Spread.Sheets.LineBorder("#D4D4D4", GC.Spread.Sheets.LineStyle.thin);
@@ -2224,7 +2224,7 @@ var projectObj = {
             'programID',
             'ruleText'
         ];
-        style.font = 'bold 0.9rem Arial';
+        style.font = 'bold 14px Arial';
         return style;
     },
    //设置节点style

web/building_saas/unit_price_file/index.html

@@ -31,7 +31,7 @@
     <style type="text/css">
         .ztree * {
             font-family: Calibri;
-            font-size: 0.9rem;
+            font-size: 14px;
         }
     </style>