(1)修改app范围,基础协议范围

(2)app标签修改,新增不再提示用户是否保存
This commit is contained in:
wangxin
2018-08-27 15:40:54 +08:00
parent 7f5d27f90a
commit b723761f61
4 changed files with 11 additions and 10 deletions

View File

@@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity<SearchReport>{
private Integer functionId; private Integer functionId;
private String cfgName; private String cfgName;
private Integer action; private Integer action;
private String services;//service日志总量统计使用
private Integer reportType;//小时报,日报,月报 private Integer reportType;//小时报,日报,月报
//标签性质来文函号境内源Ip,各国目的IP运营商局点 //标签性质来文函号境内源Ip,各国目的IP运营商局点
private String reportBusinessType; private String reportBusinessType;
@@ -50,6 +51,13 @@ public class SearchReport extends BaseEntity<SearchReport>{
//界面查询的时间 //界面查询的时间
private String reportTime; private String reportTime;
public String getServices() {
return services;
}
public void setServices(String services) {
this.services = services;
}
/** /**
* reportStartTime * reportStartTime
* @return reportStartTime * @return reportStartTime

View File

@@ -58,7 +58,6 @@
} }
//wx提示c:if标签前加了//注释,c:if标签的判断条件仍会生效 //wx提示c:if标签前加了//注释,c:if标签的判断条件仍会生效
for(var i=0; i<nodes.length; i++) { for(var i=0; i<nodes.length; i++) {
console.log(nodes[i]);
//<c:if test="${checked && notAllowSelectParent}"> //<c:if test="${checked && notAllowSelectParent}">
if (nodes[i].isParent && "${checkedPS}"!=''){ if (nodes[i].isParent && "${checkedPS}"!=''){
continue; // 如果为复选框选择,并且父子节点有关联,则过滤掉父节点 continue; // 如果为复选框选择,并且父子节点有关联,则过滤掉父节点

View File

@@ -285,7 +285,7 @@
<div class="form-group cfgType specServiceCode"> <div class="form-group cfgType specServiceCode">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label> <label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/> <input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[300001,310000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
</div> </div>
<div for="specServiceCode"></div> <div for="specServiceCode"></div>
</div> </div>
@@ -294,7 +294,7 @@
<div class="form-group cfgType"> <div class="form-group cfgType">
<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label> <label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
<div class="col-md-4"> <div class="col-md-4">
<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/> <input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[10001,20000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
</div> </div>
<div for="specServiceCode"></div> <div for="specServiceCode"></div>
</div> </div>

View File

@@ -234,13 +234,7 @@
setTimeout(function(){zTree.editName(treeNode)}, 10); setTimeout(function(){zTree.editName(treeNode)}, 10);
return false; return false;
} }
if(confirm("<spring:message code='save' />" + treeNode.name + "?")){ return true;
return true;
}else{
setTimeout(function(){zTree.editName(treeNode)}, 10);
return false;
}
} }
function beforeRemove(treeId, treeNode, newName) { function beforeRemove(treeId, treeNode, newName) {
return confirm("<spring:message code='remove' /> " + treeNode.name + "?"); return confirm("<spring:message code='remove' /> " + treeNode.name + "?");