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

徐烜
2 parents d503df12 8d0c9706
Showing 23 changed files with 2773 additions and 1427 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/repository/oil/YlbRepository.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/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.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/fatso/start.js
src/main/resources/static/pages/base/timesmodel/js/v2_2/main_v2_2.js
src/main/resources/static/pages/forms/calc/calcLbStatuAnaly.html
src/main/resources/static/pages/forms/mould/calcLbStatuAnaly.xls
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/permission/user/authorize.html
src/main/resources/static/pages/permission/user/main.html
@@ -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);
+
+}
@@ -46,7 +46,8 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and y.xlbm like %?4%  and y.nbbm like %?5%",nativeQuery=true)
 	List<Ylb> listMaxRqJcsx(String rq,String gsbm,String fgsbm,String xlbm,String nbbm);
  
-	@Query(value="select * from bsth_c_ylb where to_days(?1) -to_days(rq) <30 "
+	@Query(value="select * from bsth_c_ylb where "
+			+ " DATE_SUB(CURDATE(), INTERVAL 30 DAY) <= rq "
 			+ " and rq< ?1 and ssgsdm like %?2%"
 			+ " and fgsdm like %?3% and xlbm like %?4% and nbbm like %?5% "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
@@ -54,7 +55,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
  
 	@Query(value="select * from bsth_c_ylb where rq>=?1 "
 			+ " and rq<= ?2 and ssgsdm =?3"
-			+ " and fgsdm =?4 and xlbm like %?5%  "
+			+ " and fgsdm like %?4% and xlbm like %?5%  "
 			+ " order by nbbm , rq desc,jcsx desc,lp desc",nativeQuery=true)
 	List<Ylb> listByMonthJcsx(String rq,String rq2,String gsbm,String fgsbm,String xlbm);
  
@@ -125,6 +126,12 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	List<Object[]> checkNbmmYl(String rq, String gsbm,String fgsbm,String xlbm,String nbbm);
  
  
+	@Query(value="select nbbm,cs from (select nbbm,count(nbbm) as cs from ("
+			+ " select nbbm,fgsdm from bsth_c_ylb where rq=?1 "
+			+ " and ssgsdm like %?2% group by nbbm,fgsdm "
+			+ " ) t group by t.nbbm) x where x.cs >1 ",nativeQuery=true)
+	List<Object[]> checkNbmmFgs(String rq, String gsbm);
+	
 	@Query(value="select jzl,yh,sh from Ylb s "
 			+ " where to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm like %?2% "
@@ -155,7 +162,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where  to_days(s.rq)=to_days(?1)  "
 			+ " and s.ssgsdm =?2 "
-			+ " and s.fgsdm =?3 "
+			+ " and s.fgsdm like %?3% "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb(String rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
@@ -163,7 +170,7 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 	@Query(value="select s from Ylb s "
 			+ " where  s.rq=?1 "
 			+ " and s.ssgsdm =?2 "
-			+ " and s.fgsdm =?3 "
+			+ " and s.fgsdm like %?3% "
 			+ " and s.xlbm like %?4% "
 			+ " and s.nbbm in ?5 order by nbbm,jcsx")
 	List<Ylb> listYlb_s(Date rq, String gsbm,String fgsbm,String xlbm,List<String> listNbbm);
+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;
+	}
+
+}
@@ -239,7 +239,6 @@ public class GpsServiceImpl implements GpsService {
         long serviceState;
         ArrivalEntity arrival;
         Set<String> lineSet=new HashSet();
-        String firstLineCode="";
         List<Map<String,Object>> lineSwitch=new ArrayList<>();
  
         List<Map> gpsNotValidList=new ArrayList();
@@ -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());
@@ -291,6 +291,26 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			String sxtj=map2.get("sxtj").toString();
 			if(sxtj.equals("0")){
 				listpb=listpbs;
+			}else if (sxtj.equals("5")){
+					List<String> stringList=new ArrayList<String>();
+
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm=objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					for (int i = 0; i < stringList.size(); i++) {
+						String strNbbm=stringList.get(i);
+						for (int j = 0; j < listpbs.size(); j++) {
+							Map<String, Object> map = listpbs.get(j);
+							String mapNbbm=map.get("clZbh").toString();
+							if(strNbbm.equals(mapNbbm)){
+								listpb.add(map);
+							}
+						}
+					}
+					
 			}else{
 				List<Object[]> objectLists=repository.checkNbmmNum(rq, gsbm, fgsbm, "",nbbm);
 				List<String> stringList=new ArrayList<String>();
@@ -1269,6 +1289,19 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 						else
 							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
 					}
+				}else if(sxtj.equals("5")){
+					List<Object[]> objectLists = repository.checkNbmmFgs(rq, gsbm);
+					for (int i = 0; i < objectLists.size(); i++) {
+						String clbm =objectLists.get(i)[0].toString();
+						stringList.add(clbm);
+					}
+					
+					if (stringList.size() > 0) {
+						if (type.equals("1"))
+							listYlb = repository.listYlb(rq, gsbm, fgsbm, xlbm, stringList);
+						else
+							listYlb = repository.listYlb_s(sdf.parse(rq+" 00:00:00"), gsbm, fgsbm, xlbm, stringList);
+					}
 				} else {
 					List<Object[]> objectLists;
 					if (sxtj.equals("3")) {
@@ -1395,6 +1428,10 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 		try {
 			List<Cyl> cylList = cylRepository.findAll(new CustomerSpecs<Cyl>(newMap));
 			String json =StringEscapeUtils.unescapeHtml4(map.get("ylbList").toString());
+			String fgsbm="999";
+			if(map.get("fgsbm")!=null){
+				fgsbm=map.get("fgsbm").toString();
+			}
 			JSONArray jsonArray=JSONArray.parseArray(json);
 			JSONObject jsonObject;
 			for (int x = 0; x < jsonArray.size(); x++) {
@@ -1409,7 +1446,12 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				String nbbm_eq = ylb.getNbbm();
 				Date rq_eq = ylb.getRq();
 				// 得到一天总的加油和里程（根据车，时间）
-				List<Object[]> sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
+				List<Object[]>  sumList=new ArrayList<Object[]>();
+				if(fgsbm.equals(""))
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),fgsbm);
+				else
+					sumList = repository.sumLcYl(nbbm_eq, rq_eq,"",ylb.getSsgsdm(),ylb.getFgsdm());
+
 				// 保存总的加油量
 				Double jzl = 0.0;
 				// 保存总的里程
@@ -1431,9 +1473,14 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 				}*/
 				map.put("nbbm_eq", nbbm_eq);
 				map.put("rq_eq", rq_eq);
-				
-				List<Ylb> iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
-						ylb.getNbbm(),"jcsx");
+				List<Ylb> iterator2=null;
+				if(fgsbm.equals(""))
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),fgsbm,"",
+							ylb.getNbbm(),"jcsx");
+				else
+					iterator2=this.listOrderBy(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
+							ylb.getNbbm(),"jcsx");
+					
 //						repository.obtainYl(sdf.format(rq_eq),ylb.getSsgsdm(),ylb.getFgsdm(),"",
 //						ylb.getNbbm(),"jcsx");
 				DecimalFormat df = new DecimalFormat("#.00");
@@ -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()));
@@ -590,6 +590,11 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             //计算班次实际执行时间
             schAttrCalculator.calcRealDate(t).calcAllTimeByFcsj(t);
+            //处理计达跨24点
+            LineConfig conf = lineConfigData.get(t.getXlBm());
+            if (t.getZdsj().compareTo(conf.getStartOpt()) < 0) {
+                t.setZdsjT(sdfyyyyMMddHHmm.parse(t.getScheduleDateStr() + t.getZdsj()).getTime() + (1000 * 60 * 60 * 24));
+            }
             if (t.getZdsjT() < t.getFcsjT()) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "起终点时间异常！");
@@ -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
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.3.3",
-    "eventproxy": "^0.3.4",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.3.3",
+    "eventproxy": "^0.3.4",
+    "uglify-js": "^2.6.2"
+  }
+}
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel']
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
-/**
- * 主类（v2_2版本）。
- */
-var Main_v2_2 = function() {
-
-    var _paramObj; // 参数对象
-
-    return {
-        /**
-         * 使用发车间隔策略生成时刻表。
-         * @param paramObj 参数对象
-         * @param lpArray 路牌数组
-         * @constructor
-         */
-        BXPplaceClassesTime03 : function(paramObj, lpArray) {
-            // 参数对象
-            _paramObj = paramObj;
-
-            // // 测试行驶时间
-            // var _fcsj = paramObj.toTimeObj("16:20");
-            // var _bcsj = StrategyUtils_v2_2.sFn("CALCU_RUNTIME")(false, _fcsj, paramObj); // 使用策略计算班次行驶时间
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",行驶时间=" + _bcsj);
-            //
-
-            // // 测试停站时间
-            // var _fcsj = paramObj.toTimeObj("05:30");
-            // var _layovertime = StrategyUtils_v2_2.sFn("CALCU_LAYOVER_TIME")(
-            //     _fcsj, false, StrategyUtils_v2_2.sFn("CALCU_RUNTIME"), paramObj);
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",停站layover时间=" + _layovertime);
-            //
-            // var schedule = {};
-
-            // // 测试间隔时间
-            // var _fcsj = paramObj.toTimeObj("07:30");
-            // var _headway = StrategyUtils_v2_2.sFn("CALCU_HEADWAY_2")(true, _fcsj, _paramObj);
-            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",发车间隔=" + _headway);
-
-            // 1、初始化行车计划
-            var schedule = new InternalScheduleObj_v2_2(paramObj, lpArray);
-            // 2、生成班次（从第2圈开始）
-            schedule.fnCreateBclistWithMasterBc(2, 20);
-            // 3、调整发车间隔
-            schedule.fnAdjustHeadway();
-            // 4、计算吃饭班次
-            schedule.fnCalcuEatBc();
-            // // 6、计算末班车
-            // schedule.fnCalcuLastBc();
-            // 7、重新设置停站时间
-            schedule.fnReSetLayoverTime();
-            // 8、补进出场例保班次
-            schedule.fnCalcuOtherBc();
-
-            //-------------------- 输出ganut图上的班次，班型描述 ----------------------//
-            // TODO：班型再议
-            return {
-                'json':schedule.fnToGanttBcArray(),'bxrcgs':null,
-                'aInternalLpObj': schedule.fnGetLpArray()
-            };
-        },
-
-        //----------------------------------- 导入导出配置 -----------------------------------//
-
-        /**
-         * 导出时刻表配置。
-         * @param fnGetGanttBc 获取gantt班次方法
-         */
-        exportExcelConfig: function(fnGetGanttBc) {
-            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
-
-            $('.exportAddXls').off('click');
-            $('.exportAddXlsx').off('click');
-
-            $('.exportAddXls').on('click', function() {
-
-                var aInfos = {
-                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
-                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
-                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
-                };
-
-                console.log(aInfos);
-
-                $(".exportAdd").addClass("disabled");
-                $(".exportAddSpan").html("正在导出...");
-
-                // 提交
-                $.ajax({
-                    type: 'POST',
-                    url: "/tidc/exportDTDFile/xls",
-                    dataType: 'binary',
-                    contentType: "application/json",
-                    data: JSON.stringify(aInfos),
-                    success: function(data){
-                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xls");
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    },
-                    error: function(xhr, type){
-                        alert('错误：TODO');
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    }
-                });
-            });
-
-            $('.exportAddXlsx').on('click', function() {
-                var aInfos = {
-                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
-                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
-                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
-                };
-
-                console.log(aInfos);
-
-                $(".exportAdd").addClass("disabled");
-                $(".exportAddSpan").html("正在导出...");
-
-                // 提交
-                $.ajax({
-                    type: 'POST',
-                    url: "/tidc/exportDTDFile/xlsx",
-                    dataType: 'binary',
-                    contentType: "application/json",
-                    data: JSON.stringify(aInfos),
-                    success: function(data){
-                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xlsx");
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    },
-                    error: function(xhr, type){
-                        alert('错误：TODO');
-
-                        $(".exportAdd").removeClass("disabled");
-                        $(".exportAddSpan").html(" 导出数据");
-                    }
-                });
-            });
-        }
-
-
-    }
+/**
+ * 主类（v2_2版本）。
+ */
+var Main_v2_2 = function() {
+
+    var _paramObj; // 参数对象
+
+    return {
+        /**
+         * 使用发车间隔策略生成时刻表。
+         * @param paramObj 参数对象
+         * @param lpArray 路牌数组
+         * @constructor
+         */
+        BXPplaceClassesTime03 : function(paramObj, lpArray) {
+            // 参数对象
+            _paramObj = paramObj;
+
+            // // 测试行驶时间
+            // var _fcsj = paramObj.toTimeObj("16:20");
+            // var _bcsj = StrategyUtils_v2_2.sFn("CALCU_RUNTIME")(false, _fcsj, paramObj); // 使用策略计算班次行驶时间
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",行驶时间=" + _bcsj);
+            //
+
+            // // 测试停站时间
+            // var _fcsj = paramObj.toTimeObj("05:30");
+            // var _layovertime = StrategyUtils_v2_2.sFn("CALCU_LAYOVER_TIME")(
+            //     _fcsj, false, StrategyUtils_v2_2.sFn("CALCU_RUNTIME"), paramObj);
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",停站layover时间=" + _layovertime);
+            //
+            // var schedule = {};
+
+            // // 测试间隔时间
+            // var _fcsj = paramObj.toTimeObj("07:30");
+            // var _headway = StrategyUtils_v2_2.sFn("CALCU_HEADWAY_2")(true, _fcsj, _paramObj);
+            // console.log("发车时间=" + _fcsj.format("HH:mm") + ",发车间隔=" + _headway);
+
+            // 1、初始化行车计划
+            var schedule = new InternalScheduleObj_v2_2(paramObj, lpArray);
+            // 2、生成班次（从第2圈开始）
+            schedule.fnCreateBclistWithMasterBc(2, 20);
+            // 3、调整发车间隔
+            schedule.fnAdjustHeadway();
+            // 4、计算吃饭班次
+            schedule.fnCalcuEatBc();
+            // // 6、计算末班车
+            // schedule.fnCalcuLastBc();
+            // 7、重新设置停站时间
+            schedule.fnReSetLayoverTime();
+            // 8、补进出场例保班次
+            schedule.fnCalcuOtherBc();
+
+            //-------------------- 输出ganut图上的班次，班型描述 ----------------------//
+            // TODO：班型再议
+            return {
+                'json':schedule.fnToGanttBcArray(),'bxrcgs':null,
+                'aInternalLpObj': schedule.fnGetLpArray()
+            };
+        },
+
+        //----------------------------------- 导入导出配置 -----------------------------------//
+
+        /**
+         * 导出时刻表配置。
+         * @param fnGetGanttBc 获取gantt班次方法
+         */
+        exportExcelConfig: function(fnGetGanttBc) {
+            var oExcel = new Main_v2_2_ExcelObj(_paramObj, fnGetGanttBc);
+
+            $('.exportAddXls').off('click');
+            $('.exportAddXlsx').off('click');
+
+            $('.exportAddXls').on('click', function() {
+
+                var aInfos = {
+                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
+                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
+                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
+                };
+
+                console.log(aInfos);
+
+                $(".exportAdd").addClass("disabled");
+                $(".exportAddSpan").html("正在导出...");
+
+                // 提交
+                $.ajax({
+                    type: 'POST',
+                    url: "/tidc/exportDTDFile/xls",
+                    dataType: 'binary',
+                    contentType: "application/json",
+                    data: JSON.stringify(aInfos),
+                    success: function(data){
+                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xls");
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    },
+                    error: function(xhr, type){
+                        alert('错误：TODO');
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    }
+                });
+            });
+
+            $('.exportAddXlsx').on('click', function() {
+                var aInfos = {
+                    "lpObjList": oExcel.fnGetLpBcInfoList(), // 路牌班次信息列表
+                    "statInfoList": oExcel.fnGetStatInfoList(), // 统计项目列表
+                    "parameterInfoList" : oExcel.fnGetParamInfoList() // 参数对象
+                };
+
+                console.log(aInfos);
+
+                $(".exportAdd").addClass("disabled");
+                $(".exportAddSpan").html("正在导出...");
+
+                // 提交
+                $.ajax({
+                    type: 'POST',
+                    url: "/tidc/exportDTDFile/xlsx",
+                    dataType: 'binary',
+                    contentType: "application/json",
+                    data: JSON.stringify(aInfos),
+                    success: function(data){
+                        oExcel.downloadFile(data, "application/octet-stream", "时刻表信息.xlsx");
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    },
+                    error: function(xhr, type){
+                        alert('错误：TODO');
+
+                        $(".exportAdd").removeClass("disabled");
+                        $(".exportAddSpan").html(" 导出数据");
+                    }
+                });
+            });
+        }
+
+
+    }
 }();
 \ No newline at end of file
+<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
@@ -149,6 +149,7 @@
 									<option value="2">一车多单</option>
 									<option value="3">有加油没里程</option>
 									<option value="4">有里程没加油</option>
+									<option value="5">跨分工用车</option>
 								</select>
 							</div>
  
@@ -547,6 +548,8 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 		            	 }else{
 		            		 var params2 = {};
 		             		params2['ylbList']=JSON.stringify(ylArray2);
+		             		params2['fgsbm']=$("#ylbListFgsdmId").val();
+
 		             		 var i = layer.load(2);
 		             		//保存操作
 		               	 	 $post('/ylb/saveYlbList', params, function () {
@@ -659,11 +662,17 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         $('tr.filter .filter-submit').on('click', function () {
         	 var ylbGsdm=$("#ylbListGsdmId").val();
      		var ylbFgsdm=$("#ylbListFgsdmId").val();
+     		var nbbm=$("#nbbm").val();
             if ($("#rq").val() == "" || $("#rq").val() ==null){
             	  layer.msg('请选择日期.');
-            }else if(ylbGsdm=="" || ylbGsdm==null || ylbFgsdm=="" ||ylbFgsdm==null){
-            	 layer.msg('请选择公司和分公司.');
-            }else {
+            }else if(ylbGsdm=="" || ylbGsdm==null){
+//             	 || ylbFgsdm=="" 
+            	 layer.msg('请选择公司');
+            }
+            /* else if( (ylbFgsdm==""||ylbFgsdm==null)  && (nbbm=="" || nbbm==null) ){
+            	layer.msg('不选择分公司处理输入车辆自编号');
+            } */
+            else {
             	 var params = getParamsList();
                 page = 0;
                 jsDoQuery(params, true);
@@ -697,6 +706,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
     				}
     			}
     		}
+			options += '<option value="">全部分公司</option>';
     		$('#ylbListFgsdmId').html(options);
     		initXl();
     		initCl();
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <link rel="stylesheet" href="/assets/plugins/ztree_v3/css/zTreeStyle/zTreeStyle.css" />
-    <style>
-        html,body{
-            height: 100%;
-        }
-        .ct_page{
-            padding: 25px 15px;
-            height: 100%;
-            height: calc(100% - 50px);
-        }
-
-        .ct_cont{
-            height: calc(100% - 41px);
-        }
-
-        .ct_cont>div>div.uk-card{
-            height: 99%;
-        }
-
-        form .uk-inline{
-            width: calc(100% - 4px);
-            margin-left: 2px;
-        }
-
-        .ct-card-body{
-            overflow: auto;
-            padding: 1px 1px 0 2px;
-            height: calc(100% - 54px);
-            position: relative;
-            margin-top: -12px;
-        }
-
-        .ct_li_desc{
-            color: #a8a8a8;
-            font-size: 13px;
-        }
-
-        .ct-card-body .uk-list-large{
-            font-size: 14px;
-        }
-
-        .ct-card-body .uk-list-large>li{
-            cursor: default;
-            padding-left: 20px;
-            margin-top: 2px !important;
-            padding-top: 17px !important;
-            position: relative;
-        }
-
-        .ct-card-body .uk-list-large>li:hover{
-            background: #edecec;
-        }
-
-        .ct-card-body .uk-list-large>li.active{
-            background: #1e87f0 !important;
-            color: white;
-        }
-
-        .ct-card-body .uk-list-large>li.active>span.role-code{
-            color: #ffffff;
-        }
-
-        .ct-card-body .uk-list-large.role-list>li:hover{
-            background: #fff494;
-        }
-
-        .ct-card-body .uk-list-large>li.active .ct_li_desc{
-            color: #e6e6e6;
-        }
-
-        .ct-card-body .uk-list-large>li>span.uk-badge{
-            position: absolute;
-            top: 17px;
-            right: 25px;
-        }
-
-        .ct-card-body .uk-list-large>li>span.role-code{
-            padding: 4px 6px;
-            color: #a8a8a8;
-            margin-left: 5px;
-        }
-
-        .top_title{
-            padding: 9px 0 5px 15px;
-            border-bottom: 1px solid #ededed;
-            border-left: 5px solid #FFC107;
-        }
-
-        .top_title>.desc{
-            font-size: 13px;
-            color: grey;
-            margin-top: 3px;
-        }
-
-        .left_menu_list{
-            overflow: auto;
-            position: relative;
-        }
-
-        .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
-            opacity: 0.6 !important;
-            padding: 0 !important;
-        }
-
-        ._company{
-            margin: 15px 0px;
-        }
-        ._company>h5{
-            margin-bottom: 10px;
-            font-size: 15px;
-            color: #6b6b6b;
-            text-indent: 12px;
-        }
-        ._company>._fgs>label{
-            padding: 3px 12px 3px 10px;
-            display: inline-block;
-            border: 1px solid gainsboro;
-            border-radius: 2px;
-            margin: 5px;
-            font-size: 14px;
-        }
-        ._company>._fgs>label.active{
-            background: #1e87f0;
-            color: #fff;
-        }
-        ._company .uk-checkbox:checked:focus,
-        .line_checkbox_list .uk-checkbox:checked:focus{
-            background-color: #1e87f0 !important;
-        }
-        .save_icon{
-            position: absolute;
-            right: 2px;
-            background: #bec4c9;
-            font-size: 12px;
-            padding: 2px 15px;
-            color: #fff;
-            box-shadow: 0 5px 15px rgba(0,0,0,0.08);
-            cursor: pointer;
-        }
-        .save_icon:hover{
-            background: #FFC107;
-        }
-        .data_auth_list{
-            position: relative;
-        }
-        #user_authorize_wrap .top_title{
-            border-left: 5px solid #cacac8;
-        }
-        .xd_line_list{
-            height: 37%;
-            padding: 7px;
-            border-bottom: 1px solid #f2f2f2;
-            overflow: auto;
-            position: relative;
-        }
-        .xd_line_list>h5{
-            color: #858585;
-            margin: 5px 5px 5px 0;
-            font-size: 14px;
-        }
-        .sub_lines{
-            padding-left: 15px;
-        }
-        .sub_lines>span.line_btn {
-            background: #00BCD4;
-            color: #fff;
-            padding: 4px 9px;
-            display: inline-block;
-            min-width: 68px;
-            text-align: center;
-            margin: 5px 2px;
-            box-shadow: 0 5px 9px rgba(0,0,0,0.08);
-            cursor: pointer;
-            font-size: 14px;
-            font-family: 微软雅黑;
-        }
-
-        .sub_lines>span.line_btn.destroy{
-            background: #ff5c5c;
-        }
-
-        .sub_lines>span.line_btn.destroy:hover{
-            background: #ff7373;
-        }
-
-        .sub_lines>span.line_btn:hover{
-            background: #2dd7ed;
-        }
-        .add_line_icon{
-            cursor: pointer;
-            padding: 2px 5px;
-            border-radius: 5px;
-            display: inline-block;
-        }
-        .add_line_icon>i{
-            vertical-align: top;
-            margin-top: 3px;
-        }
-        .add_line_icon:hover{
-            background: #ededed;
-        }
-        .ct_pattern_form{
-            display: inline-block;
-        }
-        .xd_menu_grid{
-            padding: 25px 25px 0 25px;
-            height: calc(63% - 91px);
-        }
-        .xd_menu_grid .uk-list{
-            border: 1px solid #ededed;
-            height: calc(100% - 70px);
-            overflow: auto;
-            position: relative;
-        }
-
-        .xd_menu_grid .uk-list>li{
-            margin: 5px 0 !important;
-            padding: 10px 0 0 10px !important;
-            font-size: 14px;
-        }
-        .top_tools{
-            position: absolute;
-            top: 15px;
-            right: 25px;
-        }
-        .ct_field {
-            display: inline-block;
-            width: 240px;
-        }
-        .ct_field>select,.ct_field>input{
-            width: calc(100% - 60px);
-        }
-        .line_checkbox_list{
-            margin-top: 15px;
-        }
-        .line_checkbox_list>.btn{
-            padding: 5px 7px;
-            border-radius: 2px;
-            display: inline-block;
-            margin: 4px 9px;
-            font-size: 14px;
-            font-family: 微软雅黑;
-            border: 1px solid #d9d9d9;
-            width: 100px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            white-space: nowrap;
-        }
-        .line_checkbox_list>.btn>input{
-            margin-right: 5px;
-        }
-        .line_checkbox_list>.btn.active{
-            background: #1e87f0;
-            color: #fff;
-        }
-
-        .line_checkbox_list>.btn.destroy,
-        .line_checkbox_list>.btn.destroy>input{
-            border-color: #ff9595;
-            color: #ff5c5c;
-        }
-
-        .line_checkbox_list>.btn.destroy.active{
-            background: #ff5c5c;
-            color: #fff;
-        }
-
-        .line_checkbox_list>.btn.destroy.active>input{
-            background-color: #ff5c5c !important;
-            border-color: #ff5c5c !important;
-        }
-
-        #role_authorize_wrap .ztree *{
-            font-size: 14px;
-        }
-        #role_authorize_wrap .ztree li{
-            line-height: 21px;
-        }
-        .loading{
-            height: 100%;
-            text-align: center;
-        }
-        .loading .uk-spinner{
-            margin-top: 200px;
-        }
-        .loading circle{
-            stroke: red;
-        }
-
-        #select_line_modal .uk-checkbox:checked {
-            background-color: #1e87f0;
-        }
-    </style>
-</head>
-
-<body>
-<div class="loading">
-    <div uk-spinner></div>
-</div>
-<div class="ct_page" style="display: none;">
-    <h2 class="uk-heading-line uk-heading-bullet"><span>用户授权管理</span></h2>
-    <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid>
-        <div class="role_list uk-width-1-4 ">
-            <div class="uk-card uk-card-default">
-                <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>
-
-                <div class="ct-card-body" >
-                    <ul class="uk-list uk-list-large uk-list-divider role-list">
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="user_list uk-width-1-5 ">
-            <div class="uk-card uk-card-default">
-                <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>
-
-                <div class="ct-card-body">
-                    <ul class="uk-list uk-list-large user-list">
-                    </ul>
-                </div>
-            </div>
-        </div>
-        <div class="auth_cont ">
-            <div class="uk-card uk-card-default authorize_right_cont">
-
-            </div>
-        </div>
-    </div>
-</div>
-
-<script id="authorize-role-list-temp" 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>
-    {{/each}}
-</script>
-<script id="authorize-user-list-temp" 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}}
-</script>
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/js/common.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
-<script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
-<script>
-    var storage = window.localStorage;
-
-    if (typeof String.prototype.startsWith != 'function') {
-        String.prototype.startsWith = function (prefix){
-            return this.slice(0, prefix.length) === prefix;
-        };
-    }
-    var roles,users,role_users,modules,companyData,lineArray;
-
-    var ep = EventProxy.create('query_roles', 'query_users', 'query_modules', 'query_company', 'query_line', function (rs, us, ms, cs, lines) {
-        roles = rs;
-        users = us;
-        modules = ms;
-        companyData = cs;
-        lineArray=lines;
-        role_users = {};
-        debugger
-        for(var i=0,r;r=roles[i++];){
-            r.count=0;
-            role_users[r.id]=[];
-            r.createDateStr=moment(r.createDate).format('YYYY-MM-DD HH:ss');
-            r.codeUp=r.codeName.toUpperCase();
-            for(var j=0,u;u=users[j++];){
-                if(u.roles.indexOf(r.id)!=-1){
-                    r.count++;
-                    role_users[r.id].push(u);
-                }
-            }
-        }
-        //渲染角色list
-        render_role_list(roles);
-        //渲染用户list
-        render_user_list(users);
-
-        $('.loading').remove();
-        $('.ct_page').show();
-    });
-
-    //角色点击
-    $('ul.role-list').on('click', 'li', roleClickHanlder);
-    //用户点击
-    $('ul.user-list').on('click', 'li', userClickHanlder);
-
-
-    function roleClickHanlder() {
-        if($(this).hasClass('active') && $('ul.user-list>li.active').length==0)
-            return;
-
-        reset_dom();
-        $('ul.role-list>li.active').removeClass('active');
-        $(this).addClass('active');
-        //重新渲染用户list
-        var id = $(this).data('id');
-        render_user_list(role_users[id]);
-        //加载角色授权页面
-        $('.authorize_right_cont').load('/pages/permission/authorize_all/role_auth.html', function () {
-            $('#role_authorize_wrap', this).trigger('init', {role: get_role(id), modules: modules, companyData: companyData});
-        });
-    }
-
-    function userClickHanlder() {
-        if($(this).hasClass('active'))
-            return;
-
-        reset_dom();
-        $('ul.user-list>li.active').removeClass('active');
-        $(this).addClass('active');
-
-        //加载用户授权页面
-        var id = $(this).data('id');
-        $('.authorize_right_cont').load('/pages/permission/authorize_all/user_auth.html', function () {
-            $('#user_authorize_wrap', this).trigger('init', {user: get_user(id),lineArray:lineArray, companyData:companyData});
-        });
-    }
-
-    //refresh-user
-    $('.authorize_right_cont').on('refresh-user', function () {
-        $('ul.user-list>li.active').removeClass('active').trigger('click');
-    });
-
-    function reset_dom() {
-        $('#select_line_modal').remove();
-    }
-
-    //滚动条
-    $('.ct_page .uk-card .ct-card-body').perfectScrollbar({suppressScrollX: true});
-
-    //query all role
-    var paramsRole = {};
-    paramsRole['codeName'] = 'ROLE_ADMIN';
-    var userId=storage.getItem("editUser");
-    $get('/user',{id_eq:userId}, function (rs) {
-        debugger
-        //if (rs)
-        ep.emit('query_roles', rs.content[0].roles);
-    });
-
-
-    //query all user
-    var paramsUser = {};
-    paramsRole['name'] = 'name';
-    $.get('/user/all_distinct',paramsUser, function (rs) {
-        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');
-                userA[0]=u;
-            }
-        }
-        ep.emit('query_users', userA);
-    });
-
-    //query all modules
-    $.get('/module/all_distinct', function (rs) {
-        ep.emit('query_modules', rs);
-    });
-
-    //query all company data
-    $.get('/business/all', function (rs) {
-        ep.emit('query_company', rs);
-    });
-
-    //query all line
-    $.get('/line/all', {'remove_ne': 1}, function (rs) {
-        ep.emit('query_line', rs);
-    });
-
-    function discard_field(u) {
-        var array = [];
-        $.each(u.roles, function () {
-            array.push(this.id);
-        });
-        u.roles = array;
-    }
-
-    function render_role_list(list) {
-        var htmlStr = template('authorize-role-list-temp', {list: list});
-        $('ul.role-list').html(htmlStr);
-        up_scroll();
-    }
-
-
-    function render_user_list(list) {
-        var htmlStr = template('authorize-user-list-temp', {list: list});
-        $('ul.user-list').html(htmlStr);
-        up_scroll();
-    }
-
-    function reset_role_list(){
-        var actives = $('ul.role-list>li.active');
-        if(actives.length > 0){
-            $('ul.role-list>li.active').removeClass('active');
-            render_user_list(users);
-            $('.authorize_right_cont').empty();
-        }
-    }
-
-    function up_scroll() {
-        $('.ct_page .uk-card .ct-card-body').perfectScrollbar('update');
-    }
-
-
-
-    function get_role(id) {
-        for(var i=0,r;r=roles[i++];){
-            if(r.id==id)
-                return r;
-        }
-        return null;
-    }
-
-    function get_user(id) {
-        for(var i=0,u;u=users[i++];){
-            if(u.id==id)
-                return u;
-        }
-        return null;
-    }
-
-    $(document).on('submit', 'form', function () {
-        return false;
-    });
-
-    function convert_buss_data(rs) {
-        var baseCode;
-        //找到跟节点
-        $.each(rs, function () {
-            if(this.upCode == 0){
-                baseCode=this.businessCode;
-                return false;
-            }
-        });
-        if(!baseCode){
-            alert('大爷找不到根节点，数据有问题吧！！！');
-            return;
-        }
-        //提取二级节点
-        var secondMap={};
-        $.each(rs, function () {
-            if(this.upCode==baseCode){
-                secondMap[this.businessCode] = {
-                    name: this.businessName,
-                    childs: []
-                };
-            }
-        });
-        //分公司节点
-        $.each(rs, function () {
-            if(secondMap[this.upCode])
-                secondMap[this.upCode].childs.push(this);
-        });
-
-        //排序
-        for(var sid in secondMap){
-            secondMap[sid].childs.sort(naturalSort);
-        }
-
-        return secondMap;
-    }
-
-    var naturalSort=function (a, b) {
-        return a.businessName.localeCompare(b.businessName);
-    };
-
-    var groupBy = function (list, field) {
-        var rs = {},
-            key;
-        $.each(list, function () {
-            key = this[field];
-            if (!rs[key])
-                rs[key] = [];
-
-            rs[key].push(this);
-        });
-
-        return rs;
-    };
-</script>
-</body>
+<!--<!DOCTYPE html>-->
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+    <script src="/assets/js/common.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+    <script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+    <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"></script>
+    <!-- EventProxy  -->
+    <script src="/assets/js/eventproxy.js"></script>
+    <!-- art-template 模版引擎 -->
+    <script src="/assets/plugins/template.js"></script>
+    <script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.core.min.js"></script>
+    <script src="/assets/plugins/ztree_v3/js/jquery.ztree.excheck.min.js"></script>
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <link rel="stylesheet" href="/assets/plugins/ztree_v3/css/zTreeStyle/zTreeStyle.css" />
+    <style>
+    html,body{
+    height: 100%;
+    }
+    .ct_page{
+    padding: 25px 15px;
+    height: 100%;
+    height: calc(100% - 50px);
+    }
+
+    .ct_cont{
+    height: calc(100% - 41px);
+    }
+
+    .ct_cont>div>div.uk-card{
+    height: 99%;
+    }
+
+    form .uk-inline{
+    width: calc(100% - 4px);
+    margin-left: 2px;
+    }
+
+    .ct-card-body{
+    overflow: auto;
+    padding: 1px 1px 0 2px;
+    height: calc(100% - 54px);
+    position: relative;
+    margin-top: -12px;
+    }
+
+    .ct_li_desc{
+    color: #a8a8a8;
+    font-size: 13px;
+    }
+
+    .ct-card-body .uk-list-large{
+    font-size: 14px;
+    }
+
+    .ct-card-body .uk-list-large>li{
+    cursor: default;
+    padding-left: 20px;
+    margin-top: 2px !important;
+    padding-top: 17px !important;
+    position: relative;
+    }
+
+    .ct-card-body .uk-list-large>li:hover{
+    background: #edecec;
+    }
+
+    .ct-card-body .uk-list-large>li.active{
+    background: #1e87f0 !important;
+    color: white;
+    }
+
+    .ct-card-body .uk-list-large>li.active>span.role-code{
+    color: #ffffff;
+    }
+
+    .ct-card-body .uk-list-large.role-list>li:hover{
+    background: #fff494;
+    }
+
+    .ct-card-body .uk-list-large>li.active .ct_li_desc{
+    color: #e6e6e6;
+    }
+
+    .ct-card-body .uk-list-large>li>span.uk-badge{
+    position: absolute;
+    top: 17px;
+    right: 25px;
+    }
+
+    .ct-card-body .uk-list-large>li>span.role-code{
+    padding: 4px 6px;
+    color: #a8a8a8;
+    margin-left: 5px;
+    }
+
+    .top_title{
+    padding: 9px 0 5px 15px;
+    border-bottom: 1px solid #ededed;
+    border-left: 5px solid #FFC107;
+    }
+
+    .top_title>.desc{
+    font-size: 13px;
+    color: grey;
+    margin-top: 3px;
+    }
+
+    .left_menu_list{
+    overflow: auto;
+    position: relative;
+    }
+
+    .left_menu_list .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+    opacity: 0.6 !important;
+    padding: 0 !important;
+    }
+
+    ._company{
+    margin: 15px 0px;
+    }
+    ._company>h5{
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: #6b6b6b;
+    text-indent: 12px;
+    }
+    ._company>._fgs>label{
+    padding: 3px 12px 3px 10px;
+    display: inline-block;
+    border: 1px solid gainsboro;
+    border-radius: 2px;
+    margin: 5px;
+    font-size: 14px;
+    }
+    ._company>._fgs>label.active{
+    background: #1e87f0;
+    color: #fff;
+    }
+    ._company .uk-checkbox:checked:focus,
+    .line_checkbox_list .uk-checkbox:checked:focus{
+    background-color: #1e87f0 !important;
+    }
+    .save_icon{
+    position: absolute;
+    right: 2px;
+    background: #bec4c9;
+    font-size: 12px;
+    padding: 2px 15px;
+    color: #fff;
+    box-shadow: 0 5px 15px rgba(0,0,0,0.08);
+    cursor: pointer;
+    }
+    .save_icon:hover{
+    background: #FFC107;
+    }
+    .data_auth_list{
+    position: relative;
+    }
+    #user_authorize_wrap .top_title{
+    border-left: 5px solid #cacac8;
+    }
+    .xd_line_list{
+    height: 37%;
+    padding: 7px;
+    border-bottom: 1px solid #f2f2f2;
+    overflow: auto;
+    position: relative;
+    }
+    .xd_line_list>h5{
+    color: #858585;
+    margin: 5px 5px 5px 0;
+    font-size: 14px;
+    }
+    .sub_lines{
+    padding-left: 15px;
+    }
+    .sub_lines>span.line_btn {
+    background: #00BCD4;
+    color: #fff;
+    padding: 4px 9px;
+    display: inline-block;
+    min-width: 68px;
+    text-align: center;
+    margin: 5px 2px;
+    box-shadow: 0 5px 9px rgba(0,0,0,0.08);
+    cursor: pointer;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    }
+
+    .sub_lines>span.line_btn.destroy{
+    background: #ff5c5c;
+    }
+
+    .sub_lines>span.line_btn.destroy:hover{
+    background: #ff7373;
+    }
+
+    .sub_lines>span.line_btn:hover{
+    background: #2dd7ed;
+    }
+    .add_line_icon{
+    cursor: pointer;
+    padding: 2px 5px;
+    border-radius: 5px;
+    display: inline-block;
+    }
+    .add_line_icon>i{
+    vertical-align: top;
+    margin-top: 3px;
+    }
+    .add_line_icon:hover{
+    background: #ededed;
+    }
+    .ct_pattern_form{
+    display: inline-block;
+    }
+    .xd_menu_grid{
+    padding: 25px 25px 0 25px;
+    height: calc(63% - 91px);
+    }
+    .xd_menu_grid .uk-list{
+    border: 1px solid #ededed;
+    height: calc(100% - 70px);
+    overflow: auto;
+    position: relative;
+    }
+
+    .xd_menu_grid .uk-list>li{
+    margin: 5px 0 !important;
+    padding: 10px 0 0 10px !important;
+    font-size: 14px;
+    }
+    .top_tools{
+    position: absolute;
+    top: 15px;
+    right: 25px;
+    }
+    .ct_field {
+    display: inline-block;
+    width: 240px;
+    }
+    .ct_field>select,.ct_field>input{
+    width: calc(100% - 60px);
+    }
+    .line_checkbox_list{
+    margin-top: 15px;
+    }
+    .line_checkbox_list>.btn{
+    padding: 5px 7px;
+    border-radius: 2px;
+    display: inline-block;
+    margin: 4px 9px;
+    font-size: 14px;
+    font-family: 微软雅黑;
+    border: 1px solid #d9d9d9;
+    width: 100px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    }
+    .line_checkbox_list>.btn>input{
+    margin-right: 5px;
+    }
+    .line_checkbox_list>.btn.active{
+    background: #1e87f0;
+    color: #fff;
+    }
+
+    .line_checkbox_list>.btn.destroy,
+    .line_checkbox_list>.btn.destroy>input{
+    border-color: #ff9595;
+    color: #ff5c5c;
+    }
+
+    .line_checkbox_list>.btn.destroy.active{
+    background: #ff5c5c;
+    color: #fff;
+    }
+
+    .line_checkbox_list>.btn.destroy.active>input{
+    background-color: #ff5c5c !important;
+    border-color: #ff5c5c !important;
+    }
+
+    #role_authorize_wrap .ztree *{
+    font-size: 14px;
+    }
+    #role_authorize_wrap .ztree li{
+    line-height: 21px;
+    }
+    .loading{
+    height: 100%;
+    text-align: center;
+    }
+    .loading .uk-spinner{
+    margin-top: 200px;
+    }
+    .loading circle{
+    stroke: red;
+    }
+
+    #select_line_modal .uk-checkbox:checked {
+    background-color: #1e87f0;
+    }
+    </style>
+
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h2 class="uk-heading-line uk-heading-bullet"><span>用户授权管理</span></h2>
+    <div class="ct_cont uk-grid-small uk-child-width-expand" uk-grid>
+        <div class="role_list uk-width-1-4 ">
+            <div class="uk-card uk-card-default">
+                <form>
+                    <div class="uk-margin">
+                        <div class="uk-inline" >
+                        </div>
+                    </div>
+                </form>
+
+                <div class="ct-card-body" >
+                    <ul class="uk-list uk-list-large uk-list-divider role-list">
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="user_list uk-width-1-5 ">
+            <div class="uk-card uk-card-default">
+                <form>
+                    <div class="uk-margin">
+                        <div class="uk-inline" >
+                        </div>
+                    </div>
+                </form>
+
+                <div class="ct-card-body">
+                    <ul class="uk-list uk-list-large user-list">
+                    </ul>
+                </div>
+            </div>
+        </div>
+        <div class="auth_cont ">
+            <div class="uk-card uk-card-default authorize_right_cont">
+
+            </div>
+        </div>
+
+    </div>
+</div>
+
+<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>
+    {{/each}}
+</script>
+<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}}
+</script>
+<script>
+    var storage = window.localStorage;
+
+    if (typeof String.prototype.startsWith != 'function') {
+        String.prototype.startsWith = function (prefix){
+            return this.slice(0, prefix.length) === prefix;
+        };
+    }
+    var roles,users,role_users,modules,companyData,lineArray;
+
+    var ep = EventProxy.create('query_roles', 'query_users', 'query_modules', 'query_company', 'query_line', function (rs, us, ms, cs, lines) {
+        roles = rs;
+        users = us;
+        modules = ms;
+        companyData = cs;
+        lineArray=lines;
+        role_users = {};
+        debugger
+        for(var i=0,r;r=roles[i++];){
+            r.count=0;
+            role_users[r.id]=[];
+            r.createDateStr=moment(r.createDate).format('YYYY-MM-DD HH:ss');
+            r.codeUp=r.codeName.toUpperCase();
+            for(var j=0,u;u=users[j++];){
+                if(u.roles.indexOf(r.id)!=-1){
+                    r.count++;
+                    role_users[r.id].push(u);
+                }
+            }
+        }
+        //渲染角色list
+        render_role_list(roles);
+        //渲染用户list
+        render_user_list(users);
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    //角色点击
+    $('ul.role-list').on('click', 'li', roleClickHanlder);
+    //用户点击
+    $('ul.user-list').on('click', 'li', userClickHanlder);
+
+
+    function roleClickHanlder() {
+        if($(this).hasClass('active') && $('ul.user-list>li.active').length==0)
+            return;
+
+        reset_dom();
+        $('ul.role-list>li.active').removeClass('active');
+        $(this).addClass('active');
+        //重新渲染用户list
+        var id = $(this).data('id');
+        render_user_list(role_users[id]);
+        //加载角色授权页面
+        $('.authorize_right_cont').load('/pages/permission/authorize_all/role_auth.html', function () {
+            $('#role_authorize_wrap', this).trigger('init', {role: get_role(id), modules: modules, companyData: companyData});
+        });
+    }
+
+    function userClickHanlder() {
+        if($(this).hasClass('active'))
+            return;
+
+        reset_dom();
+        $('ul.user-list>li.active').removeClass('active');
+        $(this).addClass('active');
+
+        //加载用户授权页面
+        var id = $(this).data('id');
+        $('.authorize_right_cont').load('/pages/permission/authorize_all/user_auth.html', function () {
+            $('#user_authorize_wrap', this).trigger('init', {user: get_user(id),lineArray:lineArray, companyData:companyData});
+        });
+    }
+
+    //refresh-user
+    $('.authorize_right_cont').on('refresh-user', function () {
+        $('ul.user-list>li.active').removeClass('active').trigger('click');
+    });
+
+    function reset_dom() {
+        $('#select_line_modal').remove();
+    }
+
+    //滚动条
+    $('.ct_page .uk-card .ct-card-body').perfectScrollbar({suppressScrollX: true});
+
+    //query all role
+    var paramsRole = {};
+    paramsRole['codeName'] = 'ROLE_ADMIN';
+    var userId=storage.getItem("editUser");
+    $get('/user',{id_eq:userId}, function (rs) {
+        ep.emit('query_roles', rs.content[0].roles);
+    });
+
+
+    //query all user
+    var paramsUser = {};
+    paramsRole['name'] = 'name';
+    $.get('/user/all_distinct',paramsUser, function (rs) {
+        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');
+                userA[0]=u;
+            }
+        }
+        ep.emit('query_users', userA);
+    });
+
+    //query all modules
+    $.get('/module/all_distinct', function (rs) {
+        ep.emit('query_modules', rs);
+    });
+
+    //query all company data
+    $.get('/business/all', function (rs) {
+        ep.emit('query_company', rs);
+    });
+
+    //query all line
+    $.get('/line/all', {'remove_ne': 1}, function (rs) {
+        ep.emit('query_line', rs);
+    });
+
+    function discard_field(u) {
+        var array = [];
+        $.each(u.roles, function () {
+            array.push(this.id);
+        });
+        u.roles = array;
+    }
+
+    function render_role_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-temp1', {list: list});
+        $('ul.user-list').html(htmlStr);
+        up_scroll();
+    }
+
+    function reset_role_list(){
+        var actives = $('ul.role-list>li.active');
+        if(actives.length > 0){
+            $('ul.role-list>li.active').removeClass('active');
+            render_user_list(users);
+            $('.authorize_right_cont').empty();
+        }
+    }
+
+    function up_scroll() {
+        $('.ct_page .uk-card .ct-card-body').perfectScrollbar('update');
+    }
+
+
+
+    function get_role(id) {
+        for(var i=0,r;r=roles[i++];){
+            if(r.id==id)
+                return r;
+        }
+        return null;
+    }
+
+    function get_user(id) {
+        for(var i=0,u;u=users[i++];){
+            if(u.id==id)
+                return u;
+        }
+        return null;
+    }
+
+    $(document).on('submit', 'form', function () {
+        return false;
+    });
+
+    function convert_buss_data(rs) {
+        var baseCode;
+        //找到跟节点
+        $.each(rs, function () {
+            if(this.upCode == 0){
+                baseCode=this.businessCode;
+                return false;
+            }
+        });
+        if(!baseCode){
+            alert('大爷找不到根节点，数据有问题吧！！！');
+            return;
+        }
+        //提取二级节点
+        var secondMap={};
+        $.each(rs, function () {
+            if(this.upCode==baseCode){
+                secondMap[this.businessCode] = {
+                    name: this.businessName,
+                    childs: []
+                };
+            }
+        });
+        //分公司节点
+        $.each(rs, function () {
+            if(secondMap[this.upCode])
+                secondMap[this.upCode].childs.push(this);
+        });
+
+        //排序
+        for(var sid in secondMap){
+            secondMap[sid].childs.sort(naturalSort);
+        }
+
+        return secondMap;
+    }
+
+    var naturalSort=function (a, b) {
+        return a.businessName.localeCompare(b.businessName);
+    };
+
+    var groupBy = function (list, field) {
+        var rs = {},
+            key;
+        $.each(list, function () {
+            key = this[field];
+            if (!rs[key])
+                rs[key] = [];
+
+            rs[key].push(this);
+        });
+
+        return rs;
+    };
+</script>
+</body>
 </html>
 \ No newline at end of file
-<iframe src="authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
+<iframe src="/pages/permission/user/authorize.html?origin=real_control_iframe" frameborder="0" style="height: 90%;width: 100%;"></iframe>
 <div class="form-actions">
     <div class="row">
         <div class="col-md-offset-3 col-md-4">
-            <!--<a href="main.html" class="btn green" ><i class="fa fa-check"></i> 上一步</a>-->
-            <!--<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>-->
-            <!--<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>-->
         </div>
     </div>
 </div>
 \ No newline at end of file
-/* 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