分享功能调整；造价书内，导入增加下拉，显示/隐藏特征内容

project-management-Recycle.html

@@ -103,7 +103,7 @@
                           <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
                       </li>
                       <li class="nav-item">
-                          <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                          <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="分享"><i class="fa fa-share-alt"></i></a>
                       </li>
                       <li class="nav-item">
                           <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>

project-management-share.html

@@ -97,13 +97,13 @@
                   </div>
                     <ul class="nav nav-pills flex-column">
                         <li class="nav-item">
-                            <a class="nav-link active" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
+                            <a class="nav-link" href="project-management.html" data-toggle="tooltip" data-placement="right" data-original-title="全部"><i class="fa fa-bars"></i></a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                            <a class="nav-link active" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="分享"><i class="fa fa-share-alt"></i></a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>
@@ -140,8 +140,8 @@
                             <thead>
                                 <tr>
                                     <th width="40%">工程列表</th>
-                                    <th width="10%">由...共享</th>
-                                    <th width="10%">共享给...</th>
+                                    <th width="10%">由...分享</th>
+                                    <th width="10%">分享给...</th>
                                     <th width="10%">操作</th>
                                 </tr>
                             </thead>
@@ -149,23 +149,23 @@
                               <!--别人共享给我有拷贝权限-->
                               <tr>
                                   <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
-                                  <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 共享</td>
-                                  <td>共享给 我</td>
+                                  <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享</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> 共享</td>
-                                  <td>共享给 我</td>
+                                  <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享</td>
+                                  <td>分享给 我</td>
                                   <td></td>
                               </tr>
                               <!--我分享给别人-->
                               <tr>
                                   <td class="in-1">&nbsp;<a href="#">建筑工程2</a></td>
-                                  <td>由 我 共享</td>
-                                  <td>共享给 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a>、<a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">王五</a></td>
-                                  <td><a href="javacript:void(0);" data-toggle="modal" data-target="#cancelshare">取消分享</a></td>
+                                  <td>由 我 分享</td>
+                                  <td>分享给 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">张三 <i class="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>
                         </table>
@@ -205,29 +205,37 @@
             </div>
         </div>
     </div>
-    <!--弹出取消共享-->
-    <div class="modal fade" id="cancelshare" data-backdrop="static">
+
+    <!--弹出账号信息-->
+    <div class="modal fade" id="userinfo" 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>
+                  <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">
-                  <h5>取消后，被共享人将不再可以查阅该工程。</h5>
+                  <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> 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>
                 <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>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                 </div>
             </div>
         </div>
     </div>
-
-    <!--弹出账号信息-->
-    <div class="modal fade" id="userinfo" data-backdrop="static">
+    <!--弹出账号信息 有分享者权限-->
+    <div class="modal fade" id="userinfo2" data-backdrop="static">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
@@ -247,13 +255,67 @@
                         <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="form-check mt-3">
+                     <input type="checkbox" class="form-check-input" id="exampleCheck1">
+                     <label class="form-check-label" for="exampleCheck1">允许该用户拷贝该工程</label>
+                     <!--打勾后出现提示-->
+                     <small id="emailHelp" class="form-text text-danger"><i class="fa fa-exclamation-triangle"></i> 该用户可以把你的项目拷贝成为他的数据，请谨慎勾选。</small>
+                   </div>
                 </div>
                 <div class="modal-footer">
+                    <!--分享人可以取消-->
+                    <button type="button" class="btn btn-outline-danger" data-dismiss="modal">取消分享</button>
                     <button type="button" class="btn btn-secondary" 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>
+                  <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>
+                  <div class="form-group mt-3">
+                    <p>分享后，该用户仅可查阅工程，不具备任何编辑修改功能。</p>
+                  </div>
+                  <div class="form-check">
+                     <input type="checkbox" class="form-check-input" id="exampleCheck1">
+                     <label class="form-check-label" for="exampleCheck1">允许该用户拷贝该工程</label>
+                     <!--打勾后出现提示-->
+                     <div id="emailHelp" class="form-text text-danger"><i class="fa fa-exclamation-triangle"></i> 该用户可以把你的项目拷贝成为他的数据，请谨慎勾选。 </div>
+                   </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" 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-synergy.html

@@ -103,7 +103,7 @@
                         <a class="nav-link" href="#"  data-toggle="tooltip" data-placement="right" data-original-title="最近使用"><i class="fa fa-bookmark"></i></a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="共享"><i class="fa fa-share-alt"></i></a>
+                        <a class="nav-link" href="project-management-share.html"  data-toggle="tooltip" data-placement="right" data-original-title="分享"><i class="fa fa-share-alt"></i></a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" href="project-management-synergy.html"  data-toggle="tooltip" data-placement="right" data-original-title="协同工作"><i class="fa fa-users"></i></a>

project-management.html

@@ -103,7 +103,7 @@
                             <a class="nav-link" href="#" ><i  data-toggle="tooltip" data-placement="right" data-original-title="最近使用" class="fa fa-bookmark"></i></a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="project-management-share.html" ><i class="fa fa-share-alt" data-toggle="tooltip" data-placement="right" data-original-title="共享"></i></a>
+                            <a class="nav-link" href="project-management-share.html" ><i class="fa fa-share-alt" data-toggle="tooltip" data-placement="right" data-original-title="分享"></i></a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="project-management-synergy.html" ><i class="fa fa-users" data-toggle="tooltip" data-placement="right" data-original-title="协同工作"></i></a>
@@ -135,7 +135,7 @@
                         <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="btn btn-sm">删除</a>
                         <a href="javacript:void(0);" data-toggle="modal" data-target="#moveto" class="btn btn-sm">移动到...</a>
                         <a href="javacript:void(0);" data-toggle="modal" data-target="#copyto" class="btn btn-sm">复制到...</a>
-                        <a href="javacript:void(0);" data-toggle="modal" data-target="#share" class="btn btn-sm">共享</a>
+                        <a href="javacript:void(0);" data-toggle="modal" data-target="#share" class="btn btn-sm">分享</a>
                         <a href="javacript:void(0);" data-toggle="modal" data-target="#synergy" class="btn btn-sm">协同</a>
                     </div>
                     <legend class="m-0 pb-1">全部</legend>
@@ -637,22 +637,22 @@
             </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>
                 </div>
                 <div class="modal-body">
                   <div class="form-group">
-                      <label>共享给...</label>
-                      <input class="form-control" placeholder="输入对方通行证帐号" type="text">
+                      <label>分享给...</label>
+                      <input class="form-control" placeholder="输入对方手机号" type="text">
                       <span class="form-text text-danger">账号不存在。</span>
-                      <span class="form-text text-danger">已与该用户共享。</span>
+                      <span class="form-text text-danger">已与该用户分享。</span>
                   </div>
                   <div class="card">
                       <div class="card-body">
@@ -665,16 +665,18 @@
                       </ul>
                   </div>
                   <div class="form-group mt-3">
-                    <p>共享后，该用户仅可查阅工程，不具备任何编辑修改功能。</p>
+                    <p>分享后，该用户仅可查阅工程，不具备任何编辑修改功能。</p>
                   </div>
                   <div class="form-check">
                      <input type="checkbox" class="form-check-input" id="exampleCheck1">
                      <label class="form-check-label" for="exampleCheck1">允许该用户拷贝该工程</label>
+                     <!--打勾后出现提示-->
+                     <div id="emailHelp" class="form-text text-danger"><i class="fa fa-exclamation-triangle"></i> 该用户可以把你的项目拷贝成为他的数据，请谨慎勾选。 </div>
                    </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-                    <a href="" class="btn btn-primary">确定共享</a>
+                    <a href="" class="btn btn-primary">确定分享</a>
                 </div>
             </div>
         </div>
@@ -702,8 +704,8 @@
                         <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>
+                        <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="通行账号手机"><i class="fa fa-tablet"></i> 15212620017</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>
                   <table class="table table-bordered mt-3">

zaojiashu.html

@@ -243,7 +243,9 @@
                   </div>
                 </span>
                 <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="锁定清单"><i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a>
-                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="解锁清单"><i class="fa fa-unlock-alt" aria-hidden="true"></i> 解锁清单</a>
+                <!-- <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="锁定清单"><i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a> -->
+                <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="显示特征内容"><i class="fa fa-eye" aria-hidden="true"></i> 显示特征内容</a>
+                <!-- <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="隐藏特征内容"><i class="fa fa-eye-slash" aria-hidden="true"></i> 隐藏特征内容</a> -->
 
               </div>
               <div class="side-tabs">