Home Explore Help
Sign In
SmartCost
/
ConstructionCost
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

add fee_rate.html

zhangweicheng 8 years ago
parent
a15678b359
commit
7b9b1af6d2
5 changed files with 54 additions and 32 deletions
Split View Show Diff Stats
  1. 1 0
      modules/fee_rates/models/fee_rates.js
  2. 5 1
      web/building_saas/css/main.css
  3. 44 0
      web/building_saas/fee_rates/fee_rate.html
  4. 2 0
      web/building_saas/js/global.js
  5. 2 31
      web/building_saas/main/html/main.html

+ 1 - 0
modules/fee_rates/models/fee_rates.js
View File 

@@ -40,6 +40,7 @@ let feeRatesSchema = new Schema({
 
     ID: String,
 
     libID: Number,
 
     libName: String,
 
+    name:String,
 
     projectID:Number,
 
     status:String,
 
     rates: [ratesSchema]

+ 5 - 1
web/building_saas/css/main.css
View File 

@@ -318,6 +318,10 @@ body {
 
 .gc-cell select{
 
     height: auto;
 
 }
 
-
 
+.grid{
 
+    overflow: hidden;
 
+    width:100%;
 
+    height: 100%;
 
+}
 
 /*
 
 .gc-cell span{font-size: 12px !important}*/

+ 44 - 0
web/building_saas/fee_rates/fee_rate.html
View File 

@@ -0,0 +1,44 @@
 
+<!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 class="toolsbar px-1">
 
+    <div class="form-inline py-1">
 
+        <div class="col-lg-6" > <button id="selctFeeFile">选择费率文件</button></div>
 
+        <div class="col-lg-3" style="text-align: center"> 费率文件: <span id="projectName"></span></div>
 
+    </div>
 
+</div>
 
+<div class="container-fluid">
 
+    <div class="row">
 
+        <div class="col-lg-12 p-0">
 
+            <div class="row">
 
+                <div class="col-lg-6">
 
+                    <div class="form-inline py-1">
 
+                        <label class="mx-2" for="inlineFormCustomSelect">费率标准：</label>
 
+                        <select class="form-control form-control-sm" id="inlineFormCustomSelect">
 
+
 
+                        </select>
 
+                        <span>&nbsp;</span>
 
+                    </div>
 
+                    <div class=" grid  main-data-top" id="divFee"></div>
 
+                </div>
 
+                <div class="col-lg-4">
 
+                    <div class="py-1"><input type="checkbox" id="cascadeSet" checked >统一设置相同参数</div>
 
+                    <div class="grid  main-data-top py-1" id="subRate"></div>
 
+                </div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</div>
 
+
 
+</body>
 
+<script src="/web/glj/js/socket.io.slim.js"></script>
 
+<script src="/public/web/socket/connection.js"></script>
 
+</html>

+ 2 - 0
web/building_saas/js/global.js
View File 

@@ -13,6 +13,8 @@ function autoFlashHeight(){
 
     $(".side-content").height($(window).height()-headerHeight );
 
     $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
 
     $(".form-list").height($(window).height()-headerHeight-50 );
 
+    $(".grid").height($(window).height()-headerHeight-50 );
 
+
 
 };
 
 $(window).resize(autoFlashHeight);
 
 /*全局自适应高度结束*/

+ 2 - 31
web/building_saas/main/html/main.html
View File 

@@ -454,35 +454,7 @@
 
               </div>
 
             </div>
 
             <div class="tab-pane" id="fee_rates" role="tabpanel">
 
-                
-                <div class="toolsbar px-1">
 
-                    <div class="form-inline py-1">
 
-                        <div class="col-lg-6" > <button id="selctFeeFile">选择费率文件</button></div>
 
-                        <div class="col-lg-3" style="text-align: center"> 费率文件: <span id="projectName"></span></div>
 
-                    </div>
 
-                </div>
 
-                <div class="container-fluid">
 
-                    <div class="row">
 
-                        <div class="col-lg-12 p-0">
 
-                            <div class="row">
 
-                                <div class="col-lg-6">
 
-                                    <div class="form-inline py-1">
 
-                                        <label class="mx-2" for="inlineFormCustomSelect">费率标准：</label>
 
-                                        <select class="form-control form-control-sm" id="inlineFormCustomSelect">
 
-
 
-                                        </select>
 
-                                        <span>&nbsp;</span>
 
-                                    </div>
 
-                                    <div class=" grid  main-data-top" id="divFee"></div>
 
-                                </div>
 
-                                <div class="col-lg-4">
 
-                                    <div class="py-1"><input type="checkbox" id="cascadeSet" checked >统一设置相同参数</div>
 
-                                    <div class="grid  main-data-top py-1" id="subRate"></div>
 
-                                </div>
 
-                            </div>
 
-                        </div>
 
-                    </div>
 
-                </div>
 
+                <%include ../../fee_rates/fee_rate.html %>
 
             </div>
 
           </div>
 
 
@@ -577,8 +549,7 @@
 
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>
 
     <script type="text/javascript" src="/web/building_saas/main/js/views/fee_rate_view.js"></script>
 
     <script type="text/javascript" src="/web/building_saas/main/js/views/sub_fee_rate_views.js"></script>
 
-    <script src="/web/glj/js/socket.io.slim.js"></script>
 
-    <script src="/public/web/socket/connection.js"></script>
 
+
 
 
    <!-- <script src="/web/building_saas/fee_rates/fee_rate.js"></script>-->
 
     <script type="text/javascript">