更新内容:
①解决日期条件回传bug,
②列表序号下级菜单不参与主序号计算,下级序号以标识符隔开,标识符在配置中添加
③列表总条数按查询数据总数目计算
④菜单添加中英文
待处理:
①搜索结果页面条件查询表单重置时日期无法重置
This commit is contained in:
@@ -379,7 +379,7 @@ public class Page<T> {
|
|||||||
sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
|
sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
|
||||||
sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
|
sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
|
||||||
sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 页,");
|
sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 页,");
|
||||||
sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
|
sb.append("共 <span id='showTotalCount'>" + count + "</span> 条"+(message!=null?message:"")+"</a></li>\n");
|
||||||
|
|
||||||
sb.insert(0,"<ul>\n").append("</ul>\n");
|
sb.insert(0,"<ul>\n").append("</ul>\n");
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
|||||||
import com.nis.domain.BaseEntity;
|
import com.nis.domain.BaseEntity;
|
||||||
import com.nis.domain.SysMenu;
|
import com.nis.domain.SysMenu;
|
||||||
import com.nis.domain.SysUser;
|
import com.nis.domain.SysUser;
|
||||||
|
import com.nis.util.Configurations;
|
||||||
/**
|
/**
|
||||||
* 业务辅助表-业务字典信息表
|
* 业务辅助表-业务字典信息表
|
||||||
* @author zsl
|
* @author zsl
|
||||||
@@ -39,6 +40,8 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
|
|||||||
private Date editBeginDate; // 修改开始日期
|
private Date editBeginDate; // 修改开始日期
|
||||||
private Date editEndDate; // 修改结束日期
|
private Date editEndDate; // 修改结束日期
|
||||||
|
|
||||||
|
private String showSequence; //显示序号
|
||||||
|
|
||||||
|
|
||||||
public Integer getServiceDictId() {
|
public Integer getServiceDictId() {
|
||||||
return serviceDictId;
|
return serviceDictId;
|
||||||
@@ -150,6 +153,12 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
|
|||||||
public void setEditEndDate(Date editEndDate) {
|
public void setEditEndDate(Date editEndDate) {
|
||||||
this.editEndDate = editEndDate;
|
this.editEndDate = editEndDate;
|
||||||
}
|
}
|
||||||
|
public String getShowSequence() {
|
||||||
|
return showSequence;
|
||||||
|
}
|
||||||
|
public void setShowSequence(String showSequence) {
|
||||||
|
this.showSequence = showSequence;
|
||||||
|
}
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
|
public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
|
||||||
for (int i=0; i<sourcelist.size(); i++){
|
for (int i=0; i<sourcelist.size(); i++){
|
||||||
@@ -198,4 +207,35 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
|
|||||||
return listTemp.size();
|
return listTemp.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//处理下级序号
|
||||||
|
public static void addChildrenSeq(List<ServiceDictInfo> list,Integer parentId){
|
||||||
|
int countNo = 1;
|
||||||
|
for(int i=0; i<list.size(); i++){
|
||||||
|
ServiceDictInfo serviceDictInfo = list.get(i);
|
||||||
|
if(serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
|
||||||
|
&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
|
||||||
|
//找出该父类
|
||||||
|
for(ServiceDictInfo se:list){
|
||||||
|
if(se.getServiceDictId()==parentId){
|
||||||
|
serviceDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
|
||||||
|
countNo++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//继续获取子节点
|
||||||
|
for (int j=0; j<list.size(); j++){
|
||||||
|
ServiceDictInfo child = list.get(j);
|
||||||
|
if (child.getParent()!=null && child.getParent().getServiceDictId()!=null
|
||||||
|
&& child.getParent().getServiceDictId().equals(serviceDictInfo.getServiceDictId())){
|
||||||
|
addChildrenSeq(list, serviceDictInfo.getServiceDictId());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import java.util.List;
|
|||||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import com.nis.domain.BaseEntity;
|
import com.nis.domain.BaseEntity;
|
||||||
import com.nis.domain.SysUser;
|
import com.nis.domain.SysUser;
|
||||||
|
import com.nis.util.Configurations;
|
||||||
/**
|
/**
|
||||||
* 业务辅助表-系统字典信息表
|
* 业务辅助表-系统字典信息表
|
||||||
* @author zsl
|
* @author zsl
|
||||||
@@ -37,6 +38,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
|
|||||||
private Date editBeginDate; // 修改开始日期
|
private Date editBeginDate; // 修改开始日期
|
||||||
private Date editEndDate; // 修改结束日期
|
private Date editEndDate; // 修改结束日期
|
||||||
|
|
||||||
|
private String showSequence; //显示序号
|
||||||
|
|
||||||
|
|
||||||
public Integer getSysDictId() {
|
public Integer getSysDictId() {
|
||||||
@@ -147,7 +149,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
|
|||||||
public void setEditEndDate(Date editEndDate) {
|
public void setEditEndDate(Date editEndDate) {
|
||||||
this.editEndDate = editEndDate;
|
this.editEndDate = editEndDate;
|
||||||
}
|
}
|
||||||
|
public void setShowSequence(String showSequence) {
|
||||||
|
this.showSequence = showSequence;
|
||||||
|
}
|
||||||
|
public String getShowSequence() {
|
||||||
|
return showSequence;
|
||||||
|
}
|
||||||
@JsonIgnore
|
@JsonIgnore
|
||||||
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
|
public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
|
||||||
for (int i=0; i<sourcelist.size(); i++){
|
for (int i=0; i<sourcelist.size(); i++){
|
||||||
@@ -169,5 +176,33 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//处理下级序号
|
||||||
|
public static void addChildrenSeq(List<SysDictInfo> list,Integer parentId){
|
||||||
|
int countNo = 1;
|
||||||
|
for(int i=0; i<list.size(); i++){
|
||||||
|
SysDictInfo sysDictInfo = list.get(i);
|
||||||
|
if(sysDictInfo.getParent()!=null && sysDictInfo.getParent().getSysDictId()!=null
|
||||||
|
&& sysDictInfo.getParent().getSysDictId().equals(parentId)){
|
||||||
|
//找出该父类
|
||||||
|
for(SysDictInfo se:list){
|
||||||
|
if(se.getSysDictId()==parentId){
|
||||||
|
sysDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
|
||||||
|
countNo++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//继续获取子节点
|
||||||
|
for (int j=0; j<list.size(); j++){
|
||||||
|
SysDictInfo child = list.get(j);
|
||||||
|
if (child.getParent()!=null && child.getParent().getSysDictId()!=null
|
||||||
|
&& child.getParent().getSysDictId().equals(sysDictInfo.getSysDictId())){
|
||||||
|
addChildrenSeq(list, sysDictInfo.getSysDictId());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,7 @@ public class ServiceDictInfoController extends BaseController {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询业务辅助表-业务字典信息列表(无条件分页查询)
|
* 查询业务辅助表-业务字典信息列表(无条件分页查询)
|
||||||
|
* (修改内容:添加查询数据总数,添加原则:不得修改原对象引用参数,不得影响原分页参数page数据)
|
||||||
* @param serviceDictInfo
|
* @param serviceDictInfo
|
||||||
* @param request
|
* @param request
|
||||||
* @param response
|
* @param response
|
||||||
@@ -82,9 +83,16 @@ public class ServiceDictInfoController extends BaseController {
|
|||||||
model.addAttribute("selectedType", selectedType);
|
model.addAttribute("selectedType", selectedType);
|
||||||
serviceDictInfo.setItemType(selectedType);
|
serviceDictInfo.setItemType(selectedType);
|
||||||
}
|
}
|
||||||
|
//查询符合条件总数
|
||||||
|
List<ServiceDictInfo> showTotalCount = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
|
||||||
|
model.addAttribute("showTotalCount", showTotalCount.size());
|
||||||
|
|
||||||
//查出顶层分页数据
|
//查出顶层分页数据
|
||||||
Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
|
Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
|
||||||
|
//植入序号
|
||||||
|
for(int i=0;i<page.getList().size();i++){
|
||||||
|
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
|
||||||
|
}
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
//查出所有数据
|
//查出所有数据
|
||||||
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
|
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
|
||||||
@@ -99,7 +107,8 @@ public class ServiceDictInfoController extends BaseController {
|
|||||||
allList.addAll(page.getList());
|
allList.addAll(page.getList());
|
||||||
ServiceDictInfo.sortList(list,allList,0,true);
|
ServiceDictInfo.sortList(list,allList,0,true);
|
||||||
|
|
||||||
|
//处理下级序号
|
||||||
|
ServiceDictInfo.addChildrenSeq(list, 0);
|
||||||
model.addAttribute("itType", itType);
|
model.addAttribute("itType", itType);
|
||||||
model.addAttribute("intArr", Arrays.asList(intArr));
|
model.addAttribute("intArr", Arrays.asList(intArr));
|
||||||
model.addAttribute("list", list);
|
model.addAttribute("list", list);
|
||||||
@@ -156,9 +165,13 @@ public class ServiceDictInfoController extends BaseController {
|
|||||||
|
|
||||||
//先查出条件查询所有数据(注意顺序)
|
//先查出条件查询所有数据(注意顺序)
|
||||||
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
|
List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
|
||||||
|
model.addAttribute("showTotalCount", allList.size());
|
||||||
//查出条件查询顶层分页数据
|
//查出条件查询顶层分页数据
|
||||||
Page<ServiceDictInfo> page = serviceDictInfoService.findDictTopSearchList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
|
Page<ServiceDictInfo> page = serviceDictInfoService.findDictTopSearchList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
|
||||||
|
//植入序号
|
||||||
|
for(int i=0;i<page.getList().size();i++){
|
||||||
|
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
|
||||||
|
}
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
|
|
||||||
//处理数据,保留顶层中的所有下层数据
|
//处理数据,保留顶层中的所有下层数据
|
||||||
@@ -182,6 +195,8 @@ public class ServiceDictInfoController extends BaseController {
|
|||||||
|
|
||||||
allList.addAll(page.getList());
|
allList.addAll(page.getList());
|
||||||
ServiceDictInfo.sortList(list,allList,0,true);
|
ServiceDictInfo.sortList(list,allList,0,true);
|
||||||
|
//处理下级序号
|
||||||
|
ServiceDictInfo.addChildrenSeq(list, 0);
|
||||||
//serviceDictInfo.setItemType(selectedType);
|
//serviceDictInfo.setItemType(selectedType);
|
||||||
model.addAttribute("itType", itType);
|
model.addAttribute("itType", itType);
|
||||||
model.addAttribute("intArr", Arrays.asList(intArr));
|
model.addAttribute("intArr", Arrays.asList(intArr));
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
|||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import com.nis.domain.Page;
|
import com.nis.domain.Page;
|
||||||
|
import com.nis.domain.basics.ServiceDictInfo;
|
||||||
import com.nis.domain.basics.SysDictInfo;
|
import com.nis.domain.basics.SysDictInfo;
|
||||||
import com.nis.util.Configurations;
|
import com.nis.util.Configurations;
|
||||||
import com.nis.util.StringUtil;
|
import com.nis.util.StringUtil;
|
||||||
@@ -81,9 +82,16 @@ public class SysDictInfoController extends BaseController {
|
|||||||
model.addAttribute("selectedType", selectedType);
|
model.addAttribute("selectedType", selectedType);
|
||||||
sysDictInfo.setItemType(selectedType);
|
sysDictInfo.setItemType(selectedType);
|
||||||
}
|
}
|
||||||
|
//查询符合条件总数
|
||||||
|
List<SysDictInfo> showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
|
||||||
|
model.addAttribute("showTotalCount", showTotalCount.size());
|
||||||
|
|
||||||
//查出顶层分页数据
|
//查出顶层分页数据
|
||||||
Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
|
Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
|
||||||
|
//植入序号
|
||||||
|
for(int i=0;i<page.getList().size();i++){
|
||||||
|
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
|
||||||
|
}
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
//查出所有数据
|
//查出所有数据
|
||||||
List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
|
List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
|
||||||
@@ -98,6 +106,8 @@ public class SysDictInfoController extends BaseController {
|
|||||||
allList.addAll(page.getList());
|
allList.addAll(page.getList());
|
||||||
SysDictInfo.sortList(list,allList,0,true);
|
SysDictInfo.sortList(list,allList,0,true);
|
||||||
|
|
||||||
|
//处理下级序号
|
||||||
|
SysDictInfo.addChildrenSeq(list, 0);
|
||||||
model.addAttribute("itType", itType);
|
model.addAttribute("itType", itType);
|
||||||
model.addAttribute("intArr", Arrays.asList(intArr));
|
model.addAttribute("intArr", Arrays.asList(intArr));
|
||||||
model.addAttribute("list", list);
|
model.addAttribute("list", list);
|
||||||
@@ -152,9 +162,13 @@ public class SysDictInfoController extends BaseController {
|
|||||||
model.addAttribute("searchContent", searchContent);
|
model.addAttribute("searchContent", searchContent);
|
||||||
//先查出条件查询所有数据(注意顺序)
|
//先查出条件查询所有数据(注意顺序)
|
||||||
List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
|
List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
|
||||||
|
model.addAttribute("showTotalCount", allList.size());
|
||||||
//查出条件查询顶层分页数据
|
//查出条件查询顶层分页数据
|
||||||
Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
|
Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
|
||||||
|
//植入序号
|
||||||
|
for(int i=0;i<page.getList().size();i++){
|
||||||
|
page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
|
||||||
|
}
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
|
|
||||||
//处理数据,保留顶层中的所有下层数据
|
//处理数据,保留顶层中的所有下层数据
|
||||||
@@ -186,6 +200,9 @@ public class SysDictInfoController extends BaseController {
|
|||||||
allList.addAll(page.getList());
|
allList.addAll(page.getList());
|
||||||
SysDictInfo.sortList(list,allList,0,true);
|
SysDictInfo.sortList(list,allList,0,true);
|
||||||
|
|
||||||
|
|
||||||
|
//处理下级序号
|
||||||
|
SysDictInfo.addChildrenSeq(list, 0);
|
||||||
/*for(int i=list.size()-1;i>=0;i--){
|
/*for(int i=list.size()-1;i>=0;i--){
|
||||||
SysDictInfo se = list.get(i);
|
SysDictInfo se = list.get(i);
|
||||||
System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
|
System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
|
||||||
|
|||||||
@@ -471,5 +471,6 @@ public class ServiceDictInfoService extends BaseService{
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,11 @@ dns_monitor=dns monitor
|
|||||||
basic_configuration=basic configuration
|
basic_configuration=basic configuration
|
||||||
letter_from=letter from
|
letter_from=letter from
|
||||||
classification=classification
|
classification=classification
|
||||||
|
classification_manage=classification_manage
|
||||||
|
attribute_manage=attribute_manage
|
||||||
|
area_manage=area_manage
|
||||||
|
isp_manage=isp_manage
|
||||||
|
feature_scope_manage=feature_scope_manage
|
||||||
special_tasks=special tasks
|
special_tasks=special tasks
|
||||||
label_manage=label manage
|
label_manage=label manage
|
||||||
protect_list=protect list
|
protect_list=protect list
|
||||||
|
|||||||
@@ -44,6 +44,11 @@ dns_monitor=DNS\u7ba1\u63a7
|
|||||||
basic_configuration=\u57fa\u672c\u914d\u7f6e
|
basic_configuration=\u57fa\u672c\u914d\u7f6e
|
||||||
letter_from=\u6765\u51fd\u5355\u4f4d
|
letter_from=\u6765\u51fd\u5355\u4f4d
|
||||||
classification=\u5206\u7c7b\u6027\u8d28
|
classification=\u5206\u7c7b\u6027\u8d28
|
||||||
|
classification_manage=\u5206\u7c7b\u7ba1\u7406
|
||||||
|
attribute_manage=\u6027\u8d28\u7ba1\u7406
|
||||||
|
area_manage=\u5730\u57df\u7ba1\u7406
|
||||||
|
isp_manage=\u8fd0\u8425\u5546\u7ba1\u7406
|
||||||
|
feature_scope_manage=\u7279\u5f81\u4f5c\u7528\u57df\u7ba1\u7406
|
||||||
special_tasks=\u4e13\u9879\u4efb\u52a1
|
special_tasks=\u4e13\u9879\u4efb\u52a1
|
||||||
label_manage=\u6807\u7b7e\u7ba1\u7406
|
label_manage=\u6807\u7b7e\u7ba1\u7406
|
||||||
protect_list=\u4fdd\u62a4\u540d\u5355
|
protect_list=\u4fdd\u62a4\u540d\u5355
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ adminPath=/nis
|
|||||||
servicePath=/service
|
servicePath=/service
|
||||||
|
|
||||||
#\u5206\u9875\u914d\u7f6e
|
#\u5206\u9875\u914d\u7f6e
|
||||||
page.pageSize=5
|
page.pageSize=20
|
||||||
#\u5206\u9875\u914d\u7f6e
|
#\u5206\u9875\u914d\u7f6e
|
||||||
page.count=0
|
page.count=0
|
||||||
|
|
||||||
@@ -235,5 +235,7 @@ jdbc.hive.AName=xa_dfbhit_hive
|
|||||||
jdbc.hive.BName=xa_z2_mesalog_hive
|
jdbc.hive.BName=xa_z2_mesalog_hive
|
||||||
|
|
||||||
maxPageSize=100000
|
maxPageSize=100000
|
||||||
|
#允许配置最大层级
|
||||||
maxLevelNo=4
|
maxLevelNo=4
|
||||||
|
#上下级显示间隔标识符
|
||||||
|
childrenMark=.
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>配置信息</title>
|
<title>配置信息</title>
|
||||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@@ -68,7 +68,9 @@
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
|
//设定显示总条数
|
||||||
|
$("#showTotalCount").text('${showTotalCount}');
|
||||||
//设定selected,设定name 设定value
|
//设定selected,设定name 设定value
|
||||||
|
|
||||||
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
||||||
@@ -211,14 +213,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<label>到</label>
|
<label>到</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -268,7 +270,7 @@
|
|||||||
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
||||||
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
||||||
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
||||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
<td>${serviceDictInfo.showSequence}</td>
|
||||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
||||||
<td>${serviceDictInfo.itemValue}</td>
|
<td>${serviceDictInfo.itemValue}</td>
|
||||||
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>配置信息</title>
|
<title>配置信息</title>
|
||||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
|
|
||||||
//设定显示总条数
|
//设定显示总条数
|
||||||
//$("#showTotalCount").text();
|
$("#showTotalCount").text('${showTotalCount}');
|
||||||
//设定selected,设定name 设定value
|
//设定selected,设定name 设定value
|
||||||
|
|
||||||
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
||||||
@@ -213,14 +213,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<label>到</label>
|
<label>到</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -270,7 +270,7 @@
|
|||||||
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
|
||||||
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
|
||||||
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
|
||||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
<td>${serviceDictInfo.showSequence}</td>
|
||||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
|
||||||
<td>${serviceDictInfo.itemValue}</td>
|
<td>${serviceDictInfo.itemValue}</td>
|
||||||
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>配置信息</title>
|
<title>配置信息</title>
|
||||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
//设定显示总条数
|
//设定显示总条数
|
||||||
//$("#showTotalCount").text();
|
$("#showTotalCount").text('${showTotalCount}');
|
||||||
//设定selected,设定name 设定value
|
//设定selected,设定name 设定value
|
||||||
|
|
||||||
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
|
||||||
@@ -211,14 +211,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<label>到</label>
|
<label>到</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -268,7 +268,7 @@
|
|||||||
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
||||||
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
||||||
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
||||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
<td>${sysDictInfo.showSequence}</td>
|
||||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
||||||
<td>${sysDictInfo.itemValue}</td>
|
<td>${sysDictInfo.itemValue}</td>
|
||||||
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<head>
|
<head>
|
||||||
<title>配置信息</title>
|
<title>配置信息</title>
|
||||||
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
<link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
|
||||||
<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
|
<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
|
||||||
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
|
||||||
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
@@ -74,7 +74,7 @@
|
|||||||
}
|
}
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
//设定显示总条数
|
//设定显示总条数
|
||||||
//$("#showTotalCount").text();
|
$("#showTotalCount").text('${showTotalCount}');
|
||||||
//设定selected,设定name 设定value
|
//设定selected,设定name 设定value
|
||||||
|
|
||||||
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
|
||||||
@@ -216,14 +216,14 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<label>到</label>
|
<label>到</label>
|
||||||
</div>
|
</div>
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
<input id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
|
||||||
value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -273,7 +273,7 @@
|
|||||||
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
|
||||||
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
|
||||||
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
|
||||||
<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
|
<td>${sysDictInfo.showSequence}</td>
|
||||||
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
|
||||||
<td>${sysDictInfo.itemValue}</td>
|
<td>${sysDictInfo.itemValue}</td>
|
||||||
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
|
||||||
|
|||||||
Reference in New Issue
Block a user