Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost into 1.0.0_online

web/building_saas/main/js/main.js

@@ -67,6 +67,8 @@ function loadMainSize() {//加载造价书页面各高度
     });
 }
 
+let mouseMoveCount = 0;
+
 /**
  * 拖动更改div大小
  *
@@ -130,6 +132,12 @@ function slideResize(eles, limit, type, callback) {
                 eles.nearSpread[type](nEleChangeSize);
                 eles.farSpread[type](fEleChangeSize - navSize);
             }
+            //实时刷新页面
+            mouseMoveCount+=Math.abs(moveSize);//取移动的决对值
+            if(mouseMoveCount >=5){//当累计移动超过5个像素时，才刷新，减少刷新次数
+                if(callback) callback();
+                mouseMoveCount = 0;
+            }
         }
     });
 

web/building_saas/main/js/views/fee_rate_view.js

@@ -708,13 +708,21 @@ var feeRateObject={
         }
     },
     submitSaveAs:function (newName) {
-        var me = this;
-          projectObj.project.FeeRate.feeRateFileSaveAs(newName,function (result) {
-              me.activateFeeRate = result;
-              me.loadPageContent();
-              $('#copy-lv').modal('hide');
-              socket.emit('feeRateChangeNotify', projectObj.project.FeeRate.getActivateFeeRateFileID());
-              $.bootstrapLoading.end();
+        let me = this;
+        let FeeRate = projectObj.project.FeeRate;
+        FeeRate.feeRateFileSaveAs(newName,function (result) {
+            me.activateFeeRate = result;
+            me.loadPageContent();
+            $('#copy-lv').modal('hide');
+            let data ={
+                projectID:projectObj.project.ID(),
+                oldRoom:socketObject.roomInfo.feeRate,
+                newRoom: FeeRate.getActivateFeeRateFileID(),
+                name:'feeRate'
+            };
+            socket.emit('changeNewRoom',data);
+            socketObject.roomInfo.feeRate = FeeRate.getActivateFeeRateFileID();
+            $.bootstrapLoading.end();
         });
 
     },