Commit 0dcfcc10066c2952859712c990bef27ac8220530
1 parent
2a5a1f8e
更新
Showing
5 changed files
with
13 additions
and
4 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
| @@ -993,7 +993,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | @@ -993,7 +993,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf | ||
| 993 | map.put("xlName", xlName); | 993 | map.put("xlName", xlName); |
| 994 | map.put("clZbh", code); | 994 | map.put("clZbh", code); |
| 995 | map.put("company", obj[0]); | 995 | map.put("company", obj[0]); |
| 996 | - map.put("requestType", obj[1]); | 996 | + map.put("requestType", "0x" + Integer.toHexString(Integer.parseInt(obj[1]+"")).toUpperCase()); |
| 997 | map.put("requestTime", obj[2]); | 997 | map.put("requestTime", obj[2]); |
| 998 | listMap.add(map); | 998 | listMap.add(map); |
| 999 | } | 999 | } |
src/main/resources/static/pages/forms/statement/account.html
| @@ -69,7 +69,8 @@ | @@ -69,7 +69,8 @@ | ||
| 69 | </div> | 69 | </div> |
| 70 | 70 | ||
| 71 | <script> | 71 | <script> |
| 72 | - $(function(){ | 72 | + $(function(){ |
| 73 | + var reqCodeMap = {"0xA1": '请求恢复运营', "0xA2": '申请调档', "0xA3": '出场请求', "0xA5": '进场请求', "0xA7": '加油请求', "0x50": '车辆故障', "0x70": '路阻报告', "0x60": '事故报告', "0x11": '扣证纠纷', "0x12" : '报警'}; | ||
| 73 | // 关闭左侧栏 | 74 | // 关闭左侧栏 |
| 74 | if (!$('body').hasClass('page-sidebar-closed')) | 75 | if (!$('body').hasClass('page-sidebar-closed')) |
| 75 | $('.menu-toggler.sidebar-toggler').click(); | 76 | $('.menu-toggler.sidebar-toggler').click(); |
| @@ -82,6 +83,7 @@ | @@ -82,6 +83,7 @@ | ||
| 82 | $('#line').select2({ | 83 | $('#line').select2({ |
| 83 | ajax: { | 84 | ajax: { |
| 84 | url: '/realSchedule/findLine', | 85 | url: '/realSchedule/findLine', |
| 86 | + type: 'post', | ||
| 85 | dataType: 'json', | 87 | dataType: 'json', |
| 86 | delay: 150, | 88 | delay: 150, |
| 87 | data: function(params){ | 89 | data: function(params){ |
| @@ -161,7 +163,10 @@ | @@ -161,7 +163,10 @@ | ||
| 161 | var date = $("#date").val(); | 163 | var date = $("#date").val(); |
| 162 | var code = $("#code").val(); | 164 | var code = $("#code").val(); |
| 163 | $(".hidden").removeClass("hidden"); | 165 | $(".hidden").removeClass("hidden"); |
| 164 | - $get('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName},function(result){ | 166 | + $post('/realSchedule/account',{line:line,date:date,code:code,xlName:xlName},function(result){ |
| 167 | + $.each(result, function(i, obj) { | ||
| 168 | + obj.requestType = reqCodeMap[obj.requestType]; | ||
| 169 | + }); | ||
| 165 | // 把数据填充到模版中 | 170 | // 把数据填充到模版中 |
| 166 | var tbodyHtml = template('list_account',{list:result}); | 171 | var tbodyHtml = template('list_account',{list:result}); |
| 167 | // 把渲染好的模版html文本追加到表格中 | 172 | // 把渲染好的模版html文本追加到表格中 |
src/main/resources/static/pages/forms/statement/correctForm.html
| @@ -110,6 +110,7 @@ | @@ -110,6 +110,7 @@ | ||
| 110 | $('#line').select2({ | 110 | $('#line').select2({ |
| 111 | ajax: { | 111 | ajax: { |
| 112 | url: '/realSchedule/findLine', | 112 | url: '/realSchedule/findLine', |
| 113 | + type: 'post', | ||
| 113 | dataType: 'json', | 114 | dataType: 'json', |
| 114 | delay: 150, | 115 | delay: 150, |
| 115 | data: function(params){ | 116 | data: function(params){ |
| @@ -147,6 +148,7 @@ | @@ -147,6 +148,7 @@ | ||
| 147 | $('#lpName').select2({ | 148 | $('#lpName').select2({ |
| 148 | ajax: { | 149 | ajax: { |
| 149 | url: '/realSchedule/findLpName', | 150 | url: '/realSchedule/findLpName', |
| 151 | + type: 'post', | ||
| 150 | dataType: 'json', | 152 | dataType: 'json', |
| 151 | delay: 150, | 153 | delay: 150, |
| 152 | data: function(params){ | 154 | data: function(params){ |
| @@ -226,7 +228,7 @@ | @@ -226,7 +228,7 @@ | ||
| 226 | var endDate = $("#endDate").val(); | 228 | var endDate = $("#endDate").val(); |
| 227 | var lpName = $("#lpName").val(); | 229 | var lpName = $("#lpName").val(); |
| 228 | var code = $("#code").val(); | 230 | var code = $("#code").val(); |
| 229 | - $get("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){ | 231 | + $post("/realSchedule/correctForm",{line:line,startDate:startDate,endDate:endDate,lpName:lpName,code:code},function(result){ |
| 230 | $("#sDate").text(startDate); | 232 | $("#sDate").text(startDate); |
| 231 | $("#eDate").text(endDate); | 233 | $("#eDate").text(endDate); |
| 232 | var temp = {}; | 234 | var temp = {}; |
src/main/resources/static/pages/forms/statement/daily.html
| @@ -95,6 +95,7 @@ | @@ -95,6 +95,7 @@ | ||
| 95 | $('#line').select2({ | 95 | $('#line').select2({ |
| 96 | ajax: { | 96 | ajax: { |
| 97 | url: '/realSchedule/findLine', | 97 | url: '/realSchedule/findLine', |
| 98 | + type: 'post', | ||
| 98 | dataType: 'json', | 99 | dataType: 'json', |
| 99 | delay: 150, | 100 | delay: 150, |
| 100 | data: function(params){ | 101 | data: function(params){ |
src/main/resources/static/pages/forms/statement/historyMessage.html
| @@ -83,6 +83,7 @@ | @@ -83,6 +83,7 @@ | ||
| 83 | $('#line').select2({ | 83 | $('#line').select2({ |
| 84 | ajax: { | 84 | ajax: { |
| 85 | url: '/realSchedule/findLine', | 85 | url: '/realSchedule/findLine', |
| 86 | + type: 'post', | ||
| 86 | dataType: 'json', | 87 | dataType: 'json', |
| 87 | delay: 150, | 88 | delay: 150, |
| 88 | data: function(params){ | 89 | data: function(params){ |