Browse Source

界面调整

Chente 7 years ago
parent
commit
5cfc7eb23c
3 changed files with 41 additions and 16 deletions
  1. 2 2
      baobiao.html
  2. 7 1
      css/main.css
  3. 32 13
      zaojiashu.html

+ 2 - 2
baobiao.html

@@ -139,7 +139,7 @@
                                 <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                   纵向
                                 </button>
-                                <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+                                <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
                                   <a class="dropdown-item" href="#">横向</a>
                                 </div>
                               </div>
@@ -147,7 +147,7 @@
                                 <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                   A4
                                 </button>
-                                <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+                                <div class="dropdown-menu" aria-labelledby="btnGroupDrop1" style="min-width:112px">
                                   <a class="dropdown-item" href="#">A3</a>
                                 </div>
                               </div>

+ 7 - 1
css/main.css

@@ -13,6 +13,12 @@ body {
 .btn-link:focus, .btn-link:hover{
   text-decoration: none
 }
+.dropdown-menu {
+  padding:.2rem 0;
+}
+.dropdown-item:focus, .dropdown-item:hover{
+  background-color: #f7f7f9
+}
 /*自定义css*/
 .header {
   border-bottom: 1px solid #ccc
@@ -50,7 +56,7 @@ body {
     position: absolute;
     text-align: center;
     z-index: 999;
-    padding: 30px 0 0 2px
+    padding: 2px 0 0 2px
 }
 .main-nav .nav a {
     display: block;

+ 32 - 13
zaojiashu.html

@@ -32,7 +32,7 @@
             </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>
+                        <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog"></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>
@@ -80,7 +80,6 @@
                       </a>
                     </li>
                   </ul>
-                
             </div>
         </nav>
     </div>
@@ -98,6 +97,7 @@
         <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" data-toggle="tooltip" data-placement="bottom" title="插入"><i class="fa fa-sign-in" 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>
@@ -250,6 +250,7 @@
                     <a class="dropdown-item" href="#">最底层</a>
                   </div>
                 </span>
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="整理分部"><i class="fa fa-retweet" aria-hidden="true"></i> 整理分部</a>
                 <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="锁定清单"><i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a>
                 <!-- <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="锁定清单"><i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a> -->
                 <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="显示特征内容"><i class="fa fa-eye" aria-hidden="true"></i> 显示特征内容</a>
@@ -1114,13 +1115,17 @@
                                 <div class="row m-0">
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">单价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">单价</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">合价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">合价</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
@@ -1129,19 +1134,25 @@
                                 <div class="row m-0">
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">工程量</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">工程量</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">单价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">单价</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">合价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">合价</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
@@ -1150,19 +1161,25 @@
                                 <div class="row m-0">
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">工程量</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">消耗量</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
-                                  <div class="col-sm-3">
+                                  <div class="col-sm-4">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">单价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">单价<small class="text-muted">(有组成物)</small></span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
-                                  <div class="col-sm-3">
+                                  <div class="col-sm-4">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">合价</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">单价<small class="text-muted">(无组成物)</small></span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>
@@ -1171,7 +1188,9 @@
                                 <div class="row m-0">
                                   <div class="col-sm-3">
                                     <div class="input-group input-group-sm mb-2">
-                                      <div class="input-group-addon">费率</div>
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">费率</span>
+                                      </div>
                                       <input type="number" class="form-control" value="2" step="1" max="6" min="0">
                                     </div>
                                   </div>