更新指标库功能

css/main.css

@@ -40,8 +40,8 @@ body {
 	background-color: #999;
 	-webkit-border-radius: 6px;
 }
-.sjs-height-1,.sjs-height-2{
-  overflow: hidden;
+.sjs-height-1,.sjs-height-2,.sjs-height-3{
+  overflow: auto;
 }
 .sjs-bottom{
   height:400px;

js/global.js

@@ -1,10 +1,9 @@
 /*全局自适应高度*/
 function autoFlashHeight(){
     var cHeader = $(".c-header").height();
-    var sBar = $(".sjs-bar").height();
     $(".sjs-height-1").height($(window).height()-cHeader-160);
     $(".sjs-height-2").height($(window).height()-cHeader-191);
-    $(".sjs-height-3").height($(window).height()-cHeader-sBar-560);
+    $(".sjs-height-3").height($(window).height()-cHeader-520);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/

my-Library-detail.html

@@ -44,39 +44,108 @@
 			</div>
 		</div>
     <div class="main-panel">
-    			<div class="panel-content">
-    				<div class="panel-title fluid">
-    					<div class="title-main">
-    						<h2>
-                  XXX标段 2018-03-14 17:12:23
-                  <!--参数填写-->
-                  <a href="#" data-toggle="modal" data-target="#" class="btn btn-primary btn-sm pull-right">指标计算</a>
-                  <!--填写参数 进行指标计算后-->
-                  <a href="#parameter" data-toggle="modal" data-target="#parameter" class="btn btn-outline-primary btn-sm pull-right">参数设置</a>
-                  <a href="#storage" data-toggle="modal" data-target="#storage" class="btn btn-primary btn-sm pull-right">入库</a>
-                  <!--公用-->
-                  <a href="#del" data-toggle="modal" data-target="#del" class="btn btn-outline-danger btn-sm pull-right">从库中删除</a>
-              </h2>
-    					</div>
-    				</div>
-    				<div class="content-wrap">
-              <div class="c-header p-0 col-12">
-              </div>
-    					<div class="c-body">
-    						<div class="sjs-height-1">
-                  <!--填写参数-->
-                  <legend>填写参数</legend>
+			<div class="panel-content">
+				<div class="panel-title fluid">
+					<div class="title-main">
+						<h2>
+              XXX标段 2018-03-14 17:12:23
+              <a href="#storage" data-toggle="modal" data-target="#storage" class="btn btn-primary btn-sm pull-right">入库</a>
+              <a href="#del" data-toggle="modal" data-target="#del" class="btn btn-outline-danger btn-sm pull-right">从库中删除</a>
+          </h2>
+					</div>
+				</div>
+				<div class="content-wrap">
+          <div class="c-header p-0 col-12"></div>
+					<div class="c-body">
+            <div class="row">
+              <div class="col-5">
+                <div class="sjs-height-1">
                   <table class="table table-bordered">
                     <tr>
-                      <th>总造价</th><td><input class="form-control form-control-sm"></td>
-                      <th>路线总长度</th><td><input class="form-control form-control-sm"></td>
+                      <th></th>
+                      <th>项目节编号</th>
+                      <th>名称</th>
+                      <th>单位</th>
+                      <th>数量</th>
+                      <th>合价</th>
+                    </tr>
+                    <tr>
+                      <td>1</td>
+                      <td>1</td>
+                      <td>第一部分 建筑安装工程费</td>
+                      <td>公路公里</td>
+                      <td></td>
+                      <td>1045756</td>
                     </tr>
                     <tr>
-                      <th>路基工程费用</th><td><input class="form-control form-control-sm"></td>
-                      <th>边沟圬工体积</th><td><input class="form-control form-control-sm"></td>
+                      <td>2</td>
+                      <td>1-1</td>
+                      <td>临时工程</td>
+                      <td>公路公里</td>
+                      <td></td>
+                      <td>50000</td>
+                    </tr>
+                    <tr class="table-primary">
+                      <td>3</td>
+                      <td>1-1-1</td>
+                      <td>临时道路</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>4</td>
+                      <td>1-1-2</td>
+                      <td>临时便桥</td>
+                      <td>m/座</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>5</td>
+                      <td>1-1-3</td>
+                      <td>临时轨道铺设</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>6</td>
+                      <td>1-1-4</td>
+                      <td>临时电力线路</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>7</td>
+                      <td>1-1-5</td>
+                      <td>临时电力线路</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>8</td>
+                      <td>1-1-6</td>
+                      <td>临时码头</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>9</td>
+                      <td>1-1-7</td>
+                      <td>临时道路修建、养护与拆除（包括原道路的养护费）</td>
+                      <td>km</td>
+                      <td></td>
+                      <td></td>
                     </tr>
                   </table>
-                  <!--计算后出现数据-->
+                </div>
+              </div>
+              <div class="col-7">
+    						<div class="sjs-height-3">
                   <table class="table table-bordered">
                     <tr>
                       <th>指标编号</th>
@@ -84,126 +153,161 @@
                       <th colspan="2">指标单位</th>
                       <th>合价（元）</th>
                       <th>计算规则</th>
-                      <th>经济指标</th>
                       <th>指标计算</th>
-                      <th>指标模板</th>
+                      <th>经济指标</th>
                     </tr>
                     <tr>
-                      <td>z2-e</td>
-                      <td>排水工程</td>
+                      <td>z1-a</td>
+                      <td>临时道路</td>
                       <td></td>
                       <td>km</td>
                       <td></td>
-                      <td>指路基公里长度</td>
+                      <td>指新建便道与利用原有道路的总长</td>
                       <td></td>
                       <td></td>
                     </tr>
                     <tr>
-                      <td>z2-e-1</td>
-                      <td>排水工程公路公里造价</td>
+                      <td>z1-a-1</td>
+                      <td>临时道路公路公里造价</td>
                       <td>元</td>
                       <td>公路公里</td>
                       <td></td>
                       <td>合价/路线总长度</td>
-                      <td>123123</td>
-                      <td>123123 / 345345</td>
-                      <td>hj（合价）/lxzcd（路线总长度）</td>
+                      <td></td>
+                      <td></td>
                     </tr>
                     <tr>
-                      <td>z2-e-2</td>
-                      <td>排水工程路基长度造价</td>
+                      <td>z1-a-2</td>
+                      <td>临时道路公里造价</td>
                       <td>元</td>
                       <td>km</td>
                       <td></td>
-                      <td>合价/路基长度</td>
-                      <td>123123</td>
-                      <td>234234 / 123123</td>
-                      <td>hj（合价）/ljcd（路基长度）</td>
+                      <td>km指临时道路长度，合价/临时道路长</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>z1-a-3</td>
+                      <td>临时道路建筑面积造价</td>
+                      <td>元</td>
+                      <td>m2</td>
+                      <td></td>
+                      <td>合价/（临时道路长度×路基均宽）</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>z1-a-4</td>
+                      <td>临时道路造价占比</td>
+                      <td></td>
+                      <td>%</td>
+                      <td></td>
+                      <td>合价/临时工程费用</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>z1-a-5</td>
+                      <td>临时道路面积长度比</td>
+                      <td></td>
+                      <td>%</td>
+                      <td></td>
+                      <td>临时道路建筑面积/临时道路长度</td>
+                      <td></td>
+                      <td></td>
+                    </tr>
+                    <tr>
+                      <td>z1-a-6</td>
+                      <td>临时道路路线长度比</td>
+                      <td>km</td>
+                      <td>公路公里</td>
+                      <td></td>
+                      <td>临时道路长度/路线总长度</td>
+                      <td></td>
+                      <td></td>
                     </tr>
                   </table>
                 </div>
-    					</div>
-    				</div>
-    			</div>
-    		</div>
-      </div>
-      <!-- 删除已上报标段 -->
-      <div id="del" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-  			<div class="modal-dialog">
-      		<div class="modal-content">
-  					<div class="modal-header">
-              <h5 class="modal-title">删除确认</h5>
-  		        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  		      </div>
-  		      <div class="modal-body">
-  			      <div class="form">
-  			        <form>
-  								<div class="alert alert-danger">
-					          删除	XXX标段 2018-03-14 17:12:23 后数据无法恢复，请谨慎操作；
-                    <br>需要删除，请在以下输入框输入"&nbsp;&nbsp;&nbsp;<b>确认删除</b>&nbsp;&nbsp;&nbsp;"，再点击“确认删除”按钮。
-  								</div>
-                  <div class="form-group">
-                      <input class="form-control" type="text"  placeholder="输入 “确认删除”">
+                <div class="sjs-bottom-2">
+                    <legend class="mt-3">填写参数</legend>
+                    <table class="table table-bordered">
+                      <tr><th colspan="4" class="text-center">全局参数</th></tr>
+                      <tr>
+                        <th>总造价</th><td><input class="form-control form-control-sm"></td>
+                        <th>路线总长度</th><td><input class="form-control form-control-sm"></td>
+                      </tr>
+                      <tr>
+                        <th>路基工程费用</th><td><input class="form-control form-control-sm"></td>
+                        <th>边沟圬工体积</th><td><input class="form-control form-control-sm"></td>
+                      </tr>
+                    </table>
+                    <table class="table table-bordered">
+                      <tr><th colspan="4" class="text-center">1-1 项目节 参数</th></tr>
+                      <tr>
+                        <th>总造价</th><td><input class="form-control form-control-sm"></td>
+                        <th>路线总长度</th><td><input class="form-control form-control-sm"></td>
+                      </tr>
+                      <tr>
+                        <th>路基工程费用</th><td><input class="form-control form-control-sm"></td>
+                        <th>边沟圬工体积</th><td><input class="form-control form-control-sm"></td>
+                      </tr>
+                    </table>
                   </div>
-  			        </form>
-  			      </div>
-  		      </div>
-  		      <div class="modal-footer">
-              <button class="btn btn-danger">确认删除</button>
-  		        <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
-  		      </div>
-  				</div>
-  			</div>
-      </div>
-      <!-- 参数设置 -->
-      <div id="parameter" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-  			<div class="modal-dialog modal-lg">
-      		<div class="modal-content">
-  					<div class="modal-header">
-              <h5 class="modal-title">参数设置</h5>
-  		        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-  		      </div>
-  		      <div class="modal-body">
-              <div class="modal-height-500-scroll">
-                <table class="table table-bordered">
-                  <tr>
-                    <th>总造价</th><td><input class="form-control form-control-sm"></td>
-                    <th>路线总长度</th><td><input class="form-control form-control-sm"></td>
-                  </tr>
-                  <tr>
-                    <th>路基工程费用</th><td><input class="form-control form-control-sm"></td>
-                    <th>边沟圬工体积</th><td><input class="form-control form-control-sm"></td>
-                  </tr>
-                </table>
-              </div>
-  		      </div>
-  		      <div class="modal-footer">
-              <button class="btn btn-primary">指标计算</button>
-  		        <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
-  		      </div>
-  				</div>
-  			</div>
-      </div>
-      <!-- 入库 -->
-      <div id="storage" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
-        <div class="modal-dialog">
-          <div class="modal-content">
-            <div class="modal-header">
-              <h5 class="modal-title">删除确认</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            </div>
-            <div class="modal-body">
-              <div class="form">
-                <h5>入库后，才可以进行指标对比。确认入库后，仍然可以对残值进行设置，重新进行指标计算。</h5>
               </div>
             </div>
-            <div class="modal-footer">
-              <button class="btn btn-primary">确认入库</button>
-              <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
+					</div>
+				</div>
+			</div>
+		</div>
+  </div>
+<!-- 删除已上报标段 -->
+<div id="del" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+        <h5 class="modal-title">删除确认</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body">
+	      <div class="form">
+	        <form>
+						<div class="alert alert-danger">
+		          删除	XXX标段 2018-03-14 17:12:23 后数据无法恢复，请谨慎操作；
+              <br>需要删除，请在以下输入框输入"&nbsp;&nbsp;&nbsp;<b>确认删除</b>&nbsp;&nbsp;&nbsp;"，再点击“确认删除”按钮。
+						</div>
+            <div class="form-group">
+                <input class="form-control" type="text"  placeholder="输入 “确认删除”">
             </div>
-          </div>
+	        </form>
+	      </div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn btn-danger">确认删除</button>
+        <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
+      </div>
+		</div>
+	</div>
+</div>
+<!-- 入库 -->
+<div id="storage" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">删除确认</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body">
+        <div class="form">
+          <h5>入库后，才可以进行指标对比。确认入库后，仍然可以对参数进行重新设置，重新进行指标计算。</h5>
         </div>
       </div>
+      <div class="modal-footer">
+        <button class="btn btn-primary">确认入库</button>
+        <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
+      </div>
+    </div>
+  </div>
+</div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

template.html

@@ -74,7 +74,7 @@
                 <th>指标名称</th>
                 <th colspan="2">指标单位</th>
                 <th>计算规则</th>
-                <th>设置规则</th>
+                <th>模板设置</th>
               </tr>
               <tr>
                 <td>z2-e-1</td>