Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

娄高锋
2 parents 02ea4ad9 bdd4ceae
Showing 4 changed files with 7 additions and 10 deletions
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/static/real_control_v2/js/forms/wrap.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -313,17 +313,10 @@ public class GpsServiceImpl implements GpsService {
         try{
             //JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
-            dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,old_device_no as old_device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where cl_zbh='"+nbbm+"'"
+            dcs = jdbcTemplate.query("select cl_zbh as nbbm,new_device_no as device,old_device_no as old_device,UNIX_TIMESTAMP(qyrq) * 1000 as st from bsth_c_car_device where is_cancel=0 and cl_zbh='"+nbbm+"' order by qyrq"
                     , BeanPropertyRowMapper.newInstance(DeviceChange.class));
-            Collections.sort(dcs, new Comparator<DeviceChange>() {
-                @Override
-                public int compare(DeviceChange d1, DeviceChange d2) {
-                    return (int) (d1.getSt() - d2.getSt());
-                }
-            });
-
             //生成一条初始记录
             if(dcs.size() > 0){
                 DeviceChange first = dcs.get(0);
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform=='win32';
 var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil','base'+sp+'geo_data_edit', 'forms', 'report']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'history_sch' ,'report'+sp+'oil','base'+sp+'geo_data_edit', 'forms','mforms', 'report', 'punctual']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
@@ -193,7 +193,9 @@
             cb && cb($(selector));
-            $('#line', '.form-page-content').trigger('change');
+            setTimeout(function(){
+                $('#line', '.form-page-content').trigger('change');
+            }, 500);
         });
         return $(selector);
@@ -248,6 +248,8 @@ var gb_schedule_table = (function () {
             gb_schedule_table_dbclick.init();
             //重新初始化双击实发发车信息微调
             gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell', tabCont));
+            //重新初始化双击车辆
+            gb_schedule_table_dbclick.carCellClick($('.ct_table_body dd[data-nbbm]'));
             //滚动条
             $('.schedule-wrap .ct_table_wrap', tabCont).perfectScrollbar({suppressScrollX: true});