Chente преди 7 години
родител
ревизия
c9dbc3dcbc
променени са 18 файла, в които са добавени 686 реда и са изтрити 430 реда
  1. 61 57
      baobiao.html
  2. BIN
      css/logo.png
  3. 17 11
      css/main.css
  4. 60 56
      feilv.html
  5. 60 56
      gongliaoji.html
  6. 61 57
      jisuanchengxu.html
  7. 4 1
      login-infoinput.html
  8. 4 1
      login-welcome.html
  9. 41 14
      project-management-Recycle.html
  10. 41 14
      project-management-share.html
  11. 41 14
      project-management-synergy.html
  12. 41 14
      project-management.html
  13. 60 56
      tiaojia.html
  14. 41 14
      user-buy.html
  15. 41 14
      user-info.html
  16. 41 14
      user-safe.html
  17. 41 14
      user-set.html
  18. 31 23
      zaojiashu.html

+ 61 - 57
baobiao.html

@@ -22,63 +22,67 @@
               <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
           </div>
       </div> -->
-      <nav class="navbar navbar-expand-lg p-0 d-flex">
-        <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></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>
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
+                    <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 dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa  fa-cloud-upload"></i> 导入</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
+                            <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
+                        </div>
+                    </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
+                    <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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
+            </div>
+        </nav>
   </div>
     <div class="main">
         <div class="main-nav">

BIN
css/logo.png


+ 17 - 11
css/main.css

@@ -15,20 +15,26 @@ body {
 }
 /*自定义css*/
 .header {
-    background: #e1e1e1
+  border-bottom: 1px solid #ccc
 }
 .header .header-logo {
     background: #ff6501;
-    color: #fff;
     float: left;
     margin-right: 1rem;
     font-size: 1rem;
-    line-height:38px;
-    height:38px
+    height:38px;
+    background:url(logo.png) no-repeat 0 0;
+    padding-left:40px;
+}
+.header-logo div.v-title{
+  font-size:12px;
+  color:#aeaeae;
+  line-height: 12px;
+  margin-top:3px;
 }
-.header .header-logo sup{
-  font-size:10px;
-  top:-1.2em
+.header-logo div.p-title{
+  font-size:14px;
+  color:#ff6501;
 }
 .top-msg{
   position: fixed;
@@ -44,7 +50,7 @@ body {
     position: absolute;
     text-align: center;
     z-index: 999;
-    padding: 2px 0 0 2px
+    padding: 30px 0 0 2px
 }
 .main-nav .nav a {
     display: block;
@@ -99,12 +105,12 @@ body {
     background: #fff
 }
 .toolsbar,.toolsbar-f {
+  background: #f7f7f9;
   border-bottom: 1px solid #ccc
 }
 .tools-btn {
     height: 30px;
-    line-height: 30px;
-    background:#fff
+    line-height: 30px
 }
 .toolsbar .tools-btn.btn:hover,.toolsbar-f .tools-btn.btn:hover {
     background: #f7f7f9;
@@ -343,7 +349,7 @@ body {
   border-bottom:1px solid #ddd
 }
 .navbar-crumb span{
-  max-width: 200px
+  width: 200px
 }
 .dropdown-item{
   color:#007bff

+ 60 - 56
feilv.html

@@ -21,63 +21,67 @@
               <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
           </div>
       </div> -->
-      <nav class="navbar navbar-expand-lg p-0 d-flex">
-        <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></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>
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
+                    <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 dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa  fa-cloud-upload"></i> 导入</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
+                            <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
+                        </div>
+                    </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
-          <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>
+                    </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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
+            </div>
+        </nav>
   </div>
       <!-- <div class="top-msg clearfix">
           <div class="alert alert-warning mb-0 py-0" role="alert">

+ 60 - 56
gongliaoji.html

@@ -21,63 +21,67 @@
               <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
           </div>
       </div> -->
-      <nav class="navbar navbar-expand-lg p-0 d-flex">
-        <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></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>
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
+                    <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 dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa  fa-cloud-upload"></i> 导入</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
+                            <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
+                        </div>
+                    </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
-          <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>
+                    </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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
+            </div>
+        </nav>
   </div>
     <div class="main">
         <div class="main-nav">

+ 61 - 57
jisuanchengxu.html

@@ -21,63 +21,67 @@
               <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
           </div>
       </div> -->
-      <nav class="navbar navbar-expand-lg p-0 d-flex">
-        <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></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>
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
+                    <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 dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa  fa-cloud-upload"></i> 导入</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
+                            <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
+                        </div>
+                    </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
-          <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>
+                    </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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
+            </div>
+        </nav>
   </div>
     <div class="main">
         <div class="main-nav">
@@ -91,7 +95,7 @@
             </ul>
         </div>
         <div class="content">
-            <div class="toolsbar">
+            <div class="toolsbar" style="border:none">
 
             </div>
             <div class="container-fluid">

+ 4 - 1
login-infoinput.html

@@ -22,7 +22,10 @@
               </div>
           </div> -->
           <nav class="navbar navbar-expand-lg p-0 d-flex">
-              <span class="header-logo px-2">Smartcost</span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </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">15812644710</button>

+ 4 - 1
login-welcome.html

@@ -22,7 +22,10 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
           <!-- <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>

+ 41 - 14
project-management-Recycle.html

@@ -24,7 +24,10 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">Smartcost</span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
             <!-- <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>
@@ -65,19 +68,43 @@
                     </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>
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
+                    <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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
             </div>
         </nav>
     </div>

+ 41 - 14
project-management-share.html

@@ -24,7 +24,10 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">Smartcost</span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
             <!-- <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>
@@ -65,19 +68,43 @@
                     </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>
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
+                    <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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
             </div>
         </nav>
     </div>

+ 41 - 14
project-management-synergy.html

@@ -24,7 +24,10 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">Smartcost</span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
             <!-- <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>
@@ -65,19 +68,43 @@
                     </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>
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
+                    <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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
             </div>
         </nav>
     </div>

+ 41 - 14
project-management.html

@@ -24,7 +24,10 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></span>
+           <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
             <!-- <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>
@@ -65,19 +68,43 @@
                     </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>
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
+                    <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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
             </div>
         </nav>
     </div>

+ 60 - 56
tiaojia.html

@@ -21,63 +21,67 @@
               <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>
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
+                    <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 dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa  fa-cloud-upload"></i> 导入</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
+                            <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
+                        </div>
+                    </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
-          <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>
+                    </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 dropdown-menu-right">
+                            <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                            <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 dropdown-menu-right">
+                            <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 class="nav-link 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>
+                    </li>
+                  </ul>
+            </div>
+        </nav>
   </div>
     <div class="main">
         <div class="main-nav">

+ 41 - 14
user-buy.html

@@ -22,24 +22,51 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+         <div class="header-logo">
+            <div class="v-title">纵横云计价</div>
+            <div class="p-title">广东2018专业版</div>
+          </div>
           <div class="navbar-text navbar-crumb p-0">
               <span class=""><a href="project-management.html">项目管理</a></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>
+            <ul class="nav navbar-nav">
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                    <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>
+                  <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 dropdown-menu-right">
+                          <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                          <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 dropdown-menu-right">
+                          <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 class="nav-link 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>
+                  </li>
+                </ul>
           </div>
       </nav>
   </div>

+ 41 - 14
user-info.html

@@ -22,24 +22,51 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+         <div class="header-logo">
+            <div class="v-title">纵横云计价</div>
+            <div class="p-title">广东2018专业版</div>
+          </div>
           <div class="navbar-text navbar-crumb p-0">
               <span class=""><a href="project-management.html">项目管理</a></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>
+            <ul class="nav navbar-nav">
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                    <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>
+                  <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 dropdown-menu-right">
+                          <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                          <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 dropdown-menu-right">
+                          <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 class="nav-link 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>
+                  </li>
+                </ul>
           </div>
       </nav>
   </div>

+ 41 - 14
user-safe.html

@@ -22,24 +22,51 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+         <div class="header-logo">
+            <div class="v-title">纵横云计价</div>
+            <div class="p-title">广东2018专业版</div>
+          </div>
           <div class="navbar-text navbar-crumb p-0">
               <span class=""><a href="project-management.html">项目管理</a></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>
+            <ul class="nav navbar-nav">
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                    <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>
+                  <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 dropdown-menu-right">
+                          <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                          <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 dropdown-menu-right">
+                          <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 class="nav-link 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>
+                  </li>
+                </ul>
           </div>
       </nav>
   </div>

+ 41 - 14
user-set.html

@@ -22,24 +22,51 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+         <div class="header-logo">
+            <div class="v-title">纵横云计价</div>
+            <div class="p-title">广东2018专业版</div>
+          </div>
           <div class="navbar-text navbar-crumb p-0">
               <span class=""><a href="project-management.html">项目管理</a></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>
+            <ul class="nav navbar-nav">
+                  <li class="nav-item dropdown">
+                    <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                    <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>
+                  <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 dropdown-menu-right">
+                          <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
+                          <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 dropdown-menu-right">
+                          <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 class="nav-link 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>
+                  </li>
+                </ul>
           </div>
       </nav>
   </div>

+ 31 - 23
zaojiashu.html

@@ -22,8 +22,15 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></span>
-            <ul class="nav navbar-nav px-1">
+            <div class="header-logo">
+              <div class="v-title">纵横云计价</div>
+              <div class="p-title">广东2018专业版</div>
+            </div>
+            <div class="navbar-text navbar-crumb px-1">
+                <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">
                     <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>
@@ -34,9 +41,22 @@
                             <a class="dropdown-item" href="#">导入广联达算量Excel清单</a>
                         </div>
                     </li>
+            </ul>
+            <div class="ml-auto navbar-text p-0">
+              <ul class="nav navbar-nav">
+                    <li class="nav-item dropdown">
+                      <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown">陈特</a>
+                      <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>
                     <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">
+                        <div class="dropdown-menu dropdown-menu-right">
                             <a class="dropdown-item" href="#" aria-expanded="false">选项</a>
                             <a class="dropdown-item" href="#">定额库编辑器</a>
                             <a class="dropdown-item" href="tools-gongliaoji.html">工料机库编辑器</a>
@@ -44,7 +64,7 @@
                     </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">
+                        <div class="dropdown-menu dropdown-menu-right">
                             <a class="dropdown-item" href="#">帮助</a>
                             <a class="dropdown-item" href="#">升级说明</a>
                             <a class="dropdown-item" href="#">重庆市2008定额说明</a>
@@ -54,25 +74,13 @@
                             <a class="dropdown-item" href="#">关于</a>
                         </div>
                     </li>
-                </ul>
-            <div class="navbar-text navbar-crumb p-0">
-                <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>
+                    <li class="nav-item">
+                      <a class="nav-link 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>
+                    </li>
+                  </ul>
+                
             </div>
         </nav>
     </div>