Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents e38a4bf2 a917eba4
Showing 28 changed files with 143 additions and 58 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java → src/main/java/com/bsth/controller/realcontrol/AdminUtilsController.java
src/main/java/com/bsth/data/directive/GatewayHttpUtils.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/OutStationProcess.java
src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ChildTaskPlanServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/java/com/bsth/service/traffic/impl/VehicleInoutStopServiceImpl.java
src/main/java/com/bsth/websocket/handler/SendUtils.java
src/main/resources/fatso/start.js
src/main/resources/static/pages/forms/statement/firstAndLastBus_delay.html
src/main/resources/static/pages/history_sch/edit/history_sch_maintain.html
src/main/resources/static/pages/home.html
src/main/resources/static/pages/punctual/list.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/deviceInfoManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/detailedit/edit-detail2.html
src/main/resources/static/real_control_v2/alone_page/home/alone_data_gps.js
 package com.bsth.controller.realcontrol;
+import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.gpsdata_v2.cache.GeoCacheData;
 import com.bsth.data.gpsdata_v2.thread.GpsDataLoaderThread;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.msg_queue.WebSocketPushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -22,8 +23,8 @@ import java.util.Map;
  * Created by panzhao on 2017/4/14.
  */
 @RestController
-@RequestMapping("anomalyCheck")
-public class anomalyCheckController {
+@RequestMapping("adminUtils")
+public class AdminUtilsController {
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -34,10 +35,16 @@ public class anomalyCheckController {
     @Autowired
     GeoCacheData geoCacheData;
+    @Autowired
+    DayOfDirectives dayOfDirectives;
+
+    @Autowired
+    SendUtils sendUtils;
+
     /**
      * 出现重复班次的车辆
-     * @param nbbm
-     */
+     * @param
+
     @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
     public void schRepeat(@RequestParam String nbbm){
         logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
@@ -56,22 +63,22 @@ public class anomalyCheckController {
         if(map.values().size() > 0){
             dayOfSchedule.replaceByNbbm(nbbm, map.values());
         }
-    }
+    }*/
-    @RequestMapping(value = "/directivePushQueue")
+/*    @RequestMapping(value = "/directivePushQueue")
     public void directivePushQueue(){
         DirectivePushQueue.start();
-    }
+    }*/
     @RequestMapping(value = "/directiveQueueSize")
     public void directiveQueueSize(){
         DirectivePushQueue.size();
     }
-    @RequestMapping(value = "/webSocketPushQueue")
+    /*@RequestMapping(value = "/webSocketPushQueue")
     public void webSocketPushQueue(){
         WebSocketPushQueue.start();
-    }
+    }*/
     @RequestMapping(value = "/webSocketQueueSize")
     public void webSocketQueueSize(){
@@ -120,4 +127,21 @@ public class anomalyCheckController {
     public String schSizeString(){
         return dayOfSchedule.sizeString();
     }
+
+    @RequestMapping(value = "/containerSize")
+    public Map<String, Integer> containerSize(){
+        Map<String, Integer> rs = new HashMap<>();
+        rs.put("60_size", dayOfDirectives.all60().size());
+        rs.put("nbbm_sch_size", dayOfSchedule.findAll().size());
+        rs.put("lp_sch_size", dayOfSchedule.findAllByLpContainer().size());
+        rs.put("id_sch_size", dayOfSchedule.findAllByIdContainer().size());
+        rs.put("pst_sch_size", dayOfSchedule.getPstSize());
+        return rs;
+    }
+
+    @RequestMapping(value = "/websocketRadioText")
+    public int radioText(String t, String lineCode){
+        sendUtils.sendRadioText(t, lineCode);
+        return 0;
+    }
 }
@@ -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()));
@@ -39,7 +39,7 @@ public class OutStationProcess {
     @Autowired
     GpsStatusManager gpsStatusManager;
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 60 * 3;
     public void process(GpsEntity gps) {
         //自动执行的线路，滚蛋
@@ -86,8 +86,8 @@ public class OutStationProcess {
             }
             int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
-            //首班出场最多提前2小时
-            if ((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
+            //首班出场最多提前3小时
+            if (dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
                 return;
             gps.setPremiseCode(null);//清除前置围栏标记
@@ -84,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=346"; //+ dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE,SERVER_TS from bsth_c_gps_info where days_year=39"; //+ dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -102,6 +102,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
                         gps.setTimestamp(rs.getLong("TS"));
                         gps.setUpDown((byte) getUpOrDown(rs.getLong("SERVICE_STATE")));
                         gps.setServerTimestamp(rs.getLong("SERVER_TS"));
+                        gps.setState((int) getService(rs.getLong("SERVICE_STATE")));
                         return gps;
                     }
                 });
@@ -109,6 +110,17 @@ public class GpsDataRecovery implements ApplicationContextAware {
     }
     /**
+     * 获取运营状态
+     *
+     * @return -1无效 0运营 1未运营
+     */
+    public static byte getService(long serviceState) {
+        if ((serviceState & 0x00020000) == 0x00020000 || (serviceState & 0x80000000) == 0x80000000)
+            return -1;
+        return (byte) (((serviceState & 0x02000000) == 0x02000000) ? 1 : 0);
+    }
+
+    /**
      * 王通 2016/6/29 9:23:24 获取车辆线路上下行
      *
      * @return -1无效 0上行 1下行
@@ -861,6 +861,18 @@ public class DayOfSchedule {
         return nbbmScheduleMap.values();
     }
+    public Collection<ScheduleRealInfo> findAllByLpContainer() {
+        return lpScheduleMap.values();
+    }
+
+    public Collection<ScheduleRealInfo> findAllByIdContainer() {
+        return id2SchedulMap.values();
+    }
+
+    public int getPstSize() {
+        return pstBuffer.size();
+    }
+
     public boolean addExecPlan(ScheduleRealInfo sch) {
         ScheduleRealInfo oldExec = executeCurr(sch.getClZbh());
         if (sch != null){
@@ -231,16 +231,10 @@ public class GpsServiceImpl implements GpsService {
         Map<String, Object> map = null;
         for(Map<String, Object> rs : dataList){
             serviceState = map_get_long(rs, "SERVICE_STATE");
-
-            if(getGpsValid(serviceState) == 1)
-                continue;
-
-            map = new HashMap<>();
             if(getGpsValid(serviceState) == 1)
                 continue;
             map = new HashMap<>();
-
             lon = map_get_float(rs, "LON");
             lat = map_get_float(rs, "LAT");
             // 高德坐标
@@ -273,7 +267,7 @@ public class GpsServiceImpl implements GpsService {
                 map.put("inout_stop", arrival.getInOut());
             }
-            map.put("nbbm", BasicData.deviceId2NbbmMap.get(map_get_str(rs,"DEVICE_ID")));
+            //map.put("nbbm", nbbm);
             map.put("state", getService(serviceState));
             // 上下行
             map.put("upDown", getUpOrDown(serviceState));
@@ -387,7 +381,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 +
@@ -1735,7 +1735,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			long id = schedule.getId();
 			if(schedule1 == 0l || schedule1 > id)
 				schedule1 = id;
-			if(schedule2 == 0l || schedule1 < id)
+			if(schedule2 == 0l || schedule2 < id)
 				schedule2 = id;
 		}
 		Map<Long, Set<ChildTaskPlan>> cts = getChildTaskPlans(schedule1, schedule2);
 package com.bsth.service.realcontrol.impl;
+import com.alibaba.fastjson.JSON;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.Station2ParkBuffer;
@@ -137,6 +138,8 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
         Map<String, Object> rs = new HashMap();
         try {
             ScheduleRealInfo sch = dayOfSchedule.get(t.getSchedule().getId());
+            logger.info("cts: " + JSON.toJSONString(t));
+            logger.info("sch: " + JSON.toJSONString(sch));
             //保存起终点名称
             if(StringUtils.isEmpty(t.getStartStationName()))
                 t.setStartStationName(getStationName(sch.getXlBm(), t.getStartStation()));
@@ -151,7 +154,7 @@ public class ChildTaskPlanServiceImpl extends BaseServiceImpl&lt;ChildTaskPlan, Lon
             ChildTaskPlan task = null;
             Set<ChildTaskPlan> set = sch.getcTasks();
             for(ChildTaskPlan obj : set){
-                if(obj.getId() == t.getId()){
+                if(obj.getId().intValue() == t.getId().intValue()){
                     task = obj;
                     break;
                 }
@@ -1633,7 +1633,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast0", s4.getFcsjActual());
 					temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
 					jhbc += 2;
-					if(delayFirst0 <= 1l && delayFirst0 >= -3l){
+					if(delayFirst0 <= 1l && delayFirst0 >= -2l){
 						sjbc++;
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
@@ -1649,7 +1649,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 						m.put("remarks", s1.getRemarks() + s2.getRemarks());
 						mapList.add(m);
 					}
-					if(delayLast0 <= 1l && delayLast0 >= -3l){
+					if(delayLast0 <= 1l && delayLast0 >= -2l){
 						sjbc++;
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
@@ -1737,6 +1737,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast1", "/");
 					temp.put("delayLast1", "/");
 				}
+				if((up1.size() == 0 || up2.size() == 0) && (dn1.size() == 0 || dn2.size() == 0))
+					continue;
 				tempList.add(temp);
 			}
 			tempMap.put("map", tempList);
@@ -82,7 +82,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 				"if( up_down= 0,'上行','下行') as up_down ," +
 				"if( in_out_stop= 0,'站内','站外') as in_out_stop , " +
 				"stop,report_date FROM bsth_c_shreal " + packageParam(map,"") ;
-		logger.info("车载上报停靠站查询sql:",sql);
+		logger.info("车载上报停靠站查询sql:"+sql);
 		List<Map<String, Object>> result = jdbcTemp.queryForList(sql);
 		return result;
 	}
@@ -96,6 +96,7 @@ public class VehicleInoutStopServiceImpl extends BaseServiceImpl&lt;VehicleInoutSto
 		JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_MS.getDataSource());
 		String sql = "SELECT count(1) COUNT FROM bsth_c_shreal" + packageParam(map,"count");
 		long result = Long.valueOf(jdbcTemp.queryForMap(sql).get("COUNT")+"");
+		logger.info("车载上报停靠站查询count-sql:"+sql);
 		return result;
 	}
 }
@@ -10,6 +10,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.websocket.dto.WsScheduleRealInfo;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -195,4 +196,24 @@ public class SendUtils{
 			logger.error("", e);
 		}
 	}
+
+	/**
+	 * 对所有线调用户进行广播
+	 * @param t
+	 */
+	public void sendRadioText(String t, String lineCode){
+		Map<String, Object> map = new HashMap<>();
+		map.put("fn", "admin_radio_text");
+		map.put("t", t);
+		ObjectMapper mapper = new ObjectMapper();
+
+		try {
+			if(StringUtils.isNotEmpty(lineCode))
+				socketHandler.sendMessageToLine(lineCode, mapper.writeValueAsString(map));
+			else
+				socketHandler.sendMessage(mapper.writeValueAsString(map));
+		} catch (JsonProcessingException e) {
+			logger.error("", e);
+		}
+	}
 }
@@ -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()
@@ -19,7 +19,7 @@
 <div class="page-head">
 	<div class="page-title">
-		<h1>线路首末班准点率</h1>
+		<h1>线路首末班误点班次</h1>
 	</div>
 </div>
@@ -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');
+                    });
+
                 }, '我确定');
             });
         })();
@@ -59,7 +59,7 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2018-??-?? 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2018-02-06 更新说明 Changelog</h2>
     <ul >
         <li class="sub_title"><h6>基础信息</h6></li>
         <li><span class="label s_c_add">新增</span>1、新增站点间双路段生成功能。</li>
@@ -39,9 +39,9 @@
 								<td>路牌</td>
 								<td>计划发车</td>
 								<td>实际发车</td>
+								<td>发车准点</td>
 								<td>计划到站</td>
 								<td>实际到站</td>
-								<td>发车准点</td>
 								<td>到站准点</td>
 							</tr>
 						</thead>
@@ -171,7 +171,7 @@
                     <div class="col-md-3">
                         <div class="input-group">
                             <input type="datetime-local" class="form-control" name="qyrq"
-                                   ng-model="ctrl.deviceInfoForSave.qyrq"
+                                   ng-model="ctrl.deviceInfoForSave.qyrq" required
                                    remote-Validation
                                    remotevtype="cde1"
                                    remotevparam="{{ {'qyrq_eq': ctrl.deviceInfoForSave.qyrq, 'xl_eq': ctrl.deviceInfoForSave.xl, 'cl_eq': ctrl.deviceInfoForSave.cl} | json}}" />
@@ -180,7 +180,7 @@
                     </div>
                     <!-- 隐藏块，显示验证信息 -->
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.required">
-                        启用日期必须选择
+                        启用日期必须选择，精确到具体时间
                     </div>
                     <div class="alert alert-danger well-sm" ng-show="myForm.qyrq.$error.remote">
                         {{$remote_msg}}
@@ -19,7 +19,7 @@
             <i class="fa fa-circle"></i>
         </li>
         <li>
-            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})"><span ng-bind="ctrl.title1"></span></a>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
             <i class="fa fa-circle"></i>
         </li>
         <li>
@@ -19,7 +19,7 @@
             <i class="fa fa-circle"></i>
         </li>
         <li>
-            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid : ctrl.ttid, xlname: ctrl.xlname, ttname : ctrl.ttname})"><span ng-bind="ctrl.title1"></span></a>
+            <a ui-sref="ttInfoDetailManage_edit3({xlid: ctrl.xlid, ttid: ctrl.ttid, xlname: ctrl.xlname, ttname: ctrl.ttname, lineversion: ctrl.lineversion})"><span ng-bind="ctrl.title1"></span></a>
             <i class="fa fa-circle"></i>
         </li>
         <li>
@@ -41,7 +41,7 @@ var gb_data_gps = (function () {
             upDownChange = [];
         var schArray;
-        $.each(rs, function () {
+        $.each(rs.gpsList, function () {
             old = realData[this.deviceId];
             if (old) {
                 if (this.timestamp > old.timestamp) {
@@ -55,11 +55,11 @@ var gb_data_gps = (function () {
                 addArr.push(this);
             //班次信息
-            if (this.schId) {
-                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
-                if (schArray)
-                    this.sch = schArray[this.schId];
-            }
+            /*if (this.schId) {
+                //schArray = gb_schedule_table.findScheduleByLine(this.lineId);
+                ///if (schArray)
+                //    this.sch = schArray[this.schId];
+            }*/
             //时间格式化
             this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
@@ -553,7 +553,7 @@ dl.relevance-active.intimity dd:nth-child(n+2) {
 dl.relevance-active.intimity dd:nth-child(n+2) a {
     color: white !important;
 }
-/*
+
 dl.relevance-active dd.tl-qrlb,
 dl.relevance-active.intimity dd.tl-qrlb{
     background: linear-gradient(to right, #a9a911, #808000, #8baabf) !important;
@@ -595,7 +595,7 @@ dl.relevance-active.intimity dd.tl-xxrd {
 dl.relevance-active dd.tl-xxfc,
 dl.relevance-active.intimity dd.tl-xxfc {
     background: linear-gradient(to right, #8baabf, rgb(43, 185, 185), rgb(0,255,255)) !important;
-}*/
+}
 dl.relevance-active.intimity dd span.fcsj-diff {
     color: #616060;
@@ -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 {
@@ -275,8 +275,10 @@
                 //检查子任务营运里程
                 $('#childTaskTitle .child-task-status', modal).remove();
                 //var i = 0;
-                if (sch.cTasks.length == 0)
+                if (sch.cTasks.length == 0){
+                    $('.uk-panel-box-secondary', modal).removeClass('c_task_mileage_abnormal');
                     return;
+                }
                 var sum = 0, calcs = ' ';
                 $.each(sch.cTasks, function () {
                     if (this.mileageType == 'service') {
@@ -193,7 +193,11 @@
             cb && cb($(selector));
-            $('#line', '.form-page-content').trigger('change');
+            if(selector === '#line') {
+                setTimeout(function () {
+                    $('#line', '.form-page-content').trigger('change');
+                }, 500);
+            }
         });
         return $(selector);
@@ -352,9 +352,10 @@ var gb_schedule_table = (function () {
         $(dds[1]).find('a').text(sch.lpName);
         //车辆自编号
-        $(dds[2]).replaceWith(temps['line-schedule-nbbm-temp'](sch));
+        var $newDds2 = $(temps['line-schedule-nbbm-temp'](sch));
+        $(dds[2]).replaceWith($newDds2);
         //车辆双击
-        gb_schedule_table_dbclick.carCellClick($(dds[2]));
+        gb_schedule_table_dbclick.carCellClick($newDds2);
         $(dds[3]).text(sch.qdzArrDatejh ? sch.qdzArrDatejh : '');
         $(dds[4]).text(sch.qdzArrDatesj ? sch.qdzArrDatesj : '');
@@ -475,10 +476,12 @@ var gb_schedule_table = (function () {
         if (nextSch) {
             $('dl[data-id=' + nextSch.id + ']', contWrap).addClass('intimity');
-            if (nextSch.xlDir == sch.xlDir)
-                return;
+            /*if (nextSch.xlDir == sch.xlDir)
+                return;*/
             //滚动到下一个班次
-            scroToDl(nextSch);
+            if(nextSch.xlDir != sch.xlDir)
+                scroToDl(nextSch);
+
         }
         //如果有打开轨迹回放
@@ -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>
@@ -209,6 +209,7 @@
                         var code2Name = gb_data_basic.lineCode2NameAll();
                         $.each(rs.list, function () {
                             this.lineName = code2Name[this.lineId];
+                            this.nbbm = data.nbbm;
                         });
                         //排序
                         rs.list.sort(function (a, b) {