费率界面调整

feilv.html

@@ -84,28 +84,20 @@
         </div>
         <div class="content">
             <div class="toolsbar px-1">
-              <!-- <div class="form-inline py-1">
-                <label class="mx-2">建设项目费率：</label>
-                <select class="form-control form-control-sm">
-                  <option selected>费率1</option>
-                  <option value="1">费率2</option>
-                  <option value="2">费率3</option>
-                </select>
-                <a class="btn btn-secondary btn-sm ml-1">从其他项目复制</a>
-              </div> -->
                 <div class="form-inline py-1">
-                  <label class="mx-2" >当前使用：费率1</label>
-                  <label class="mx-2" ><a href="#" id="pop-lv"><span class="fa fa-file-powerpoint-o mr-1"></span>3</a> 单位工程使用</label>
-                  <label class="mx-2" >基于 重庆渝建发[2016]35号</label>
-                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#set-lv"><i class="fa fa-cog"></i> 设置</a>
-                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-lv"><i class="fa fa-exchange"></i> 更换</a>
-                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#copy-lv"><i class="fa fa-files-o"></i> 另存新文件</a>
+                  <label class="mx-2" >当前使用：费率1（<a href="#" id="pop-lv">3 单位工程使用</a>）
+                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-lv"><i class="fa fa-exchange"></i> 选择其他</a>
+                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#copy-lv"><i class="fa fa-files-o"></i> 另存单独用</a></label>
                 </div>
             </div>
             <div class="container-fluid">
                 <div class="row">
                     <div class="main-content col-lg-8 p-0">
-                      <div class="main-data-full">
+                      <div class="form-inline py-1">
+                        <label class="mx-2" >基于 重庆渝建发[2016]35号</label>
+                        <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#set-lv"><i class="fa fa-cog"></i> 重选标准</a>
+                      </div>
+                      <div class="main-data-full-fl">
                           <table class="table table-sm table-bordered m-0">
                               <thead>
                                   <th>序号</th>
@@ -198,17 +190,13 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">费率1 设置</h5>
+                  <h5 class="modal-title">费率1 重选标准</h5>
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                       <span aria-hidden="true">&times;</span>
                     </button>
                 </div>
                 <div class="modal-body">
                   <div class="form-group">
-                    <label>费率文件名称</label>
-                    <input class="form-control"  value="费率1">
-                  </div>
-                  <div class="form-group">
                     <label >费率标准</label>
                     <select class="form-control"><option>重庆渝建发[2016]35号</option></select>
                     <small class="form-text text-danger">重新选择费率标准将重置当前费率文件的所有费率，正在使用当前费率文件的其他单位工程也将受影响。</small>

js/global.js

@@ -9,6 +9,7 @@ function autoFlashHeight(){
     $(".main-data-side-d").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightD-202);
     $(".main-data-top").height($(window).height()-headerHeight-toolsbarHeight-bottomContentHeight-1);
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
+    $(".main-data-full-fl").height($(window).height()-headerHeight-toolsbarHeight-37);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
     $(".side-content").height($(window).height()-headerHeight );
     $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);