Selaa lähdekoodia

更新README 项目管理增加共享和协同的弹窗,增加 共享和协同的页面。项目管理,工具栏下拉菜单按钮(链接)hover颜色修改为与其他按钮一样。

Chente 7 vuotta sitten
vanhempi
commit
db938276db
6 muutettua tiedostoa jossa 604 lisäystä ja 11 poistoa
  1. 11 1
      README.md
  2. 3 0
      css/main.css
  3. 256 0
      project-management-share.html
  4. 239 0
      project-management-synergy.html
  5. 91 5
      project-management.html
  6. 4 5
      user-safe.html

+ 11 - 1
README.md

@@ -3,7 +3,7 @@
 
 ## 相关框架插件
 
-* Bootstrap v4.0.0-alpha.6 [https://v4-alpha.getbootstrap.com](https://v4-alpha.getbootstrap.com)
+* Bootstrap v4.0 [https://v4-alpha.getbootstrap.com](https://v4-alpha.getbootstrap.com)
 * Tether 1.4.0 [http://tether.io](http://tether.io/)
 * jQuery 3.1.1 [http://jquery.com](http://jquery.com/)
 * Font Awesome 4.7.0 [http://fontawesome.io](http://fontawesome.io/)
@@ -30,6 +30,9 @@
     ├-- login-infoinput.html
     ├-- login-welcome.html
     ├-- project-management.html
+    ├-- project-management-share.html
+    ├-- project-management-synergy.html
+    ├-- project-management-Recycle.html
     ├-- user-info.html
     ├-- user-safe.html
     ├-- user-buy.html
@@ -39,6 +42,8 @@
     └-- baobiao.html
     └-- feilv.html
     └-- main.html
+    └-- jisuanchengxu.html
+    └-- tools-gongliaoji.html
 
 ## 页面简介
 
@@ -49,6 +54,9 @@
 
 ### 项目管理
 * project-management.html  - 项目管理页
+* project-management-share.html  - 项目管理-共享
+* project-management-synergy.html  - 项目管理-协同
+* project-management-Recycle.html  - 项目管理-回收站
 
 ### 用户相关
 * user-info.html  - 账号信息
@@ -62,3 +70,5 @@
 * baobiao.html - 报表
 * baobiao.html - 费率
 * main.html - 集合 造价书 工料机 报表 费率
+* jisuanchengxu.html - 计算程序
+* tools-gongliaoji.html 工料机库编辑器

+ 3 - 0
css/main.css

@@ -314,6 +314,9 @@ body {
 .dropdown-item{
   color:#007bff
 }
+.dropdown-item:hover{
+  color:#0056b3
+}
 .dropdown-item.disabled, .dropdown-item:disabled{
   pointer-events:none
 }

+ 256 - 0
project-management-share.html

@@ -0,0 +1,256 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>项目管理-Smartcost</title>
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+    <!--zTree-->
+  	<link rel="stylesheet" href="css/ztree/zTreeStyle.css" type="text/css">
+</head>
+
+<body>
+    <div class="header">
+        <!-- <div class="top-msg clearfix">
+            <div class="alert alert-warning mb-0 py-0" 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> -->
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <span class="header-logo px-2">Smartcost</span>
+            <!-- <div class="navbar-text navbar-crumb p-0">
+                <span class=""><a href="project-management.html">项目管理</a></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-o"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span><i class="fa fa-sticky-note-o"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"> <span class="text-truncate float-right">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span></span>
+            </div>
+            <ul class="nav navbar-nav px-1">
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#">定额库编辑器</a>
+                            <a class="dropdown-item" href="tools-gongliaoji.html">工料机库编辑器</a>
+                        </div>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o"></i> 帮助</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#">帮助</a>
+                            <a class="dropdown-item" href="#">升级说明</a>
+                            <a class="dropdown-item" href="#">重庆市2008定额说明</a>
+                            <a class="dropdown-item" href="#">纵横官网</a>
+                            <a class="dropdown-item" href="#">动画教程</a>
+                            <a class="dropdown-item" href="#">联系客服</a>
+                            <a class="dropdown-item" href="#">关于</a>
+                        </div>
+                    </li>
+                </ul> -->
+            <div class="ml-auto navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
+                    <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
+                    <div class="dropdown-menu dropdown-menu-right">
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#" target="_blank">退出登录</a>
+                    </div>
+                </div>
+                <a class="btn btn-link btn-sm new-msg" data-toggle="modal" data-target="#msg" href="javacript:void(0);">
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="main">
+        <div class="poj-manage container-fluid">
+            <div class="row">
+                <div class="col-lg-2">
+                    <div class="poj-cate">
+                        <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
+                        <ul class="nav nav-pills flex-column">
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management.html">全部</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="#">最近使用</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link active" href="project-management-share.html">共享</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management-synergy.html">协同工作</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="#">归档</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management-Recycle.html">回收站</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col-lg-10">
+                    <div class="toolsbar">
+                        <!-- <div class="tools-btn btn-group align-top">
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj2" class="btn btn-sm">新建 <i class="fa fa-cube"></i> 单项工程</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj3" class="btn btn-sm disabled2">新建 <i class="fa fa-sticky-note-o"></i> 单位工程</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="btn btn-sm">新建 <i class="fa fa-folder-o"></i> 文件夹</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#rename" class="btn btn-sm">重命名</a>
+                            <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="" class="btn btn-sm">共享</a>
+                            <a href="" class="btn btn-sm">协同</a>
+                        </div> -->
+                        <legend class="m-0 pb-1">全部</legend>
+                    </div>
+                    <div class="poj-list">
+                        <table class="table table-hover table-sm mb-5">
+                            <thead>
+                                <tr>
+                                    <th width="40%">工程列表</th>
+                                    <th width="10%">由...共享</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> 共享</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></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>
+                              </tr>
+                            </tbody>
+                        </table>
+                    </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>
+                <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>
+        </div>
+    </div>
+    <!--弹出取消共享-->
+    <div class="modal fade" id="cancelshare" 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">
+                  <h5>取消后,被共享人将不再可以查阅该工程。</h5>
+                </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>
+        </div>
+    </div>
+
+    <!--弹出账号信息-->
+    <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>
+                </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>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- JS. -->
+    <script src="js/jquery/jquery-3.2.1.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
+    <script src="js/bootstrap/bootstrap.min.js"></script>
+    <script src="js/global.js"></script>
+</body>
+<script type="text/javascript">
+    autoFlashHeight();
+</script>
+
+</html>

+ 239 - 0
project-management-synergy.html

@@ -0,0 +1,239 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>项目管理-Smartcost</title>
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+    <!--zTree-->
+  	<link rel="stylesheet" href="css/ztree/zTreeStyle.css" type="text/css">
+</head>
+
+<body>
+    <div class="header">
+        <!-- <div class="top-msg clearfix">
+            <div class="alert alert-warning mb-0 py-0" 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> -->
+        <nav class="navbar navbar-expand-lg p-0 d-flex">
+            <span class="header-logo px-2">Smartcost</span>
+            <!-- <div class="navbar-text navbar-crumb p-0">
+                <span class=""><a href="project-management.html">项目管理</a></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="文件夹名称"><i class="fa fa-folder-o"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cubes"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"><i class="fa fa-cube"></i></span>
+                <span class=""><i class="fa fa-angle-right fa-fw"></i></span>
+                <span><i class="fa fa-sticky-note-o"></i></span>
+                <span class="" data-toggle="tooltip" data-placement="bottom" title="乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程"> <span class="text-truncate float-right">&nbsp;乌恰县S309线K72+100-开普太西水库-苏约克村公路建设工程</span></span>
+            </div>
+            <ul class="nav navbar-nav px-1">
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#">定额库编辑器</a>
+                            <a class="dropdown-item" href="tools-gongliaoji.html">工料机库编辑器</a>
+                        </div>
+                    </li>
+                    <li class="nav-item dropdown">
+                        <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o"></i> 帮助</a>
+                        <div class="dropdown-menu">
+                            <a class="dropdown-item" href="#">帮助</a>
+                            <a class="dropdown-item" href="#">升级说明</a>
+                            <a class="dropdown-item" href="#">重庆市2008定额说明</a>
+                            <a class="dropdown-item" href="#">纵横官网</a>
+                            <a class="dropdown-item" href="#">动画教程</a>
+                            <a class="dropdown-item" href="#">联系客服</a>
+                            <a class="dropdown-item" href="#">关于</a>
+                        </div>
+                    </li>
+                </ul> -->
+            <div class="ml-auto navbar-text p-0">
+                <div class="dropdown d-inline-block navbar-nav">
+                    <button class="btn btn-link btn-sm dropdown-toggle" type="button" data-toggle="dropdown">陈特</button>
+                    <div class="dropdown-menu dropdown-menu-right">
+                        <a class="dropdown-item" href="user-info.html" target="_blank">账号资料</a>
+                        <a class="dropdown-item" href="user-buy.html" target="_blank">产品购买</a>
+                        <a class="dropdown-item" href="user-set.html" target="_blank">偏好设置</a>
+                        <div class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="#" target="_blank">退出登录</a>
+                    </div>
+                </div>
+                <a class="btn btn-link btn-sm new-msg" data-toggle="modal" data-target="#msg" href="javacript:void(0);">
+                  <i class="fa fa-envelope-o" aria-hidden="true"></i>&nbsp;2
+                </a>
+            </div>
+        </nav>
+    </div>
+    <div class="main">
+        <div class="poj-manage container-fluid">
+            <div class="row">
+                <div class="col-lg-2">
+                    <div class="poj-cate">
+                        <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
+                        <ul class="nav nav-pills flex-column">
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management.html">全部</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="#">最近使用</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management-share.html">共享</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link active" href="project-management-synergy.html">协同工作</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="#">归档</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" href="project-management-Recycle.html">回收站</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+                <div class="col-lg-10">
+                    <div class="toolsbar">
+                        <!-- <div class="tools-btn btn-group align-top">
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj2" class="btn btn-sm">新建 <i class="fa fa-cube"></i> 单项工程</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj3" class="btn btn-sm disabled2">新建 <i class="fa fa-sticky-note-o"></i> 单位工程</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="btn btn-sm">新建 <i class="fa fa-folder-o"></i> 文件夹</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#rename" class="btn btn-sm">重命名</a>
+                            <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="" class="btn btn-sm">共享</a>
+                            <a href="" class="btn btn-sm">协同</a>
+                        </div> -->
+                        <legend class="m-0 pb-1">全部</legend>
+                    </div>
+                    <div class="poj-list">
+                        <table class="table table-hover table-sm mb-5">
+                            <thead>
+                                <tr>
+                                    <th width="40%">工程列表</th>
+                                    <th width="10%">由...发起</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> 发起</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="#cancelsynergy">取消协同</a></td>
+                              </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出取消协同-->
+    <div class="modal fade" id="cancelsynergy" 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">
+
+                  <table class="table table-bordered">
+                    <thead><tr><th colspan="3">该工程正在与...协同</th></tr></thead>
+                    <tr>
+                      <td>张三</td><td>珠海纵横创新软件有限公司</td>
+                      <td>
+                        <div class="form-check">
+                          <input class="form-check-input" id="exampleCheck1" type="checkbox">
+                        <label class="form-check-label" for="exampleCheck1">取消协同</label>
+                       </div>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td>王五</td><td>珠海纵横创新软件有限公司</td>
+                      <td>
+                        <div class="form-check">
+                          <input class="form-check-input" id="exampleCheck2" type="checkbox">
+                        <label class="form-check-label" for="exampleCheck2">取消协同</label>
+                       </div>
+                      </td>
+                    </tr>
+                  </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>
+            </div>
+        </div>
+    </div>
+    <!--弹出账号信息-->
+    <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>
+                </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>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- JS. -->
+    <script src="js/jquery/jquery-3.2.1.min.js"></script>
+    <script src="js/popper/popper.min.js"></script>
+    <script src="js/bootstrap/bootstrap.min.js"></script>
+    <script src="js/global.js"></script>
+</body>
+<script type="text/javascript">
+    autoFlashHeight();
+</script>
+
+</html>

+ 91 - 5
project-management.html

@@ -89,16 +89,16 @@
                         <input type="text" class="my-2 form-control form-control-sm" placeholder="搜索所有工程">
                         <ul class="nav nav-pills flex-column">
                             <li class="nav-item">
-                                <a class="nav-link active" href="#">全部</a>
+                                <a class="nav-link active" href="project-management.html">全部</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="#">最近使用</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="#">共享</a>
+                                <a class="nav-link" href="project-management-share.html">共享</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" href="#">协同工作</a>
+                                <a class="nav-link" href="project-management-synergy.html">协同工作</a>
                             </li>
                             <li class="nav-item">
                                 <a class="nav-link" href="#">归档</a>
@@ -125,8 +125,8 @@
                             <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="" class="btn btn-sm">共享</a>
-                            <a href="" 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>
                     </div>
@@ -628,6 +628,92 @@
             </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> 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-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>
+                </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>
+    <!--弹出协同-->
+    <div class="modal fade" id="synergy" 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> 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>
+                  <table class="table table-bordered mt-3">
+                    <thead><tr><th colspan="2">该工程正在与...协同</th></tr></thead>
+                    <tr>
+                      <td>张三</td><td>珠海纵横创新软件有限公司</td>
+                    </tr>
+                    <tr>
+                      <td>王五</td><td>珠海纵横创新软件有限公司</td>
+                    </tr>
+                  </table>
+                </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>

+ 4 - 5
user-safe.html

@@ -92,11 +92,10 @@
                             <div class="form-group">
                                 <label class="form-control-label">异常登录提醒</label>
                                 <div class="form-control-static">
-                                  <label class="custom-control custom-checkbox" data-toggle="modal" data-target="#phoneTips" >
-                                    <input type="checkbox" class="custom-control-input">
-                                    <span class="custom-control-indicator"></span>
-                                    <span class="custom-control-description">开启</span>
-                                  </label>
+                                  <div class="custom-control custom-checkbox" >
+                                    <input type="checkbox" class="custom-control-input" id="customCheck1">
+                                    <label class="custom-control-label" for="customCheck1"  data-toggle="modal" data-target="#phoneTips">开启</label>
+                                  </div>
                                   <p class="text-muted">
                                     账号出现异常登录时将给你的手机号码发送通知。
                                   </p>