Merge branch 'lggj' of http://192.168.168.245:8888/panzhaov5/bsth_control into lggj

徐烜
2 parents 853edc1e 263fb4ef
Showing 77 changed files with 1106 additions and 115 deletions
src/main/java/com/bsth/controller/zndd/LoggerZnddController.java
src/main/java/com/bsth/data/gpsdata_v2/handlers/StationInsideProcess.java
src/main/java/com/bsth/data/pilot80/PilotReport.java
src/main/java/com/bsth/data/schedule/edit_logs/service/dto/SchEditInfoDto.java
src/main/java/com/bsth/data/zndd/AutomaticSch.java
src/main/java/com/bsth/data/zndd/OutEntrance.java
src/main/java/com/bsth/data/zndd/carMonitor.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/entity/zndd/LoggerZndd.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CalcSheetServiceImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/zndd/LoggerZnddService.java
src/main/java/com/bsth/service/zndd/impl/LoggerZnddServiceImpl.java
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
src/main/resources/static/pages/forms/mould/sch_tzsf.xls
@@ -44,4 +44,14 @@ public class LoggerZnddController  extends BaseController&lt;LoggerZndd, Integer&gt; {
     public ScheduleRealInfo thissch(@PathVariable("id") Integer id){
         return loggerZnddService.thissch(id);
     }
+
+    @RequestMapping(value = "LineUserAll", method = RequestMethod.GET)
+    public String LineUserAll(@RequestParam Integer userId) {
+
+        return loggerZnddService.LineUserAll(userId);
+    }
+    @RequestMapping(value = "schTZSF", method = RequestMethod.GET)
+    public  Map<String, Object>  schTZSF(String line,String date,String endDate,String changType,String type){
+        return loggerZnddService.schTZSF(line,date,endDate,changType,type);
+    }
 }
@@ -5,6 +5,8 @@ import com.bsth.data.gpsdata_v2.cache.GpsCacheData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.gpsdata_v2.entity.StationRoute;
 import com.bsth.data.gpsdata_v2.utils.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.util.List;
@@ -16,6 +18,9 @@ import java.util.List;
 @Component
 public class StationInsideProcess {
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
     public void process(GpsEntity gps) {
         //是否在场内
         String parkCode = GeoUtils.gpsInCarpark(gps);
@@ -25,7 +30,8 @@ public class StationInsideProcess {
             gps.setStopNo(parkCode);
             gps.setCarparkNo(parkCode);
         }
-
+        //重新计算车辆执行班次
+        dayOfSchedule.reCalcExecPlan(gps.getNbbm());
         //是否在站内
         List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
         StationRoute station = GeoUtils.gpsInStation(gps, srs);
@@ -13,6 +13,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D80Repository;
 import com.bsth.repository.directive.DC0A4Repository;
+import com.bsth.service.SystemParamService;
 import com.bsth.service.directive.DirectiveService;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.websocket.handler.SendUtils;
@@ -53,6 +54,8 @@ public class PilotReport {
     @Autowired
     GpsStatusManager gpsStatusManager;
+    @Autowired
+    private SystemParamService systemParamService;
     private static ConcurrentHashMap<Integer, D80> d80Maps;
     /**
@@ -101,7 +104,7 @@ public class PilotReport {
                 //报警请求
                 case 0x10:
                     try {
-                        String url = "http://58.34.52.130:9103/dataDockingApi/accident/saveAccident?";
+                        String url = systemParamService.getValue("url.yjbj")+"dataDockingApi/accident/saveAccident?";
                         url = url + "accidentTime=" + new Date().getTime() + "&nbbm=" + nbbm;
                         logger.info("url===="+url);
                         String res = HttpClientUtils.get(url).toString();
@@ -59,6 +59,10 @@ public class SchEditInfoDto {
      */
     private long ts;
+    private String xlName;
+
+    private String text;
+
     public long getId() {
         return id;
     }
@@ -219,4 +223,20 @@ public class SchEditInfoDto {
     public void setTs(long ts) {
         this.ts = ts;
     }
+
+    public String getXlName() {
+        return xlName;
+    }
+
+    public void setXlName(String xlName) {
+        this.xlName = xlName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
 }
@@ -82,7 +82,7 @@ public class AutomaticSch {
     public  void mz(){
         try {
-            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W1Q-006","normal");
+            List<ScheduleRealInfo> sr = dayOfSchedule.findByBcType("W9G-041","normal");
             ts(addStationPeople(sr.get(5), "MZ", 0L));//第二种 设备未离线 出站时间内未出站
         }
         catch (Exception e){
@@ -106,10 +106,14 @@ public class AutomaticSch {
                  }else {
                      continue;
                  }
-                 if (k == 0 && lg.getlGType() == 0){
-                     ts(ConvertDJK(lg,sch,"FCJG"));
+                 if (k == 0 ){
+                     if(lg.getlGType() == 0){
+                         ts(ConvertDJK(lg,sch,"FCJG"));
+                     }
                  }else {
-                     ts(ConvertDJK(lg,sch,"DJG"));
+                     if(lg.getlGType() != 0){
+                         ts(ConvertDJK(lg,sch,"DJG"));
+                     }
                  }
             }
 package com.bsth.data.zndd;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.StationRoute;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.zndd.StationPeopleLogger;
 import com.bsth.entity.zndd.StationSignsLogger;
-import com.bsth.service.schedule.utils.Md5Util;
 import com.bsth.util.HttpClientUtils;
 import com.bsth.util.SignUtils;
 import com.bsth.websocket.handler.SendUtils;
@@ -18,8 +17,18 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.time.Duration;
 import java.time.LocalTime;
@@ -65,6 +74,7 @@ public class OutEntrance {
      public Map OutCarOutCar(@RequestParam Map m,@RequestBody StationSignsLogger ssLogger) {
          Map rtn = new HashMap<>();
          try {
+             logger.info("催发接口调用----");
              if(!SignUtils.validation(ssLogger.getTimestamp(),ssLogger.getSign())){
                  rtn.put("status", "验证失败");
                  return rtn;
@@ -99,21 +109,26 @@ public class OutEntrance {
                  rtn.put("message",s+"车辆预计还有"+dzList.get(0).get("sj")+"抵达，请耐心等待");
              }else {
                  //筛选方向
-                 List<ScheduleRealInfo> rs = dayOfSchedule.findByLineCode(ssLogger.getLineCode());
+                 List<ScheduleRealInfo> rs = dayOfSchedule.findByLineAndUpDown(ssLogger.getLineCode(),Integer.parseInt(ssLogger.getDir()));
                  if(rs.size()>0){
                      //排序
                      Collections.sort(rs,new ScheduleComparator.FCSJ());
-                     SimpleDateFormat sdf= new SimpleDateFormat("HH:ss");
-                     String sjtext = "";
+                     SimpleDateFormat sdf= new SimpleDateFormat("HH:mm");
+                     String sjtext = null;
                      LocalTime t1 = LocalTime.parse(sdf.format(new Date()), DateTimeFormatter.ofPattern("HH:mm"));
                      for (ScheduleRealInfo sr:rs) {
                          LocalTime t2 = LocalTime.parse(sr.getFcsj(), DateTimeFormatter.ofPattern("HH:mm"));
-                         //判断上下行
-                         if(t1.isAfter(t2)){
+                         //最近的运营班次
+                         if(t2.isAfter(t1) && (sr.getBcType().equals("normal")||sr.getBcType().equals("region"))){
                              sjtext = sr.getFcsj();
+                             break;
                          }
                      }
-                     rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                     if(sjtext!=null){
+                         rtn.put("message","车辆预计"+sjtext+"发车，请耐心等待");
+                     }else {
+                         rtn.put("message","当日运营已结束");
+                     }
                  }else {
                      rtn.put("message","当日运营已结束");
                  }
@@ -133,6 +148,7 @@ public class OutEntrance {
     public Map klyj(@RequestBody JSONObject jsonObject) {
         Map rtn = new HashMap<>();
         try {
+            logger.info("大客流接口调用----");
             if(!SignUtils.validation(Long.parseLong(jsonObject.getString("timestamp")),jsonObject.getString("sign"))){
                 rtn.put("status", "验证失败");
                 return rtn;
@@ -257,7 +273,7 @@ public class OutEntrance {
             rtn.put("status",ResponseCode.SUCCESS);
         } catch (Exception e) {
             rtn.put("status", ResponseCode.ERROR);
-            Logger logger = LoggerFactory.getLogger(this.getClass());
+            logger.error("大客流推送异常----",e);
         }
         return rtn;
     }
@@ -303,7 +319,7 @@ public class OutEntrance {
                     destfile.mkdirs();
                 }
                 //文件新名称
-                String fileNameNew = "666"+ ".png";
+                String fileNameNew = AutomaticSch.UUID()+ ".png";
                 File f = new File(destfile.getAbsoluteFile() + File.separator + fileNameNew);
                 // 将字符串转换成二进制，用于显示图片
                 // 将上面生成的图片格式字符串 imgStr，还原成图片显示
@@ -329,6 +345,30 @@ public class OutEntrance {
         return null;
     }
+    /**
+     * 转移文件图片
+     * @param  url 文件路径
+     * @param  （示例：D:\\1.png）
+     * @return
+     */
+    public String moveImg(String url) throws Exception {
+        try {
+            String file = url.replace("/"+profile+"/avat",imgurl+"/img");
+            String destDir = file.substring(0,file.lastIndexOf("/"));
+            File destPath = new File(destDir);
+            if (!destPath.exists()) {
+                destPath.mkdirs();
+            }
+            Path sourceFile= Paths.get(url.replace("/"+profile,imgurl));
+            Path destFile= Paths.get(url.replace("/"+profile+"/avat",imgurl+"/img"));
+            Files.copy(sourceFile, destFile,StandardCopyOption.REPLACE_EXISTING);
+            return file;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
     private static ConcurrentMap<String, Map<String,Object>> trafficMap = new ConcurrentHashMap<>();
     public String getTraffic(String nbbm,String lon,String lat){
         Map<String,Object> traffic=trafficMap.get(nbbm);
@@ -354,5 +394,26 @@ public class OutEntrance {
         return traffic.get("trafficStatus").toString();
     }
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void clearImg(){
+        try {
+            File folder=new File(imgurl+"/avat");
+            delete(folder);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void delete(File folder) throws Exception{
+        if(folder.isDirectory()) {
+            File[] files = folder.listFiles();
+            if(files != null) { // 如果文件夹为空，files可能为null
+                for(File file : files) {
+                    delete(file); // 递归删除子文件夹和文件
+                }
+            }
+        }
+        folder.delete(); // 删除空文件夹或者文件
+    }
 }
 package com.bsth.data.zndd;
+import com.bsth.service.SystemParamService;
 import org.apache.commons.io.IOUtils;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import java.io.ByteArrayOutputStream;
@@ -20,13 +22,13 @@ import java.util.*;
 public class carMonitor {
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    static String url;
-    
+    @Autowired
+    private SystemParamService systemParamService;
     public List<Map> carMonitor(String lineCode,String directions,String station) {
         List<Map> list = new ArrayList<>(); //返回的接口数据
-        url = "http://58.34.52.130:9777/xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
+        String url = systemParamService.getValue("url.xxfb")+"xxfb/jd/carMonitor?lineid="+lineCode+"&stopid="+station+"&direction="+directions;
         InputStream in = null;
         OutputStream out = null;
         try {
@@ -245,6 +245,18 @@ public class ScheduleRealInfo {
 	@Transient
 	private String kxcl;
+	/**
+	 * 大客流图片
+	 */
+	@Transient
+	private String img;
+
+	/**
+	 * 操作类型 大客流-1
+	 */
+	@Transient
+	private String operationType;
+
 	public Integer getLpChange() {
 		return lpChange;
 	}
@@ -1026,4 +1038,20 @@ public class ScheduleRealInfo {
 	public void setKxcl(String kxcl) {
 		this.kxcl = kxcl;
 	}
+
+	public String getImg() {
+		return img;
+	}
+
+	public void setImg(String img) {
+		this.img = img;
+	}
+
+	public String getOperationType() {
+		return operationType;
+	}
+
+	public void setOperationType(String operationType) {
+		this.operationType = operationType;
+	}
 }
@@ -3,6 +3,7 @@ package com.bsth.entity.sys;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.joda.time.DateTime;
+import org.springframework.format.annotation.DateTimeFormat;
 import javax.persistence.*;
 import java.io.Serializable;
@@ -36,10 +37,12 @@ public class SysUser implements Serializable {
 	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date updateDate;
-	
+
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date lastLoginDate;
     /** 最近密码更新时间 */
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date lastPwdDate;
     /** 密码有效期 */
     private Integer pwdValidPeriod;
@@ -32,6 +32,8 @@ public class LoggerZndd implements Serializable {
     private String dir;
+    private String img;
+
     // 创建日期
     @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
     private Date createDate;
@@ -107,4 +109,12 @@ public class LoggerZndd implements Serializable {
     public void setDir(String dir) {
         this.dir = dir;
     }
+
+    public String getImg() {
+        return img;
+    }
+
+    public void setImg(String img) {
+        this.img = img;
+    }
 }
@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
@@ -29,6 +30,7 @@ import java.util.concurrent.*;
 import java.util.regex.Pattern;
 import com.bsth.data.SystemParamCache;
+import com.bsth.data.zndd.OutEntrance;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.repository.zndd.LoggerZnddRepository;
 import org.apache.commons.io.IOUtils;
@@ -228,6 +230,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     @Autowired
     LoggerZnddRepository loggerZnddRepository;
+    @Autowired
+    OutEntrance outEntrance;
+
     Logger logger = LoggerFactory.getLogger(this.getClass());
     SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
@@ -728,6 +733,26 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> save(ScheduleRealInfo sch) {
         Map<String, Object> rs = new HashMap<>();
         try {
+            if("1".equals(sch.getOperationType())){//大客流临加班次
+                String img = outEntrance.moveImg(sch.getImg());
+                if(img==null){
+                    rs.put("status", ResponseCode.ERROR);
+                    rs.put("msg", "照片缺失");
+                    return rs;
+                }
+                LoggerZndd lz = addZndd(sch);
+                String text = "大客流预警:"+sch.getXlName()+"_"+sch.getFcsj()+"新增临加班次";
+                lz.setText(text);
+                lz.setCreateBy(SecurityUtils.getCurrentUser().getId());
+                lz.setCreateDate(new Date());
+                lz.setLineCode(sch.getXlBm());
+                lz.setLineName(sch.getXlName());
+                lz.setDir(sch.getXlDir());
+                lz.setImg(img);
+                String rq=java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd").format(LocalDate.now());
+                lz.setRq(rq);
+                loggerZnddRepository.save(lz);
+            }
             String clZbh = sch.getClZbh(), lpName = sch.getLpName();
             if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) {
                 rs.put("status", ResponseCode.ERROR);
@@ -121,12 +121,12 @@ public class CalcSheetServiceImpl extends BaseServiceImpl&lt;CalcSheet, Integer&gt; im
 				s.setXl(rs.getString("xl"));
 				s.setXlName(rs.getString("xl_name"));
 				s.setId(rs.getInt("id"));
-				s.setJhszfcs(rs.getString("jhszfcs"));
-				s.setSjszfczds(rs.getString("sjszfczds"));
-				s.setSjszddzds(rs.getString("sjszddzds"));
-				int jhfc=Integer.parseInt(rs.getString("jhszfcs"));
-				int zdfc=Integer.parseInt(rs.getString("sjszfczds"));
-				int zddd=Integer.parseInt(rs.getString("sjszddzds"));
+				s.setJhszfcs(rs.getString("jhszfcs").split("\\.")[0]);
+				s.setSjszfczds(rs.getString("sjszfczds").split("\\.")[0]);
+				s.setSjszddzds(rs.getString("sjszddzds").split("\\.")[0]);
+				int jhfc=Integer.parseInt(rs.getString("jhszfcs").split("\\.")[0]);
+				int zdfc=Integer.parseInt(rs.getString("sjszfczds").split("\\.")[0]);
+				int zddd=Integer.parseInt(rs.getString("sjszddzds").split("\\.")[0]);
 				if(jhfc>0){
 					double zdl=(zdfc*1.0)/(jhfc*1.0)*100;
 					s.setSzfczdl(df.format(zdl)+"%");
@@ -471,8 +471,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         // 构造表头
         excelPoiOperator.createStringCell(wb, lpHeadRow, (short) 0, "路牌", new Color(0x96b9d7));
-        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
-        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = null;
+        StationRoute station2 = null;
         // TODO
         Map<String, Object> param = new HashMap<>();
@@ -596,8 +596,8 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
         excelPoiOperator.createStringCell(wb, lpHeadRow, (short) 2, "出场", new Color(0x96b9d7));
-        StationRoute station1 = stationRouteService.findById(lpObjList.get(0).getStationRouteId1());
-        StationRoute station2 = stationRouteService.findById(lpObjList.get(1).getStationRouteId2());
+        StationRoute station1 = null;
+        StationRoute station2 = null;
         // TODO
         Map<String, Object> param = new HashMap<>();
@@ -3,6 +3,7 @@ package com.bsth.service.zndd;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.service.BaseService;
+import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.Map;
@@ -18,4 +19,8 @@ public interface LoggerZnddService extends BaseService&lt;LoggerZndd, Integer&gt; {
     ScheduleRealInfo thissch(Integer ids);
+
+     String LineUserAll(@RequestParam Integer userId);
+
+    Map<String, Object> schTZSF(String line,String date,String endDate,String changType,String type);
 }
 package com.bsth.service.zndd.impl;
+import com.alibaba.fastjson.JSON;
+import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.data.schedule.edit_logs.service.dto.SchEditInfoDto;
+import com.bsth.entity.Line;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.entity.sys.RealControAuthority;
 import com.bsth.entity.zndd.LoggerZndd;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.repository.zndd.LoggerZnddRepository;
+import com.bsth.service.LineService;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.service.report.ReportService;
+import com.bsth.service.sys.RealControAuthorityService;
 import com.bsth.service.zndd.LoggerZnddService;
+import com.bsth.util.ReportUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import org.springframework.data.domain.Sort;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.RequestParam;
 import java.text.SimpleDateFormat;
 import java.time.LocalTime;
@@ -34,8 +45,15 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     ScheduleRealInfoService scheduleRealInfoService;
     @Autowired
     ScheduleRealInfoRepository scheduleRealInfoRepository;
+    @Autowired
+    LineService lineService;
+    @Autowired
+    ReportService reportService;
-
+    @Autowired
+    RealControAuthorityService realControAuthorityService;
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     Logger logger = LoggerFactory.getLogger(this.getClass());
     private static SimpleDateFormat sdfMonth = new SimpleDateFormat("HH:mm");
     private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -137,28 +155,38 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     public  ScheduleRealInfo thissch(Integer ids){
         ScheduleRealInfo sch=dayOfSchedule.get(ids);
-        Set<String> set = dayOfSchedule.findCarByLineCode(sch.getXlBm());
+        Line line = lineService.findByLineCode(sch.getXlBm());
+        List<Map<String, Object>> lineList=reportService.lineList();
+        Set<String> lines = new HashSet<>();
+        for (Map<String, Object> map : lineList) {
+            if(line.getBrancheCompany().equals(map.get("fgsbm").toString())){
+                lines.add(map.get("xlbm").toString());
+            }
+        }
         List<String> nbbms=new ArrayList<>();
         List<String> jghs=new ArrayList<>();
         List<String> jNames=new ArrayList<>();
-        LocalTime localTime=LocalTime.now().plusHours(1);
-        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
-        for (String nbbm : set) {
-            ScheduleRealInfo s=dayOfSchedule.executeCurr(nbbm);//当前执行班次
-             if(s==null){//当日班次执行完毕
-                 List<ScheduleRealInfo> list=dayOfSchedule.findByNbbm(nbbm);
-                if(list.size()>0){
-                    ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次
-                    nbbms.add(s2.getClZbh());
-                    jghs.add(s2.getjGh());
-                    jNames.add(s2.getjName());
-                }
-            }else {//1小时内是否有待执行班次
-                LocalTime fcsj=LocalTime.parse(s.getFcsj(),dtf);
-                if(fcsj.isAfter(localTime)){
-                    nbbms.add(s.getClZbh());
-                    jghs.add(s.getjGh());
-                    jNames.add(s.getjName());
+        for (String lineCode : lines) {
+            Set<String> set = dayOfSchedule.findCarByLineCode(lineCode);
+            LocalTime localTime=LocalTime.now().plusHours(1);
+            DateTimeFormatter dtf=DateTimeFormatter.ofPattern("HH:mm");
+            for (String nbbm : set) {
+                ScheduleRealInfo s=dayOfSchedule.executeCurr(nbbm);//当前执行班次
+                if(s==null){//当日班次执行完毕
+                    List<ScheduleRealInfo> list=dayOfSchedule.findByNbbm(nbbm);
+                    if(list.size()>0){
+                        ScheduleRealInfo s2=list.get(list.size()-1);//最后一个班次
+                        nbbms.add(s2.getClZbh());
+                        jghs.add(s2.getjGh());
+                        jNames.add(s2.getjName());
+                    }
+                }else {//1小时内是否有待执行班次
+                    LocalTime fcsj=LocalTime.parse(s.getFcsj(),dtf);
+                    if(fcsj.isAfter(localTime)){
+                        nbbms.add(s.getClZbh());
+                        jghs.add(s.getjGh());
+                        jNames.add(s.getjName());
+                    }
                 }
             }
         }
@@ -168,7 +196,8 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
             sch.setClZbh(nbbms.get(0));
             sch.setjGh(jghs.get(0));
             sch.setjName(jNames.get(0));
-            for (int i = 0; i < nbbms.size(); i++) {
+            int size =nbbms.size()>10?9:nbbms.size();
+            for (int i = 0; i < size; i++) {
                 sb.append(nbbms.get(i)+"/");
                 sb.append(jNames.get(i)+",");
             }
@@ -179,4 +208,93 @@ public class LoggerZnddServiceImpl extends BaseServiceImpl&lt;LoggerZndd, Integer&gt; 
     }
+
+    public String LineUserAll(@RequestParam Integer userId){
+        String xlNames ="";
+        RealControAuthority rcay = realControAuthorityService.findByUserId(userId);
+        String lineCodeStr = rcay.getLineCodeStr();
+        String[] lineArray = lineCodeStr.split(",");
+        for(String line : lineArray){
+            List<ScheduleRealInfo>  schList = dayOfSchedule.findByLineCode(line);
+            for(ScheduleRealInfo sc : schList){
+                if (sc.getStatus() == 0 || sc.getStatus() == 1){
+                    xlNames += sc.getXlName()+",";
+                    break;
+                }
+            }
+        }
+        return xlNames;
+
+    }
+
+    public  Map<String, Object> schTZSF(String line,String date,String endDate,String changType,String type){
+
+        Map<String, Object> rs = new HashMap();
+        try {
+            String cont = "";
+            if (line != null && !line.equals("")){
+                cont = " and line_code  ="+line;
+            }
+            String bcType ="";
+            if (changType.equals("0")){
+                bcType = " and bc_type not in ('in','out','venting')";
+            }else {
+                bcType =" and bc_type in ('out')";
+            }
+
+            //拼接除rq、lineCode 外的其他where 条件
+            String sql = "select t1.*, t2.fcsj,t2.lp_name,t2.cl_zbh,t2.j_gh,t2.j_name,t2.xl_dir,t2.real_exec_date,t2.xl_name from (select * from logger_sch_modify where rq >=? and rq <=?  and type in('SFTZ','FCXXWT') and remarks !='自动调度实发未发-车辆掉线'"+cont+"  ) t1 INNER JOIN bsth_c_s_sp_info_real t2 on t1.sch_id=t2.id where 1=1 " +bcType;
+            List<SchEditInfoDto> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(SchEditInfoDto.class), date,endDate);
+            rs.put("status", ResponseCode.SUCCESS);
+            List<SchEditInfoDto> listnew = new ArrayList<>();
+            for(SchEditInfoDto item : list){
+                List<Map> lists = (List) JSON.parse(item.getJsonArray());
+                for(Map its : lists){
+                    if (item.getType().equals("FCXXWT")) {
+                        if (its.get("old") != null && its.get("title").equals("调整实发时间")) {
+                            String text = "调整前：" + its.get("old") + ",调整后：" + its.get("now");
+                            item.setText(text);
+                            listnew.add(item);
+                            break;
+                        }
+                    }else {
+                        if(its.get("old") != null){
+                            String text = "调整前：" + its.get("old") + ",调整后：" + its.get("now");
+                            item.setText(text);
+                            break;
+                        }
+                    }
+                };
+            };
+
+            rs.put("list", listnew);
+
+            if(type.equals("export")){
+                List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+                Map<String, Object> m = new HashMap<String, Object>();
+                ReportUtils ee = new ReportUtils();
+                List list1 = new ArrayList();
+                for(SchEditInfoDto sed : listnew){
+                    Map map = JSON.parseObject(JSON.toJSONString(sed), Map.class);
+                    list1.add(map);
+                }
+
+                try {
+                    listI.add(list1.iterator());
+                    String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+                    ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sch_tzsf.xls",
+                            path + "export/"+date+"-"+endDate+"-异常调整实发.xls");
+                } catch (Exception e) {
+                    // TODO: handle exception
+                    e.printStackTrace();
+                }
+            }
+
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
 }
@@ -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','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','zndd_yuan' + sp + 'call']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','call']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
@@ -38,7 +38,7 @@
 		<div class="actions">
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
-				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 打开现有时刻表明细</a>
+				<a class="btn btn-circle blue openHaveSkb" href="javascript:;" data-pjax><i class="fa fa-check"></i> 排班诊断</a>
 			</div>
 			<div class="btn-group btn-group-devided" data-toggle="buttons">
 				<a class="btn btn-circle default" href="/pages/base/timesmodel/index.html" style="float: right;padding: 4px 23px;" data-pjax=""><i class="fa fa-reply"></i> 退出</a>
@@ -50,7 +50,7 @@
 				<!-- actions 组件START -->
 				<div class="actions">
 					<div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
-						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 统计数据</a>
+						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 排班统计</a>
 					</div>
                     <div class="btn-group btn-group-devided parambtn" data-toggle="buttons">
                         <a class="btn btn-circle blue paramAdd" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 重新生成</a>
@@ -42,7 +42,7 @@ $(&#39;.addBc&#39;).on(&#39;click&#39;,function() {
     var lpData = echartsDrawGTT.getLpData();
     var lpDataCount = echartsDrawGTT.getLpDataCount();
     // 弹出层mobal页面
-    $.get('/pages/base/timesmodel/fragments/addBc.html', function(m){
+    $.get('/pages/base/timesmodel/fragments/addbc.html', function(m){
         $(pjaxContainer).append(m);
         // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
         $('#addBc_mobal').trigger('addBcMobal.show',[lpData,lpDataCount,echartsDrawGTT]);
+<style type="text/css">
+    .table-bordered {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td,
+    .table-bordered > tbody > tr > th,
+    .table-bordered > tbody > tr > td,
+    .table-bordered > tfoot > tr > th,
+    .table-bordered > tfoot > tr > td {
+        border: 1px solid; }
+    .table-bordered > thead > tr > th,
+    .table-bordered > thead > tr > td {
+        border-bottom-width: 2px; }
+
+    .table > tbody + tbody {
+        border-top: 1px solid; }
+</style>
+
+<div class="page-head">
+    <div class="page-title">
+        <h1>异常调整实发</h1>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-md-12">
+        <div class="portlet light porttlet-fit bordered">
+            <div class="portlet-title">
+                <form class="form-inline" action="">
+                    <div style="display: inline-block;">
+                        <span class="item-label" style="width: 140px;">线路: </span>
+                        <select class="form-control" name="line" id="line" style="width: 136px;"></select>
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">开始时间: </span>
+                        <input class="form-control" type="text" id="date" style="width: 160px;" />
+                    </div>
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <span class="item-label" style="width: 80px;">结束时间: </span>
+                        <input class="form-control" type="text" id="endDate" style="width: 160px;" />
+                    </div>
+
+
+                    <div style="display: inline-block;margin-left: 15px;">
+                        <select name="type" class="form-control" id="changType">
+                            <option value="0">营运</option>
+                            <option value="1">出场</option>
+                        </select>
+                    </div>
+
+                    <div class="form-group">
+                        <input class="btn btn-default" type="button" id="query" value="筛选"/>
+                        <input class="btn btn-default" type="button" id="export" value="导出"/>
+                    </div>
+                </form>
+            </div>
+            <div class="portlet-body">
+                <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+                    <table class="table table-bordered table-hover table-checkable" id="forms">
+                        <thead>
+                        <tr>
+                            <th colspan="10">异常调整实发明细表</th>
+                        </tr>
+                        <tr>
+                            <td>编号</td>
+                            <td>日期</td>
+                            <td>线路</td>
+                            <td>路牌</td>
+                            <td>车号</td>
+                            <td>司机</td>
+                            <td>计发</td>
+                            <td>修改详细</td>
+                            <td>修改人</td>
+                            <td>备注</td>
+                        </tr>
+                        </thead>
+                        <tbody class="list_correctForm">
+
+                        </tbody>
+                        <tbody class="list_correctForm_statistics">
+
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    $(function(){
+        $("#export").attr('disabled',"true");
+
+        // 关闭左侧栏
+        if (!$('body').hasClass('page-sidebar-closed'))
+            $('.menu-toggler.sidebar-toggler').click();
+
+        var d = new Date();
+        //d.setTime(d.getTime() - 1*1000*60*60*24);
+        var year = d.getFullYear();
+        var month = d.getMonth() + 1;
+        var day = d.getDate();
+        if(month < 10)
+            month = "0" + month;
+        if(day < 10)
+            day = "0" + day;
+        var dateTime = year + "-" + month + "-" + day;
+        $("#date").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+        $("#endDate").datetimepicker({
+            format : 'YYYY-MM-DD',
+            locale : 'zh-cn',
+            maxDate : dateTime
+        });
+        $("#date").val(dateTime);
+        $("#endDate").val(dateTime);
+
+        $.get('/report/lineList',function(xlList){
+            var data = [];
+ 			data.push({id: "", text: "全部线路"});
+            $.get('/user/companyData', function(result){
+                for(var i = 0; i < result.length; i++){
+                    var companyCode = result[i].companyCode;
+                    var children = result[i].children;
+                    for(var j = 0; j < children.length; j++){
+                        var code = children[j].code;
+                        for(var k=0;k < xlList.length;k++ ){
+                            if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+                                data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+// 								tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+                            }
+                        }
+                    }
+                }
+                initPinYinSelect2('#line',data,'');
+
+            });
+        });
+
+        $('#czcl').on('click', function () {
+            $('#code').val('').change();
+        });
+
+
+        $("#query").on("click",function(){
+            var line = $("#line").val();
+            var date = $("#date").val();
+            var endDate = $("#endDate").val();
+            var changType =$("#changType").val();
+            if (line == "全部线路")
+                line = "";
+            var type = "query";
+            $get("/logZndd/schTZSF",{line:line,date:date,endDate:endDate,changType:changType,type:type},function(result){
+                //两种情况
+                // 1.发车信息微调   是实发调整
+                // 2.实发调整  old不是空调整
+                var list  = result.list;
+
+                var list_correctForm = template('list_correctForm',{list});
+                // 把渲染好的模版html文本追加到表格中
+                $('#forms .list_correctForm').html(list_correctForm);
+
+                if(list.length == 0)
+                    $("#export").attr('disabled',"true");
+                else
+                    $("#export").removeAttr("disabled");
+
+            });
+        });
+
+        $("#export").on("click",function(){
+            var line = $("#line").val();
+            var date = $("#date").val();
+            var endDate = $("#endDate").val();
+            var changType =$("#changType").val();
+            if (line == "全部线路")
+                line = "";
+            var type = "export";
+            $get('/logZndd/schTZSF',{line:line,date:date,endDate:endDate,changType:changType,type:type},function(result){
+                window.open("/downloadFile/download?fileName="
+                    +date+"-"+endDate+"-异常调整实发");
+            });
+        });
+
+    });
+</script>
+<script type="text/html" id="list_correctForm">
+    {{each list as obj i}}
+    <tr>
+        <td>{{i+1}}</td>
+        <td>{{obj.rq}}</td>
+        <td>{{obj.xlName}}</td>
+        <td>{{obj.lpName}}</td>
+        <td>{{obj.clZbh}}</td>
+        <td>{{obj.jName}}/{{obj.jGh}}</td>
+        <td>{{obj.fcsj}}</td>
+        <td>{{obj.text}}</td>
+        <td>{{obj.user}}</td>
+        <td>{{obj.remarks}}</td>
+    </tr>
+    {{/each}}
+    {{if list.length == 0}}
+    <tr>
+        <td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
+    </tr>
+    {{/if}}
+</script>
@@ -192,7 +192,7 @@
                     <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
                     <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
-                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
+                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 排班优化 </a>
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>
@@ -182,8 +182,8 @@
              id: 'card4',
              x: 100,
              y: 400,
-             label: '待发调整',
-             type: "待发调整",
+             label: '待发调整工具',
+             type: "待发调整工具",
              nodes: [{
                  type: "in",
                  level: 0,
@@ -199,13 +199,35 @@
              }
              ],
              titleBarColor: ['#3950e8', '#25f6d0']
-            },
+        },
         {
             id: 'card5',
             x: 100,
             y: 400,
-            label: '班次取消（烂班）',
-            type: "班次取消（烂班）",
+            label: '班次取消（烂班）工具',
+            type: "班次取消（烂班）工具",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card51',
+            x: 100,
+            y: 400,
+            label: '撤销班次取消（烂班）工具',
+            type: "撤销班次取消（烂班）工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -226,8 +248,30 @@
             id: 'card6',
             x: 100,
             y: 400,
-            label: '实发调整',
-            type: "实发调整",
+            label: '实发调整工具',
+            type: "实发调整工具",
+            nodes: [{
+                type: "in",
+                level: 0,
+                enumType: 'call',
+                color: '#fff',
+
+            },
+                {
+                    type: "out",
+                    level: 0,
+                    enumType: 'call',
+                    color: '#3C8CE7',
+                }
+            ],
+            titleBarColor: ['#3950e8', '#25f6d0']
+        },
+        {
+            id: 'card7',
+            x: 100,
+            y: 400,
+            label: '实发撤销工具',
+            type: "实发撤销工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -248,8 +292,8 @@
             id: 'card7',
             x: 100,
             y: 400,
-            label: '实发撤销',
-            type: "实发撤销",
+            label: '发车信息微调工具',
+            type: "发车信息微调工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -270,8 +314,8 @@
             id: 'card8',
             x: 100,
             y: 400,
-            label: '新增临加班次',
-            type: "新增临加班次",
+            label: '新增临加班次工具',
+            type: "新增临加班次工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -292,8 +336,8 @@
             id: 'card9',
             x: 100,
             y: 400,
-            label: '调整人车',
-            type: "调整人车",
+            label: '调整人车工具',
+            type: "调整人车工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -314,8 +358,8 @@
             id: 'card10',
             x: 100,
             y: 400,
-            label: '指令重发',
-            type: "指令重发",
+            label: '指令重发工具',
+            type: "指令重发工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -336,8 +380,8 @@
             id: 'card11',
             x: 100,
             y: 400,
-            label: '路牌对调',
-            type: "路牌对调",
+            label: '路牌对调工具',
+            type: "路牌对调工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -358,8 +402,8 @@
             id: 'card12',
             x: 100,
             y: 400,
-            label: '误点调整',
-            type: "误点调整",
+            label: '误点调整工具',
+            type: "误点调整工具",
             nodes: [{
                 type: "in",
                 level: 0,
@@ -30,7 +30,7 @@ var gb_main_ep = new EventProxy(),
             //判断如果用户按下了回车键（keycody=13）
             if (keyNum == 13) {
                 fired = true;
-                debugger
+
                 let lineCode = gb_schedule_table.TablelineCode;
                 document.getElementById("recidress").style.display = 'none';
                 recorder.upload("zndd/do/"+lineCode, function (state, e) {
@@ -36,17 +36,30 @@ var gb_northToolbar = (function () {
             //exit
             $('.north .north-toolbar .exit-system').on('click', function () {
                 //调度员退出时提示未全部完成班次的线路
-                debugger
                 //默认只取一个角色
-              /*  if(currentUser.currentUser[0].codeName == "BSTH_A"){
+                if(user.roles[0].codeName == "LG_DDY" || user.roles[0].codeName == "LG_GLY"){
                     //提示未完成线路 搜索该用户下所有的线路 判断是否完成
-
+                    $.get('/logZndd/LineUserAll', {userId: user.id}, function (rs) {
+                        if(rs.length > 0){
+                            notify_err(rs+"班次还有未完成");
+                            layer.confirm('班次还有未完成，是否要退出线调?', {
+                                btn: ['确定','取消'] //按钮
+                            }, function(){
+                                gb_sch_websocket.sock().close(1000, '退出线调');
+                                window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
+                            }, function(){
+                            });
+                        }else {
+                            //关闭websocket 连接
+                            gb_sch_websocket.sock().close(1000, '退出线调');
+                            window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
+                        }
+                    })
+                }else {
+                    //关闭websocket 连接
+                    gb_sch_websocket.sock().close(1000, '退出线调');
+                    window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
                 }
-*/
-
-                //关闭websocket 连接
-                gb_sch_websocket.sock().close(1000, '退出线调');
-                window.location.href = '/pages/control/lineallot_v2/iframe_wrap.html';
             });
             //过滤菜单
@@ -3,7 +3,7 @@
  */
 var gb_klyj = (function () {
     var $wrap = $('.multi_plat_msg_pop_zndd');
-    var max = 3;
+    var max = 0;
     var dataMap = new Map();
     var popcf = function (data) {
         dataMap.set(data.uuid,data);
@@ -27,7 +27,7 @@ var gb_stationcf = (function () {
     $wrap.on('click', '.all', function () {
         var type = $(this).data('ip');
         var calleeId = $(this).data('call')
-        var pageUrl ="/real_control_v2/js/call/index.html?calleeId="+calleeId;
+        var pageUrl ="/real_control_v2/zndd/call/index.html?calleeId="+calleeId;
         //将片段路径写入 localStorage
         window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
         var index = layer.open({
@@ -88,6 +88,11 @@ var gb_dataZndd = (function (){
         if (closetwo)  closetwo = false
     });
+    var modal_opts = {
+        center: false,
+        bgclose: false
+    }
+
     //1078路，1135路，南临专线，临港4路，浦东111路，浦东74路，临港13路，申港3路，浦东29路，新芦专线
     function ycsf_sx(line){
@@ -110,6 +115,23 @@ var gb_dataZndd = (function (){
         }
         return  false;
     }
+    //发车信息微调
+    $pop.on('click', '.fcxxwts', function () {
+        if (close)  close = false
+        var that = $(this);
+        debugger
+        var folder = '/real_control_v2/fragments/line_schedule/context_menu';
+        var id = that.data('id')
+
+        $.post('/logZndd/thissch/'+id, function(res) {
+            open_modal(folder + '/fcxxwt.html?r=' + Math.random(), {
+                sch: res
+            }, modal_opts);
+
+        });
+
+    });
+
     //撤销实发
+var dkl_yanshi = (function (){
+
+
+
+
+    $('#dkl_yanshi').on('click',function(){
+        //1096路水华路枢纽站
+        var list = { lineCode : "80301",stationCode: "126934"};
+        var cc = [];
+        cc.push(list);
+
+        var datas = {
+            stations :cc,
+            num : 20,
+            token : 1,
+
+        }
+
+        $.ajax({
+            type: "POST",
+            cache: false,
+            url: '/out/klyj',
+            contentType:"application/json;charset=utf-8",
+            data:JSON.stringify(datas),
+            success: function (res) {
+                notify_succ('检测大客流！');
+            }
+        })
+
+
+
+    });
+
+})();
 \ No newline at end of file
@@ -212,7 +212,13 @@
                     }
                     else if(responseText[1]=="2"){//新增出场班次
                         if(schId==''){
-                            notify_err("请选择班次");
+                            var sch ={
+                                xlBm : lineCode
+                            }
+                            var fun =gb_schedule_context_menu.add_temp_sch_v2;
+                            fun(sch, function () {
+                                confirmBtn.trigger('click');
+                            });
                             return;
                         }
                         var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
@@ -229,7 +235,13 @@
                     }
                     else if(responseText[1]=="3"){//新增班次
                         if(schId==''){
-                            notify_err("请选择班次");
+                            var sch ={
+                                xlBm : lineCode
+                            }
+                            var fun =gb_schedule_context_menu.add_temp_sch_v2;
+                            fun(sch, function () {
+                                confirmBtn.trigger('click');
+                            });
                             return;
                         }
                         var sch = gb_schedule_table.findScheduleByLine(lineCode)[schId];
@@ -52,6 +52,9 @@
     <!-- main style -->
     <link rel="stylesheet" href="/real_control_v2/css/microphone.css" />
+    <!--//演示使用-->
+    <link href="/real_control_v2/zndd/yanshi/static/css/sjz.css" type="text/css" rel="stylesheet">
+
 </head>
 <body>
@@ -236,7 +239,8 @@
 <script src="/real_control_v2/js/forms/form_embed.js" merge="custom_js"></script>
 <!-- 模态框扩展 -->
 <script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
-<script src="/real_control_v2/call/assets/js/index.js" merge="custom_js"></script>
+
+<script src="/real_control_v2/zndd/call/assets/js/index.js"></script>
 <!-- #### 安全驾驶 start ###  -->
 <div class="multi_plat_msg_pop_wrap" ></div>
 <script id="sd_plat_msg_template" type="text/html">
@@ -301,6 +305,11 @@
             <div class="popup-msg-contents"  style="display:{{type == 'YCSF'?'':'none'}}">
                 <button class="uk-button uk-button-primary colsebc"  data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">取消实发</button>
             </div>
+
+            <div class="popup-msg-contents"  style="display:{{type == 'WD'?'':'none'}}">
+                <button class="uk-button uk-button-primary fcxxwts"  data-fcsj="{{fcsj}}" data-clzbh="{{clzbh}}" data-id="{{id}}">发车信息微调</button>
+            </div>
+
             <div class="centerSpace msg-title">
                 <div></div>
                 <div class="msg-date-infos" style="display:{{type == 'SFTZ_1'?'':'none'}}" >
@@ -346,7 +355,6 @@
             <span class="title">{{datarq}}  ----</span>
             <span class="title">{{types}}</span>
             <div> 点击查看预案</div>
-
         </div>
     </div>
@@ -360,6 +368,9 @@
 <script src="/real_control_v2/js/stationcf/stationcf.js"  merge="custom_js"></script>
 <!--智能调度-->
 <script src="/real_control_v2/js/zndd/data_zndd.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/zndd/dkl_yanshi.js" merge="custom_js"></script>
+
+
 <!--站点催发-->
 <script src="/real_control_v2/js/stationcf/klyj.js"  merge="custom_js"></script>
 <!--语音图标-->
@@ -6,19 +6,19 @@
     <meta name="google" content="notranslate" />
     <title>anyrtc 呼叫邀请DEMO - anyRTC</title>
     <!-- icon -->
-    <link rel="icon" href="/real_control_v2/js/call/assets/images/favicon.ico" />
+    <link rel="icon" href="/real_control_v2/zndd/call/assets/images/favicon.ico" />
     <!-- CSS only -->
-    <link rel="stylesheet" href="/real_control_v2/js/call/assets/css/bootstrap.min.css"/>
-    <link rel="stylesheet" type="text/css" href="/real_control_v2/js/call/assets/font/iconfont.css" />
+    <link rel="stylesheet" href="/real_control_v2/zndd/call/assets/css/bootstrap.min.css"/>
+    <link rel="stylesheet" type="text/css" href="/real_control_v2/zndd/call/assets/font/iconfont.css" />
     <!-- JS, Popper.js, and jQuery -->
-    <script src="/real_control_v2/js/call/assets/js/jquery-3.5.1.min.js"></script>
-    <script src="/real_control_v2/js/call/assets/js/bootstrap.min.js"></script>
+    <script src="/real_control_v2/zndd/call/assets/js/jquery-3.5.1.min.js"></script>
+    <script src="/real_control_v2/zndd/call/assets/js/bootstrap.min.js"></script>
     <!-- JS, RTC and RTM -->
-    <script src="/real_control_v2/js/call/assets/js/latest.js"></script>
-    <script src="/real_control_v2/js/call/assets/js/ArRTM@latest.js"></script>
+    <script src="/real_control_v2/zndd/call/assets/js/latest.js"></script>
+    <script src="/real_control_v2/zndd/call/assets/js/ArRTM@latest.js"></script>
     <!-- 覆盖bootstrap样式 -->
-    <link rel="stylesheet" href="/real_control_v2/js/call/assets/css/index.css" />
+    <link rel="stylesheet" href="/real_control_v2/zndd/call/assets/css/index.css" />
   </head>
   <body class="notranslate">
@@ -28,7 +28,7 @@
     <!-- 首页 -->
     <div
       class="page d-flex flex-col justify-content-center align-items-center"
-      id="homePage" style="background-image:url('/real_control_v2/js/call/assets/images/yimg.jpg')"
+      id="homePage" style="background-image:url('/real_control_v2/zndd/call/assets/images/yimg.jpg')"
     >
       <!--  -->
@@ -133,7 +133,7 @@
                   <img
                     draggable="false"
                     class="img-responsive setting-video_preview_bg"
-                    src="/real_control_v2/js/call/assets/images/chart.png"
+                    src="/real_control_v2/zndd/call/assets/images/chart.png"
                   />
                   <div
                     id="settingVideoPreview"
@@ -332,7 +332,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/real_control_v2/js/call/assets/images/head.png" />
+            <img draggable="false" src="/real_control_v2/zndd/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -357,7 +357,7 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/js/call/assets/images/hangup.png"
+            src="/real_control_v2/zndd/call/assets/images/hangup.png"
             id="cancelCallBtn"
           />
           <!-- <button type="button" class="btn btn-danger" >取消</button> -->
@@ -372,7 +372,7 @@
       <div class="invitation bd-highlight">
         <div class="d-flex justify-content-center">
           <div class="head_portrait">
-            <img draggable="false" src="/real_control_v2/js/call/assets/images/head.png" />
+            <img draggable="false" src="/real_control_v2/zndd/call/assets/images/head.png" />
           </div>
         </div>
         <div
@@ -398,21 +398,21 @@
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/js/call/assets/images/changaudio-hover.png"
+            src="/real_control_v2/zndd/call/assets/images/changaudio-hover.png"
             id="changAudioBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/js/call/assets/images/answer.png"
+            src="/real_control_v2/zndd/call/assets/images/answer.png"
             id="acceptCallBtn"
           />
           <img
             draggable="false"
             class="img-responsive"
             style="cursor: pointer"
-            src="/real_control_v2/js/call/assets/images/hangup.png"
+            src="/real_control_v2/zndd/call/assets/images/hangup.png"
             id="refuseCallBtn"
           />
           <!-- 多人 -->
@@ -437,7 +437,7 @@
             <img
               draggable="false"
               class="img-responsive"
-              src="/real_control_v2/js/call/assets/images/head.png"
+              src="/real_control_v2/zndd/call/assets/images/head.png"
             />
           </div>
           <div class="">
@@ -469,7 +469,7 @@
             draggable="false"
             style="width: 100%"
             class="img-responsive"
-            src="/real_control_v2/js/call/assets/images/audio_bg.png"
+            src="/real_control_v2/zndd/call/assets/images/audio_bg.png"
           />
         </div>
       </div>
@@ -492,7 +492,7 @@
               draggable="false"
               style="position: absolute; width: 50%"
               class="img-responsive"
-              src="/real_control_v2/js/call/assets/images/logo_title.png"
+              src="/real_control_v2/zndd/call/assets/images/logo_title.png"
             />
           </div>
           <div class="prompt_little d-flex">
@@ -515,7 +515,7 @@
               draggable="false"
               style="position: absolute; width: 40%"
               class="img-responsive"
-              src="/real_control_v2/js/call/assets/images/logo_big.png"
+              src="/real_control_v2/zndd/call/assets/images/logo_big.png"
             />
           </div>
           <div class="prompt_big meet-control_icon m-3" id="videoDuration">
@@ -587,7 +587,7 @@
             <img
             draggable="false"
             class="img-responsive"
-            src="/real_control_v2/js/call/assets/images/logo_big.png"
+            src="/real_control_v2/zndd/call/assets/images/logo_big.png"
           />
           </div>
@@ -724,7 +724,7 @@
       </div>
       <!-- /.modal -->
     </div>
-    <script src="/real_control_v2/js/call/assets/js/index.js"></script>
+    <script src="/real_control_v2/zndd/call/assets/js/index.js"></script>
   </body>
 <script>
   (function() {
@@ -427,9 +427,14 @@
                     data.fgsBm = line.brancheCompany;
                 }
+                data.img=sch.image;
+                data.operationType=1;
                 gb_common.$post('/realSchedule', data, function (rs) {
                     notify_succ('新增临加班次成功');
                     cb && cb(rs);
+                    /*var folder = '/real_control_v2/zndd/yanshi';
+                    open_modal(folder + '/yanshi.html', {
+                    }, {center: true, bgclose: false, modal: true});*/
                 }, err);
             }
@@ -2,7 +2,7 @@
     <div class="uk-modal-dialog" style="width: 920px;">
         <a href="" class="uk-modal-close uk-close"></a>
         <div class="uk-modal-header">
-            <h2>新增临加班次</h2></div>
+            <h2>发车间隔</h2></div>
         <div class="uk-grid uk-width-3-5" style="float: left">
             <div class="uk-width-5-5">
                 <form class="uk-form uk-form-horizontal"> </form>
@@ -448,7 +448,7 @@
         <div class="uk-width-1-1">
             <div class="uk-form-row">
-                <label class="uk-form-label">车内视频：</label>
+                <label class="uk-form-label">车内情况：</label>
             </div>
         </div>
     </div>
+
+.demo {
+	width:960px;
+	margin:60px auto 0 auto;
+}
+/*history*/
+.history {
+	background:url(../image/line04.gif) repeat-y 187px 0;
+	overflow:hidden;
+	position:relative;
+}
+.history-date {
+	overflow:hidden;
+	position:relative;
+}
+.history-date h2 {
+	background:#fff url(../image/icon06.gif) no-repeat 158px 0;
+	height:59px;
+	font-size:25px;
+	font-family:微软雅黑;
+	font-weight:normal;
+	padding-left:45px;
+	margin-bottom:74px;
+}
+.history-date h2.first {
+	position:absolute;
+	left:0;
+	top:0;
+	width:500px;
+	z-index:99;
+}
+.history-date h2 a {
+	color:#00bbff;
+	display:inline-block;
+*display:inline;
+	zoom:1;
+	background:url(../image/icon08.gif) no-repeat right 50%;
+	padding-right:17px;
+	margin:21px 97px 0 0;
+}
+.history-date h2 a:hover {
+	text-decoration:none;
+}
+.history-date h2 img {
+	vertical-align:-5px;
+}
+.history-date h2.date02 {
+	background:none;
+}
+.history-date ul li {
+	background:url(../image/yes.png) no-repeat 180px 0;
+	background-size: 15px 15px;
+	padding-bottom:50px;
+	zoom:1;
+}
+.history-date ul li.last {
+	padding-bottom:0;
+}
+.history-date ul li:after {
+	content:" ";
+	display:block;
+	height:0;
+	clear:both;
+	visibility:hidden;
+}
+.history-date ul li h3 {
+	float:left;
+	width:20%;
+	text-align:right;
+	padding-right:19px;
+	color:#c3c3c3;
+	font:normal 18px/16px Arial;
+}
+.history-date ul li h3 span {
+	display:block;
+	color:#d0d0d0;
+	font-size:12px;
+}
+.history-date ul li dl {
+	width: 70%;
+	float:left;
+	padding-left:41px;
+	margin-top:-5px;
+	font-family:微软雅黑;
+}
+.history-date ul li dl dt {
+	font:20px/22px 微软雅黑;
+	color:#737373;
+}
+.history-date ul li dl dt span {
+	display:block;
+	color:#787878;
+	font-size:12px;
+}
+.history-date ul li.green h3 {
+	color:#1db702;
+}
+.history-date ul li.green h3 span {
+	color:#a8dda3;
+}
+.history-date ul li.green dl {
+	margin-top:-8px;
+}
+.history-date ul li.green dl dt {
+	font-size:30px;
+	line-height:28px;
+}
+.history-date ul li.green dl dt a {
+	display:inline-block;
+*display:inline;
+	zoom:1;
+	overflow:hidden;
+	vertical-align:middle;
+	margin-left:12px;
+}
+.history-date ul li.green dl dd {
+	padding-top:20px;
+	display:none;
+}
+.history-date ul li.green dl dd img {
+	float:left;
+}
+.history-date ul li.green dl dd p {
+	overflow:hidden;
+	zoom:1;
+	line-height:21px;
+	color:#787878;
+}
+.history-date h2.first .more-history {
+	font-size:16px;
+	background:transparent;
+	margin-left:30px;
+}
+.history-date h2.first .more-history:hover {
+	text-decoration:underline;
+}
+*body .history-date ul li dl dt {
+	_font-size:12px!important;
+	_font-weight:bold;
+}
+*body .history-date ul li dl dt span {
+	_font-weight:normal!important;
+}
+*body .history-date ul li.green dl dt a {
+	_background:transparent!important;
+*background:transparent!important;
+*font-size:12px!important;
+	_font-weight:normal!important;
+}
+.timerssn{
+	text-align: center;
+	font-size: 20px;
+	color: red;
+	position: absolute;
+	width: 15%;
+}
 \ No newline at end of file
+/*-防止各大cdn公共库加载地址失效问题，此地址我们会时时监控，及调整以保障正常访问-www.jq22.com为您服务*/
+/*当前为字节跳动cdn公共库提供的jQuery-1.10.2*/
+document.write("<script src='https://s1.pstatp.com/cdn/expire-1-M/jquery/1.10.2/jquery.min.js'><\/script>");
 \ No newline at end of file
+<div class="uk-modal ct-form-modal ct_move_modal" id="schedule-dklyanshi-modal">
+  <div class="uk-modal-dialog" style="width: 800px;">
+    <a href="" class="uk-modal-close uk-close"></a>
+    <div class="uk-modal-header">
+      <h2>大客流預案场景演示</h2></div>
+
+    <head>
+      <meta charset="utf-8">
+      <title>jQuery疫情防控时间轴</title>
+      <link href="/real_control_v2/zndd/yanshi/static/css/sjz.css" type="text/css" rel="stylesheet">
+    </head>
+    <div class="timerssn"></div>
+    <div class="history" style="margin-top:50px;height: 400px;overflow-y: scroll"  >
+
+      <div class="history-date" STYLE="padding-top:10px;">
+        <ul>
+          <li>
+            <h3>10:00<span>10月31日</span></h3>
+            <dl>
+              <dt>驾驶收到通知 </dt>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <h3>10:05<span>10月31日</span></h3>
+            <dl>
+              <dt>驾驶员抵达车辆、车辆收到行驶班次</dt>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <h3>10:06<span>10月31日</span></h3>
+            <dl>
+              <dt>车辆行驶出发点</dt>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <h3>10:06<span>10月31日</span></h3>
+            <dl>
+              <div id="drawer_right_map" style="height: 300px;width: 100%"></div>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <h3>10:10<span>10月31日</span></h3>
+            <dl>
+              <dt>车辆抵达发车点</dt>
+            </dl>
+          </li>
+        </ul>
+
+        <ul>
+          <li>
+            <h3>10:20<span>10月31日</span></h3>
+            <dl>
+              <dt>车辆运送乘客，继续监控站点是否还有大客流</dt>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+            <h3>11:00<span>10月31日</span></h3>
+            <dl>
+              <dt>车辆送达乘客</dt>
+            </dl>
+          </li>
+        </ul>
+        <ul>
+          <li>
+          <h3>11:00<span>10月31日</span></h3>
+          <dl>
+            <dt>任务结束</dt>
+          </dl>
+        </li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
+
+  <script>
+
+    $(function(){
+      systole();
+      var nt = 0;
+      function systole(){
+        $(".history-date ul").css({display: 'none'});
+        //驾驶员收到通知
+
+
+        var cctime = setInterval(function (){
+          time();
+          timent = timent - 1;
+        }, 1000);
+
+        // 设置一个每2000毫秒执行一次的定时器
+        var intervalId = setInterval(function() {
+          var divs = $(".history-date ul");
+          divs.each(function(index,element) {
+            if(nt == index){
+              $(this).css({display: ''});
+
+              if(index == 3){
+                play();
+              }
+              if(nt == divs.length - 1){
+                nt = 0;
+                clearInterval(intervalId)
+                clearInterval(cctime);
+                $(".timerssn").html("");//清空倒计时
+              }
+              nt ++;
+              timent = 5;
+              return false;
+            }
+
+          });
+        }, 5000);
+
+      }
+      let date ={
+        "list": [{"bd_lon":121.90467819574694,"bd_lat":30.900545629815696,"lon":121.89413,"lat":30.896774,"deviceId":"77W1S014","ts":1730264742000,"timestamp":1730264742000,"stopNo":"126930","direction":272.0,"lineId":"80301","speed":33.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184989","section_name":"方竹路（白薇路-沪城环路）","version":6},{"bd_lon":121.89989041589938,"bd_lat":30.900580233328572,"lon":121.88931,"lat":30.896894,"deviceId":"77W1S014","ts":1730264850000,"timestamp":1730264850000,"stopNo":"128063","direction":277.0,"lineId":"80301","speed":35.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.90069454903107,"bd_lat":30.900535838211702,"lon":121.89012,"lat":30.896835,"deviceId":"77W1S014","ts":1730264821000,"timestamp":1730264821000,"stopNo":"128063","direction":276.0,"lineId":"80301","speed":0.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路卓卉路","ts":1730264821000,"lineCode":"80301","upDown":0,"stopNo":"128063","inOut":0,"createDate":1730264825690,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264821000"},"inout_stop":0,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89525655752936,"bd_lat":30.90044660702875,"lon":121.88465,"lat":30.896847,"deviceId":"77W1S014","ts":1730264956000,"timestamp":1730264956000,"stopNo":"126932","direction":268.0,"lineId":"80301","speed":24.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路水华路","ts":1730264956000,"lineCode":"80301","upDown":0,"stopNo":"126932","inOut":0,"createDate":1730264961637,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264956000"},"inout_stop":0,"state":0,"upDown":0,"section_code":"184991","section_name":"方竹路（叶菊路-水华路）","version":6},{"bd_lon":121.90203740623024,"bd_lat":30.900512501387293,"lon":121.89147,"lat":30.896788,"deviceId":"77W1S014","ts":1730264781000,"timestamp":1730264781000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":0.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89599210807043,"bd_lat":30.90049839119409,"lon":121.88539,"lat":30.896885,"deviceId":"77W1S014","ts":1730264917000,"timestamp":1730264917000,"stopNo":"126931","direction":262.0,"lineId":"80301","speed":0.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.90650763313731,"bd_lat":30.900574422731786,"lon":121.895966,"lat":30.896772,"deviceId":"77W1S014","ts":1730264701000,"timestamp":1730264701000,"stopNo":"126930","direction":268.0,"lineId":"80301","speed":18.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184989","section_name":"方竹路（白薇路-沪城环路）","version":6},{"bd_lon":121.89599210466311,"bd_lat":30.90050220719686,"lon":121.88539,"lat":30.896889,"deviceId":"77W1S014","ts":1730264943000,"timestamp":1730264943000,"stopNo":"126931","direction":262.0,"lineId":"80301","speed":3.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89796373453942,"bd_lat":30.900714383979444,"lon":121.887375,"lat":30.897064,"deviceId":"77W1S014","ts":1730264889000,"timestamp":1730264889000,"stopNo":"126931","direction":270.0,"lineId":"80301","speed":38.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路建桥学院北门","ts":1730264889000,"lineCode":"80301","upDown":0,"stopNo":"126931","inOut":1,"createDate":1730264893416,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264889000"},"inout_stop":1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.9022270878919,"bd_lat":30.900514001354395,"lon":121.89166,"lat":30.896786,"deviceId":"77W1S014","ts":1730264768000,"timestamp":1730264768000,"stopNo":"126930","direction":270.0,"lineId":"80301","speed":18.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89600727155313,"bd_lat":30.90050248856405,"lon":121.88541,"lat":30.896889,"deviceId":"77W1S014","ts":1730264913000,"timestamp":1730264913000,"stopNo":"126931","direction":261.0,"lineId":"80301","speed":3.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89901801919352,"bd_lat":30.900690056246688,"lon":121.888435,"lat":30.89702,"deviceId":"77W1S014","ts":1730264876000,"timestamp":1730264876000,"stopNo":"126931","direction":268.0,"lineId":"80301","speed":9.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.9056877508437,"bd_lat":30.900541759662353,"lon":121.89514,"lat":30.896753,"deviceId":"77W1S014","ts":1730264729000,"timestamp":1730264729000,"stopNo":"126930","direction":268.0,"lineId":"80301","speed":22.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184989","section_name":"方竹路（白薇路-沪城环路）","version":6},{"bd_lon":121.9016656375683,"bd_lat":30.900515336243583,"lon":121.8911,"lat":30.896797,"deviceId":"77W1S014","ts":1730264805000,"timestamp":1730264805000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":16.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89440728696924,"bd_lat":30.900379432991862,"lon":121.8838,"lat":30.896795,"deviceId":"77W1S014","ts":1730264981000,"timestamp":1730264981000,"stopNo":"126932","direction":267.0,"lineId":"80301","speed":12.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路水华路","ts":1730264981000,"lineCode":"80301","upDown":0,"stopNo":"126932","inOut":1,"createDate":1730264986077,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264981000"},"inout_stop":1,"state":0,"upDown":0,"section_code":"184991","section_name":"方竹路（叶菊路-水华路）","version":6},{"bd_lon":121.90067937710931,"bd_lat":30.90053556084185,"lon":121.89011,"lat":30.896835,"deviceId":"77W1S014","ts":1730264835000,"timestamp":1730264835000,"stopNo":"128063","direction":276.0,"lineId":"80301","speed":0.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89907870115947,"bd_lat":30.900687363266552,"lon":121.8885,"lat":30.897017,"deviceId":"77W1S014","ts":1730264863000,"timestamp":1730264863000,"stopNo":"126931","direction":274.0,"lineId":"80301","speed":0.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路建桥学院北门","ts":1730264863000,"lineCode":"80301","upDown":0,"stopNo":"126931","inOut":0,"createDate":1730264867085,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264863000"},"inout_stop":0,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89967800540734,"bd_lat":30.900601124403273,"lon":121.8891,"lat":30.89692,"deviceId":"77W1S014","ts":1730264852000,"timestamp":1730264852000,"stopNo":"128063","direction":278.0,"lineId":"80301","speed":35.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89784238925144,"bd_lat":30.900710221128048,"lon":121.88725,"lat":30.897062,"deviceId":"77W1S014","ts":1730264890000,"timestamp":1730264890000,"stopNo":"126931","direction":268.0,"lineId":"80301","speed":40.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89428597247607,"bd_lat":30.900360032264537,"lon":121.883675,"lat":30.896778,"deviceId":"77W1S014","ts":1730264997000,"timestamp":1730264997000,"stopNo":"126932","direction":270.0,"lineId":"80301","speed":0.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184991","section_name":"方竹路（叶菊路-水华路）","version":6},{"bd_lon":121.90626469804877,"bd_lat":30.900558981481137,"lon":121.89572,"lat":30.89676,"deviceId":"77W1S014","ts":1730264705000,"timestamp":1730264705000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":18.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184989","section_name":"方竹路（白薇路-沪城环路）","version":6},{"bd_lon":121.90008765951121,"bd_lat":30.900559057215247,"lon":121.88951,"lat":30.89687,"deviceId":"77W1S014","ts":1730264848000,"timestamp":1730264848000,"stopNo":"128063","direction":279.0,"lineId":"80301","speed":33.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路卓卉路","ts":1730264848000,"lineCode":"80301","upDown":0,"stopNo":"128063","inOut":1,"createDate":1730264851942,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264848000"},"inout_stop":1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.89502148743209,"bd_lat":30.900430816053387,"lon":121.884415,"lat":30.896835,"deviceId":"77W1S014","ts":1730264970000,"timestamp":1730264970000,"stopNo":"126932","direction":264.0,"lineId":"80301","speed":11.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184991","section_name":"方竹路（叶菊路-水华路）","version":6},{"bd_lon":121.90595344115236,"bd_lat":30.90055191818359,"lon":121.89541,"lat":30.896759,"deviceId":"77W1S014","ts":1730264715000,"timestamp":1730264715000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":3.0,"inout_stop_info":{"deviceId":"77W1S014","stopName":"方竹路沪城环路","ts":1730264715000,"lineCode":"80301","upDown":0,"stopNo":"126930","inOut":1,"createDate":1730264719617,"enable":false,"weeksYear":44,"tcc":false,"correct":false,"flag":0,"outTcc":false,"id":"77W1S014_1730264715000"},"inout_stop":1,"state":0,"upDown":0,"section_code":"184989","section_name":"方竹路（白薇路-沪城环路）","version":6},{"bd_lon":121.89431629470351,"bd_lat":30.900372037240512,"lon":121.883705,"lat":30.89679,"deviceId":"77W1S014","ts":1730264984000,"timestamp":1730264984000,"stopNo":"126932","direction":270.0,"lineId":"80301","speed":5.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184991","section_name":"方竹路（叶菊路-水华路）","version":6},{"bd_lon":121.89599210466311,"bd_lat":30.90050220719686,"lon":121.88539,"lat":30.896889,"deviceId":"77W1S014","ts":1730264930000,"timestamp":1730264930000,"stopNo":"126931","direction":262.0,"lineId":"80301","speed":0.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.901483555169,"bd_lat":30.900513948386312,"lon":121.890915,"lat":30.8968,"deviceId":"77W1S014","ts":1730264808000,"timestamp":1730264808000,"stopNo":"126930","direction":271.0,"lineId":"80301","speed":25.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.90333491241968,"bd_lat":30.900531799908887,"lon":121.89278,"lat":30.896784,"deviceId":"77W1S014","ts":1730264755000,"timestamp":1730264755000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":31.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.90202981742063,"bd_lat":30.90051427288283,"lon":121.891464,"lat":30.89679,"deviceId":"77W1S014","ts":1730264794000,"timestamp":1730264794000,"stopNo":"126930","direction":269.0,"lineId":"80301","speed":1.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6},{"bd_lon":121.8964015764253,"bd_lat":30.900551784995276,"lon":121.8858,"lat":30.89693,"deviceId":"77W1S014","ts":1730264903000,"timestamp":1730264903000,"stopNo":"126931","direction":262.0,"lineId":"80301","speed":27.0,"inout_stop":-1,"state":0,"upDown":0,"section_code":"184990","section_name":"方竹路（沪城环路-叶菊路）","version":6}]
+      }
+
+      date.list.sort(function (a, b) {
+        return parseInt((a.ts - b.ts) + '' + (a.stop_no - b.stop_no));
+      });
+      var map = '';
+      // 地图的中心点和缩放级别
+      map = new BMap.Map("drawer_right_map");
+      var point = new BMap.Point(121.89413, 30.896774);
+      map.centerAndZoom(point,16);
+      var marker = new BMap.Marker(date.list[0]);
+      map.addOverlay(marker);
+      // 地图的轨迹回放路径
+      var path = [];
+      var passdate  = date.list;
+      for (var c in passdate){
+        path.push(new BMap.Point(passdate[c].bd_lon, passdate[c].bd_lat))
+      }
+      var carIcon = '/assets/img/bus1.png';
+      // 创建一个图标，用于表示轨迹回放的位置
+      var marker = new BMap.Marker(path[0]);
+      icon = new BMap.Icon(carIcon, new BMap.Size(25, 25));
+      marker.setIcon(icon);
+      marker.setRotation(270);
+      marker.setTop(true);
+      map.addOverlay(marker);
+      var polyline = new BMap.Polyline(path, {strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+      map.addOverlay(polyline);
+
+      // 开始轨迹回放
+      var i = 0;
+      function play() {
+        if (i < path.length) {
+          // 设置当前位置
+          marker.setPosition(path[i]);
+          // 移动地图视角
+          map.panTo(path[i]);
+
+          // 延迟1秒继续回放下一个位置
+          setTimeout(play, 200);
+          i++;
+        }
+      }
+    });
+
+
+
+
+    var timent = 5;
+    function time(){
+      $(".timerssn").html(timent);
+    }
+
+
+
+
+  </script>
+
+</div>