自动伸缩

@@ -181,7 +181,7 @@
 </div>
 
 <script src="<%=basePath%>script/common/genarate_left_panel.js"></script>
-<script src="<%=basePath%>script/autoscaling/autoscaling_new.js?v=20171022-2"></script>
+<script src="<%=basePath%>script/autoscaling/autoscaling_new.js?v=20171022-3"></script>
 <script>
     $("#li_manager").addClass("active open");
     $("#li_autoscaling").addClass("active");

@@ -322,7 +322,13 @@ function changeOk(){
         //清空
         $("#resultScalingMessage").html("");
         writeToText("第 0 步:获取原实例ip-->");
-        souInstanceIps = getIpByGroupId(scalingGroupName,souScalingGroupId);
+        if(1 == $("#cloudType").val()){
+            souInstanceIps = getIpByGroupId(aws_scalingGroupName,souScalingGroupId);
+        }else{
+            souInstanceIps = getIpByGroupId(scalingGroupName,souScalingGroupId);
+        }
+alert(souInstanceIps);
+        return ;
         writeToText("获取原实例ip获取完成："+souInstanceIps);
         writeToText("获取原实例ip获取完成");
         souProjectNames = getDeployProjectNames(scalingGroupName);
@@ -373,7 +379,11 @@ function clear_Sour(){
 
 //腾讯云:修改伸缩组后的下一个流程是查询伸缩活动
 function refCloudMessage(cloudType,showMessage, serverChangeCount,desiredCapacity){
-    var url = contextPath + 'autoScalingTool/getIpsByScalingGroupId?groupName='+scalingGroupName+'&groupId='+souScalingGroupId+"&cloudType="+$("#cloudType").val();
+    var tmpGroupName=scalingGroupName;
+    if(1 == $("#cloudType").val()){
+        tmpGroupName=aws_scalingGroupName;
+    }
+    var url = contextPath + 'autoScalingTool/getIpsByScalingGroupId?groupName='+tmpGroupName+'&groupId='+souScalingGroupId+"&cloudType="+$("#cloudType").val();
     writeToText("开始..........");
     var count = 0;
     var intervalIndex = setInterval(function() {