浏览代码

gulpConfig.js

zhongzewei 6 年之前
父节点
当前提交
cdee1cfb46
共有 3 个文件被更改,包括 2 次插入4 次删除
  1. 0 1
      config/gulpConfig.js
  2. 2 2
      web/building_saas/pm/js/pm_newMain.js
  3. 0 1
      web/users/html/login.html

+ 0 - 1
config/gulpConfig.js

@@ -30,7 +30,6 @@ module.exports = {
     login_jspaths:[
         'public/web/url_util.js',
         'web/users/js/login.js',
-        'public/web/headerOpr.js'
     ],
     pm_css:[
         'lib/ztree/css/zTreeStyle.css',

+ 2 - 2
web/building_saas/pm/js/pm_newMain.js

@@ -849,10 +849,9 @@ const projTreeObj = {
                         BeforeOpenProject(node.data.ID, {'fullFolder': GetFullFolder(node.parent)}, function () {
                             let mainUrl = `/main?project=${node.data.ID}`;
                             CommonAjax.get(mainUrl, [], function () {
-                                newTab.location.href = mainUrl;
+                                newTab.location.replace(mainUrl); //不能后退
                             });
                         });
-                        return;
                     }, timeoutTime);
                 }
                 if (!node || node.children.length === 0) { return; }
@@ -872,6 +871,7 @@ const projTreeObj = {
         };
         TreeNodeCellType.prototype.processMouseMove = function (hitInfo) {
             let sheet = hitInfo.sheet;
+
             let div = sheet.getParent().getHost();
             let canvasId = div.id + "vp_vp";
             let canvas = $(`#${canvasId}`)[0];

+ 0 - 1
web/users/html/login.html

@@ -111,7 +111,6 @@
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
     <script type="text/javascript" src="/web/users/js/login.js"></script>
-    <script src="/public/web/headerOpr.js"></script>
     <!-- endinject -->
 </body>