人材机侧栏

css/main.css

@@ -348,7 +348,7 @@ a{
   margin-top:2px;
 }
 .rn-nav .nav-tabs .nav-link{
-  padding:0.8em 0.4em;
+  padding:0.4em 0.4em;
   line-height: 16px
 }
 .rn-nav .nav-tabs .nav-link.active {
@@ -357,6 +357,7 @@ a{
   border-left:1px solid #fff;
   margin-left:-1px;
   border-top:1px solid #ccc;
+  border-right:1px solid #ccc;
   border-bottom:1px solid #ccc;
 }
 .rn-nav .nav-tabs .nav-link span{

zaojiashu.html

@@ -419,7 +419,7 @@
                                 <li class="nav-item">
                                     <a class="nav-link active" data-toggle="tab" href="#gl" role="tab">人材机</a>
                                 </li>
-                                <li class="nav-item">
+                                <!-- <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#fzt" role="tab">附注条件</a>
                                 </li>
                                 <li class="nav-item">
@@ -430,7 +430,7 @@
                                 </li>
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#gc" role="tab">工程量明细</a>
-                                </li>
+                                </li> -->
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#dj" role="tab">计算程序</a>
                                 </li>
@@ -467,6 +467,12 @@
                                                 内容
                                             </div>
                                         </div>
+                                        <div class="col-auto">
+                                            <div class="tn-nav d-flex align-items-start flex-column" data-toggle="tooltip" data-placement="left" title="" data-original-title="打开子目换算">
+                                                <span class="mt-3 ml-2 text-primary">子目换算</span>
+                                                <i class="fa fa-arrow-left mt-auto mb-3 text-primary ml-2"></i>
+                                            </div>
+                                        </div>
                                         <div class="col-4 p-0">
                                             <div class="tab-content">
                                                 <div class="tab-pane active" id="rnc-xm">
@@ -474,13 +480,17 @@
                                                     项目特征 内容
                                                     </div>
                                                 </div>
-                                                <div class="tab-pane" id="rnc-zm">
+                                                <div class="tab-pane" id="rnc-fz">
                                                     <div class="main-data-bottom ovf-hidden">
-                                                    子目换算 内容
+                                                    附注条件 内容
                                                     </div>
                                                 </div>
-                                                <div class="tab-pane" id="rnc-fz"><div class="main-data-bottom ovf-hidden">
-                                                    辅助定额 内容
+                                                <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">
+                                                    增减换算 内容
                                                     </div>
                                                 </div>
                                             </div>
@@ -488,9 +498,11 @@
                                         <div class="col-auto p-0">
                                             <div class="rn-nav d-flex align-items-start flex-column">
                                                 <ul class="nav nav-tabs">
-                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征"><a data-toggle="tab" href="#rnc-xm" role="tab" class="nav-link active"><i class="fa fa-info-circle"></i><span>项目特征</span></a></li>
-                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" title="子目换算"><a data-toggle="tab" href="#rnc-zm" role="tab"class="nav-link"><i class="fa fa-exchange"></i><span>子目换算</span></a></li>
-                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" title="辅助定额"><a data-toggle="tab" href="#rnc-fz" role="tab"class="nav-link"><i class="fa fa-wrench"></i><span>辅助定额</span></a></li>
+                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" title="关闭子目换算"><a data-toggle="tab" href="#rnc-xm" role="tab" class="nav-link"><i class="fa fa-arrow-right"></i></a></li>
+                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" 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="left" title="附注条件"><a data-toggle="tab" href="#rnc-fz" role="tab"class="nav-link"><i class="fa fa-exchange"></i></a></li>
+                                                    <li class="nav-item" data-toggle="tooltip" data-placement="left" 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="left" title="增减换算"><a data-toggle="tab" href="#rnc-zj" role="tab"class="nav-link"><i class="fa fa-plus"></i></a></li>
                                                 </ul>
                                             </div>
                                         </div>
@@ -628,56 +640,56 @@
                                             </div>
                                         </div>
                                         <div class="col-4">
-                                        <div class="main-data-bottom">
-                                          <div class="container-fluid my-2">
-                                            <div class="mb-2 d-flex justify-content-between"><span>排版规则</span><a href="#"><i class="fa fa-arrow-right" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="收起排版规则"></i></a></div>
-                                            <div class="mb-2 row">
-                                             <div class="col-6">
-                                               <button class="btn btn-primary btn-sm">应用到选中清单</button>
-                                             </div>
-                                             <div class="col-6">
-                                               <button class="btn btn-primary btn-sm">应用到所有清单</button>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-5 px-0 col-form-label text-right">添加位置：</label>
-                                             <div class="col-7">
-                                               <select class="form-control form-control-sm"><option>添加到项目特征列</option></select>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-sm-5 px-0 col-form-label text-right">添加内容：</label>
-                                             <div class="col-sm-7">
-                                               <select class="form-control form-control-sm"><option>项目特征+工作内容</option></select>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-5 px-0 col-form-label text-right">显示格式：</label>
-                                             <div class="col-7">
-                                               <select class="form-control form-control-sm"><option>换行分隔</option></select>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-5 px-0 col-form-label text-right">特征生成方式：</label>
-                                             <div class="col-7">
-                                               <select class="form-control form-control-sm"><option>特征：特征值</option></select>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-5 px-0 col-form-label text-right">子目生成方式：</label>
-                                             <div class="col-7">
-                                               <select class="form-control form-control-sm"><option>编号+子目名称</option></select>
-                                             </div>
-                                            </div>
-                                            <div class="mb-1 row">
-                                             <label class="col-5 px-0 col-form-label text-right">序号格式：</label>
-                                             <div class="col-7">
-                                               <select class="form-control form-control-sm"><option>1</option></select>
-                                             </div>
+                                            <div class="main-data-bottom">
+                                              <div class="container-fluid my-2">
+                                                <div class="mb-2 d-flex justify-content-between"><span>排版规则</span><a href="#"><i class="fa fa-arrow-right" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="收起排版规则"></i></a></div>
+                                                <div class="mb-2 row">
+                                                 <div class="col-6">
+                                                   <button class="btn btn-primary btn-sm">应用到选中清单</button>
+                                                 </div>
+                                                 <div class="col-6">
+                                                   <button class="btn btn-primary btn-sm">应用到所有清单</button>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-5 px-0 col-form-label text-right">添加位置：</label>
+                                                 <div class="col-7">
+                                                   <select class="form-control form-control-sm"><option>添加到项目特征列</option></select>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-sm-5 px-0 col-form-label text-right">添加内容：</label>
+                                                 <div class="col-sm-7">
+                                                   <select class="form-control form-control-sm"><option>项目特征+工作内容</option></select>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-5 px-0 col-form-label text-right">显示格式：</label>
+                                                 <div class="col-7">
+                                                   <select class="form-control form-control-sm"><option>换行分隔</option></select>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-5 px-0 col-form-label text-right">特征生成方式：</label>
+                                                 <div class="col-7">
+                                                   <select class="form-control form-control-sm"><option>特征：特征值</option></select>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-5 px-0 col-form-label text-right">子目生成方式：</label>
+                                                 <div class="col-7">
+                                                   <select class="form-control form-control-sm"><option>编号+子目名称</option></select>
+                                                 </div>
+                                                </div>
+                                                <div class="mb-1 row">
+                                                 <label class="col-5 px-0 col-form-label text-right">序号格式：</label>
+                                                 <div class="col-7">
+                                                   <select class="form-control form-control-sm"><option>1</option></select>
+                                                 </div>
+                                                </div>
+                                              </div>
                                             </div>
-                                          </div>
                                         </div>
-                                      </div>
                                     </div>
                                 </div>
                             </div>