指标对比

css/main.css

@@ -405,6 +405,10 @@ body {
   height:500px;
   overflow: hidden
 }
+.modal-height-500-scroll{
+  height:500px;
+  overflow: auto;
+}
 .modal-lgx {
   max-width:1000px
 }

js/global.js

@@ -30,7 +30,8 @@ $("body").click(function(event){
 /*侧滑*/
 /*工具提示*/
 $(function () {
-  $('[data-toggle="tooltip"]').tooltip()
+  $('[data-toggle="tooltip"]').tooltip();
+  $('[data-toggle="popover"]').popover()
 });
 /*侧栏菜单*/
 $(".bg-nav > li > a").click(function() {

my-Library-detail.html

@@ -49,9 +49,12 @@
     					<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="#" 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>
@@ -61,6 +64,7 @@
               </div>
     					<div class="c-body">
     						<div class="sjs-height-1">
+                  <!--填写参数-->
                   <legend>填写参数</legend>
                   <table class="table table-bordered">
                     <tr>
@@ -81,7 +85,7 @@
                       <th>合价（元）</th>
                       <th>计算规则</th>
                       <th>经济指标</th>
-                      <th>设置指标</th>
+                      <th>指标计算</th>
                       <th>指标模板</th>
                     </tr>
                     <tr>
@@ -124,7 +128,7 @@
     		</div>
       </div>
       <!-- 删除已上报标段 -->
-      <div id="del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <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">
@@ -152,7 +156,7 @@
   			</div>
       </div>
       <!-- 参数设置 -->
-      <div id="parameter" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <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">
@@ -160,16 +164,18 @@
   		        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
   		      </div>
   		      <div class="modal-body">
-              <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 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>
@@ -178,6 +184,26 @@
   				</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>

my-Library.html

@@ -94,29 +94,22 @@
     			</div>
     		</div>
       </div>
-      <!-- 删除已上报标段 -->
-      <div id="del" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <!-- 导入指标源 -->
+      <div id="upload" 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>
+              <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>
-  			        </form>
-  			      </div>
+              <div class="form-group">
+                <label for="exampleFormControlFile1">上传指标源文件</label>
+                <div class="form-control"><input class="form-control-file" id="exampleFormControlFile1" type="file"></div>
+              </div>
   		      </div>
   		      <div class="modal-footer">
-              <button class="btn btn-danger">确认删除</button>
+              <button class="btn btn-primary">确认导入</button>
   		        <button class="btn btn-secondary" data-dismiss="modal" aria-hidden="true">关闭</button>
   		      </div>
   				</div>

search-Library.html

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -10,7 +9,6 @@
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
 </head>
-
 <body>
   <div class="header">
 		<h1 class="logo"><a>指标对比-纵横经济指标系统</a></h1>
@@ -44,175 +42,126 @@
 			</div>
 		</div>
     <div class="main-panel">
-    			<div class="panel-sidebar">
-    				<div class="panel-title">
-    					<div class="title-bar">
-    						<h2>指标数据源</h2>
-    					</div>
-    				</div>
-    				<div class="scrollbar-auto">
-    					<div class="nav-box">
-    						<ul class="nav-list list-unstyled">
-                  <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>XXX标段 2018-03-14 17:12:23</span></label></a></li>
-                  <li class="bg-warning"><a href="#" class="text-truncate"><label><input type="checkbox"> <span>YYY标段 2018-03-13 17:12:23</span></label></a></li>
-                  <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>ZZZ标段 2018-03-11 17:12:23</span></label></a></li>
-                  <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>AAA标段 2018-03-11 17:12:23</span></label></a></li>
-                  <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>BBB标段 2018-03-11 17:12:23</span></label></a></li>
-                  <li><a href="#" class="text-truncate"><label><input type="checkbox" checked> <span>CCC标段 2018-03-11 17:12:23</span></label></a></li>
-    						</ul>
-    					</div>
-    				</div>
-    			</div>
     			<div class="panel-content">
-    				<div class="panel-title">
+    				<div class="panel-title fluid">
     					<div class="title-main">
-                <div class="btn-group col-3 pr-0">
-                  <input type="text" class="form-control form-control-sm m-0" placeholder="输入项目节名称检索" >
+                <div class="btn-group">
+                  <a class="btn btn-primary btn-sm" href="#generate-data" data-toggle="modal" data-target="#generate-data">指标源：5</a>
+                </div>
+                <div class="btn-group col-2 pr-0">
+                  <input type="text" class="form-control form-control-sm m-0" placeholder="输入项目节名称" >
                 </div>
                 <div class="btn-group">
-                  <button class="btn btn-sm btn-primary " type="button">检索指标</button>
+                  <button class="btn btn-sm btn-primary " type="button">定位项目节</button>
                 </div>
     					</div>
     				</div>
     				<div class="content-wrap">
               <div class="c-header p-0 col-12">
-                <div class="card text-white bg-dark">
-                  <div class="card-body row">
-                    <div class="col-auto">
-                      <span class="btn btn-light btn-sm"><i class="fa fa-search"></i> 路侧护栏</span>
-                    </div>
-                    <div class="col-auto">
-                      <span class="btn btn-light btn-sm">数据源：5</span>
-                      <span class="btn btn-light btn-sm">参与计算：3</span>
-                    </div>
-                    <div class="col-2">
-                      <div class="input-group input-group-sm mb-0">
-                      <div class="input-group-prepend">
-                        <span class="input-group-text" id="basic-addon1">数量</span>
-                      </div>
-                      <input type="text" class="form-control" value="7000" >
-                      <div class="input-group-append">
-                        <a class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" >组成</a>
-                        <div class="dropdown-menu p-2">
-                          <table class="table table-sm table-bordered mb-0">
-                            <tr><th class="text-center">单位</th><th class="text-center">数量</th><th class="text-center">合计</th></tr>
-                            <tr><td>单位1</td><td class="text-right">3000</td><td><input type="checkbox" class="form-control" checked></td></tr>
-                            <tr><td>单位2</td><td class="text-right">4000</td><td><input type="checkbox" class="form-control" checked></td></tr>
-                            <tr><td>合计</td><td  class="text-right" colspan="2">7000</td></tr>
-                          </table>
-                        </div>
-                      </div>
-                    </div>
-                    </div>
-                    <div class="col-2">
-                      <div class="input-group input-group-sm mb-0">
-                        <div class="input-group-prepend">
-                          <span class="input-group-text" id="basic-addon1">经济指标</span>
-                        </div>
-                        <input type="text" class="form-control" value="66020" readonly>
-
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="card text-white bg-danger">
-                    <div class="card-body row">
-                      <div class="col-auto">
-                        <h4>检索 "关键词" 没有结果</h4>
-                      </div>
-                    </div>
-                  </div>
               </div>
     					<div class="c-body">
                 <div class="sjs-height-1">
                   <table class="table table-bordered">
-                    <tr>
-                      <th class="text-center">序号</th>
-                      <th class="text-center">参与计算</th>
-                      <th class="text-center">编号</th>
-                      <th class="text-center">名称</th>
-                      <th class="text-center">单位</th>
-                      <th class="text-center">设计数量1</th>
-                      <th class="text-center">设计数量2</th>
-                      <th class="text-center">经济指标</th>
-                      <th class="text-center">金额</th>
-                      <th class="text-center">所属标段</th>
-                      <th class="text-center">上传时间</th>
-                      <th class="text-center">所在位置</th>
-                      <th class="text-center">备注</th>
-                    </tr>
-                    <tr>
-                      <td>1</td>
-                      <td><input type="checkbox" checked  class="form-control"></td>
-                      <td>编号</td>
-                      <td>名称</td>
-                      <td class="text-center">单位</td>
-                      <td class="text-right">设计数量1</td>
-                      <td class="text-right">设计数量2</td>
-                      <td class="text-right">经济指标</td>
-                      <td class="text-right">金额</td>
-                      <td>所属标段</td>
-                      <td>上传时间</td>
-                      <td>所在位置</td>
-                      <td>备注</td>
-                    </tr>
-                    <tr class="table-secondary">
-                      <td>2</td>
-                      <td><input type="checkbox" class="form-control"></td>
-                      <td>编号</td>
-                      <td>名称</td>
-                      <td class="text-center">单位</td>
-                      <td class="text-right">设计数量1</td>
-                      <td class="text-right">设计数量2</td>
-                      <td class="text-right">经济指标</td>
-                      <td class="text-right">金额</td>
-                      <td>所属标段</td>
-                      <td>上传时间</td>
-                      <td>所在位置</td>
-                      <td>备注</td>
-                    </tr>
-                    <tr>
-                      <td>3</td>
-                      <td><input type="checkbox" checked class="form-control"></td>
-                      <td>编号</td>
-                      <td>名称</td>
-                      <td class="text-center">单位</td>
-                      <td class="text-right">设计数量1</td>
-                      <td class="text-right">设计数量2</td>
-                      <td class="text-right">经济指标</td>
-                      <td class="text-right">金额</td>
-                      <td>所属标段</td>
-                      <td>上传时间</td>
-                      <td>所在位置</td>
-                      <td>备注</td>
-                    </tr>
-                    <tr>
-                      <td>4</td>
-                      <td><input type="checkbox" checked class="form-control"></td>
-                      <td>编号</td>
-                      <td>名称</td>
-                      <td class="text-center">单位</td>
-                      <td class="text-right">设计数量1</td>
-                      <td class="text-right">设计数量2</td>
-                      <td class="text-right">经济指标</td>
-                      <td class="text-right">金额</td>
-                      <td>所属标段</td>
-                      <td>上传时间</td>
-                      <td>所在位置</td>
-                      <td>备注</td>
-                    </tr>
+                    <thead>
+                      <tr>
+                        <th class="text-center" rowspan="2"></th>
+                        <th class="text-center" rowspan="2">指标编号</th>
+                        <th class="text-center" rowspan="2">项目或费用名称</th>
+                        <th class="text-center" rowspan="2" colspan="2">指标单位</th>
+                        <th class="text-center" colspan="3">经济指标</th>
+                        <th class="text-center" rowspan="2">平均指标</th>
+                        <th class="text-center" rowspan="2">计算规则</th>
+                        <th class="text-center" rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>XXX标段</th>
+                        <th>YYY标段</th>
+                        <th>ZZZ标段</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      <tr>
+                        <td>1</td>
+                        <td>z1</td>
+                        <td>临时工程</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td>2</td>
+                        <td>z1-a</td>
+                        <td>临时道路</td>
+                        <td></td>
+                        <td>km</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>指新建便道与利用原有道路的总长</td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                        <td>2</td>
+                        <td>z1-a-1</td>
+                        <td>临时道路公路公里造价</td>
+                        <td>元</td>
+                        <td>公路公里</td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td>合价/路线总长度</td>
+                        <td></td>
+                      </tr>
+                    </tbody>
                   </table>
                 </div>
     					</div>
     				</div>
     			</div>
-    		</div>	</div>
+    		</div>
+      </div>
+      <!-- 设置计算式 -->
+      <div id="generate-data" class="modal" 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="modal-height-500-scroll">
+                <table class="table table-bordered">
+                  <tr><th>指标源</th><th>选择</th></tr>
+                  <tr class="table-secondary"><td>XXX标段 2018-03-14 17:12:23</td><td><input type="checkbox"></td></tr>
+                  <tr class=""><td>YYY标段 2018-03-14 17:12:23</td><td><input type="checkbox" checked></td></tr>
+                  <tr class=""><td>ZZZ标段 2018-03-14 17:12:23</td><td><input type="checkbox" checked></td></tr>
+                  <tr class=""><td>AAA标段 2018-03-14 17:12:23</td><td><input type="checkbox" checked></td></tr>
+                  <tr class="table-secondary"><td>BBB标段 2018-03-14 17:12:23</td><td><input type="checkbox"></td></tr>
+                  <tr class="table-secondary"><td>CCC标段 2018-03-14 17:12:23</td><td><input type="checkbox"></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>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>
     <script src="js/bootstrap/bootstrap.min.js"></script>
     <script src="js/global.js"></script>
     <script type="text/javascript">
+    $('#generate-data').modal('show');
     autoFlashHeight();
     </script>
 </body>

template.html

@@ -104,16 +104,16 @@
               <table class="table table-bordered">
                 <legend>全局参数</legend>
                 <tr><th>名称</th><th>代码</th><th>描述</th></tr>
-                <tr><td>总造价</td><td>zzj</td><td><a href=""><i class="fa fa-info"></i></a></td></tr>
-                <tr><td>路线总长度</td><td>lxzcd</td><td><a href=""><i class="fa fa-info"></i></a></td></tr>
-                <tr><td>输入框</td><td>input</td><td><a href=""><i class="fa fa-info"></i></a></td></tr>
+                <tr><td>总造价</td><td>zzj</td><td><a href="javascript:void(0)" data-container="body" data-toggle="popover" data-placement="bottom" data-content="描述内容"><i class="fa fa-info"></i></a></td></tr>
+                <tr><td>路线总长度</td><td>lxzcd</td><td><a href="javascript:void(0)" data-container="body" data-toggle="popover" data-placement="bottom" data-content="描述内容"><i class="fa fa-info"></i></a></td></tr>
+                <tr><td>输入框</td><td>input</td><td><a href="javascript:void(0)" data-container="body" data-toggle="popover" data-placement="bottom" data-content="描述内容"><i class="fa fa-info"></i></a></td></tr>
               </table>
             </div>
             <div class="col-6">
               <table class="table table-bordered">
                 <legend>本项目节参数</legend>
                 <tr><th>名称</th><th>代码</th><th>描述</th></tr>
-                <tr><td>合价</td><td>hj</td><td><a href=""><i class="fa fa-info"></i></a></td></tr>
+                <tr><td>合价</td><td>hj</td><td><a href="javascript:void(0)" data-container="body" data-toggle="popover" data-placement="bottom" data-content="描述内容"><i class="fa fa-info"></i></a></td></tr>
               </table>
             </div>
           </div>