+
@@ -43,8 +45,8 @@
| {{row.cityName}} |
{{row.districtName}} |
{{row.areaCode}} |
-
-
+ |
+
否
|
{{row.sysName}} |
@@ -55,7 +57,7 @@
-
+
当前没有选择需要校验的数据，请选择需要校验的数据！
diff --git a/plugins/system/ts/systemList.ts b/plugins/system/ts/systemList.ts
index ddff4a3..f97a383 100644
--- a/plugins/system/ts/systemList.ts
+++ b/plugins/system/ts/systemList.ts
@@ -21,7 +21,7 @@ module System{
{ field: "cityName", title: "市", filter: { cityName: 'text' }, show: true },
{ field: "districtName", title: "区/县", filter: { districtName: 'text' }, show: true },
{ field: "areaCode", title: "行政区划代码", filter: {areaCode: 'text'}, show: true },
- { field: "areaLevel", title: "级次", filter: { areaLevel: "select" }, filterData: levelType(), show: true },
+ { field: "areaLevel", title: "地区级次", filter: { areaLevel: "select" }, filterData: levelType(), show: true },
{ field: "sysName", title: "信息系统名称", filter: { sysName: "text" }, show: true },
{ field: "departmentManager", title: "联系人", filter: { departmentManager: "text" }, show: true },
{ field: "managerContacts", title: "联系方式", filter: { managerContacts: "text" }, show: true },
diff --git a/plugins/system/ts/systemVerification.ts b/plugins/system/ts/systemVerification.ts
index 2c7b7ec..da3f376 100644
--- a/plugins/system/ts/systemVerification.ts
+++ b/plugins/system/ts/systemVerification.ts
@@ -8,7 +8,7 @@
///
module System{
- export var SystemVerificationController = controller('SystemVerificationController', ['$scope', '$location', '$http', '$templateCache', 'Upload', 'NgTableParams', 'ngDialog', 'SystemModel', '$element', '$timeout', 'ConfigsModel', ($scope, $location, $http, $templateCache, Upload, NgTableParams, ngDialog, SystemModel, $element, $timeout, ConfigsModel) => {
+ export var SystemVerificationController = controller('SystemVerificationController', ['$scope', '$location', '$http', '$templateCache', 'Upload', 'NgTableParams', 'ngDialog', 'SystemModel', '$element', '$timeout', 'ConfigsModel', 'DataModel', ($scope, $location, $http, $templateCache, Upload, NgTableParams, ngDialog, SystemModel, $element, $timeout, ConfigsModel, DataModel) => {
shareInit($scope);
$scope.cities = classifyCity(SystemModel.regionalismInfo);
$scope.model = SystemModel;
@@ -115,7 +115,7 @@ module System{
/**
提示没有配置标准表汇总库
**/
- Configs.customAlert("提示", "操作失败:没有配置默认的汇总库", '',null, 0, "error");
+ Configs.customAlert("提示", "操作失败:没有配置默认的标准表汇总库", '',null, 0, "error");
return;
}
@@ -131,10 +131,11 @@ module System{
Configs.customAlert("提示", "操作失败:选择的系统存在没有数据的系统", '',null, 0, "error");
return;
}
- if(item.dataBaseType == 'ORACLE'){
+ item["_key"] = item.areaCode + "-" + item.sysCode + "-" + item.dataVersion;
+ if(item.dataBaseType == 'ORACLE'){
oracleDB.push(item);
}else{
- oracleDB.push(item);
+ sqlServerDB.push(item);
}
}
}
@@ -143,9 +144,16 @@ module System{
/*
此处需要检查数据是否已挂载、正在迁移。
*/
+ var exitedOracle = Kubernetes.checkForCreateOracle(DataModel.transferTasks, oracleDB);
+ var exitedSqlServer = Kubernetes.checkForCreateOracle(DataModel.transferTasks, sqlServerDB);
+ if(exitedSqlServer.length > 0 || exitedOracle.length > 0){
+ Configs.customAlert("提示", "操作失败: 正在迁移的数据不能执行校验操作！", '', null, 0, "error");
+ return;
+ }
+
angular.forEach(oracleDB, (item) =>{
Kubernetes.createRC({
- name: item.areaCode + "-" + item.sysCode + "-" + item.dataVersion,
+ name: item._key,
labels: {
system: item.sysCode.toString(),
version: item.dataVersion.toString(),
@@ -169,16 +177,13 @@ module System{
$location.path('/kubernetes/namespace/default/replicationControllers');
}, 500);
}
-
- if(sqlServerDB.length <= 0)
- return;
-
+
$http({
url: "/java/console/api/checkout/checkList",
method: "POST",
- data: sqlServerDB
+ data: oracleDB
}).success((data, header, config, status) => {
- $scope.tableData = data.data;
+ /*$scope.tableData = data.data;
var result = [];
if($scope.y != 'all'){
angular.forEach($scope.tableData, (item) =>{
@@ -191,10 +196,10 @@ module System{
$scope.tableParams.settings({
dataset: result
- });
+ });*/
}).error((data, header, config, status) => {
throw "请求失败"
- });
+ });
}
}
// watch for check all checkbox