Página inicial Explorar Ajuda
Entrar
SmartCost
/
ConstructionCost
2
0
Fork 0
Arquivos Issues 0 Pull Requests 0 Wiki
Ver código fonte

fix bootstrap tab show bug

zhangweicheng 7 anos atrás
pai
2bbe5e708e
commit
f0cbadcc5a
9 arquivos alterados com 34 adições e 16 exclusões
Visão dividida Mostrar estatísticas do Diff
  1. 9 0
      public/web/number_util.js
  2. 1 1
      public/web/scMathUtil.js
  3. 3 11
      web/building_saas/fee_rates/fee_rate.html
  4. 1 0
      web/building_saas/glj/js/project_glj.js
  5. 2 2
      web/building_saas/main/html/main.html
  6. 11 0
      web/building_saas/main/js/main.js
  7. 5 2
      web/building_saas/main/js/models/fee_rate.js
  8. 1 0
      web/building_saas/main/js/views/calc_program_manage.js
  9. 1 0
      web/building_saas/main/js/views/fee_rate_view.js

+ 9 - 0
public/web/number_util.js
Ver arquivo 

@@ -24,5 +24,14 @@ var  number_util = {
 
             value = editingText;
 
         }
 
         return value;
 
+    },
 
+    roundToString:function(obj,decimal){
 
+        let value;
 
+        if(this.isNumber(obj)){
 
+            value = scMathUtil.roundTo(obj,-decimal)
 
+        }else {
 
+            value = scMathUtil.roundTo(Number(obj),-decimal);
 
+        }
 
+        return value.toFixed(decimal);
 
     }
 
 }

+ 1 - 1
public/web/scMathUtil.js
Ver arquivo 

@@ -66,7 +66,7 @@ let scMathUtil = {
 
             if (num === 0){
 
                 num = 1;
 
                 let bin1 = bin.substring(0, i);
 
-                let bin2 = zeroString(iLength - (i + 1));//bin.substring(i + 1, iLength);
 
+                let bin2 = this.zeroString(iLength - (i + 1));//bin.substring(i + 1, iLength);
 
                 result = bin1 + num.toString() + bin2;
 
                 break;
 
             }

+ 3 - 11
web/building_saas/fee_rates/fee_rate.html
Ver arquivo 

@@ -1,14 +1,6 @@
 
-<!DOCTYPE html>
 
-<html lang="en">
 
 
-<head>
 
-    <meta charset="utf-8">
 
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
 
 
-</head>
 
-
 
-<body >
 
+<div >
 
 <div class="toolsbar px-1">
 
     <div class="form-inline py-1">
 
         <label class="mx-2" >当前使用：<span id="feeRateFileName">费率1</span>（<a href="#" id="pop-lv"><span id="projectCount">3</span> 单位工程使用</a>）
 
@@ -164,5 +156,5 @@
 
 </div>
 
 
 
-</body>
 
-</html>
 
+</div>
 
+

+ 1 - 0
web/building_saas/glj/js/project_glj.js
Ver arquivo 

@@ -26,6 +26,7 @@ let currentTag = '';
 
 let isChanging = false;
 
 $(document).ready(function () {
 
     $('#tab_gongliaoji').on('show.bs.tab', function (e) {
 
+        $(e.relatedTarget.hash).removeClass('active');
 
         init();
 
     });

+ 2 - 2
web/building_saas/main/html/main.html
Ver arquivo 

@@ -76,11 +76,11 @@
 
     <div class="main">
 
         <div class="main-nav">
 
             <ul class="nav nav-tabs flex-column" role="tablist">
 
-                <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" role="tab">造价书</a></li>
 
+                <li class="nav-item"><a class="active" data-toggle="tab" href="#zaojiashu" id="tab_zaojiashu" role="tab">造价书</a></li>
 
                 <li class="nav-item"><a data-toggle="tab" href="#gongliaoji" id="tab_gongliaoji" role="tab">工料机</a></li>
 
                 <li class="nav-item"><a data-toggle="tab" href="#fee_rates" id="tab_fee_rate" role="tab" >费率</a></li>
 
                 <li class="nav-item"><a data-toggle="tab" href="#calc_program_manage" id="tab_calc_program_manage" role="tab">计算程序</a></li>
 
-                <li class="nav-item"><a data-toggle="tab" href="#baobiao" role="tab" onclick="">报表</a></li>
 
+                <li class="nav-item"><a data-toggle="tab" href="#baobiao" role="tab" id="tab_baobiao" onclick="">报表</a></li>
 
             </ul>
 
         </div>
 
         <div class="content">

+ 11 - 0
web/building_saas/main/js/main.js
Ver arquivo 

@@ -6,4 +6,15 @@ $(function () {
 
     projectInfoObj.showProjectInfo();
 
     projectObj.checkMainSpread();
 
     projectObj.loadProjectData();
 
+
 
+    $('#tab_baobiao').on('shown.bs.tab', function (e) {
 
+        $(e.relatedTarget.hash).removeClass('active');
 
+        // do something
 
+    });
 
+
 
+    $('#tab_zaojiashu').on('shown.bs.tab', function (e) {
 
+        $(e.relatedTarget.hash).removeClass('active');
 
+        // do something
 
+    });
 
+
 
 });

+ 5 - 2
web/building_saas/main/js/models/fee_rate.js
Ver arquivo 

@@ -167,6 +167,9 @@ var FeeRate = {
 
                 return false;
 
             }
 
         };
 
+        FeeRate.prototype.onFeeRateChange=function (feeRateID,) {
 
+
 
+        };
 
         FeeRate.prototype.changeFeeRateStandard=function(newVal,callback){
 
             var me =this;
 
             var feeRate = this.getActivateFeeRate();
 
@@ -298,7 +301,7 @@ var FeeRate = {
 
             rate.rate=value;
 
             var nodes = _.filter(projectObj.project.mainTree.items,function (n) {
 
                 if(n.sourceType==ModuleNames.bills&&n.data.feeRateID==rate.ID){
 
-                    n.data.feeRate=value;
 
+                    n.data.feeRate=number_util.roundToString(value,feeRate_consts.decimal);
 
                     return true;
 
                 }else {
 
                     return false;
 
@@ -383,7 +386,7 @@ var FeeRate = {
 
             if(node.data.feeRateID){
 
                 var feeRate = this.getFeeRateByID(node.data.feeRateID);
 
                 if(feeRate){
 
-                    node.data.feeRate=parseFloat(feeRate.rate).toFixed(feeRate_consts.decimal);
 
+                    node.data.feeRate=number_util.roundToString(feeRate.rate,feeRate_consts.decimal);// parseFloat(feeRate.rate).toFixed(feeRate_consts.decimal);
 
                 }
 
             }
 
         };

+ 1 - 0
web/building_saas/main/js/views/calc_program_manage.js
Ver arquivo 

@@ -121,6 +121,7 @@ let rationPM = {
 
 
 $(document).ready(function(){
 
     $('#tab_calc_program_manage').on('shown.bs.tab', function (e) {
 
+        $(e.relatedTarget.hash).removeClass('active');
 
         rationPM.buildSheet();
 
     });
 
 });

+ 1 - 0
web/building_saas/main/js/views/fee_rate_view.js
Ver arquivo 

@@ -691,6 +691,7 @@ $(function(){
 
     );
 
 
     $('#tab_fee_rate').on('shown.bs.tab', function (e) {
 
+        $(e.relatedTarget.hash).removeClass('active');
 
         feeRateObject.reFreshRateViews();
 
         feeRateObject.loadPageContent();
 
     });