Browse Source

指标对比增加快捷筛选按钮

Chente 6 years ago
parent
commit
66fa0873f4
5 changed files with 34 additions and 13 deletions
  1. 2 2
      css/bootstrap/bootstrap.min.css
  2. BIN
      css/logo.png
  3. 4 3
      css/main.css
  4. 2 2
      login.html
  5. 26 6
      search-Library.html

File diff suppressed because it is too large
+ 2 - 2
css/bootstrap/bootstrap.min.css


BIN
css/logo.png


+ 4 - 3
css/main.css

@@ -164,12 +164,13 @@ body {
 .panel-title>.title-main .btn.pull-right {
   margin:10px 0 0 10px
 }
-.panel-title>.title-main .form-control {
-  margin:10px 0 0 0
-}
+
 .panel-title>.title-main{
   padding-left: 15px
 }
+.panel-title>.title-main .dropdown-item{
+  line-height: normal;
+}
 /*滚动*/
 .scrollbar-auto {
     overflow-y: auto;

+ 2 - 2
login.html

@@ -13,7 +13,7 @@
     <div class="container">
         <!--演示版-->
         <form class="form-signin">
-            <h1 class="d-flex justify-content-center mb-4">纵横造价指标系统</h1>
+            <h2 class="d-flex justify-content-center mb-4">纵横公路工程造价指标分析系统</h2>
             <nav class="nav nav-tabs nav-justified mb-3" role="tablist" >
             </nav>
                 <div class="form-group">
@@ -33,7 +33,7 @@
         <!--项目版-->
         <!--登录错误-->
         <form class="form-signin">
-            <h1 class="d-flex justify-content-center mb-4">纵横造价指标系统</h1>
+            <h2 class="d-flex justify-content-center mb-4">纵横公路工程造价指标分析系统</h2>
             <div class="form-group has-danger">
                 <input class="form-control gform-control-danger" value="1212@qq.com" placeholder="账号" required="" autofocus="">
             </div>

+ 26 - 6
search-Library.html

@@ -44,20 +44,40 @@
     <div class="main-panel">
     			<div class="panel-content">
     				<div class="panel-title fluid">
-    					<div class="title-main d-flex justify-content-between">
+    					<div class="title-main d-flex">
                 <div>
                   <div class="d-inline-flex">
                     <a class="btn btn-primary btn-sm" href="#generate-data" data-toggle="modal" data-target="#generate-data">造价文件:5</a>
                   </div>
-                  <div class="d-inline-flex pr-0">
-                    <input type="text" class="form-control form-control-sm m-0" style="width:200px" placeholder="输入指标节点编号或者名称" >
+                  <div class="d-inline-flex">
+                    <div class="input-group input-group-sm">
+                      <input type="text" class="form-control" placeholder="输入指标节点编号或者名称" aria-label="Recipient's username" aria-describedby="button-addon2" style="width:220px">
+                      <div class="input-group-append">
+                        <button class="btn btn-primary" type="button" id="button-addon2">搜索</button>
+                      </div>
+                    </div>
                   </div>
                   <div class="d-inline-flex">
-                    <button class="btn btn-sm btn-primary " type="button">搜索</button>
+                    <div class="btn-group btn-group-sm" role="group" aria-label="Basic example">
+                      <button type="button" class="btn btn-secondary">分项指标</button><!--选中状态 btn-secondary-->
+                      <button type="button" class="btn btn-primary">综合指标</button>
+                      <div class="btn-group btn-group-sm" role="group">
+                        <button id="btnGroupDrop1" type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                          单元指标
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+                          <a class="dropdown-item" href="#">单元指标</a>
+                          <a class="dropdown-item" href="#">边坡</a>
+                          <a class="dropdown-item" href="#">桥梁</a>
+                        </div>
+                      </div>
+                    </div>
                   </div>
                 </div>
-                <div>
-                  <a href="search-Library-print.html" class="btn btn-primary btn-sm pull-right" target="_blank"><i class="fa fa-file-excel-o"></i> 导出Excel</a>
+                <div class="ml-auto">
+                  <div class="d-inline-block">
+                    <a href="search-Library-print.html" class="btn btn-primary btn-sm" target="_blank"><i class="fa fa-file-excel-o"></i> 导出Excel</a>
+                  </div>
                 </div>
     					</div>
     				</div>