报表相关修改

baobiao.html

@@ -84,9 +84,10 @@
         <div class="main-nav">
             <ul class="nav flex-column">
               <li><a href="zaojiashu.html">造价书</a></li>
-              <li><a href="gongliaoji.html">工料机</a></li>
+              <li><a href="gongliaoji.html">人材机</a></li>
               <li><a href="feilv.html">费率</a></li>
               <li><a href="jisuanchengxu.html">计算程序</a></li>
+              <li><a href="tiaojia.html">调价</a></li>
               <li><a href="baobiao.html" class="active">报表</a></li>
             </ul>
         </div>
@@ -96,7 +97,7 @@
                 <div class="col-lg-2 p-0">
                   <div class="print-list">
                   <div class="list-tools d-flex justify-content-center">
-                    <button class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#editForm"><i class="fa fa-cog"></i> 管理报表</button>
+                    <button class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#editForm"><i class="fa fa-cog"></i> 管理报表</button>
                   </div>
                     <div class="form-list">
                       <ul id="treeDemo" class="ztree"></ul>
@@ -108,21 +109,30 @@
                     <div class="print-toolsbar">
                       <div class="panel">
                         <div class="panel-body">
-                          <button class="btn btn-secondary btn-sm" type="button">
+                          <div class="btn-group" role="group">
+                            <button class="btn btn-outline-primary btn-sm" type="button">
                             <i class="fa fa-print"></i><br>
-                            打印 <span id="checkCount" class="badge badge-light">5</span>
-                          </button>
-                          <button class="btn btn-secondary btn-sm" type="button"  href="#export" data-toggle="modal" data-target="#export">
-                            <i class="fa fa-share-square-o"></i><br>
-                            导出 <span id="checkCount" class="badge badge-light">5</span>
+                            打印 <span class="badge badge-secondary">5</span>
                           </button>
+                          </div>
                         </div>
                       </div>
                       <div class="panel">
                           <div class="panel-body">
                             <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#export"><i class="fa fa-file-excel-o"></i> Excel <span class="badge badge-secondary">5</span></button>
+                              <button type="button" class="btn btn-outline-primary btn-sm"><i class="fa fa-file-pdf-o"></i> PDF <span class="badge badge-secondary">5</span></button>
+                            </div>
+                          </div>
+                          <div class="panel-foot text-muted">
+                            导出报表
+                          </div>
+                      </div>
+                      <div class="panel">
+                          <div class="panel-body">
+                            <div class="btn-group" role="group">
                               <div class="btn-group" role="group">
-                                <button id="btnGroupDrop1" type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                   纵向
                                 </button>
                                 <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
@@ -130,7 +140,7 @@
                                 </div>
                               </div>
                               <div class="btn-group" role="group">
-                                <button id="btnGroupDrop1" type="button" class="btn btn-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                   A4
                                 </button>
                                 <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
@@ -146,9 +156,9 @@
                       <div class="panel">
                           <div class="panel-body">
                             <div class="btn-group" role="group">
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="缩小">-</button>
-                              <button class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重置默认大小">1000%</button>
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="放大">+</button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="缩小">-</button>
+                              <button class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="重置默认大小">1000%</button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="放大">+</button>
                             </div>
                           </div>
                           <div class="panel-foot text-muted">
@@ -157,10 +167,10 @@
                       </div>
                       <div class="panel">
                           <div class="panel-body">
-                            <div class="btn-group" role="group" aria-label="Button group with nested dropdown">
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#paper"><i class="fa fa-file-o"></i> 纸张</button>
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#format"><i class="fa fa-bold"></i> 格式</button>
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#content"><i class="fa fa-file-text-o"></i> 内容</button>
+                            <div class="btn-group" role="group">
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#paper"><i class="fa fa-file-o"></i> 页边距</button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#format"><i class="fa fa-bold"></i> 页面</button>
+                              <!-- <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#content"><i class="fa fa-file-text-o"></i> 内容</button> -->
                             </div>
                           </div>
                           <div class="panel-foot text-muted">
@@ -171,11 +181,13 @@
                         <div class="panel-body">
                           <div class="input-group input-group-sm">
                             <div class="input-group-prepend">
-                              <button type="button" class="btn btn-secondary btn-sm" disabled data-toggle="tooltip" data-placement="bottom" title="上一页"><i class="fa fa-chevron-left"></i></button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="第一页"><i class="fa fa-angle-double-left "></i></button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" disabled data-toggle="tooltip" data-placement="bottom" title="上一页"><i class="fa fa-angle-left "></i></button>
                             </div>
                             <input class="form-control" value="1/10" style="width:60px"  data-toggle="tooltip" data-placement="bottom" title="输入页码按回车键，快速跳转">
                             <div class="input-group-append">
-                              <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页"><i class="fa fa-chevron-right"></i></button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页"><i class="fa fa-angle-right"></i></button>
+                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="tooltip" data-placement="bottom" title="尾页"><i class="fa fa-angle-double-right "></i></button>
                             </div>
                           </div>
                         </div>
@@ -190,15 +202,6 @@
                         <div class="page">
                           <img src="img/baobiao.png">
                         </div>
-                        <div class="page">
-                          <img src="img/baobiao.png">
-                        </div>
-                        <div class="page">
-                          <img src="img/baobiao.png">
-                        </div>
-                        <div class="page">
-                          <img src="img/baobiao.png">
-                        </div>
                       </div>
                     </div>
                 </div>
@@ -251,57 +254,51 @@
           <div class="modal-dialog" role="document">
               <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-label="Close">
                         <span aria-hidden="true">&times;</span>
                       </button>
                   </div>
                   <div class="modal-body">
-                    <div class="row mb-1">
-                      <div class="col-3">
-                        纸张大小
-                      </div>
-                      <div class="col-3">
-                        <select class="form-control form-control-sm"><option>A4</option><option>A3</option></select>
-                      </div>
+                    <div class="row mb-1 justify-content-center">
                       <div class="col-3">
-                        纸张方向
-                      </div>
-                      <div class="col-3">
-                        <select class="form-control form-control-sm"><option>纵向</option><option>横向</option></select>
+                        <div class="input-group input-group-sm ">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon1">上</span>
+                          </div>
+                         <input type="number" class="form-control" value="12">
+                        </div>
                       </div>
                     </div>
-                    <div class="row mb-1">
+                    <div class="row mb-1 align-items-center">
                       <div class="col-3">
-                        缩放比例
+                        <div class="input-group input-group-sm ">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon1">左</span>
+                          </div>
+                         <input type="number" class="form-control" value="12">
+                        </div>
                       </div>
-                      <div class="col-3">
-                        <select class="form-control form-control-sm"><option>100%</option></select>
+                      <div class="col-6">
+                        <h1 class="display-4 text-center"><i class="fa fa-file-o"></i></h1>
                       </div>
-                    </div>
-                    <div class="row mb-1">
                       <div class="col-3">
-                        页边距
-                      </div>
-                      <div class="input-group input-group-sm col-md-4">
-                       <label class="input-group-addon">上</label>
-                       <input type="number" class="form-control" value="12">
-                      </div>
-                      <div class="input-group input-group-sm col-md-4">
-                       <label class="input-group-addon">下</label>
-                       <input type="number" class="form-control" value="12">
+                        <div class="input-group input-group-sm ">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon1">右</span>
+                          </div>
+                         <input type="number" class="form-control" value="12">
+                        </div>
                       </div>
                     </div>
-                    <div class="row mb-1">
+                    <div class="row mb-1 justify-content-center">
                       <div class="col-3">
-                      </div>
-                      <div class="input-group input-group-sm col-md-4">
-                       <label class="input-group-addon">左</label>
-                       <input type="number" class="form-control" value="12">
-                      </div>
-                      <div class="input-group input-group-sm col-md-4">
-                       <label class="input-group-addon">右</label>
-                       <input type="number" class="form-control" value="12">
+                        <div class="input-group input-group-sm ">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon1">下</span>
+                          </div>
+                         <input type="number" class="form-control" value="12">
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -313,12 +310,12 @@
               </div>
           </div>
       </div>
-      <!--弹出格式-->
+      <!--弹出页面-->
       <div class="modal fade" id="format" data-backdrop="static">
           <div class="modal-dialog" role="document">
               <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-label="Close">
                         <span aria-hidden="true">&times;</span>
                       </button>
@@ -532,7 +529,7 @@
           <div class="modal-dialog" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                    <h5 class="modal-title">选择导出格式</h5>
+                    <h5 class="modal-title">批量导出Excel</h5>
                       <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                       </button>
@@ -540,28 +537,36 @@
                   <div class="modal-body">
                     <div class="row">
                       <div class="col-6">
-                        <a class="btn btn-block btn-primary" href="#">
-                          <i class="fa fa-check-square pull-right"></i>
-                          <div class="card-body text-center">
-                            <h1 class="display-3"><i class="fa fa-file-pdf-o"></i></h1>
-                            <h1>PDF</h1>
+                        <div class="card">
+                          <img class="card-img-top" src="img/p2.png">
+                          <div class="card-body px-3">
+                            <div class="form-check">
+                              <input class="form-check-input" type="radio" name="exampleRadios" id="exampleRadios1" value="option1" checked>
+                              <label class="form-check-label" for="exampleRadios1">
+                                多个表导出一个Excel文件
+                              </label>
+                            </div>
                           </div>
-                        </a>
+                        </div>
                       </div>
                       <div class="col-6">
-                        <!-- <i class="fa fa-check-square pull-right"></i> -->
-                        <a class="btn btn-block btn-outline-secondary" href="#">
-                          <div class="card-body text-center">
-                            <h1 class="display-3"><i class="fa fa-file-excel-o"></i></h1>
-                            <h1>Excel</h1>
+                        <div class="card">
+                          <img class="card-img-top" src="img/p1.png">
+                          <div class="card-body px-3">
+                            <div class="form-check">
+                              <input class="form-check-input" type="radio" name="exampleRadios" id="exampleRadios2" value="option2" checked>
+                              <label class="form-check-label" for="exampleRadios2">
+                                每个表导出一个Excel文件
+                              </label>
+                            </div>
                           </div>
-                        </a>
+                        </div>
                       </div>
                     </div>
                   </div>
                   <div class="modal-footer">
                       <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-primary">确定</a>
+                      <a href="" class="btn btn-primary">确定导出</a>
                   </div>
               </div>
           </div>

css/main.css

@@ -294,12 +294,13 @@ body {
 }
 .print-toolsbar .panel {
   display:inline-block;
-  vertical-align:top;
-  background:#f7f7f9
+  vertical-align:top
 }
 .print-toolsbar .panel .panel-foot{
   text-align: center;
-  font-size: 12px
+  font-size: 12px;
+  padding-bottom:3px;
+  background:#F2F2F2
 }
 .print-list {
   border-right:1px solid #ccc
@@ -313,7 +314,6 @@ body {
   border-bottom:1px solid #f2f2f2
 }
 .pageContainer {
-  background: #ededed;
   text-align: center
 }
 .pageContainer .page{

feilv.html

@@ -92,9 +92,10 @@
         <div class="main-nav">
             <ul class="nav flex-column">
               <li><a href="zaojiashu.html">造价书</a></li>
-              <li><a href="gongliaoji.html">工料机</a></li>
+              <li><a href="gongliaoji.html">人材机</a></li>
               <li><a href="feilv.html" class="active">费率</a></li>
               <li><a href="jisuanchengxu.html">计算程序</a></li>
+              <li><a href="tiaojia.html">调价</a></li>
               <li><a href="baobiao.html">报表</a></li>
             </ul>
         </div>

gongliaoji.html

@@ -83,9 +83,10 @@
         <div class="main-nav">
             <ul class="nav flex-column">
               <li><a href="zaojiashu.html">造价书</a></li>
-              <li><a href="gongliaoji.html" class="active">工料机</a></li>
+              <li><a href="gongliaoji.html" class="active">人材机</a></li>
               <li><a href="feilv.html">费率</a></li>
               <li><a href="jisuanchengxu.html">计算程序</a></li>
+              <li><a href="tiaojia.html">调价</a></li>
               <li><a href="baobiao.html">报表</a></li>
             </ul>
         </div>

jisuanchengxu.html

@@ -82,11 +82,12 @@
     <div class="main">
         <div class="main-nav">
             <ul class="nav flex-column">
-                <li><a href="zaojiashu.html">造价书</a></li>
-                <li><a href="gongliaoji.html">工料机</a></li>
-                <li><a href="feilv.html">费率</a></li>
-                <li><a href="jisuanchengxu.html" class="active">计算程序</a></li>
-                <li><a href="baobiao.html">报表</a></li>
+              <li><a href="zaojiashu.html">造价书</a></li>
+              <li><a href="gongliaoji.html">人材机</a></li>
+              <li><a href="feilv.html">费率</a></li>
+              <li><a href="jisuanchengxu.html" class="active">计算程序</a></li>
+              <li><a href="tiaojia.html">调价</a></li>
+              <li><a href="baobiao.html">报表</a></li>
             </ul>
         </div>
         <div class="content">

zaojiashu.html

@@ -80,7 +80,7 @@
         <div class="main-nav">
             <ul class="nav flex-column">
               <li><a href="zaojiashu.html" class="active">造价书</a></li>
-              <li><a href="gongliaoji.html">工料机</a></li>
+              <li><a href="gongliaoji.html">人材机</a></li>
               <li><a href="feilv.html">费率</a></li>
               <li><a href="jisuanchengxu.html">计算程序</a></li>
               <li><a href="tiaojia.html">调价</a></li>
@@ -278,7 +278,7 @@
                         <div class="bottom-content">
                             <ul class="nav nav-tabs d-flex" role="tablist">
                                 <li class="nav-item">
-                                    <a class="nav-link active" data-toggle="tab" href="#gl" role="tab">工料机</a>
+                                    <a class="nav-link active" data-toggle="tab" href="#gl" role="tab">人材机</a>
                                 </li>
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#fzt" role="tab">附注条件</a>