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 { @@ -12,6 +12,8 @@ public class DegradeConfig {
12 12
13 private String configName; 13 private String configName;
14 14
  15 + private String configShowName;
  16 +
15 private String configDesc; 17 private String configDesc;
16 18
17 private String level; 19 private String level;
@@ -12,6 +12,8 @@ public class DegradeInfoReq extends PageRequest { @@ -12,6 +12,8 @@ public class DegradeInfoReq extends PageRequest {
12 12
13 private String configName; 13 private String configName;
14 14
  15 + private String configShowName;
  16 +
15 private Integer level; 17 private Integer level;
16 18
17 private String switchOn; 19 private String switchOn;
@@ -9,11 +9,17 @@ @@ -9,11 +9,17 @@
9 <form class="form-horizontal" id="degradeInfoForm" name="degradeInfoForm"> 9 <form class="form-horizontal" id="degradeInfoForm" name="degradeInfoForm">
10 10
11 <div class="form-group"> 11 <div class="form-group">
12 - <label class="col-sm-2 control-label">配置名称：</label> 12 + <label class="col-sm-2 control-label">配置项：</label>
13 <div class="col-sm-8"> 13 <div class="col-sm-8">
14 <input type="text" class="form-control" id="configName" name="configName" maxlength="30" size="40" readonly="readonly"/> 14 <input type="text" class="form-control" id="configName" name="configName" maxlength="30" size="40" readonly="readonly"/>
15 </div> 15 </div>
16 </div> 16 </div>
  17 + <div class="form-group">
  18 + <label class="col-sm-2 control-label">配置名称：</label>
  19 + <div class="col-sm-8">
  20 + <input type="text" class="form-control" id="configShowName" name="configShowName" maxlength="30" size="40"/>
  21 + </div>
  22 + </div>
17 23
18 <div class="form-group"> 24 <div class="form-group">
19 <label class="col-sm-2 control-label">配置描述：</label> 25 <label class="col-sm-2 control-label">配置描述：</label>
@@ -57,6 +63,7 @@ @@ -57,6 +63,7 @@
57 <script> 63 <script>
58 $(function(){ 64 $(function(){
59 $("#degradeInfoForm #configName").val(paramObj.configName); 65 $("#degradeInfoForm #configName").val(paramObj.configName);
  66 + $("#degradeInfoForm #configShowName").val(paramObj.configShowName);
60 $("#degradeInfoForm #configDesc").val(paramObj.configDesc); 67 $("#degradeInfoForm #configDesc").val(paramObj.configDesc);
61 $("#degradeInfoForm #level").val(paramObj.level); 68 $("#degradeInfoForm #level").val(paramObj.level);
62 $("#degradeInfoForm #switchOn").val(paramObj.switchOn); 69 $("#degradeInfoForm #switchOn").val(paramObj.switchOn);
@@ -93,10 +93,14 @@ @@ -93,10 +93,14 @@
93 </select> 93 </select>
94 </div> 94 </div>
95 <div class="input-group" style="float: left;"> 95 <div class="input-group" style="float: left;">
96 - <span class="input-group-addon">配置名称：</span> 96 + <span class="input-group-addon">配置项：</span>
97 <input type="text" id="configName" name="configName" class="form-control" placeholder=""/> 97 <input type="text" id="configName" name="configName" class="form-control" placeholder=""/>
98 </div> 98 </div>
99 <div class="input-group" style="float: left;"> 99 <div class="input-group" style="float: left;">
  100 + <span class="input-group-addon">配置名称：</span>
  101 + <input type="text" id="configShowName" name="configShowName" class="form-control" placeholder=""/>
  102 + </div>
  103 + <div class="input-group" style="float: left;">
100 <span class="input-group-addon">级别：</span> 104 <span class="input-group-addon">级别：</span>
101 <select id="level" name="level" class="form-control"> 105 <select id="level" name="level" class="form-control">
102 <option value="">全部</option> 106 <option value="">全部</option>
@@ -135,17 +139,21 @@ @@ -135,17 +139,21 @@
135 return defaultLoadFilter(data); 139 return defaultLoadFilter(data);
136 }, 140 },
137 columns: [{ 141 columns: [{
138 - title: "配置名称",  
139 - width:"25%", 142 + title: "配置项",
  143 + width:"20%",
140 align:"left", 144 align:"left",
141 field: "configName" 145 field: "configName"
142 }, { 146 }, {
  147 + title: "配置名称",
  148 + width:"20%",
  149 + field: "configShowName"
  150 + }, {
143 title: "配置描述", 151 title: "配置描述",
144 - width:"35%", 152 + width:"30%",
145 field: "configDesc" 153 field: "configDesc"
146 }, { 154 }, {
147 title: "级别", 155 title: "级别",
148 - width:"10%", 156 + width:"5%",
149 field: "level", 157 field: "level",
150 formatter : function(value, rowData, rowIndex) { 158 formatter : function(value, rowData, rowIndex) {
151 if(value == 1){ 159 if(value == 1){
@@ -156,7 +164,7 @@ @@ -156,7 +164,7 @@
156 }, 164 },
157 }, { 165 }, {
158 title: "图片", 166 title: "图片",
159 - width:"10%", 167 + width:"5%",
160 field: "img" 168 field: "img"
161 }, { 169 }, {
162 title: "开关", 170 title: "开关",
@@ -189,6 +197,7 @@ @@ -189,6 +197,7 @@
189 function updateDegradeInfo(rowData){ 197 function updateDegradeInfo(rowData){
190 paramObj.id = rowData.id; 198 paramObj.id = rowData.id;
191 paramObj.configName = rowData.configName; 199 paramObj.configName = rowData.configName;
  200 + paramObj.configShowName = rowData.configShowName;
192 paramObj.configDesc = rowData.configDesc; 201 paramObj.configDesc = rowData.configDesc;
193 paramObj.level = rowData.level; 202 paramObj.level = rowData.level;
194 paramObj.switchOn = rowData.switchOn; 203 paramObj.switchOn = rowData.switchOn;
@@ -260,12 +269,14 @@ function updateDegradeInfo(rowData){ @@ -260,12 +269,14 @@ function updateDegradeInfo(rowData){
260 var level = $("#level").val();//=="0"?null:$("#level").val(); 269 var level = $("#level").val();//=="0"?null:$("#level").val();
261 var cloudType = $("#cloudType").val(); 270 var cloudType = $("#cloudType").val();
262 var configName=$("#configName").val(); 271 var configName=$("#configName").val();
  272 + var configShowName=$("#configShowName").val();
263 var switchOn= $("#switch").val();//=="0"?null:$("#switch").val(); 273 var switchOn= $("#switch").val();//=="0"?null:$("#switch").val();
264 274
265 $("#degradeInfoTable").table("load", { 275 $("#degradeInfoTable").table("load", {
266 'cloudType': cloudType, 276 'cloudType': cloudType,
267 'level': level , 277 'level': level ,
268 'configName': configName , 278 'configName': configName ,
  279 + 'configShowName': configShowName ,
269 'switchOn' : switchOn 280 'switchOn' : switchOn
270 }); 281 });
271 }); 282 });