ops / monitor-ui · Commits

Go to a project

Authored by zhaoqi
Commit 5968ca424f2b286558e661246eb52be1305b86dd 2 parents d18392dd d6516621

Merge branch 'dev_degrade'

Inline Side-by-side
Showing 4 changed files with 29 additions and 7 deletions
... ... @@ -12,6 +12,8 @@ public class DegradeConfig {
private String configName;
private String configShowName;
private String configDesc;
private String level;
... ...
... ... @@ -12,6 +12,8 @@ public class DegradeInfoReq extends PageRequest {
private String configName;
private String configShowName;
private Integer level;
private String switchOn;
... ...
... ... @@ -9,11 +9,17 @@
<form class="form-horizontal" id="degradeInfoForm" name="degradeInfoForm">
<div class="form-group">
<label class="col-sm-2 control-label">配置名称：</label>
<label class="col-sm-2 control-label">配置项：</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="configName" name="configName" maxlength="30" size="40" readonly="readonly"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">配置名称：</label>
<div class="col-sm-8">
<input type="text" class="form-control" id="configShowName" name="configShowName" maxlength="30" size="40"/>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label">配置描述：</label>
... ... @@ -57,6 +63,7 @@
<script>
$(function(){
$("#degradeInfoForm #configName").val(paramObj.configName);
$("#degradeInfoForm #configShowName").val(paramObj.configShowName);
$("#degradeInfoForm #configDesc").val(paramObj.configDesc);
$("#degradeInfoForm #level").val(paramObj.level);
$("#degradeInfoForm #switchOn").val(paramObj.switchOn);
... ...
... ... @@ -93,10 +93,14 @@
</select>
</div>
<div class="input-group" style="float: left;">
<span class="input-group-addon">配置名称：</span>
<span class="input-group-addon">配置项：</span>
<input type="text" id="configName" name="configName" class="form-control" placeholder=""/>
</div>
<div class="input-group" style="float: left;">
<span class="input-group-addon">配置名称：</span>
<input type="text" id="configShowName" name="configShowName" class="form-control" placeholder=""/>
</div>
<div class="input-group" style="float: left;">
<span class="input-group-addon">级别：</span>
<select id="level" name="level" class="form-control">
<option value="">全部</option>
... ... @@ -135,17 +139,21 @@
return defaultLoadFilter(data);
},
columns: [{
title: "配置名称",
width:"25%",
title: "配置项",
width:"20%",
align:"left",
field: "configName"
}, {
title: "配置名称",
width:"20%",
field: "configShowName"
}, {
title: "配置描述",
width:"35%",
width:"30%",
field: "configDesc"
}, {
title: "级别",
width:"10%",
width:"5%",
field: "level",
formatter : function(value, rowData, rowIndex) {
if(value == 1){
... ... @@ -156,7 +164,7 @@
},
}, {
title: "图片",
width:"10%",
width:"5%",
field: "img"
}, {
title: "开关",
... ... @@ -189,6 +197,7 @@
function updateDegradeInfo(rowData){
paramObj.id = rowData.id;
paramObj.configName = rowData.configName;
paramObj.configShowName = rowData.configShowName;
paramObj.configDesc = rowData.configDesc;
paramObj.level = rowData.level;
paramObj.switchOn = rowData.switchOn;
... ... @@ -260,12 +269,14 @@ function updateDegradeInfo(rowData){
var level = $("#level").val();//=="0"?null:$("#level").val();
var cloudType = $("#cloudType").val();
var configName=$("#configName").val();
var configShowName=$("#configShowName").val();
var switchOn= $("#switch").val();//=="0"?null:$("#switch").val();
$("#degradeInfoTable").table("load", {
'cloudType': cloudType,
'level': level ,
'configName': configName ,
'configShowName': configShowName ,
'switchOn' : switchOn
});
});
... ...