ソースを参照

更新BS至4.1;分享功能调整

Chente 6 年 前
コミット
02b099d53c
4 ファイル変更127 行追加181 行削除
  1. 2 2
      css/bootstrap/bootstrap.min.css
  2. 2 2
      js/bootstrap/bootstrap.min.js
  3. 121 175
      project-management-share.html
  4. 2 2
      zaojiashu.html

ファイルの差分が大きいため隠しています
+ 2 - 2
css/bootstrap/bootstrap.min.css


ファイルの差分が大きいため隠しています
+ 2 - 2
js/bootstrap/bootstrap.min.js


+ 121 - 175
project-management-share.html

@@ -12,7 +12,6 @@
     <!--zTree-->
   	<link rel="stylesheet" href="css/ztree/zTreeStyle.css" type="text/css">
 </head>
-
 <body>
     <div class="header">
         <!-- <div class="top-msg clearfix">
@@ -173,52 +172,96 @@
                               </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>
-                                <!--单位工程共享 别人共享给我无拷贝权限-->
-                                <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>
+                            <!--单项工程共享-->
+                            <tr>
+                                <td class="in-1"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-cubes"></i>&nbsp;未定义建设项目</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>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享</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>
+                            <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;左3号生产车间</a></td>
+                                <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享</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;建筑工程6</a></td>
+                                <td></td>
+                                <td></td>
+                                <td><a href="javacript:void(0);" data-toggle="modal" data-target="#copytomy">拷贝工程</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-cubes"></i>&nbsp;未定义建设项目</td>
                                     <td></td>
                                     <td></td>
                                     <td></td>
-                                </tr>
+                            </tr>
+                            <tr>
+                                <td class="in-2"><a href="#" class="tree-open" title="收起"><i class="fa fa-minus-square-o"></i></a><i class="fa fa-cube"></i>&nbsp;未定义单项工程</td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            <!--单位工程共享 单别人共享给我有拷贝权限-->
+                            <tr>
+                                <td class="in-3">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i><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="#copytomy">拷贝工程</a></td>
+                            </tr>
+                            <!--单位工程共享 别人共享给我无拷贝权限-->
+                            <tr>
+                                <td class="in-3">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i><a href="#">建筑工程3</a></td>
+                                <td>由 <a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo">张三</a> 分享</td>
+                                <td>分享给 我</td>
+                                <td></td>
+                            </tr>
+                            <!--单位工程共享 我分享给别人-->
+                            <tr>
+                                <td class="in-3">└</span><a href="zaojiashu.html"><i class="fa fa-sticky-note-o"></i><a href="#">建筑工程4</a></td>
+                                <td>由 我 分享</td>
+                                <td><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>由 我 分享</td>
+                                <td><a href="javacript:void(0);" data-toggle="modal" data-target="#userinfo2">分享给...</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>
@@ -388,79 +431,26 @@
             </div>
         </div>
     </div>
-    <!--弹出账号信息 有分享者权限-->
+    <!--弹出 分享给..-->
     <div class="modal fade" id="userinfo2" 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">
-                      <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="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-primary" data-dismiss="modal">确定</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!--弹出账号信息 文件夹 分享-->
-    <div class="modal fade" id="userinfo3" 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>
+                  <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>
+                    <table class="table table-sm">
+                        <tr><th>姓名</th><th>公司</th><th>手机</th><th>邮箱</th><th width="90">允许拷贝</th><th width="90">取消分享</th></tr>
+                        <tr><td>张三</td><td>XX公司</td><td>12345678900</td><td></td><td><input type="checkbox"></td><td><input type="checkbox"></td></tr>
+                        <tr><td>王五</td><td>XX公司</td><td>12345678900</td><td></td><td><input type="checkbox"></td><td><input type="checkbox"></td></tr>
+                    </table>
                 </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>
                     <button type="button" class="btn btn-primary" data-dismiss="modal">确定</button>
                 </div>
             </div>
@@ -498,7 +488,7 @@
                   </div>
                   <div class="form-check">
                      <input type="checkbox" class="form-check-input" id="exampleCheck1">
-                     <label class="form-check-label" for="exampleCheck1">允许该用户拷贝工程</label>
+                     <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>
@@ -510,76 +500,32 @@
             </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 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>
-    </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 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>
-        </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>
     </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>

+ 2 - 2
zaojiashu.html

@@ -15,14 +15,14 @@
 
 <body>
     <div class="header">
-        <div class="top-msg clearfix">
+        <!-- <div class="top-msg clearfix">
             <div class="alert alert-warning alert-dismissible" role="alert">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
                   </button>
                 <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
             </div>
-        </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">