服务集群配置添加字段，信息系统增加导出功能，信息系统的信息系统脚本管理的上传限制sql文件
This commit is contained in:
parent
456dee0be2
commit
57d45a80f7
|
|
@ -13,4 +13,5 @@ declare module Configs {
|
|||
var sqlVerificationController: ng.IModule;
|
||||
var sqlMoveController: ng.IModule;
|
||||
var sysVerUpdateController: ng.IModule;
|
||||
var dataExportController: ng.IModule;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -249,7 +249,7 @@ gulp.task('connect', ['watch'], function() {
|
|||
}, {
|
||||
proto: "http",
|
||||
port: "9001",
|
||||
hostname: "192.168.191.100", //hostname:"127.0.0.1"
|
||||
hostname: "192.168.191.120", //hostname:"127.0.0.1"
|
||||
path: '/java/console/api',
|
||||
targetPath: "/"
|
||||
}];
|
||||
|
|
|
|||
|
|
@ -16,10 +16,15 @@ a:hover,a:active{color:#333;}
|
|||
.cl{ clear:both; overflow:hidden;}
|
||||
/* public*/
|
||||
.mt2{margin-top: 3px;}
|
||||
.mt5{ margin-top: 5px;}.mt10{ margin-top: 10px;}.mt15{ margin-top: 15px;}
|
||||
.ml5{ margin-left:5px;}.ml10{ margin-left:10px;}.ml15{ margin-left:15px;}
|
||||
.mt5{ margin-top: 5px;}.mt10{ margin-top: 10px;}.mt15{ margin-top: 15px;}.mt20{ margin-top: 20px;}.mt30{ margin-top: 30px;}
|
||||
.ml5{ margin-left:5px;}.ml10{ margin-left:10px;}.ml15{ margin-left:15px;}.ml20{ margin-left: 20px;}
|
||||
.mr5{ margin-right:5px;}.mr10{ margin-right:10px;}.mr15{ margin-right:15px;}.mr17{ margin-right:17px;}.mr20{ margin-right:20px;}
|
||||
.mb10{ margin-bottom: 10px;}
|
||||
.mb5{ margin-bottom: 5px;}.mb10{ margin-bottom: 10px;}
|
||||
.margin20{ margin:20px;}
|
||||
.pt5{ padding-top:5px;}
|
||||
.pb5{ padding-bottom:5px;}
|
||||
.padding20{ padding: 20px;}
|
||||
.height20{ height:20px;}
|
||||
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);}
|
||||
.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;}
|
||||
|
|
@ -77,6 +82,7 @@ a:hover.sj_btn_grey{ background-image:-webkit-linear-gradient(top, #eeeeee,#d3d3
|
|||
.sj_table_td00{ width:5%;}
|
||||
.sj_table_td06{ width:15%;}
|
||||
.sj_over_hid{ display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
|
||||
.sj_over_hid2{ overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
|
||||
.sj_content_table table tr td input{ margin-top:15px;}
|
||||
.sj_content_table .sj_table_top td{ border-bottom:1px solid #a6a6a6; font-weight:bold; border-right:1px solid #ccc;}
|
||||
.sj_table_bottom{ height:30px; line-height:30px; }
|
||||
|
|
@ -205,4 +211,12 @@ table tr.sj_popup_toptxt th{ font-weight: bold; text-align: center; color: #333
|
|||
.container-fluid{ padding-left: 0; padding-right: 0;}
|
||||
.sj_fluid{ margin-left:20px; margin-right: 20px;}
|
||||
.custom-alert {width: 330px; border: none;background-color: #fff;font-weight: bold;font-size: 12px;-webkit-border-radius:5px; -moz-border-radius:5px;-o-border-radius:5px; border-radius:5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
|
||||
.custom-alert-title { line-height: 30px;padding: 0px 10px;background-color: #3b94d6;}
|
||||
.custom-alert-title { line-height: 30px;padding: 0px 10px;background-color: #3b94d6;}
|
||||
|
||||
.sj-border-black{ border:1px solid #000;}
|
||||
.export-li{ width:446px; height:30px;}
|
||||
.export-label { height:30px;}
|
||||
.export-li input{ width: 18px; height:18px;}
|
||||
.export-li span{width:400px; height:18px;}
|
||||
.box-sizing{ -moz-box-sizing: border-box; -webkit-box-sizing: border-box; -o-box-sizing: border-box; -ms-box-sizing: border-box; box-sizing: border-box; }
|
||||
.border-left-none{ boder-left:none;}
|
||||
|
|
@ -29,37 +29,103 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">名称</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control " type="text" ng-model="tableForm.name" name="orcName" ng-minlength="2" ng-maxlength="20" required="required" ng-focus="tableForm.name=''"/>
|
||||
<input class="system-info-danger-input form-control " type="text" ng-model="tableForm.name" name="orcName" ng-minlength="2" ng-maxlength="20" required="required" ng-focus="tableForm.name" placeholder="请输入2-20个字符的数据名称"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcName.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcName.$error.required">名称不能为空</span>
|
||||
<span role="alert" ng-show="!validForm.orcName.$error.required && validForm.orcName.$invalid">请输入2-20个字符的数据名称</span>
|
||||
<span role="alert" ng-show="!validForm.orcName.$error.required && validForm.orcName.$invalid">请输入2-20个字符的数据名称</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">IP</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.ip" name="orcIP" ng-pattern="/((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))/" required="required" ng-focus="tableForm.ip=''"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcIP.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcIP.$error.required">IP不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcIP.$error.pattern">请输入正确的IP地址</span>
|
||||
</div>
|
||||
<label class="col-sm-2 control-label">是否创建汇总库</label>
|
||||
<div class="col-sm-10 sj_form_input ">
|
||||
<select class="form-control " ng-model="tableForm.isCreateGatherOracle">
|
||||
<option value=1 ng-selected="tableForm.isCreateGatherOracle==1" selected>是</option>
|
||||
<option value=0 ng-selected="tableForm.isCreateGatherOracle==0" >否</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">端口号</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.port" name="orcPort" ng-pattern="/^([1-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/" required="required" ng-focus="tableForm.port=''"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcPort.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcPort.$error.required">端口号不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcPort.$error.pattern">端口号必须为1~65535的数字</span>
|
||||
<div ng-switch = "tableForm.isCreateGatherOracle">
|
||||
<div ng-switch-when = "0">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">IP</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.ip" name="orcIP" ng-pattern="/((?:(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d)))\.){3}(?:25[0-5]|2[0-4]\d|((1\d{2})|([1-9]?\d))))/" required="required" ng-focus="tableForm.ip" placeholder="oracle的IP,例如：0.0.0.0"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcIP.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcIP.$error.required">IP不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcIP.$error.pattern">请输入正确的IP地址</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">端口号</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.port" name="orcPort" ng-pattern="/^([1-9]|[1-9]\d|[1-9]\d{2}|[1-9]\d{3}|[1-5]\d{4}|6[0-4]\d{3}|65[0-4]\d{2}|655[0-2]\d|6553[0-5])$/" required="required" ng-focus="tableForm.port" placeholder="oracle的的端口,1~65535"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcPort.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcPort.$error.required">端口号不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcPort.$error.pattern">端口号必须为1~65535的数字</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-switch = "tableForm.isCreateGatherOracle">
|
||||
<div ng-switch-when = "1">
|
||||
<div class="form-group ">
|
||||
<label class="col-sm-2 control-label">开始时间</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.startTime" name="orcStartTime" ng-pattern="/^([0-9]{4})-(0?[1-9]|1[0-2])$/" required="required" ng-focus="tableForm.startTime" placeholder="开始时间,格式为yyyy-MM 例如：2018-02"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcStartTime.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcStartTime.$error.required">开始时间不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcStartTime.$error.pattern">格式为yyyy-MM 例如：2018-02</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">结束时间</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.endTime" name="orcEndTime" ng-pattern="/^([0-9]{4})-(0?[1-9]|1[0-2])$/" required="required" ng-focus="tableForm.endTime" placeholder="结束时间,格式为yyyy-MM 例如：2018-02"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcEndTime.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcEndTime.$error.required">结束时间不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcEndTime.$error.pattern">格式为yyyy-MM 例如：2018-02</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">联系人</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.contact" name="orcContact" ng-pattern="" required="required" ng-focus="tableForm.contact" placeholder="联系人"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcContact.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcContact.$error.required">联系人不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcContact.$error.pattern">联系人为有效联系人</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">联系方式</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.phone" name="orcPhone" ng-pattern="/^[1][3,4,5,7,8][0-9]{9}$/" required="required" ng-focus="tableForm.phone" placeholder="联系方式"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcPhone.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcPhone.$error.required">联系方式不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcPhone.$error.pattern">手机号必须为有效的手机号码</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">编码方式</label>
|
||||
<div class="col-sm-10 sj_form_input ">
|
||||
<select class="form-control " ng-model="tableForm.encoding">
|
||||
<option value=0 ng-selected="tableForm.encoding==GBK" selected>GBK</option>
|
||||
<option value=1 ng-selected="tableForm.encoding==UTF8">UTF8</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">用戶名</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.user" name="orcUser" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.user=''"/>
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.user" name="orcUser" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.user" placeholder="oracle的用户名，2-15个字母、数字或下划线"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcUser.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcUser.$error.required">用户名不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcUser.$error.pattern">用户名必须为2-15个字母、数字或下划线</span>
|
||||
|
|
@ -69,7 +135,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">密码</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.password" name="orcPassword" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.password=''"/>
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.password" name="orcPassword" ng-pattern="/^\w{2,15}$/" required="required" ng-focus="tableForm.password" placeholder="oracle的密码,2-15个字母、数字或下划线"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcPassword.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcPassword.$error.required">密码不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcPassword.$error.pattern">密码必须为2-15个字母、数字或下划线</span>
|
||||
|
|
@ -79,7 +145,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">服务名</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.databaseName" name="orcService" ng-pattern="/^[a-zA-Z]{1,10}$/" required="required" ng-focus="tableForm.databaseName=''"/>
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.databaseName" name="orcService" ng-pattern="/^[a-zA-Z]{1,10}$/" required="required" ng-focus="tableForm.databaseName" placeholder="oracle的实例名,1-10个字母,例如ORCL"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcService.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcService.$error.required">服务名不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcService.$error.pattern">服务名必须为1-10个字母</span>
|
||||
|
|
@ -89,7 +155,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">表空间名</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.tableName" name="orcTable" ng-pattern="/^\w{1,15}$/" required="required" ng-focus="tableForm.tableName=''"/>
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.tableName" name="orcTable" ng-pattern="/^\w{1,15}$/" required="required" ng-focus="tableForm.tableName" placeholder="oracle的表空间名,1-15个字母、数字或下划线"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcTable.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcTable.$error.required">表空间名不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcTable.$error.pattern">表空间名必须为1-15个字母、数字或下划线</span>
|
||||
|
|
@ -99,7 +165,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-2 control-label">表后缀名</label>
|
||||
<div class="col-sm-10 sj_form_input">
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.suffix" name="orcSuffix" ng-pattern="/^\w{1,10}$/" required="required" ng-focus="tableForm.suffix=''"/>
|
||||
<input class="system-info-danger-input form-control" type="text" ng-model="tableForm.suffix" name="orcSuffix" ng-pattern="/^\w{1,10}$/" required="required" ng-focus="tableForm.suffix" placeholder="汇总生成新表的后缀名,1-10个字母、数字或下划线"/>
|
||||
<div class="system-info-danger-red-char form-error" ng-show="validForm.orcSuffix.$invalid && submitted">
|
||||
<span role="alert" ng-show="validForm.orcSuffix.$error.required">表后缀名不能为空</span>
|
||||
<span role="alert" ng-show="validForm.orcSuffix.$error.pattern">表后缀名必须为1-10个字母、数字或下划线</span>
|
||||
|
|
@ -116,7 +182,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="form-group" style="margin-left:145px;">
|
||||
<button class="btn sj_btn_blue" type='submit' style="color:#fff;" >
|
||||
<button class="btn sj_btn_blue" type='submit' style="color:#fff; margin-right:30px;" >
|
||||
<span class="glyphicon glyphicon-save "></span> 保存
|
||||
</button>
|
||||
<button class="btn sj_btn_grey" ng-click='cancel()'>
|
||||
|
|
@ -130,3 +196,30 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<style>
|
||||
.form-horizontal input::-webkit-input-placeholder{
|
||||
font-family: "微软雅黑";
|
||||
font-size: 12px;
|
||||
line-height: 28px;
|
||||
font-style:normal;
|
||||
}
|
||||
.form-horizontal input::-moz-placeholder{
|
||||
font-family: "微软雅黑";
|
||||
font-size: 12px;
|
||||
line-height: 28px;
|
||||
font-style:normal;
|
||||
}
|
||||
.form-horizontal input:-moz-placeholder{
|
||||
font-family: "微软雅黑";
|
||||
font-size: 12px;
|
||||
line-height: 28px;
|
||||
font-style:normal;
|
||||
}
|
||||
.form-horizontal input:-ms-input-placeholder{
|
||||
font-family: "微软雅黑";
|
||||
font-size: 12px;
|
||||
line-height: 28px;
|
||||
font-style:normal;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
|
@ -434,6 +434,44 @@
|
|||
</div>
|
||||
</div>
|
||||
</script>
|
||||
<script type="text/ng-template" id="dataExport.html">
|
||||
<div class="container-fluid cl padding20 box-sizing">
|
||||
<div class="sj_table_td05 sj-border-black mt10 padding20 fl">
|
||||
<h3 class="mb10">选择需要导出的数据</h3>
|
||||
<ul class="mb10" style="height:400px;overflow-y:auto;">
|
||||
<li class="cl export-li">
|
||||
<label class="export-label">
|
||||
<input type="checkbox" ng-model="flag" class="fl" ng-click="selectAll(flag)"/>
|
||||
<span class="ml5 mt5 fl sj_over_hid">全选</span>
|
||||
</label>
|
||||
</li>
|
||||
<li class="cl export-li" ng-repeat = "item in data">
|
||||
<label class="export-label">
|
||||
<input type="checkbox" id = {{item.id}} ng-checked="ischeckedId(item.id)" ng-click="selectId(item.id,$event,idList)" class="fl" />
|
||||
<span class="ml5 mt5 fl sj_over_hid ">{{item.cityName}}_{{item.districtName}}_{{item.systemName}}_{{item.endYear}}_{{item.submittedBatch}}</span>
|
||||
</label>
|
||||
</li>
|
||||
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<div class="sj_table_td05 sj-border-black mt10 padding20 border-left-none fl">
|
||||
<h3 class="mb10">选择导出数据类型</h3>
|
||||
<ul class="mb10" style="height:400px;overflow-y:auto;">
|
||||
<li class="cl export-li" ng-repeat = "item in export">
|
||||
<label class="export-label">
|
||||
<input type="checkbox" class="fl" id="{{item.type}}" ng-checked="ischeckedType(item.type)" ng-click="selectType(item.type,$event,typeList)"/>
|
||||
<span class="ml5 mt5 fl sj_over_hid">{{item.exportName}}</span>
|
||||
</label>
|
||||
</li>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<button class="sj_btn_blue mt20 fr" ng-click="onsubmit(idList,typeList)">保存</button>
|
||||
<button class="sj_btn_grey mt20 mr5 fr" ng-click="cancel()">取消</button>
|
||||
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@ module Configs{
|
|||
}else{
|
||||
RESTfulUrl = UrlHelpers.join(url, id+"", operate);
|
||||
}
|
||||
|
||||
|
||||
$http({
|
||||
method: "POST",
|
||||
dataType: 'json',
|
||||
|
|
@ -134,10 +134,13 @@ module Configs{
|
|||
data: JSON.stringify(resource),
|
||||
}).success((data,header,config,status) => {
|
||||
if(angular.isFunction(fn))
|
||||
fn(data, header);
|
||||
fn(data, header);
|
||||
// console.log("success");
|
||||
// console.log(data + "_." + header + "_.." + config + "_..." + status);
|
||||
// console.log("success");
|
||||
}).error((data,header,config,status) => {
|
||||
if(angular.isFunction(fn))
|
||||
fn(data, header);
|
||||
fn(data, header);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,8 @@ module Configs{
|
|||
inputObj.setAttribute('id', 'myFileInput');
|
||||
inputObj.setAttribute('type', 'file');
|
||||
inputObj.setAttribute("style", 'visibility:hidden');
|
||||
inputObj.setAttribute("accept", "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
// inputObj.setAttribute("accept", "application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
|
||||
inputObj.setAttribute("accept", "application/sql");
|
||||
if(isMultiple)
|
||||
inputObj.setAttribute("multiple", "multiple");
|
||||
document.body.appendChild(inputObj);
|
||||
|
|
|
|||
|
|
@ -5,11 +5,17 @@
|
|||
|
||||
module Configs{
|
||||
|
||||
export var KubeController = controller('KubeController', ["$scope", "$templateCache", "$location", "$routeParams", "$http", "$timeout","ConfigsModel",
|
||||
($scope, $templateCache:ng.ITemplateCacheService, $location, $routeParams, $http, $timeout, ConfigsModel) => {
|
||||
export var KubeController = controller('KubeController', ["$scope", "$templateCache", "$location", "$routeParams", "$http", "$timeout","ConfigsModel","DataModel",
|
||||
($scope, $templateCache:ng.ITemplateCacheService, $location, $routeParams, $http, $timeout, ConfigsModel, DataModel) => {
|
||||
$scope.model= ConfigsModel;
|
||||
$scope.model.updateOracleParam();
|
||||
$scope.submitted = false;
|
||||
$scope.submitted = false;
|
||||
|
||||
$scope.DataModel = DataModel;
|
||||
|
||||
console.log(ConfigsModel.oracleParam);
|
||||
console.log("Configs00000000");
|
||||
|
||||
|
||||
$scope.tableConfig={
|
||||
data: 'model.oracleParam',
|
||||
|
|
@ -45,7 +51,7 @@ module Configs{
|
|||
{
|
||||
field: "suffix",
|
||||
displayName: "表后缀"
|
||||
},
|
||||
},
|
||||
{
|
||||
field: "type",
|
||||
displayName: "标准表汇总库",
|
||||
|
|
@ -74,14 +80,20 @@ module Configs{
|
|||
$scope.tableForm = {};
|
||||
$scope.tableForm["id"]=0;
|
||||
$scope.tableForm["type"]=0;
|
||||
$scope.tableForm["name"]='请输入2-20个字符的数据名称';
|
||||
$scope.tableForm["ip"]='oracle的IP,例如：0.0.0.0';
|
||||
$scope.tableForm["port"]='oracle的的端口,1~65535';
|
||||
$scope.tableForm["user"]='oracle的用户名，2-15个字母、数字或下划线';
|
||||
$scope.tableForm["password"]='oracle的密码,2-15个字母、数字或下划线';
|
||||
$scope.tableForm["databaseName"]='oracle的实例名,1-10个字母,例如ORCL';
|
||||
$scope.tableForm["tableName"]='oracle的表空间名,1-15个字母、数字或下划线';
|
||||
$scope.tableForm["suffix"]='汇总生成新表的后缀名,1-10个字母、数字或下划线';
|
||||
$scope.tableForm["name"]='';
|
||||
$scope.tableForm["ip"]='';
|
||||
$scope.tableForm["port"]='';
|
||||
$scope.tableForm["user"]='';
|
||||
$scope.tableForm["password"]='';
|
||||
$scope.tableForm["databaseName"]='';
|
||||
$scope.tableForm["tableName"]='';
|
||||
$scope.tableForm["suffix"]='';
|
||||
|
||||
$scope.tableForm["startTime"]='';
|
||||
$scope.tableForm["endTime"]='';
|
||||
$scope.tableForm["contact"]='';
|
||||
$scope.tableForm["phone"]='';
|
||||
$scope.tableForm["isCreateGatherOracle"]=1;
|
||||
}
|
||||
|
||||
$scope.cancel = () => {
|
||||
|
|
@ -109,23 +121,36 @@ module Configs{
|
|||
if($scope.tableForm["suffix"]=='汇总生成新表的后缀名,1-10个字母、数字或下划线')
|
||||
$scope.tableForm["suffix"]='';
|
||||
|
||||
if($scope.tableForm["startTime"]=='开始时间,格式为yyyy-MM 例如：2018-02')
|
||||
$scope.tableForm["startTime"]='';
|
||||
if($scope.tableForm["endTime"]=='结束时间,格式为yyyy-MM 例如：2018-02')
|
||||
$scope.tableForm["endTime"]='';
|
||||
if($scope.tableForm["contact"]=='联系人')
|
||||
$scope.tableForm["contact"]='';
|
||||
if($scope.tableForm["phone"]=='联系方式')
|
||||
$scope.tableForm["phone"]='';
|
||||
|
||||
|
||||
|
||||
if($scope.validForm.$valid && $scope.validForm.$dirty){
|
||||
$scope.edit = false;
|
||||
$scope.add = false;
|
||||
oracleInfoOperate($http, "/java/console/api/oracle", OperateType.UPDATE, oracle, (result, status) => {
|
||||
$scope.add = false
|
||||
console.log(oracle);
|
||||
oracleInfoOperate($http, "/java/console/api/oracle", OperateType.UPDATE, oracle, (result, status) => {
|
||||
console.log(oracle);
|
||||
|
||||
if(status===200){
|
||||
$scope.model.updateOracleParam();
|
||||
}else{
|
||||
throw "资源请求失败";
|
||||
throw "资源请求失败";
|
||||
}
|
||||
});
|
||||
}else{
|
||||
$scope.submitted = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$scope.$on("editRow", (event, data) =>{
|
||||
$scope.$on("editRow", (event, data) =>{
|
||||
$scope.submitted = false;
|
||||
$scope.tableForm = deepCopy(data);
|
||||
$scope.edit = true;
|
||||
|
|
@ -146,5 +171,6 @@ module Configs{
|
|||
});
|
||||
//removeElementByValue($scope.model, data._id, "_id");
|
||||
});
|
||||
|
||||
}]);
|
||||
}
|
||||
|
|
@ -151,7 +151,7 @@ module Configs{
|
|||
}]);
|
||||
|
||||
export var SqlAddController = controller('SqlAddController', ['$scope', '$http', ($scope, $http) => {
|
||||
$scope.content = "";
|
||||
$scope.content = "";
|
||||
$scope.title = shareInit($scope.ngDialogData);
|
||||
$scope.sqlFileUpload = () =>{
|
||||
Configs.FileInputPlugin((file) =>{
|
||||
|
|
@ -284,7 +284,7 @@ module Configs{
|
|||
if($scope.checkboxItmes.indexOf(name) == -1)
|
||||
$scope.checkboxItmes.push(name)
|
||||
}
|
||||
else{
|
||||
else{
|
||||
for(var i= 0; i < $scope.checkboxItmes.length; i++){
|
||||
if($scope.checkboxItmes[i] === name){
|
||||
$scope.checkboxItmes.splice(i,1);
|
||||
|
|
@ -325,6 +325,87 @@ module Configs{
|
|||
}
|
||||
}]);
|
||||
|
||||
export var dataExportController = controller("dataExportController", ['$scope', '$http', 'DataModel', 'ConfigsModel', ($scope, $http, DataModel:Developer.DataModelService, ConfigsModel:Configs.ConfigsModelService ) => {
|
||||
$scope.model = DataModel;
|
||||
$scope.data = DataModel.data;
|
||||
|
||||
$scope.export = [{"type":1,"exportName":"原始数据"},{"type":2,"exportName":"汇总库"},{"type":3,"exportName":"标准表抽取脚本"}];
|
||||
|
||||
$scope.idList = [];
|
||||
$scope.typeList= [];
|
||||
$scope.flag = false;
|
||||
|
||||
$scope.ischeckedId = function(id){
|
||||
return $scope.idList.indexOf(id)>=0;
|
||||
}
|
||||
$scope.selectId = function(id, event){
|
||||
var action = event.target;
|
||||
if(action.checked){
|
||||
if($scope.idList.indexOf(id) == -1){
|
||||
$scope.idList.push(id);
|
||||
return $scope.idList;
|
||||
}
|
||||
}else{
|
||||
var idx = $scope.idList.indexOf(id);
|
||||
if(idx != -1){
|
||||
$scope.idList.splice(idx,1);
|
||||
return $scope.idList;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$scope.ischeckedType = function(type){
|
||||
return $scope.typeList.indexOf(type)>=0;
|
||||
}
|
||||
$scope.selectType = function(type, event){
|
||||
var action = event.target;
|
||||
if(action.checked){
|
||||
if($scope.typeList.indexOf(type) == -1){
|
||||
$scope.typeList.push(type);
|
||||
return $scope.typeList;
|
||||
}
|
||||
}else{
|
||||
var idx = $scope.typeList.indexOf(type);
|
||||
if(idx != -1){
|
||||
$scope.typeList.splice(idx,1);
|
||||
return $scope.typeList;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$scope.selectAll = function(flag){
|
||||
if($scope.flag){
|
||||
flag = false;
|
||||
angular.forEach($scope.data, function(item, index){
|
||||
$scope.idList.push(item.id);
|
||||
});
|
||||
return $scope.idList;
|
||||
}else{
|
||||
flag = true;
|
||||
$scope.idList = [];
|
||||
return $scope.idList;
|
||||
}
|
||||
}
|
||||
|
||||
$scope.cancel = () => {
|
||||
$scope.closeThisDialog();
|
||||
}
|
||||
|
||||
$scope.onsubmit = (idList , typeList) => {
|
||||
$http({
|
||||
url: "/oracle/exportData",
|
||||
method:'POST',
|
||||
data: idList,typeList,
|
||||
}).success(function(data,header,config,status){
|
||||
console.log(data + "__" + header);
|
||||
}).error(function(data,header,config,status){
|
||||
console.log("获取脚本内容失败");
|
||||
});
|
||||
|
||||
$scope.closeThisDialog();
|
||||
}
|
||||
}]);
|
||||
|
||||
function shareInit(ngDialogData) {
|
||||
var title = "";
|
||||
if(ngDialogData.type != 'undefined'){
|
||||
|
|
|
|||
|
|
@ -30,7 +30,8 @@ module Developer{
|
|||
if(extendValue.indexOf(key))
|
||||
result[key] = value;
|
||||
});
|
||||
|
||||
console.log(result);
|
||||
console.log("参数");
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -119,6 +120,8 @@ module Developer{
|
|||
|
||||
function formatTask(items:Array<any>){
|
||||
var result = [];
|
||||
console.log(items);
|
||||
console.log("items");
|
||||
angular.forEach(items, (item) => {
|
||||
var tmp_batch="";
|
||||
if(item.submittedBatch.indexOf("批次")==-1){
|
||||
|
|
@ -140,6 +143,8 @@ module Developer{
|
|||
}
|
||||
result.push(item);
|
||||
});
|
||||
// console.log(result);
|
||||
// console.log("formatTask");
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -168,8 +173,10 @@ module Developer{
|
|||
paramOptions.totalSize = data.length;
|
||||
paramOptions.totlePage = data.page.totlePage;
|
||||
}
|
||||
});
|
||||
return result;
|
||||
});
|
||||
console.log(result);
|
||||
console.log("getDataModel");
|
||||
return result;
|
||||
}
|
||||
|
||||
public initParamOptions(){
|
||||
|
|
|
|||
|
|
@ -13,12 +13,11 @@ module Developer {
|
|||
export var WorkspacesController = controller("WorkspacesController", ["$scope", "KubernetesModel", "DataModel", "ConfigsModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "$element", "ngDialog",
|
||||
($scope, KubernetesModel: Kubernetes.KubernetesModelService, DataModel:Developer.DataModelService, ConfigsModel:Configs.ConfigsModelService, KubernetesState, $templateCache:ng.ITemplateCacheService, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, $element, ngDialog) => {
|
||||
$scope.model=DataModel;
|
||||
$scope.replicasModel = KubernetesModel;
|
||||
|
||||
$scope.replicasModel = KubernetesModel;
|
||||
|
||||
$scope.options = DataModel.paramOptions;
|
||||
$scope.pageSizeChoses = DataModel.paramOptions.pagerSizeOption;
|
||||
var result = getDataType($location);
|
||||
|
||||
|
||||
$scope.treeOptions = {
|
||||
nodeChildren: "childNodes",
|
||||
|
|
@ -286,8 +285,12 @@ module Developer {
|
|||
}
|
||||
};
|
||||
|
||||
$scope.createOracleService = (items) =>{
|
||||
var exitedItems = Kubernetes.checkForCreateOracle($scope.model.transferTasks, items);
|
||||
$scope.createOracleService = (items) =>{
|
||||
console.log($scope.tableConfig.selectedItems);
|
||||
console.log("selected");
|
||||
var exitedItems = Kubernetes.checkForCreateOracle($scope.model.transferTasks, items);
|
||||
console.log(items);
|
||||
console.log(12313132);
|
||||
for (var i = 0; i < items.length; ++i) {
|
||||
// code...
|
||||
if(items[i].dataBaseType != 'ORACLE'){
|
||||
|
|
@ -319,7 +322,7 @@ module Developer {
|
|||
isTarget: "false",
|
||||
isExtract: item.extractStatus
|
||||
}, (rc) =>{
|
||||
Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", rc, 0);
|
||||
Kubernetes.connectOracle($http, $timeout, "/java/console/api/connectOracle", "create", rc, 50000000000);
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
class="btn btn-success pull-right sj_btn_grey"
|
||||
ng-click="extractOracle(id || tableConfig.selectedItems)">
|
||||
<i class="glyphicon glyphicon-cloud-download"></i> 抽取
|
||||
</button>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row sj_fluid">
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
module Kubernetes {
|
||||
|
||||
export var ReplicationControllers = controller("ReplicationControllers",
|
||||
["$scope", "KubernetesModel", "KubernetesReplicationControllers", "KubernetesPods", "ConfigsModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL",
|
||||
["$scope", "KubernetesModel", "KubernetesReplicationControllers", "KubernetesPods", "ConfigsModel", "KubernetesState", "$templateCache", "$location", "$routeParams", "$http", "$timeout", "KubernetesApiURL", "ngDialog",
|
||||
($scope, KubernetesModel: Kubernetes.KubernetesModelService, KubernetesReplicationControllers:ng.resource.IResourceClass<any>, KubernetesPods:ng.resource.IResourceClass<any>, ConfigsModel, KubernetesState,
|
||||
$templateCache, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL) => {
|
||||
$templateCache, $location:ng.ILocationService, $routeParams, $http, $timeout, KubernetesApiURL, ngDialog) => {
|
||||
|
||||
$scope.kubernetes = KubernetesState;
|
||||
$scope.configs = ConfigsModel;
|
||||
|
|
@ -295,5 +295,7 @@ module Kubernetes {
|
|||
}
|
||||
};
|
||||
|
||||
|
||||
|
||||
}]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,21 @@
|
|||
<i class="glyphicon glyphicon-export"></i> Excel导出
|
||||
</button>
|
||||
<span class="pull-right"> </span>
|
||||
<button class="sj_btn_green fl mr5" ng-click="upLoadExcelFile()">
|
||||
<button class="sj_btn_green mr5" ng-click="upLoadExcelFile()">
|
||||
<i class="glyphicon glyphicon-import"></i>Excel导入
|
||||
</button>
|
||||
</button>
|
||||
</div>
|
||||
<div class="row clear fr mb10">
|
||||
<!--<input type="checkbox" class="fl mr5 " style="margin-top: 8px;" />
|
||||
<label class="fl mr5 " style="margin-top: 5px; font-style:nomal;">全选</label>-->
|
||||
<button class="btn pull-right sj_btn_grey mr20" ng-click="downLoadExcelFile()">
|
||||
<i class="glyphicon glyphicon-export"></i> 导出日志查看
|
||||
</button>
|
||||
<span class="pull-right"> </span>
|
||||
<button class="sj_btn_green mr5" ng-click="dataManagementExport()">
|
||||
<i class="glyphicon glyphicon-export"></i> 导出
|
||||
</button>
|
||||
<span class="pull-right"> </span>
|
||||
</div>
|
||||
<div ng-show="true">
|
||||
<div class="col-md-12" >
|
||||
|
|
|
|||
|
|
@ -153,6 +153,19 @@ module System{
|
|||
});
|
||||
}
|
||||
|
||||
$scope.dataManagementExport = () => {
|
||||
ngDialog.open({
|
||||
template: 'dataExport.html',
|
||||
width: 1005,
|
||||
height:600,
|
||||
// data: {id : id},
|
||||
scope: $scope,
|
||||
className: 'ngdialog-theme-default',
|
||||
controller: 'Configs.dataExportController',
|
||||
closeByDocument : false
|
||||
});
|
||||
}
|
||||
|
||||
//boolean选择条件：是/否
|
||||
function booleanChoose(){
|
||||
return [{id: '是', title: '是'}, {id: '否', title: '否'}];
|
||||
|
|
|
|||
Loading…
Reference in New Issue