From 4597919ba0c3778cfbbae91b4ec3267d9a09e6a7 Mon Sep 17 00:00:00 2001 From: wangxin Date: Wed, 7 Mar 2018 18:54:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=A2=9E/?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=88=86=E7=B1=BB=E6=80=A7?= =?UTF-8?q?=E8=B4=A8=E6=A0=87=E7=AD=BE=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/dao/basics/ServiceDictInfoDao.xml | 28 +- .../dao/configuration/ServiceDictInfoDao.xml | 303 ------------------ 2 files changed, 23 insertions(+), 308 deletions(-) delete mode 100644 src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml diff --git a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml index fa5903350..d783f0415 100644 --- a/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml +++ b/src/main/java/com/nis/web/dao/basics/ServiceDictInfoDao.xml @@ -29,7 +29,15 @@ - + + + + + + + + + s.service_dict_id AS serviceDictId, s.item_type AS itemType, @@ -44,6 +52,16 @@ s.editor_id AS "serviceDictEditor.id", s.edit_time AS editTime + + 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 + @@ -260,14 +278,14 @@ UPDATE service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId} - select - + from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType} and s.is_valid=#{isValid}; - select - + from service_dict_info s where s.is_leaf = 0 and s.item_type=#{itemType}; diff --git a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml deleted file mode 100644 index 2e20d46fd..000000000 --- a/src/main/java/com/nis/web/dao/configuration/ServiceDictInfoDao.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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}) - - - - - - - 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 service_dict_info s set s.is_valid = #{isValid} where s.service_dict_id = #{serviceDictId} - - - - - - - LEFT JOIN service_dict_info p ON p.service_dict_id = s.parent_id - - - - - - - - - \ No newline at end of file From 1a69db26c4da7c9d70d787c0b1a9b18bb17f7fc3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Thu, 8 Mar 2018 10:53:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A4=B1=E6=95=88=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/login.jsp | 6 +++--- src/main/webapp/static/global/scripts/jeesite.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index b569fea3e..0e9fbd2f2 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -109,7 +109,7 @@ - + @@ -139,8 +139,8 @@ // 如果在框架或在对话框中，则弹出提示并跳转到首页 if(self.frameElement && self.frameElement.tagName == "IFRAME" || $('#left').length > 0 || $('.jbox').length > 0){ - alert(""); - top.location = "${pageContext.request.contextPath }"; + alertx(""); + window.setTimeout(function () { top.location = "${pageContext.request.contextPath }"; }, 5000); } diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 98e04853b..c110933af 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -111,7 +111,7 @@ function showTip(mess, type, timeout, lazytime){ // 显示加载框 function loading(mess){ if (mess == undefined || mess == ""){ - mess = "正在提交，请稍等..."; + mess = "OnLoading..."; } resetTip(); top.$.jBox.tip(mess,'loading',{opacity:0}); @@ -119,7 +119,7 @@ function loading(mess){ // 警告对话框 function alertx(mess, closed){ - top.$.jBox.info(mess, '提示', {closed:function(){ + top.$.jBox.info(mess, 'Waring', {closed:function(){ if (typeof closed == 'function') { closed(); } @@ -129,7 +129,7 @@ function alertx(mess, 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 (typeof href == 'function') { href(); @@ -152,7 +152,7 @@ function promptx(title, lable, href, closed){ top.$.jBox("
" + lable + "：
", { title: title, submit: function (v, h, f){ if (f.txt == '') { - top.$.jBox.tip("请输入" + lable + "。", 'error'); + top.$.jBox.tip("Please input" + lable + "。", 'error'); return false; } if (typeof href == 'function') { From 7493c116797525dcfce4f1ca5f4907ad327bb615 Mon Sep 17 00:00:00 2001 From: chiguangxu Date: Thu, 8 Mar 2018 11:10:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/BaseEntity.java | 18 ++ .../webapp/WEB-INF/views/cfg/requestList.jsp | 221 +++++++++++++----- .../webapp/static/global/css/components.css | 24 +- .../My97DatePicker/skin/WdatePicker.css | 2 +- .../plugins/bootstrap/css/bootstrap.css | 23 +- .../webapp/static/global/scripts/jeesite.js | 44 +++- 6 files changed, 262 insertions(+), 70 deletions(-) diff --git a/src/main/java/com/nis/domain/BaseEntity.java b/src/main/java/com/nis/domain/BaseEntity.java index 4023dc6b7..947d66eb9 100644 --- a/src/main/java/com/nis/domain/BaseEntity.java +++ b/src/main/java/com/nis/domain/BaseEntity.java @@ -57,6 +57,14 @@ public abstract class BaseEntity implements Serializable { * 设置为true后强制执行插入语句，ID不会自动生成，需从手动传入。 */ protected boolean isNewRecord = false; + + + /** + * 筛选搜索框展开状态 + */ + protected boolean isFilterAction = false; + + public BaseEntity() { @@ -162,6 +170,16 @@ public abstract class BaseEntity implements Serializable { public String toString() { return ReflectionToStringBuilder.toString(this); } + + + public void setIsFilterAction(boolean isFilterAction) { + this.isFilterAction = isFilterAction; + } + + @JsonIgnore + public boolean getIsFilterAction() { + return isFilterAction; + } diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp index 93310dae3..c00dc5467 100644 --- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp @@ -10,67 +10,167 @@

+

+
-
-
-
- -
-
+
+
- - - -
- : - - - - + + + - - - - - - - + + - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - : " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> - -
- + +
+ +
+ + 所有状态 + + + +
+ +
+
+
+ +
+ + + +
+ +
+ +
+
+ +
+ +
+ +
+ + + + +
+ + +
+ + + + +
+ + +
+ + + + + + +
+
+ +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+ +
+ +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+ +
+
+ " onclick="WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true});"/> +
+
+
+ +
+
+ +
+ + +
+ +
+
+ + + +
- + + + + + + @@ -87,6 +187,7 @@ + @@ -114,7 +215,7 @@ @@ -145,9 +252,26 @@ - \ No newline at end of file diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 092dca3bf..0438bdf94 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -21531,4 +21531,26 @@ Color library demo vertical-align: middle; } .mt-cookie-consent-bar.mt-cookie-consent-bar-light { 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; + } + + + diff --git a/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css b/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css index 08b743975..f9121da77 100644 --- a/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css +++ b/src/main/webapp/static/global/plugins/My97DatePicker/skin/WdatePicker.css @@ -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;} \ No newline at end of file diff --git a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css index 1d6d56de1..3c2dcb07c 100644 --- a/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css +++ b/src/main/webapp/static/global/plugins/bootstrap/css/bootstrap.css @@ -1334,9 +1334,9 @@ a.bg-danger:focus { background-color: #f6b3b8; } .page-header { - padding-bottom: 9px; - margin: 40px 0 20px; - border-bottom: 1px solid #eeeeee; } +/* padding-bottom: 9px; + margin: 40px 0 20px; */ + border-bottom: 1px solid #C2CAD8; } ul, ol { @@ -2037,7 +2037,9 @@ th { .table { width: 100%; max-width: 100%; - margin-bottom: 20px; } + margin-bottom: 20px; + margin-top: 10px; + } .table > thead > tr > th, .table > thead > tr > td, .table > tbody > tr > th, @@ -2058,7 +2060,16 @@ th { .table > thead:first-child > tr:first-child > th, .table > thead:first-child > tr:first-child > td { 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 { border-top: 2px solid #e7ecf1; } @@ -2071,7 +2082,7 @@ th { .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > th, .table-condensed > tfoot > tr > td { - padding: 5px; } + padding-left:10px; } .table-bordered { border: 1px solid #e7ecf1; } diff --git a/src/main/webapp/static/global/scripts/jeesite.js b/src/main/webapp/static/global/scripts/jeesite.js index 98e04853b..dc7ca3281 100644 --- a/src/main/webapp/static/global/scripts/jeesite.js +++ b/src/main/webapp/static/global/scripts/jeesite.js @@ -6,15 +6,14 @@ * @version 2014-4-29 */ $(document).ready(function() { + try{ // 链接去掉虚框 $("a").bind("focus",function() { if(this.blur) {this.blur()}; }); //所有下拉框使用select2 - 排除class为noSelect2的> + >
${requestInfo.id } ${requestInfo.requestNumber } ${requestInfo.requestOrg }${requestInfo.requestContent } ${requestInfo.taskName } -
+ <%--
-
+
--%>