--修复bug

defs.d.ts

@@ -1,15 +1,22 @@
 /// <reference path="d.ts/includes.d.ts"/>
+/// <reference path="d.ts/configs/ts/configPlugin.d.ts"/>
+/// <reference path="d.ts/configs/ts/configsDataService.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerNavigation.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesInterfaces.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/utilHelpers.d.ts"/>
 /// <reference path="d.ts/configs/ts/customAlert.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/readPlacedivision.d.ts"/>
-/// <reference path="d.ts/configs/ts/configPlugin.d.ts"/>
-/// <reference path="d.ts/configs/ts/configsDataService.d.ts"/>
-/// <reference path="d.ts/configs/ts/ConfigsHelper.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesHelpers.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
 /// <reference path="d.ts/developer/ts/dataManagerHelper.d.ts"/>
+/// <reference path="d.ts/configs/ts/ConfigsHelper.d.ts"/>
+/// <reference path="d.ts/configs/ts/configsUtils.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/kubernetesPlugin.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/watcher.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/term.d.ts"/>
+/// <reference path="d.ts/configs/ts/shareController.d.ts"/>
+/// <reference path="d.ts/configs/ts/glusterfsSetting.d.ts"/>
+/// <reference path="d.ts/configs/ts/kubeClusterSetting.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerPlugin.d.ts"/>
 /// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
@@ -18,7 +25,6 @@
 /// <reference path="d.ts/developer/ts/home.d.ts"/>
 /// <reference path="d.ts/developer/ts/jenkinsJob.d.ts"/>
 /// <reference path="d.ts/developer/ts/jenkinsJobs.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/kubernetesPlugin.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesModel.d.ts"/>
 /// <reference path="d.ts/developer/ts/jenkinsLog.d.ts"/>
 /// <reference path="d.ts/developer/ts/jenkinsMetrics.d.ts"/>
@@ -31,12 +37,6 @@
 /// <reference path="d.ts/developer/ts/projects.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspace.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
-/// <reference path="d.ts/configs/ts/configsUtils.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/watcher.d.ts"/>
-/// <reference path="d.ts/kubernetes/ts/term.d.ts"/>
-/// <reference path="d.ts/configs/ts/shareController.d.ts"/>
-/// <reference path="d.ts/configs/ts/glusterfsSetting.d.ts"/>
-/// <reference path="d.ts/configs/ts/kubeClusterSetting.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -77,7 +77,6 @@
 /// <reference path="d.ts/kubernetes/ts/sharedControllers.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/tabs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/templates.d.ts"/>
-/// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
 /// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/regionalismCodeSearch.d.ts"/>
@@ -86,3 +85,4 @@
 /// <reference path="d.ts/system/ts/systemCodeSearch.d.ts"/>
 /// <reference path="d.ts/system/ts/systemList.d.ts"/>
 /// <reference path="d.ts/system/ts/systemVerification.d.ts"/>
+/// <reference path="d.ts/navigation/ts/navigationPlugin.d.ts"/>

plugins/developer/ts/workspaces.ts

@@ -13,8 +13,7 @@ module Developer {
   export var WorkspacesController = controller("WorkspacesController", ["$scope", "KubernetesModel", "DataModel", "ConfigsModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "$element", "ngDialog",
   ($scope, KubernetesModel: Kubernetes.KubernetesModelService, DataModel:Developer.DataModelService, ConfigsModel:Configs.ConfigsModelService, KubernetesState,  $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, $element, ngDialog) => {    
     $scope.model=DataModel; 
-    $scope.replicasModel = KubernetesModel;
+    $scope.replicasModel = KubernetesModel;  
-    console.log("==============================");
     init($scope, $location, $routeParams);   
     $scope.options = DataModel.paramOptions;
     $scope.pageSizeChoses = DataModel.paramOptions.pagerSizeOption;

plugins/system/ts/systemVerification.ts

@@ -125,32 +125,50 @@ module System{
           var  filter = [];
           if($scope.tableData && $scope.tableData.length > 0){
             angular.forEach($scope.tableData, (item) => {
-              if($scope.checkboxes.items[item.id])
+              if($scope.checkboxes.items[item.id]){
+                item["index"] = item.cityName + "_" + item.districtName + "_" + item.sysName + "_" + item.year + "_版本" + item.dataVersion;
                 filter.push(item);
-            }); 
+              }
-            $http({
+            });             
-              url: "/java/console/api/checkout/deleteList",
+          }
-              method: "POST",
-              data: filter
-            }).success((data, header, config, status) => {              
-              $scope.tableData = data.data;
-              var result = [];
-              if($scope.y != 'all'){                
-                angular.forEach($scope.tableData, (item) =>{
-                  if(item.districtName == $scope.y)
-                    result.push(item);
-                });
-              }else{
-                result = $scope.tableData;
-              }           
 
-              $scope.tableParams.settings({
+          UI.multiItemConfirmActionDialog(<UI.MultiItemConfirmActionOptions>{
-                dataset: result
+            collection: filter,
-              });        
+            index: 'index',
-            }).error((data, header, config, status) => { 
+            onClose: (result:boolean) => {
-                throw "请求失败"         
+              if(result){
-            });                          
+                $http({
-          }           
+                  url: "/java/console/api/checkout/deleteList",
+                  method: "POST",
+                  data: filter
+                }).success((data, header, config, status) => {              
+                  $scope.tableData = data.data;
+                  var result = [];
+                  if($scope.y != 'all'){                
+                    angular.forEach($scope.tableData, (item) =>{
+                      if(item.districtName == $scope.y)
+                        result.push(item);
+                    });
+                  }else{
+                    result = $scope.tableData;
+                  }       
+                  $scope.tableParams.settings({
+                    dataset: result
+                  });        
+                }).error((data, header, config, status) => { 
+                  throw "请求失败"         
+                });                 
+              }
+            },
+            title: '是否需要删除采集数据？',
+            action: '以下采集数据文件将会被删除:',
+            okText: '删除',
+            okClass: 'btn-danger sj_btn_cir',
+            custom: "该删除操作将会彻底删除数据文件,是否删除，请确认！",
+            customClass: "alert alert-warning sj_alert-warning",
+            cancelText: "取消",
+            cancelClass: 'sj_btn_grey'
+          }).open();           
         }
 
         $scope.check = () => {
@@ -207,7 +225,7 @@ module System{
             /*
               如果是Oracle数据，先启动oracle数据
             */
-            if(oracleDB.length >= 0){
+            if(oracleDB.length > 0){
               angular.forEach(oracleDB, (item) =>{
                 Kubernetes.createRC({
                   name: item._key,
@@ -240,9 +258,8 @@ module System{
               url: "/java/console/api/checkout/checkList",
               method: "POST",
               data: selectedItems
-            }).success((data, header, config, status) => {  
+            }).success((data, header, config, status) => {                    
-              console.log(data);            
+              $scope.tableData = data.data;
-              /*$scope.tableData = data.data;
               var result = [];
               if($scope.y != 'all'){                
                 angular.forEach($scope.tableData, (item) =>{
@@ -255,7 +272,7 @@ module System{
 
               $scope.tableParams.settings({
                 dataset: result
-              });*/        
+              });       
             }).error((data, header, config, status) => { 
                 throw "请求失败"         
             });