Merge branch 'master' into HEAD

Conflicts:
	zaojiashu.html

css/main.css

@@ -210,8 +210,11 @@ a{
     z-index: 999
 }
 .bottom-content .nav-tabs .nav-link.active {
+    border-bottom: 2px solid #fff;
+}
+.bottom-content .bc-tabs .nav-link.active {
     border:2px solid #ff6501;
-    border-bottom: 1px solid #fff
+    border-bottom: 1px solid #fff;
 }
 .side-tabs .nav-tabs .nav-link.active {
     border-top: none;
@@ -360,12 +363,6 @@ a{
   border-right:1px solid #ccc;
   border-bottom:1px solid #ccc;
 }
-.rn-nav .nav-tabs .nav-link span{
-  display:none;
-}
-.rn-nav .nav-tabs .nav-link.active span{
-  display: inline-block;
-}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;

zaojiashu.html

@@ -411,6 +411,7 @@
                             </div>
                         </div>
                         <div class="bottom-content">
+<<<<<<< HEAD
                             <ul class="nav nav-tabs d-flex" role="tablist">
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#qdjl" role="tab">清单精灵</a>
@@ -440,6 +441,44 @@
                                     <a class="nav-link" data-toggle="tab" href="#tenr" role="tab">特征及内容</a>
                                 </li>
                             </ul>
+=======
+                            <div class="row p-0">
+                                <div class="col pr-0">
+                                    <ul class="nav nav-tabs bc-tabs d-flex" role="tablist">
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#qdjl" role="tab">清单精灵</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link active" data-toggle="tab" href="#gl" role="tab">人材机</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#az" role="tab">安装增加费</a>
+                                        </li><!-- 
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#gc" role="tab">工程量明细</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#dj" role="tab">计算程序</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#sm" role="tab">说明信息</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" data-toggle="tab" href="#tenr" role="tab">特征及内容</a>
+                                        </li> -->
+                                    </ul>
+                                </div>
+                                <div class="col-auto pl-0">
+                                    <ul class="nav nav-tabs">
+                                        <li class="nav-item mr-3"><a href="#" class="nav-link">子目换算</a></li>
+                                        <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="项目特征"><a data-toggle="tab" href="#rnc-xm" role="tab" class="nav-link active"><i class="fa fa-info-circle"></i></a></li>
+                                        <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="附注条件"><a data-toggle="tab" href="#rnc-fz" role="tab"class="nav-link"><i class="fa fa-check-circle-o"></i></a></li>
+                                        <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="自定义系数"><a data-toggle="tab" href="#rnc-zd" role="tab"class="nav-link"><i class="fa fa-wrench"></i></a></li>
+                                        <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="增减换算"><a data-toggle="tab" href="#rnc-zj" role="tab"class="nav-link"><i class="fa fa-plus"></i></a></li>
+                                    </ul>
+                                </div>
+                            </div>
+>>>>>>> master
                             <!-- Tab panes -->
                             <div class="tab-content">
                                 <!--清单精灵-->
@@ -461,7 +500,7 @@
                                 <!--人材机-->
                                 <div class="tab-pane container-fluid active" id="gl" role="tabpanel">
                                     <div class="row">
-                                        <div class="col p-0">
+                                        <div class="col-8 p-0">
                                             <div class="main-data-bottom ovf-hidden">
                                                 内容
                                             </div>
@@ -482,6 +521,7 @@
                                                 <div class="tab-pane" id="rnc-fz">
                                                     <div class="main-data-bottom ovf-hidden">
                                                     附注条件 内容
+<<<<<<< HEAD
                                                     </div>
                                                 </div>
                                                 <div class="tab-pane" id="rnc-zd"><div class="main-data-bottom ovf-hidden">
@@ -489,11 +529,23 @@
                                                     </div>
                                                 </div>
                                                 <div class="tab-pane" id="rnc-zj"><div class="main-data-bottom ovf-hidden">
+=======
+                                                    </div>
+                                                </div>
+                                                <div class="tab-pane" id="rnc-zd">
+                                                    <div class="main-data-bottom ovf-hidden">
+                                                    自定义系数 内容
+                                                    </div>
+                                                </div>
+                                                <div class="tab-pane" id="rnc-zj">
+                                                    <div class="main-data-bottom ovf-hidden">
+>>>>>>> master
                                                     增减换算 内容
                                                     </div>
                                                 </div>
                                             </div>
                                         </div>
+<<<<<<< HEAD
                                         <div class="col-auto p-0">
                                             <div class="rn-nav d-flex align-items-start flex-column">
                                                 <ul class="nav nav-tabs">
@@ -531,6 +583,8 @@
                                 <div class="tab-pane" id="fzd" role="tabpanel">
                                     <div class="main-data-bottom">
                                         辅助定额的内容
+=======
+>>>>>>> master
                                     </div>
                                 </div>
                                 <!--安装增加费-->