Browse Source

批量替换单价文件增加树结构;人材机Tab菜单修改

Chente 6 năm trước cách đây
mục cha
commit
d19c66efa4
3 tập tin đã thay đổi với 54 bổ sung35 xóa
  1. 8 2
      css/main.css
  2. 42 29
      project-management.html
  3. 4 4
      zaojiashu.html

+ 8 - 2
css/main.css

@@ -348,8 +348,8 @@ a{
   margin-top:2px;
 }
 .rn-nav .nav-tabs .nav-link{
-  padding:0.2em 0.4em;
-  line-height: 20px
+  padding:0.8em 0.4em;
+  line-height: 16px
 }
 .rn-nav .nav-tabs .nav-link.active {
   border:none;
@@ -359,6 +359,12 @@ a{
   border-top: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;

+ 42 - 29
project-management.html

@@ -859,7 +859,7 @@
     </div>
     <!--弹出 批量替换单价文件-->
     <div class="modal fade" id="plth" data-backdrop="static">
-        <div class="modal-dialog" role="document">
+        <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                   <h5 class="modal-title">批量替换单价文件</h5>
@@ -868,41 +868,54 @@
                   </button>
                 </div>
                 <div class="modal-body">
-                    <div class="form-group">
-                        <div class="custom-control custom-radio custom-control-inline">
-                          <input type="radio" id="customRadioInline33" name="customRadio1" class="custom-control-input" checked>
-                          <label class="custom-control-label" for="customRadioInline33">从本建设项目中选择</label>
+                    <div class="row">
+                        <div class="col-6">
+                            <h5>选择项目</h5>
+                            <div class="modal-auto-height">
+                            </div>
+                            <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="customCheck1">
+                                  <label class="custom-control-label" for="customCheck1">自动勾选同专业工程</label>
+                                </div>
                         </div>
-                        <div class="custom-control custom-radio custom-control-inline">
-                          <input type="radio" id="customRadioInline44" name="customRadio1" class="custom-control-input">
-                          <label class="custom-control-label" for="customRadioInline44">从其他建设项目中复制</label>
+                        <div class="col-6">
+                            <h5>更换为</h5>
+                            <div class="form-group">
+                                <div class="custom-control custom-radio custom-control-inline">
+                                  <input type="radio" id="customRadioInline33" name="customRadio1" class="custom-control-input" checked>
+                                  <label class="custom-control-label" for="customRadioInline33">从本建设项目中选择</label>
+                                </div>
+                                <div class="custom-control custom-radio custom-control-inline">
+                                  <input type="radio" id="customRadioInline44" name="customRadio1" class="custom-control-input">
+                                  <label class="custom-control-label" for="customRadioInline44">从其他建设项目中复制</label>
+                                </div>
+                            </div>
+                                <!--从本建设项目中选择-->
+                              <div class="form-group">
+                                  <label>9.21<!--本建设项目名称--></label>
+                                  <select class="form-control">
+                                    <option>测试5单价文件</option><!--单价文件-->
+                                  </select>
+                              </div>
+                                <!--从其他建设项目中复制-->
+                              <div class="form-group">
+                                  <label>选择建设项目</label>
+                                  <select class="form-control">
+                                    <option>10.9建筑例题内测</option><!--建设项目-->
+                                  </select>
+                              </div>
+                              <div class="form-group">
+                                  <select class="form-control">
+                                    <option>10.9建筑例题内测单价文件</option><!--建设项目下单价文件-->
+                                  </select>
+                                  <span class="form-text text-muted">你选择的单价文件将复制一份至新项目,不会影响原建设项目的单价文件。</span>
+                              </div>
                         </div>
                     </div>
-                    <!--从本建设项目中选择-->
-                  <div class="form-group">
-                      <label>9.21<!--本建设项目名称--></label>
-                      <select class="form-control">
-                        <option>测试5单价文件</option><!--单价文件-->
-                      </select>
-                  </div>
-                    <!--从其他建设项目中复制-->
-                  <div class="form-group">
-                      <label>选择建设项目</label>
-                      <select class="form-control">
-                        <option>10.9建筑例题内测</option><!--建设项目-->
-                      </select>
-                  </div>
-                  <div class="form-group">
-                      <select class="form-control">
-                        <option>10.9建筑例题内测单价文件</option><!--建设项目下单价文件-->
-                      </select>
-                      <span class="form-text text-muted">你选择的单价文件将复制一份至新项目,不会影响原建设项目的单价文件。</span>
-                  </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="" class="btn btn-primary mr-3">确定</a>
-                    <a href="" class="btn btn-primary">应用</a>
                 </div>
             </div>
         </div>

+ 4 - 4
zaojiashu.html

@@ -38,6 +38,7 @@
                 <span class="text-muted px-1">\</span>
                 <span><i class="fa fa-sticky-note-o"></i></span>
                 <span class="text-truncate"  data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span>
+                <span>由 张三 分享给你(只读)</span>
                 <!-- <ul class="f-nav list-unstyled">
                     <li class="d-flex justify-content-between focus"><span class="title text-truncate"><i class="fa fa-cube"></i> 单项工程1</span><i class="fa fa-caret-right text-muted mt-1"></i>
                         <ul class="s-nav list-unstyled">
@@ -464,7 +465,6 @@
                                         <div class="col p-0">
                                             <div class="main-data-bottom ovf-hidden">
                                                 内容
-                                                <h3><span class="badge badge-primary"><i class="fa fa-home pr-2"></i>3</span></h3>
                                             </div>
                                         </div>
                                         <div class="col-4 p-0">
@@ -488,9 +488,9 @@
                                         <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"><a data-toggle="tab" href="#rnc-xm" role="tab" class="nav-link active">项目特征</a></li>
-                                                    <li class="nav-item"><a data-toggle="tab" href="#rnc-zm" role="tab"class="nav-link">子目换算</a></li>
-                                                    <li class="nav-item"><a data-toggle="tab" href="#rnc-fz" role="tab"class="nav-link">辅助定额</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><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>
                                                 </ul>
                                             </div>
                                         </div>