Browse Source

界面调整

Chente 7 years ago
parent
commit
2fcb026994
13 changed files with 43 additions and 29 deletions
  1. 1 1
      baobiao.html
  2. 4 5
      css/main.css
  3. 1 1
      feilv.html
  4. 1 1
      gongliaoji.html
  5. 1 1
      jisuanchengxu.html
  6. 3 3
      login-infoinput.html
  7. 1 1
      login.html
  8. 1 1
      project-management.html
  9. 2 2
      user-buy.html
  10. 5 3
      user-info.html
  11. 2 2
      user-safe.html
  12. 4 4
      user-set.html
  13. 17 4
      zaojiashu.html

+ 1 - 1
baobiao.html

@@ -23,7 +23,7 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+        <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>

+ 4 - 5
css/main.css

@@ -21,11 +21,10 @@ body {
     background: #ff6501;
     color: #fff;
     float: left;
-    padding-top: .25rem;
-    padding-bottom: .25rem;
     margin-right: 1rem;
-    font-size: 1.25rem;
-    line-height: inherit
+    font-size: 1rem;
+    line-height:38px;
+    height:38px
 }
 .header .header-logo sup{
   font-size:10px;
@@ -150,7 +149,7 @@ body {
     height: 30px;
     line-height: 30px;
     background:#fff;
-    bottom:22px;
+    bottom:20px;
     left:22px;
     z-index: 999
 }

+ 1 - 1
feilv.html

@@ -22,7 +22,7 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+        <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>

+ 1 - 1
gongliaoji.html

@@ -22,7 +22,7 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+        <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>

+ 1 - 1
jisuanchengxu.html

@@ -22,7 +22,7 @@
           </div>
       </div> -->
       <nav class="navbar navbar-expand-lg p-0 d-flex">
-          <span class="header-logo px-2">Smartcost</span>
+        <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>

+ 3 - 3
login-infoinput.html

@@ -69,10 +69,10 @@
                                 <div class="form-group">
                                     <select class="form-control">
                                      <option>请选择企业规模</option>
-                                     <option>1-20</option>
-                                     <option>20-50</option>
+                                     <option>1-50</option>
                                      <option>50-100</option>
-                                     <option>100+</option>
+                                     <option>100-500</option>
+                                     <option>500+</option>
                                    </select>
                                 </div>
                         </div>

+ 1 - 1
login.html

@@ -58,7 +58,7 @@
             <div class="modal-content">
                 <div class="modal-header">
                     <h5 class="modal-title">选择登录版本</h5>
-                    <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>偏好设置</b> 中可以修改您的登录习惯。</p>
+                    <p class="m-0 text-warning"><i class="fa fa-exclamation-triangle"></i> <b>登录设置</b> 中可以修改您的登录习惯。</p>
                 </div>
                 <div class="modal-body">
                     <div class="row">

+ 1 - 1
project-management.html

@@ -24,7 +24,7 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">纵横云造价<sup>广东2018专业版</sup></span>
+          <span class="header-logo px-2">纵横云计价<sup>广东2018专业版</sup></span>
             <!-- <div class="navbar-text navbar-crumb p-0">
                 <span class=""><a href="project-management.html">项目管理</a></span>
                 <span class=""><i class="fa fa-angle-right fa-fw"></i></span>

+ 2 - 2
user-buy.html

@@ -32,7 +32,7 @@
                   <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>
+                      <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>
@@ -59,7 +59,7 @@
                                 <a class="nav-link active" href="user-buy.html">产品激活</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-set.html">偏好设置</a>
+                                <a class="nav-link" href="user-set.html">登录设置</a>
                             </li>
                         </ul>
                     </div>

+ 5 - 3
user-info.html

@@ -59,7 +59,7 @@
                                 <a class="nav-link" href="user-buy.html">产品激活</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-set.html">偏好设置</a>
+                                <a class="nav-link" href="user-set.html">登录设置</a>
                             </li>
                         </ul>
                     </div>
@@ -74,8 +74,10 @@
                             </div>
                             <div class="form-group has-danger">
                                 <label class="form-control-label">您的姓名</label>
-                                <input class="form-control orm-control-danger" value="" placeholder="输入您的姓名" required="" autofocus="">
-                                <div class="form-control-feedback">您得填上姓名</div>
+                                <input class="form-control is-invalid" value="" placeholder="输入您的姓名" required="" autofocus="">
+                                <div class="invalid-feedback">
+                                   请填写您的姓名
+                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="form-control-label">企业名称</label>

+ 2 - 2
user-safe.html

@@ -32,7 +32,7 @@
                   <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>
+                      <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>
@@ -59,7 +59,7 @@
                                 <a class="nav-link" href="user-buy.html">产品激活</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="user-set.html">偏好设置</a>
+                                <a class="nav-link" href="user-set.html">登录设置</a>
                             </li>
                         </ul>
                     </div>

+ 4 - 4
user-set.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>偏好设置-Smartcost</title>
+    <title>登录设置-Smartcost</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
@@ -32,7 +32,7 @@
                   <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>
+                      <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>
@@ -59,14 +59,14 @@
                                 <a class="nav-link" href="user-buy.html">产品激活</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link active" href="user-set.html">偏好设置</a>
+                                <a class="nav-link active" href="user-set.html">登录设置</a>
                             </li>
                         </ul>
                     </div>
                 </div>
                 <div class="col-lg-10">
                     <div class="col-lg-4">
-                        <legend class="my-3">偏好设置</legend>
+                        <legend class="my-3">登录设置</legend>
                         <from>
                             <div class="form-group">
                                 <label class="form-control-label">登录时选择版本</label>

+ 17 - 4
zaojiashu.html

@@ -22,7 +22,7 @@
             </div>
         </div> -->
         <nav class="navbar navbar-expand-lg p-0 d-flex">
-            <span class="header-logo px-2">纵横云价<sup>广东2018专业版</sup></span>
+            <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>
@@ -790,9 +790,22 @@
                             <!--清单指引-->
                             <div class="tab-pane" id="zy" role="tabpanel">
                               <div class="sidebar-tools-bar container-fluid tools-bar-height-z">
-                                <div class="p-1 d-flex justify-content-center">
-                                  <button class="btn btn-primary btn-sm mx-3" type="button">插入定额</button>
-                                  <button class="btn btn-primary btn-sm mx-3" type="button">插入清单</button>
+                                <div class="p-1 row">
+                                    <div class="col p-0">
+                                      <select class="form-control form-control-sm" id="stdBillsGuidanceLibSelect"></select>
+                                    </div>
+                                    <div class="col px-1">
+                                      <div class="input-group" id="stdBillsGuidanceSearch">
+                                        <input type="text" class="form-control form-control-sm" placeholder="搜索清单">
+                                        <span class="input-group-btn">
+                                            <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                                        </span>
+                                      </div>
+                                    </div>
+                                    <div class="col p-0">
+                                      <button class="btn btn-primary btn-sm" type="button">插入定额</button>
+                                      <button class="btn btn-primary btn-sm" type="button">插入清单</button>
+                                    </div>
                                 </div>
                               </div>
                               <div class="main-data-side-z">