diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index d62fdd6d3..c1ccddf73 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -68,7 +68,16 @@ AND r.edit_time between #{dobeginDate} and #{doendDate} - order by r.create_time desc + + + + ORDER BY ${page.orderBy} + + + ORDER BY r.create_time desc + + + + +
@@ -180,11 +182,12 @@ - + - + - + + diff --git a/src/main/webapp/static/global/css/components.css b/src/main/webapp/static/global/css/components.css index 09f9957c5..fa69f2746 100644 --- a/src/main/webapp/static/global/css/components.css +++ b/src/main/webapp/static/global/css/components.css @@ -21574,5 +21574,39 @@ Color library demo margin-right: 3px; } + +/*ʽ*/ +.sort-column { + cursor: pointer; +} +.sort-column i { + top: 2px; + position: relative; + display: inline-table; +} +.sort-icon { + width: 9px; + height: 13px; + background-image: url('../img/bee.png'); + background-position: -232px -59px; + +} + + +.sort-icon-down { + width: 9px; + height: 12px; + background-image: url('../img/bee.png'); + background-position: -232px -73px; +} + +.sort-icon-up { + width: 9px; + height: 13px; + background-image: url('../img/bee.png'); + background-position: -232px -86px; +} + + diff --git a/src/main/webapp/static/global/img/bee.png b/src/main/webapp/static/global/img/bee.png new file mode 100644 index 000000000..709e6d236 Binary files /dev/null and b/src/main/webapp/static/global/img/bee.png differ