完善数据迁移进度页面

plugins/configs/ts/ConfigsHelper.ts

@@ -99,7 +99,7 @@ module Configs{
             method: "POST",
             dataType: 'json', 
             url: RESTfulUrl,    
-            data: resource,     
+            data: JSON.stringify(resource),     
         }).success((data,header,config,status) => {        	
         	if(angular.isFunction(fn))
             	fn(data, header);  

plugins/developer/ts/dataManagerModel.ts

@@ -109,7 +109,15 @@ module Developer{
 				name: item.cityName+ "-" + item.districtName,
 				systemName: item.systemName,
 				status: item.completeStatus,
-				process: item.rate
+				process: item.rate,
+				from: item.dataPath,
+				to: item.dstPath,
+				labels:{
+					dataType: item.dataType,
+					batch: "批次"+item.submittedBatch,					
+					dataVersion: "版本"+item.dataVersion,
+					dataYear: item.year
+				}
 			});
 		});
 		return result;
@@ -177,10 +185,10 @@ module Developer{
 					success : function(data) { 
 					    if(data){			
 						    result = data;						   				   
-						}												
+						}																		
 					} 	
-				});
-				this.transferTasks = formatTask(result);											
+				});				
+				this.transferTasks = formatTask(result);																	
  		    },1500);
 
  		    timer.then(() =>{

plugins/developer/ts/fileMigrationTask.ts

@@ -63,13 +63,10 @@ module Developer {
 		]};
 
 
-		$scope.$on("deleteRow", (event, data) =>{
-			console.log("确认删除");
-			console.log(data);
-			if(data.status === 1)
-				console.log("无法删除");
-			else{
-				
+		$scope.$on("deleteRow", (event, data) =>{			
+			if(data.status == 1)
+				alert("无法删除正在迁移的数据");
+			else{				
 				Configs.oracleInfoOperate($http, "/java/console/api/task/transfer", Configs.OperateType.DELETE, data, (data, status) =>{
 					if(status === 200)
 						console.log("删除成功");

plugins/kubernetes/html/layoutKubernetes.html

@@ -231,7 +231,7 @@
         <div ng-show="entity.status!==3" class="progress-bar progress-bar-success active sj_progress_bar " role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%">
             <span class="sj_progress_font">{{entity.process}}%</span>
         </div>
-        <div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%">
+        <div ng-show="entity.status ===3" class="progress-bar progress-bar-danger active sj_progress_bar" role="progressbar" aria-valuenow="{{entity.process}}" aria-valuemin="0" aria-valuemax="100" style="width: {{entity.process}}%" title="{{entity.process}}%">
             <span class="sj_progress_font">{{entity.process}}%</span>
         </div>
     </div>
@@ -239,10 +239,18 @@
 <!--迁移状态显示 -->
 <script type="text/ng-template" id="taskStatus.html">
     <div class="ngCellText" ng-init="entity=row.entity">
-        <span ng-show="entity.status===0" class="glyphicon glyphicon-minus"></span>
-        <span ng-show="entity.status===1" class="glyphicon glyphicon-transfer"></span>
-        <span ng-show="entity.status===2" class="glyphicon glyphicon-ok"></span>
-        <span ng-show="entity.status===3" class="glyphicon glyphicon-remove"></span>
+        <div ng-show="entity.status == 0">
+            <sapn class="glyphicon glyphicon-minus"> 待迁移
+        </div>
+        <div ng-show="entity.status == 1"> 
+            <span class="glyphicon glyphicon-transfer"> 迁移中
+        </div>
+        <div ng-show="entity.status == 2"> 
+            <span class="glyphicon glyphicon-ok"> 已完成
+        </div>
+        <div ng-show="entity.status == 3"> 
+            <span class="glyphicon glyphicon-remove"> 失败
+        </div>
     </div>
 </script>
 <script type="text/ng-template" id="creationTimeTemplate.html">

plugins/kubernetes/ts/sharedControllers.ts

@@ -24,8 +24,9 @@ module Kubernetes {
     }
   });
 
-  export var DataLabels = controller("DataLabels",['$scope','$location', ($scope, $location) =>{      
-      $scope.labelClick = (entity, key:string, value:string) => {        
+  export var DataLabels = controller("DataLabels",['$scope','$location', ($scope, $location) =>{
+    
+      $scope.labelClick = (entity, key:string, value:string) => {              
         $scope.$emit('dataLabelFilterUpdate', value, key)
     }
     $scope.labelClass = containerLabelClass;