智能调度优化，指令下发，登录跳转，gps线路=0

ljq
1 parent ed74b389
Showing 12 changed files with 190 additions and 62 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/msg_queue/DirectivePushQueue.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/service/directive/DirectiveService.java
src/main/java/com/bsth/service/directive/DirectiveServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/login.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
src/main/resources/static/real_control_v2/main.html
@@ -145,7 +145,7 @@ public class XDApplication implements CommandLineRunner {
         //dayOfSchedule.dataRecovery();
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
@@ -193,7 +193,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
@@ -238,7 +238,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
         /** 线调业务 */
@@ -284,7 +284,7 @@ public class XDApplication implements CommandLineRunner {
         //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(znddThread, 15, 60, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(znddThread, 15, 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
         /** 线调业务 */
@@ -54,6 +54,23 @@ public class DirectivePushQueue implements ApplicationContextAware {
         linkedList.add(qd6002);
         lastSend60TimeMap.put(sch.getClZbh(), System.currentTimeMillis());
     }
+    //单独出厂请求设计
+    public static void put60_002(ScheduleRealInfo sch, int finish, String sender, String txtPrefix){
+        if(null == sch)
+            return;
+        QueueData_Directive qd6002 = new QueueData_Directive();
+        qd6002.setSch(sch);
+        qd6002.setFinish(finish);
+        qd6002.setSender(sender);
+        qd6002.setCode("60_002");
+        qd6002.setTxtPrefix(txtPrefix);
+
+        linkedList.add(qd6002);
+        lastSend60TimeMap.put(sch.getClZbh(), System.currentTimeMillis());
+    }
+    
+    
+    
     public static void put6003(String nbbm, int state, int upDown, String sender){
         long t = System.currentTimeMillis();
@@ -131,6 +148,10 @@ public class DirectivePushQueue implements ApplicationContextAware {
                             directiveService.send60Dispatch(qd.getSch(), qd.getFinish(), qd.getSender(), qd.getTxtPrefix());
                             log.info("directive 60_02 sch id: " + qd.getSch().getId());
                         }
+                        else if(code.equals("60_002")){ //出场请求只写出场
+                            directiveService.send60Dispatchcc(qd.getSch(), qd.getFinish(), qd.getSender(), qd.getTxtPrefix());
+                            log.info("directive出场 60_002 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
+                        }
                         else if(code.equals("60_03")){
                             directiveService.send60Operation(qd.getNbbm(), qd.getState(), qd.getUpDown(), qd.getSender());
                             log.info("directive 60_03 nbbm: " + qd.getNbbm());
@@ -138,7 +159,8 @@ public class DirectivePushQueue implements ApplicationContextAware {
                         else if(code.equals("64")){
                             directiveService.lineChange(qd.getNbbm(), qd.getLineCode(), qd.getSender());
                             log.info("directive 64 nbbm: " + qd.getNbbm() + " lineCode: " + qd.getLineCode());
-                        }
+                        } 
+                       
                     } else{
                         Thread.sleep(500);
@@ -93,7 +93,7 @@ public class PilotReport {
                         if (outSch.getJhlc() == null)
                             outSch = dayOfSchedule.next(outSch);
                         //下发调度指令
-                        //DirectivePushQueue.put6002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
+                        DirectivePushQueue.put60_002(outSch, dayOfSchedule.doneSum(nbbm), "请出@系统", "同意出场;");
                     }
                     break;
             }
@@ -10,12 +10,14 @@ import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
+import com.bsth.entity.StationRoute;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.StationRouteRepository;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
 import com.bsth.util.HttpClientUtils;
+import com.google.gson.Gson;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -130,31 +132,33 @@ public class AutomaticSch {
                     //1.离线 2.实发时间为空 3.已过待发时间还没发车的
                     long time = System.currentTimeMillis();//实际时间+2分钟
                     //超过待发时间  实发时间还是null的
-                    if (sr.getFcsjT() + (1000*3) > time) {
+                    if (sr.getFcsjT()+ (1000 * 60 * 3) <  time && sr.getFcsjT()+ (1000 * 60 * 7) >  time) {
                         //起点站实际到达时间为null的情况下
-                        if (StringUtils.isEmpty(sr.getQdzArrDatesj())) {
+                  /*      if (StringUtils.isEmpty(sr.getQdzArrDatesj())) {
                             ScheduleRealInfo prev = dayOfSchedule.prev(sr);
                             //上一个班次没有实际终点到达时间
                             if (prev != null && StringUtils.isEmpty(prev.getZdsjActual())) {
                                 continue;
                             }
-                        }
+                        }*/
                         //第一种 设备离线的情况下改出站
                         Integer staus = 0; //状态
-                        if (StringUtils.isEmpty(sr.getFcsjActual()) && sr.getBcType().equals("normal") && StringUtils.isEmpty(sr.getRemarks())) {
+                        if (StringUtils.isEmpty(sr.getFcsjActual()) 
+                                && (sr.getBcType().equals("normal")   || sr.getBcType().equals("region"))
+                                && (StringUtils.isEmpty(sr.getRemarks()) || sr.getRemarks().equals("_智能调度-异常实发"))) {
                             GpsEntity gps =  gpsRealData.getByNbbm(sr.getClZbh());
                             //当前设备离线的情况  
                             //1。一直没收到gps
                             //2.gps长时间离线的情况下
                             //3.人为调整过的都跳过
-                            if (gps == null || (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))){
+                            if (gps == null || gps.getTimestamp() + (1000 * 60 * 3) < time ||  (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))){
                                 ts(addStationPeople(sr, "SFTZ_1", 0L));
-                                break;
+                                Gson gson = new Gson();
+                                String chartStr = gson.toJsonTree(sr).toString();
+                                logger.info("实发调整--"+chartStr);
                             }
-                         /*   if (staus == 0)
-                                ts(addStationPeople(sr, "SFTZ_2", 0L));//第二种 设备未离线 出站时间内未出站 */
                         }
                     }
                 }
@@ -171,54 +175,67 @@ public class AutomaticSch {
         //查询所有班次
         //remark 人工干预过的的不检测
         try {
+
+            stationRouteRepository.findAll();
+
+            Iterator<StationRoute> iterator = stationRouteRepository.findAll().iterator();
+//            Map<String, String> stationCode2Name = new HashMap<>();
+//            StationRoute sroute;
+//            while (iterator.hasNext()) {
+//                sroute = iterator.next();
+//                stationCode2Name.put(sroute.getLineCode() + "_" + sroute.getDirections() + "_" + sroute.getStationCode(), sroute.getStationMark());
+//            }
+//            
             Map<String, String> lineMap =  BasicData.lineCode2NameMap;
             List<ScheduleRealInfo>  oldSchDateList;
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()){
                 lineCode =ts.getKey();
                 oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
+      
+                Map m = new HashMap();
                 //排序
                 Collections.sort(oldSchDateList, new ScheduleComparator.FCSJ());
                 for (ScheduleRealInfo t : oldSchDateList){
                     // 发车误点 
-                    if (t.getFcsj() != null && t.getFcsjActual() != null  && t.getBcType().equals("normal") && StringUtils.isEmpty(t.getRemarks())){
-                        Long sst = ((t.getFcsjActualTime() - t.getFcsjT()) / 1000 / 60);
-                        Long fcsj = t.getFcsjT() / 1000 ;
-                        Long sfsj = t.getFcsjActualTime() / 1000;
-                        //获取车辆状态 gps没有的情况下，或者车辆状态异常的情况
-                        //判定gps发送时间和现在时间作对比
-                        GpsEntity gps =  gpsRealData.getByNbbm(t.getClZbh());
-                     /*   if (gps)*/
-                        //1.gps一直掉后一直没上线
-                        //2.车辆gps判断还在场站内
-                        //3.车辆信号离线的
-                        if (gps == null || gps.getInstation() == 2 ||
-                                (gps.getAbnormalStatus() != null && gps.getAbnormalStatus().equals("offline"))){
-                            //实发快一慢三   
-                          /*  if (sst <= 3 && sst >= -1){*/
-                                if(fcsj.equals(sfsj)) 
-                                    continue;
-                                //快1
-                                if(sfsj < fcsj && fcsj - sfsj <=  60 * 1) 
-                                    continue;
-                                //慢3
-                                if(fcsj < sfsj && sfsj - fcsj <= 60 *3) 
-                                    continue;
-                                
-                                
+                    if (t.getDfsj() != null && t.getFcsjActual() != null  
+                            && (t.getBcType().equals("normal") || t.getBcType().equals("region"))
+                            && (StringUtils.isEmpty(t.getRemarks()) || t.getRemarks().equals("_智能调度-异常实发"))) {
+
+                        long sjc = t.getFcsjActualTime() - t.getDfsjT();
+                        long time = System.currentTimeMillis();//当前时间
+                        
+                        if (t.getDfsjT() >  time) {
+                            //快1慢3
+                            if (sjc >= -1 * 60 * 1000 && sjc <= 3 * 60 * 1000) {
+                                continue;
+                            } else {
                                 //异常实发
-                                ts(addStationPeople(t,"YCSF",sst));
+                                ts(addStationPeople(t, "YCSF", 0l));
+                                Gson gson = new Gson();
+                                String chartStr = gson.toJsonTree(t).toString();
+                                logger.info("实发撤销--" + chartStr);
                             }
-                        /*}*/
-                       
+                        }
+                        
+                      /*  //待发时间要大于当前时间
+                        //车辆还在站内
+                        String mark = null;
+                        if (gps != null){
+                             mark = stationCode2Name.get(gps.getLineId()+"_"+gps.getUpDown()+"_"+gps.getStopNo());
+                        }
+                        if (t.getFcsjT() >  time && ((gps!= null && gps.getInstation() == 2) 
+                                || gps == null ||
+                                (gps!= null && mark!=null && mark.equals("B") && gps.getInstation() == 1) || 
+                                (gps!= null && mark!=null  && mark.equals("E") && gps.getInstation() == 1))) {
+                          
+                        }*/
                     }
                 }
             }
         }catch (Exception e){
             logger.error("实发撤销推送接口出错-----------",e);
         }
-        
-        
     }
     //发车信息微调检测  -- 车辆掉线后实发检测，重新计算时间发车时间
@@ -248,8 +265,8 @@ public class AutomaticSch {
             String lineCode;
             for (Map.Entry<String, String> ts : lineMap.entrySet()) {
                 lineCode = ts.getKey();
-                if (!lineCode.equals("12101"))
-                    return;
+             /*   if (!lineCode.equals("12101"))
+                    return;*/
                 oldSchDateList = dayOfSchedule.findByLineCode(lineCode);
                 for (ScheduleRealInfo t : oldSchDateList){
@@ -310,8 +327,12 @@ public class AutomaticSch {
                             LateAdjustHandle.putLate(sch);
                             List<Map> dzList = carMonitor.carMonitor(prev.getXlBm(), prev.getXlDir(), prev.getZdzCode());  //信息发布接口
                             for (Map m : dzList){
-                                if (m.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-",""))){
-                                    return addStationPeople(sch, "WD", 0L);
+                                if (basicData.nbbmCompanyPlateMap.get(prev.getClZbh()) != null && m.get("terminal").equals(basicData.nbbmCompanyPlateMap.get(prev.getClZbh()).replaceAll("-",""))){
+                                    sch.setRemark(m.get("sj").toString());
+                                    Gson gson = new Gson();
+                                    String chartStr = gson.toJsonTree(sch).toString();
+                                    logger.info("误点--"+chartStr);
+                                    ts(addStationPeople(sch, "WD", 0L));
                                 }
                             }
                         }
@@ -33,7 +33,10 @@ public interface DirectiveService extends BaseService&lt;D60, Integer&gt;{
 	 * @throws
 	 */
 	int send60Dispatch(ScheduleRealInfo sch, int finish, String sender,String txtPrefix);
-	
+
+
+	int send60Dispatchcc(ScheduleRealInfo sch, int finish, String sender,String txtPrefix);
+
 	/**
 	 * 
 	 * @Title: send60Dispatch 
@@ -179,6 +179,72 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;D60, Integer&gt; implemen
         return code;
     }
+    //出场请求
+    @Override
+    public int send60Dispatchcc(ScheduleRealInfo sch, int finish, String sender, String txtPrefix) {
+        D60 d60 = null;
+        try {
+            if (sch.isDestroy()) {
+                logger.warn("烂班不允许发送调度指令....");
+                return -1;
+            }
+            //待发应到时间
+            String dfsj = fmtHHmm.print(sch.getDfsjT() + (sch.getBcsj() * 60 * 1000));
+            String text = "出场请求,由" + sch.getQdzName() + "发往" + sch.getZdzName() + ";请出场";
+
+            //下发0x02指令  调度指令(闹钟有效)
+            long t = System.currentTimeMillis() + 1000 * 30,
+                    alarmTime = sch.getDfsjT() < t?t:sch.getDfsjT();
+
+            if(StringUtils.isNotEmpty(txtPrefix)){
+                text = txtPrefix + text;
+            }
+            text = StringEscapeUtils.unescapeHtml4(text);
+            int state = 0;//营运状态
+            if(dayOfSchedule.emptyService(sch))
+                state = 1;
+            d60 = new DirectiveCreator().createD60_02(sch.getClZbh(), text, Integer.parseInt(sch.getXlDir())
+                    , state, new Date(alarmTime));
+
+            d60.setLineCode(sch.getXlBm());
+        } catch (Exception e) {
+            logger.error("生成调度指令时出现异常", e);
+            return -1;
+        }
+
+        if (null == d60)
+            return -1;
+
+        d60.setSender(sender);
+
+        JSONObject jObj = JSON.parseObject(JSON.toJSONString(d60));
+
+        //进场或者出场班次时，附加lock 标识
+        if (null != sch.getBcType()
+                && (sch.getBcType().equals("out") || sch.getBcType().equals("in"))) {
+
+            jObj.put("lock", 1);
+        }
+
+        // 发送指令
+        int code = GatewayHttpUtils.postJson(jObj.toJSONString());
+
+        d60.setDispatch(true);
+        d60.setSch(sch);
+        d60.setHttpCode(code);
+
+        if (code == 0) {
+            sch.setDirectiveState(60);
+            // 通知页面
+            sendD60ToPage(sch);
+        } else {
+            d60.setErrorText("网关通讯失败, code: " + code);
+        }
+
+        dayOfDirectives.put60(d60);
+        return code;
+    }
+
     public int send60DispatchZndd(ScheduleRealInfo sch, int finish, String sender, String txtPrefix) {
         D60 d60 = null;
@@ -296,6 +296,9 @@ public class GpsServiceImpl implements GpsService {
         Map<String, Integer> lineCode2IdMap = BasicData.lineId2CodeMap.inverse();
         for(Map<String, Object> rs : dataList) {
+            if(rs.get("LINE_ID").toString().equals("0"))
+                continue;
+            
         	Object lineCode = rs.get("LINE_ID");
         	// 线路ID发生变化时补全线路切换信息 并新加入一个
         	if (oldLineId != (Integer)lineCode) {
@@ -1627,7 +1627,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             rs.put("ts", ts);
             LoggerZndd lz = new LoggerZndd();
-            String text = sch.getFcsj()+"的班次进行了实发调整";
+            String text = sch.getXlName()+"_"+sch.getFcsj()+"的班次进行了实发调整";
             lz.setText(text);
             lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
             lz.setCreateDate(new Date());
@@ -1728,7 +1728,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 dayOfSchedule.save(sch);
                 LoggerZndd lz = new LoggerZndd();
-                String text = sch.getFcsj()+"的班次进行了实发撤销调整";
+                String text = sch.getXlName()+"_"+sch.getFcsj()+"的班次进行了实发撤销调整";
                 lz.setText(text);
                 lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
                 lz.setCreateDate(new Date());
@@ -234,6 +234,9 @@
 <script src="/login_assets/js/jquery.min.js"></script>
 <script src="/login_assets/js/jsencrypt.min.js"></script>
 <script>
+    if (window.location.href.indexOf('58.34.47.74') > -1) {
+        window.location.href = window.location.href.replace('58.34.47.74', '10.10.150.103');
+    }
     window.onload=function(){
         var body=document.getElementsByTagName("body")[0];
         if(typeof body.style.WebkitAnimation=="undefined")
@@ -2185,7 +2185,6 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
     cursor: pointer;
     border-radius: 5px;
     color: white;
-    opacity: 0.9;
     padding: 10px;
     box-shadow: 0 0.125rem 0.8rem rgba(0, 0, 0, 0.1) !important;
 }
@@ -2193,7 +2192,6 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
     border: 1px solid #e79a00;
     background-color: #7ecbe4;
     font-size: 18px;
-    opacity: 0.9;
 }
 .msg-times {
@@ -2222,10 +2220,20 @@ g.gps-wrap rect.twinkle[updown=&quot;1&quot;] {
 .msg-date-info {
     padding-right: 20px;
 }
+.msg-date-info {
+    padding-top: 10px;
+    padding-right: 20px;
+}
 .colsebc{
     line-height: 20px;
     font-size: 1px;
 }
+.popup-msg-content{
+    border-bottom: 1px solid black;
+    padding-bottom: 5px;
+    padding-top: 10px;
+}
+
 .popup-msg-contents{
     text-align: right   ;
@@ -16,7 +16,7 @@ var gb_dataZndd = (function (){
     var timelist = [],interval;
     var dataMap = new Map();
-    var leftTime = 1000 * 40;//剩余的毫秒数
+    var leftTime = 1000 * 10;//剩余的毫秒数
     var timeType = false
     var sop = function (data) {
         /*//调度智能开关
@@ -120,7 +120,7 @@ var gb_dataZndd = (function (){
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('实发未发操作成功！');
                 //calc 应发未发
-                that.parent().parent().remove();
+                that.parent().parent().parent().remove();
             });
         }, '确认调整实发');
     });
@@ -154,7 +154,7 @@ var gb_dataZndd = (function (){
                 return 'ycsf.html';
                 break;
             case 'WD':
-                return 'wd.html';
+                //return 'wd.html';
                 break;
             case 'DJG':
                 return 'djg1.html';
@@ -295,7 +295,7 @@ var gb_dataZndd = (function (){
         }
         if (type == "WD"){
-            var minute = 6;
+         /*   var minute = 6;
             gb_common.$post_arr('/realSchedule/lateAdjust', {idx: sch.sch.id, minute: minute}, function (rs) {
                 console.log('误点调整rs', rs);
                 if(rs.ts){
@@ -303,7 +303,7 @@ var gb_dataZndd = (function (){
                     notify_succ('成功设置误点停靠时间');
                     UIkit.modal(modal).hide();
                 }
-            });
+            });*/
         }
     }
     function checkTime(i){ //将0-9的数字前面加上0，例1变为01
@@ -268,7 +268,7 @@
 </script>
 <!-- #### 智能调度 start ###  -->
 <script  id="zndd_plat_msg_template_config" type="text/html">
-    <div class="multi_plat_config"  data-linecode="{{lineCode}}" data-station="{{station}}" data-stationname="{{stationName}}" data-numtype="{{numType}}" 
+    <div class="multi_plat_config"  data-linecode="{{lineCode}}" data-station="{{station}}" data-stationname="{{stationName}}" data-numtype="{{numType}}"
          data-xlname="{{lineName}}" data-type="{{type}}" data-xldir="{{xlDir}}" data-rqstr="{{rqStr}}" data-types ="{{types}}" data-regionstopid="{{lg != null?lg.regionStopid:''}}" data-lgtype ="{{lg != null?lg.lGType:''}}"
          data-rq="{{rq}}" data-ids="{{ids}}" data-uuid="{{uuid}}">
         <div id ={{uuid}}  class="timer"></div>
@@ -281,14 +281,16 @@
             <div class="popup-msg-content">
                 <i class="fa fa-info-circle" aria-hidden="true"></i>
                 <span>{{lineName}} {{xlDir ==0 ?'上行':'下行'}}  {{clzbh}}   {{fcsj}} 出现 {{types}}</span>
+                <span  style="display:{{type == 'WD'?'':'none'}}"> 。{{sch.remark}}后车辆到站 </span>
             </div>
+            <br>
             <div class="popup-msg-contents"  style="display:{{type == 'YCSF'?'':'none'}}">
-                <button class="btn btn-default colsebc"  data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">取消实发</button>
+                <button class="uk-button uk-button-primary colsebc"  data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">取消实发</button>
             </div>
             <div class="centerSpace msg-title">
                 <div></div>
-                <div class="msg-date-info" style="display:{{type == 'SFTZ_1'?'':'none'}}" >
-                    <button class="btn btn-default sfTzbc" data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">补入发车时间</button>
+                <div class="msg-date-infos" style="display:{{type == 'SFTZ_1'?'':'none'}}" >
+                    <button class="uk-button uk-button-primary sfTzbc" data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">补入发车时间</button>
                 </div>
             </div>
         </div>