Преглед изворни кода

恢复 项目管理,空白处右键“新建分段”卡死。

chenshilong пре 2 година
родитељ
комит
8b1c4e31d5

+ 128 - 167
web/building_saas/pm/html/blank-project.html

@@ -1,188 +1,149 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-  <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" />
+
+<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>项目管理-<%= title%></title>
-    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="/web/building_saas/css/main.css" />
-    <link rel="stylesheet" href="/web/building_saas/css/custom.css" />
-    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css" />
-    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" />
+    <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/web/building_saas/css/main.css">
+    <link rel="stylesheet" href="/web/building_saas/css/custom.css">
+    <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css">
     <!--zTree-->
-    <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css" />
-    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css" />
-    <link rel="shortcut icon" href="/web/building_saas/css/favicon.ico" />
-    <link rel="icon" type="image/gif" href="/web/building_saas/css/animated_favicon1.gif" />
+    <link rel="stylesheet" href="/lib/ztree/css/zTreeStyle.css" type="text/css">
+    <link rel="stylesheet" href="/lib/jquery-contextmenu/jquery.contextMenu.css">
+    <link rel="shortcut icon" href="/web/building_saas/css/favicon.ico">
+    <link rel="icon" type="image/gif" href="/web/building_saas/css/animated_favicon1.gif">
     <script>
-      // 这里的变量供页面调用
-      var userAccount = "<%- userAccount %>";
-      var userID = "<%- userID %>";
+        // 这里的变量供页面调用
+        var userAccount = '<%- userAccount %>';
+        var userID = '<%- userID %>';
     </script>
     <style type="text/css">
-      .hidden-area {
-        display: none;
-      }
-      #summary-engineering,
-      #summary-project {
-        display: none;
-      }
-      #shareToInfo {
-        display: block;
-        height: 200px;
-        overflow-y: auto;
-        -webkit-overflow-scrolling: touch;
-      }
+        .hidden-area{
+            display: none;
+        }
+        #summary-engineering,#summary-project{
+            display: none;
+        }
+        #shareToInfo {
+            display:block;
+            height:200px;
+            overflow-y:auto;
+            -webkit-overflow-scrolling: touch;
+        }
     </style>
-  </head>
+</head>
 
-  <body oncontextmenu="return false;">
-    <!--屏蔽input鼠标右键-->
-    <img src="/web/dest/css/img/folder_open.png" id="folder_open_pic" style="display: none" />
-    <img src="/web/dest/css/img/folder_close.png" id="folder_close_pic" style="display: none" />
-    <img src="/web/dest/css/img/project.png" id="proj_pic" style="display: none" />
-    <img src="/web/dest/css/img/engineering.png" id="eng_pic" style="display: none" />
-    <img src="/web/dest/css/img/tender.png" id="tender_pic" style="display: none" />
-    <img src="/web/dest/css/img/refresh.png" id="refresh_pic" style="display: none" />
-    <img src="/web/dest/css/img/share.png" id="share_pic" style="display: none" />
-    <img src="/web/dest/css/img/copy.png" id="copy_pic" style="display: none" />
-    <img src="/web/dest/css/img/edit.png" id="edit_pic" style="display: none" />
-    <div class="header">
-      <input type="hidden" id="projectTitle" value="<%= title%>" />
-      <div class="top-msg clearfix">
-        <div class="alert alert-warning mb-0 py-0" role="alert" style="display: none">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
-          <strong>注意!</strong> 这是一条消息通知 <a href="#">链接</a>
+<body oncontextmenu="return false;">  <!--屏蔽input鼠标右键-->
+    <img src="/web/dest/css/img/folder_open.png" id="folder_open_pic" style="display: none">
+    <img src="/web/dest/css/img/folder_close.png" id="folder_close_pic" style="display: none">
+    <img src="/web/dest/css/img/project.png" id="proj_pic" style="display: none">
+    <img src="/web/dest/css/img/engineering.png" id="eng_pic" style="display: none">
+    <img src="/web/dest/css/img/tender.png" id="tender_pic" style="display: none">
+    <img src="/web/dest/css/img/refresh.png" id="refresh_pic" style="display: none">
+    <img src="/web/dest/css/img/share.png" id="share_pic" style="display: none">
+    <img src="/web/dest/css/img/copy.png" id="copy_pic" style="display: none">
+    <img src="/web/dest/css/img/edit.png" id="edit_pic" style="display: none">
+<div class="header">
+    <input type="hidden" id="projectTitle" value="<%= title%>">
+    <div class="top-msg clearfix">
+        <div class="alert alert-warning mb-0 py-0" role="alert" style="display: none;">
+            <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>
-      <%include ../../../common/html/header.html %>
     </div>
-    <div class="main">
-      <a id="autoOpenTender" style="display: none"></a>
-      <div class="poj-manage container-fluid p-0">
-        <div class="pm-side">
-          <div class="poj-cate">
-            <div class="dropdown" style="height: 38px"></div>
-            <ul class="nav nav-pills flex-column" id="sideTab">
-              <li class="nav-item" data-original-title="项目管理" data-placement="right" data-toggle="tooltip">
-                <a class="nav-link active" href="#pm_all" role="tab" id="tab_pm_all" data-toggle="tab"><i class="fa fa-bars"></i></a>
-              </li>
-              <li class="nav-item" data-original-title="分享" data-placement="right" data-toggle="tooltip">
-                <a class="nav-link" href="#pm_share" id="tab_pm_share" data-toggle="tab"><i class="fa fa-share-alt"></i></a>
-              </li>
-              <li class="nav-item" data-original-title="回收站" data-placement="right" data-toggle="tooltip">
-                <a class="nav-link" href="#pm_gc" id="tab_pm_gc" data-toggle="tab"><i class="fa fa-trash"></i></a>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="pm-content">
-          <div class="tab-content">
-            <div class="tab-pane active" id="pm_all" role="tabpanel">
-              <div class="toolsbar">
-                <legend class="m-0 px-4">
-                  项目管理
-                  <div class="tools-btn btn-group align-top btn-group-sm my-1 ml-3">
-                    <a id="addMenuBtn" href="javascript:;" data-toggle="modal" data-target="#add-tender-dialog" class="btn btn-primary px-5 border-radius"
-                      ><i class="fa fa-plus"></i> 新建</a
-                    >
-                  </div>
-                  <div class="tools-btn btn-group align-top px-3 my-1">
-                    <a
-                      id="upLevel"
-                      href="javascript:void(0);"
-                      class="btn btn-light btn-sm disabled"
-                      data-toggle="tooltip"
-                      data-placement="bottom"
-                      title=""
-                      data-original-title="升级"
-                      ><i class="fa fa-arrow-left" aria-hidden="true"></i
-                    ></a>
-                    <a
-                      id="downLevel"
-                      href="javascript:void(0);"
-                      class="btn btn-light btn-sm"
-                      data-toggle="tooltip"
-                      data-placement="bottom"
-                      title=""
-                      data-original-title="降级"
-                      ><i class="fa fa-arrow-right" aria-hidden="true"></i
-                    ></a>
-                    <a
-                      id="upMove"
-                      href="javascript:void(0);"
-                      class="btn btn-light btn-sm"
-                      data-toggle="tooltip"
-                      data-placement="bottom"
-                      title=""
-                      data-original-title="上移"
-                      ><i class="fa fa-arrow-up" aria-hidden="true"></i
-                    ></a>
-                    <a
-                      id="downMove"
-                      href="javascript:void(0);"
-                      class="btn btn-light btn-sm"
-                      data-toggle="tooltip"
-                      data-placement="bottom"
-                      title=""
-                      data-original-title="下移"
-                      ><i class="fa fa-arrow-down" aria-hidden="true"></i
-                    ></a>
-                  </div>
-                </legend>
-              </div>
-              <div class="poj-list" id="projSpread"></div>
+    <%include ../../../common/html/header.html %>
+</div>
+<div class="main">
+    <a id="autoOpenTender" style="display: none;"></a>
+    <div class="poj-manage container-fluid p-0">
+            <div class="pm-side">
+                <div class="poj-cate">
+                    <div class="dropdown" style="height: 38px">
+                    </div>
+                    <ul class="nav nav-pills flex-column" id="sideTab">
+                        <li class="nav-item" data-original-title="项目管理" data-placement="right" data-toggle="tooltip">
+                            <a class="nav-link active" href="#pm_all" role="tab" id="tab_pm_all" data-toggle="tab"><i class="fa fa-bars"></i></a>
+                        </li>
+                        <li class="nav-item" data-original-title="分享" data-placement="right" data-toggle="tooltip">
+                            <a class="nav-link" href="#pm_share" id="tab_pm_share" data-toggle="tab"><i class="fa fa-share-alt"></i></a>
+                        </li>
+                        <li class="nav-item" data-original-title="回收站" data-placement="right" data-toggle="tooltip">
+                            <a class="nav-link" href="#pm_gc" id="tab_pm_gc" data-toggle="tab"><i class="fa fa-trash"></i></a>
+                        </li>
+                    </ul>
+                </div>
             </div>
-          </div>
-        </div>
-      </div>
-      <div class="slide-sidebar">
+            <div class="pm-content">
+                <div class="tab-content">
+                    <div class="tab-pane active" id="pm_all" role="tabpanel">
+                        <div class="toolsbar">
+                            <legend class="m-0 px-4">项目管理
+                                <div class="tools-btn btn-group align-top btn-group-sm my-1 ml-3">
+                                    <a id="addMenuBtn" href="javascript:;" data-toggle="modal" data-target="#add-tender-dialog" class="btn btn-primary px-5 border-radius"><i class="fa fa-plus"></i> 新建</a>
+                                </div>
+                                <div class="tools-btn btn-group align-top px-3 my-1">
+                                    <a id="upLevel" href="javascript:void(0);" class="btn btn-light btn-sm disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                                    <a id="downLevel" href="javascript:void(0);" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                                    <a id="upMove" href="javascript:void(0);" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                                    <a id="downMove" href="javascript:void(0);" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                                </div>
+                            </legend>
+                        </div>
+                        <div class="poj-list" id="projSpread">
+                        </div>
+                    </div>
+                </div>
+            </div>
+    </div>
+    <div class="slide-sidebar">
         <div class="side-content">
-          <!--建设项目汇总-->
-          <div class="p-3" id="summary-project">
-            <legend>单价文件</legend>
-            <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-unit-price-table">
-              <thead>
-                <th style="width: 25px" class="text-center"></th>
-                <th style="width: 330px" class="text-center">名称</th>
-                <th style="width: 55px" class="text-center">使用</th>
-              </thead>
-              <tbody></tbody>
-            </table>
+            <!--建设项目汇总-->
+            <div class="p-3" id="summary-project">
+                <legend>单价文件</legend>
+                <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-unit-price-table">
+                    <thead>
+                        <th style="width: 25px;" class="text-center"></th>
+                        <th style="width: 330px;" class="text-center">名称</th>
+                        <th style="width: 55px;" class="text-center">使用</th>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
 
-            <legend>费率文件</legend>
-            <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-fee-table">
-              <thead>
-                <th style="width: 25px" class="text-center"></th>
-                <th style="width: 330px" class="text-center">名称</th>
-                <th style="width: 55px" class="text-center">使用</th>
-              </thead>
-              <tbody></tbody>
-            </table>
-          </div>
+
+                <legend>费率文件</legend>
+                <table class="table table-bordered table-hover table-sm table-sc" id="summary-project-fee-table">
+                    <thead>
+                        <th style="width: 25px;" class="text-center"></th>
+                        <th style="width: 330px;" class="text-center">名称</th>
+                        <th style="width: 55px;" class="text-center">使用</th>
+                    </thead>
+                    <tbody>
+                    </tbody>
+                </table>
+            </div>
         </div>
-      </div>
     </div>
-  </body>
-  <script type="text/javascript">
+</div>
+
+
+</body>
+<script type="text/javascript">
     autoFlashHeight();
     function _showFreeUserInfo() {
-      const showFreeUserInfo = `尊敬的用户:<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;养护云计价学习版已停用,请升级专业版,即可继续使用。<br>如有疑问,请联系:<br>纵横全国服务热线:0756-3850888,企业QQ:800003850`;
-      hintBox.infoBox(
-        "温馨提示",
-        showFreeUserInfo,
-        1,
-        () => {
-          CommonHeader.getCategoryList();
-        },
-        null,
-        ["联系当地客服"],
-        false
-      );
+        const showFreeUserInfo = `尊敬的用户:<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;养护云计价学习版已停用,请升级专业版,即可继续使用。<br>如有疑问,请联系:<br>纵横全国服务热线:0756-3850888,企业QQ:800003850`;
+        hintBox.infoBox('温馨提示', showFreeUserInfo, 1, 
+            ()=>{
+                CommonHeader.getCategoryList();
+            }, null, ['联系当地客服'], false
+        );
     }
     $(document).ready(setTimeout(_showFreeUserInfo, 20));
-  </script>
+</script>
 </html>

+ 1 - 1
web/building_saas/pm/html/project-management.html

@@ -135,7 +135,7 @@
                                     <a id="downMove" href="javascript:void(0);" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                                 </div>-->
                                 <div class="tools-btn btn-group align-top btn-group-sm my-1 ml-3">
-                                    <!-- <a id="addMenuBtn" href="javascript:;" data-toggle="modal" data-target="#add-tender-dialog" class="btn btn-primary px-5 border-radius"><i class="fa fa-plus"></i> 新建666</a> -->
+                                    <a id="addMenuBtn" href="javascript:;" data-toggle="modal" data-target="#add-tender-dialog" class="btn btn-primary px-5 border-radius"><i class="fa fa-plus"></i> 新建</a>
                                     <!--<div class="dropdown-menu dropright" id="addMenu">
                                         <a href="javascript:;" id="addFolderSub" class="dropdown-item" data-toggle="modal" data-target="#add-folder-dialog"><i class="pm-i fa fa-folder-open-o" aria-hidden="true"></i> 新建文件夹</a>
                                         <a href="javascript:;" id="addProjectSub" class="dropdown-item" data-toggle="modal" data-target="#add-project-dialog"><i class="pm-i fa fa-cubes" aria-hidden="true"></i> 新建建设项目</a>

Разлика између датотеке није приказан због своје велике величине
+ 3697 - 3852
web/building_saas/pm/js/pm_newMain.js