gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
zhangshilin
2018-03-08 19:20:46 +08:00
parent c0472494ec 43de1a2b12
commit fb383e8cf1
10 changed files with 266 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/domain/BaseEntity.java
View File

@@ -58,6 +58,14 @@ public abstract class BaseEntity<T> implements Serializable {
*/ */
protected boolean isNewRecord = false; protected boolean isNewRecord = false;
/**
* 筛选搜索框展开状态
*/
protected boolean isFilterAction = false;
public BaseEntity() { public BaseEntity() {
} }
@@ -164,5 +172,15 @@ public abstract class BaseEntity<T> implements Serializable {
} }
public void setIsFilterAction(boolean isFilterAction) {
this.isFilterAction = isFilterAction;
}
@JsonIgnore
public boolean getIsFilterAction() {
return isFilterAction;
}
} }

303
src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml
View File

@@ -1,303 +0,0 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.nis.web.dao.configuration.ServiceDictInfoDao" >
<resultMap id="dictResultMap" type="com.nis.domain.configuration.ServiceDictInfo" >
<id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
<result column="item_type" property="itemType" jdbcType="INTEGER" />
<result column="item_code" property="itemCode" jdbcType="INTEGER" />
<result column="item_value" property="itemValue" jdbcType="VARCHAR" />
<result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
<result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
<!-- 父id -->
<association property="parent" javaType="com.nis.domain.configuration.ServiceDictInfo">
<id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
<result column="item_type" property="itemType" jdbcType="INTEGER" />
<result column="item_code" property="itemCode" jdbcType="INTEGER" />
<result column="item_value" property="itemValue" jdbcType="VARCHAR" />
<result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
</association>
<!-- 创建人员 -->
<association property="serviceDictCreator" javaType="com.nis.domain.SysUser">
<id property="id" column="id"/>
<result property="loginId" column="login_id"/>
<result property="name" column="name"/>
</association>
<!-- 修改人员 -->
<association property="serviceDictEditor" javaType="com.nis.domain.SysUser">
<id property="id" column="id"/>
<result property="loginId" column="login_id"/>
<result property="name" column="name"/>
</association>
</resultMap>
<resultMap id="dictResultSimpleMap" type="com.nis.domain.configuration.ServiceDictInfo" >
<id column="service_dict_id" property="serviceDictId" jdbcType="INTEGER" />
<result column="item_type" property="itemType" jdbcType="INTEGER" />
<result column="item_code" property="itemCode" jdbcType="INTEGER" />
<result column="item_value" property="itemValue" jdbcType="VARCHAR" />
<result column="item_desc" property="itemDesc" jdbcType="VARCHAR" />
<result column="is_leaf" property="isLeaf" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" jdbcType="INTEGER" />
</resultMap>
<sql id="serviceDictInfoColumns">
s.service_dict_id AS serviceDictId,
s.item_type AS itemType,
s.item_code AS itemCode,
s.item_value AS itemValue,
s.item_desc AS itemDesc,
s.parent_id AS "parent.serviceDictId",
s.is_leaf AS isLeaf,
s.is_valid AS isValid,
s.creator_id AS "serviceDictCreator.id",
s.create_time AS createTime,
s.editor_id AS "serviceDictEditor.id",
s.edit_time AS editTime
</sql>
<sql id="serviceDictInfoColumnsSimple">
s.service_dict_id AS serviceDictId,
s.item_type AS itemType,
s.item_code AS itemCode,
s.item_value AS itemValue,
s.item_desc AS itemDesc,
s.is_leaf AS isLeaf,
s.is_valid AS isValid
</sql>
<!-- 查询顶层分页列表 (==)-->
<select id="findTopDictList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
SELECT * FROM service_dict_info WHERE is_valid=1 AND parent_id = 0
<if test="itemValue != null and itemValue != '' " >
AND item_value like '%${itemValue}%'
</if>
<if test="itemCode != null and itemCode != '' " >
AND item_code like '%${itemCode}%'
</if>
<if test="itemType != null and itemType != '' " >
AND item_type = #{itemType}
</if>
<if test="beginDate !=null" >
AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
</if>
<if test="endDate !=null" >
AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
</if>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY create_time desc
</otherwise>
</choose>
</select>
<!-- 查询顶层分页列表 (!=)-->
<select id="findTopDictListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
SELECT * FROM service_dict_info WHERE is_valid=1 AND parent_id = 0
<if test="itemValue != null and itemValue != '' " >
AND item_value like '%${itemValue}%'
</if>
<if test="itemCode != null and itemCode != '' " >
AND item_code like '%${itemCode}%'
</if>
<if test="itemType != null and itemType != '' " >
AND item_type != #{itemType}
</if>
<if test="beginDate !=null" >
AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
</if>
<if test="endDate !=null" >
AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
</if>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY create_time desc
</otherwise>
</choose>
</select>
<!-- 查出所有 -->
<select id="findAllDictList" resultType="serviceDictInfo">
SELECT
<include refid="serviceDictInfoColumns"/>
FROM service_dict_info s
<include refid="menuJoins"/>
WHERE s.is_valid =1
</select>
<!-- 查询所有非叶子配置 -->
<select id="findAllNoLeafDictList" resultType="com.nis.domain.configuration.ServiceDictInfo" parameterType="java.lang.Integer">
SELECT
<include refid="serviceDictInfoColumns"/>
FROM service_dict_info s
WHERE s.is_valid = 1 AND s.is_leaf = 0 AND item_type = #{itemType}
</select>
<!-- 条件查询分页(==) -->
<select id="findDictSearchList" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
SELECT * FROM service_dict_info WHERE is_valid=1
<if test="itemType != null and itemType != '' " >
AND item_type like '%${itemType}%'
</if>
<if test="itemCode != null and itemCode != '' " >
AND item_code like '%${itemCode}%'
</if>
<if test="itemValue!= null and itemValue != '' " >
AND item_value like '%${itemValue}%'
</if>
<if test="beginDate !=null" >
AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
</if>
<if test="endDate !=null" >
AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
</if>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY create_time desc
</otherwise>
</choose>
</select>
<!-- 条件查询分页(!=) -->
<select id="findDictSearchListN" resultMap="dictResultMap" parameterType="com.nis.domain.configuration.ServiceDictInfo">
SELECT * FROM service_dict_info WHERE is_valid=1
<if test="itemCode != null and itemCode != '' " >
AND item_code like '%${itemCode}%'
</if>
<if test="itemValue!= null and itemValue != '' " >
AND item_value like '%${itemValue}%'
</if>
<if test="itemType != null and itemType != '' " >
AND item_type != ${itemType}
</if>
<if test="beginDate !=null" >
AND create_time &gt;= #{beginDate,jdbcType=TIMESTAMP}
</if>
<if test="endDate !=null" >
AND create_time &lt;= DATE_ADD(#{endDate,jdbcType=TIMESTAMP},INTERVAL 1 DAY)
</if>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY create_time desc
</otherwise>
</choose>
</select>
<!-- 根据主键查询字典详细信息 -->
<select id="getDictById" resultType="com.nis.domain.configuration.ServiceDictInfo">
select
<include refid="serviceDictInfoColumns"/>
from service_dict_info s where s.service_dict_id = #{serviceDictId}
</select>
<!-- 根据上级id选出所有下级 -->
<select id="getDictByParentId" resultMap="dictResultMap">
select *
from service_dict_info s where parent_id = #{parentId}
</select>
<!-- 根据itemCode查询字典对象列表 -->
<select id="findByItemCode" resultType="com.nis.domain.configuration.ServiceDictInfo">
select
<include refid="serviceDictInfoColumns"/>
from service_dict_info s where s.item_code = #{itemCode}
</select>
<!-- 新增字典信息 -->
<insert id="insertDict" parameterType="com.nis.domain.configuration.ServiceDictInfo" useGeneratedKeys="true" keyProperty="id" >
insert into service_dict_info (item_type, item_code, item_value, item_desc, parent_id, is_leaf, is_valid, creator_id, create_time, editor_id, edit_time)
values ( #{itemType,jdbcType=INTEGER}, #{itemCode,jdbcType=INTEGER},
#{itemValue,jdbcType=VARCHAR}, #{itemDesc,jdbcType=VARCHAR},
#{parent.serviceDictId,jdbcType=INTEGER}, #{isLeaf,jdbcType=INTEGER}, #{isValid,jdbcType=INTEGER},
#{serviceDictCreator.id,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{serviceDictEditor.id,jdbcType=INTEGER}, #{editTime,jdbcType=TIMESTAMP})
</insert>
<!-- 修改 -->
<update id="update">
UPDATE service_dict_info s SET
s.service_dict_id = #{serviceDictId},
s.item_type = #{itemType},
s.item_code = #{itemCode},
s.item_value = #{itemValue},
s.item_desc = #{itemDesc},
s.parent_id = #{parent.serviceDictId},
s.is_leaf = #{isLeaf},
s.creator_id = #{serviceDictCreator.id},
s.editor_id = #{serviceDictEditor.id},
s.edit_time = #{editTime}
WHERE s.service_dict_id = #{serviceDictId}
</update>
<!-- 删除 -->
<update id="delete">
UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId}
</update>
<select id="findItemDict" resultMap="dictResultSimpleMap">
select
<include refid="serviceDictInfoColumnsSimple" />
from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid};
</select>
<select id="findAllItemDict" resultMap="dictResultSimpleMap">
select
<include refid="serviceDictInfoColumnsSimple" />
from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType};
</select>
<sql id="menuJoins">
LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id
</sql>
</mapper>

1
src/main/java/com/nis/web/dao/systemService/SystemServiceInfoDao.xml
View File

@@ -53,6 +53,7 @@
<if test="serviceIdPre != null"> <if test="serviceIdPre != null">
and service_id like concat(#{serviceIdPre}, '%') and service_id like concat(#{serviceIdPre}, '%')
</if> </if>
order by ssi.service_id asc
</select> </select>
<select id="get" resultMap="systemServiceInfoMap"> <select id="get" resultMap="systemServiceInfoMap">

189
src/main/webapp/WEB-INF/views/cfg/requestList.jsp
View File

@@ -10,67 +10,167 @@
<div class="page-content"> <div class="page-content">
<div class="theme-panel hidden-xs hidden-sm"> <div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/request/list'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary" <button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/request/form'"><spring:message code="add"></spring:message></button> onClick="javascript:window.location='${ctx}/cfg/request/form'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message><spring:message code="requestInfo"></spring:message></button>
</div> </div>
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="requestInfo"></spring:message> <spring:message code="requestInfo"></spring:message>
<small><spring:message code="date_list"/></small>
</h3> </h3>
<h5 class="page-header"></h5>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="portlet box blue"> <div class="portlet">
<div class="portlet-title">
<div class="caption">
<i class="fa fa-cogs"></i><spring:message code="date_list"/>
</div>
</div>
<div class="portlet-body"> <div class="portlet-body">
<div class="row" > <div class="row" >
<form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="form-search"> <form:form id="searchForm" modelAttribute="requestInfo" action="${ctx}/cfg/request/list" method="post" class="form-search">
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/> <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/> <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${requestInfo.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<spring:message code="state"/> : <form:select path="isAudit" class="select2">
<form:option value=""><spring:message code="select"></spring:message></form:option> <div class="pull-left">
<form:select path="isAudit" class="selectpicker select2 input-small" >
<form:option value="">所有状态</form:option>
<form:option value="0"><spring:message code="created"></spring:message></form:option> <form:option value="0"><spring:message code="created"></spring:message></form:option>
<form:option value="1"><spring:message code="approved"></spring:message></form:option> <form:option value="1"><spring:message code="approved"></spring:message></form:option>
</form:select> </form:select>
</div>
<select id="seltype"> <div class="pull-left">
<option value=""><spring:message code="select"></spring:message></option> <div class="input-group">
<div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-small" >
<option value="requestTitle"><spring:message code="title"></spring:message></option> <option value="requestTitle"><spring:message code="title"></spring:message></option>
<option value="requestNumber"><spring:message code="request_number"></spring:message></option> <option value="requestNumber"><spring:message code="request_number"></spring:message></option>
<option value="requestContent"><spring:message code="content"></spring:message></option> <option value="requestContent"><spring:message code="content"></spring:message></option>
</select> <input id="intype"> </select>
<form:select path="timeType">
<form:option value=""><spring:message code="select"></spring:message></form:option>
<form:option value="requestTime"><spring:message code="request_time"></spring:message></form:option>
<form:option value="createTime"><spring:message code="operate_time"></spring:message></form:option>
</form:select>
<spring:message code="begin_date"></spring:message> : <input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<spring:message code="end_date"></spring:message> : <input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="input-medium Wdate"
value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
<button type="button" class="btn btn-default btn-sm" onclick="return page()">
<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
</button>
</div> </div>
<input id="intype" class="form-control input-medium" placeholder="请输入标题" type="text">
<div class="input-group-btn">
<button class="btn btn-default btn-search" type="button" onclick="page()"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn btn-default" id="filter-btn"> 筛选 <i class="fa fa-angle-double-down"></i></button>
</div>
<div class="pull-right">
<button type="button" class="btn btn-default">
<i class="fa fa-edit"></i> 编辑</button>
<button type="button" class="btn btn-default">
<i class="fa fa-trash"></i> 删除</button>
<!-- <button type="button" class="btn btn-default">
<i class="fa fa-download"></i> 导出</button> -->
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<i class="fa fa-wrench"></i> 审核
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<li><a href="javascript:void(0);" onclick="passOpt()"><i class="fa fa-check"></i> 通过</a></li>
<li><a href="javascript:void(0);" onclick="noPassOpt()"><i class="fa fa-remove"></i> 未通过</a></li>
<li><a href="javascript:void(0);" onclick="cancelPassOpt()"><i class="fa fa-undo"></i> 配置取消</a></li>
</ul>
</div>
<a class="btn btn-icon-only btn-default setfields tooltips"
data-container="body" data-placement="top" data-original-title="自定义列字段" href="javascript:;">
<i class="icon-wrench"></i>
</a>
</div>
</div>
<!-- /搜索内容与操作按钮栏-->
<!-- 筛选搜索内容栏默认隐藏-->
<div class="col-md-12 filter-action-select-panle hide" >
<div class="row">
<div class="col-md-6">
<div class="pull-left">
<label>来函时间：</label>
</div>
<div class="pull-left">
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<label>到</label>
</div>
<div class="pull-left">
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
<div class="col-md-6">
<div class="pull-left">
<label>操作时间：</label>
</div>
<div class="pull-left">
<input id="beginDate" name="beginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
value="<fmt:formatDate value="${requestInfo.beginDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
<div class="pull-left">
<label>到</label>
</div>
<div class="pull-left">
<input id="endDate" name="endDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
value="<fmt:formatDate value="${requestInfo.endDate}" pattern="yyyy-MM-dd"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/>
</div>
</div>
</div>
<h5 class="page-header"></h5>
<div class="row">
<div class="pull-left">
<button type="button" class="btn blue" onclick="page()"> <i class="fa fa-search"></i> 搜索 </button>
<button type="button" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> 重置 </button>
</div>
</div>
</div>
<!-- /筛选搜索内容栏 结束-->
</form:form> </form:form>
</div> </div>
<!-- <div class="table-responsive"> --> <!-- <div class="table-responsive"> -->
<sys:message content="${message}"/> <sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed"> <table id="contentTable" class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" class="ckboxs"></th>
<th><spring:message code="seq"></spring:message></th> <th><spring:message code="seq"></spring:message></th>
<th><spring:message code="request_number"></spring:message></th> <th><spring:message code="request_number"></spring:message></th>
<th><spring:message code="request_organization"></spring:message></th> <th><spring:message code="request_organization"></spring:message></th>
@@ -87,6 +187,7 @@
<tbody> <tbody>
<c:forEach items="${page.list}" var="requestInfo"> <c:forEach items="${page.list}" var="requestInfo">
<tr> <tr>
<td><input type="checkbox" class="ckbox"></td>
<td>${requestInfo.id }</td> <td>${requestInfo.id }</td>
<td>${requestInfo.requestNumber }</td> <td>${requestInfo.requestNumber }</td>
<td>${requestInfo.requestOrg }</td> <td>${requestInfo.requestOrg }</td>
@@ -114,7 +215,7 @@
<td>${requestInfo.requestContent }</td> <td>${requestInfo.requestContent }</td>
<td>${requestInfo.taskName }</td> <td>${requestInfo.taskName }</td>
<td> <td>
<div class="btn-group btn-xs"> <%-- <div class="btn-group btn-xs">
<a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a> <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
<ul class="dropdown-menu btn-xs"> <ul class="dropdown-menu btn-xs">
<!-- 审核未通过可修改 --> <!-- 审核未通过可修改 -->
@@ -135,7 +236,7 @@
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>
</ul> </ul>
</div> </div> --%>
</td> </td>
</tr> </tr>
</c:forEach> </c:forEach>
@@ -152,8 +253,25 @@
<script> <script>
$(document).ready(function() { $(document).ready(function() {
//筛选功能初始化
filterActionInit();
$("#isAudit").change(function(){
page();
});
$("#seltype").change(function(){
$("#intype").attr("placeholder","请输入"+$(this).find("option:selected").text());
});
}); });
function reset(){
$("#searchForm").reset();
}
//查询 //查询
function page(n,s){ function page(n,s){
$("#intype").attr("name",$("#seltype").val()); $("#intype").attr("name",$("#seltype").val());
@@ -166,19 +284,6 @@
} }
</script> </script>
<style>
.input-medium {
width: 200px !important;
}
.Wdate {
border: #c2cad8 1px solid;
height: 26px;
}
.dropdown-menu {
min-width: 50px;
}
</style>
</body> </body>
</html> </html>

6
src/main/webapp/WEB-INF/views/login.jsp
View File

@@ -109,7 +109,7 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/scripts/jeesite.js" type="text/javascript"></script>
<!-- END CORE PLUGINS --> <!-- END CORE PLUGINS -->
<!-- BEGIN THEME GLOBAL SCRIPTS --> <!-- BEGIN THEME GLOBAL SCRIPTS -->
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script> <script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
@@ -139,8 +139,8 @@
// 如果在框架或在对话框中，则弹出提示并跳转到首页 // 如果在框架或在对话框中，则弹出提示并跳转到首页
if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){
alert("<spring:message code='login_timeout'/>"); alertx("<spring:message code='login_timeout'/>");
top.location = "${pageContext.request.contextPath }"; window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000);
} }

3
src/main/webapp/WEB-INF/views/systemService/form.jsp
View File

@@ -60,6 +60,7 @@
if (flag) { if (flag) {
loading('LOADING...'); loading('LOADING...');
$("[disabled=disabled]").attr("disabled", false); $("[disabled=disabled]").attr("disabled", false);
$("#submitBtn").attr("disabled", true);//防止重复提交
form.submit(); form.submit();
} else { } else {
flag = true; flag = true;
@@ -324,7 +325,7 @@
<div class="form-actions"> <div class="form-actions">
<div class="row"> <div class="row">
<div class="col-md-offset-3 col-md-9"> <div class="col-md-offset-3 col-md-9">
<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>></shiro:hasPermission> <shiro:hasPermission name="system:service:edit"><input id="submitBtn" type="submit" class="btn btn-circle blue" value=<spring:message code="submit"></spring:message>></shiro:hasPermission>
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button> <button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)"><spring:message code="cancel"></spring:message></button>
</div> </div>
</div> </div>

22
src/main/webapp/static/global/css/components.css
View File

@@ -21532,3 +21532,25 @@ Color library demo
.mt-cookie-consent-bar.mt-cookie-consent-bar-light { .mt-cookie-consent-bar.mt-cookie-consent-bar-light {
background: rgba(238, 238, 238, 0.9); background: rgba(238, 238, 238, 0.9);
color: #333; } color: #333; }
.form-search .pull-left {
float: left !important;
margin-right: 5px;
}
.filter-action-select-panle {
border: 1px solid #c2cad8;
background-color: #f6f3f3;
margin-top: 5px;
padding: 10px;
}
.filter-action-select-panle label{
line-height: 34px;
}

2
src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css
View File

@@ -1,2 +1,2 @@
.Wdate{border:#999 1px solid;height:20px;background:#fff url(datePicker.gif) no-repeat right;} .Wdate{border:#c2cad8 1px solid;min-height:20px;background:#fff url(datePicker.gif) no-repeat right;}
.WdateFmtErr{font-weight:bold;color:red;} .WdateFmtErr{font-weight:bold;color:red;}

23
src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css vendored
View File

@@ -1334,9 +1334,9 @@ a.bg-danger:focus {
background-color: #f6b3b8; } background-color: #f6b3b8; }
.page-header { .page-header {
padding-bottom: 9px; /* padding-bottom: 9px;
margin: 40px 0 20px; margin: 40px 0 20px; */
border-bottom: 1px solid #eeeeee; } border-bottom: 1px solid #C2CAD8; }
ul, ul,
ol { ol {
@@ -2037,7 +2037,9 @@ th {
.table { .table {
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
margin-bottom: 20px; } margin-bottom: 20px;
margin-top: 10px;
}
.table > thead > tr > th, .table > thead > tr > th,
.table > thead > tr > td, .table > thead > tr > td,
.table > tbody > tr > th, .table > tbody > tr > th,
@@ -2058,7 +2060,16 @@ th {
.table > thead:first-child > tr:first-child > th, .table > thead:first-child > tr:first-child > th,
.table > thead:first-child > tr:first-child > td { .table > thead:first-child > tr:first-child > td {
border-top: 0; border-top: 0;
background-color: #F5F6FA; /* background-color: #F5F6FA;
*/
background-color: #3598dc;
color: #F5F6FA;
height: 38px;
line-height: 38px;
padding-top: 0px;
padding-right: 10px;
padding-bottom: 0px;
padding-left: 10px;
} }
.table > tbody + tbody { .table > tbody + tbody {
border-top: 2px solid #e7ecf1; } border-top: 2px solid #e7ecf1; }
@@ -2071,7 +2082,7 @@ th {
.table-condensed > tbody > tr > td, .table-condensed > tbody > tr > td,
.table-condensed > tfoot > tr > th, .table-condensed > tfoot > tr > th,
.table-condensed > tfoot > tr > td { .table-condensed > tfoot > tr > td {
padding: 5px; } padding-left:10px; }
.table-bordered { .table-bordered {
border: 1px solid #e7ecf1; } border: 1px solid #e7ecf1; }

52
src/main/webapp/static/global/scripts/jeesite.js
View File

@@ -6,15 +6,14 @@
* @version 2014-4-29 * @version 2014-4-29
*/ */
$(document).ready(function() { $(document).ready(function() {
try{ try{
// 链接去掉虚框 // 链接去掉虚框
$("a").bind("focus",function() { $("a").bind("focus",function() {
if(this.blur) {this.blur()}; if(this.blur) {this.blur()};
}); });
//所有下拉框使用select2 - 排除class为noSelect2的<select>元素 //所有下拉框使用select2 - 排除class为noSelect2的<select>元素
$("select:not(.noSelect2)").select2(); //$("select:not(.noSelect2)").select2();
}catch(e){ }catch(e){
// blank // blank
@@ -22,10 +21,6 @@ $(document).ready(function() {
}); });
function getContextPath() { function getContextPath() {
var pathName = window.location.pathname; var pathName = window.location.pathname;
var index = pathName.substring(1).indexOf("/"); var index = pathName.substring(1).indexOf("/");
@@ -111,7 +106,7 @@ function showTip(mess, type, timeout, lazytime){
// 显示加载框 // 显示加载框
function loading(mess){ function loading(mess){
if (mess == undefined || mess == ""){ if (mess == undefined || mess == ""){
mess = "正在提交，请稍等..."; mess = "OnLoading...";
} }
resetTip(); resetTip();
top.$.jBox.tip(mess,'loading',{opacity:0}); top.$.jBox.tip(mess,'loading',{opacity:0});
@@ -119,7 +114,7 @@ function loading(mess){
// 警告对话框 // 警告对话框
function alertx(mess, closed){ function alertx(mess, closed){
top.$.jBox.info(mess, '提示', {closed:function(){ top.$.jBox.info(mess, 'Waring', {closed:function(){
if (typeof closed == 'function') { if (typeof closed == 'function') {
closed(); closed();
} }
@@ -129,7 +124,7 @@ function alertx(mess, closed){
// 确认对话框 // 确认对话框
function confirmx(mess, href, closed){ function confirmx(mess, href, closed){
top.$.jBox.confirm(mess,'系统提示',function(v,h,f){ top.$.jBox.confirm(mess,'System Prompt',function(v,h,f){
if(v=='ok'){ if(v=='ok'){
if (typeof href == 'function') { if (typeof href == 'function') {
href(); href();
@@ -152,7 +147,7 @@ function promptx(title, lable, href, closed){
top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + "：<input type='text' id='txt' name='txt'/></div>", { top.$.jBox("<div class='form-search' style='padding:20px;text-align:center;'>" + lable + "：<input type='text' id='txt' name='txt'/></div>", {
title: title, submit: function (v, h, f){ title: title, submit: function (v, h, f){
if (f.txt == '') { if (f.txt == '') {
top.$.jBox.tip("请输入" + lable + "。", 'error'); top.$.jBox.tip("Please input" + lable + "。", 'error');
return false; return false;
} }
if (typeof href == 'function') { if (typeof href == 'function') {
@@ -298,3 +293,38 @@ function abbr(name, maxLength){
/*筛选按钮初始化*/
function filterActionInit() {
var isFilterAction = $("#isFilterAction").val();
if(isFilterAction=="true") {
fiterPanleShow();
}else {
fiterPanleHide();
}
$("#filter-btn").click(function(){
if($("#isFilterAction").val()=="true") {
$("#isFilterAction").val("false");
fiterPanleHide();
}else {
$("#isFilterAction").val("true");
fiterPanleShow();
}
});
}
function fiterPanleShow() {
$("#filter-action").find("i").removeClass("fa-angle-double-down").addClass("fa-angle-double-up");
$(".btn-search").addClass("hide");
$(".filter-action-select-panle").removeClass("hide");
}
function fiterPanleHide() {
$("#filter-action").find("i").removeClass("fa-angle-double-up").addClass("fa-angle-double-down");
$(".btn-search").removeClass("hide");
$(".filter-action-select-panle").addClass("hide");
}