Browse Source

添加全局参数增加loading

Chente 7 years ago
parent
commit
e6686310e2
2 changed files with 12 additions and 42 deletions
  1. 10 40
      my-Library-detail.html
  2. 2 2
      my-Library-detail2.html

+ 10 - 40
my-Library-detail.html

@@ -51,7 +51,7 @@
               XXX标段 2018-03-14 17:12:23
               XXX标段 2018-03-14 17:12:23
             </div>
             </div>
             <div>
             <div>
-              <a href="my-Library-detail2.html" class="btn btn-primary btn-sm pull-right">填写项目节参数</a>
+              <a href="#save" data-toggle="modal" data-target="#save"  class="btn btn-primary btn-sm pull-right">保存全局参数</a>
             </div>
             </div>
 					</div>
 					</div>
 				</div>
 				</div>
@@ -62,7 +62,7 @@
 								<a class="nav-link active" href="my-Library-detail.html">全局参数</a>
 								<a class="nav-link active" href="my-Library-detail.html">全局参数</a>
 							</li>
 							</li>
 							<li class="nav-item">
 							<li class="nav-item">
-                <a class="nav-link disabled"  data-container="body" data-toggle="popover" data-placement="right" data-content="请点击右上角「填写项目节参数」">项目节参数</a>
+                <a class="nav-link" href="my-Library-detail2.html">项目节参数</a>
               </li>
               </li>
 						</ul>
 						</ul>
           </div>
           </div>
@@ -70,6 +70,7 @@
             <div class="row">
             <div class="row">
               <div class="col-5">
               <div class="col-5">
                 <div class="sjs-height-1">
                 <div class="sjs-height-1">
+
                   <!--全局参数-->
                   <!--全局参数-->
                   <table class="table table-bordered table-sm table-hover">
                   <table class="table table-bordered table-sm table-hover">
                     <tr><th colspan="4" class="text-center">全局参数</th></tr>
                     <tr><th colspan="4" class="text-center">全局参数</th></tr>
@@ -98,51 +99,20 @@
 			</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>
-	        </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 id="save" class="modal fade" tabindex="-1" role="dialog" data-backdrop="static">
   <div class="modal-dialog">
   <div class="modal-dialog">
     <div class="modal-content">
     <div class="modal-content">
       <div class="modal-header">
       <div class="modal-header">
-        <h5 class="modal-title">删除确认</h5>
-        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h5 class="modal-title">保存全局参数</h5>
       </div>
       </div>
       <div class="modal-body">
       <div class="modal-body">
-        <div class="form">
-          <h5>入库后,才可以进行指标对比。确认入库后,仍然可以对参数进行重新设置,重新进行指标计算。</h5>
+        <div class="alert alert-warning" role="alert">
+          <p class="text-center"><i class="fa fa-cog fa-spin fa-5x fa-fw"></i></p>
+          全局计算中...修改全局参数涉及计算数量比较大,请耐心等待。
         </div>
         </div>
       </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>
 </div>

+ 2 - 2
my-Library-detail2.html

@@ -84,7 +84,7 @@
                     <table class="table table-bordered table-sm table-hover table-f">
                     <table class="table table-bordered table-sm table-hover table-f">
                       <thead>
                       <thead>
                         <tr>
                         <tr>
-                            <th width="100">指标编号</th>
+                            <th width="80">指标编号</th>
                             <th width="150">项目或费用名称</th>
                             <th width="150">项目或费用名称</th>
                             <th colspan="2">指标单位</th>
                             <th colspan="2">指标单位</th>
                             <th width="250">计算规则</th>
                             <th width="250">计算规则</th>
@@ -93,7 +93,7 @@
                         </tr>
                         </tr>
                       </thead>
                       </thead>
                       <tbody id="indexList">
                       <tbody id="indexList">
-                        <tr> <td>z2-1</td> <td>路基工程路线总长度造价指标</td><td>元</td><td>公路公里</td><td>本项合价/路线总长度</td> <td class="text-right">385554513.0264/63.182</td><td class="text-right">6102284</td> </tr>
+                        <tr> <td>z2-1</td> <td>路基工程路线总长度造价指标</td><td>元</td><td width="75">公路公里</td><td>本项合价/路线总长度</td> <td class="text-right">385554513.0264/63.182</td><td class="text-right">6102284</td> </tr>
                         <tr> <td>z2-2</td> <td>路基工程路基长度造价指标</td><td>元</td><td>km</td><td>本项合价/本项数量1</td> <td class="text-right">385554513.0264/19.89</td><td class="text-right">19384340</td> </tr>
                         <tr> <td>z2-2</td> <td>路基工程路基长度造价指标</td><td>元</td><td>km</td><td>本项合价/本项数量1</td> <td class="text-right">385554513.0264/19.89</td><td class="text-right">19384340</td> </tr>
                         <tr> <td>z2-3</td> <td>路基工程建筑总面积造价指标</td><td>元</td><td>m2</td><td>本项合价/(路线总长度*路基宽度*1000)</td> <td class="text-right">385554513.0264/(63.182*35*)</td><td class="text-right"></td> </tr>
                         <tr> <td>z2-3</td> <td>路基工程建筑总面积造价指标</td><td>元</td><td>m2</td><td>本项合价/(路线总长度*路基宽度*1000)</td> <td class="text-right">385554513.0264/(63.182*35*)</td><td class="text-right"></td> </tr>
                         <tr> <td>z2-4</td> <td>路基工程建筑面积造价指标</td><td>元</td><td>m2</td><td>本项合价/(路基长度*路基宽度*1000)</td> <td class="text-right">385554513.0264/(19.89*35*)</td><td class="text-right"></td> </tr>
                         <tr> <td>z2-4</td> <td>路基工程建筑面积造价指标</td><td>元</td><td>m2</td><td>本项合价/(路基长度*路基宽度*1000)</td> <td class="text-right">385554513.0264/(19.89*35*)</td><td class="text-right"></td> </tr>