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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents f4a911ad 7b255c11
Showing 35 changed files with 3709 additions and 1091 deletions
src/main/java/com/bsth/controller/calc/CalcExportController.java
src/main/java/com/bsth/controller/calc/CalcLbStatuAnalyController.java
src/main/java/com/bsth/entity/calc/CalcLbStatuAnaly.java
src/main/java/com/bsth/repository/calc/CalcLbStatuAnalyRepository.java
src/main/java/com/bsth/service/calc/CalcLbStatuAnalyService.java
src/main/java/com/bsth/service/calc/impl/CalcLbStatuAnalyServiceImpl.java
src/main/java/com/bsth/service/calc/impl/CalcMixServiceImpl.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/fatso/package.json
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/forms/calc/calcLbStatuAnaly.html
src/main/resources/static/pages/forms/calc/calcjsyspy.html
src/main/resources/static/pages/forms/calc/calcsingledata.html
src/main/resources/static/pages/forms/mould/calcLbStatuAnaly.xls
src/main/resources/static/pages/forms/mould/calcjsyspy.xls
src/main/resources/static/pages/permission/user/authorize.html
src/main/resources/static/pages/report/inoutstation/js/Blob.js
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.calc.CalcWaybill;
 import com.bsth.entity.mcy_forms.Waybillday;
+import com.bsth.service.calc.CalcLbStatuAnalyService;
 import com.bsth.service.calc.CalcMixService;
 import com.bsth.service.calc.CalcWaybillService;
 import com.bsth.util.ReportUtils;
@@ -26,6 +27,9 @@ public class CalcExportController {
 	@Autowired
 	CalcWaybillService service;
+	
+	@Autowired
+	CalcLbStatuAnalyService lbService;
 	@Autowired
 	CalcMixService clacMixService;
@@ -204,5 +208,84 @@ public class CalcExportController {
 		}
 		return resMap;
 	}
+
+	@RequestMapping(value = "/lbStatuAnalyExport", method = RequestMethod.GET)
+	public Map<String, Object> lbStatuAnalyExport(@RequestParam Map<String, Object> map) {
+		
+		String gsdm="";
+		if(map.get("company")!=null){
+			gsdm=map.get("company").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("subCompany")!=null){
+			fgsdm=map.get("subCompany").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String lineName="";
+		if(map.get("lineName")!=null){
+			lineName=map.get("lineName").toString().trim();
+		}
+		String date="";
+		if(map.get("startDate")!=null){
+			date=map.get("startDate").toString().trim();
+		}
+		String date2="";
+		if(map.get("endDate")!=null){
+			date2=map.get("endDate").toString().trim();
+		}
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+
+		Map<String, Object> resMap = new HashMap<String, Object>();
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<Map<String, Object>> list = lbService.lbStatuAnaly(gsdm, fgsdm, line, date, date2, sfyy, type);
+		
+		for(int i = 0; i < list.size(); i++){
+			Map<String, Object> temp = list.get(i);
+			temp.put("i", i+1);
+			if(!temp.containsKey("date") || temp.get("date") == null){
+				temp.put("date", "");
+			}
+			if(!temp.containsKey("company") || temp.get("company") == null){
+				temp.put("company", "");
+			}
+			if(!temp.containsKey("subCompany") || temp.get("subCompany") == null){
+				temp.put("subCompany", "");
+			}
+			resList.add(temp);
+		}
+		
+		String Data = date.replaceAll("-", "");
+		if(!date.equals(date2)){
+			Data = date.replaceAll("-", "") + "-" + date2.replaceAll("-", "");
+		}
+		
+		SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+				sdfSimple = new SimpleDateFormat("yyyyMMdd");
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String,Object> mm = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		
+		try {
+			listI.add(resList.iterator());
+			String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+			ee.excelReplace(listI, new Object[] { mm }, path+"mould/calcLbStatuAnaly.xls",
+					path+"export/"+Data+"-"+lineName+"-烂班情况分析表(统计).xls");
+			resMap.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			e.printStackTrace();
+			resMap.put("status", ResponseCode.ERROR);
+		}
+		return resMap;
+	}
 }
+package com.bsth.controller.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.calc.CalcLbStatuAnaly;
+import com.bsth.service.calc.CalcLbStatuAnalyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by 19/03/18.
+ */
+@RestController
+@RequestMapping("calcLbStatuAnaly")
+public class CalcLbStatuAnalyController extends BaseController<CalcLbStatuAnaly, Integer> {
+	
+	@Autowired
+	private CalcLbStatuAnalyService service;
+	
+
+	@RequestMapping(value="/lbStatuAnaly")
+	public List<Map<String,Object>> lbStatuAnaly(@RequestParam Map<String, Object> map){
+		String gsdm="";
+		if(map.get("company")!=null){
+			gsdm=map.get("company").toString().trim();
+		}
+		String fgsdm="";
+		if(map.get("subCompany")!=null){
+			fgsdm=map.get("subCompany").toString().trim();
+		}
+		String line="";
+		if(map.get("line")!=null){
+			line=map.get("line").toString().trim();
+		}
+		String date="";
+		if(map.get("startDate")!=null){
+			date=map.get("startDate").toString().trim();
+		}
+		String date2="";
+		if(map.get("endDate")!=null){
+			date2=map.get("endDate").toString().trim();
+		}
+		String sfyy="";
+		if(map.get("sfyy")!=null){
+			sfyy=map.get("sfyy").toString().trim();
+		}
+		String type="";
+		if(map.get("type")!=null){
+			type=map.get("type").toString().trim();
+		}
+		return service.lbStatuAnaly(gsdm,fgsdm,line,date,date2,sfyy,type);
+	}
+	
+}
+package com.bsth.entity.calc;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "calc_lb_statu_analy")
+public class CalcLbStatuAnaly {
+	/* 主键*/
+	@Id
+	@GeneratedValue
+	private Long id;
+	/* 公司代码*/
+	private String gsdm;
+	/* 公司名称*/
+	private String gsname;
+	/* 分公司代码*/
+	private String fgsdm;
+	/* 分公司名称*/
+	private String fgsname;
+	/* 日期*/
+	private Date rq;
+	/* 日期字符串*/
+	private String rqStr;
+	/* 线路编码*/
+	private String xl;
+	/* 线路名称*/
+	private String xlName;
+	/* 计划班次*/
+	private int jhbc;
+	/* 实际班次*/
+	private int sjbc;
+	/* 计划里程*/
+	private Double jhlc;
+	/* 实际公里*/
+	private Double sjlc;
+	/* 路阻（烂班班次）*/
+	private int lzbc;
+	/* 路阻（烂班里程）*/
+	private Double lzlc;
+	/* 吊慢（烂班班次）*/
+	private int dmbc;
+	/* 吊慢（烂班里程）*/
+	private Double dmlc;
+	/* 故障（烂班班次）*/
+	private int gzbc;
+	/* 故障（烂班里程）*/
+	private Double gzlc;
+	/* 纠纷（烂班班次）*/
+	private int jfbc;
+	/* 纠纷（烂班里程）*/
+	private Double jflc;
+	/* 肇事（烂班班次）*/
+	private int zsbc;
+	/* 肇事（烂班里程）*/
+	private Double zslc;
+	/* 缺人（烂班班次）*/
+	private int qrbc;
+	/* 缺人（烂班里程）*/
+	private Double qrlc;
+	/* 缺车（烂班班次）*/
+	private int qcbc;
+	/* 缺车（烂班里程）*/
+	private Double qclc;
+	/* 客稀（烂班班次）*/
+	private int kxbc;
+	/* 客稀（烂班里程）*/
+	private Double kxlc;
+	/* 气候（烂班班次）*/
+	private int qhbc;
+	/* 气候（烂班里程）*/
+	private Double qhlc;
+	/* 援外（烂班班次）*/
+	private int ywbc;
+	/* 援外（烂班里程）*/
+	private Double ywlc;
+	/* 其他（烂班班次）*/
+	private int qtbc;
+	/* 其他（烂班里程）*/
+	private Double qtlc;
+	/* 备注*/
+	private String remark;
+	
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public String getGsdm() {
+		return gsdm;
+	}
+	public void setGsdm(String gsdm) {
+		this.gsdm = gsdm;
+	}
+	public String getGsname() {
+		return gsname;
+	}
+	public void setGsname(String gsname) {
+		this.gsname = gsname;
+	}
+	public String getFgsdm() {
+		return fgsdm;
+	}
+	public void setFgsdm(String fgsdm) {
+		this.fgsdm = fgsdm;
+	}
+	public String getFgsname() {
+		return fgsname;
+	}
+	public void setFgsname(String fgsname) {
+		this.fgsname = fgsname;
+	}
+	public Date getRq() {
+		return rq;
+	}
+	public void setRq(Date rq) {
+		this.rq = rq;
+	}
+	public String getRqStr() {
+		return rqStr;
+	}
+	public void setRqStr(String rqStr) {
+		this.rqStr = rqStr;
+	}
+	public String getXl() {
+		return xl;
+	}
+	public void setXl(String xl) {
+		this.xl = xl;
+	}
+	public String getXlName() {
+		return xlName;
+	}
+	public void setXlName(String xlName) {
+		this.xlName = xlName;
+	}
+	public int getJhbc() {
+		return jhbc;
+	}
+	public void setJhbc(int jhbc) {
+		this.jhbc = jhbc;
+	}
+	public int getSjbc() {
+		return sjbc;
+	}
+	public void setSjbc(int sjbc) {
+		this.sjbc = sjbc;
+	}
+	public Double getJhlc() {
+		return jhlc;
+	}
+	public void setJhlc(Double jhlc) {
+		this.jhlc = jhlc;
+	}
+	public Double getSjlc() {
+		return sjlc;
+	}
+	public void setSjlc(Double sjlc) {
+		this.sjlc = sjlc;
+	}
+	public int getLzbc() {
+		return lzbc;
+	}
+	public void setLzbc(int lzbc) {
+		this.lzbc = lzbc;
+	}
+	public Double getLzlc() {
+		return lzlc;
+	}
+	public void setLzlc(Double lzlc) {
+		this.lzlc = lzlc;
+	}
+	public int getDmbc() {
+		return dmbc;
+	}
+	public void setDmbc(int dmbc) {
+		this.dmbc = dmbc;
+	}
+	public Double getDmlc() {
+		return dmlc;
+	}
+	public void setDmlc(Double dmlc) {
+		this.dmlc = dmlc;
+	}
+	public int getGzbc() {
+		return gzbc;
+	}
+	public void setGzbc(int gzbc) {
+		this.gzbc = gzbc;
+	}
+	public Double getGzlc() {
+		return gzlc;
+	}
+	public void setGzlc(Double gzlc) {
+		this.gzlc = gzlc;
+	}
+	public int getJfbc() {
+		return jfbc;
+	}
+	public void setJfbc(int jfbc) {
+		this.jfbc = jfbc;
+	}
+	public Double getJflc() {
+		return jflc;
+	}
+	public void setJflc(Double jflc) {
+		this.jflc = jflc;
+	}
+	public int getZsbc() {
+		return zsbc;
+	}
+	public void setZsbc(int zsbc) {
+		this.zsbc = zsbc;
+	}
+	public Double getZslc() {
+		return zslc;
+	}
+	public void setZslc(Double zslc) {
+		this.zslc = zslc;
+	}
+	public int getQrbc() {
+		return qrbc;
+	}
+	public void setQrbc(int qrbc) {
+		this.qrbc = qrbc;
+	}
+	public Double getQrlc() {
+		return qrlc;
+	}
+	public void setQrlc(Double qrlc) {
+		this.qrlc = qrlc;
+	}
+	public int getQcbc() {
+		return qcbc;
+	}
+	public void setQcbc(int qcbc) {
+		this.qcbc = qcbc;
+	}
+	public Double getQclc() {
+		return qclc;
+	}
+	public void setQclc(Double qclc) {
+		this.qclc = qclc;
+	}
+	public int getKxbc() {
+		return kxbc;
+	}
+	public void setKxbc(int kxbc) {
+		this.kxbc = kxbc;
+	}
+	public Double getKxlc() {
+		return kxlc;
+	}
+	public void setKxlc(Double kxlc) {
+		this.kxlc = kxlc;
+	}
+	public int getQhbc() {
+		return qhbc;
+	}
+	public void setQhbc(int qhbc) {
+		this.qhbc = qhbc;
+	}
+	public Double getQhlc() {
+		return qhlc;
+	}
+	public void setQhlc(Double qhlc) {
+		this.qhlc = qhlc;
+	}
+	public int getYwbc() {
+		return ywbc;
+	}
+	public void setYwbc(int ywbc) {
+		this.ywbc = ywbc;
+	}
+	public Double getYwlc() {
+		return ywlc;
+	}
+	public void setYwlc(Double ywlc) {
+		this.ywlc = ywlc;
+	}
+	public int getQtbc() {
+		return qtbc;
+	}
+	public void setQtbc(int qtbc) {
+		this.qtbc = qtbc;
+	}
+	public Double getQtlc() {
+		return qtlc;
+	}
+	public void setQtlc(Double qtlc) {
+		this.qtlc = qtlc;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	
+}
+package com.bsth.repository.calc;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import com.bsth.entity.calc.CalcLbStatuAnaly;
+import com.bsth.repository.BaseRepository;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 
+ */
+@Repository
+public interface CalcLbStatuAnalyRepository extends BaseRepository<CalcLbStatuAnaly, Integer>{
+
+	//按照时间段统计，公司下线路
+	@Query(value="select DISTINCT c from CalcLbStatuAnaly c where c.xl like %?1% and c.rqStr between ?2 and ?3 and c.gsdm like %?4% and c.fgsdm like %?5% order by c.xl")
+	List<CalcLbStatuAnaly> selectByDateAndLine(String line,String date,String date2,String gsdm,String fgsdm);
+	
+	//按照时间段统计，单条线路
+	@Query(value="select DISTINCT c from CalcLbStatuAnaly c where c.xl = ?1  and c.rqStr between ?2 and ?3 order by c.xl")
+	List<CalcLbStatuAnaly> selectByDateAndLine(String line,String date,String date2);
+	
+	//按照日期和线路删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcLbStatuAnaly c where c.rqStr=?1 and c.xl=?2")
+	void deleteByDateAndLine(String date, String line);
+
+	//按照日期删除数据
+	@Modifying
+	@Transactional
+	@Query(value = "delete CalcLbStatuAnaly c where c.rqStr=?1")
+	void deleteByDate(String date);
+
+}
+package com.bsth.service.calc;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.calc.CalcLbStatuAnaly;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by 19/03/18.
+ */
+public interface CalcLbStatuAnalyService extends BaseService<CalcLbStatuAnaly, Integer> {
+	
+	List<Map<String, Object>> lbStatuAnaly(String gsdm, String fgsdm, String line, String date, String date2, String sfyy, String type);
+	
+}
+package com.bsth.service.calc.impl;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.calc.CalcLbStatuAnaly;
+import com.bsth.repository.calc.CalcLbStatuAnalyRepository;
+import com.bsth.service.LineService;
+import com.bsth.service.calc.CalcLbStatuAnalyService;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.util.Arith;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * Created by 19/03/18.
+ */
+@Service
+public class CalcLbStatuAnalyServiceImpl extends BaseServiceImpl<CalcLbStatuAnaly, Integer> implements CalcLbStatuAnalyService {
+	
+	@Autowired
+	private CalcLbStatuAnalyRepository calcRepository;
+	
+	@Autowired
+	private LineService lineService;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
+
+
+	@Override
+	public List<Map<String, Object>> lbStatuAnaly(String gsdm, String fgsdm,
+			String line, String date, String date2, String sfyy, String type) {
+		// TODO Auto-generated method stub
+		List<Map<String, Object>> resList = new ArrayList<Map<String, Object>>();
+		List<CalcLbStatuAnaly> query = calcRepository.selectByDateAndLine(line, date, date2, gsdm, fgsdm);
+		Map<String, Boolean> lineNature = lineService.lineNature();
+		Map<String, List<CalcLbStatuAnaly>> keyMap = new HashMap<String, List<CalcLbStatuAnaly>>();
+		List<String> keyList = new ArrayList<String>();
+
+		String[] Date1 = date.split("-");
+		String[] Date2 = date2.split("-");
+		String Date = "";
+		if(date.equals(date2))
+			Date = Date1[0] + "年" + Date1[1] + "月" + Date1[2] + "日";
+		else
+			Date = Date1[0] + "年" + Date1[1] + "月" + Date1[2] + "日 - "
+				 + Date2[0] + "年" + Date2[1] + "月" + Date2[2] + "日";
+		
+		for(CalcLbStatuAnaly lb : query){
+			String xlBm = lb.getXl();
+			if(lineNature.containsKey(xlBm) && lineNature.get(xlBm) != null){
+				if(sfyy.equals("1") && !lineNature.get(xlBm)){
+					continue;
+				} else if(sfyy.equals("2") && lineNature.get(xlBm)){
+					continue;
+				}
+			} else if(sfyy.equals("2")){
+				continue;
+			}
+			
+			String key = lb.getGsdm() + "/" + lb.getFgsdm() + "/" + lb.getXl();
+			
+			if(!keyMap.containsKey(key)){
+				keyMap.put(key, new ArrayList<CalcLbStatuAnaly>());
+				keyList.add(key);
+			}
+			keyMap.get(key).add(lb);
+		}
+		
+		Collections.sort(keyList, new Comparator<String>() {
+			 
+			public int compare(String o1, String o2) {
+
+				Long a = 0l;
+				Long b = 0l;
+				String[] split1 = o1.split("/");
+				String[] split2 = o2.split("/");
+				char[] charArray1 = split1[2].toCharArray();
+				char[] charArray2 = split2[2].toCharArray();
+				for(int i = 0; i < charArray1.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					a += (long)charArray1[charArray1.length - 1 - i] * temp;
+				}
+				for(int i = 0; i < charArray2.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					b += (long)charArray2[charArray2.length - 1 - i] * temp;
+				}
+ 
+				return a.compareTo(b);
+			}
+		});
+		Collections.sort(keyList, new Comparator<String>() {
+			 
+			public int compare(String o1, String o2) {
+
+				Long a = 0l;
+				Long b = 0l;
+				String[] split1 = o1.split("/");
+				String[] split2 = o2.split("/");
+				char[] charArray1 = split1[1].toCharArray();
+				char[] charArray2 = split2[1].toCharArray();
+				for(int i = 0; i < charArray1.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					a += (long)charArray1[charArray1.length - 1 - i] * temp;
+				}
+				for(int i = 0; i < charArray2.length; i++){
+					long temp = 1l;
+					for(int j = 0; j < i; j++)
+						temp *= 10;
+					b += (long)charArray2[charArray2.length - 1 - i] * temp;
+				}
+
+				return a.compareTo(b);
+			}
+		});
+
+		String company = "", subCompany = "", lineName = "";
+		Map<String, Object> lastMap = new HashMap<String, Object>();
+		lastMap.put("line", "合计");
+		for(String key : keyList){
+			List<CalcLbStatuAnaly> list = keyMap.get(key);
+			Map<String, Object> m = new HashMap<String, Object>();
+			company = "";
+			subCompany = "";
+			lineName = "";
+			for(CalcLbStatuAnaly lb : list){
+				if(lb.getGsname() != null && company.trim().length() == 0)
+					company = lb.getGsname();
+				if(lb.getFgsname() != null && subCompany.trim().length() == 0)
+					subCompany = lb.getFgsname();
+				if(lb.getXlName() != null && lineName.trim().length() == 0)
+					lineName = lb.getXlName();
+				m.put("jhbc", Arith.add(m.get("jhbc")!=null?m.get("jhbc"):"0", lb.getJhbc()));
+				m.put("sjbc", Arith.add(m.get("sjbc")!=null?m.get("sjbc"):"0", lb.getSjbc()));
+				m.put("jhlc", Arith.add(m.get("jhlc")!=null?m.get("jhlc"):"0", lb.getJhlc()!=null?lb.getJhlc():"0"));
+				m.put("sjlc", Arith.add(m.get("sjlc")!=null?m.get("sjlc"):"0", lb.getSjlc()!=null?lb.getSjlc():"0"));
+				m.put("lzbc", Arith.add(m.get("lzbc")!=null?m.get("lzbc"):"0", lb.getLzbc()));
+				m.put("lzlc", Arith.add(m.get("lzlc")!=null?m.get("lzlc"):"0", lb.getLzlc()!=null?lb.getLzlc():"0"));
+				m.put("dmbc", Arith.add(m.get("dmbc")!=null?m.get("dmbc"):"0", lb.getDmbc()));
+				m.put("dmlc", Arith.add(m.get("dmlc")!=null?m.get("dmlc"):"0", lb.getDmlc()!=null?lb.getDmlc():"0"));
+				m.put("gzbc", Arith.add(m.get("gzbc")!=null?m.get("gzbc"):"0", lb.getGzbc()));
+				m.put("gzlc", Arith.add(m.get("gzlc")!=null?m.get("gzlc"):"0", lb.getGzlc()!=null?lb.getGzlc():"0"));
+				m.put("jfbc", Arith.add(m.get("jfbc")!=null?m.get("jfbc"):"0", lb.getJfbc()));
+				m.put("jflc", Arith.add(m.get("jflc")!=null?m.get("jflc"):"0", lb.getJflc()!=null?lb.getJflc():"0"));
+				m.put("zsbc", Arith.add(m.get("zsbc")!=null?m.get("zsbc"):"0", lb.getZsbc()));
+				m.put("zslc", Arith.add(m.get("zslc")!=null?m.get("zslc"):"0", lb.getZslc()!=null?lb.getZslc():"0"));
+				m.put("qrbc", Arith.add(m.get("qrbc")!=null?m.get("qrbc"):"0", lb.getQrbc()));
+				m.put("qrlc", Arith.add(m.get("qrlc")!=null?m.get("qrlc"):"0", lb.getQrlc()!=null?lb.getQrlc():"0"));
+				m.put("qcbc", Arith.add(m.get("qcbc")!=null?m.get("qcbc"):"0", lb.getQcbc()));
+				m.put("qclc", Arith.add(m.get("qclc")!=null?m.get("qclc"):"0", lb.getQclc()!=null?lb.getQclc():"0"));
+				m.put("kxbc", Arith.add(m.get("kxbc")!=null?m.get("kxbc"):"0", lb.getKxbc()));
+				m.put("kxlc", Arith.add(m.get("kxlc")!=null?m.get("kxlc"):"0", lb.getKxlc()!=null?lb.getKxlc():"0"));
+				m.put("qhbc", Arith.add(m.get("qhbc")!=null?m.get("qhbc"):"0", lb.getQhbc()));
+				m.put("qhlc", Arith.add(m.get("qhlc")!=null?m.get("qhlc"):"0", lb.getQhlc()!=null?lb.getQhlc():"0"));
+				m.put("ywbc", Arith.add(m.get("ywbc")!=null?m.get("ywbc"):"0", lb.getYwbc()));
+				m.put("ywlc", Arith.add(m.get("ywlc")!=null?m.get("ywlc"):"0", lb.getYwlc()!=null?lb.getYwlc():"0"));
+				m.put("qtbc", Arith.add(m.get("qtbc")!=null?m.get("qtbc"):"0", lb.getQtbc()));
+				m.put("qtlc", Arith.add(m.get("qtlc")!=null?m.get("qtlc"):"0", lb.getQtlc()!=null?lb.getQtlc():"0"));
+			}
+			m.put("date", Date);
+			m.put("company", company);
+			m.put("subCompany", subCompany);
+			m.put("line", lineName);
+			resList.add(m);
+			
+			lastMap.put("jhbc", Arith.add(m.get("jhbc")!=null?m.get("jhbc"):"0", lastMap.get("jhbc")!=null?lastMap.get("jhbc"):"0"));
+			lastMap.put("sjbc", Arith.add(m.get("sjbc")!=null?m.get("sjbc"):"0", lastMap.get("sjbc")!=null?lastMap.get("sjbc"):"0"));
+			lastMap.put("jhlc", Arith.add(m.get("jhlc")!=null?m.get("jhlc"):"0", lastMap.get("jhlc")!=null?lastMap.get("jhlc"):"0"));
+			lastMap.put("sjlc", Arith.add(m.get("sjlc")!=null?m.get("sjlc"):"0", lastMap.get("sjlc")!=null?lastMap.get("sjlc"):"0"));
+			lastMap.put("lzbc", Arith.add(m.get("lzbc")!=null?m.get("lzbc"):"0", lastMap.get("lzbc")!=null?lastMap.get("lzbc"):"0"));
+			lastMap.put("lzlc", Arith.add(m.get("lzlc")!=null?m.get("lzlc"):"0", lastMap.get("lzlc")!=null?lastMap.get("lzlc"):"0"));
+			lastMap.put("dmbc", Arith.add(m.get("dmbc")!=null?m.get("dmbc"):"0", lastMap.get("dmbc")!=null?lastMap.get("dmbc"):"0"));
+			lastMap.put("dmlc", Arith.add(m.get("dmlc")!=null?m.get("dmlc"):"0", lastMap.get("dmlc")!=null?lastMap.get("dmlc"):"0"));
+			lastMap.put("gzbc", Arith.add(m.get("gzbc")!=null?m.get("gzbc"):"0", lastMap.get("gzbc")!=null?lastMap.get("gzbc"):"0"));
+			lastMap.put("gzlc", Arith.add(m.get("gzlc")!=null?m.get("gzlc"):"0", lastMap.get("gzlc")!=null?lastMap.get("gzlc"):"0"));
+			lastMap.put("jfbc", Arith.add(m.get("jfbc")!=null?m.get("jfbc"):"0", lastMap.get("jfbc")!=null?lastMap.get("jfbc"):"0"));
+			lastMap.put("jflc", Arith.add(m.get("jflc")!=null?m.get("jflc"):"0", lastMap.get("jflc")!=null?lastMap.get("jflc"):"0"));
+			lastMap.put("zsbc", Arith.add(m.get("zsbc")!=null?m.get("zsbc"):"0", lastMap.get("zsbc")!=null?lastMap.get("zsbc"):"0"));
+			lastMap.put("zslc", Arith.add(m.get("zslc")!=null?m.get("zslc"):"0", lastMap.get("zslc")!=null?lastMap.get("zslc"):"0"));
+			lastMap.put("qrbc", Arith.add(m.get("qrbc")!=null?m.get("qrbc"):"0", lastMap.get("qrbc")!=null?lastMap.get("qrbc"):"0"));
+			lastMap.put("qrlc", Arith.add(m.get("qrlc")!=null?m.get("qrlc"):"0", lastMap.get("qrlc")!=null?lastMap.get("qrlc"):"0"));
+			lastMap.put("qcbc", Arith.add(m.get("qcbc")!=null?m.get("qcbc"):"0", lastMap.get("qcbc")!=null?lastMap.get("qcbc"):"0"));
+			lastMap.put("qclc", Arith.add(m.get("qclc")!=null?m.get("qclc"):"0", lastMap.get("qclc")!=null?lastMap.get("qclc"):"0"));
+			lastMap.put("kxbc", Arith.add(m.get("kxbc")!=null?m.get("kxbc"):"0", lastMap.get("kxbc")!=null?lastMap.get("kxbc"):"0"));
+			lastMap.put("kxlc", Arith.add(m.get("kxlc")!=null?m.get("kxlc"):"0", lastMap.get("kxlc")!=null?lastMap.get("kxlc"):"0"));
+			lastMap.put("qhbc", Arith.add(m.get("qhbc")!=null?m.get("qhbc"):"0", lastMap.get("qhbc")!=null?lastMap.get("qhbc"):"0"));
+			lastMap.put("qhlc", Arith.add(m.get("qhlc")!=null?m.get("qhlc"):"0", lastMap.get("qhlc")!=null?lastMap.get("qhlc"):"0"));
+			lastMap.put("ywbc", Arith.add(m.get("ywbc")!=null?m.get("ywbc"):"0", lastMap.get("ywbc")!=null?lastMap.get("ywbc"):"0"));
+			lastMap.put("ywlc", Arith.add(m.get("ywlc")!=null?m.get("ywlc"):"0", lastMap.get("ywlc")!=null?lastMap.get("ywlc"):"0"));
+			lastMap.put("qtbc", Arith.add(m.get("qtbc")!=null?m.get("qtbc"):"0", lastMap.get("qtbc")!=null?lastMap.get("qtbc"):"0"));
+			lastMap.put("qtlc", Arith.add(m.get("qtlc")!=null?m.get("qtlc"):"0", lastMap.get("qtlc")!=null?lastMap.get("qtlc"):"0"));
+		}
+		
+		if(resList.size() > 0){
+			resList.add(lastMap);
+			for(Map<String, Object> m : resList){
+				if(Arith.compareTo(m.get("sjbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("bcbfb", Arith.div(Arith.mul(m.get("sjbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("bcbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("sjlc"), 0) == 1 && Arith.compareTo(m.get("jhlc"), 0) == 1){
+					m.put("lcbfb", Arith.div(Arith.mul(m.get("sjlc"), 100), m.get("jhlc"), 2) + "%");
+				} else {
+					m.put("lcbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("lzbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("lzbfb", Arith.div(Arith.mul(m.get("lzbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("lzbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("dmbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("dmbfb", Arith.div(Arith.mul(m.get("dmbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("dmbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("gzbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("gzbfb", Arith.div(Arith.mul(m.get("gzbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("gzbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("jfbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("jfbfb", Arith.div(Arith.mul(m.get("jfbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("jfbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("zsbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("zsbfb", Arith.div(Arith.mul(m.get("zsbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("zsbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("qrbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("qrbfb", Arith.div(Arith.mul(m.get("qrbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("qrbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("qcbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("qcbfb", Arith.div(Arith.mul(m.get("qcbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("qcbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("kxbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("kxbfb", Arith.div(Arith.mul(m.get("kxbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("kxbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("qhbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("qhbfb", Arith.div(Arith.mul(m.get("qhbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("qhbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("ywbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("ywbfb", Arith.div(Arith.mul(m.get("ywbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("ywbfb", "0%");
+				}
+				if(Arith.compareTo(m.get("qtbc"), 0) == 1 && Arith.compareTo(m.get("jhbc"), 0) == 1){
+					m.put("qtbfb", Arith.div(Arith.mul(m.get("qtbc"), 100), m.get("jhbc"), 2) + "%");
+				} else {
+					m.put("qtbfb", "0%");
+				}
+			}
+		}
+		
+		return resList;
+	}
+
+}
@@ -306,9 +306,9 @@ public class CalcMixServiceImpl implements CalcMixService {
 					m.put("hyl", Arith.add(m.get("hyl"), sin_.getHyl()!=null?sin_.getHyl():0));
 					m.put("jzl", Arith.add(m.get("jzl"), sin_.getJzl()!=null?sin_.getJzl():0));
 					m.put("sh", Arith.add(m.get("sh"), sin_.getUnyyyl()!=null?sin_.getUnyyyl():0));
-					last.put("hyl", Arith.add(last.get("hyl"), m.get("hyl")));
-					last.put("jzl", Arith.add(last.get("jzl"), m.get("jzl")));
-					last.put("sh", Arith.add(last.get("sh"), m.get("sh")));
+					last.put("hyl", Arith.add(last.get("hyl"), sin_.getHyl()!=null?sin_.getHyl():0));
+					last.put("jzl", Arith.add(last.get("jzl"), sin_.getJzl()!=null?sin_.getJzl():0));
+					last.put("sh", Arith.add(last.get("sh"), sin_.getUnyyyl()!=null?sin_.getUnyyyl():0));
 				} else {
 					Map<String, Object> m = new HashMap<String, Object>();
 					m.put("gS", BasicData.businessFgsCodeNameMap.get(fgsdm+"_"+gsdm));
@@ -16,6 +16,7 @@ import com.bsth.entity.LineVersions;
 import com.bsth.entity.directive.D80;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.CarParkRepository;
+import com.bsth.repository.LineRepository;
 import com.bsth.repository.LineVersionsRepository;
 import com.bsth.repository.StationRepository;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
@@ -87,6 +88,9 @@ public class GpsServiceImpl implements GpsService {
     @Autowired
     LineVersionsRepository lineVersionsRepository;
+    @Autowired
+    LineRepository lineRepository;
+
     // 历史gps查询
     @Override
     public List<Map<String, Object>> history(String device, Long startTime, Long endTime, int directions) {
@@ -228,50 +232,68 @@ public class GpsServiceImpl implements GpsService {
         //查询GPS数据
         JdbcTemplate jdbcTemplate_ms = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<Map<String, Object>> dataList = jdbcTemplate_ms.queryForList(sql.toString());
-        if (!dataList.isEmpty()){
-            int lineId=Integer.parseInt(map_get_str(dataList.get(0), "LINE_ID"));
-            List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
-            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-            List<Map<String,Object>> vlist=new ArrayList<>();
-            Map<String,Object> vMap;
-            if (lvs!=null&&!lvs.isEmpty()){
-                for (LineVersions lv : lvs) {
-                    vMap=new HashMap();
-                    Long sd=lv.getStartDate().getTime();
-                    Long ed=lv.getEndDate().getTime();
-                    if (sd<st&&et<ed){
-                        vMap.put("version",lv.getVersions());
-                        vMap.put("vtime","all");
-                        vlist.add(vMap);
-                    }else if(sd<st&&et>ed&&st<ed){
-                        vMap.put("version",lv.getVersions());
-                        vMap.put("endTime",lv.getEndDate().getTime());
-                        vlist.add(vMap);
-                    }else if(st<sd&&et<ed&&sd<et){
-                        vMap.put("version",lv.getVersions());
-                        vMap.put("startTime",lv.getStartDate().getTime());
-                        vlist.add(vMap);
-                    }
-                }
-            }
-            rsMap.put("lineVerson",vlist);
-        }
         Float lon, lat;
         Location bdLoc, gdLoc;
         int inOutStop;
         long serviceState;
         ArrivalEntity arrival;
-
+        Set<String> lineSet=new HashSet();
+        List<Map<String,Object>> lineSwitch=new ArrayList<>();
+
+        List<Map> gpsNotValidList=new ArrayList();
+        List<Map> versionSwitchList=new ArrayList();
+        List<Map> gpsEqualsZeroList=new ArrayList();
+        Map<String,Object> zeroMap=null;
+        Map<String,Object> gpsNotValidMap=null;
+        boolean isFirstNotValid=true;
+        boolean isFirstLonlatZero=true;
         Map<String, Object> map = null;
         for(Map<String, Object> rs : dataList){
+            int index=dataList.indexOf(rs);
+            if (index< dataList.size()-1&&!map_get_str( rs,"LINE_ID").equals(map_get_str( dataList.get(index+1),"LINE_ID"))){
+                Map<String,Object> LSmap=new HashMap<>();
+                String name=lineRepository.findOne(Integer.valueOf(map_get_str( rs,"LINE_ID"))).getName();
+                String NextName=lineRepository.findOne(Integer.valueOf(map_get_str( dataList.get(index+1),"LINE_ID"))).getName();
+                LSmap.put("abnormalType","linesSwitch");
+                LSmap.put("line_line",name+"-->"+NextName);
+                LSmap.put("st",map_get_long(rs, "TS"));
+                LSmap.put("et",index== dataList.size()-1?map_get_long(rs, "TS"):map_get_long( dataList.get(index+1), "TS"));
+                lineSwitch.add(LSmap);
+            }
             serviceState = map_get_long(rs, "SERVICE_STATE");
-            if(getGpsValid(serviceState) == 1)
-                continue;
+            if(getGpsValid(serviceState) == 1){
+                if (isFirstNotValid) {
+                    gpsNotValidMap=new HashMap<>();
+                    gpsNotValidMap.put("abnormalType","gpsNotValid");
+                    gpsNotValidMap.put("st",map_get_long(rs,"TS"));
+                    isFirstNotValid=false;
+                }
+                if (index== dataList.size()-1||index< dataList.size()-1&&getGpsValid(map_get_long(dataList.get(index+1), "SERVICE_STATE"))!=1){
+                    gpsNotValidMap.put("et",map_get_long(rs,"TS"));
+                    gpsNotValidList.add(gpsNotValidMap);
+                    isFirstNotValid=true;
+                    gpsNotValidMap=null;
+                }
+            }
+                //continue;
             map = new HashMap<>();
             lon = map_get_float(rs, "LON");
             lat = map_get_float(rs, "LAT");
+            if (lon==0||lat==0){
+                if (isFirstLonlatZero){
+                    zeroMap=new HashMap<>();
+                    zeroMap.put("abnormalType","gpsZero");
+                    zeroMap.put("st",map_get_long(rs,"TS"));
+                    isFirstLonlatZero=false;
+                }
+                if (index<dataList.size()-1&&(map_get_float(dataList.get(index+1),"LON")!=0&&map_get_float(dataList.get(index+1),"LAT")!=0)){
+                    zeroMap.put("et",map_get_long(rs,"TS"));
+                    gpsEqualsZeroList.add(zeroMap);
+                    isFirstLonlatZero=true;
+                }
+            }
             // 高德坐标
             gdLoc = TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(lon, lat));
             map.put("gcj_lon", gdLoc.getLng());
@@ -292,7 +314,7 @@ public class GpsServiceImpl implements GpsService {
             map.put("lineId", map_get_str(rs, "LINE_ID"));
             map.put("speed", map_get_float(rs,"SPEED_GPS"));
-
+            lineSet.add(map_get_str(rs, "LINE_ID"));
             inOutStop = Integer.parseInt(rs.get("INOUT_STOP").toString());
             map.put("inout_stop", inOutStop);
@@ -310,6 +332,48 @@ public class GpsServiceImpl implements GpsService {
             map.put("section_code", map_get_str(rs,"SECTION_CODE"));
             list.add(map);
         }
+
+        if (lineSet.size()>0){
+            for (String s : lineSet) {
+            int lineId=Integer.parseInt(s);
+            List<LineVersions> lvs=lineVersionsRepository.findBylineId(lineId);
+            List<Map<String,Object>> vlist=new ArrayList<>();
+            Map<String,Object> vMap;
+            Long qt=0L;
+            if (lvs!=null&&!lvs.isEmpty()){
+                for (LineVersions lv : lvs) {
+                    vMap=new HashMap();
+                    Long sd=lv.getStartDate().getTime();
+                    Long ed=lv.getEndDate().getTime();
+                    if (sd<st&&et<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("vtime","all");
+                        vlist.add(vMap);
+                    }else if(sd<st&&et>ed&&st<ed){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("endTime",lv.getEndDate().getTime());
+                        vMap.put("abnormalType","versionSwitch");
+                        vMap.put("st",lv.getEndDate().getTime());
+                        //vMap.put("et",lvs.indexOf(lv)==lvs.size()-1?lv.getEndDate().getTime():lvs.get(lvs.indexOf(lv)+1).getStartDate().getTime());
+                        qt=lv.getEndDate().getTime();
+                        vlist.add(vMap);
+                    }else if(st<sd&&et<ed&&sd<et){
+                        vMap.put("version",lv.getVersions());
+                        vMap.put("startTime",lv.getStartDate().getTime());
+                        vlist.add(vMap);
+                    }
+                }
+            }
+            rsMap.put("lineVerson",vlist);
+            if (vlist.size()>1){
+                Map<String,Object> VSmap=new HashMap<>();
+                VSmap.put("abnormalType","vserionSwitch");
+                VSmap.put("st",qt);
+                versionSwitchList.add(VSmap);
+            }
+            }
+
+        }
         // 按时间排序
         Collections.sort(list, new Comparator<Map<String, Object>>() {
@@ -321,6 +385,9 @@ public class GpsServiceImpl implements GpsService {
         rsMap.put("list", list);
         rsMap.put("dcs", dcs);
+        rsMap.put("gpsNotValid",gpsNotValidList);
+        rsMap.put("lineSwitch",lineSwitch);
+        rsMap.put("lonlatZero",gpsEqualsZeroList);
         return rsMap;
     }
@@ -749,6 +816,9 @@ public class GpsServiceImpl implements GpsService {
             rs.put("sumMileage", new DecimalFormat(".##").format(sum / 1000));
             rs.put("dcs", gpsMap.get("dcs"));
             rs.put("lineVerson",gpsMap.get("lineVerson"));
+            rs.put("gpsInvalid",gpsMap.get("gpsNotValid"));
+            rs.put("gpslineSwitch",gpsMap.get("lineSwitch"));
+            rs.put("gpslonlatex",gpsMap.get("lonlatZero"));
         } catch (Exception e) {
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
@@ -306,10 +306,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 		String sql = "select id,cc_id,mileage_type,destroy,destroy_reason," +
 				" mileage,type1,type2,schedule from bsth_c_s_child_task" +
 				" where 1=1";
-		if(schedule1 != null && schedule1 > 0){
+		if(schedule1 != null && schedule1 >= 0){
 			sql += " and schedule >= '"+schedule1+"'";
 		}
-		if(schedule2 != null && schedule2 > 0){
+		if(schedule2 != null && schedule2 >= 0){
 			sql += " and schedule <= '"+schedule2+"'";
 		}
@@ -520,9 +520,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				continue;
 			Map<String, List<ScheduleRealInfo>> keyMap2 = new HashMap<String, List<ScheduleRealInfo>>();
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(companyName.length() == 0 && schedule.getGsName() != null)
+				if(companyName.trim().length() == 0 && schedule.getGsName() != null)
 					companyName = schedule.getGsName();
-				if(subCompanyName.length() == 0 && schedule.getFgsName() != null)
+				if(subCompanyName.trim().length() == 0 && schedule.getFgsName() != null)
 					subCompanyName = schedule.getFgsName();
 				String date = schedule.getScheduleDateStr();
 				if(!keyMap2.containsKey(date))
@@ -1061,7 +1061,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				continue;
 			}
 			String key = schedule.getScheduleDateStr() + "/" + schedule.getXlName() + "/"
-					+ schedule.getLpName() + "/" + schedule.getFgsName();
+					+ schedule.getLpName() + "/" + schedule.getFgsBm();
 			if(model.length() != 0){
 				if(ttSet.contains(schedule.getSpId())){
 					if(!keyMap.containsKey(key))
@@ -1099,10 +1099,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			long jhyssj1 = 0, sjyssj1 = 0;
 			double jhlc = 0, sjlc = 0;
 			for(ScheduleRealInfo schedule : list2){
-				if(companyName.length() == 0 && schedule.getGsName() != null){
+				if(companyName.trim().length() == 0 && schedule.getGsName() != null){
 					companyName = schedule.getGsName();
 				}
-				if(subCompanyName.length() == 0 && schedule.getFgsName() != null){
+				if(subCompanyName.trim().length() == 0 && schedule.getFgsName() != null){
 					subCompanyName = schedule.getFgsName();
 				}
 				long fcsj = schedule.getFcsjT();
@@ -1887,7 +1887,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				continue;
 			}
-			String key = schedule.getXlName() + "/" + schedule.getFgsName();
+			String key = schedule.getXlName() + "/" + schedule.getFgsBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
@@ -1978,9 +1978,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					qtlc = new BigDecimal("0");
 			String companyName = "", subCompanyName = "";
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
-				if(schedule.getGsName() != null && companyName.length() == 0)
+				if(schedule.getGsName() != null && companyName.trim().length() == 0)
 					companyName = schedule.getGsName();
-				if(schedule.getFgsName() != null && subCompanyName.length() == 0)
+				if(schedule.getFgsName() != null && subCompanyName.trim().length() == 0)
 					subCompanyName = schedule.getFgsName();
 				BigDecimal lc = new BigDecimal("0");
 				if(schedule.getJhlcOrig() != null && schedule.getJhlcOrig() > 0.1d){
@@ -2071,7 +2071,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String[] keys = key.split("/");
 			tempMap.put("date", Date);
 			tempMap.put("company", companyName);
-			tempMap.put("subCompany", keys[1]);
+			tempMap.put("subCompany", subCompanyName);
+//			tempMap.put("subCompany", keys[1]);
 			tempMap.put("times", sfqr == 1 ? times : "全日");
 			tempMap.put("line", keys[0]);
 			tempMap.put("jhbc", jhbc);
@@ -2338,17 +2339,23 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				continue;
 			}
-			String key = schedule.getGsName() + "/" + schedule.getFgsName() + "/" + schedule.getXlBm();
+			String key = schedule.getGsBm() + "/" + schedule.getFgsBm() + "/" + schedule.getXlBm();
 			if(!keyMap.containsKey(key))
 				keyMap.put(key, new ArrayList<ScheduleRealInfo>());
 			keyMap.get(key).add(schedule);
 		}
+
 		for(String key : keyMap.keySet()){
+			String companyName = "", subCompanyName = "";
 			Map<String, Object> tempMap = new HashMap<String, Object>();
 			List<ScheduleRealInfo> tempList = new ArrayList<ScheduleRealInfo>();
 			int sjbc = 0, sddf = 0, zddf = 0,
 					dxtz = 0, lbtz = 0;
 			for(ScheduleRealInfo schedule : keyMap.get(key)){
+				if(schedule.getGsName() != null && companyName.trim().length() == 0)
+					companyName = schedule.getGsName();
+				if(schedule.getFgsName() != null && subCompanyName.trim().length() == 0)
+					subCompanyName = schedule.getFgsName();
 				boolean flag = false;
 				if(schedule.getFcsjActual() != null && schedule.getZdsjActual() != null
 						&& schedule.getStatus() != -1 && !schedule.isCcService()){
@@ -2373,8 +2380,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			}
 			tempMap.put("date", date);
 			String[] keys = key.split("/");
-			tempMap.put("company", keys[0]);
-			tempMap.put("subCompany", keys[1]);
+			tempMap.put("company", companyName);
+			tempMap.put("subCompany", subCompanyName);
+//			tempMap.put("company", keys[0]);
+//			tempMap.put("subCompany", keys[1]);
 			tempMap.put("line", keys[2]);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("sddf", sddf);
@@ -3108,7 +3117,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				continue;
 			}
-			String xl = s.getXlName() + "/" + s.getFgsName();
+			String xl = s.getXlName() + "/" + s.getFgsBm();
 			String dateStr = s.getScheduleDateStr();
 			if(!sches.containsKey(xl)){
 				sches.put(xl, new HashMap<String, List<ScheduleRealInfo>>());
@@ -3138,12 +3147,19 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			List<List<Map<String, Object>>> lists = new ArrayList<List<Map<String, Object>>>();
 			Map<Long, ScheduleRealInfo> keyTemp = new HashMap<Long, ScheduleRealInfo>();
 			for(Long time : timeList){
+				String companyName = "", subCompanyName = "";
 				List<Long> keyList = new ArrayList<Long>();
 				String date = timeTemp.get(time);
 				List<ScheduleRealInfo> sche2 = sche1.get(date);
 				for(ScheduleRealInfo s : sche2){
 					if(s.getFcsj()!=null && s.getFcsj().trim().length() > 0
 							&& s.getFcsj().contains(":")){
+						
+						if(s.getGsName() != null && companyName.trim().length() == 0)
+							companyName = s.getGsName();
+						if(s.getFgsName() != null && subCompanyName.trim().length() == 0)
+							subCompanyName = s.getFgsName();
+						
 						String[] split = s.getFcsj().split(":");
 						Long key = Long.valueOf(s.getXlDir())*1500 + Long.valueOf(split[0])*60 + Long.valueOf(split[1]);
 						while(keyTemp.containsKey(key)){
@@ -3158,8 +3174,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				for(Long l : keyList){
 					ScheduleRealInfo s = keyTemp.get(l);
 					Map<String, Object> temp = new HashMap<String, Object>();
-					temp.put("gs", s.getGsName());
-					temp.put("fgs", s.getFgsName());
+					temp.put("gs", companyName);
+					temp.put("fgs", subCompanyName);
+//					temp.put("gs", s.getGsName());
+//					temp.put("fgs", s.getFgsName());
 					temp.put("fgsBm", s.getFgsBm());
 					temp.put("date", date);
 					temp.put("xlbm", s.getXlBm());
@@ -568,7 +568,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
+            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm()+ "_" + t.getGsBm() ));
             //t.setScheduleDateStr(schDate);
             t.setScheduleDate(sdfyyyyMMdd.parse(t.getScheduleDateStr()));
@@ -8,9 +8,10 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.show-sql= true
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
-spring.datasource.password=
+spring.datasource.password= root
 #spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 #spring.datasource.username= root
 #spring.datasource.password= root
@@ -11,8 +11,8 @@
   "dependencies": {
     "cheerio": "^0.20.0",
     "clean-css": "^4.0.12",
-    "colors": "^1.1.2",
+    "colors": "^1.3.3",
     "eventproxy": "^0.3.4",
     "uglify-js": "^2.6.2"
   }
-}
 \ No newline at end of file
+}
@@ -77,6 +77,7 @@
             CSMap = getMaxCarAndStopSpace1(map);
         } else if (map.baseRes == '3') { // 主站停站使用v2_2版本
             _paramObj = Main_v2.getFactory().createParameterObj(map, dataMap); // TODO：暂时使用v2_1版本的方法，通用的，后续再放到v2_2版本中
+            console.log(_paramObj);
             map.clzs = InternalScheduleObj_v2_2.calcuClzx(_paramObj);
             CSMap = getMaxCarAndStopSpace1(map);
         }
@@ -186,7 +187,7 @@
                 return _rtnBcArray;
             };
-            // Main_v2_2.exportExcelConfig(_dfun);
+            Main_v2_2.exportExcelConfig(_paramObj, _dfun);
         }
         // 关闭弹出层
+<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; }
+	#forms > tbody > tr{
+		background-color: #FFFFFF;
+	}
+</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 id="history" class="form-inline" action="">
+					<div style="display: inline-block;margin-left: 5px;">
+						<span class="item-label" style="width: 80px;">烂班原因: </span>
+						<input class="form-control" type="checkbox" id="totalLb" style="width: 20px;" checked="true"/>全选 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="0" checked="true"/>路阻 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="1" checked="true"/>吊慢 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="2" checked="true"/>故障 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="3" checked="true"/>纠纷 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="4" checked="true"/>肇事 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="5" checked="true"/>缺人 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="6" checked="true"/>缺车 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他 
+					</div>
+					<div style="margin-top: 5px"></div>
+					<div style="display: inline-block; margin-left: 33px;" id="company1">
+						<span class="item-label" style="width: 80px;">公司: </span>
+						<select class="form-control" name="company" id="company" style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 24px;" id="subCompany1">
+						<span class="item-label" style="width: 80px;">分公司: </span>
+						<select class="form-control" name="subCompany" id="subCompany" style="width: 140px;"></select>
+					</div>
+					<div style="display: inline-block; margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">选择线路: </span>
+						<select class="form-control" name="line" id="line" style="width: 150px;"></select>
+					</div>
+					<div style="margin-top: 10px"></div>
+					<div style="display: inline-block; margin-left: 5px">
+						<span class="item-label" style="width: 80px;">是否营运: </span>
+						<select class="form-control" name="sfyy" id="sfyy" style="width: 140px;">
+							<option value="0">全部线路</option>
+							<option value="1" selected="selected">营运线路</option>
+							<option value="2">非营运线路</option>
+						</select>
+					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">开始时间: </span>
+						<input class="form-control" type="text" id="startDate" style="width: 140px;"/>
+					</div>
+					<div style="display: inline-block;margin-left: 10px;">
+						<span class="item-label" style="width: 80px;">结束时间: </span>
+						<input class="form-control" type="text" id="endDate" style="width: 140px;"/>
+					</div>
+					<div class="form-group" style="margin-left: 10px">
+						<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" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
+						<thead>
+						
+						</thead>
+						<tbody>
+							
+						</tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</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;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
+		
+		
+		var fage=false;
+		var xlList;
+		var obj = [];
+		
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			$.get('/user/companyData', function(result){
+				obj = result;
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#company1").css('display','none');
+				}else if(obj.length ==1){
+					 $("#company1").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#subCompany1').css('display','none');
+				}
+				$('#company').html(options);
+				updateCompany();
+			});
+		})
+		$("#company").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#company').val();
+			var options = '<option value="">全部分公司</option>';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#subCompany').html(options);
+		}
+		
+		var tempData = {};
+		$.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,'');
+				
+			});
+		});
+		
+		$("#line").on("change", function(){
+			if($("#line").val() == " "){
+				$("#company").attr("disabled", false);
+				$("#subCompany").attr("disabled", false);
+			} else {
+				var temp = tempData[$("#line").val()].split(":");
+				$("#company").val(temp[0]);
+				updateCompany();
+// 				$("#subCompany").val(temp[1]);
+				$("#subCompany").val("");
+				$("#company").attr("disabled", true);
+// 				$("#subCompany").attr("disabled", true);
+			}
+		});
+		
+		var lb = 0;		//标志是否有选择至少一个烂班类型
+		$("#totalLb").on("change", function(){
+			var reason = $("input[name='reason']");
+			var checked = this.checked;
+			$.each(reason, function(i, g){
+				g.checked = checked;
+			});
+			if(checked == true)
+				lb = 33;
+			else
+				lb = 0;
+		});
+		
+		$("input[name='reason']").on("change", function(){
+			var totalLb = $("#totalLb")[0];
+			totalLb.checked = true;
+			lb = 0;
+			$.each($("input[name='reason']"), function(i, g){
+				if(g.checked == false){
+					totalLb.checked = false;
+				}else{
+					lb += 3;
+				}
+			});
+		});
+		
+		$("#query").on("click",jsDoQuery);
+
+		var sfyy = 1;
+		var line = $("#line").val();
+		var startDate = $("#startDate").val();
+		var endDate = $("#endDate").val();
+		var company = $("#company").val();
+		var subCompany = $("#subCompany").val();
+		var lineName = $('#line option:selected').text();
+		function jsDoQuery(pagination){
+			if($("#startDate").val().trim().length == 0 || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择日期");
+				return;
+			}
+			var reason = $("input[name='reason']");
+			var params = {};
+			if(line == " ")
+				line = "";
+// 			line = $("#line").val();
+			sfyy = $("#sfyy").val();
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
+			company = $("#company").val();
+			subCompany = $("#subCompany").val();
+			params['line'] = line;
+			params['sfyy'] = sfyy;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['type'] = "query";
+			lineName = $('#line option:selected').text();
+			if(lineName == "全部线路")
+				lineName = $('#subCompany option:selected').text();
+			var i = layer.load(2);
+// 			$(".hidden").removeClass("hidden");
+			$get('/calcLbStatuAnaly/lbStatuAnaly', params, function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_lbAnaly',{list:result, reason:reason, lb:lb});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms').html(tbodyHtml);
+				layer.close(i);
+				
+				_w_table_rowspan("#forms", 1);
+				_w_table_rowspan("#forms", 2);
+				_w_table_rowspan("#forms", 3);
+				_w_table_rowspan("#forms", 4);
+// 				_w_table_rowspan("#forms", 5);
+				
+				if(result.length == 0)
+					$('#export').attr('disabled', "true");
+				else
+					$("#export").removeAttr("disabled");
+
+				if($("#forms").height()+70 > $(window).height()-110){
+					$("#table").height($(window).height()-110);
+				} else {
+					$("#table").height($("#forms").height()+70);
+				}
+			});
+		}
+		
+		$("#export").on("click", function(){
+			if($("#startDate").val().trim().length == 0 || $("#endDate").val().trim().length == 0){
+				layer.msg("请选择日期");
+				return;
+			}
+			var params = {};
+			params['line'] = line;
+			params['sfyy'] = sfyy;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['type'] = "export";
+			params['lineName'] = lineName;
+			var i = layer.load(2);
+			$get('/calc_export/lbStatuAnalyExport', params, function(result){
+				var dd = "";
+				if(startDate == endDate){
+					dd = moment(startDate).format("YYYYMMDD");
+				} else {
+					dd = moment(startDate).format("YYYYMMDD")
+						+"-"+moment(endDate).format("YYYYMMDD");
+				}
+				window.open("/downloadFile/download?fileName="
+							+dd+"-"+lineName+"-烂班情况分析表(统计)");
+				layer.close(i);
+			});
+		});
+		
+		
+		$("#line").on("change", function(){
+			line = $("#line").val();
+			if(line == " ")
+				line = "";
+		});
+		$('#startDate').on("blur", function(){
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
+		});
+		$('#endDate').on("blur", function(){
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
+		});
+		
+		
+		/**
+		 * 将模块List 转换为树结构
+		 * @param arr
+		 * @returns {Array}
+		 */
+		function createTreeData(arr){
+			var treeData = [];
+			var len = arr.length;
+			for(var i = 0; i < len; i ++){
+				var pId = arr[i].pId;
+				arr[i].text = arr[i].name;
+				if(!pId){
+					treeData.push(arr[i]);
+				}
+
+				for(var j = 0; j < len; j ++){
+					if(pId == arr[j].id){
+						if(!arr[j].children)
+							arr[j].children = [];
+						arr[j].children.push(arr[i]);
+						break;
+					}
+				}
+			}
+			return treeData;
+		}
+		
+		function _w_table_rowspan(_w_table_id, _w_table_colnum){
+		    _w_table_firsttd = "";
+		    _w_table_currenttd = "";
+		    _w_table_SpanNum = 0;
+		    _w_table_Obj = jQuery(_w_table_id + " tr td:nth-child(" + _w_table_colnum + ")");
+		    _w_table_Obj.each(function(i){
+		        if(i==0){
+		            _w_table_firsttd = jQuery(this);
+		            _w_table_SpanNum = 1;
+		        }else{
+		            _w_table_currenttd = jQuery(this);
+		            if(_w_table_firsttd.text()==_w_table_currenttd.text()){
+		                _w_table_SpanNum++;
+		                _w_table_currenttd.hide(); //remove();
+		                _w_table_firsttd.attr("rowSpan",_w_table_SpanNum);
+		            }else{
+		                _w_table_firsttd = jQuery(this);
+		                _w_table_SpanNum = 1;
+		            }
+		        }
+		    });
+		}
+		
+		
+	});
+	
+</script>
+<script type="text/html" id="list_lbAnaly">
+<thead>
+	<tr>
+		<th class="hidden"></th>
+		<th rowspan="3" style=" width:120px;">日期</th>
+		<th rowspan="3">公司</th>
+		<th rowspan="3">分公司</th>
+		<th rowspan="3">线路</th>
+		<th rowspan="2" colspan="3">总班次</th>
+		<th rowspan="2" colspan="3">总营运公里</th>
+		{{if lb != 0}}
+			<th colspan={{lb}}>烂班原因</th>
+		{{/if}}
+	</tr>
+	<tr>
+		<th class="hidden"></th>
+		{{if reason[0].checked == true}}<th colspan="3">路阻</th>{{/if}}
+		{{if reason[1].checked == true}}<th colspan="3">吊慢</th>{{/if}}
+		{{if reason[2].checked == true}}<th colspan="3">故障</th>{{/if}}
+		{{if reason[3].checked == true}}<th colspan="3">纠纷</th>{{/if}}
+		{{if reason[4].checked == true}}<th colspan="3">肇事</th>{{/if}}
+		{{if reason[5].checked == true}}<th colspan="3">缺人</th>{{/if}}
+		{{if reason[6].checked == true}}<th colspan="3">缺车</th>{{/if}}
+		{{if reason[7].checked == true}}<th colspan="3">客稀</th>{{/if}}
+		{{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
+		{{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
+		{{if reason[10].checked == true}}<th colspan="3">其他</th>{{/if}}
+	</tr>
+	<tr>
+		<th class="hidden"></th>
+		<th>计划</th><th>实际</th><th>百分比</th>
+		<th>计划</th><th>实际</th><th>百分比</th>
+		{{if reason[0].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[1].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[2].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[3].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[4].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[5].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[6].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[7].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[8].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[9].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+		{{if reason[10].checked==true}}<th>烂班班次</th><th>烂班公里</th><th>百分比</th>{{/if}}
+	</tr>
+</thead>
+<tbody>
+	{{each list as obj i}}
+		<tr>
+			{{if obj.line!='合计'}}
+				<td>{{obj.date}}</td>
+				<td>{{obj.company}}</td>
+				<td>{{obj.subCompany}}</td>
+				<td>{{obj.line}}</td>
+			{{/if}}
+			{{if obj.line=='合计'}}
+				<td colspan="4">{{obj.line}}</td>
+			{{/if}}
+			<td>{{obj.jhbc}}</td><td>{{obj.sjbc}}</td><td>{{obj.bcbfb}}</td>
+			<td>{{obj.jhlc}}</td><td>{{obj.sjlc}}</td><td>{{obj.lcbfb}}</td>
+			{{if reason[0].checked==true}}<td>{{obj.lzbc}}</td><td>{{obj.lzlc}}</td><td>{{obj.lzbfb}}</td>{{/if}}
+			{{if reason[1].checked==true}}<td>{{obj.dmbc}}</td><td>{{obj.dmlc}}</td><td>{{obj.dmbfb}}</td>{{/if}}
+			{{if reason[2].checked==true}}<td>{{obj.gzbc}}</td><td>{{obj.gzlc}}</td><td>{{obj.gzbfb}}</td>{{/if}}
+			{{if reason[3].checked==true}}<td>{{obj.jfbc}}</td><td>{{obj.jflc}}</td><td>{{obj.jfbfb}}</td>{{/if}}
+			{{if reason[4].checked==true}}<td>{{obj.zsbc}}</td><td>{{obj.zslc}}</td><td>{{obj.zsbfb}}</td>{{/if}}
+			{{if reason[5].checked==true}}<td>{{obj.qrbc}}</td><td>{{obj.qrlc}}</td><td>{{obj.qrbfb}}</td>{{/if}}
+			{{if reason[6].checked==true}}<td>{{obj.qcbc}}</td><td>{{obj.qclc}}</td><td>{{obj.qcbfb}}</td>{{/if}}
+			{{if reason[7].checked==true}}<td>{{obj.kxbc}}</td><td>{{obj.kxlc}}</td><td>{{obj.kxbfb}}</td>{{/if}}
+			{{if reason[8].checked==true}}<td>{{obj.qhbc}}</td><td>{{obj.qhlc}}</td><td>{{obj.qhbfb}}</td>{{/if}}
+			{{if reason[9].checked==true}}<td>{{obj.ywbc}}</td><td>{{obj.ywlc}}</td><td>{{obj.ywbfb}}</td>{{/if}}
+			{{if reason[10].checked==true}}<td>{{obj.qtbc}}</td><td>{{obj.qtlc}}</td><td>{{obj.qtbfb}}</td>{{/if}}
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="44"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</tbody>
+</script>
 \ No newline at end of file
@@ -89,7 +89,6 @@
 								<th>实际空驶里程</th>
 								<th>烂班里程</th>
 								<th>临加营运里程</th>
-								<th>临加空驶里程</th>
 							</tr>
 						</thead>
 						<tbody>
@@ -302,7 +301,6 @@
 			<td>{{obj.sjfyylc}}</td>
 			<td>{{obj.lblc}}</td>
 			<td>{{obj.ljyylc}}</td>
-			<td>{{obj.ljfyylc}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -186,10 +186,10 @@
 				var temp = tempData[$("#line").val()].split(":");
 				$("#gsdmSing").val(temp[0]);
 				updateCompany();
-// 				$("#fgsdmSing").val(temp[1]);
-				$("#fgsdmSing").val("");
+				$("#fgsdmSing").val(temp[1]);
+// 				$("#fgsdmSing").val("");
 				$("#gsdmSing").attr("disabled", true);
-// 				$("#fgsdmSing").attr("disabled", true);
+				$("#fgsdmSing").attr("disabled", true);
 			}
 		});
@@ -312,8 +312,6 @@
                 <form>
                     <div class="uk-margin">
                         <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input role_search_input" type="text" placeholder="搜索角色">-->
                         </div>
                     </div>
                 </form>
@@ -329,8 +327,6 @@
                 <form>
                     <div class="uk-margin">
                         <div class="uk-inline" >
-                            <!--<span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>-->
-                            <!--<input class="uk-input user_search_input" type="text" placeholder="搜索用户">-->
                         </div>
                     </div>
                 </form>
@@ -349,16 +345,16 @@
     </div>
 </div>
-<script id="authorize-role-list-temp" type="text/html">
+<script id="authorize-role-list-temp1" type="text/html">
     {{each list as r i}}
-        <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}}
-            <span class="role-code">{{r.codeName}}</span>
-            <div class="ct_li_desc">{{r.createDateStr}}</div>
-            <span class="uk-badge">{{r.count}}</span>
-        </li>
+    <li data-id="{{r.id}}" data-name="{{r.roleName}}" data-code="{{r.codeUp}}">{{r.roleName}}
+        <span class="role-code">{{r.codeName}}</span>
+        <div class="ct_li_desc">{{r.createDateStr}}</div>
+        <span class="uk-badge">{{r.count}}</span>
+    </li>
     {{/each}}
 </script>
-<script id="authorize-user-list-temp" type="text/html">
+<script id="authorize-user-list-temp1" type="text/html">
     {{each list as u i}}
     <li class="uk-animation-fade uk-animation-fast" data-name="{{u.name}}" data-code="{{u.userNameUp}}" data-id="{{u.id}}">{{u.name}}<span class="role-code">{{u.userName}}</span></li>
     {{/each}}
@@ -481,9 +477,9 @@
         var userA={};
         for(var i=0,u;u=rs[i++];){
             if (u.id==userId){
-            discard_field(u);
-            u.userNameUp=u.userName.toUpperCase();
-            u.lastLoginDateStr=moment(u.lastLoginDate).format('YYYY-MM-DD HH:ss');
+                discard_field(u);
+                u.userNameUp=u.userName.toUpperCase();
+                u.lastLoginDateStr=moment(u.lastLoginDate).format('YYYY-MM-DD HH:ss');
                 userA[0]=u;
             }
         }
@@ -514,14 +510,14 @@
     }
     function render_role_list(list) {
-        var htmlStr = template('authorize-role-list-temp', {list: list});
+        var htmlStr = template('authorize-role-list-temp1', {list: list});
         $('ul.role-list').html(htmlStr);
         up_scroll();
     }
     function render_user_list(list) {
-        var htmlStr = template('authorize-user-list-temp', {list: list});
+        var htmlStr = template('authorize-user-list-temp1', {list: list});
         $('ul.user-list').html(htmlStr);
         up_scroll();
     }
@@ -604,7 +600,7 @@
     var groupBy = function (list, field) {
         var rs = {},
-                key;
+            key;
         $.each(list, function () {
             key = this[field];
             if (!rs[key])
-/* Blob.js
- * A Blob implementation.
- * 2014-07-24
- *
- * By Eli Grey, http://eligrey.com
- * By Devin Samarin, https://github.com/dsamarin
- * License: X11/MIT
- *   See https://github.com/eligrey/Blob.js/blob/master/LICENSE.md
- */
-
-/*global self, unescape */
-/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
-  plusplus: true */
-
-/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
-
-(function (view) {
-	"use strict";
-
-	view.URL = view.URL || view.webkitURL;
-
-	if (view.Blob && view.URL) {
-		try {
-			new Blob;
-			return;
-		} catch (e) {}
-	}
-
-	// Internally we use a BlobBuilder implementation to base Blob off of
-	// in order to support older browsers that only have BlobBuilder
-	var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
-		var
-			  get_class = function(object) {
-				return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
-			}
-			, FakeBlobBuilder = function BlobBuilder() {
-				this.data = [];
-			}
-			, FakeBlob = function Blob(data, type, encoding) {
-				this.data = data;
-				this.size = data.length;
-				this.type = type;
-				this.encoding = encoding;
-			}
-			, FBB_proto = FakeBlobBuilder.prototype
-			, FB_proto = FakeBlob.prototype
-			, FileReaderSync = view.FileReaderSync
-			, FileException = function(type) {
-				this.code = this[this.name = type];
-			}
-			, file_ex_codes = (
-				  "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
-				+ "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
-			).split(" ")
-			, file_ex_code = file_ex_codes.length
-			, real_URL = view.URL || view.webkitURL || view
-			, real_create_object_URL = real_URL.createObjectURL
-			, real_revoke_object_URL = real_URL.revokeObjectURL
-			, URL = real_URL
-			, btoa = view.btoa
-			, atob = view.atob
-
-			, ArrayBuffer = view.ArrayBuffer
-			, Uint8Array = view.Uint8Array
-
-			, origin = /^[\w-]+:\/*\[?[\w\.:-]+\]?(?::[0-9]+)?/
-		;
-		FakeBlob.fake = FB_proto.fake = true;
-		while (file_ex_code--) {
-			FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
-		}
-		// Polyfill URL
-		if (!real_URL.createObjectURL) {
-			URL = view.URL = function(uri) {
-				var
-					  uri_info = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
-					, uri_origin
-				;
-				uri_info.href = uri;
-				if (!("origin" in uri_info)) {
-					if (uri_info.protocol.toLowerCase() === "data:") {
-						uri_info.origin = null;
-					} else {
-						uri_origin = uri.match(origin);
-						uri_info.origin = uri_origin && uri_origin[1];
-					}
-				}
-				return uri_info;
-			};
-		}
-		URL.createObjectURL = function(blob) {
-			var
-				  type = blob.type
-				, data_URI_header
-			;
-			if (type === null) {
-				type = "application/octet-stream";
-			}
-			if (blob instanceof FakeBlob) {
-				data_URI_header = "data:" + type;
-				if (blob.encoding === "base64") {
-					return data_URI_header + ";base64," + blob.data;
-				} else if (blob.encoding === "URI") {
-					return data_URI_header + "," + decodeURIComponent(blob.data);
-				} if (btoa) {
-					return data_URI_header + ";base64," + btoa(blob.data);
-				} else {
-					return data_URI_header + "," + encodeURIComponent(blob.data);
-				}
-			} else if (real_create_object_URL) {
-				return real_create_object_URL.call(real_URL, blob);
-			}
-		};
-		URL.revokeObjectURL = function(object_URL) {
-			if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
-				real_revoke_object_URL.call(real_URL, object_URL);
-			}
-		};
-		FBB_proto.append = function(data/*, endings*/) {
-			var bb = this.data;
-			// decode data to a binary string
-			if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
-				var
-					  str = ""
-					, buf = new Uint8Array(data)
-					, i = 0
-					, buf_len = buf.length
-				;
-				for (; i < buf_len; i++) {
-					str += String.fromCharCode(buf[i]);
-				}
-				bb.push(str);
-			} else if (get_class(data) === "Blob" || get_class(data) === "File") {
-				if (FileReaderSync) {
-					var fr = new FileReaderSync;
-					bb.push(fr.readAsBinaryString(data));
-				} else {
-					// async FileReader won't work as BlobBuilder is sync
-					throw new FileException("NOT_READABLE_ERR");
-				}
-			} else if (data instanceof FakeBlob) {
-				if (data.encoding === "base64" && atob) {
-					bb.push(atob(data.data));
-				} else if (data.encoding === "URI") {
-					bb.push(decodeURIComponent(data.data));
-				} else if (data.encoding === "raw") {
-					bb.push(data.data);
-				}
-			} else {
-				if (typeof data !== "string") {
-					data += ""; // convert unsupported types to strings
-				}
-				// decode UTF-16 to binary string
-				bb.push(unescape(encodeURIComponent(data)));
-			}
-		};
-		FBB_proto.getBlob = function(type) {
-			if (!arguments.length) {
-				type = null;
-			}
-			return new FakeBlob(this.data.join(""), type, "raw");
-		};
-		FBB_proto.toString = function() {
-			return "[object BlobBuilder]";
-		};
-		FB_proto.slice = function(start, end, type) {
-			var args = arguments.length;
-			if (args < 3) {
-				type = null;
-			}
-			return new FakeBlob(
-				  this.data.slice(start, args > 1 ? end : this.data.length)
-				, type
-				, this.encoding
-			);
-		};
-		FB_proto.toString = function() {
-			return "[object Blob]";
-		};
-		FB_proto.close = function() {
-			this.size = 0;
-			delete this.data;
-		};
-		return FakeBlobBuilder;
-	}(view));
-
-	view.Blob = function(blobParts, options) {
-		var type = options ? (options.type || "") : "";
-		var builder = new BlobBuilder();
-		if (blobParts) {
-			for (var i = 0, len = blobParts.length; i < len; i++) {
-				builder.append(blobParts[i]);
-			}
-		}
-		return builder.getBlob(type);
-	};
-}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
+/* Blob.js
+ * A Blob implementation.
+ * 2014-07-24
+ *
+ * By Eli Grey, http://eligrey.com
+ * By Devin Samarin, https://github.com/dsamarin
+ * License: X11/MIT
+ *   See https://github.com/eligrey/Blob.js/blob/master/LICENSE.md
+ */
+
+/*global self, unescape */
+/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
+  plusplus: true */
+
+/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
+
+(function (view) {
+	"use strict";
+
+	view.URL = view.URL || view.webkitURL;
+
+	if (view.Blob && view.URL) {
+		try {
+			new Blob;
+			return;
+		} catch (e) {}
+	}
+
+	// Internally we use a BlobBuilder implementation to base Blob off of
+	// in order to support older browsers that only have BlobBuilder
+	var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function(view) {
+		var
+			  get_class = function(object) {
+				return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
+			}
+			, FakeBlobBuilder = function BlobBuilder() {
+				this.data = [];
+			}
+			, FakeBlob = function Blob(data, type, encoding) {
+				this.data = data;
+				this.size = data.length;
+				this.type = type;
+				this.encoding = encoding;
+			}
+			, FBB_proto = FakeBlobBuilder.prototype
+			, FB_proto = FakeBlob.prototype
+			, FileReaderSync = view.FileReaderSync
+			, FileException = function(type) {
+				this.code = this[this.name = type];
+			}
+			, file_ex_codes = (
+				  "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
+				+ "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
+			).split(" ")
+			, file_ex_code = file_ex_codes.length
+			, real_URL = view.URL || view.webkitURL || view
+			, real_create_object_URL = real_URL.createObjectURL
+			, real_revoke_object_URL = real_URL.revokeObjectURL
+			, URL = real_URL
+			, btoa = view.btoa
+			, atob = view.atob
+
+			, ArrayBuffer = view.ArrayBuffer
+			, Uint8Array = view.Uint8Array
+
+			, origin = /^[\w-]+:\/*\[?[\w\.:-]+\]?(?::[0-9]+)?/
+		;
+		FakeBlob.fake = FB_proto.fake = true;
+		while (file_ex_code--) {
+			FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
+		}
+		// Polyfill URL
+		if (!real_URL.createObjectURL) {
+			URL = view.URL = function(uri) {
+				var
+					  uri_info = document.createElementNS("http://www.w3.org/1999/xhtml", "a")
+					, uri_origin
+				;
+				uri_info.href = uri;
+				if (!("origin" in uri_info)) {
+					if (uri_info.protocol.toLowerCase() === "data:") {
+						uri_info.origin = null;
+					} else {
+						uri_origin = uri.match(origin);
+						uri_info.origin = uri_origin && uri_origin[1];
+					}
+				}
+				return uri_info;
+			};
+		}
+		URL.createObjectURL = function(blob) {
+			var
+				  type = blob.type
+				, data_URI_header
+			;
+			if (type === null) {
+				type = "application/octet-stream";
+			}
+			if (blob instanceof FakeBlob) {
+				data_URI_header = "data:" + type;
+				if (blob.encoding === "base64") {
+					return data_URI_header + ";base64," + blob.data;
+				} else if (blob.encoding === "URI") {
+					return data_URI_header + "," + decodeURIComponent(blob.data);
+				} if (btoa) {
+					return data_URI_header + ";base64," + btoa(blob.data);
+				} else {
+					return data_URI_header + "," + encodeURIComponent(blob.data);
+				}
+			} else if (real_create_object_URL) {
+				return real_create_object_URL.call(real_URL, blob);
+			}
+		};
+		URL.revokeObjectURL = function(object_URL) {
+			if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
+				real_revoke_object_URL.call(real_URL, object_URL);
+			}
+		};
+		FBB_proto.append = function(data/*, endings*/) {
+			var bb = this.data;
+			// decode data to a binary string
+			if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
+				var
+					  str = ""
+					, buf = new Uint8Array(data)
+					, i = 0
+					, buf_len = buf.length
+				;
+				for (; i < buf_len; i++) {
+					str += String.fromCharCode(buf[i]);
+				}
+				bb.push(str);
+			} else if (get_class(data) === "Blob" || get_class(data) === "File") {
+				if (FileReaderSync) {
+					var fr = new FileReaderSync;
+					bb.push(fr.readAsBinaryString(data));
+				} else {
+					// async FileReader won't work as BlobBuilder is sync
+					throw new FileException("NOT_READABLE_ERR");
+				}
+			} else if (data instanceof FakeBlob) {
+				if (data.encoding === "base64" && atob) {
+					bb.push(atob(data.data));
+				} else if (data.encoding === "URI") {
+					bb.push(decodeURIComponent(data.data));
+				} else if (data.encoding === "raw") {
+					bb.push(data.data);
+				}
+			} else {
+				if (typeof data !== "string") {
+					data += ""; // convert unsupported types to strings
+				}
+				// decode UTF-16 to binary string
+				bb.push(unescape(encodeURIComponent(data)));
+			}
+		};
+		FBB_proto.getBlob = function(type) {
+			if (!arguments.length) {
+				type = null;
+			}
+			return new FakeBlob(this.data.join(""), type, "raw");
+		};
+		FBB_proto.toString = function() {
+			return "[object BlobBuilder]";
+		};
+		FB_proto.slice = function(start, end, type) {
+			var args = arguments.length;
+			if (args < 3) {
+				type = null;
+			}
+			return new FakeBlob(
+				  this.data.slice(start, args > 1 ? end : this.data.length)
+				, type
+				, this.encoding
+			);
+		};
+		FB_proto.toString = function() {
+			return "[object Blob]";
+		};
+		FB_proto.close = function() {
+			this.size = 0;
+			delete this.data;
+		};
+		return FakeBlobBuilder;
+	}(view));
+
+	view.Blob = function(blobParts, options) {
+		var type = options ? (options.type || "") : "";
+		var builder = new BlobBuilder();
+		if (blobParts) {
+			for (var i = 0, len = blobParts.length; i < len; i++) {
+				builder.append(blobParts[i]);
+			}
+		}
+		return builder.getBlob(type);
+	};
+}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));
-/* FileSaver.js
- * A saveAs() FileSaver implementation.
- * 2014-08-29
- *
- * By Eli Grey, http://eligrey.com
- * License: X11/MIT
- *   See https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md
- */
-
-/*global self */
-/*jslint bitwise: true, indent: 4, laxbreak: true, laxcomma: true, smarttabs: true, plusplus: true */
-
-/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
-
-var saveAs = saveAs
-  // IE 10+ (native saveAs)
-  || (typeof navigator !== "undefined" &&
-      navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
-  // Everyone else
-  || (function(view) {
-	"use strict";
-	// IE <10 is explicitly unsupported
-	if (typeof navigator !== "undefined" &&
-	    /MSIE [1-9]\./.test(navigator.userAgent)) {
-		return;
-	}
-	var
-		  doc = view.document
-		  // only get URL when necessary in case Blob.js hasn't overridden it yet
-		, get_URL = function() {
-			return view.URL || view.webkitURL || view;
-		}
-		, save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
-		, can_use_save_link = "download" in save_link
-		, click = function(node) {
-			var event = doc.createEvent("MouseEvents");
-			event.initMouseEvent(
-				"click", true, false, view, 0, 0, 0, 0, 0
-				, false, false, false, false, 0, null
-			);
-			node.dispatchEvent(event);
-		}
-		, webkit_req_fs = view.webkitRequestFileSystem
-		, req_fs = view.requestFileSystem || webkit_req_fs || view.mozRequestFileSystem
-		, throw_outside = function(ex) {
-			(view.setImmediate || view.setTimeout)(function() {
-				throw ex;
-			}, 0);
-		}
-		, force_saveable_type = "application/octet-stream"
-		, fs_min_size = 0
-		// See https://code.google.com/p/chromium/issues/detail?id=375297#c7 for
-		// the reasoning behind the timeout and revocation flow
-		, arbitrary_revoke_timeout = 10
-		, revoke = function(file) {
-			var revoker = function() {
-				if (typeof file === "string") { // file is an object URL
-					get_URL().revokeObjectURL(file);
-				} else { // file is a File
-					file.remove();
-				}
-			};
-			if (view.chrome) {
-				revoker();
-			} else {
-				setTimeout(revoker, arbitrary_revoke_timeout);
-			}
-		}
-		, dispatch = function(filesaver, event_types, event) {
-			event_types = [].concat(event_types);
-			var i = event_types.length;
-			while (i--) {
-				var listener = filesaver["on" + event_types[i]];
-				if (typeof listener === "function") {
-					try {
-						listener.call(filesaver, event || filesaver);
-					} catch (ex) {
-						throw_outside(ex);
-					}
-				}
-			}
-		}
-		, FileSaver = function(blob, name) {
-			// First try a.download, then web filesystem, then object URLs
-			var
-				  filesaver = this
-				, type = blob.type
-				, blob_changed = false
-				, object_url
-				, target_view
-				, dispatch_all = function() {
-					dispatch(filesaver, "writestart progress write writeend".split(" "));
-				}
-				// on any filesys errors revert to saving with object URLs
-				, fs_error = function() {
-					// don't create more object URLs than needed
-					if (blob_changed || !object_url) {
-						object_url = get_URL().createObjectURL(blob);
-					}
-					if (target_view) {
-						target_view.location.href = object_url;
-					} else {
-						var new_tab = view.open(object_url, "_blank");
-						if (new_tab == undefined && typeof safari !== "undefined") {
-							//Apple do not allow window.open, see http://bit.ly/1kZffRI
-							view.location.href = object_url
-						}
-					}
-					filesaver.readyState = filesaver.DONE;
-					dispatch_all();
-					revoke(object_url);
-				}
-				, abortable = function(func) {
-					return function() {
-						if (filesaver.readyState !== filesaver.DONE) {
-							return func.apply(this, arguments);
-						}
-					};
-				}
-				, create_if_not_found = {create: true, exclusive: false}
-				, slice
-			;
-			filesaver.readyState = filesaver.INIT;
-			if (!name) {
-				name = "download";
-			}
-			if (can_use_save_link) {
-				object_url = get_URL().createObjectURL(blob);
-				save_link.href = object_url;
-				save_link.download = name;
-				click(save_link);
-				filesaver.readyState = filesaver.DONE;
-				dispatch_all();
-				revoke(object_url);
-				return;
-			}
-			// Object and web filesystem URLs have a problem saving in Google Chrome when
-			// viewed in a tab, so I force save with application/octet-stream
-			// http://code.google.com/p/chromium/issues/detail?id=91158
-			// Update: Google errantly closed 91158, I submitted it again:
-			// https://code.google.com/p/chromium/issues/detail?id=389642
-			if (view.chrome && type && type !== force_saveable_type) {
-				slice = blob.slice || blob.webkitSlice;
-				blob = slice.call(blob, 0, blob.size, force_saveable_type);
-				blob_changed = true;
-			}
-			// Since I can't be sure that the guessed media type will trigger a download
-			// in WebKit, I append .download to the filename.
-			// https://bugs.webkit.org/show_bug.cgi?id=65440
-			if (webkit_req_fs && name !== "download") {
-				name += ".download";
-			}
-			if (type === force_saveable_type || webkit_req_fs) {
-				target_view = view;
-			}
-			if (!req_fs) {
-				fs_error();
-				return;
-			}
-			fs_min_size += blob.size;
-			req_fs(view.TEMPORARY, fs_min_size, abortable(function(fs) {
-				fs.root.getDirectory("saved", create_if_not_found, abortable(function(dir) {
-					var save = function() {
-						dir.getFile(name, create_if_not_found, abortable(function(file) {
-							file.createWriter(abortable(function(writer) {
-								writer.onwriteend = function(event) {
-									target_view.location.href = file.toURL();
-									filesaver.readyState = filesaver.DONE;
-									dispatch(filesaver, "writeend", event);
-									revoke(file);
-								};
-								writer.onerror = function() {
-									var error = writer.error;
-									if (error.code !== error.ABORT_ERR) {
-										fs_error();
-									}
-								};
-								"writestart progress write abort".split(" ").forEach(function(event) {
-									writer["on" + event] = filesaver["on" + event];
-								});
-								writer.write(blob);
-								filesaver.abort = function() {
-									writer.abort();
-									filesaver.readyState = filesaver.DONE;
-								};
-								filesaver.readyState = filesaver.WRITING;
-							}), fs_error);
-						}), fs_error);
-					};
-					dir.getFile(name, {create: false}, abortable(function(file) {
-						// delete file if it already exists
-						file.remove();
-						save();
-					}), abortable(function(ex) {
-						if (ex.code === ex.NOT_FOUND_ERR) {
-							save();
-						} else {
-							fs_error();
-						}
-					}));
-				}), fs_error);
-			}), fs_error);
-		}
-		, FS_proto = FileSaver.prototype
-		, saveAs = function(blob, name) {
-			return new FileSaver(blob, name);
-		}
-	;
-	FS_proto.abort = function() {
-		var filesaver = this;
-		filesaver.readyState = filesaver.DONE;
-		dispatch(filesaver, "abort");
-	};
-	FS_proto.readyState = FS_proto.INIT = 0;
-	FS_proto.WRITING = 1;
-	FS_proto.DONE = 2;
-
-	FS_proto.error =
-	FS_proto.onwritestart =
-	FS_proto.onprogress =
-	FS_proto.onwrite =
-	FS_proto.onabort =
-	FS_proto.onerror =
-	FS_proto.onwriteend =
-		null;
-
-	return saveAs;
-}(
-	   typeof self !== "undefined" && self
-	|| typeof window !== "undefined" && window
-	|| this.content
-));
-// `self` is undefined in Firefox for Android content script context
-// while `this` is nsIContentFrameMessageManager
-// with an attribute `content` that corresponds to the window
-
-if (typeof module !== "undefined" && module !== null) {
-  module.exports = saveAs;
-} else if ((typeof define !== "undefined" && define !== null) && (define.amd != null)) {
-  define([], function() {
-    return saveAs;
-  });
-}
+/* FileSaver.js
+ * A saveAs() FileSaver implementation.
+ * 2014-08-29
+ *
+ * By Eli Grey, http://eligrey.com
+ * License: X11/MIT
+ *   See https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md
+ */
+
+/*global self */
+/*jslint bitwise: true, indent: 4, laxbreak: true, laxcomma: true, smarttabs: true, plusplus: true */
+
+/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
+
+var saveAs = saveAs
+  // IE 10+ (native saveAs)
+  || (typeof navigator !== "undefined" &&
+      navigator.msSaveOrOpenBlob && navigator.msSaveOrOpenBlob.bind(navigator))
+  // Everyone else
+  || (function(view) {
+	"use strict";
+	// IE <10 is explicitly unsupported
+	if (typeof navigator !== "undefined" &&
+	    /MSIE [1-9]\./.test(navigator.userAgent)) {
+		return;
+	}
+	var
+		  doc = view.document
+		  // only get URL when necessary in case Blob.js hasn't overridden it yet
+		, get_URL = function() {
+			return view.URL || view.webkitURL || view;
+		}
+		, save_link = doc.createElementNS("http://www.w3.org/1999/xhtml", "a")
+		, can_use_save_link = "download" in save_link
+		, click = function(node) {
+			var event = doc.createEvent("MouseEvents");
+			event.initMouseEvent(
+				"click", true, false, view, 0, 0, 0, 0, 0
+				, false, false, false, false, 0, null
+			);
+			node.dispatchEvent(event);
+		}
+		, webkit_req_fs = view.webkitRequestFileSystem
+		, req_fs = view.requestFileSystem || webkit_req_fs || view.mozRequestFileSystem
+		, throw_outside = function(ex) {
+			(view.setImmediate || view.setTimeout)(function() {
+				throw ex;
+			}, 0);
+		}
+		, force_saveable_type = "application/octet-stream"
+		, fs_min_size = 0
+		// See https://code.google.com/p/chromium/issues/detail?id=375297#c7 for
+		// the reasoning behind the timeout and revocation flow
+		, arbitrary_revoke_timeout = 10
+		, revoke = function(file) {
+			var revoker = function() {
+				if (typeof file === "string") { // file is an object URL
+					get_URL().revokeObjectURL(file);
+				} else { // file is a File
+					file.remove();
+				}
+			};
+			if (view.chrome) {
+				revoker();
+			} else {
+				setTimeout(revoker, arbitrary_revoke_timeout);
+			}
+		}
+		, dispatch = function(filesaver, event_types, event) {
+			event_types = [].concat(event_types);
+			var i = event_types.length;
+			while (i--) {
+				var listener = filesaver["on" + event_types[i]];
+				if (typeof listener === "function") {
+					try {
+						listener.call(filesaver, event || filesaver);
+					} catch (ex) {
+						throw_outside(ex);
+					}
+				}
+			}
+		}
+		, FileSaver = function(blob, name) {
+			// First try a.download, then web filesystem, then object URLs
+			var
+				  filesaver = this
+				, type = blob.type
+				, blob_changed = false
+				, object_url
+				, target_view
+				, dispatch_all = function() {
+					dispatch(filesaver, "writestart progress write writeend".split(" "));
+				}
+				// on any filesys errors revert to saving with object URLs
+				, fs_error = function() {
+					// don't create more object URLs than needed
+					if (blob_changed || !object_url) {
+						object_url = get_URL().createObjectURL(blob);
+					}
+					if (target_view) {
+						target_view.location.href = object_url;
+					} else {
+						var new_tab = view.open(object_url, "_blank");
+						if (new_tab == undefined && typeof safari !== "undefined") {
+							//Apple do not allow window.open, see http://bit.ly/1kZffRI
+							view.location.href = object_url
+						}
+					}
+					filesaver.readyState = filesaver.DONE;
+					dispatch_all();
+					revoke(object_url);
+				}
+				, abortable = function(func) {
+					return function() {
+						if (filesaver.readyState !== filesaver.DONE) {
+							return func.apply(this, arguments);
+						}
+					};
+				}
+				, create_if_not_found = {create: true, exclusive: false}
+				, slice
+			;
+			filesaver.readyState = filesaver.INIT;
+			if (!name) {
+				name = "download";
+			}
+			if (can_use_save_link) {
+				object_url = get_URL().createObjectURL(blob);
+				save_link.href = object_url;
+				save_link.download = name;
+				click(save_link);
+				filesaver.readyState = filesaver.DONE;
+				dispatch_all();
+				revoke(object_url);
+				return;
+			}
+			// Object and web filesystem URLs have a problem saving in Google Chrome when
+			// viewed in a tab, so I force save with application/octet-stream
+			// http://code.google.com/p/chromium/issues/detail?id=91158
+			// Update: Google errantly closed 91158, I submitted it again:
+			// https://code.google.com/p/chromium/issues/detail?id=389642
+			if (view.chrome && type && type !== force_saveable_type) {
+				slice = blob.slice || blob.webkitSlice;
+				blob = slice.call(blob, 0, blob.size, force_saveable_type);
+				blob_changed = true;
+			}
+			// Since I can't be sure that the guessed media type will trigger a download
+			// in WebKit, I append .download to the filename.
+			// https://bugs.webkit.org/show_bug.cgi?id=65440
+			if (webkit_req_fs && name !== "download") {
+				name += ".download";
+			}
+			if (type === force_saveable_type || webkit_req_fs) {
+				target_view = view;
+			}
+			if (!req_fs) {
+				fs_error();
+				return;
+			}
+			fs_min_size += blob.size;
+			req_fs(view.TEMPORARY, fs_min_size, abortable(function(fs) {
+				fs.root.getDirectory("saved", create_if_not_found, abortable(function(dir) {
+					var save = function() {
+						dir.getFile(name, create_if_not_found, abortable(function(file) {
+							file.createWriter(abortable(function(writer) {
+								writer.onwriteend = function(event) {
+									target_view.location.href = file.toURL();
+									filesaver.readyState = filesaver.DONE;
+									dispatch(filesaver, "writeend", event);
+									revoke(file);
+								};
+								writer.onerror = function() {
+									var error = writer.error;
+									if (error.code !== error.ABORT_ERR) {
+										fs_error();
+									}
+								};
+								"writestart progress write abort".split(" ").forEach(function(event) {
+									writer["on" + event] = filesaver["on" + event];
+								});
+								writer.write(blob);
+								filesaver.abort = function() {
+									writer.abort();
+									filesaver.readyState = filesaver.DONE;
+								};
+								filesaver.readyState = filesaver.WRITING;
+							}), fs_error);
+						}), fs_error);
+					};
+					dir.getFile(name, {create: false}, abortable(function(file) {
+						// delete file if it already exists
+						file.remove();
+						save();
+					}), abortable(function(ex) {
+						if (ex.code === ex.NOT_FOUND_ERR) {
+							save();
+						} else {
+							fs_error();
+						}
+					}));
+				}), fs_error);
+			}), fs_error);
+		}
+		, FS_proto = FileSaver.prototype
+		, saveAs = function(blob, name) {
+			return new FileSaver(blob, name);
+		}
+	;
+	FS_proto.abort = function() {
+		var filesaver = this;
+		filesaver.readyState = filesaver.DONE;
+		dispatch(filesaver, "abort");
+	};
+	FS_proto.readyState = FS_proto.INIT = 0;
+	FS_proto.WRITING = 1;
+	FS_proto.DONE = 2;
+
+	FS_proto.error =
+	FS_proto.onwritestart =
+	FS_proto.onprogress =
+	FS_proto.onwrite =
+	FS_proto.onabort =
+	FS_proto.onerror =
+	FS_proto.onwriteend =
+		null;
+
+	return saveAs;
+}(
+	   typeof self !== "undefined" && self
+	|| typeof window !== "undefined" && window
+	|| this.content
+));
+// `self` is undefined in Firefox for Android content script context
+// while `this` is nsIContentFrameMessageManager
+// with an attribute `content` that corresponds to the window
+
+if (typeof module !== "undefined" && module !== null) {
+  module.exports = saveAs;
+} else if ((typeof define !== "undefined" && define !== null) && (define.amd != null)) {
+  define([], function() {
+    return saveAs;
+  });
+}
-
-
-(function(view){
-	"use strict";
-	var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
-	var fromCharCode = String.fromCharCode;
-	var INVALID_CHARACTER_ERR = ( function() {
-        // fabricate a suitable error object
-        try {
-            document.createElement('$');
-        } catch (error) {
-            return error;
-        }
-    }());
-
-	// encoder
-	var btoa = function(string) {
-	    var a, b, b1, b2, b3, b4, c, i = 0, len = string.length, max = Math.max, result = '';
-
-	    while (i < len) {
-	        a = string.charCodeAt(i++) || 0;
-	        b = string.charCodeAt(i++) || 0;
-	        c = string.charCodeAt(i++) || 0;
-
-	        if (max(a, b, c) > 0xFF) {
-	            throw INVALID_CHARACTER_ERR;
-	        }
-
-	        b1 = (a >> 2) & 0x3F;
-	        b2 = ((a & 0x3) << 4) | ((b >> 4) & 0xF);
-	        b3 = ((b & 0xF) << 2) | ((c >> 6) & 0x3);
-	        b4 = c & 0x3F;
-
-	        if (!b) {
-	            b3 = b4 = 64;
-	        } else if (!c) {
-	            b4 = 64;
-	        }
-	        result += characters.charAt(b1) + characters.charAt(b2) + characters.charAt(b3) + characters.charAt(b4);
-	    }
-	    return result;
-	};
-
-	//获取dom文本
-	var getText = function( el ){
-		var s = el.textContent || el.innerText;
-		return s == null ? "" : s.replace( /^\s*(.*?)\s+$/, "$1");
-	};
-	view.tableExport = function(tableId, filename, type){
-		var doc = view.document,
-			table = doc.getElementById(tableId),
-			charSet = doc.characterSet
-
-		var uri = {
-			json: 'application/json;charset='+charSet,
-			txt: 'csv/txt;charset='+charSet,
-			csv: 'csv/txt;charset='+charSet,
-			doc: 'application/vnd.ms-doc', 
-			excel: 'application/vnd.ms-excel'
-		};
-
-		var base64 = function(s) {
-        	return btoa(unescape(encodeURIComponent(s)));
-    	};
-    	var template = function(s, c) {
-        	return s.replace(/{(\w+)}/g, function(m, p) {
-            	return c[p];
-        	});
-    	};
-
-    	var	get_blob = function() {
-			return view.Blob;
-		}
-
-    	var fixCSVField = function(value) {
-	        var fixedValue = value;
-	        var addQuotes = (value.indexOf(',') !== -1) || (value.indexOf('\r') !== -1) || (value.indexOf('\n') !== -1);
-	        var replaceDoubleQuotes = (value.indexOf('"') !== -1);
-
-	        if (replaceDoubleQuotes) {
-	            fixedValue = fixedValue.replace(/"/g, '""');
-	        }
-	        if (addQuotes || replaceDoubleQuotes) {
-	            fixedValue = '"' + fixedValue + '"';
-	        }
-	        return fixedValue;
-	    };
-
-	    var saveData = function(data){
-	    	var BB = get_blob();
-	        saveAs(new BB([data], {type: uri[type]}), filename + "."+type);
-	    };
-
-		var toCSV = function(){
-			var data = "\ufeff";
-			for (var i = 0, row; row = table.rows[i]; i++) {
-	            for (var j = 0, col; col = row.cells[j]; j++) {
-	                data = data + (j ? ',' : '') + fixCSVField(getText(col));
-	            }
-	            data = data + "\r\n";
-	        }
-	        saveData(data);
-		};
-
-		var toJson = function(){
-			var jsonHeaderArray = [];
-
-			if(table.tHead){
-				for(var i =0,col; col = table.tHead.rows[0].cells[i]; i++){
-					jsonHeaderArray.push(getText(col));
-				}
-			}
-
-			var jsonArray = [];
-			if(table.tBodies){
-				for(var j=0,tbody; tbody = table.tBodies[j]; j++){
-					for(var k =0, rowb; rowb= tbody.rows[k]; k++){
-						var len = jsonArray.length;
-						jsonArray[len]  = [];
-						for (var g = 0, colb; colb = rowb.cells[g]; g++) {
-	                		jsonArray[len].push(getText(colb));
-	            		}
-					}
-				}
-			}
-
-			var jsonExportArray = {
-				header: jsonHeaderArray,
-				data: jsonArray
-			};
-			saveData(JSON.stringify(jsonExportArray));
-		};
-
-		var toOffice = function(){
-			var tmpl = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:'+type+'" xmlns="http://www.w3.org/TR/REC-html40">';
-			tmpl += '<head><meta charset="'+charSet+'" /><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>';
-			tmpl += '{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->';
-  			tmpl += '</head><body><table>{table}</table></body></html>';
-			var office = '',
-				maph = [['<thead><tr>', '</tr></thead>'], ['<tbody><tr>', '</tr></tbody>'], ['<tr>', '</tr>']],
-				mapb = [['<th>', '</th>'],['<td>', '</td>']],
-				flag = +!table.tHead,
-				com = 1 - flag;
-
-			for(var i=0, row; row = table.rows[i]; i++){
-				flag = i > com ? 2 : flag;
-				office += maph[flag][0];
-				for(var j =0, col; col = row.cells[j]; j++){
-					office += mapb[+!!flag][0]+ getText(col) +mapb[+!!flag][1];
-				}
-				office += maph[flag][1];
-				flag++;
-			}
-			saveData(template(tmpl, {worksheet: 'Worksheet', table: office}));
-		};
-
-		var typeMap = {
-			json : toJson,
-			txt: toCSV,
-			csv: toCSV,
-			doc: toOffice,
-			docx: toOffice,
-			xls: toOffice,
-			xlsx: toOffice
-		};
-
-		typeMap[type]();
-	};
-
+
+
+(function(view){
+	"use strict";
+	var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
+	var fromCharCode = String.fromCharCode;
+	var INVALID_CHARACTER_ERR = ( function() {
+        // fabricate a suitable error object
+        try {
+            document.createElement('$');
+        } catch (error) {
+            return error;
+        }
+    }());
+
+	// encoder
+	var btoa = function(string) {
+	    var a, b, b1, b2, b3, b4, c, i = 0, len = string.length, max = Math.max, result = '';
+
+	    while (i < len) {
+	        a = string.charCodeAt(i++) || 0;
+	        b = string.charCodeAt(i++) || 0;
+	        c = string.charCodeAt(i++) || 0;
+
+	        if (max(a, b, c) > 0xFF) {
+	            throw INVALID_CHARACTER_ERR;
+	        }
+
+	        b1 = (a >> 2) & 0x3F;
+	        b2 = ((a & 0x3) << 4) | ((b >> 4) & 0xF);
+	        b3 = ((b & 0xF) << 2) | ((c >> 6) & 0x3);
+	        b4 = c & 0x3F;
+
+	        if (!b) {
+	            b3 = b4 = 64;
+	        } else if (!c) {
+	            b4 = 64;
+	        }
+	        result += characters.charAt(b1) + characters.charAt(b2) + characters.charAt(b3) + characters.charAt(b4);
+	    }
+	    return result;
+	};
+
+	//获取dom文本
+	var getText = function( el ){
+		var s = el.textContent || el.innerText;
+		return s == null ? "" : s.replace( /^\s*(.*?)\s+$/, "$1");
+	};
+	view.tableExport = function(tableId, filename, type){
+		var doc = view.document,
+			table = doc.getElementById(tableId),
+			charSet = doc.characterSet
+
+		var uri = {
+			json: 'application/json;charset='+charSet,
+			txt: 'csv/txt;charset='+charSet,
+			csv: 'csv/txt;charset='+charSet,
+			doc: 'application/vnd.ms-doc', 
+			excel: 'application/vnd.ms-excel'
+		};
+
+		var base64 = function(s) {
+        	return btoa(unescape(encodeURIComponent(s)));
+    	};
+    	var template = function(s, c) {
+        	return s.replace(/{(\w+)}/g, function(m, p) {
+            	return c[p];
+        	});
+    	};
+
+    	var	get_blob = function() {
+			return view.Blob;
+		}
+
+    	var fixCSVField = function(value) {
+	        var fixedValue = value;
+	        var addQuotes = (value.indexOf(',') !== -1) || (value.indexOf('\r') !== -1) || (value.indexOf('\n') !== -1);
+	        var replaceDoubleQuotes = (value.indexOf('"') !== -1);
+
+	        if (replaceDoubleQuotes) {
+	            fixedValue = fixedValue.replace(/"/g, '""');
+	        }
+	        if (addQuotes || replaceDoubleQuotes) {
+	            fixedValue = '"' + fixedValue + '"';
+	        }
+	        return fixedValue;
+	    };
+
+	    var saveData = function(data){
+	    	var BB = get_blob();
+	        saveAs(new BB([data], {type: uri[type]}), filename + "."+type);
+	    };
+
+		var toCSV = function(){
+			var data = "\ufeff";
+			for (var i = 0, row; row = table.rows[i]; i++) {
+	            for (var j = 0, col; col = row.cells[j]; j++) {
+	                data = data + (j ? ',' : '') + fixCSVField(getText(col));
+	            }
+	            data = data + "\r\n";
+	        }
+	        saveData(data);
+		};
+
+		var toJson = function(){
+			var jsonHeaderArray = [];
+
+			if(table.tHead){
+				for(var i =0,col; col = table.tHead.rows[0].cells[i]; i++){
+					jsonHeaderArray.push(getText(col));
+				}
+			}
+
+			var jsonArray = [];
+			if(table.tBodies){
+				for(var j=0,tbody; tbody = table.tBodies[j]; j++){
+					for(var k =0, rowb; rowb= tbody.rows[k]; k++){
+						var len = jsonArray.length;
+						jsonArray[len]  = [];
+						for (var g = 0, colb; colb = rowb.cells[g]; g++) {
+	                		jsonArray[len].push(getText(colb));
+	            		}
+					}
+				}
+			}
+
+			var jsonExportArray = {
+				header: jsonHeaderArray,
+				data: jsonArray
+			};
+			saveData(JSON.stringify(jsonExportArray));
+		};
+
+		var toOffice = function(){
+			var tmpl = '<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:'+type+'" xmlns="http://www.w3.org/TR/REC-html40">';
+			tmpl += '<head><meta charset="'+charSet+'" /><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet><x:Name>';
+			tmpl += '{worksheet}</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet></x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->';
+  			tmpl += '</head><body><table>{table}</table></body></html>';
+			var office = '',
+				maph = [['<thead><tr>', '</tr></thead>'], ['<tbody><tr>', '</tr></tbody>'], ['<tr>', '</tr>']],
+				mapb = [['<th>', '</th>'],['<td>', '</td>']],
+				flag = +!table.tHead,
+				com = 1 - flag;
+
+			for(var i=0, row; row = table.rows[i]; i++){
+				flag = i > com ? 2 : flag;
+				office += maph[flag][0];
+				for(var j =0, col; col = row.cells[j]; j++){
+					office += mapb[+!!flag][0]+ getText(col) +mapb[+!!flag][1];
+				}
+				office += maph[flag][1];
+				flag++;
+			}
+			saveData(template(tmpl, {worksheet: 'Worksheet', table: office}));
+		};
+
+		var typeMap = {
+			json : toJson,
+			txt: toCSV,
+			csv: toCSV,
+			doc: toOffice,
+			docx: toOffice,
+			xls: toOffice,
+			xlsx: toOffice
+		};
+
+		typeMap[type]();
+	};
+
 })(window);
 \ No newline at end of file
@@ -87,8 +87,10 @@ module.exports = function (grunt) {
                     'module/common/dts2/guideboardGroup/saGuideboardgroup.js', // 路牌选择整合指令
                     'module/common/dts2/employeeGroup/saEmployeegroup.js', // 人员选饿整合指令
                     'module/common/dts2/bcGroup/saBcgroup.js', // 班次选择整合指令
-                    'module/common/dts2/ttinfotable/saTimeTable.js', // 时刻表显示指令
-                    'module/common/dts2/ttinfotable/saTimeTableScrolly1.js', // 时刻表滚动1显示指令
+                    'module/common/dts2/ttinfotable/saTimeTable.js', // 时刻表显示指令（编辑模式）
+                    'module/common/dts2/ttinfotable/saTimeTablePreView.js', // 时刻表显示指令（预览模式）
+                    'module/common/dts2/ttinfotable/saTimeTableScrolly1.js', // 时刻表滚动1显示指令（编辑模式）
+                    'module/common/dts2/ttinfotable/saTimeTableScrolly2.js', // 时刻表滚动2显示指令（预览模式）
                     'module/common/dts2/queryOption/saOrderOption.js', // saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
                     'module/common/dts2/scheduleplan/saScpdate.js', // saScpdate指令（非通用指令，只在排班计划form中使用）
                     'module/common/dts2/scheduleplan/saSrule.js', // saSrule指令（非通用指令，只在排班计划form中使用）
+/**
+ * saTimetablePreview指令，时刻表预览模式视图。
+ */
+angular.module("ScheduleApp").directive(
+    "saTimetable2",
+    [
+        '$timeout',
+        function($timeout) {
+            return {
+                restrict : 'E',
+                templateUrl : '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreViewTemplate.html',
+                scope : { // 独立作用域
+                    // 使用外部数据源，内部重新组合显示
+                    ds : "=ngModel"
+                },
+                controllerAs : "$saTimeTablePreviewCtrl",
+                bindToController: true,
+                controller : function() {
+                    var self = this;
+
+                    // 内部班次时刻模型
+                    self.internalBcModel = {
+                        up_qdz_name : "", // 上行起点站名字
+                        down_qdz_name : "", // 下行起点站名字
+                        up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                        down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                    };
+
+                    // 内部各个路牌block车次链模型
+                    self.internalLpBlockModel = {
+                        // key：路牌名字
+                        // value: 数组（按照发车时间排序）
+                        // value 数据内对象 {fcsj:发车时间,isUp:是否上行,fcno:发车顺序号,index:对应的班次列表索引}
+                    };
+
+                    // TODO：
+                },
+
+                /**，
+                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile : function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw new Error("saTimeTablePreview指令 name属性required");
+                    }
+
+                    // 内部controlAs名字
+                    var ctrlAs = "$saTimeTablePreviewCtrl";
+
+                    // TODO：
+
+                    //------------------ 内部方法 --------------------//
+                    var date_wrap_prefix = "2000-01-01 "; // 包装日期的前缀
+                    var date_wrap_format = "YYYY-MM-DD HH:mm"; // 日期格式
+                    /**
+                     * 将时间包装成日期，方便计算。
+                     * @param timeStr 时间格式，如 06:30
+                     * @returns moment对象
+                     */
+                    var _fun_WrapTime = function(timeStr) {
+                        return moment(
+                            date_wrap_prefix + timeStr,
+                            date_wrap_format
+                        );
+                    };
+
+                    /**
+                     * 点击班次html元素（dl），触发班次移动，如下：
+                     * 1、点击上行班次，下一个下行班次在下行班次列表中移到中间位置
+                     * 2、点击下行班次，下一个上行班次在上行班次列表中移到中间位置
+                     * @param ctrl 内部控制器
+                     * @param index 班次索引
+                     * @param isUp 是否上行
+                     * @private
+                     */
+                    var _fun_bcDDViewMove = function(ctrl, index, isUp) {
+                        // 获取当前点击班次对象
+                        var oBc;
+                        if (isUp) {
+                            oBc = ctrl.internalBcModel.up_bc_list_asc[index];
+                        } else {
+                            oBc = ctrl.internalBcModel.down_bc_list_asc[index];
+                        }
+
+                        // 找出车次链中的下一个班次索引，没有就undefined
+                        var nextIndex = undefined;
+                        var nextBlockBc = undefined;
+                        var currentBlockBcIndex = undefined;
+                        angular.forEach(ctrl.internalLpBlockModel[oBc.lpName], function(data, i) {
+                            if (data.fcsj == oBc.fcsj) {
+                                currentBlockBcIndex = i;
+                            }
+                        });
+                        if (currentBlockBcIndex != undefined &&
+                            currentBlockBcIndex < (ctrl.internalLpBlockModel[oBc.lpName].length - 1)) {
+                            nextBlockBc = ctrl.internalLpBlockModel[oBc.lpName][currentBlockBcIndex + 1];
+                            nextIndex = nextBlockBc.index;
+                        }
+                        // 先删除click标记，再添加
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        oBc.isClick = true;
+                        if (nextIndex) {
+                            if (nextBlockBc.isUp) {
+                                ctrl.internalBcModel.up_bc_list_asc[nextIndex].isClick = true;
+                            } else {
+                                ctrl.internalBcModel.down_bc_list_asc[nextIndex].isClick = true;
+                            }
+                        }
+
+                        // 移动，同方向不移动
+                        var clientHeight = angular.element("#temp").height() - 34;
+                        if (nextBlockBc && isUp != nextBlockBc.isUp) {
+                            if (isUp) { // 移动下行
+                                angular.element(".ttpv_table_scrollbar:eq(1)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            } else { // 移动上行
+                                angular.element(".ttpv_table_scrollbar:eq(0)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            }
+                        }
+
+                    };
+
+                    /**
+                     * 刷新内部数据。
+                     * @param ctrl 内部控制器对象（$saTimeTablePreviewCtrl）
+                     * @private
+                     */
+                    var _fun_refreshInternalModel = function(ctrl) {
+                        // 初始化内部数据
+                        ctrl.internalBcModel = {
+                            up_qdz_name : "", // 上行起点站名字
+                            up_zdz_name : "", // 上行终点站名字
+                            down_qdz_name : "", // 下行起点站名字
+                            down_zdz_name : "", // 下行终点站名字
+                            up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                            down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                        };
+                        ctrl.internalLpBlockModel = {
+
+                        };
+
+                        // ngModel传入的数据
+                        var dataSource = ctrl.ds.bcList;
+
+                        // 构造上下行班次列表，并确定上下行的首发站点
+                        angular.forEach(dataSource, function(bcObj) {
+                            var _internalBcObj = {};
+                            // 构造内部班次对象
+                            _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
+                            _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
+                            _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
+                            _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
+                            _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
+                            _internalBcObj.bcType = bcObj.bcType; // 班次类型
+                            _internalBcObj.isTs = bcObj.isTS; // 是否停驶
+                            _internalBcObj.isFb = bcObj.isFB; // 是否分班
+                            _internalBcObj.remark = bcObj.remark; // 备注
+                            _internalBcObj._fcno = bcObj.fcno; // 发车顺序号
+
+                            if (bcObj.xlDir == "0") { // 上行
+                                ctrl.internalBcModel.up_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.up_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.up_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
+                            if (bcObj.xlDir == "1") { // 下行
+                                ctrl.internalBcModel.down_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.down_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.down_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
+
+                        });
+
+                        // 发车时间升序排序上行班次
+                        ctrl.internalBcModel.up_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
+
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+
+                        });
+                        // 发车时间升序排序下行班次
+                        ctrl.internalBcModel.down_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
+
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+                        });
+
+                        // 构造路牌block车次链，按照发车顺序排序
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : true,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : false,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalLpBlockModel, function(value, key) {
+                            value.sort(function (a, b) {
+                                if (a.fcno < b.fcno) {
+                                    return -1;
+                                } else if (a.fcno > b.fcno) {
+                                    return 1;
+                                } else {
+                                    return 0;
+                                }
+                            });
+                        });
+
+
+                    };
+
+                    return {
+                        pre : function(scope, element, attr) {
+                            // TODO：
+                        },
+                        post : function(scope, element, attr) {
+                            // 班次html点击事件
+                            scope[ctrlAs].$$bcDD_Click = function(index, xlDir) {
+                                _fun_bcDDViewMove(scope[ctrlAs], index, xlDir);
+                            };
+
+                            // 监控ngModel绑定的外部数据源的刷新状态变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ds.refreshInfos;
+                                },
+                                function(newValue, oldValue) {
+                                    if (newValue === undefined && oldValue === undefined) {
+                                        return;
+                                    }
+                                    console.log("saTimetable2 refresh");
+                                    _fun_refreshInternalModel(scope[ctrlAs]);
+                                },
+                                true
+                            );
+                        }
+                    };
+                }
+            };
+        }
+    ]
+);
 \ No newline at end of file
+<style>
+    .ttpv_detail {
+        height: 100%;
+    }
+    .ttpv_detail .container-fluid {
+        height: 100%;
+        margin-left: 0;
+    }
+    .ttpv_detail .container-fluid>* {
+        padding: 0;
+    }
+    .ttpv_detail .container-fluid.top-container {
+        margin-top: 5px;
+        padding: 0;
+    }
+
+    .ttpv_detail .detail-panel {
+        padding: 0;
+        height: 100%;
+        border: 1px solid #ddd;
+        background: #fafafa;
+        border-radius: 10px !important;
+        moz-user-select: -moz-none;
+        -moz-user-select: none;
+        -o-user-select: none;
+        -khtml-user-select: none;
+        -webkit-user-select: none;
+        -ms-user-select: none;
+        user-select: none;
+    }
+
+    .ttpv_detail .detail-panel .detail-wrap {
+        height: calc(100% - 1px);
+        padding: 0;
+
+        font-size: 14px;
+        color: #cccaca;
+    }
+
+    .ttpv_detail .detail-panel .detail-wrap .detail-title {
+        margin: 7px 0 5px;
+        text-indent: 5px;
+        margin: 0;
+        height: 31px;
+        line-height: 31px;
+        color: #2765A7;
+    }
+
+    .ttpv_detail .detail-panel .detail-wrap .detail-body {
+        height: calc(100% - 37px);
+        background: #fff;
+    }
+
+    .ttpv_detail .detail-panel .detail-wrap .detail-body .ttpv_table_wrap {
+        width: 100%;
+        height: 100%;
+        border-left: 0;
+        border-bottom: 0;
+        overflow: auto;
+    }
+
+</style>
+
+<style>
+    /** 表格样式 */
+    .ttpv_table {
+        position: relative;
+        padding-top: 34px;
+        font-size: 13px;
+    }
+
+    .ttpv_table dl {
+        display: block;
+        /*width: 100%;*/
+        margin: 0;
+        /*border-bottom: 1px solid;*/
+        cursor: default;
+    }
+    .ttpv_table dl {
+        font-size: 0;
+        white-space: nowrap;
+    }
+    .ttpv_table dl {
+        transition: all .1s ease;
+    }
+
+    .ttpv_table dl dd, .ttpv_table dl dt {
+        display: inline-block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        height: 100%;
+        line-height: 34px;
+        border-right: 1px solid;
+        text-indent: 5px;
+    }
+    .ttpv_table dl dd, .ttpv_table dl dt {
+        border-right-color: #dedede;
+        font-size: 13px;
+        /*border-bottom: 1px solid #dedede;*/
+        border-top: 1px solid #dedede;
+        text-align: center;
+    }
+
+    .ttpv_table > .ttpv_table_head {
+        position: absolute;
+        top: 0;
+        height: 34px;
+        background: #f5f5f5;
+        /*width: 100%;*/
+        line-height: 34px;
+        z-index: 1;
+    }
+    .ttpv_table_head dl {
+        border-bottom: 2px solid #96b9d7;
+        color: #333333;
+        height: 34px;
+        background-color: #f5f5f5;
+    }
+    .ttpv_table_head dl dt {
+        font-weight: normal;
+        font-size: 12px;
+    }
+
+    .ttpv_table_head dl dt:nth-of-type(1) {
+        width: 50px;
+        height: 34px;
+    }
+    .ttpv_table_head dl dt:nth-of-type(2) {
+        width: 55px;
+        height: 34px;
+    }
+    .ttpv_table_head dl dt:nth-of-type(3) {
+        width: 120px;
+        height: 34px;
+    }
+    .ttpv_table_head dl dt:nth-of-type(4) {
+        width: 100px;
+        height: 34px;
+    }
+    .ttpv_table_head dl dt:nth-of-type(5) {
+        width: 200px;
+        height: 34px;
+    }
+
+    .ttpv_table > .ttpv_table_body {
+        /*width: 100%;*/
+        position: absolute;
+        border-bottom: 1px solid #dedede;
+    }
+
+    .ttpv_table_body dd.ists {
+        background: #105383 !important;
+        color: white !important;
+    }
+    .ttpv_table_body dd.region {
+        background: #686d7b !important;
+        color: white !important;
+    }
+    .ttpv_table_body dd.isfb {
+        background: #adff00 !important;
+        color: #501a1a !important;
+    }
+
+    .ttpv_table_body dd.istsClick {
+        background: linear-gradient(to right,#8baabf,#105383,#808086)!important;
+    }
+    .ttpv_table_body dd.regionClick {
+        background: linear-gradient(to right,#8baabf,#686d7b,#a09997)!important;
+    }
+    .ttpv_table_body dd.isfbClick {
+        background: linear-gradient(to right,#8baabf,#adff00,#a09997)!important;
+    }
+
+    .ttpv_table_body dl dd:nth-of-type(1) {
+        width: 50px;
+        height: 30px;
+    }
+    .ttpv_table_body dl dd:nth-of-type(2) {
+        width: 55px;
+        height: 30px;
+    }
+    .ttpv_table_body dl dd:nth-of-type(3) {
+        width: 120px;
+        height: 30px;
+        text-align: left;
+    }
+    .ttpv_table_body dl dd:nth-of-type(4) {
+        width: 100px;
+        height: 30px;
+    }
+    .ttpv_table_body dl dd:nth-of-type(5) {
+        width: 200px;
+        height: 30px;
+    }
+
+    .ttpv_table_body dd:nth-of-type(1) {
+        color: #2765A7;
+        background: #eae8e8;
+        /*border-bottom: 1px solid #b3b3b3;*/
+        border-right: 1px solid #b3b3b3;
+        text-indent: -3px;
+    }
+    .ttpv_table_body dd:nth-of-type(n + 2) {
+        color: #2765A7;
+    }
+    .ttpv_table_body dl:hover {
+        box-shadow: 0 0 4px #656c71;
+        background: #f5fbff;
+    }
+    .ttpv_table_body dl:hover dd:nth-of-type(1) {
+        background: #fafafa;
+        background: linear-gradient(to right, #fafafa, #f5fbff);
+    }
+
+    .isClick {
+        background: #8baabf!important;
+        color: #fff!important;
+    }
+
+</style>
+
+<style>
+    /** 滚动条css样式 */
+
+    .ttpv_table_scrollbar::-webkit-scrollbar {
+        width: 18px;
+        height: 18px;
+    }
+
+    .ttpv_table_scrollbar::-webkit-scrollbar-track, ::-webkit-scrollbar-thumb {
+        border-radius: 999px;
+        border: 5px solid transparent;
+    }
+
+    .ttpv_table_scrollbar::-webkit-scrollbar-track {
+        box-shadow: 1px 1px 5px rgba(0, 0, 0, .2) inset;
+    }
+
+    .ttpv_table_scrollbar::-webkit-scrollbar-thumb {
+        min-height: 20px;
+        background-clip: content-box;
+        box-shadow: 0 0 0 5px rgba(0, 0, 0, .2) inset;
+    }
+
+    .ttpv_table_scrollbar::-webkit-scrollbar-corner {
+        background: transparent;
+    }
+</style>
+
+<div class="ttpv_detail">
+    <div class="container-fluid top-container">
+        <div class="col-md-12 container-fluid">
+            <div class="col-md-6" style="height: 100%; padding-right: 3px;">
+                <div class="detail-panel">
+                    <div class="detail-wrap" >
+                        <h3 class="detail-title">
+                            上行：
+                            {{$saTimeTablePreviewCtrl.internalBcModel.up_qdz_name}}
+                            <i class="fa fa-angle-double-right" aria-hidden="true"></i>
+                            {{$saTimeTablePreviewCtrl.internalBcModel.up_zdz_name}}
+                        </h3>
+                        <div id="temp" class="detail-body">
+                            <div class="ttpv_table_wrap ttpv_table_scrollbar" sa-tscrolly2 scrclass = ".upFixHead">
+                                <div class="ttpv_table">
+                                    <div class="ttpv_table_head upFixHead">
+                                        <dl>
+                                            <dt>序号</dt>
+                                            <dt>路牌</dt>
+                                            <dt>发车时间</dt>
+                                            <dt>到达时间</dt>
+                                            <dt>备注</dt>
+                                        </dl>
+                                    </div>
+                                    <div class="ttpv_table_body">
+                                        <dl ng-repeat="bc in $saTimeTablePreviewCtrl.internalBcModel.up_bc_list_asc track by $index"
+                                            ng-click="$saTimeTablePreviewCtrl.$$bcDD_Click($index, true)">
+                                            <dd>{{$index + 1}}</dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.lpName}}
+                                            </dd>
+                                            <dd ng-class="{
+                                                    ists: (bc.isTs && !bc.isClick),
+                                                    istsClick: (bc.isTs && bc.isClick),
+                                                    region: (bc.bcType == 'region' && !bc.isClick),
+                                                    regionClick : (bc.bcType == 'region' && bc.isClick),
+                                                    isfb: (bc.isFb && !bc.isClick),
+                                                    isfbClick : (bc.isFb && bc.isClick),
+                                                    isClick: bc.isClick}">
+                                                {{bc.fcsj}}
+                                                <span class="badge"
+                                                      style="border-radius: 2px !important; background-color: #f9a124;"
+                                                      ng-show="bc.bcType == 'out'">出场</span>
+                                                <span class="badge"
+                                                      style="border-radius: 2px !important; background-color: #f9a124;"
+                                                      ng-show="bc.bcType == 'in'">进场</span>
+                                            </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.ddsj}}
+                                            </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">{{bc.remark}}</dd>
+                                        </dl>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="col-md-6" style="height: 100%; padding-left: 3px;">
+                <div class="detail-panel">
+                    <div class="detail-wrap" >
+                        <h3 class="detail-title">
+                            下行：
+                            {{$saTimeTablePreviewCtrl.internalBcModel.down_qdz_name}}
+                            <i class="fa fa-angle-double-right" aria-hidden="true"></i>
+                            {{$saTimeTablePreviewCtrl.internalBcModel.down_zdz_name}}
+                        </h3>
+                        <div class="detail-body">
+                            <div class="ttpv_table_wrap ttpv_table_scrollbar" sa-tscrolly2 scrclass = ".downFixHead">
+                                <div class="ttpv_table">
+                                    <div class="ttpv_table_head downFixHead">
+                                        <dl>
+                                            <dt>序号</dt>
+                                            <dt>路牌</dt>
+                                            <dt>发车时间</dt>
+                                            <dt>到达时间</dt>
+                                            <dt>备注</dt>
+                                        </dl>
+                                    </div>
+                                    <div class="ttpv_table_body">
+                                        <dl ng-repeat="bc in $saTimeTablePreviewCtrl.internalBcModel.down_bc_list_asc track by $index"
+                                            ng-click="$saTimeTablePreviewCtrl.$$bcDD_Click($index, false)">
+                                            <dd>{{$index + 1}}</dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.lpName}}
+                                            </dd>
+                                            <dd ng-class="{
+                                                    ists: (bc.isTs && !bc.isClick),
+                                                    istsClick: (bc.isTs && bc.isClick),
+                                                    region: (bc.bcType == 'region' && !bc.isClick),
+                                                    regionClick : (bc.bcType == 'region' && bc.isClick),
+                                                    isfb: (bc.isFb && !bc.isClick),
+                                                    isfbClick : (bc.isFb && bc.isClick),
+                                                    isClick: bc.isClick}">
+                                                {{bc.fcsj}}
+                                                <span class="badge"
+                                                      style="border-radius: 2px !important; background-color: #f9a124;"
+                                                      ng-show="bc.bcType == 'out'">出场</span>
+                                                <span class="badge"
+                                                      style="border-radius: 2px !important; background-color: #f9a124;"
+                                                      ng-show="bc.bcType == 'in'">进场</span>
+                                            </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">
+                                                {{bc.ddsj}}
+                                            </dd>
+                                            <dd ng-class="{isClick : bc.isClick}">{{bc.remark}}</dd>
+                                        </dl>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly2',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(attr.scrclass).css("top", element.scrollTop());
+                                // angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
+                                // angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
 \ No newline at end of file
@@ -4407,216 +4407,326 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     ]
 );
-/**
- * 滚动事件控制指令。
- */
-angular.module('ScheduleApp').directive(
-    'saTscrolly1',
-    [
-        function() {
-            return {
-                restrict: 'A',
-
-                compile: function(tElem, tAttrs) {
-
-                    return {
-                        pre: function(scope, element, attr) {
-                            // TODO：
-                            //alert(element.find("#tooltipTest").html());
-                            //$compile(element.find("#tooltipTest"))(scope);
-
-                        },
-
-                        post: function(scope, element, attr) {
-                            //var head = element[0];
-
-                            //console.log("llllllllload");
-                            //console.log(element.name);
-
-                            element.bind('scroll', function() {
-                                //console.log("top=", angular.element(".tt_table_head").css("top"));
-                                //console.log("left=", angular.element(".tt_table_head").css("left"));
-                                //console.log("s top=" + element.scrollTop());
-
-                                angular.element(".tt_table_head").css("top", element.scrollTop());
-                                angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
-                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
-
-                            });
-                        }
-
-                    };
-                }
-            }
-        }
-    ]
-);
 /**
- * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
- * 属性如下：
- * name（必须）：控件的名字
- * columns（必须，独立作用域）：字段名字列表，格式：[{name:[字段名],desc:[字段描述]}...]
- * ordercolumns（必须，独立作用域）：字段排序列表，格式：{order: '字段1,字段2',direction: 'ASC,DESC'}
+ * saTimetablePreview指令，时刻表预览模式视图。
  */
-angular.module('ScheduleApp').directive(
-    'saOrderoption',
+angular.module("ScheduleApp").directive(
+    "saTimetable2",
     [
-        function() {
+        '$timeout',
+        function($timeout) {
             return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html',
-                scope: {
-                    columns: '=',
-                    ordercolumns: '='
+                restrict : 'E',
+                templateUrl : '/pages/scheduleApp/module/common/dts2/ttinfotable/saTimeTablePreViewTemplate.html',
+                scope : { // 独立作用域
+                    // 使用外部数据源，内部重新组合显示
+                    ds : "=ngModel"
                 },
-                controllerAs: '$saOrderOptionCtrl',
+                controllerAs : "$saTimeTablePreviewCtrl",
                 bindToController: true,
-                controller: function() {
+                controller : function() {
                     var self = this;
-                    // 字段列表是否预载入
-                    self.$$columns_loaded = false;
-                    // 字段排序是否预载入
-                    self.$$ordercolumns_loaded = false;
+                    // 内部班次时刻模型
+                    self.internalBcModel = {
+                        up_qdz_name : "", // 上行起点站名字
+                        down_qdz_name : "", // 下行起点站名字
+                        up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                        down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                    };
+                    // 内部各个路牌block车次链模型
+                    self.internalLpBlockModel = {
+                        // key：路牌名字
+                        // value: 数组（按照发车时间排序）
+                        // value 数据内对象 {fcsj:发车时间,isUp:是否上行,fcno:发车顺序号,index:对应的班次列表索引}
+                    };
-                    // 每组选项内部数据源
-                    // 格式：[{column:[选中的字段名],dir:[ASC/DESC]}]
-                    self.$$selectgroupds = [];
+                    // TODO：
+                },
-                    // TODO：选择事件
+                /**，
+                 * compile阶段，angular还没有编译模版，根据需要可以修改模版dom
+                 * @param tElem
+                 * @param tAttrs
+                 * @returns {{pre: Function, post: Function}}
+                 */
+                compile : function(tElem, tAttrs) {
+                    // 获取属性
+                    var $attr_name = tAttrs["name"]; // 控件的名字
+                    if (!$attr_name) {
+                        throw new Error("saTimeTablePreview指令 name属性required");
+                    }
-                    self.$$select_column_change = function() {
-                        self.$$refresh_selectgroupds();
-                    };
+                    // 内部controlAs名字
+                    var ctrlAs = "$saTimeTablePreviewCtrl";
-                    self.$$select_dir_change = function() {
-                        self.$$refresh_selectgroupds();
-                    };
+                    // TODO：
-                    self.$$add_option_click = function(index) {
-                        self.$$selectgroupds.splice(index, 0, {
-                            column: self.columns[0].name,
-                            dir: "ASC"
-                        });
-                        self.$$refresh_selectgroupds();
-                    };
-                    self.$$del_option_click = function(index) {
-                        self.$$selectgroupds.splice(index, 1);
-                        self.$$refresh_selectgroupds();
+                    //------------------ 内部方法 --------------------//
+                    var date_wrap_prefix = "2000-01-01 "; // 包装日期的前缀
+                    var date_wrap_format = "YYYY-MM-DD HH:mm"; // 日期格式
+                    /**
+                     * 将时间包装成日期，方便计算。
+                     * @param timeStr 时间格式，如 06:30
+                     * @returns moment对象
+                     */
+                    var _fun_WrapTime = function(timeStr) {
+                        return moment(
+                            date_wrap_prefix + timeStr,
+                            date_wrap_format
+                        );
                     };
-                    // 刷新选项内部数据源
-                    self.$$refresh_selectgroupds = function() {
-                        if (!self.$$columns_loaded || !self.$$ordercolumns_loaded || self.columns.length == 0) {
-                            // 没有载入完成，或者字段列表为空
-                            return;
+                    /**
+                     * 点击班次html元素（dl），触发班次移动，如下：
+                     * 1、点击上行班次，下一个下行班次在下行班次列表中移到中间位置
+                     * 2、点击下行班次，下一个上行班次在上行班次列表中移到中间位置
+                     * @param ctrl 内部控制器
+                     * @param index 班次索引
+                     * @param isUp 是否上行
+                     * @private
+                     */
+                    var _fun_bcDDViewMove = function(ctrl, index, isUp) {
+                        // 获取当前点击班次对象
+                        var oBc;
+                        if (isUp) {
+                            oBc = ctrl.internalBcModel.up_bc_list_asc[index];
+                        } else {
+                            oBc = ctrl.internalBcModel.down_bc_list_asc[index];
                         }
-                        if (self.$$selectgroupds.length == 0) { // 默认添加一组排序
-                            self.$$selectgroupds.push({
-                                column: self.columns[0].name,
-                                dir: "ASC"
-                            });
+                        // 找出车次链中的下一个班次索引，没有就undefined
+                        var nextIndex = undefined;
+                        var nextBlockBc = undefined;
+                        var currentBlockBcIndex = undefined;
+                        angular.forEach(ctrl.internalLpBlockModel[oBc.lpName], function(data, i) {
+                            if (data.fcsj == oBc.fcsj) {
+                                currentBlockBcIndex = i;
+                            }
+                        });
+                        if (currentBlockBcIndex != undefined &&
+                            currentBlockBcIndex < (ctrl.internalLpBlockModel[oBc.lpName].length - 1)) {
+                            nextBlockBc = ctrl.internalLpBlockModel[oBc.lpName][currentBlockBcIndex + 1];
+                            nextIndex = nextBlockBc.index;
                         }
-
-                        // 重新计算ordercolumns
-
-                        var aColumn = [];
-                        var aDir = [];
-                        for (var i = 0; i < self.$$selectgroupds.length; i++) {
-                            aColumn.push(self.$$selectgroupds[i].column);
-                            aDir.push(self.$$selectgroupds[i].dir);
+                        // 先删除click标记，再添加
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data) {
+                            delete data["isClick"];
+                        });
+                        oBc.isClick = true;
+                        if (nextIndex) {
+                            if (nextBlockBc.isUp) {
+                                ctrl.internalBcModel.up_bc_list_asc[nextIndex].isClick = true;
+                            } else {
+                                ctrl.internalBcModel.down_bc_list_asc[nextIndex].isClick = true;
+                            }
                         }
-                        if (self.ordercolumns) {
-                            self.ordercolumns.order = aColumn.join(",");
-                            self.ordercolumns.direction = aDir.join(",");
-                        } else {
-                            self.ordercolumns = {order: aColumn.join(","), direction: aDir.join(",")}
+
+                        // 移动，同方向不移动
+                        var clientHeight = angular.element("#temp").height() - 34;
+                        if (nextBlockBc && isUp != nextBlockBc.isUp) {
+                            if (isUp) { // 移动下行
+                                angular.element(".ttpv_table_scrollbar:eq(1)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            } else { // 移动上行
+                                angular.element(".ttpv_table_scrollbar:eq(0)").animate(
+                                    {scrollTop : nextIndex * 30 - clientHeight / 2}, 400);
+                            }
                         }
-                    }
-                },
-                compile: function(tElem, tAttrs) {
-                    // 获取所有属性，并验证
-                    var $name_attr = tAttrs['name']; // 控件的名字
-                    if (!$name_attr) {
-                        throw "必须有名称属性";
-                    }
+                    };
-                    // controlAs名字
-                    var ctrlAs = '$saOrderOptionCtrl';
+                    /**
+                     * 刷新内部数据。
+                     * @param ctrl 内部控制器对象（$saTimeTablePreviewCtrl）
+                     * @private
+                     */
+                    var _fun_refreshInternalModel = function(ctrl) {
+                        // 初始化内部数据
+                        ctrl.internalBcModel = {
+                            up_qdz_name : "", // 上行起点站名字
+                            up_zdz_name : "", // 上行终点站名字
+                            down_qdz_name : "", // 下行起点站名字
+                            down_zdz_name : "", // 下行终点站名字
+                            up_bc_list_asc : [], // 上行班次列表（按照发车时间升序）
+                            down_bc_list_asc : [] // 下行班次列表（按照发车时间升序）
+                        };
+                        ctrl.internalLpBlockModel = {
-                    // TODO：
+                        };
+                        // ngModel传入的数据
+                        var dataSource = ctrl.ds.bcList;
+                        // 构造上下行班次列表，并确定上下行的首发站点
+                        angular.forEach(dataSource, function(bcObj) {
+                            var _internalBcObj = {};
+                            // 构造内部班次对象
+                            _internalBcObj.lpName = bcObj.lp.lpName; // 路牌
+                            _internalBcObj.fcsj = bcObj.fcsj; // 发车时间
+                            _internalBcObj.ddsj = _fun_WrapTime(bcObj.fcsj).add(bcObj.bcsj, "m").format("HH:mm");
+                            _internalBcObj.qdzName = bcObj.qdzName; // 起点站名字
+                            _internalBcObj.zdzName = bcObj.zdzName; // 终点站名字
+                            _internalBcObj.bcType = bcObj.bcType; // 班次类型
+                            _internalBcObj.isTs = bcObj.isTS; // 是否停驶
+                            _internalBcObj.isFb = bcObj.isFB; // 是否分班
+                            _internalBcObj.remark = bcObj.remark; // 备注
+                            _internalBcObj._fcno = bcObj.fcno; // 发车顺序号
-                    return {
-                        pre: function(scope, element, attr) {
+                            if (bcObj.xlDir == "0") { // 上行
+                                ctrl.internalBcModel.up_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.up_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.up_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.up_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
+                            if (bcObj.xlDir == "1") { // 下行
+                                ctrl.internalBcModel.down_bc_list_asc.push(_internalBcObj);
+                                // 确定起点站
+                                if (ctrl.internalBcModel.down_qdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_qdz_name = bcObj.qdzName;
+                                    }
+                                }
+                                // 确定终点站
+                                if (ctrl.internalBcModel.down_zdz_name == "") {
+                                    if (bcObj.bcType == "normal") {
+                                        ctrl.internalBcModel.down_zdz_name = bcObj.zdzName;
+                                    }
+                                }
+                            }
-                        },
+                        });
-                        post: function(scope, element, attr) {
+                        // 发车时间升序排序上行班次
+                        ctrl.internalBcModel.up_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
-                            //--------------------- 监控属性方法 -------------------//
-                            // 监控字段名字列表
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].columns;
-                                },
-                                function(newValue, oldValue) {
-                                    if (!scope[ctrlAs].$$columns_loaded) {
-                                        // TODO：格式判定以后做，假设格式是对的
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
-                                    }
+                        });
+                        // 发车时间升序排序下行班次
+                        ctrl.internalBcModel.down_bc_list_asc.sort(function(a, b) {
+                            var a_wrapTime = _fun_WrapTime(a.fcsj);
+                            var b_wrapTime = _fun_WrapTime(b.fcsj);
-                                    scope[ctrlAs].$$columns_loaded = true;
-                                    scope[ctrlAs].$$refresh_selectgroupds();
-                                },
-                                true
-                            );
-                            // 监控字段排序列表
+                            // 判定如果发车时间是以00,01,02,03开头的，说明是下一天凌晨的班次，需要加1天判定
+                            // TODO：以后要配合首班车的发车时间判定
+                            if (a.fcsj.indexOf("00:") == 0 ||
+                                a.fcsj.indexOf("01:") == 0 ||
+                                a.fcsj.indexOf("02:") == 0) {
+                                a_wrapTime.add(1, "day");
+                            }
+                            if (b.fcsj.indexOf("00:") == 0 ||
+                                b.fcsj.indexOf("01:") == 0 ||
+                                b.fcsj.indexOf("02:") == 0) {
+                                b_wrapTime.add(1, "day");
+                            }
+
+                            if (a_wrapTime.isBefore(b_wrapTime)) {
+                                return -1;
+                            } else if (a_wrapTime.isAfter(b_wrapTime)) {
+                                return 1;
+                            } else {
+                                return 0;
+                            }
+                        });
+
+                        // 构造路牌block车次链，按照发车顺序排序
+                        angular.forEach(ctrl.internalBcModel.up_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : true,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalBcModel.down_bc_list_asc, function(data, index) {
+                            if (!ctrl.internalLpBlockModel[data.lpName]) {
+                                ctrl.internalLpBlockModel[data.lpName] = [];
+                            }
+                            ctrl.internalLpBlockModel[data.lpName].push({
+                                fcsj : data.fcsj,
+                                isUp : false,
+                                fcno : data._fcno,
+                                index : index
+                            });
+                        });
+                        angular.forEach(ctrl.internalLpBlockModel, function(value, key) {
+                            value.sort(function (a, b) {
+                                if (a.fcno < b.fcno) {
+                                    return -1;
+                                } else if (a.fcno > b.fcno) {
+                                    return 1;
+                                } else {
+                                    return 0;
+                                }
+                            });
+                        });
+
+
+                    };
+
+                    return {
+                        pre : function(scope, element, attr) {
+                            // TODO：
+                        },
+                        post : function(scope, element, attr) {
+                            // 班次html点击事件
+                            scope[ctrlAs].$$bcDD_Click = function(index, xlDir) {
+                                _fun_bcDDViewMove(scope[ctrlAs], index, xlDir);
+                            };
+
+                            // 监控ngModel绑定的外部数据源的刷新状态变化
                             scope.$watch(
                                 function() {
-                                    return scope[ctrlAs].ordercolumns;
+                                    return scope[ctrlAs].ds.refreshInfos;
                                 },
                                 function(newValue, oldValue) {
-                                    if (!scope[ctrlAs].$$ordercolumns_loaded) {
-                                        if (newValue) {
-                                            var aColumns = []; // 排序的字段
-                                            var aDirs = []; // 排序字段对应的排序方向
-
-                                            if (newValue.order) {
-                                                aColumns = newValue.order.split(",");
-                                            }
-                                            if (newValue.direction) {
-                                                aDirs = newValue.direction.split(",");
-                                            }
-
-                                            for (var i = 0; i < aColumns.length; i++) {
-                                                if (i < aDirs.length) {
-                                                    scope[ctrlAs].$$selectgroupds.push({
-                                                        column: aColumns[i],
-                                                        dir: aDirs[i]
-                                                    });
-                                                } else {
-                                                    scope[ctrlAs].$$selectgroupds.push({
-                                                        column: aColumns[i],
-                                                        dir: 'ASC'
-                                                    });
-                                                }
-                                            }
-                                        }
+                                    if (newValue === undefined && oldValue === undefined) {
+                                        return;
                                     }
-                                    scope[ctrlAs].$$ordercolumns_loaded = true;
-                                    scope[ctrlAs].$$refresh_selectgroupds();
-
+                                    console.log("saTimetable2 refresh");
+                                    _fun_refreshInternalModel(scope[ctrlAs]);
                                 },
                                 true
                             );
                         }
-
                     };
                 }
             };
@@ -4624,6 +4734,266 @@ angular.module(&#39;ScheduleApp&#39;).directive(
     ]
 );
 /**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly1',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(".tt_table_head").css("top", element.scrollTop());
+                                angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
+                                angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
+/**
+ * 滚动事件控制指令。
+ */
+angular.module('ScheduleApp').directive(
+    'saTscrolly2',
+    [
+        function() {
+            return {
+                restrict: 'A',
+
+                compile: function(tElem, tAttrs) {
+
+                    return {
+                        pre: function(scope, element, attr) {
+                            // TODO：
+                            //alert(element.find("#tooltipTest").html());
+                            //$compile(element.find("#tooltipTest"))(scope);
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            //var head = element[0];
+
+                            //console.log("llllllllload");
+                            //console.log(element.name);
+
+                            element.bind('scroll', function() {
+                                //console.log("top=", angular.element(".tt_table_head").css("top"));
+                                //console.log("left=", angular.element(".tt_table_head").css("left"));
+                                //console.log("s top=" + element.scrollTop());
+
+                                angular.element(attr.scrclass).css("top", element.scrollTop());
+                                // angular.element(".tt_table_head:eq(0)").css("left", element.scrollLeft());
+                                // angular.element(".tt_table_body:eq(0)").css("left", element.scrollLeft());
+
+                            });
+                        }
+
+                    };
+                }
+            }
+        }
+    ]
+);
+/**
+ * saOrderoption指令，搜索时的排序选项（在搜索时可以使用，通用的）
+ * 属性如下：
+ * name（必须）：控件的名字
+ * columns（必须，独立作用域）：字段名字列表，格式：[{name:[字段名],desc:[字段描述]}...]
+ * ordercolumns（必须，独立作用域）：字段排序列表，格式：{order: '字段1,字段2',direction: 'ASC,DESC'}
+ */
+angular.module('ScheduleApp').directive(
+    'saOrderoption',
+    [
+        function() {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/queryOption/saOrderOptionTemplate.html',
+                scope: {
+                    columns: '=',
+                    ordercolumns: '='
+                },
+                controllerAs: '$saOrderOptionCtrl',
+                bindToController: true,
+                controller: function() {
+                    var self = this;
+
+                    // 字段列表是否预载入
+                    self.$$columns_loaded = false;
+                    // 字段排序是否预载入
+                    self.$$ordercolumns_loaded = false;
+
+
+                    // 每组选项内部数据源
+                    // 格式：[{column:[选中的字段名],dir:[ASC/DESC]}]
+                    self.$$selectgroupds = [];
+
+                    // TODO：选择事件
+
+                    self.$$select_column_change = function() {
+                        self.$$refresh_selectgroupds();
+                    };
+
+                    self.$$select_dir_change = function() {
+                        self.$$refresh_selectgroupds();
+                    };
+
+                    self.$$add_option_click = function(index) {
+                        self.$$selectgroupds.splice(index, 0, {
+                            column: self.columns[0].name,
+                            dir: "ASC"
+                        });
+                        self.$$refresh_selectgroupds();
+                    };
+                    self.$$del_option_click = function(index) {
+                        self.$$selectgroupds.splice(index, 1);
+                        self.$$refresh_selectgroupds();
+                    };
+
+                    // 刷新选项内部数据源
+                    self.$$refresh_selectgroupds = function() {
+                        if (!self.$$columns_loaded || !self.$$ordercolumns_loaded || self.columns.length == 0) {
+                            // 没有载入完成，或者字段列表为空
+                            return;
+                        }
+
+                        if (self.$$selectgroupds.length == 0) { // 默认添加一组排序
+                            self.$$selectgroupds.push({
+                                column: self.columns[0].name,
+                                dir: "ASC"
+                            });
+                        }
+
+                        // 重新计算ordercolumns
+
+                        var aColumn = [];
+                        var aDir = [];
+                        for (var i = 0; i < self.$$selectgroupds.length; i++) {
+                            aColumn.push(self.$$selectgroupds[i].column);
+                            aDir.push(self.$$selectgroupds[i].dir);
+                        }
+                        if (self.ordercolumns) {
+                            self.ordercolumns.order = aColumn.join(",");
+                            self.ordercolumns.direction = aDir.join(",");
+                        } else {
+                            self.ordercolumns = {order: aColumn.join(","), direction: aDir.join(",")}
+                        }
+
+                    }
+                },
+                compile: function(tElem, tAttrs) {
+                    // 获取所有属性，并验证
+                    var $name_attr = tAttrs['name']; // 控件的名字
+                    if (!$name_attr) {
+                        throw "必须有名称属性";
+                    }
+
+                    // controlAs名字
+                    var ctrlAs = '$saOrderOptionCtrl';
+
+                    // TODO：
+
+
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+
+                        post: function(scope, element, attr) {
+
+                            //--------------------- 监控属性方法 -------------------//
+                            // 监控字段名字列表
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].columns;
+                                },
+                                function(newValue, oldValue) {
+                                    if (!scope[ctrlAs].$$columns_loaded) {
+                                        // TODO：格式判定以后做，假设格式是对的
+
+
+                                    }
+
+                                    scope[ctrlAs].$$columns_loaded = true;
+                                    scope[ctrlAs].$$refresh_selectgroupds();
+                                },
+                                true
+                            );
+                            // 监控字段排序列表
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].ordercolumns;
+                                },
+                                function(newValue, oldValue) {
+                                    if (!scope[ctrlAs].$$ordercolumns_loaded) {
+                                        if (newValue) {
+                                            var aColumns = []; // 排序的字段
+                                            var aDirs = []; // 排序字段对应的排序方向
+
+                                            if (newValue.order) {
+                                                aColumns = newValue.order.split(",");
+                                            }
+                                            if (newValue.direction) {
+                                                aDirs = newValue.direction.split(",");
+                                            }
+
+                                            for (var i = 0; i < aColumns.length; i++) {
+                                                if (i < aDirs.length) {
+                                                    scope[ctrlAs].$$selectgroupds.push({
+                                                        column: aColumns[i],
+                                                        dir: aDirs[i]
+                                                    });
+                                                } else {
+                                                    scope[ctrlAs].$$selectgroupds.push({
+                                                        column: aColumns[i],
+                                                        dir: 'ASC'
+                                                    });
+                                                }
+                                            }
+                                        }
+                                    }
+                                    scope[ctrlAs].$$ordercolumns_loaded = true;
+                                    scope[ctrlAs].$$refresh_selectgroupds();
+
+                                },
+                                true
+                            );
+                        }
+
+                    };
+                }
+            };
+        }
+    ]
+);
+/**
  * saScpdate指令（非通用指令，只在排班计划form中使用）。
  * 属性如下：
  * name（必须）：控件的名字
@@ -4854,193 +5224,193 @@ angular.module(&#39;ScheduleApp&#39;).directive(
         }
     ]
 );
-/**
- * saSrule指令（非通用指令，只在排班计划form中使用）。
- * 属性如下：
- * name（必须）：控件的名字
- * xlid（必须）：线路id
- * from（必须）：独立作用域-绑定的开始时间属性名
- * to（必须）：独立作用域-绑定的结束时间属性名
- * error（必须）：独立作用域-绑定的错误描述属性名
- */
-angular.module('ScheduleApp').directive(
-    'saSrule',
-    [
-        'SchedulePlanManageService_g',
-        function(service) {
-            return {
-                restrict: 'E',
-                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saSruleTemplate.html',
-                scope: {
-                    from: '=',
-                    to: '=',
-                    xlid: '=',
-                    error: '='
-                },
-                controllerAs: '$saSruleCtrl',
-                bindToController: true,
-                controller: function() {
-                    var self = this;
-
-                    // 内部ng-model值，用于和required配对
-                    self.$$internalmodel = undefined;
-
-                    // 内部数据源（时刻表的一些信息）
-                    self.$$count = 0;
-                    self.$$qyCount = 0;
-                    self.$$qyErrorCount = 0;
-                    self.$$errorInfos = [];
-
-                },
-                compile: function(tElem, tAttrs) {
-                    // 获取所有属性，并验证
-                    var $name_attr = tAttrs['name']; // 控件的名字
-                    if (!$name_attr) {
-                        throw "必须有名称属性";
-                    }
-
-                    // controlAs名字
-                    var ctrlAs = '$saSruleCtrl';
-
-                    // 线路id
-                    var xl_id = undefined;
-                    // 开始时间
-                    var from_date = undefined;
-                    // 结束时间
-                    var to_date = undefined;
-
-                    // 内部添加required验证，将所有的错误应用到required验证上去
-                    tElem.find("div").attr("required", "");
-
-                    return {
-                        pre: function(scope, element, attr) {
-
-                        },
-
-                        post: function(scope, element, attr) {
-                            // 属性值
-                            if ($name_attr) {
-                                scope[ctrlAs]["$name_attr"] = $name_attr;
-                            }
-
-                            // 开始日期open属性，及方法
-                            scope[ctrlAs].$$fromDateOpen = false;
-                            scope[ctrlAs].$$fromDate_open = function() {
-                                scope[ctrlAs].$$fromDateOpen = true;
-                            };
-
-                            // 结束日期open属性，及方法
-                            scope[ctrlAs].$$toDateOpen = false;
-                            scope[ctrlAs].$$toDate_open = function() {
-                                scope[ctrlAs].$$toDateOpen = true;
-                            };
-
-                            // 内部模型刷新
-                            scope[ctrlAs].$$internal_model_refresh = function() {
-                                if (!xl_id) {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                    scope[ctrlAs].error = "线路必须选择";
-                                    return;
-                                }
-                                if (!from_date) {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                    scope[ctrlAs].error = "开始日期必须选择";
-                                    return;
-                                }
-                                if (!to_date) {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                    scope[ctrlAs].error = "结束日期必须选择";
-                                    return;
-                                }
-                                if (from_date > to_date) {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                    scope[ctrlAs].error = "开始日期必须在结束日期之前";
-                                    return;
-                                }
-
-                                scope[ctrlAs].$$count = 0;
-                                scope[ctrlAs].$$qyCount = 0;
-                                scope[ctrlAs].$$qyErrorCount = 0;
-                                scope[ctrlAs].$$errorInfos = [];
-
-                                if (scope[ctrlAs].$$qyCount == 0) {
-                                    scope[ctrlAs].$$internalmodel = undefined;
-                                    scope[ctrlAs].error = "无可启用的规则数";
-                                }
-
-                                var QClass = service.v_rules;
-                                QClass.val({xlid: xl_id, from: from_date, to: to_date},
-                                    function(result) {
-                                        scope[ctrlAs].$$count = result.data.count;
-                                        scope[ctrlAs].$$qyCount = result.data.qyCount;
-                                        scope[ctrlAs].$$qyErrorCount = result.data.qyErrorCount;
-
-                                        angular.forEach(result.data.errorInfos, function(obj) {
-                                            scope[ctrlAs].$$errorInfos.push({
-                                                ruleId: obj.ruleId,
-                                                clZbh: obj.clZbh,
-                                                qyrq: moment(obj.qyrq).format("YYYY年MM月DD日"),
-                                                infos: obj.errorDescList.join("")
-                                            });
-                                        });
-
-                                        if (scope[ctrlAs].$$qyErrorCount > 0) {
-                                            scope[ctrlAs].$$internalmodel = undefined;
-                                            scope[ctrlAs].error = "有错误的规则";
-                                        } else {
-                                            scope[ctrlAs].$$internalmodel = "ok";
-                                            scope[ctrlAs].$$errorInfos = [];
-                                        }
-                                    },
-                                    function() {
-                                        scope[ctrlAs].$$internalmodel = undefined;
-                                        scope[ctrlAs].error = "获取规则数据失败！";
-                                    }
-                                );
-
-                                scope[ctrlAs].$$internalmodel = "ok";
-                            };
-
-                            scope[ctrlAs].$$internal_model_refresh(); // 初始执行
-
-                            //--------------------- 监控属性方法 -------------------//
-                            // 监控线路id模型值变化
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].xlid;
-                                },
-                                function(newValue, oldValue) {
-                                    xl_id = newValue;
-                                    scope[ctrlAs].$$internal_model_refresh();
-                                }
-                            );
-
-                            // 监控开始时间模型值变化
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].from;
-                                },
-                                function(newValue, oldValue) {
-                                    from_date = newValue;
-                                    scope[ctrlAs].$$internal_model_refresh();
-                                }
-                            );
-                            // 监控结束时间模型值变化
-                            scope.$watch(
-                                function() {
-                                    return scope[ctrlAs].to;
-                                },
-                                function(newValue, oldValue) {
-                                    to_date = newValue;
-                                    scope[ctrlAs].$$internal_model_refresh();
-                                }
-                            );
-                        }
-                    };
-                }
-            };
-        }
-    ]
+/**
+ * saSrule指令（非通用指令，只在排班计划form中使用）。
+ * 属性如下：
+ * name（必须）：控件的名字
+ * xlid（必须）：线路id
+ * from（必须）：独立作用域-绑定的开始时间属性名
+ * to（必须）：独立作用域-绑定的结束时间属性名
+ * error（必须）：独立作用域-绑定的错误描述属性名
+ */
+angular.module('ScheduleApp').directive(
+    'saSrule',
+    [
+        'SchedulePlanManageService_g',
+        function(service) {
+            return {
+                restrict: 'E',
+                templateUrl: '/pages/scheduleApp/module/common/dts2/scheduleplan/saSruleTemplate.html',
+                scope: {
+                    from: '=',
+                    to: '=',
+                    xlid: '=',
+                    error: '='
+                },
+                controllerAs: '$saSruleCtrl',
+                bindToController: true,
+                controller: function() {
+                    var self = this;
+
+                    // 内部ng-model值，用于和required配对
+                    self.$$internalmodel = undefined;
+
+                    // 内部数据源（时刻表的一些信息）
+                    self.$$count = 0;
+                    self.$$qyCount = 0;
+                    self.$$qyErrorCount = 0;
+                    self.$$errorInfos = [];
+
+                },
+                compile: function(tElem, tAttrs) {
+                    // 获取所有属性，并验证
+                    var $name_attr = tAttrs['name']; // 控件的名字
+                    if (!$name_attr) {
+                        throw "必须有名称属性";
+                    }
+
+                    // controlAs名字
+                    var ctrlAs = '$saSruleCtrl';
+
+                    // 线路id
+                    var xl_id = undefined;
+                    // 开始时间
+                    var from_date = undefined;
+                    // 结束时间
+                    var to_date = undefined;
+
+                    // 内部添加required验证，将所有的错误应用到required验证上去
+                    tElem.find("div").attr("required", "");
+
+                    return {
+                        pre: function(scope, element, attr) {
+
+                        },
+
+                        post: function(scope, element, attr) {
+                            // 属性值
+                            if ($name_attr) {
+                                scope[ctrlAs]["$name_attr"] = $name_attr;
+                            }
+
+                            // 开始日期open属性，及方法
+                            scope[ctrlAs].$$fromDateOpen = false;
+                            scope[ctrlAs].$$fromDate_open = function() {
+                                scope[ctrlAs].$$fromDateOpen = true;
+                            };
+
+                            // 结束日期open属性，及方法
+                            scope[ctrlAs].$$toDateOpen = false;
+                            scope[ctrlAs].$$toDate_open = function() {
+                                scope[ctrlAs].$$toDateOpen = true;
+                            };
+
+                            // 内部模型刷新
+                            scope[ctrlAs].$$internal_model_refresh = function() {
+                                if (!xl_id) {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                    scope[ctrlAs].error = "线路必须选择";
+                                    return;
+                                }
+                                if (!from_date) {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                    scope[ctrlAs].error = "开始日期必须选择";
+                                    return;
+                                }
+                                if (!to_date) {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                    scope[ctrlAs].error = "结束日期必须选择";
+                                    return;
+                                }
+                                if (from_date > to_date) {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                    scope[ctrlAs].error = "开始日期必须在结束日期之前";
+                                    return;
+                                }
+
+                                scope[ctrlAs].$$count = 0;
+                                scope[ctrlAs].$$qyCount = 0;
+                                scope[ctrlAs].$$qyErrorCount = 0;
+                                scope[ctrlAs].$$errorInfos = [];
+
+                                if (scope[ctrlAs].$$qyCount == 0) {
+                                    scope[ctrlAs].$$internalmodel = undefined;
+                                    scope[ctrlAs].error = "无可启用的规则数";
+                                }
+
+                                var QClass = service.v_rules;
+                                QClass.val({xlid: xl_id, from: from_date, to: to_date},
+                                    function(result) {
+                                        scope[ctrlAs].$$count = result.data.count;
+                                        scope[ctrlAs].$$qyCount = result.data.qyCount;
+                                        scope[ctrlAs].$$qyErrorCount = result.data.qyErrorCount;
+
+                                        angular.forEach(result.data.errorInfos, function(obj) {
+                                            scope[ctrlAs].$$errorInfos.push({
+                                                ruleId: obj.ruleId,
+                                                clZbh: obj.clZbh,
+                                                qyrq: moment(obj.qyrq).format("YYYY年MM月DD日"),
+                                                infos: obj.errorDescList.join("")
+                                            });
+                                        });
+
+                                        if (scope[ctrlAs].$$qyErrorCount > 0) {
+                                            scope[ctrlAs].$$internalmodel = undefined;
+                                            scope[ctrlAs].error = "有错误的规则";
+                                        } else {
+                                            scope[ctrlAs].$$internalmodel = "ok";
+                                            scope[ctrlAs].$$errorInfos = [];
+                                        }
+                                    },
+                                    function() {
+                                        scope[ctrlAs].$$internalmodel = undefined;
+                                        scope[ctrlAs].error = "获取规则数据失败！";
+                                    }
+                                );
+
+                                scope[ctrlAs].$$internalmodel = "ok";
+                            };
+
+                            scope[ctrlAs].$$internal_model_refresh(); // 初始执行
+
+                            //--------------------- 监控属性方法 -------------------//
+                            // 监控线路id模型值变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].xlid;
+                                },
+                                function(newValue, oldValue) {
+                                    xl_id = newValue;
+                                    scope[ctrlAs].$$internal_model_refresh();
+                                }
+                            );
+
+                            // 监控开始时间模型值变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].from;
+                                },
+                                function(newValue, oldValue) {
+                                    from_date = newValue;
+                                    scope[ctrlAs].$$internal_model_refresh();
+                                }
+                            );
+                            // 监控结束时间模型值变化
+                            scope.$watch(
+                                function() {
+                                    return scope[ctrlAs].to;
+                                },
+                                function(newValue, oldValue) {
+                                    to_date = newValue;
+                                    scope[ctrlAs].$$internal_model_refresh();
+                                }
+                            );
+                        }
+                    };
+                }
+            };
+        }
+    ]
 );
 /**
  * saPlaninfoedit指令，排班明细编辑控件，用在调度执勤日报的修改功能
@@ -344,7 +344,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;GuideboardManageService_g&#39;, [&#39;$resource&#39;,
     return {
         rest: $resource(
             '/gic/:id',
-            {order: 'xl,isCancel,lpNo', direction: 'DESC,ASC,ASC', id: '@id'},
+            {order: 'xl.name,isCancel,lpNo', direction: 'DESC,ASC,ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -417,7 +417,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(&#39;rerunManageService_g&#39;, [&#39;$resource&#39;, func
     return {
         rest: $resource(
             '/rms/:id',
-            {order: 'rerunXl.id,isCancel', direction: 'ASC', id: '@id'},
+            {order: 'rerunXl.name,isCancel', direction: 'ASC', id: '@id'},
             {
                 list: {
                     method: 'GET',
@@ -791,6 +791,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     '/tidc/:id',
                     {order: 'createDate', direction: 'DESC', id: '@id'},
                     {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
                         get: {
                             method: 'GET',
                             transformResponse: function(rs) {
@@ -37,10 +37,13 @@
                     <!--<i class="fa fa-arrow-down" aria-hidden="true"></i>-->
                     <!--<span style="padding-right: 10px;">下行班次</span>-->
                     <!--<i class="fa fa-circle-o-notch" aria-hidden="true"></i>-->
-                    <span style="padding-right: 10px;background: #105383;color: white;text-align: center;">停驶班次</span>
-                    <span style="padding-right: 10px;background: #686d7b;color: white;text-align: center;">区间班次</span>
-                    <!--<i class="fa fa-adjust" aria-hidden="true"></i>-->
-                    <span style="padding-right: 10px;background: #adff00;color: #501a1a;text-align: center;">分班班次</span>
+
+                    <a href="javascript:" class="btn blue" style="padding-right: 5px;" ng-click="ctrl.switchView()">
+                        <i class="fa fa-exchange"></i>
+                        {{ctrl.currentView.switchBtnMsg}}
+                    </a>
+
+
                     <!--<div class="btn-group">-->
                         <!--<a href="javascript:" class="btn red btn-outline btn-circle" data-toggle="dropdown">-->
@@ -87,40 +90,67 @@
             </div>
             <div class="portlet-body">
-                <div style="padding-bottom: 5px;">
-                    <a href="javascript:" style="padding-right: 5px;" ng-click="ctrl.multiselect()">
-                        <i class="fa fa-file-excel-o"></i>
-                        批量选择
-                    </a>
-                    <a href="javascript:" style="padding-right: 5px;" ng-click="ctrl.editInfos()">
-                        <i class="fa fa-pencil-square-o"></i>
-                        批量修改
-                    </a>
+                <div style="padding-bottom: 10px; height: 20px;">
+                    <div style="float: left">
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.multiselect()"
+                           ng-show="ctrl.currentView.btn1">
+                            <i class="fa fa-file-excel-o"></i>
+                            批量选择
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.editInfos()"
+                           ng-show="ctrl.currentView.btn2">
+                            <i class="fa fa-pencil-square-o"></i>
+                            批量修改
+                        </a>
+
+                        <a sweetalert
+                           sweet-options="{title: '是否删除选定的班次？',text: '线路：' + ctrl.xlname + '</br>时刻表：' + ctrl.ttname + '</br>谨慎删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
+                           sweet-on-confirm="ctrl.deleteInfos()"
+                           style="padding-right: 5px;"
+                           ng-show="ctrl.currentView.btn3">
+                            <i class="fa fa-trash"></i>
+                            批量删除
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.clearsel()"
+                           ng-show="ctrl.currentView.btn4">
+                            <i class="fa fa-eraser"></i>
+                            取消选择
+                        </a>
+                        <a href="javascript:" style="padding-right: 5px;"
+                           ng-click="ctrl.refresh()"
+                           ng-show="ctrl.currentView.btn5">
+                            <i class="fa fa-refresh"></i>
+                            刷新数据
+                        </a>
+                    </div>
+
+
+                    <div style="float: right;">
+                        <span style="padding-right: 10px;background: #105383;color: white;text-align: center;">停驶班次</span>
+                        <span style="padding-right: 10px;background: #686d7b;color: white;text-align: center;">区间班次</span>
+                        <!--<i class="fa fa-adjust" aria-hidden="true"></i>-->
+                        <span style="padding-right: 10px;background: #adff00;color: #501a1a;text-align: center;">分班班次</span>
+                    </div>
-                    <a sweetalert
-                       sweet-options="{title: '是否删除选定的班次？',text: '线路：' + ctrl.xlname + '</br>时刻表：' + ctrl.ttname + '</br>谨慎删除！', html: true,type: 'warning',showCancelButton: true,confirmButtonColor: '#DD6B55',confirmButtonText: '是',cancelButtonText: '取消'}"
-                       sweet-on-confirm="ctrl.deleteInfos()"
-                       style="padding-right: 5px;" >
-                        <i class="fa fa-trash"></i>
-                        批量删除
-                    </a>
-                    <a href="javascript:" style="padding-right: 5px;" ng-click="ctrl.clearsel()">
-                        <i class="fa fa-eraser"></i>
-                        取消选择
-                    </a>
-                    <a href="javascript:" style="padding-right: 5px;" ng-click="ctrl.refresh()">
-                        <i class="fa fa-refresh"></i>
-                        刷行数据
-                    </a>
                 </div>
                 <!--<div ng-view></div>-->
-                <div style="height: {{ctrl.ttHeight}}px;">
+                <div style="height: {{ctrl.ttHeight}}px;"
+                     ng-show="ctrl.currentView.viewId == 1">
                     <sa-Timetable name="tt" ng-model="ctrl.editInfo" ng-model-options="{ getterSetter: true }" celldbclick="ctrl.singleEditBcDetail">
                     </sa-Timetable>
                 </div>
+                <div style="height: {{ctrl.ttHeight}}px;"
+                     ng-show="ctrl.currentView.viewId == 2">
+                    <sa-Timetable2 name="tt2" ng-model="ctrl.pvInfo" ng-model-options="{ getterSetter: true }" >
+
+                    </sa-Timetable2>
+                </div>
             </div>
         </div>
@@ -12,7 +12,7 @@ angular.module(&#39;ScheduleApp&#39;).factory(
             // 查询对象类
             var queryClass = service.rest;
-            // 时刻表信息
+            // 时刻表信息（编辑视图使用）
             var editInfo = {
                 detailHeads: [], // 时刻表头信息
                 detailInfos: [], // 时刻表明细信息
@@ -20,6 +20,12 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 yydesc: "" // 营运汇总描述
             };
+            // 时刻表信息（预览视图使用）
+            var pvInfo = {
+                bcList : [], // 班次列表
+                refreshInfos : undefined // 刷新信息
+            };
+
             return {
                 getQueryClass: function() {
                     return queryClass;
@@ -27,6 +33,31 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                 getEditInfo: function() {
                     return editInfo;
                 },
+                getPvInfo : function() {
+                    return pvInfo;
+                },
+
+                /**
+                 * 获取预览用的时刻表明细数据。
+                 * @param ttid 时刻表id
+                 */
+                refreshPvInfo : function(ttid) {
+                    service.rest.list(
+                        {page : 0, size : 1000, "ttinfo.id_eq" : ttid},
+                        function(result) {
+                            if (result.content.length > 0) {
+                                pvInfo.bcList = result.content;
+                                if (pvInfo.refreshInfos == undefined) {
+                                    pvInfo.refreshInfos = {
+                                        count : 1 // 刷新次数
+                                    };
+                                } else {
+                                    pvInfo.refreshInfos.count ++;
+                                }
+                            }
+                        }
+                    );
+                },
                 /**
                  * 获取编辑用的时刻表明细数据。
@@ -269,6 +300,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             self.editInfo = undefined;
+            self.pvInfo = undefined;
             $scope.$watch(
                 function() {
@@ -280,6 +312,17 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 true
             );
+            $scope.$watch(
+                function() {
+                    return service.getPvInfo();
+                },
+                function(n, o) {
+                    self.pvInfo = n;
+                },
+                true
+            );
+
+
             // 清除选择
             self.clearsel = function() {
                 var ds = service.getEditInfo().detailInfos;
@@ -291,7 +334,39 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
             // 刷新时刻表数据
             self.refresh = function() {
-                service.refreshEditInfo(self.xlid, self.ttid);
+                // TODO：目前只有2个视图，内部toggle，以后多个视图需传入viewId
+                if (self.currentView.viewId == 1) {
+                    service.refreshEditInfo(self.xlid, self.ttid);
+                } else {
+                    service.refreshPvInfo(self.ttid);
+                }
+            };
+
+            // 切换视图（编辑视图/预览视图）
+            self.viewInfos = {
+                "editView" : {
+                    viewId : 1,
+                    switchBtnMsg : "切换预览视图",
+                    btn1 : true,
+                    btn2 : true,
+                    btn3 : true,
+                    btn4 : true,
+                    btn5 : true
+                },
+                "preView" : {
+                    viewId : 2,
+                    switchBtnMsg : "切换编辑视图",
+                    btn5 : true
+                }
+            };
+            self.currentView = self.viewInfos["editView"]; // 默认编辑视图
+            self.switchView = function() {
+                // TODO：目前只有2个视图，内部toggle，以后多个视图需传入viewId
+                if (self.currentView.viewId == 1) {
+                    self.currentView = self.viewInfos["preView"];
+                } else {
+                    self.currentView = self.viewInfos["editView"];
+                }
             };
             self.ttHeight = 500; // 时刻表的高度
@@ -431,8 +506,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             };
-            if (self.rflag) { // 是否刷新
-                self.refresh(); // 刷新数据
+            if (self.rflag) { // 是否初始刷新数据
+                service.refreshEditInfo(self.xlid, self.ttid);
+                service.refreshPvInfo(self.ttid);
             }
             // TODO:
@@ -108,6 +108,20 @@ angular.module(&#39;ScheduleApp&#39;).factory(
                     '/tidc/:id',
                     {order: 'createDate', direction: 'DESC', id: '@id'},
                     {
+                        list: {
+                            method: 'GET',
+                            params: {
+                                page: 0
+                            },
+                            transformResponse: function(rs) {
+                                var dst = angular.fromJson(rs);
+                                if (dst.status == 'SUCCESS') {
+                                    return dst.data;
+                                } else {
+                                    return dst; // 业务错误留给控制器处理
+                                }
+                            }
+                        },
                         get: {
                             method: 'GET',
                             transformResponse: function(rs) {
@@ -29,7 +29,6 @@ var gb_schedule_table = (function () {
     var show = function (cb) {
         //从服务器获取班次数据
-        debugger
         $.get('/realSchedule/lines', {
             lines: gb_data_basic.line_idx
         }, function (rs) {
@@ -96,13 +96,21 @@
         <dl>
             <dd>
                 {{if item.abnormalType == 'speed'}}
-                    {{if item.speed>=100}}
-                        速度异常
-                    {{else}}
-                        超速({{item.speed}})
-                    {{/if}}
+                {{if item.speed>=100}}
+                速度异常
+                {{else}}
+                超速({{item.speed}})
+                {{/if}}
                 {{else if item.abnormalType == 'outbound'}}
                 越界
+                {{else if item.abnormalType == 'gpsNotValid'}}
+                gps无效
+                {{else if item.abnormalType == 'linesSwitch'}}
+                <span style="font-size:12px;-webkit-transform:scale(0.9);display:block;text-indent: 5px;">{{item.line_line}}</span>
+                {{else if item.abnormalType == 'versionSwitch'}}
+                线路版本切换
+                {{else if item.abnormalType == 'gpsZero'}}
+                经纬度为0
                 {{/if}}
             </dd>
             <dd>{{item.st_str}}</dd>
@@ -218,7 +218,7 @@
                         fillTrailTable(rs.list);//填充行车轨迹表格
                         fillArivalStationTable(rs.list);//填充到离站表格
                         $('.sum_mileage_span', leftWrap).text('共约 ' + rs.sumMileage + ' 公里');
-                        fillAbnormalTable(rs['outboundList'], rs['speedList']);//填充异常信息表格
+                        fillAbnormalTable(rs['outboundList'], rs['speedList'],rs['gpsInvalid'],rs['gpslineSwitch'],rs['lineVerson'],rs['gpslonlatex']);//填充异常信息表格
                         //准备播放
                         rs.arrivalData = arrivalData;
                         $('.gps-play-back-panel-v3>div.right-panel .play-back-tools-wrap').trigger('ready-to-play', rs);
@@ -461,14 +461,21 @@
             for(var i = 0; i < arguments.length; i ++){
                 array = array.concat(arguments[i]);
             }
+            var i=null;
             //格式化时间
             $.each(array, function () {
+                if(!this.abnormalType&&this.version){
+                    i=array.indexOf(this);
+                }
                 if(this.st)
                     this.st_str = moment(this.st).format('HH:mm.ss');
                 if(this.et)
                     this.et_str = moment(this.et).format('HH:mm.ss');
             });
+            if(i){
+                array.splice(i,1);
+            }
             //排序
             array.sort(function (a, b) {
                 return a.st - b.st;
@@ -84,7 +84,6 @@
         var currentVersion;
         $('.play-back-tools-wrap', rightWrap).on('ready-to-play', function (e, data) {
-            debugger
             e.stopPropagation();
             //reset
             reset();
@@ -191,7 +190,6 @@
         $('.top-btn-list .play', rightWrap).on('click', function () {
             if(toolsDisabled())
                 return;
-debugger
             if(!$(this).hasClass('pause')){
                 //第一次点击播放，清除一下
                 if(play_before_flag){
@@ -344,7 +342,6 @@ debugger
             //从localStorage获取路段
             routes = JSON.parse(storage.getItem(lineCode+"_"+lineVersion + '_route'));
             if(!routes){
-                debugger
                 var name = gb_data_basic.lineCode2NameAll()[lineCode];
                 notify_err("缺少" + name + "的路段信息，请选择" + name + "进入线调");
                 return;