瀏覽代碼

update move

zhangweicheng 7 年之前
父節點
當前提交
24a4870754
共有 3 個文件被更改,包括 6 次插入14 次删除
  1. 1 1
      config/config.js
  2. 5 5
      modules/pm/controllers/pm_controller.js
  3. 0 8
      web/building_saas/pm/js/pm_newMain.js

+ 1 - 1
config/config.js

@@ -10,7 +10,7 @@ module.exports = {
             auth: {
                 "authdb": "admin"
               },
-            connectTimeoutMS: 20000,
+            connectTimeoutMS: 50000,
             useMongoClient: true
         }
     },

+ 5 - 5
modules/pm/controllers/pm_controller.js

@@ -384,14 +384,14 @@ module.exports = {
                 await feeRateFileModel.bulkWrite(bulkFFs);
             }
             callback(request, response, 0, 'success', null);
-        }
-        catch(err){
+        } catch(err){
             callback(request, response, 1, err, null);
-        }    },
-moveProject:async function(req,res){
+        }
+    },
+    moveProject:async function(req,res){
         let result={
             error:0
-        }
+        };
         try {
             let data = req.body.data;
             let rdata= await pm_facade.moveProject(data);

+ 0 - 8
web/building_saas/pm/js/pm_newMain.js

@@ -174,7 +174,6 @@ const projTreeObj = {
         me.initSelection(args.newSelections[0], args.oldSelections[0]);
     },
     onDragDropBlock : function (sender,args) {//拖动移动项目位置
-        console.log(args);
         let selected = projTreeObj.tree.selected;
         let targetNode = projTreeObj.tree.items[args.toRow];
         let projectMap = {},feeRateMap={},unitPriceMap = {},parent=null,next = null;
@@ -237,25 +236,18 @@ const projTreeObj = {
         }
         $.bootstrapLoading.start();
         moveProjects({"user_id": userID,rootProjectID:rootProjectID,projectMap:projectMap,feeRateMap:feeRateMap,unitPriceMap:unitPriceMap},function (result) {
-            console.log(result);
             for(let key in result){//更新前端节点数据
                 let updateData = result[key].update;
                 let node = projTreeObj.tree.findNode(result[key].query.ID);
                 if(node){
-                    console.log(node.data);
                     for(let ukey in updateData){
                         _.set(node.data,ukey,updateData[ukey]);
                     }
-                    console.log(node.data);
                 }
             }
             projTreeObj.moveTo(selected,targetNode,parent,next);
             $.bootstrapLoading.end();
         });
-      //  projTreeObj.moveTo(selected,targetNode,parent,next);
-        //删除行数
-
-
         function getMoveUpdateData(sel,target,projectMap,sameLevel) {
             let tem_parent = null,tem_next = null;
             if(sameLevel==true){//移动后的位置的级别相同