+
{{node.name}}
diff --git a/plugins/developer/ts/dataManagerModel.ts b/plugins/developer/ts/dataManagerModel.ts
index 4beb9b1d..34479294 100644
--- a/plugins/developer/ts/dataManagerModel.ts
+++ b/plugins/developer/ts/dataManagerModel.ts
@@ -180,7 +180,7 @@ module Developer{
//创建数据模型服务
_module.factory("DataModel", ['$rootScope', '$http', '$interval', '$location', '$resource', ($rootScope, $http, $interval, $location, $resource) => {
var $scope = new DataModelService();
- $scope.startIntervalTask($interval, $http);
+ $scope.startIntervalTask($interval, $http);
return $scope;
}]);
}
\ No newline at end of file
diff --git a/plugins/developer/ts/developerNavigation.ts b/plugins/developer/ts/developerNavigation.ts
index 9bc64b3b..34710f75 100644
--- a/plugins/developer/ts/developerNavigation.ts
+++ b/plugins/developer/ts/developerNavigation.ts
@@ -581,7 +581,7 @@ module Developer {
class: "fa fa-clone",
title: "View the Replicas for this project"
},
- {
+ /*{
href: UrlHelpers.join(namespacesLink, ns, "events"),
label: "日志信息",
class: "fa fa-newspaper-o",
@@ -593,7 +593,7 @@ module Developer {
label: "集群节点",
class: "fa fa-server",
title: "View the nodes for this project"
- }
+ } */
]);
}
diff --git a/plugins/developer/ts/fileMigrationTask.ts b/plugins/developer/ts/fileMigrationTask.ts
index 509399e7..86b5d51b 100644
--- a/plugins/developer/ts/fileMigrationTask.ts
+++ b/plugins/developer/ts/fileMigrationTask.ts
@@ -2,8 +2,9 @@
///
///
///
+///
module Developer {
- export var KubeTaskController = controller("KubeTaskController", ["$scope", "$location", "$routeParams", "DataModel", "$templateCache", ($scope, $location, $routeParams, DataModel, $templateCache) => {
+ export var KubeTaskController = controller("KubeTaskController", ["$scope", "$http", "$location", "$routeParams", "DataModel", "$templateCache", ($scope, $http, $location, $routeParams, DataModel, $templateCache) => {
$scope.model = DataModel;
$scope.subTabConfig = Developer.createCurrentSubNavBar($scope, $location, $routeParams);
$scope.model.data = [{_key: 2, name: "南京市-玄武区", labels:{system: 34, batch: 2}, status: 1, process:75},
@@ -39,7 +40,15 @@ module Developer {
field: "labels",
displayName: '数据标签',
cellTemplate: $templateCache.get("dataLabelsTemplate.html")
- },
+ },
+ {
+ field: "from",
+ displayName: '源集群',
+ },
+ {
+ field: "to",
+ displayName: '目的集群',
+ },
{
field: "status",
displayName: '迁移状态',
@@ -59,7 +68,14 @@ module Developer {
$scope.$on("deleteRow", (event, data) =>{
- console.log("删除任务");
+ if(data.status === 1)
+ console.log("无法删除");
+ else{
+ Configs.oracleInfoOperate($http, "/java/console/api/task", Configs.OperateType.DELETE, data, (data, status) =>{
+ if(status === 200)
+ console.log("删除成功");
+ });
+ }
});
}]);
}
diff --git a/plugins/developer/ts/workspaces.ts b/plugins/developer/ts/workspaces.ts
index 69ec38b2..6ac22e58 100644
--- a/plugins/developer/ts/workspaces.ts
+++ b/plugins/developer/ts/workspaces.ts
@@ -62,7 +62,11 @@ module Developer {
field: "labels",
displayName: '数据标签',
cellTemplate: $templateCache.get("dataLabelsTemplate.html")
- },
+ },
+ {
+ field: "year",
+ displayName: '年度',
+ },
{
field: "collectingTime",
displayName: '采集时间'
@@ -136,22 +140,43 @@ module Developer {
}, true);
- $scope.deletePrompt = (items) =>{
- var idColl = [];
- angular.forEach(items,(item) => {
- idColl.push(item.id);
- console.log(item.id);
- });
- $http({
- method: "POST",
- url: "/java/console/api/delete/data",
- params: {"data": idColl}
- }).success(function(data, status, headers, config) {
- //成功之后做一些事情
- DataModel.updateModel();
- }).error(function(data, status, headers, config) {
-
- });
+ $scope.deletePrompt = (selected) => {
+ if (angular.isString(selected)) {
+ selected = [{
+ id: selected
+ }];
+ }
+ UI.multiItemConfirmActionDialog({
+ collection: selected,
+ index: 'id',
+ onClose: (result:boolean) => {
+ var idColl = [];
+ if (result) {
+ angular.forEach(selected, (select) => {
+ idColl.push(select.id);
+ console.log(select.id);
+ });
+ $http({
+ method: "POST",
+ url: "/java/console/api/delete/data",
+ params: {"data": idColl}
+ }).success(function(data, status, headers, config) {
+ //成功之后做一些事情
+ DataModel.updateModel();
+ }).error(function(data, status, headers, config) {
+
+ });
+ }
+ },
+ title: '是否需要删除采集数据？',
+ action: '以下采集数据文件将会被删除:',
+ okText: '删除',
+ okClass: 'btn-danger sj_btn_cir',
+ custom: "该删除操作将会彻底删除数据文件,是否删除，请确认！",
+ customClass: "alert alert-warning sj_alert-warning",
+ cancelText: "取消",
+ cancelClass: 'sj_btn_grey'
+ }).open();
}
$scope.migrationClick = {
@@ -177,9 +202,7 @@ module Developer {
open: (selected) =>{
var migrationClick = $scope.migrationClick;
if($scope.volumes && $scope.volumes instanceof Array && $scope.volumes.length >0)
- migrationClick.selectedItem = $scope.volumes[0];
- console.log(migrationClick.selectedItem.folder.childNodes);
-
+ migrationClick.selectedItem = $scope.volumes[0];
migrationClick.dialog.open();
},
close: () => {
@@ -204,10 +227,11 @@ module Developer {
},
path: item.dataPath+"app/",
isTarget: "false"
- }, (rc) =>{
- Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", Kubernetes.getName(rc), 0);
+ }, (rc) =>{
+ Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", rc, 0);
});
- });
+ });
+
$timeout(() => {
$location.path('/kubernetes/namespace/default/replicationControllers');
}, 200);
diff --git a/plugins/kubernetes/html/layoutKubernetes.html b/plugins/kubernetes/html/layoutKubernetes.html
index bac46041..aa47bca1 100644
--- a/plugins/kubernetes/html/layoutKubernetes.html
+++ b/plugins/kubernetes/html/layoutKubernetes.html
@@ -210,20 +210,18 @@
diff --git a/plugins/kubernetes/html/replicationControllers.html b/plugins/kubernetes/html/replicationControllers.html
index 31cc2357..63462654 100644
--- a/plugins/kubernetes/html/replicationControllers.html
+++ b/plugins/kubernetes/html/replicationControllers.html
@@ -81,8 +81,7 @@