update..

潘钊
1 parent 50ebd417
Showing 5 changed files with 15 additions and 9 deletions
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/main.html
@@ -48,9 +48,9 @@ public class GatewayHttpUtils {
             int statusCode = response.getStatusLine().getStatusCode();
             if(statusCode != 200){
-                post.abort();
+                //post.abort();
                 logger.error("http client status code: " + statusCode);
-                return code;
+                //return code;
             }
             JSONObject json = JSONObject.parseObject(EntityUtils.toString(response.getEntity()));
@@ -387,7 +387,7 @@ public class GpsServiceImpl implements GpsService {
             dc = dcs.get(i);
             if(dc.getSt() > st)
                 t1 = dc.getSt();
-            if(dc.getEt() < et)
+            if(dc.getEt() < et && dc.getEt() != 0)
                 t2 = dc.getEt();
             sql.append("SELECT DEVICE_ID,LINE_ID as LINE_CODE,STOP_NO,TS,UP_DOWN,IN_OUT,WEEKS_YEAR,CREATE_DATE FROM " + tableName +
@@ -495,22 +495,27 @@
                     $(that).prepend('<i class="uk-icon-spinner uk-icon-spin"></i>');
-                    var reCountEp = EventProxy.create('ylbUpdate', function () {
+                    var reCountEp = EventProxy.create('ylbUpdate', 'calcWaybill', 'scheduleDetail', function () {
                         $('i.uk-icon-spin', that).remove();
                         $(that).removeAttr('disabled');
                         notify_succ('重新统计成功！');
                     });
                     //统计路单 -娄高峰
-                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
-                     reCountEp.emitLater('calcWaybill');
-                     });*/
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('calcWaybill');
+                    });
                     //统计油 -廖磊
                     gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('ylbUpdate');
                     });
+                    //重新统计班次明细
+                    gb_common.$post('/sch/reCalc/scheduleDetail', {date:rq, line: lineCode}, function () {
+                        reCountEp.emitLater('scheduleDetail');
+                    });
+
                 }, '我确定');
             });
         })();
@@ -1147,7 +1147,7 @@ dl.intimity span.late-badge {
 }
 .tip_task_list dl dt:nth-of-type(6), .tip_task_list dl dd:nth-of-type(6) {
-
+    width: 12%;
 }
 .tip_task_list dl dd:nth-of-type(1) a {
@@ -237,9 +237,10 @@
 <script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
-<!-- 打电话 -->
+<!-- 打电话
 <script src="http://180.168.57.114:4244/Scripts/CallCenter.js" ></script>
 <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
+-->
 </body>
 </html>