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

---样式修改合并

This commit is contained in:
wu ming 2016-11-17 08:51:19 +08:00
parent 87e135ec62 9c9b14f1b7
commit adcd11eb9b
14 changed files with 239 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
new/sj_style.css
View File

@ -16,9 +16,9 @@ a:hover,a:active{color:#333;}
.cl{ clear:both; overflow:hidden;} .cl{ clear:both; overflow:hidden;}
/* public*/ /* public*/
.mt2{margin-top: 3px;} .mt2{margin-top: 3px;}
.mt5{ margin-top: 5px;}.mt10{ margin-top: 10px;} .mt5{ margin-top: 5px;}.mt10{ margin-top: 10px;}.mt15{ margin-top: 15px;}
.ml5{ margin-left:5px;}.ml10{ margin-left:10px;}.ml15{ margin-left:15px;} .ml5{ margin-left:5px;}.ml10{ margin-left:10px;}.ml15{ margin-left:15px;}
.mr5{ margin-right:5px;}.mr10{ margin-right:10px;} .mr5{ margin-right:5px;}.mr10{ margin-right:10px;}.mr15{ margin-right:15px;}.mr17{ margin-right:17px;}.mr20{ margin-right:20px;}
.mb10{ margin-bottom: 10px;} .mb10{ margin-bottom: 10px;}
a.sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;} a.sj_btn_grey{ display:inline-block; padding:0px 15px; height:30px; line-height:30px; -webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; background-image:-webkit-linear-gradient(top, #fdfdfd,#e8e8e8);background-image:linear-gradient(top,#fdfdfd,#e8e8e8); border:1px solid #cecece; color:#505050;}
a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);} a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3d3);background-image:linear-gradient(top,#eeeeee,#d3d3d3);}
@ -126,7 +126,7 @@ treecontrol li:hover{}
.sj_btn{ box-shadow:none; -webkit-box-shadow:none; font-weight: normal; background:none; color:#0088cc;} .sj_btn{ box-shadow:none; -webkit-box-shadow:none; font-weight: normal; background:none; color:#0088cc;}
.sj_btn:hover{ color: #005580;} .sj_btn:hover{ color: #005580;}
.sj_form_input input{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 3px #dcdcdc;} .sj_form_input input{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:310px;box-shadow: inset 0px 0px 3px #dcdcdc;}
.sj_alert-warning{ background-color: #fff6d0; border-color:#f6e7aa; color: #fd5f00; margin-top:10px;} .sj_alert-warning{ background-color: #fff6d0; border-color:#f6e7aa; color: #fd5f00; }
.help-block{ color: #fd5f00;} .help-block{ color: #fd5f00;}
.alert{ padding:10px 15px; margin-bottom:0;} .alert{ padding:10px 15px; margin-bottom:0;}
.sj_control-label{ padding:0; line-height:30px; } .sj_control-label{ padding:0; line-height:30px; }
@ -156,28 +156,27 @@ treecontrol li:hover{}
.sj_c_red{ color:#c00000;} .sj_c_red{ color:#c00000;}
.sj_table_border{ border:1px solid #ddd;} .sj_table_border{ border:1px solid #ddd;}
/*查看弹框 20161018byLB*/
.box_chakan{ width: 750px; padding:15px; line-height: 1.9; }
.box_chakan h2{ font-size: 14px; border-bottom: 1px solid #e4e4e4; padding-bottom: 5px; padding-left: 15px;}
.box_chakan li{ margin-bottom: 10px;}
.box_chakan_leftinfo{ display:inline-block; width: 120px; text-align: right;}
.box_chakan_maxinfo{ display:inline-block; width: 600px; text-align: left; color: #666; }
.box_chakan_mininfo{ display:inline-block; width: 230px; text-align: left; color: #666; }
.box_chakan_smallinfo{ display:inline-block; width: 140px; text-align: left; color: #666; }
/*查看弹框 20161018byLB*/ /*查看弹框 20161018byLB*/
.box_chakan{ width: 720px;background:#f4f4f4; padding:15px; line-height: 1.9; } .box_chakan{ width: 750px;background:none; padding:15px; line-height: 1.9; }
.box_chakan h2{ font-size: 14px; border-bottom: 1px solid #e4e4e4; padding-bottom: 5px; padding-left: 15px;} .box_chakan h2{ font-size: 14px; border-bottom: 1px solid #ccc; padding-bottom: 10px; padding-left: 15px;}
.box_chakan li{ margin-bottom: 10px;} .box_chakan li{ margin-bottom: 10px;}
.box_chakan_leftinfo{ display:inline-block; width: 100px; text-align: right;} .box_chakan_leftinfo{ display:inline-block; width: 110px; text-align: right; font-weight: bold;}
.box_chakan_maxinfo{ display:inline-block; width: 600px; text-align: left; color: #666; } .box_chakan_maxinfo{ display:inline-block; width: 600px; text-align: left; color: #666; }
.box_chakan_mininfo{ display:inline-block; width: 250px; text-align: left; color: #666; } .box_chakan_mininfo{ display:inline-block; width: 250px; text-align: left; color: #666; }
.box_chakan_smallinfo{ display:inline-block; width: 140px; text-align: left; color: #666; } .box_chakan_smallinfo{ display:inline-block; width: 140px; text-align: left; color: #666; }
/*查看弹框 20161027byLB*/ /*查看弹框 20161027byLB*/
.sj_box_w440{ width: 430px; height: 400px; overflow-x:scroll; border:1px solid #eee;background: #fff; color: #666; padding:5px;} .sj_box_w440{ width: 430px; height: 400px; overflow-x:scroll; border:1px solid #ddd;background: #fff; color: #666; padding:5px;}
.sj_new_box02{ width:450px; margin:0 auto; padding:20px; } .sj_box_w470{ width: 471px; height: 400px; overflow-x:scroll; border:1px solid #ddd;background: #fff; color: #666; padding:5px;}
.sj_box_w535{ width: 535px; height: 400px; overflow-x:scroll; border:1px solid #ddd;background: #fff; color: #666; padding:5px;}
.sj_new_box02{ width:580px; margin:0 auto; padding:20px; }
.sj_new_box03{ width:880px; margin:0 auto; } .sj_new_box03{ width:880px; margin:0 auto; }
.sj_new_box04{ width:960px; margin:0 auto; }
.sj_new_box05{ width:540px; margin:0 auto; }
.sj_width440{width: 440px;} .sj_width440{width: 440px;}
.sj_width470{width: 470px;}
.sj_width535{width: 535px;}
.sj_box_w580{width:560px;}
.fb{ font-weight: bold;} .fb{ font-weight: bold;}
.mr60{ margin-right: 60px;} .mr60{ margin-right: 60px;}
.sj_link{padding-left: 60px; width: 360px;} .sj_link{padding-left: 60px; width: 360px;}
@ -186,8 +185,18 @@ treecontrol li:hover{}
.sj_new_table02{border-top: 1px solid #ddd; border-left: 1px solid #ddd;} .sj_new_table02{border-top: 1px solid #ddd; border-left: 1px solid #ddd;}
.sj_new_table02 tr{ line-height:30px; } .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_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; } table tr.sj_popup_toptxt th{ font-weight: bold; text-align: center; color: #333; }
.sj_popup_boxrightline{ border-right:1px solid #ddd; } .sj_popup_boxrightline{ border-right:1px solid #ddd; }
.sj_popup_lefttxt { width: 105px; text-align: right;padding:0 5px; } .sj_popup_lefttxt { width: 105px; text-align: right;padding:0 5px; font-weight: bold; }
.sj_popup_midtxt { width: 348px; margin-bottom: 10px; color: #666; 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;} .sj_popup_righttxt { width: 50px; margin-bottom: 10px; text-align: center; padding:0 5px;}
.sj_select_box{ height: 30px; line-height: 30px;}
.help-block{ margin-top: 0;}
.col-md-12{ padding-left:0; padding-right:20px;}
.sj_link_blue{ color:#2a84e9; border:none; padding:0; margin:0; background: none; text-align: left; margin-left: -5px;}
.sj_link_blue:hover{ color: #0d62c1;}
.table_sj_td_center tr td{ text-align: center;}
.sj_popup_txtbold { width: 105px; text-align: center;padding:0 5px; font-weight: bold; }
.sj_popup_p{ width:540px; text-align:center; color: #666;}

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

@ -99,7 +99,7 @@
</div> </div>
</script> </script>
<script type="text/ng-template" id="systemInfo.html"> <script type="text/ng-template" id="systemInfo.html">
<div class="sj_new_box"> <div class="sj_new_box mt10">
<div class=" mb10"> <div class=" mb10">
<ul class="box_chakan"> <ul class="box_chakan">
<h2 class="mb10">查看详情</h2> <h2 class="mb10">查看详情</h2>
@ -162,23 +162,24 @@
<input type="checkbox" ng-model="checkboxes.checked" class="select-all" value=" " /> <input type="checkbox" ng-model="checkboxes.checked" class="select-all" value=" " />
</script> </script>
<script type="text/ng-template" id="sqlView.html"> <script type="text/ng-template" id="sqlView.html">
<div class="sj_new_box03"> <div class="sj_new_box04">
<h2 class="sj_popup_h2 mb10">{{title}}_{{ngDialogData.item.areaCode}}_{{ngDialogData.item.sysCode}}.sql</h2> <h2 class="sj_popup_h2 mb10">{{title}}_{{ngDialogData.item.areaCode}}_{{ngDialogData.item.sysCode}}.sql</h2>
<div class="clear mb10"> <div class="clear mb10">
<ul class="fl sj_width440"> <ul class="fl sj_width470">
<li><span class="fb">默认脚本：</span>{{ngDialogData.item[ngDialogData.type + 'StandardModified']}}</li> <li><span class="fb">默认脚本：</span>{{ngDialogData.item[ngDialogData.type + 'StandardModified']}}</li>
<li class="sj_link">{{ngDialogData.item[ngDialogData.type + 'PathStandard']}}</li> <li class="sj_link">{{ngDialogData.item[ngDialogData.type + 'PathStandard']}}</li>
</ul> </ul>
<div class="fl sj_width440"> <div class="fr sj_width470 mr5 mt10">
<button class="sj_btn_green fl" ng-click="upLoadSqlFile()">上传</button> <button class="sj_btn_green fr" ng-click="upLoadSqlFile()">上传</button>
</div> </div>
<div class="cl"></div>
</div> </div>
<div class="clear mb10"> <div class="clear mb10">
<div class="sj_box_w440 fl"> <div class="sj_box_w470 fl">
<p ng-bind="old_content"> <p ng-bind="old_content">
</p> </p>
</div> </div>
<div class=" sj_box_w440 fl ml15"> <div class=" sj_box_w470 fl ml15">
<p ng-bind="new_content"> <p ng-bind="new_content">
</p> </p>
</div> </div>
@ -193,11 +194,12 @@
</script> </script>
<script type="text/ng-template" id="sqlAdd.html"> <script type="text/ng-template" id="sqlAdd.html">
<div class="sj_new_box02"> <div class="sj_new_box02">
<h2 class="sj_popup_h2 mb10">{{title}}_{{ngDialogData.item.areaCode}}_{{ngDialogData.item.sysCode}}.sql</h2> <h2 class="sj_popup_h2 mt10 fl">{{title}}_{{ngDialogData.item.areaCode}}_{{ngDialogData.item.sysCode}}.sql</h2>
<div class="clear mb10"> <div class="clear mb10 fr mr5">
<button class="sj_btn_green fl" ng-click="sqlFileUpload()">上传</button> <button class="sj_btn_green fl" ng-click="sqlFileUpload()">上传</button>
</div> </div>
<div class="sj_box_w440 mb10"> <div class="cl"></div>
<div class="sj_box_w535 mb10">
<p>{{content}}</p> <p>{{content}}</p>
</div> </div>
<div class=" clear"> <div class=" clear">
@ -250,19 +252,19 @@
<li class="sj_link">{{ngDialogData.item[ngDialogData.type + 'PathLast']}}</li> <li class="sj_link">{{ngDialogData.item[ngDialogData.type + 'PathLast']}}</li>
</ul> </ul>
</div> </div>
<div class="sj_box_w440 mb10"> <div class="sj_box_w535 mb10">
<p ng-bind="content"></p> <p ng-bind="content"></p>
</div> </div>
<div class=" clear"> <div class=" clear">
<button class="btn pull-right sj_btn_blue " ng-disabled="!content && content != ''" ng-click="move()">归档</button> <button class="btn pull-right sj_btn_blue " style="color:#fff;" ng-disabled="!content && content != ''" ng-click="move()">归档</button>
<button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button> <button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button>
</div> </div>
</div> </div>
</script> </script>
<script type="text/ng-template" id="sysVerificationUpdate.html"> <script type="text/ng-template" id="sysVerificationUpdate.html">
<div class="sj_new_box03 "> <div class="sj_new_box03 mt10 ">
<h2 class="sj_popup_h2 mb10">{{ngDialogData.areaCode}} {{ngDialogData.cityName}} {{ngDialogData.districtName}} {{ngDialogData.sysName}}</h2> <h2 class="sj_popup_h2 mb10 ml10 mt15">{{ngDialogData.areaCode}} {{ngDialogData.cityName}} {{ngDialogData.districtName}} {{ngDialogData.sysName}}</h2>
<table class="sj_new_table02 mb10" cellpadding="0" cellspacing="0"> <table class="sj_new_table02 mb10 ml10" cellpadding="0" cellspacing="0">
<thead> <thead>
<tr class="sj_popup_toptxt "> <tr class="sj_popup_toptxt ">
<th>&nbsp;</th> <th>&nbsp;</th>
@ -348,10 +350,10 @@
<tr> <tr>
<td class="sj_popup_lefttxt">业务范围</td> <td class="sj_popup_lefttxt">业务范围</td>
<td class="sj_popup_midtxt"> <td class="sj_popup_midtxt">
<span ng-repeat="item in data1.workRange">{{item}}</span> <span ng-repeat="item in data1.workRange" class="mr5">{{item}}</span>
</td> </td>
<td class="sj_popup_midtxt"> <td class="sj_popup_midtxt">
<span ng-repeat="item in data2.workRange">{{item}} </span> <span ng-repeat="item in data2.workRange" class="mr5">{{item}} </span>
</td> </td>
<td class="sj_popup_righttxt"> <td class="sj_popup_righttxt">
<input type="checkbox" ng-show="data2.workRange && data2.workRange.length > 0" ng-click="click($event, 'workRange')"> <input type="checkbox" ng-show="data2.workRange && data2.workRange.length > 0" ng-click="click($event, 'workRange')">
@ -360,29 +362,56 @@
</tbody> </tbody>
</table> </table>
<div class=" clear"> <div class=" clear">
<button class="btn pull-right sj_btn_blue" ng-disabled="checkboxItmes.length==0" ng-click="replace()">更新</button> <button class="btn pull-right sj_btn_blue mr15" ng-disabled="checkboxItmes.length==0" ng-click="replace()">更新</button>
<button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button> <button class="sj_btn_grey mr5 fr" ng-click="cancel()">取消</button>
</div> </div>
</div> </div>
</script> </script>
<script type="text/ng-template" id="statusHelp.html"> <script type="text/ng-template" id="statusHelp.html">
<table border="1" cellspacing="0" cellpadding="2"> <div class="sj_new_box05">
<tr> <h2 class="sj_popup_h2 mb10 mt10">帮助</h2>
<td>第一行第一栏</td> <table class="sj_new_table02 mb10" cellpadding="0" cellspacing="0">
<td >第一行的第二</td> <thead >
<td>第一行第三栏</td> <tr class="sj_popup_toptxt ">
</tr> <th >操作</th>
<tr> <th >归档脚本</th>
<td>第二行及第三行 的 第一栏</td> <th >新版版本</th>
<td>第二行第二栏</td> <th >详细说明</th>
<td>第二行第三栏</td> </tr>
</tr> </thead>
<tr> <tbody>
<td>第三行第一栏</td> <tr >
<td>第三行第二栏</td> <td class="sj_popup_txtbold">审核</td>
<td>第三行第三栏</td> <td class="sj_popup_txtbold">有</td>
</tr> <td class="sj_popup_txtbold">有</td>
</table> <td class=" sj_popup_midtxt">保留：删除新版脚本文件，保留现有归档脚本
<br/>替换：新版脚本文件移动并覆盖原有归档脚本</td>
</tr>
<tr>
<td class="sj_popup_txtbold">上传</td>
<td class="sj_popup_txtbold">无</td>
<td class="sj_popup_txtbold">无</td>
<td class=" sj_popup_midtxt">选择本地脚本文件，系统按照命名规范重命名文件并归档</td>
</tr>
<tr>
<td class="sj_popup_txtbold">归档</td>
<td class="sj_popup_txtbold">无</td>
<td class="sj_popup_txtbold">有</td>
<td class=" sj_popup_midtxt">将上报的脚本文件移动到归档路径进行归档</td>
</tr>
<tr>
<td class="sj_popup_txtbold">查看</td>
<td class="sj_popup_txtbold">有</td>
<td class="sj_popup_txtbold">无</td>
<td class=" sj_popup_midtxt">重新上传：选择本地脚本文件，系统按照命名规范重命名文件并覆盖现有的归档脚本</td>
</tr>
</tbody>
</table>
<div class="sj_popup_p">
<p>一键归档：待归档状态的所有脚本文件，后台一次性全部归档</p>
<p>一键审核：待审核状态的所有脚本文件，后台一次性全部替换</p>
</div>
</div>
</script> </script>
<script type="text/ng-template" id="strandColumn.html"> <script type="text/ng-template" id="strandColumn.html">

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

@ -287,7 +287,8 @@ module Developer {
districtName: item.districtName, districtName: item.districtName,
systemName: item.systemName, systemName: item.systemName,
id: item.id+"", id: item.id+"",
year: item.year year: item.year,
checkStatus: item.check
}, },
path: item.dataPath+"app/", path: item.dataPath+"app/",
isTarget: "false", isTarget: "false",

5
plugins/kubernetes/html/layoutKubernetes.html
View File

@ -274,6 +274,11 @@
</div> </div>
</script> </script>
<script type="text/ng-template" id="dataCheckStatus.html">
<div class="ngCellText" ng-init="entity=row.entity">
</div>
</script>
<div ng-controller="Kubernetes.TopLevel"> <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="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> <div class="row kubernetes-view" ng-view></div>

9
plugins/kubernetes/html/replicationControllers.html
View File

@ -61,7 +61,14 @@
ng-click="extractClick.open(id || tableConfig.selectedItems)"> ng-click="extractClick.open(id || tableConfig.selectedItems)">
<i class="glyphicon glyphicon-cloud-download"></i> 汇总 <i class="glyphicon glyphicon-cloud-download"></i> 汇总
</button> </button>
<!--<span ng-include="'runButton.html'"></span>--> <span class="pull-right">&nbsp;</span>
<button ng-show="model.fetched"
ng-disabled="!id && tableConfig.selectedItems.length == 0"
class="btn btn-success pull-right sj_btn_grey"
ng-click="extract(id || tableConfig.selectedItems)">
<i class="glyphicon glyphicon-cloud-download"></i> 抽取
</button>
</div> </div>
</div> </div>
<div class="row"> <div class="row">

35
plugins/kubernetes/ts/replicationControllers.ts
View File

@ -66,6 +66,11 @@ module Kubernetes {
{ field: '$extractStatus', { field: '$extractStatus',
displayName: '数据汇总状态', displayName: '数据汇总状态',
cellTemplate: $templateCache.get("dataSummaryTemplate.html") cellTemplate: $templateCache.get("dataSummaryTemplate.html")
},
{
field: '$checkStatus',
displayName: '检验状态',
cellTemplate: $templateCache.get("dataCheckStatus.html")
} }
], ],
sortInfo: { sortInfo: {
@ -205,6 +210,34 @@ module Kubernetes {
startSelected(selected, selected.shift()); startSelected(selected, selected.shift());
}; };
/**
处理抽取标准表
**/
$scope.extract = (selected) =>{
console.log(selected);
var answer = false;
for (var i = 0; i < ConfigsModel.oracleParam.length; ++i) {
if(ConfigsModel.oracleParam[i].type == 1){
answer = true
break;
}
}
if(answer == false){
/**
提示没有配置标准表汇总库
**/
Configs.customAlert("提示", "操作失败:没有配置默认的标准表汇总库", '',null, 0, "error");
return;
}
// 检查数据库是否已启动
var result = checkIsStartSuccess(selected);
if(result.length > 0){
Configs.customAlert("提示", "操作失败:选择服务中存在未启动的数据库，请先启动服务", '',null, 0, "error");
return;
}
//执行标准表抽取操作
}
$scope.extractClick = { $scope.extractClick = {
items: null, items: null,
selectedItem: {name: "当前没有可用的汇总库"}, selectedItem: {name: "当前没有可用的汇总库"},
@ -222,7 +255,7 @@ module Kubernetes {
extractClick.selectedItem = $scope.configs.oracleParam[0]; extractClick.selectedItem = $scope.configs.oracleParam[0];
var result = checkIsStartSuccess($scope.tableConfig.selectedItems); var result = checkIsStartSuccess($scope.tableConfig.selectedItems);
if(result.length >0){ if(result.length >0){
Configs.customAlert("提示", "操作失败:选择服务中存在未启动的数据，请先启动服务", '',null, 0, "error"); Configs.customAlert("提示", "操作失败:选择服务中存在未启动的数据库，请先启动服务", '',null, 0, "error");
return; return;
} }
extractClick.dialog.open(); extractClick.dialog.open();

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

@ -283,7 +283,7 @@ module Kubernetes {
function checkForExitTask(transferTasks:Array<any>, selectItem){ function checkForExitTask(transferTasks:Array<any>, selectItem){
for(var index in transferTasks){ for(var index in transferTasks){
var task = transferTasks[index]; var task = transferTasks[index];
if(task["_key"] == selectItem["_key"] && (task["status"] == "1" || task["status"] == "0") && selectItem["year"] == task.labels.dataYear){ if(task["_key"] == selectItem["_key"] && selectItem["year"] == task.labels.dataYear){
return true; return true;
} }
} }

2
plugins/system/html/regionalismCodeSearch.html
View File

@ -6,7 +6,7 @@
<div ng-hide="model.regionalismInfo.length" class="align-center"> <div ng-hide="model.regionalismInfo.length" class="align-center">
<p class="alert alert-info">当前没有可以查看的数据.</p> <p class="alert alert-info">当前没有可以查看的数据.</p>
</div> </div>
<div ng-show="model.regionalismInfo.length"> <div ng-show="model.regionalismInfo.length" class="mr20">
<table ng-table="tableParams" class="table table-condensed table-bordered table-striped" show-filter="true"> <table ng-table="tableParams" class="table table-condensed table-bordered table-striped" show-filter="true">
<tr ng-repeat="row in $data"> <tr ng-repeat="row in $data">
<td title="'行政区划代码'" filter="{ code: 'text'}" sortable="'code'"> <td title="'行政区划代码'" filter="{ code: 'text'}" sortable="'code'">

2
plugins/system/html/systemCodeSearch.html
View File

@ -6,7 +6,7 @@
<div ng-hide="model.systemInfo.length" class="align-center"> <div ng-hide="model.systemInfo.length" class="align-center">
<p class="alert alert-info">当前没有可以查看的数据.</p> <p class="alert alert-info">当前没有可以查看的数据.</p>
</div> </div>
<div ng-show="model.systemInfo.length"> <div ng-show="model.systemInfo.length" class="mr20">
<table ng-table="tableParams" class="table table-condensed table-bordered table-striped" show-filter="true"> <table ng-table="tableParams" class="table table-condensed table-bordered table-striped" show-filter="true">
<tr ng-repeat="row in $data"> <tr ng-repeat="row in $data">
<td title="'系统编码'" filter="{ code: 'text'}" sortable="'code'"> <td title="'系统编码'" filter="{ code: 'text'}" sortable="'code'">

14
plugins/system/html/systemList.html
View File

@ -2,29 +2,27 @@
<div hawtio-tabs></div> <div hawtio-tabs></div>
<div class="container-content "> <div class="container-content ">
<div class="container-fluid sj_fluid"> <div class="container-fluid sj_fluid">
<div class="row clear fl"> <div class="row clear fl mb10">
<!--<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" /> <!--<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" />
<label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>--> <label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>-->
<span class="pull-right">&nbsp;</span> <button class="btn pull-right sj_btn_grey " ng-click="downloadFilePackage()">
<span class="pull-right">&nbsp;</span>
<button class="btn pull-right sj_btn_grey " ng-click="downloadFilePackage()">
<i class="glyphicon glyphicon-save"></i> 文件包导出 <i class="glyphicon glyphicon-save"></i> 文件包导出
</button> </button>
<span class="pull-right">&nbsp;</span> <span class="pull-right">&nbsp;</span>
<button class="btn pull-right sj_btn_grey " ng-click="downLoadExcelFile()"> <button class="btn pull-right sj_btn_grey mr5" ng-click="downLoadExcelFile()">
<i class="glyphicon glyphicon-export"></i> Excel导出 <i class="glyphicon glyphicon-export"></i> Excel导出
</button> </button>
<span class="pull-right">&nbsp;</span> <span class="pull-right">&nbsp;</span>
<button class="sj_btn_green fl" ng-click="upLoadExcelFile()"> <button class="sj_btn_green fl mr5" ng-click="upLoadExcelFile()">
<i class="glyphicon glyphicon-import"></i>Excel导入 <i class="glyphicon glyphicon-import"></i>Excel导入
</button> </button>
</div> </div>
<div ng-show="true"> <div ng-show="true">
<div class="col-md-12"> <div class="col-md-12" style="padding-left:0; padding-right:20px;">
<div ng-show="model.length == 0" class="alert alert-warning sj_alert-warning"> <div ng-show="model.length == 0" class="alert alert-warning sj_alert-warning">
<span class="help-block"> <span class="help-block">
当前没有可以查看的数据，请点击Excel导入按钮导入Excel数据</span></div> 当前没有可以查看的数据，请点击Excel导入按钮导入Excel数据</span></div>
<table ng-show="model.length != 0" ng-table-dynamic="tableParams with columns" class="table table-condensed table-bordered table-striped"> <table ng-show="model.length != 0" ng-table-dynamic="tableParams with columns" class="table table-condensed table-bordered table-striped table_sj_td_center">
<tr ng-repeat="row in $data"> <tr ng-repeat="row in $data">
<td ng-repeat="col in $columns"> <td ng-repeat="col in $columns">
<span ng-show="col.field != 'id'">{{row[col.field]}}</span> <span ng-show="col.field != 'id'">{{row[col.field]}}</span>

74
plugins/system/html/systemSQLManagement.html
View File

@ -1,47 +1,49 @@
<div ng-controller="System.SystemSQLManagement"> <div ng-controller="System.SystemSQLManagement">
<div hawtio-tabs></div> <div hawtio-tabs></div>
<div class="container-fluid sj_fluid"> <div class="container-fluid sj_fluid">
<div class="row clear fl"> <div class="mb10 clear">
<label>行政区划代码</label> <div class="row clear fl mr5 mt5">
</div> <label>行政区划代码</label>
<div class="row clear fl"> </div>
<select class="form-control" ng-change="citySelect(x)" ng-model="x" ng-init="x='all'"> <div class="row clear fl">
<option value="all">全部</option> <select class="form-control sj_select_box" ng-change="citySelect(x)" ng-model="x" ng-init="x='all'">
<option ng-repeat="city in cities">{{city}}</option> <option value="all">全部</option>
</select> <option ng-repeat="city in cities">{{city}}</option>
</div> </select>
<div class="row clear fl"> </div>
<select class="form-control" ng-change="countrySelect(y)" ng-model="y" ng-init="y='all'"> <div class="row clear fl">
<option value="all">全部</option> <select class="form-control sj_select_box" ng-change="countrySelect(y)" ng-model="y" ng-init="y='all'">
<option ng-repeat="country in countries">{{country.name}}</option> <option value="all">全部</option>
</select> <option ng-repeat="country in countries">{{country.name}}</option>
</div> </select>
<div class="row clear fl"> </div>
<select class="form-control" ng-change="statusSelect(z)" ng-model="z" ng-init="z='all'"> <div class="row clear fl mr10">
<option value="all">全部</option> <select class="form-control sj_select_box" ng-change="statusSelect(z)" ng-model="z" ng-init="z='all'">
<option ng-repeat="value in status">{{value.label}}</option> <option value="all">全部</option>
</select> <option ng-repeat="value in status">{{value.label}}</option>
</div> </select>
<div class="row clear fl"> </div>
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="quickCheck()"> <div class="row clear fr mt5 ml5 mr20">
<i class="glyphicon glyphicon-save"></i> 一键审核 <!--<button class="btn btn-danger pull-right sj_btn_grey " ng-click="help()">-->
</button> <i style="cursor:pointer; font-size:18px;" class="glyphicon glyphicon-question-sign " ng-click="help()" title="查看状态详情"></i>
</div> <!--</button> -->
<div class="row clear fl"> </div>
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="quitFile()"> <div class="row clear fr">
<i class="glyphicon glyphicon-save"></i> 一键归档 <button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="quitFile()">
</button> <i class="glyphicon glyphicon-save"></i> 一键归档
</div> </button>
<div class="row clear fl"> </div>
<!--<button class="btn btn-danger pull-right sj_btn_grey " ng-click="help()">--> <div class="row clear fr">
<i style="cursor:pointer" class="glyphicon glyphicon-question-sign " ng-click="help()" title="查看状态详情"></i> <button class="btn pull-right sj_btn_grey mr5" ng-disabled="!checkable" ng-click="quickCheck()">
<!--</button> --> <i class="glyphicon glyphicon-save"></i> 一键审核
</button>
</div>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div ng-show="tableParams.dataset.length<=0" class="alert alert-warning sj_alert-warning"> <div ng-show="tableParams.dataset.length<=0" class="alert alert-warning sj_alert-warning">
<span class="help-block"> <span class="help-block">
当前没有查到符合过滤条件的数据，请重新选择过滤条件</span></div> 当前没有查到符合过滤条件的数据，请重新选择过滤条件</span></div>
<table ng-table="tableParams" class="table table-condensed table-bordered table-striped"> <table ng-table="tableParams" class="table table-condensed table-bordered table-striped table_sj_td_center">
<colgroup> <colgroup>
<col width="2%" /> <col width="2%" />
<col width="10%" /> <col width="10%" />

62
plugins/system/html/systemVerification.html
View File

@ -1,34 +1,36 @@
<div ng-controller="System.SystemVerificationController"> <div ng-controller="System.SystemVerificationController">
<div hawtio-tabs></div> <div hawtio-tabs></div>
<div class="container-content "> <div class="container-content ">
<div class="container-fluid sj_fluid"> <div class="container-fluid sj_fluid ">
<div class="row clear fl"> <div class="mb10 clear">
<label>行政区划代码</label> <div class="row clear fl mr5 mt5">
<label>行政区划代码</label>
</div>
<div class="row clear fl">
<select class="form-control sj_select_box" ng-change="citySelect(x)" ng-model="x" ng-init="x='all'">
<option value="all">请选择市级</option>
<option ng-repeat="city in cities">{{city}}</option>
</select>
</div>
<div class="row clear fl mr10">
<select class="form-control sj_select_box" ng-change="countrySelect(y)" ng-model="y" ng-init="y='all'">
<option value="all">请选择区/县</option>
<option ng-repeat="country in countries">{{country.name}}</option>
</select>
</div>
<div class="row clear fr mr20">
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="deleteRows()">
<i class="glyphicon glyphicon-save"></i> 删除
</button>
</div>
<div class="row clear fr mr5">
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="check()">
<i class="glyphicon glyphicon-save"></i> 校验
</button>
</div>
</div> </div>
<div class="row clear fl"> <div class="col-md-12 clear">
<select class="form-control" ng-change="citySelect(x)" ng-model="x" ng-init="x='all'"> <table ng-show="tableData.length > 0" ng-table="tableParams" class="table table-condensed table-bordered table-striped table_sj_td_center">
<option value="all">请选择市级</option>
<option ng-repeat="city in cities">{{city}}</option>
</select>
</div>
<div class="row clear fl">
<select class="form-control" ng-change="countrySelect(y)" ng-model="y" ng-init="y='all'">
<option value="all">请选择区/县</option>
<option ng-repeat="country in countries">{{country.name}}</option>
</select>
</div>
<div class="row clear fl">
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="check()">
<i class="glyphicon glyphicon-save"></i> 校验
</button>
</div>
<div class="row clear fl">
<button class="btn pull-right sj_btn_grey " ng-disabled="!checkable" ng-click="deleteRows()">
<i class="glyphicon glyphicon-save"></i> 删除
</button>
</div>
<div class="col-md-12">
<table ng-show="tableData.length > 0" ng-table="tableParams" class="table table-condensed table-bordered table-striped">
<colgroup> <colgroup>
<col width="2%" /> <col width="2%" />
</colgroup> </colgroup>
@ -43,8 +45,8 @@
<td title="'市'">{{row.cityName}}</td> <td title="'市'">{{row.cityName}}</td>
<td title="'区/县'">{{row.districtName}}</td> <td title="'区/县'">{{row.districtName}}</td>
<td title="'行政区划代码'">{{row.areaCode}}</td> <td title="'行政区划代码'">{{row.areaCode}}</td>
<td title="'更新'"> <td title="'更新'" class="sj_td_center">
<button ng-show="row.collUpdate == '是'" class="btn sj_btn" ng-click="update(row)">&nbsp;&nbsp;是</button> <button ng-show="row.collUpdate == '是'" class="sj_link_blue" ng-click="update(row)">&nbsp;&nbsp;是</button>
<span ng-hide="row.collUpdate == '是'">否</span> <span ng-hide="row.collUpdate == '是'">否</span>
</td> </td>
<td title="'系统名称'">{{row.sysName}}</td> <td title="'系统名称'">{{row.sysName}}</td>
@ -55,7 +57,7 @@
</tr> </tr>
</table> </table>
<div ng-hide="tableData.length > 0" class="col-sm-12 alert alert-warning sj_alert-warning"> <div ng-hide="tableData.length > 0" class="col-sm-12 alert alert-warning sj_alert-warning">
<span class="help-block"> <span class="help-block" >
当前没有选择需要校验的数据，请选择需要校验的数据！ 当前没有选择需要校验的数据，请选择需要校验的数据！
</span> </span>
</div> </div>

2
plugins/system/ts/systemList.ts
View File

@ -21,7 +21,7 @@ module System{
{ field: "cityName", title: "市", filter: { cityName: 'text' }, show: true }, { field: "cityName", title: "市", filter: { cityName: 'text' }, show: true },
{ field: "districtName", title: "区/县", filter: { districtName: 'text' }, show: true }, { field: "districtName", title: "区/县", filter: { districtName: 'text' }, show: true },
{ field: "areaCode", title: "行政区划代码", filter: {areaCode: '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: "sysName", title: "信息系统名称", filter: { sysName: "text" }, show: true },
{ field: "departmentManager", title: "联系人", filter: { departmentManager: "text" }, show: true }, { field: "departmentManager", title: "联系人", filter: { departmentManager: "text" }, show: true },
{ field: "managerContacts", title: "联系方式", filter: { managerContacts: "text" }, show: true }, { field: "managerContacts", title: "联系方式", filter: { managerContacts: "text" }, show: true },

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

@ -8,7 +8,7 @@
/// <reference path="../../configs/ts/configsDataService.ts"/> /// <reference path="../../configs/ts/configsDataService.ts"/>
module System{ 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); shareInit($scope);
$scope.cities = classifyCity(SystemModel.regionalismInfo); $scope.cities = classifyCity(SystemModel.regionalismInfo);
$scope.model = SystemModel; $scope.model = SystemModel;
@ -115,7 +115,7 @@ module System{
/** /**
提示没有配置标准表汇总库 提示没有配置标准表汇总库
**/ **/
Configs.customAlert("提示", "操作失败:没有配置默认的汇总库", '',null, 0, "error"); Configs.customAlert("提示", "操作失败:没有配置默认的标准表汇总库", '',null, 0, "error");
return; return;
} }
@ -131,10 +131,11 @@ module System{
Configs.customAlert("提示", "操作失败:选择的系统存在没有数据的系统", '',null, 0, "error"); Configs.customAlert("提示", "操作失败:选择的系统存在没有数据的系统", '',null, 0, "error");
return; return;
} }
if(item.dataBaseType == 'ORACLE'){ item["_key"] = item.areaCode + "-" + item.sysCode + "-" + item.dataVersion;
if(item.dataBaseType == 'ORACLE'){
oracleDB.push(item); oracleDB.push(item);
}else{ }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) =>{ angular.forEach(oracleDB, (item) =>{
Kubernetes.createRC({ Kubernetes.createRC({
name: item.areaCode + "-" + item.sysCode + "-" + item.dataVersion, name: item._key,
labels: { labels: {
system: item.sysCode.toString(), system: item.sysCode.toString(),
version: item.dataVersion.toString(), version: item.dataVersion.toString(),
@ -169,16 +177,13 @@ module System{
$location.path('/kubernetes/namespace/default/replicationControllers'); $location.path('/kubernetes/namespace/default/replicationControllers');
}, 500); }, 500);
} }
if(sqlServerDB.length <= 0)
return;
$http({ $http({
url: "/java/console/api/checkout/checkList", url: "/java/console/api/checkout/checkList",
method: "POST", method: "POST",
data: sqlServerDB data: oracleDB
}).success((data, header, config, status) => { }).success((data, header, config, status) => {
$scope.tableData = data.data; /*$scope.tableData = data.data;
var result = []; var result = [];
if($scope.y != 'all'){ if($scope.y != 'all'){
angular.forEach($scope.tableData, (item) =>{ angular.forEach($scope.tableData, (item) =>{
@ -191,10 +196,10 @@ module System{
$scope.tableParams.settings({ $scope.tableParams.settings({
dataset: result dataset: result
}); });*/
}).error((data, header, config, status) => { }).error((data, header, config, status) => {
throw "请求失败" throw "请求失败"
}); });
} }
} }
// watch for check all checkbox // watch for check all checkbox