p01469285
/
aggregation-platform
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

--2016.11.3

This commit is contained in:
wu ming 2016-11-03 10:48:03 +08:00
parent 702d2be8e8
commit cd2b920264
7 changed files with 255 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dist/hawtio-kubernetes.js vendored
View File

File diff suppressed because one or more lines are too long

11
new/sj_style.css
View File

@ -181,4 +181,13 @@ treecontrol li:hover{}
.fb{ font-weight: bold;}
.mr60{ margin-right: 60px;}
.sj_link{padding-left: 60px; width: 360px;}
.sj_popup_h2{ font-size: 14px; color: #333;}
.sj_popup_h2{ font-size: 14px; color: #333;}
/*查看弹框 20161102byLB*/
.sj_new_table02{border-top: 1px solid #ddd; border-left: 1px solid #ddd;}
.sj_new_table02 tr{ line-height:30px; }
.sj_new_table02 td,.sj_new_table02 th{ border-right: 1px solid #ddd; border-bottom: 1px solid #ddd;}
.sj_popup_toptxt { font-weight: bold; text-align: center; color: #333; }
.sj_popup_boxrightline{ border-right:1px solid #ddd; }
.sj_popup_lefttxt { width: 105px; text-align: right;padding:0 5px; }
.sj_popup_midtxt { width: 348px; margin-bottom: 10px; color: #666; padding:0 5px;}
.sj_popup_righttxt { width: 50px; margin-bottom: 10px; text-align: center; padding:0 5px;}

110
plugins/configs/html/shareLayout.html
View File

@ -149,7 +149,7 @@
</li>
<li class="clear">
<span class="fl box_chakan_leftinfo">脚本文件：</span>
<p class="fl box_chakan_maxinfo">
<p class="fl box_chakan_maxinfo">
<span ng-repeat="sql in ngDialogData.sqlList">{{sql}} <br /></span>
<br/>
</p>
@ -208,7 +208,6 @@
</div>
</div>
</script>
<script type="text/ng-template" id="sqlVerification.html">
<div class="sj_new_box03">
<h2 class="sj_popup_h2 mb10">Checkout_sIndicate_321202_05.sql</h2>
@ -240,7 +239,6 @@
</div>
</div>
</script>
<script type="text/ng-template" id="sqlMove.html">
<div class="sj_new_box02">
<h2 class="sj_popup_h2 mb10">Checkout_Indicate_321202_05.sql</h2>
@ -257,10 +255,112 @@
</div>
</div>
</script>
<script type="text/ng-template" id="sysVerificationUpdate.html">
<div class="sj_new_box03 ">
<h2 class="sj_popup_h2 mb10">{{ngDialogData.areaCode}} {{ngDialogData.cityName}} {{ngDialogData.districtName}} {{ngDialogData.sysName}}</h2>
<table class="sj_new_table02 mb10" cellpadding="0" cellspacing="0">
<thead>
<tr class="sj_popup_toptxt ">
<th>&nbsp;</th>
<th>默认描述信息</th>
<th>采集描述信息</th>
<td>&nbsp;</td>
</tr>
</thead>
<tbody>
<tr>
<td class="sj_popup_lefttxt">行政区划级次</td>
<td class="sj_popup_midtxt">{{data1.areaLevel}}</td>
<td class="sj_popup_midtxt">{{data2.areaLevel}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" id='areaLevel' ng-show="null != data2.areaLevel && data2.areaLevel != ''" ng-click="click($event, 'areaLevel')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">信息系统版本</td>
<td class="sj_popup_midtxt">{{data1.sysVersion}}</td>
<td class="sj_popup_midtxt">{{data2.sysVersion}}</td>
<td class="sj_popup_righttxt" >
<input type="checkbox" id='sysVersion' ng-show="null != data2.sysVersion && data2.sysVersion != ''" ng-click="click($event, 'sysVersion')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">投入使用时间</td>
<td class="sj_popup_midtxt">{{data1.beginUseTime}}</td>
<td class="sj_popup_midtxt">{{data2.beginUseTime}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" id='beginUseTime' ng-show="null != data2.beginUseTime && data2.beginUseTime != ''" ng-click="click($event, 'beginUseTime')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">功能描述</td>
<td class="sj_popup_midtxt">{{data1.functionDetails}}</td>
<td class="sj_popup_midtxt">{{data2.functionDetails}}
</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.functionDetails && data2.functionDetails != ''" ng-click="click($event, 'functionDetails')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">开发商全称</td>
<td class="sj_popup_midtxt">{{data1.developerFullName}}</td>
<td class="sj_popup_midtxt">{{data2.developerFullName}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.developerFullName && data2.developerFullName != ''" ng-click="click($event, 'developerFullName')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">联系人</td>
<td class="sj_popup_midtxt">{{data1.departmentManager}}</td>
<td class="sj_popup_midtxt">{{data2.departmentManager}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.departmentManager && data2.departmentManager != ''" ng-click="click($event, 'departmentManager')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">联系电话(手机)</td>
<td class="sj_popup_midtxt">{{data1.managerContacts}}</td>
<td class="sj_popup_midtxt">{{data2.managerContacts}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.managerContacts && data2.managerContacts != ''" ng-click="click($event, 'managerContacts')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">数据库类型</td>
<td class="sj_popup_midtxt">{{data1.dataBaseType}}</td>
<td class="sj_popup_midtxt">{{data2.dataBaseType}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.dataBaseType && data2.dataBaseType != ''" ng-click="click($event, 'dataBaseType')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">数据库版本</td>
<td class="sj_popup_midtxt">{{data1.dataBaseVersion}}</td>
<td class="sj_popup_midtxt">{{data2.dataBaseVersion}}</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="null != data2.dataBaseVersion && data2.dataBaseVersion != ''" ng-click="click($event, 'dataBaseVersion')">
</td>
</tr>
<tr>
<td class="sj_popup_lefttxt">业务范围</td>
<td class="sj_popup_midtxt">
<span ng-repeat="item in data1.workRange">{{item}}</span>
</td>
<td class="sj_popup_midtxt">
<span ng-repeat="item in data2.workRange">{{item}}</span>
</td>
<td class="sj_popup_righttxt">
<input type="checkbox" ng-show="data2.workRange && data2.workRange.length > 0" ng-click="click($event, 'workRange')">
</td>
</tr>
</tbody>
</table>
<div class=" clear">
<button class="sj_btn_blue fr" ng-click="replace()">更新</button>
<button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button>
</div>
</div>
</script>
<div ng-controller="Kubernetes.TopLevel">
<div class="wiki-icon-view" ng-controller="Kubernetes.FileDropController" nv-file-drop nv-file-over uploader="uploader" over-class="ready-drop">
<div class="row kubernetes-view" ng-view></div>

61
plugins/configs/ts/shareController.ts
View File

@ -241,8 +241,7 @@ module Configs{
params: {type: $scope.ngDialogData.type},
data: JSON.stringify($scope.ngDialogData.item)
}).success(function(data,header,config,status){
$scope.content = data.data2;
$scope.content = data.data2;
//响应成功
}).error(function(data,header,config,status){
//处理响应失败
@ -251,7 +250,63 @@ module Configs{
}
}]);
export var sysVerUpdateController = controller('sysVerUpdateController', ['$scope', ($scope) => {
export var sysVerUpdateController = controller('sysVerUpdateController', ['$scope', '$http', ($scope, $http) => {
var checkboxItmes = [];
$scope.click = ($event, name) => {
if($event.target.checked){
if(checkboxItmes.indexOf(name) == -1)
checkboxItmes.push(name)
}
else{
for(var i= 0; i < checkboxItmes.length; i++){
if(checkboxItmes[i] === name){
checkboxItmes.splice(i,1);
break;
}
}
}
}
getData();
$scope.replace = () => {
console.log(checkboxItmes);
$scope.requestBody = $scope.data1;
angular.forEach(checkboxItmes, (item) => {
$scope.requestBody[item] = $scope.data2[item];
});
$http({
url: "/java/console/api/checkout/update",
method:'POST',
data: JSON.stringify($scope.requestBody)
}).success(function(data,header,config,status){
if(header == 200)
Configs.customAlert("提示", "操作成功!", '',null, 0, "success");
else
Configs.customAlert("提示", "操作失败!", '',null, 0, "error");
}).error(function(data,header,config,status){
Configs.customAlert("提示", "操作失败:发生请求失败,不能删除！", '',null, 0, "error");
});
$scope.closeThisDialog();
}
$scope.cancel = () => {
$scope.closeThisDialog();
}
function getData(){
$http({
url: "/java/console/api/checkout/findDetails",
method:'POST',
data: JSON.stringify($scope.ngDialogData)
}).success(function(data,header,config,status){
$scope.data1 = data.data1;
$scope.data2 = data.data2;
//响应成功
}).error(function(data,header,config,status){
//处理响应失败
$scope.content = "获取脚本内容失败";
});
}
}]);
}

13
plugins/developer/ts/workspaces.ts
View File

@ -118,6 +118,7 @@ module Developer {
$scope.first = () => {
var idx = $scope.model.getParamOption("currentPageNum");
if(idx >1){
Kubernetes.eliminateChechBoxClick();
$scope.model.updateParamOption("currentPageNum", 1);
}
}
@ -125,22 +126,26 @@ module Developer {
$scope.last = () =>{
var idx = $scope.model.getParamOption("currentPageNum");
var length =$scope.options.getPageSizeNum();
if(idx < length)
$scope.model.updateParamOption("currentPageNum", length);
if(idx < length){
Kubernetes.eliminateChechBoxClick();
$scope.model.updateParamOption("currentPageNum", length);
}
}
$scope.previous = () => {
var idx = $scope.model.getParamOption("currentPageNum");
var length =$scope.options.getPageSizeNum();
if(idx > 1)
if(idx > 1){
Kubernetes.eliminateChechBoxClick();
$scope.model.updateParamOption("currentPageNum", idx-1);
}
}
$scope.next = () =>{
var length =$scope.options.getPageSizeNum();
var idx = $scope.model.getParamOption("currentPageNum");
if(idx < length){
Kubernetes.eliminateChechBoxClick();
Kubernetes.eliminateChechBoxClick();
$scope.model.updateParamOption("currentPageNum", idx+1);
}
}

7
plugins/kubernetes/ts/utilHelpers.ts
View File

@ -347,10 +347,9 @@ module Kubernetes {
export function eliminateChechBoxClick(){
console.log($("#tableConfig > thead > tr input:checkbox").is(':checked'));
if($("#tableConfig > thead > tr input:checkbox").is(':checked')){
}
var element = $("#tableConfig > thead > tr input:checkbox");
if(element.is(':checked'))
element.click();
}
/*

4
plugins/system/ts/systemVerification.ts
View File

@ -121,8 +121,8 @@ module System{
ngDialog.open({
template: 'sysVerificationUpdate.html',
controller: 'Configs.sysVerUpdateController',
width: 790,
height: 800,
width: 900,
height: 600,
closeByDocument: false,
data: entity,
className: 'ngdialog-theme-default'