----功能完善

d.ts/developer/ts/dataManagerModel.d.ts

@@ -12,6 +12,7 @@ declare module Developer {
         priorTableSize: number;
         keyQuery: any;
         volumeType: number;
+        totlePage: number;
         createParamData(): {
             currentPageNum: number;
             dataType: any;

defs.d.ts

@@ -17,26 +17,6 @@
 /// <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"/>
-/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
-/// <reference path="d.ts/developer/ts/fileMigrationTask.d.ts"/>
-/// <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/kubernetesModel.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsLog.d.ts"/>
-/// <reference path="d.ts/developer/ts/jenkinsMetrics.d.ts"/>
-/// <reference path="d.ts/developer/ts/navbar.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipeline.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipelineDirective.d.ts"/>
-/// <reference path="d.ts/developer/ts/pipelines.d.ts"/>
-/// <reference path="d.ts/developer/ts/project.d.ts"/>
-/// <reference path="d.ts/developer/ts/projectSelector.d.ts"/>
-/// <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/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/breadcrumbs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -49,6 +29,7 @@
 /// <reference path="d.ts/kubernetes/ts/deploymentConfig.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/deploymentConfigs.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/events.d.ts"/>
+/// <reference path="d.ts/kubernetes/ts/kubernetesModel.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/host.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/hosts.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/imageRepositories.d.ts"/>
@@ -77,6 +58,25 @@
 /// <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/developer/ts/developerPlugin.d.ts"/>
+/// <reference path="d.ts/developer/ts/dataManagerModel.d.ts"/>
+/// <reference path="d.ts/developer/ts/developerEnrichers.d.ts"/>
+/// <reference path="d.ts/developer/ts/environmentPanel.d.ts"/>
+/// <reference path="d.ts/developer/ts/fileMigrationTask.d.ts"/>
+/// <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/developer/ts/jenkinsLog.d.ts"/>
+/// <reference path="d.ts/developer/ts/jenkinsMetrics.d.ts"/>
+/// <reference path="d.ts/developer/ts/navbar.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipeline.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipelineDirective.d.ts"/>
+/// <reference path="d.ts/developer/ts/pipelines.d.ts"/>
+/// <reference path="d.ts/developer/ts/project.d.ts"/>
+/// <reference path="d.ts/developer/ts/projectSelector.d.ts"/>
+/// <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/navigation/ts/navigationPlugin.d.ts"/>
 /// <reference path="d.ts/system/ts/systemHelpers.d.ts"/>
 /// <reference path="d.ts/system/ts/systemPlugin.d.ts"/>

plugins/developer/html/workspaces.html

@@ -35,14 +35,14 @@
                         </button>
                     </div>
                     <ul class="fr sj_table_bottom">
-                        <li class="mr5 ">当前显示{{(options.currentPageNum-1)*20 + 1}}~{{(options.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行,</li>
+                        <li class="mr5 ">当前显示{{(model.paramOptions.currentPageNum-1)*20 + 1}}~{{(model.paramOptions.currentPageNum-1)*20 + model.data.length}}行，共{{model.paramOptions.totalSize}}行,</li>
                         <!--<li class="mr5 ">每页显示
                             <select ng-options="value for value in pageSizeChoses" ng-cha=nge="selectAction()" ng-model="options.currentTableSize"></select>行
                         </li>-->
                         <li class="mr5 ">当前页码</li>
                         <li>
                             <div class="hawtio-pager clearfix">
-                                <label>{{options.currentPageNum}} / {{options.getPageSizeNum()}}</label>
+                                <label>{{model.paramOptions.currentPageNum}} / {{model.paramOptions.totlePage}}</label>
                                 <div class=btn-group>
                                     <button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="first()"><i class="fa fa-fast-backward"></i></button>
                                     <button class="btn sj_btn_grey" ng-disabled="isEmptyOrFirst()" ng-click="previous()"><i class="fa fa-step-backward"></i></button>

plugins/developer/ts/dataManagerModel.ts

@@ -12,6 +12,7 @@ module Developer{
 		public priorTableSize = 20;	
 		public keyQuery = null;
 		public volumeType = 1;
+		public totlePage = 1;	
 
 		public createParamData(){
 			var extendValue =["cityName", "districtName", "dataVersion", "systemName", "dataYear"];
@@ -160,8 +161,10 @@ module Developer{
 				dataType : 'json',
 				data: createParamData(paramOptions),		
 				success : function(data) {
+					console.log(data);				
 					result = data.data;
 					paramOptions.totalSize = data.length;	
+					paramOptions.totlePage = data.page.totlePage;								
 				} 
 			});			
 			return result;	

plugins/kubernetes/html/layoutKubernetes.html

@@ -211,10 +211,10 @@
 </script>
 <script type="text/ng-template" id="taskEdit.html">
     <div class="ngCellText" ng-init="entity=row.entity" ng-controller="Kubernetes.TaskEdit">
-        <button class="btn sj_btn" ng-click="showDeleteOne.open(entity)" ng-disabled="entity.status == 1">
+        <button class="btn sj_btn" ng-click="showDeleteOne.open(entity)" ng-disabled="entity.status == 1 || entity.status == 0">
             <span class="glyphicon glyphicon-trash"></span>&nbsp;&nbsp;删除
         </button>
-        <button class="btn sj_btn" ng-click="showCancelOne.open(entity)" ng-disabled="entity.process == 100">
+        <button class="btn sj_btn" ng-click="showCancelOne.open(entity)" ng-disabled="entity.process == 100 || entity.status = 3">
             <span class="glyphicon glyphicon-remove"></span>&nbsp;&nbsp;取消
         </button>
         <div hawtio-confirm-dialog="showDeleteOne.show" title="是否删除任务？" ok-button-text="确认" cancel-button-text="取消" on-cancel="showDeleteOne.onCancelled()" on-ok="showDeleteOne.onOk()">

plugins/kubernetes/html/logShell.html

@@ -4,7 +4,7 @@
     <span class="fa fa-caret-down"></span>
   </div>
   <div class="terminal-title" ng-mousedown="mouseDown($event)" ng-mouseup="mouseUp($event)" ng-mousemove="mouseMove($event)">
-    <h5 class="top-bottom-middle">{{containerName}}的汇总日志</h5>
+    <h5 class="top-bottom-middle">{{containerName}}的抽取日志</h5>
     <i class="fa fa-remove pull-right clickable" title="Close and exit this log" ng-click="close()"></i>
     <i class="fa fa-square-o pull-right clickable" title="Maximize this log" ng-click="maximize($event)"></i>
     <i class="fa fa-sort-desc pull-right clickable" ng-hide="maximized()" title="Minimize this log" ng-click="minimize($event)"></i>

plugins/system/ts/systemVerification.ts

@@ -25,6 +25,8 @@ module System{
         });  
 
         $scope.citySelect = (x) =>{
+          $scope.countries=[];
+          $scope.y = "all";           
           if(x != 'all'){
             $scope.countries = classifyCountry(SystemModel.regionalismInfo, x);  
             $http({
@@ -40,8 +42,8 @@ module System{
               throw "请求失败"         
             });       
           }else{ 
-            $scope.countries=[];          
+            //$scope.countries=[];          
-            $scope.y = "all";
+            //$scope.y = "all";
             $scope.tableData = null;
             $scope.checkboxes = {
               checked: false,
@@ -225,6 +227,12 @@ module System{
                   Configs.customAlert("提示", "操作失败:选择的系统存在没有数据的系统", '',null, 0, "error");
                   return;
                 }
+                /**
+                */
+                if(item.payResultLast == 1){
+                   Configs.customAlert("提示", "操作失败:选择的系统存在不需要校验的系统", '',null, 0, "error");
+                  return;
+                }
 
                 /**
                     检查数据是否在热区