瀏覽代碼

项目管理 侧栏固定宽度;菜单栏合并至标题栏;新建工程交互更新。

Chente 7 年之前
父節點
當前提交
1c905f54af
共有 3 個文件被更改,包括 145 次插入284 次删除
  1. 4 2
      css/main.css
  2. 91 224
      project-management.html
  3. 50 58
      zaojiashu.html

+ 4 - 2
css/main.css

@@ -10,6 +10,9 @@ body {
 .btn.disabled, .btn:disabled {
   color:#999
 }
+.btn-link:focus, .btn-link:hover{
+  text-decoration: none
+}
 /*自定义css*/
 .header {
     background: #e1e1e1
@@ -306,6 +309,5 @@ body {
   border-bottom:1px solid #ddd
 }
 .navbar-crumb span{
-  max-width: 200px;
-  display: inline-block;
+  max-width: 200px
 }

+ 91 - 224
project-management.html

@@ -15,65 +15,76 @@
 
 <body>
     <div class="header">
-        <div class="top-msg clearfix">
+        <!-- <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 bg-light bg-faded p-0 justify-content-between">
-          <span class="header-logo px-2">Smartcost</span>
-          <div class="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>
-              </div>
-              <span class="btn btn-link btn-sm new-msg">
-                <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
-              </span>
-              <button class="btn btn-link btn-sm">注销</button>
-          </div>
-        </nav>
-        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
+        </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-haspopup="true" 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="#">工料机库编辑器</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>
+                    <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>
-                </li>
-            </ul>
-            <form class="form-inline">
-                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
-            </form>
+                </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="poj-manage container-fluid">
             <div class="row">
-                <div class="col-lg-2">
+                <div class="col-auto">
                     <div class="poj-cate">
                         <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
                         <ul class="nav nav-pills flex-column">
@@ -98,13 +109,18 @@
                         </ul>
                     </div>
                 </div>
-                <div class="col-lg-10">
+                <div class="col">
                     <div class="toolsbar">
                         <div class="tools-btn btn-group align-top">
-                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>
-                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj2" class="btn btn-sm">新建 <i class="fa fa-cube"></i> 单项工程</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj3" class="btn btn-sm disabled2">新建 <i class="fa fa-sticky-note-o"></i> 单位工程</a>
-                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="btn btn-sm">新建 <i class="fa fa-folder-o"></i> 文件夹</a>
+                            <div class="btn-group" role="group">
+                              <a href="javacript:void(0);" class="btn btn-sm dropdown-toggle" data-toggle="dropdown"></a>
+                              <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+                                <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="dropdown-item"><span class="btn-sm btn-link">新建 <i class="fa fa-cubes"></i> 建设项目</span></a>
+                                <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj2" class="dropdown-item"><span class="btn-sm btn-link">新建 <i class="fa fa-cube"></i> 单项工程</span></a>
+                                <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="dropdown-item"><span class="btn-sm btn-link">新建 <i class="fa fa-folder-o"></i> 文件夹</span></a>
+                              </div>
+                            </div>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#rename" class="btn btn-sm">重命名</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="btn btn-sm">删除</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#moveto" class="btn btn-sm">移动到...</a>
@@ -119,9 +135,11 @@
                             <thead>
                                 <tr>
                                     <th width="40"></th>
-                                    <th width="78%">工程列表</th>
-                                    <th width="10%">最近使用</th>
-                                    <th width="10%">创建日期</th>
+                                    <th width="55%">工程列表</th>
+                                    <th width="8%">计价方式</th>
+                                    <th width="16%">计价规则</th>
+                                    <th width="9%">工程专业</th>
+                                    <th width="8%">创建日期</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -130,181 +148,42 @@
                                     <td class="in-1"><a href="#" class="tree-close" title="展开"><i class="fa fa-plus-square-o"></i></a><i class="fa fa-folder-o"></i>&nbsp;文件夹</td>
                                     <td></td>
                                     <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;文件夹</td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;左2号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;轮船生产</td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cubes"></i>&nbsp;船体生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;6号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">├</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程3</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">├</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程4</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程5</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;7号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程6</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class=""></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;8号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class=""></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;9号生产车间</a></td>
                                     <td></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <td></td>
-                                    <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cubes"></i>&nbsp;甲板生产车间</a></td>
-                                    <td></td>
+                                    <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;文件夹</td>
                                     <td></td>
-                                </tr>
-                                <tr>
                                     <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;7号生产车间</a></td>
                                     <td></td>
                                     <td></td>
                                 </tr>
                                 <tr>
                                     <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">├</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程7</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
+                                    <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</a></td>
                                     <td></td>
-                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程8</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
                                     <td></td>
-                                    <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;XX项目文件夹</td>
                                     <td></td>
                                     <td></td>
                                 </tr>
-                                  <tr>
-                                      <td></td>
-                                      <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;XX项目文件夹</td>
-                                      <td></td>
-                                      <td></td>
-                                  </tr>
                                 <tr>
                                     <td></td>
-                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;XX项目文件夹</td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-4"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#"><i class="fa fa-cubes"></i>&nbsp;某某某某工厂工厂某某工厂建设某某工厂建设</a></td>
-                                    <td></td>
+                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;左2号生产车间</a></td>
                                     <td></td>
-                                </tr>
-                                <tr>
                                     <td></td>
-                                    <td class="in-5"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;左1号生产车间(click)</a></td>
                                     <td></td>
                                     <td></td>
                                 </tr>
                                 <tr>
-                                    <td><i class="fa fa-sort" data-toggle="tooltip" data-placement="top" title="长安拖动"></i></td>
-                                    <td class="in-6"><a class="tree-open"></a><span class="poj-icon">├</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程(click)</a></td>
-                                    <td>2016-01-01</td>
-                                    <td>2016-01-01</td>
-                                </tr>
-                                <tr>
                                     <td></td>
-                                    <td class="in-6"><a class="tree-open"></a><span class="poj-icon">└</span><a href="#"><i class="fa fa-sticky-note-o"></i>&nbsp;机械设备安装工程</a></td>
-                                    <td>2016-01-01</td>
+                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</a></td>
+                                    <td>清单计价</td>
+                                    <td>重庆[2008]调整人工单价</td>
+                                    <td>建筑工程</td>
                                     <td>2016-01-01</td>
                                 </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-5"><a href="#" class="tree-close" title="展开"><i class="fa fa-plus-square-o  mr-1"></i></a><a href="#"><i class="fa fa-cube"></i>&nbsp;2号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-1"><a href="#" class="tree-close" title="展开"><i class="fa fa-plus-square-o  mr-1"></i></a><a href="#"><i class="fa fa-cubes"></i>&nbsp;3号生产车间</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-2"><a href="#" class="tree-close" title="展开"><i class="fa fa-plus-square-o  mr-1"></i></a><a href="#"><i class="fa fa-cube"></i>&nbsp;大炮</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
-                                <tr>
-                                    <td></td>
-                                    <td class="in-2"><a href="#" class="tree-close" title="展开"><i class="fa fa-plus-square-o  mr-1"></i></a><a href="#"><i class="fa fa-cube"></i>&nbsp;机枪</a></td>
-                                    <td></td>
-                                    <td></td>
-                                </tr>
+
                             </tbody>
                         </table>
                     </div>
@@ -492,31 +371,11 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                  <!--没有点击任何节点-->
                     <form>
                         <div class="form-group">
                             <label>建设项目</label>
                             <input type="text" class="form-control" placeholder="输入建设项目名称">
                         </div>
-                        <div class="form-group">
-                            <label>计价方式</label>
-                            <div>
-                                <label class="custom-control custom-radio">
-                                  <input id="radio1" name="radio" type="radio" class="custom-control-input">
-                                  <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>
-                        <div class="form-group">
-                            <label>计价规则</label>
-                            <select class="form-control"><option>重庆[2008]调整人工单价</option></select>
-                        </div>
                     </form>
                 </div>
                 <div class="modal-footer">
@@ -537,7 +396,6 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                  <!--没有点击任何节点-->
                     <form>
                         <div class="form-group">
                             <label>单项工程</label>
@@ -563,9 +421,18 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                  <!--没有点击任何节点-->
                     <form>
                         <div class="form-group">
+                            <label>建设项目</label>
+                            <input type="text" class="form-control" placeholder="输入建设项目名称" value="汽车生产车间">
+                            <span class="form-text text-danger">同级已存在“汽车生产车1”</span>
+                        </div>
+                        <div class="form-group">
+                            <label>单项工程</label>
+                            <input type="text" class="form-control" placeholder="输入单项工程名称" value="左2号生产车间">
+                            <span class="form-text text-info">新建“左2号生产车间2”</span>
+                        </div>
+                        <div class="form-group">
                             <label>单位工程</label>
                             <input type="text" class="form-control" placeholder="输入单位工程名称">
                         </div>
@@ -586,7 +453,7 @@
                                   <span class="custom-control-description">清单计价</span>
                                 </label>
                                 <label class="custom-control custom-radio">
-                                  <input id="radio2" name="radio" type="radio" class="custom-control-input" disabled>
+                                  <input id="radio2" name="radio" type="radio" class="custom-control-input">
                                   <span class="custom-control-indicator"></span>
                                   <span class="custom-control-description">定额计价</span>
                                 </label>
@@ -594,7 +461,7 @@
                         </div>
                         <div class="form-group">
                             <label>计价规则</label>
-                            <select class="form-control " disabled><option>重庆[2008]调整人工单价</option></select>
+                            <select class="form-control "><option>重庆[2008]调整人工单价</option></select>
                         </div>
                         <div class="form-group">
                             <label>工程专业</label>

+ 50 - 58
zaojiashu.html

@@ -21,71 +21,63 @@
                 <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
         </div> -->
-        <nav class="navbar navbar-expand-lg bg-light bg-faded p-0 justify-content-between">
+        <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="text-truncate"><a href="project-management.html">项目管理</a></span>
-                <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="文件夹A"><i class="fa fa-folder-open-o"></i></span>
-                <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="文件夹B"><i class="fa fa-folder-open-o"></i></span>
-                <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i> 乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
-                <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i> 乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
-                <span class="text-truncate"><i class="fa fa-angle-right fa-fw"></i></span>
-                <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-sticky-note-o"></i> 乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
+                <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="float-lg-right navbar-text p-0">
+            <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>
-                <button class="btn btn-link btn-sm">注销</button>
             </div>
         </nav>
-        <nav class="navbar navbar-expand-lg justify-content-between navbar-light p-0">
-            <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>
-                <li class="nav-item">
-                    <a href="javacript:void(0);" data-toggle="modal" data-target="#history" class="nav-link"><i class="fa fa-history"></i> 历史记录</a>
-                </li>
-            </ul>
-            <form class="form-inline">
-                <input class="form-control form-control-sm mr-1" type="text" placeholder="告诉我你想做什么">
-            </form>
-        </nav>
     </div>
     <div class="main">
         <div class="main-nav">
@@ -100,17 +92,17 @@
         <div class="content">
           <div class="toolsbar px-1 d-flex justify-content-between">
               <div class="tools-btn btn-group align-top">
-                <a href="" class="btn btn-sm"><i class="fa fa-files-o" aria-hidden="true"></i> 复制</a>
-                <a href="" class="btn btn-sm"><i class="fa fa-scissors" aria-hidden="true"></i> 接切</a>
-                <a href="" class="btn btn-sm"><i class="fa fa-clipboard" aria-hidden="true"></i> 粘贴</a>
-                <a href="" class="btn btn-sm"><i class="fa fa-remove" aria-hidden="true"></i> 删除</a>
-                <a href="" class="btn btn-sm disabled"><i class="fa fa-arrow-left" aria-hidden="true"></i> 升级</a>
-                <a href="" class="btn btn-sm disabled"><i class="fa fa-arrow-right" aria-hidden="true"></i> 降级</a>
-                <a href="" class="btn btn-sm"><i class="fa fa-arrow-down" aria-hidden="true"></i> 下移</a>
-                <a href="" class="btn btn-sm"><i class="fa fa-arrow-up" aria-hidden="true"></i> 上移</a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="接切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
               </div>
               <div class="tools-btn">
-                <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
+                <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="列设置"></i></a>
               </div>
               <div class="side-tabs">
                   <ul class="nav nav-tabs" role="tablist">