LOGO区域调整，增加返回；文件夹分享

css/main.css

@@ -39,13 +39,13 @@ a{
     padding-left:40px;
 }
 .header-logo div.v-title{
-  font-size:12px;
+  font-size:11px;
   color:#aeaeae;
   line-height: 12px;
   margin-top:3px;
 }
 .header-logo div.p-title{
-  font-size:14px;
+  font-size:16px;
   color:#ff6501;
 }
 .top-msg{

project-management-share.html

@@ -164,75 +164,202 @@
                     </div>
                     <div class="poj-list">
                         <table class="table table-hover table-sm mb-5">
-                            <thead>
-                                <tr>
-                                    <th width="40%">工程列表</th>
-                                    <th width="20%">由...分享</th>
-                                    <th width="10%">分享给...</th>
-                                    <th width="10%">操作</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                              <!--别人共享给我有拷贝权限-->
-                              <tr>
-                                  <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
-                                  <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
-                                  <td>分享给 我</td>
-                                  <td><a href="javacript:void(0);" data-toggle="modal" data-target="#copytomy">拷贝工程</a></td>
-                              </tr>
-                              <!--别人共享给我无拷贝权限-->
+                          <thead>
                               <tr>
-                                  <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
-                                  <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
-                                  <td>分享给 我</td>
-                                  <td></td>
+                                  <th width="40%">工程列表</th>
+                                  <th width="20%">由...分享</th>
+                                  <th width="20%">分享给...</th>
+                                  <th width="10%">操作</th>
                               </tr>
-                              <!--我分享给别人-->
-                              <tr>
-                                  <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
-                                  <td>由 我 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
-                                  <td>分享给 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">张三 <i class="fa fa-files-o"></i></a>、<a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">王五</a></td>
-                                  <td><a href="javacript:void(0);" data-toggle="modal" data-target="#share">添加分享</a></td>
-                              </tr>
-                            </tbody>
+                          </thead>
+                          <tbody>
+                                <!--单位工程共享 别人共享给我有拷贝权限-->
+                                <tr>
+                                    <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
+                                    <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
+                                    <td>分享给 我</td>
+                                    <td><a href="javacript:void(0);" data-toggle="modal" data-target="#copytomy">拷贝工程</a></td>
+                                </tr>
+                                <!--单位工程共享 别人共享给我无拷贝权限-->
+                                <tr>
+                                    <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
+                                    <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
+                                    <td>分享给 我</td>
+                                    <td></td>
+                                </tr>
+                                <!--单位工程共享 我分享给别人-->
+                                <tr>
+                                    <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
+                                    <td>由 我 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
+                                    <td>分享给 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">张三 <i class="fa fa-files-o"></i></a>、<a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">王五</a></td>
+                                    <td><a href="javacript:void(0);" data-toggle="modal" data-target="#share">添加分享</a></td>
+                                </tr>
+                                <!--文件夹分享 我分享给别人-->
+                                <tr>
+                                    <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-folder-open-o"></i>&nbsp;文件夹</td>
+                                    <td>由 我 分享 于 <span class="text-muted">2018-05-01 13:20:20</span></td>
+                                    <td>分享给 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo3">张三 <i class="fa fa-files-o"></i></a>、<a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo3">王五</a></td>
+                                    <td><a href="javacript:void(0);" data-toggle="modal" data-target="#share2">添加分享</a></td>
+                                </tr>
+                                <tr>
+                                    <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</a></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td class="in-3"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><a href="#" class="open-sidebar"><i class="fa fa-cube"></i>&nbsp;左2号生产车间</a></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</a></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                          </tbody>
                         </table>
                     </div>
                 </div>
               </div>
             </div>
         </div>
-    </div>
-    <!--弹出拷贝工程-->
-    <div class="modal fade" id="copytomy" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title">拷贝工程</h5>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                      <span aria-hidden="true">&times;</span>
-                    </button>
-                </div>
-                <div class="modal-body">
-                  <div class="form-group">
-                      <label>建设项目</label>
-                      <select class="form-control"><option>请选择建设项目</option></select>
-                  </div>
-                  <div class="form-group">
-                      <label>单项项目</label>
-                      <select class="form-control"><option>请选择单项项目</option></select>
-                  </div>
-                  <div class="form-group">
-                      <p>拷贝后，工程将重命名为 "<b>建筑工程2（张三共享）</b>"</p>
-                  </div>
+        <div class="slide-sidebar">
+            <div class="side-content">
+              <!--建设项目汇总-->
+                <div class="p-3">
+                    <legend>船体生产车间 汇总</legend>
+                    <table class="table table-bordered table-hover table-sm">
+                        <thead>
+                            <tr>
+                                <th rowspan="2"></th>
+                                <th rowspan="2">序号</th>
+                                <th rowspan="2">单位工程名称</th>
+                                <th rowspan="2">金额（元）</th>
+                                <th colspan="3">其中</th>
+                            </tr>
+                            <tr>
+                                <th>暂估价（元）</th>
+                                <th>安全文明施工费（元）</th>
+                                <th>规费（元）</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>1</td>
+                                <td>1</td>
+                                <td>6号生产车间</td>
+                                <td>12345.67</td>
+                                <td>5436.87</td>
+                                <td>54345.68</td>
+                                <td>514.54</td>
+                            </tr>
+                            <tr>
+                                <td>2</td>
+                                <td>2</td>
+                                <td>7号生产车间</td>
+                                <td>12345.67</td>
+                                <td>5436.87</td>
+                                <td>54345.68</td>
+                                <td>514.54</td>
+                            </tr>
+                            <tr>
+                                <td>3</td>
+                                <td>3</td>
+                                <td>8号生产车间</td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                            </tr>
+                            <tr>
+                                <td>4</td>
+                                <td>4</td>
+                                <td>9号生产车间</td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                            </tr>
+                            <tr>
+                                <td>4</td>
+                                <td> </td>
+                                <td>合计</td>
+                                <td>110789.36</td>
+                                <td>5971.32</td>
+                                <td>58900.46</td>
+                                <td>1049.41
+
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
                 </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                    <a href="project-management.html" class="btn btn-primary">确定拷贝</a>
+              <!--单项工程汇总-->
+                <div class="p-3">
+                    <legend>6号生产车间 汇总</legend>
+                    <table class="table table-bordered table-hover table-sm">
+                        <thead>
+                            <tr>
+                                <th rowspan="2"></th>
+                                <th rowspan="2">序号</th>
+                                <th rowspan="2">单位工程名称</th>
+                                <th rowspan="2">金额（元）</th>
+                                <th colspan="3">其中</th>
+                            </tr>
+                            <tr>
+                                <th>暂估价（元）</th>
+                                <th>安全文明施工费（元）</th>
+                                <th>规费（元）</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr>
+                                <td>1</td>
+                                <td>1</td>
+                                <td>建筑工程3</td>
+                                <td>12345.67</td>
+                                <td>5436.87</td>
+                                <td>54345.68</td>
+                                <td>514.54</td>
+                            </tr>
+                            <tr>
+                                <td>2</td>
+                                <td>2</td>
+                                <td>建筑工程4</td>
+                                <td>12345.67</td>
+                                <td>5436.87</td>
+                                <td>54345.68</td>
+                                <td>514.54</td>
+                            </tr>
+                            <tr>
+                                <td>3</td>
+                                <td>3</td>
+                                <td>建筑工程5</td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                                <td> </td>
+                            </tr>
+                            <tr>
+                                <td>4</td>
+                                <td> </td>
+                                <td>合计</td>
+                                <td>110789.36</td>
+                                <td>5971.32</td>
+                                <td>58900.46</td>
+                                <td>1049.41
+
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
                 </div>
             </div>
         </div>
     </div>
-
     <!--弹出账号信息-->
     <div class="modal fade" id="userinfo" data-backdrop="static">
         <div class="modal-dialog" role="document">
@@ -298,12 +425,53 @@
             </div>
         </div>
     </div>
-    <!--弹出分享-->
+    <!--弹出账号信息 文件夹 分享-->
+    <div class="modal fade" id="userinfo3" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">用户信息</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="card mb-2">
+                      <div class="card-body">
+                        <h4 class="card-title">张三</h4>
+                        <h6 class="card-subtitle mb-2 text-muted">珠海纵横创新软件有限公司</h6>
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="通行账号手机"><i class="fa fa-tablet"></i> 15812644017</li>
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="通行账号邮箱"><i class="fa fa-envelope-o "></i> 0756-3850891</li>
+                      </ul>
+                  </div>
+                  <!--分享人设置权限-->
+                  <div class="modal-auto-height">
+                  <table class="table table-sm table-bordered">
+                      <tr><th>工程列表</th><td>全选</td><th>允许拷贝</th></tr>
+                      <tr><td><i class="fa fa-folder-open-o"></i></a><i class="fa fa-folder-o"></i>&nbsp;文件夹</td><td><input type="checkbox">全选</td><td></td></tr>
+                      <tr><td class="in-2"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                      <tr><td><i class="fa fa-cube"></i>&nbsp;左2号生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                      <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</td><td></td><td><input type="checkbox">允许</td></tr>
+                      <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程3</td><td></td><td><input type="checkbox">允许</td></tr>
+                  </table>
+                </div>
+                </div>
+                <div class="modal-footer">
+                    <!--分享人可以取消-->
+                    <button type="button" class="btn btn-outline-danger" data-dismiss="modal">取消分享</button>
+                    <button type="button" class="btn btn-primary" data-dismiss="modal">确定</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出单位工程添加分享-->
     <div class="modal fade" id="share" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">分享</h5>
+                  <h5 class="modal-title">添加分享</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                   </button>
@@ -342,7 +510,77 @@
             </div>
         </div>
     </div>
-
+    <!--弹出文件夹添加分享-->
+    <div class="modal fade" id="share2" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">添加分享</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                      <label>分享给...</label>
+                      <input class="form-control" placeholder="输入对方手机号" type="text">
+                      <span class="form-text text-danger">账号不存在。</span>
+                      <span class="form-text text-danger">已与该用户分享。</span>
+                  </div>
+                  <div class="card">
+                      <div class="card-body">
+                        <h4 class="card-title">张三</h4>
+                        <h6 class="card-subtitle mb-2 text-muted">珠海纵横创新软件有限公司</h6>
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="通行账号手机"><i class="fa fa-tablet"></i> 15312454417</li>
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="通行账号邮箱"><i class="fa fa-envelope-o "></i> 12312323@qq.com</li>
+                      </ul>
+                  </div>
+                  <p class="mt-3">点 下一步 设置单位工程拷贝权限。</p>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="javacript:void(0);" data-toggle="modal" data-target="#share3" class="btn btn-primary">下一步</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出分享文件夹权限-->
+    <div class="modal fade" id="share3" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">设置单位工程拷贝权限</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <p>分享 <b>文件夹</b> 给以下用户，仅可查阅，不具备任何编辑修改功能。
+                        <h4><span class="badge badge-light mr-3">张三(15812644017)</span>
+                        </h4></p>
+                        <p class="text-danger"><i class="fa fa-exclamation-triangle"></i> 允许拷贝后，用户可以把你的项目拷贝成为他的数据，请谨慎勾选。</p>
+                  </div>
+                  <div class="modal-auto-height">
+                    <table class="table table-sm table-bordered">
+                        <tr><th>工程列表</th><td>全选</td><th>允许拷贝</th></tr>
+                        <tr><td><i class="fa fa-folder-open-o"></i></a><i class="fa fa-folder-o"></i>&nbsp;文件夹</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td class="in-2"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td><i class="fa fa-cube"></i>&nbsp;左2号生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</td><td></td><td><input type="checkbox">允许</td></tr>
+                        <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程3</td><td></td><td><input type="checkbox">允许</td></tr>
+                    </table>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="javacript:void(0);"class="btn btn-primary">确认分享</a>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

project-management.html

@@ -169,6 +169,8 @@
                 </div>
                   <div class="poj-list">
                     <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#addPoj3">新建</a>
+                    <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#share">分享</a>
+                    <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#share2">分享文件夹</a>
                     <table class="table table-hover table-sm mb-5">
                         <thead>
                             <tr>
@@ -214,7 +216,7 @@
                                 <td></td>
                             </tr>
                             <tr>
-                                <td><i class="fa fa-refresh text-danger"></i></td>
+                                <td><i class="fa fa-refresh text-danger"></i>  <i class="fa fa-question-circle text-primary"></i></td>
                                 <td class="in-4"><a class="tree-open"></a><span class="poj-icon">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</a></td>
                                 <td>清单计价</td>
                                 <td>重庆[2008]调整人工单价</td>
@@ -757,6 +759,83 @@
             </div>
         </div>
     </div>
+    <!--弹出分享文件夹-->
+    <div class="modal fade" id="share2" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">分享</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                      <label>分享给...</label>
+                      <input class="form-control" placeholder="输入对方手机号" type="text">
+                      <span class="form-text text-danger">账号不存在。</span>
+                      <span class="form-text text-danger">已与该用户分享。</span>
+                  </div>
+                  <div class="card">
+                      <div class="card-body">
+                        <h4 class="card-title">张三</h4>
+                        <h6 class="card-subtitle mb-2 text-muted">珠海纵横创新软件有限公司</h6>
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-tablet"></i> 15812644017</li>
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title=""><i class="fa fa-envelope-o "></i> 0756-3850891</li>
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title=""><a class="btn btn-sm btn-primary" href=""><i class="fa fa-plus"></i> 添加分享</a></li>
+                      </ul>
+                  </div>
+                  <div class="form-group mt-3">
+                    <p>确认分享 <b>文件夹</b></p>
+                    <p><h4><span class="badge badge-light mr-3">张三(15812644017) <a href="" class="text-danger" title="移除分享"><i class="fa fa-remove"></i></a></span>
+                        <span class="badge badge-light mr-3">王五(15812644017) <a href="" class="text-danger" title="移除分享"><i class="fa fa-remove"></i></a></span></h4></p>
+                    <p>点 下一步 设置单位工程拷贝权限。</p>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="javacript:void(0);" data-toggle="modal" data-target="#share3" class="btn btn-primary">下一步</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出分享文件夹权限-->
+    <div class="modal fade" id="share3" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">设置单位工程拷贝权限</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <p>分享 <b>文件夹</b> 给以下用户，仅可查阅，不具备任何编辑修改功能。
+                        <h4><span class="badge badge-light mr-3">张三(15812644017)</span>
+                        <span class="badge badge-light mr-3">王五(15812644017)</span></h4></p>
+                        <p class="text-danger"><i class="fa fa-exclamation-triangle"></i> 允许拷贝后，用户可以把你的项目拷贝成为他的数据，请谨慎勾选。</p>
+                  </div>
+                  <div class="modal-auto-height">
+                    <table class="table table-sm table-bordered">
+                        <tr><th>工程列表</th><td>全选</td><th>允许拷贝</th></tr>
+                        <tr><td><i class="fa fa-folder-open-o"></i></a><i class="fa fa-folder-o"></i>&nbsp;文件夹</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td class="in-2"><i class="fa fa-cubes"></i>&nbsp;汽车生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td><i class="fa fa-cube"></i>&nbsp;左2号生产车间</td><td><input type="checkbox">全选</td><td></td></tr>
+                        <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程2</td><td></td><td><input type="checkbox">允许</td></tr>
+                        <tr><td><i class="fa fa-sticky-note-o"></i>&nbsp;建筑工程3</td><td></td><td><input type="checkbox">允许</td></tr>
+                    </table>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="javacript:void(0);"class="btn btn-primary">确认分享</a>
+                </div>
+            </div>
+        </div>
+    </div>
     <!--弹出协同-->
     <div class="modal fade" id="synergy" data-backdrop="static">
         <div class="modal-dialog" role="document">

zaojiashu.html

@@ -24,9 +24,10 @@
             </div>
         </div>
         <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <div class="mx-2"><a href="project-management.html" class="btn btn-sm" data-toggle="tooltip" title="返回"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
             <div class="header-logo">
-              <div class="v-title">纵横云计价</div>
-              <div class="p-title">广东2018专业版</div>
+              <div class="v-title">重庆2018定额</div>
+              <div class="p-title">纵横云计价(免费版)</div>
             </div>
             <div class="navbar-text navbar-crumb px-1">
                 <span data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-open-o"></i>...</span>
@@ -1862,16 +1863,17 @@
                   </button>
                 </div>
                 <div class="modal-body">
-                  <div class="modal-auto-height">
+                  <div class="modal-auto-height1">
                     <h3>标题1</h3>
                     <h4>标题2</h4>
                     <h5>标题3</h5>
                     <p>这是一行文本</p>
                     <p>这是一行<b>文本</b></p>
+                    <p><img src="img/p2.png"></p>
                     <p class="text-indent">这是一行带缩进的文本</p>
                     <table class="table table-sm table-bordered">
                         <tr><th>表头1</th><th>表头2</th><th>表头3</th></tr>
-                        <tr><td>内容1</td><td>内容2</td><td>内容3</td></tr>
+                        <tr><td class="text-right">内容1</td><td class="text-center">内容2</td><td>内容3</td></tr>
                         <tr><td>内容4</td><td>内容5</td><td>内容6</td></tr>
                       </table>
                   </div>