增加调价页面；造价书 增加 清单指引

feilv.html

@@ -87,63 +87,6 @@
               <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
           </div>
       </div> -->
-      <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
-          <div class="navbar-text navbar-crumb p-0">
-              <span class=""><a href="project-management.html">项目管理</a></span>
-              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-              <span class="" data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-o"></i></span>
-              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i></span>
-              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i></span>
-              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
-              <span><i class="fa fa-sticky-note-o"></i></span>
-              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"> <span class="text-truncate float-right">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span></span>
-          </div>
-          <ul class="nav navbar-nav px-1">
-                  <li class="nav-item">
-                      <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
-                  </li>
-                  <li class="nav-item">
-                      <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
-                  </li>
-                  <li class="nav-item dropdown">
-                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
-                      <div class="dropdown-menu">
-                          <a class="dropdown-item" href="#">定额库编辑器</a>
-                          <a class="dropdown-item" href="tools-gongliaoji.html">工料机库编辑器</a>
-                      </div>
-                  </li>
-                  <li class="nav-item dropdown">
-                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o"></i> 帮助</a>
-                      <div class="dropdown-menu">
-                          <a class="dropdown-item" href="#">帮助</a>
-                          <a class="dropdown-item" href="#">升级说明</a>
-                          <a class="dropdown-item" href="#">重庆市2008定额说明</a>
-                          <a class="dropdown-item" href="#">纵横官网</a>
-                          <a class="dropdown-item" href="#">动画教程</a>
-                          <a class="dropdown-item" href="#">联系客服</a>
-                          <a class="dropdown-item" href="#">关于</a>
-                      </div>
-                  </li>
-              </ul>
-          <div class="ml-auto navbar-text p-0">
-              <div class="dropdown d-inline-block navbar-nav">
-                  <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
-                  <div class="dropdown-menu dropdown-menu-right">
-                      <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
-                      <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
-                      <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
-                      <div class="dropdown-divider"></div>
-                      <a class="dropdown-item" href="#" target="_blank">退出登录</a>
-                  </div>
-              </div>
-              <a class="btn btn-link btn-sm new-msg" data-toggle="modal" data-target="#msg" href="javacript:void(0);">
-                <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
-              </a>
-          </div>
-      </nav>
   </div>
     <div class="main">
         <div class="main-nav">

js/global.js

@@ -6,8 +6,10 @@ function autoFlashHeight(){
     var bottomContentHeight = $(".bottom-content").height();
     var toolsBarHeightQ = $(".tools-bar-height-q").height();
     var toolsBarHeightD = $(".tools-bar-height-d").height();
+    var toolsBarHeightZ = $(".tools-bar-height-z").height();
     $(".main-data-side-q").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightQ-302);
     $(".main-data-side-d").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightD-302);
+    $(".main-data-side-z").height($(window).height()-headerHeight-toolsbarHeight-toolsBarHeightZ-2);
     $(".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);

tiaojia.html

@@ -0,0 +1,217 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>调价-Smartcost</title>
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+</head>
+
+<body>
+  <div class="header">
+      <!-- <div class="top-msg clearfix">
+          <div class="alert alert-warning mb-0 py-0" role="alert">
+              <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+              <strong>注意！</strong> 这是一条消息通知 <a href="#">链接</a>
+          </div>
+      </div> -->
+      <nav class="navbar navbar-expand-lg p-0 d-flex">
+          <span class="header-logo px-2">Smartcost</span>
+          <ul class="nav navbar-nav px-1">
+                  <li class="nav-item">
+                      <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
+                  </li>
+                  <li class="nav-item">
+                      <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
+                  </li>
+                  <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
+                      <div class="dropdown-menu">
+                          <a class="dropdown-item" href="#">定额库编辑器</a>
+                          <a class="dropdown-item" href="tools-gongliaoji.html">工料机库编辑器</a>
+                      </div>
+                  </li>
+                  <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o"></i> 帮助</a>
+                      <div class="dropdown-menu">
+                          <a class="dropdown-item" href="#">帮助</a>
+                          <a class="dropdown-item" href="#">升级说明</a>
+                          <a class="dropdown-item" href="#">重庆市2008定额说明</a>
+                          <a class="dropdown-item" href="#">纵横官网</a>
+                          <a class="dropdown-item" href="#">动画教程</a>
+                          <a class="dropdown-item" href="#">联系客服</a>
+                          <a class="dropdown-item" href="#">关于</a>
+                      </div>
+                  </li>
+              </ul>
+          <div class="navbar-text navbar-crumb p-0">
+              <span class=""><a href="project-management.html">项目管理</a></span>
+              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+              <span class="" data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-o"></i></span>
+              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i></span>
+              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i></span>
+              <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+              <span><i class="fa fa-sticky-note-o"></i></span>
+              <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"> <span class="text-truncate float-right">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span></span>
+          </div>
+          <div class="ml-auto navbar-text p-0">
+              <div class="dropdown d-inline-block navbar-nav">
+                  <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
+                  <div class="dropdown-menu dropdown-menu-right">
+                      <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
+                      <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
+                      <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
+                      <div class="dropdown-divider"></div>
+                      <a class="dropdown-item" href="#" target="_blank">退出登录</a>
+                  </div>
+              </div>
+              <a class="btn btn-link btn-sm new-msg" data-toggle="modal" data-target="#msg" href="javacript:void(0);">
+                <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
+              </a>
+          </div>
+      </nav>
+  </div>
+    <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">计算程序</a></li>
+              <li><a href="tiaojia.html" class="active">调价</a></li>
+              <li><a href="baobiao.html">报表</a></li>
+            </ul>
+        </div>
+        <div class="content">
+            <div class="toolsbar px-1">
+              <div class="btn-toolbar py-1">
+                <div class="input-group input-group-sm mr-2" style="width:220px">
+                  <div class="input-group-prepend">
+                    <span class="input-group-text" id="inputGroup-sizing-sm">工料机单价调整系数</span>
+                  </div>
+                  <input type="number" step="0.1" class="form-control" placeholder="请输入系数" value="1">
+                </div>
+                <div class="btn-group mr-2">
+                  <button type="button" class="btn btn-outline-primary btn-sm">反调消耗</button>
+                  <button type="button" class="btn btn-outline-primary btn-sm">反调单价</button>
+                  <button type="button" class="btn btn-outline-primary btn-sm">正向调价</button>
+                </div>
+                <button type="button" class="btn btn-outline-danger btn-sm">清空调价</button>
+              </div>
+            </div>
+            <div class="container-fluid">
+                <div class="row">
+                    <div class="main-content col-12 p-0">
+                      <div class="main-data-full">
+                        <table class="table table-sm table-bordered m-0">
+                          <thead>
+                            <tr>
+                              <th rowspan="2"></th><th rowspan="2">项目编码</th><th rowspan="2">项目名称</th><th rowspan="2">计量单位</th><th rowspan="2">工程量</th><th rowspan="2">不调价</th><th colspan="2">初始报价</th><th colspan="2">反向目标</th><th colspan="2">调整后报价</th><th colspan="5">消耗量调整系数</th>
+                            </tr>
+                            <tr><th>综合单价</th><th>综合合价</th><th>综合单价</th><th>综合合价</th><th>综合单价</th><th>综合合价</th><th>人工</th><th>材料</th><th>机械</th><th>主材</th><th>设备</th></tr>
+                          </thead>
+                        </table>
+                      </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出更换-->
+    <div class="modal fade" id="change-dj" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <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="form-group">
+                    <label class="custom-control custom-radio">
+                      <input id="radio1" name="radio" type="radio" class="custom-control-input" checked>
+                      <span class="custom-control-indicator"></span>
+                      <span class="custom-control-description">从本建设项目中选择</span>
+                    </label>
+                    <label class="custom-control custom-radio">
+                      <input id="radio2" name="radio" type="radio" class="custom-control-input">
+                      <span class="custom-control-indicator"></span>
+                      <span class="custom-control-description">从其他建设项目中复制</span>
+                    </label>
+                  </div>
+                  <!--从本建设项目中选择-->
+                  <div class="form-group">
+                    <label>建设项目A</label>
+                    <select class="form-control"><option>单价1</option><option>单价2</option><option>单价3</option></select>
+                  </div>
+                  <!--从其他建设项目中复制-->
+                  <div class="form-group">
+                    <label>选择建设项目</label>
+                    <select class="form-control"><option>建设项目B</option><option>建设项目C</option><option>建设项目D</option></select>
+                  </div>
+                  <div class="form-group">
+                    <select class="form-control"><option>单价1</option><option>单价2</option><option>单价3</option></select>
+                    <small class="form-text text-muted">你选择的单价文件将复制一份至新项目，不会影响原建设项目的单价文件。</small>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出 另存新文件-->
+    <div class="modal fade" id="copy-lv" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <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="form-group">
+                    <label>单价文件名称</label>
+                    <input class="form-control"  value="单价1副本">
+                    <!--默认为复制单价文件名字+副本 2字，用户修改后需判断是否在同项目下存在同名-->
+                    <small class="form-text text-danger">已存在同名费率文件。</small>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </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>
+</body>
+<script type="text/javascript">
+    $('#pop-dj').popover({
+      placement:"bottom",
+      html:true,
+      trigger:"hover | focus",
+      content:"A单位工程<br>B单位工程<br>C单位工程"
+    }
+    );
+</script>
+<script type="text/javascript">
+    autoFlashHeight();
+</script>
+
+</html>

zaojiashu.html

@@ -79,6 +79,7 @@
               <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">报表</a></li>
             </ul>
         </div>
@@ -246,6 +247,9 @@
               </div>
               <div class="side-tabs">
                   <ul class="nav nav-tabs" role="tablist">
+                    <li class="nav-item">
+                        <a class="nav-link px-3" data-toggle="tab" href="#zy" role="tab">清单指引</a>
+                    </li>
                       <li class="nav-item">
                           <a class="nav-link active px-3" data-toggle="tab" href="#qd" role="tab">清单规则</a>
                       </li>
@@ -260,14 +264,12 @@
                     <div class="main-content col-lg-8 p-0">
                         <div class="top-content">
                             <div class="main-data-top">
-
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-jsjs">计算基数 窗口</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-fl">费率(%) 窗口</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#loading">loading</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#zlfb">右键“整理分部”</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#jqaz">右键“计取安装费用”</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#ntwz">粘帖位置选择</a>
-
                             </div>
                         </div>
                         <div class="bottom-content">
@@ -782,6 +784,23 @@
                     </div>
                     <div class="main-side col-lg-4 p-0">
                         <div class="tab-content">
+                            <!--清单指引-->
+                            <div class="tab-pane" id="zy" role="tabpanel">
+                              <div class="sidebar-tools-bar container-fluid tools-bar-height-z">
+                                <div class="p-1 d-flex justify-content-center">
+                                  <button class="btn btn-primary btn-sm mx-3" type="button">插入定额</button>
+                                  <button class="btn btn-primary btn-sm mx-3" type="button">插入清单</button>
+                                </div>
+                              </div>
+                              <div class="main-data-side-z">
+                                <table class="table table-bordered">
+                                  <tr>
+                                    <th></th><th>项目指引</th><th>选择</th>
+                                  </tr>
+                                  </tr>
+                                </table>
+                              </div>
+                            </div>
                             <!--清单规则-->
                             <div class="tab-pane active" id="qd" role="tabpanel">
                                 <div class="sidebar-tools-bar container-fluid tools-bar-height-q">