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

into pudong

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control
into pudong
廖磊
2 parents c9c64ac7 8f6b2e0f
Showing 66 changed files with 5375 additions and 2058 deletions
src/main/java/com/bsth/controller/LineVersionsController.java
src/main/java/com/bsth/controller/SectionController.java
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/data/utils/ListFilterUtils.java
src/main/java/com/bsth/data/utils/ListPageQueryUtils.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/entity/LsSectionRoute.java
src/main/java/com/bsth/entity/LsStationRoute.java
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/repository/LineVersionsRepository.java
src/main/java/com/bsth/repository/LsSectionRouteRepository.java
src/main/java/com/bsth/repository/LsStationRouteRepository.java
src/main/java/com/bsth/repository/SectionRouteRepository.java
src/main/java/com/bsth/repository/StationRouteRepository.java
src/main/java/com/bsth/service/LineVersionsService.java
src/main/java/com/bsth/service/SectionRouteService.java
src/main/java/com/bsth/service/SectionService.java
src/main/java/com/bsth/service/StationRouteService.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
+package com.bsth.controller;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.bsth.data.LineVersionsData;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.service.LineVersionsService;
+
+/**
+ * 
+ * @ClassName: LineController(线路版本控制器)
+ * 
+ * @Extends : BaseController
+ * 
+ * @Description: TODO(线路版本版控制层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@RestController
+@RequestMapping("lineVersions")
+public class LineVersionsController extends BaseController<LineVersions, Integer> {
+	
+	@Autowired
+	private LineVersionsService service;
+	
+	@Autowired
+	LineRepository lineRepository;
+	  @Autowired
+	    LsStationRouteRepository  lsStationRouteRepository ;
+	/**
+	 * 获取线路所有版本
+	 * 
+	 */
+	@RequestMapping(value = "findByLineId", method = RequestMethod.GET)
+	public List<LineVersions> getLineCode(@RequestParam(defaultValue = "lineId") int lineId) {
+		return service.findByLineCode(lineId);
+	}
+	
+	/**
+	 * 根据id查询线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "findById", method = RequestMethod.GET)
+	public LineVersions findOne(@RequestParam(defaultValue = "id") int id) {
+		service.lineUpdate();
+		return service.findById(id);
+	}
+	
+	/**
+	 * 根据id修改线路版本信息
+	 * 
+	 */
+	@RequestMapping(value = "update", method = RequestMethod.POST)
+	public Map<String, Object> update(@RequestParam Map<String, Object> map) {
+		return service.update(map);
+	}
+	
+	@RequestMapping(value = "add", method = RequestMethod.POST)
+	public Map<String, Object> add(@RequestParam Map<String, Object> map) {
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		
+		LineVersions lineVersions = new LineVersions();
+		try {
+			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
+			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
+			Line line = lineRepository.findOne(Integer.valueOf(map.get("lineId").toString())); 
+			lineVersions.setLine(line);
+			lineVersions.setLineCode(map.get("lineCode").toString());
+			lineVersions.setStartDate(new java.sql.Date(startDate.getTime()));
+			lineVersions.setEndDate(new java.sql.Date(endDate.getTime()));
+			lineVersions.setVersions(Integer.valueOf(map.get("versions").toString()));
+			lineVersions.setStatus(Integer.valueOf(map.get("status").toString()));
+			lineVersions.setRemark(map.get("remark").toString());
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		return service.save(lineVersions);
+	}
+	
+}
@@ -74,6 +74,24 @@ public class SectionController extends BaseController&lt;Section, Integer&gt; {
 	}
  
 	/**
+	 * @Description :TODO(编辑线路走向保存到线路历史表)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@RequestMapping(value="sectionCutSaveLineLS" , method = RequestMethod.POST)
+	public Map<String, Object> sectionCutSaveLineLS(@RequestParam Map<String, Object> map) {
+		
+		map.put("updateBy", "");
+		
+		map.put("createBy", "");
+		
+		return service.sectionCutSaveLineLS(map);
+		
+	}
+	
+	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
 	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+package com.bsth.data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+import com.bsth.entity.LineVersions;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.StationRouteService;
+
+/**
+ * @ClassName: LineVersionsData
+ * @Description: TODO(线路版本数据管理)
+ */
+@Component
+@Order(20)
+public class LineVersionsData implements CommandLineRunner {
+
+    static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
+
+
+    @Autowired
+    LineVersionsService lineVersionsService;
+    
+    @Autowired
+    StationRouteService stationRouteService;
+
+    @Override
+    public void run(String... arg0) throws Exception {
+    	
+    	
+    	try {
+    		List<LineVersions> list = lineVersionsService.lineUpdate();
+    		for (LineVersions lineVersions : list) {
+        		Integer lineId = lineVersions.getLine().getId();
+        		// 更新线路文件
+    			Map<String, Object> map = new HashMap<>();
+    			map.put("lineId", lineId);
+    			stationRouteService.usingSingle(map);
+    		}
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    }
+}
-package com.bsth.data.utils;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 集合搜索过滤
- * Created by panzhao on 2017/8/2.
- */
-public class ListFilterUtils {
-
-    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
-
-    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
-        List rs = new ArrayList();
-        Field[] fields = clazz.getDeclaredFields();
-
-        //参与过滤的字段
-        List<Field> fs = new ArrayList<>();
-        for (Field f : fields) {
-            f.setAccessible(true);
-            if (map.containsKey(f.getName()))
-                fs.add(f);
-        }
-
-        //过滤数据
-        for (Object obj : all) {
-            if (fieldEquals(fs, obj, map))
-                rs.add(obj);
-        }
-        return rs;
-    }
-
-    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
-        try {
-            for (Field f : fs) {
-                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
-                    continue;
-
-                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
-                    return false;
-            }
-        } catch (Exception e) {
-            logger.error("", e);
-            return false;
-        }
-        return true;
-    }
-}
+package com.bsth.data.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 集合搜索过滤
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListFilterUtils {
+
+    static Logger logger = LoggerFactory.getLogger(ListFilterUtils.class);
+
+    public static List filter(Collection all, Map<String, Object> map, Class clazz) {
+        List rs = new ArrayList();
+        Field[] fields = clazz.getDeclaredFields();
+
+        //参与过滤的字段
+        List<Field> fs = new ArrayList<>();
+        for (Field f : fields) {
+            f.setAccessible(true);
+            if (map.containsKey(f.getName()))
+                fs.add(f);
+        }
+
+        //过滤数据
+        for (Object obj : all) {
+            if (fieldEquals(fs, obj, map))
+                rs.add(obj);
+        }
+        return rs;
+    }
+
+    public static boolean fieldEquals(List<Field> fs, Object obj, Map<String, Object> map) {
+        try {
+            for (Field f : fs) {
+                if (StringUtils.isEmpty(map.get(f.getName()).toString()))
+                    continue;
+
+                if (f.get(obj) == null || f.get(obj).toString().indexOf(map.get(f.getName()).toString()) == -1)
+                    return false;
+            }
+        } catch (Exception e) {
+            logger.error("", e);
+            return false;
+        }
+        return true;
+    }
+}
-package com.bsth.data.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 集合分页工具
- * Created by panzhao on 2017/8/2.
- */
-public class ListPageQueryUtils {
-
-    public static List paging(List all, int page, int pageSize) {
-        List rs = new ArrayList(pageSize);
-
-        int s = page * pageSize;
-        int e = (page + 1) * pageSize;
-
-        int size = all.size();
-
-        if (e > size)
-            e = size;
-
-        if (s > size)
-            return rs;
-
-        for (; s < e; s++) {
-            rs.add(all.get(s));
-        }
-        return rs;
-    }
-}
+package com.bsth.data.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 集合分页工具
+ * Created by panzhao on 2017/8/2.
+ */
+public class ListPageQueryUtils {
+
+    public static List paging(List all, int page, int pageSize) {
+        List rs = new ArrayList(pageSize);
+
+        int s = page * pageSize;
+        int e = (page + 1) * pageSize;
+
+        int size = all.size();
+
+        if (e > size)
+            e = size;
+
+        if (s > size)
+            return rs;
+
+        for (; s < e; s++) {
+            rs.add(all.get(s));
+        }
+        return rs;
+    }
+}
+package com.bsth.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName: LineVersions(线路版本实体类)
+ * 
+ * @Description: TODO(线路版本)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_line_versions")
+public class LineVersions{
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	/** ID 主键(唯一标识符) int length(11) */
+	private Integer id;
+	
+	/** 线路ID  int length(11) */
+	@ManyToOne
+	private Line line;
+	
+	/** 线路编码 varchar length(50) */ 
+	private String lineCode;
+
+	/** 版本号  int length(11)  */
+	private int versions;
+	
+	/** 启用日期 timestamp  */
+	private Date startDate;
+	
+	/** 终止日期 timestamp  */
+	private Date endDate;
+	
+	/** 创建日期 timestamp  */
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	/** 修改日期 timestamp */
+	@Column(name = "update_date", columnDefinition = "TIMESTAMP  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+
+	/** 备注 varchar length(50) */ 
+	private String remark;
+	
+	/** 版本状态 int length(11)
+	 *  0（历史版本），1（当前版本），2（待更新版本）
+	 */ 
+	private int status;
+	
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public int getVersions() {
+		return versions;
+	}
+
+	public void setVersions(int versions) {
+		this.versions = versions;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public Date getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(Date endDate) {
+		this.endDate = endDate;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public String getRemark() {
+		return remark;
+	}
+	
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public void setStatus(int status) {
+		this.status = status;
+	}
+	
+}
 \ No newline at end of file
+package com.bsth.entity;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+
+/**
+ * 
+ * @ClassName : SectionRoute(历史路段路由实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(历史路段路由)
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_ls_sectionroute")
+public class LsSectionRoute {
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 路段路由序号
+	private Integer sectionrouteCode;
+	
+	// 线路编号
+	private String lineCode;
+	
+	// 路段编号
+	private String sectionCode;
+	
+	// 路段路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	/** 是否有路段限速数据  <0：分段；1：未分段>*/
+	private Integer isRoadeSpeed;
+	
+	// 描述
+	private String descriptions;
+		
+	// 创建人
+	private Integer createBy;
+	
+	// 修改人
+	private Integer updateBy;
+		
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+		
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+		
+	// 路段信息
+	@OneToOne
+	private Section section;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+	
+	public Integer getIsRoadeSpeed() {
+		return isRoadeSpeed;
+	}
+
+	public void setIsRoadeSpeed(Integer isRoadeSpeed) {
+		this.isRoadeSpeed = isRoadeSpeed;
+	}
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getSectionrouteCode() {
+		return sectionrouteCode;
+	}
+
+	public void setSectionrouteCode(Integer sectionrouteCode) {
+		this.sectionrouteCode = sectionrouteCode;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getSectionCode() {
+		return sectionCode;
+	}
+
+	public void setSectionCode(String sectionCode) {
+		this.sectionCode = sectionCode;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+	
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Integer createBy) {
+		this.createBy = createBy;
+	}
+
+	public Integer getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Integer updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public Section getSection() {
+		return section;
+	}
+
+	public void setSection(Section section) {
+		this.section = section;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
+package com.bsth.entity;
+
+import javax.persistence.*;
+import java.util.Date;
+
+/**
+ * 
+ * @ClassName : StationRoute(历史站点路由实体类)
+ * 
+ * @Author : bsth@lq
+ * 
+ * @Description : TODO(历史站点路由)
+ *	
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Entity
+@Table(name = "bsth_c_ls_stationroute")
+@NamedEntityGraphs({
+    @NamedEntityGraph(name = "ls_stationRoute_station", attributeNodes = {
+            @NamedAttributeNode("station"),
+            @NamedAttributeNode("line")
+    })
+})
+public class LsStationRoute {
+	
+	//站点路由ID
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	private Integer id;
+	
+	// 站点路由序号
+	private Integer stationRouteCode;
+	
+	// 站点编码
+	private String stationCode;
+	
+	// 站点名称
+	private String stationName;
+	
+	// 线路编码
+	private String lineCode;
+	
+	/**
+	 * 站点类型
+	 * 
+	 * ------ B：起点站
+	 * 
+	 * ------ Z：中途站
+	 * 
+	 * ------ E：终点站
+	 * 
+	 * ------ T：停车场
+	 * 
+	 */
+	private String stationMark;
+	
+	// 站点路由出站序号
+	private Integer outStationNmber;
+	
+	// 站点路由到站距离
+	private Double distances;
+	
+	// 站点路由到站时间
+	private Double toTime;
+	
+	// 首班时间
+	private String firstTime;
+	
+	// 末班时间
+	private String endTime;
+	
+	// 站点路由方向
+	private Integer directions;
+	
+	// 版本号
+	private Integer versions;
+	
+	// 是否撤销
+	private Integer destroy;
+	
+	// 描述
+	private String descriptions;
+	
+	// 创建人
+	private Integer createBy;
+		
+	// 修改人
+	private Integer updateBy;
+	
+	// 创建日期
+	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+	private Date createDate;
+	
+	// 修改日期
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
+	
+	// 站点信息
+	@ManyToOne(fetch = FetchType.LAZY)
+	private Station station;
+	
+	// 线路信息
+	@ManyToOne
+	private Line line;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getStationRouteCode() {
+		return stationRouteCode;
+	}
+
+	public void setStationRouteCode(Integer stationRouteCode) {
+		this.stationRouteCode = stationRouteCode;
+	}
+
+	public String getStationCode() {
+		return stationCode;
+	}
+
+	public void setStationCode(String stationCode) {
+		this.stationCode = stationCode;
+	}
+
+	public String getStationName() {
+		return stationName;
+	}
+
+	public void setStationName(String stationName) {
+		this.stationName = stationName;
+	}
+
+	public String getLineCode() {
+		return lineCode;
+	}
+
+	public void setLineCode(String lineCode) {
+		this.lineCode = lineCode;
+	}
+
+	public String getStationMark() {
+		return stationMark;
+	}
+
+	public void setStationMark(String stationMark) {
+		this.stationMark = stationMark;
+	}
+
+	public Integer getOutStationNmber() {
+		return outStationNmber;
+	}
+
+	public void setOutStationNmber(Integer outStationNmber) {
+		this.outStationNmber = outStationNmber;
+	}
+
+	public Double getDistances() {
+		return distances;
+	}
+
+	public void setDistances(Double distances) {
+		this.distances = distances;
+	}
+
+	public Double getToTime() {
+		return toTime;
+	}
+
+	public void setToTime(Double toTime) {
+		this.toTime = toTime;
+	}
+
+	public String getFirstTime() {
+		return firstTime;
+	}
+
+	public void setFirstTime(String firstTime) {
+		this.firstTime = firstTime;
+	}
+
+	public String getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+
+	public Integer getDirections() {
+		return directions;
+	}
+
+	public void setDirections(Integer directions) {
+		this.directions = directions;
+	}
+	
+	public Integer getVersions() {
+		return versions;
+	}
+
+	public void setVersions(Integer versions) {
+		this.versions = versions;
+	}
+	
+	public Integer getDestroy() {
+		return destroy;
+	}
+
+	public void setDestroy(Integer destroy) {
+		this.destroy = destroy;
+	}
+
+	public String getDescriptions() {
+		return descriptions;
+	}
+
+	public void setDescriptions(String descriptions) {
+		this.descriptions = descriptions;
+	}
+
+	public Integer getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(Integer createBy) {
+		this.createBy = createBy;
+	}
+
+	public Integer getUpdateBy() {
+		return updateBy;
+	}
+
+	public void setUpdateBy(Integer updateBy) {
+		this.updateBy = updateBy;
+	}
+
+	public Date getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(Date createDate) {
+		this.createDate = createDate;
+	}
+
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public Station getStation() {
+		return station;
+	}
+
+	public void setStation(Station station) {
+		this.station = station;
+	}
+
+	public Line getLine() {
+		return line;
+	}
+
+	public void setLine(Line line) {
+		this.line = line;
+	}
+}
 \ No newline at end of file
@@ -4,7 +4,6 @@ import com.bsth.entity.Line;
 import com.bsth.service.schedule.rules.rerun.RerunRule_input;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleResult_output;
 import com.bsth.service.schedule.rules.shiftloop.ScheduleRule_Type;
-import org.apache.commons.lang3.StringUtils;
  
 import javax.persistence.*;
 import java.sql.PreparedStatement;
@@ -181,28 +180,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
@@ -230,28 +229,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
@@ -316,28 +315,28 @@ public class SchedulePlanInfo extends BEntity {
             }
  
             this.j = employeeConfigInfo.getJsy().getId();
-//        this.jGh = employeeConfigInfo.getJsy().getJobCode();
-            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
-                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
-                if (jsy_temp.length > 1) {
-                    this.jGh = jsy_temp[1];
-                } else {
-                    this.jGh = jsy_temp[0];
-                }
-            }
+            this.jGh = employeeConfigInfo.getJsy().getJobCodeori();
+//            if (StringUtils.isNotEmpty(employeeConfigInfo.getJsy().getJobCode())) {
+//                String[] jsy_temp = employeeConfigInfo.getJsy().getJobCode().split("-");
+//                if (jsy_temp.length > 1) {
+//                    this.jGh = jsy_temp[1];
+//                } else {
+//                    this.jGh = jsy_temp[0];
+//                }
+//            }
             this.jName = employeeConfigInfo.getJsy().getPersonnelName();
             // 关联的售票员
             if (employeeConfigInfo.getSpy() != null) {
                 this.s = employeeConfigInfo.getSpy().getId();
-//            this.sGh = employeeConfigInfo.getSpy().getJobCode();
-                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
-                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
-                    if (spy_temp.length > 1) {
-                        this.sGh = spy_temp[1];
-                    } else {
-                        this.sGh = spy_temp[0];
-                    }
-                }
+                this.sGh = employeeConfigInfo.getSpy().getJobCodeori();
+//                if (StringUtils.isNotEmpty(employeeConfigInfo.getSpy().getJobCode())) {
+//                    String[] spy_temp = employeeConfigInfo.getSpy().getJobCode().split("-");
+//                    if (spy_temp.length > 1) {
+//                        this.sGh = spy_temp[1];
+//                    } else {
+//                        this.sGh = spy_temp[0];
+//                    }
+//                }
  
                 this.sName = employeeConfigInfo.getSpy().getPersonnelName();
             }
+package com.bsth.repository;
+
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+
+/**
+ * 
+ * @Interface: LineVersionsRepository(线路Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(线路版本Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+@Repository
+public interface LineVersionsRepository extends BaseRepository<LineVersions, Integer> {
+	
+	/**
+	 * 获取线路所有版本
+	 */
+	@Query(value = "  SELECT lv FROM LineVersions lv where lv.line.id = ?1")
+	public List<LineVersions> findBylineCode(int lineId);
+	
+	@Transactional
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.line=?2, lv.lineCode=?3, lv.startDate=?4, lv.endDate=?5, "
+			+ "lv.versions=?6, lv.status=?7, lv.remark=?8 where lv.id=?1")
+	public int update(Integer id, Line line, String lineCode, Date startDate, Date endDate, Integer versions, Integer status,
+			String remark);
+	
+	/**
+	 * 查询待更新线路的线路版本
+	 */
+	@Query(value = "SELECT lv FROM LineVersions lv where lv.status = 2 and lv.startDate<sysdate() and lv.endDate > sysdate()")
+	public List<LineVersions> findupdated();
+
+	/**
+	 * 更改为历史版本
+	 */
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.status=0 where lv.line.id=?1 and lv.lineCode=?2 and lv.status=1")
+	public void updateOdlVersions(Integer lineId, String lineCode);
+	
+	/**
+	 * 更改为当前版本
+	 */
+	@Modifying
+	@Query(value = "UPDATE LineVersions lv set lv.status=1 where lv.line.id=?1 and lv.lineCode=?2 and lv.versions=?3")
+	public void updateNewVersions(Integer lineId, String lineCode, Integer versions);
+	
+}
+package com.bsth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.LsSectionRoute;
+
+/**
+ * 
+ * @Interface: SectionRouteRepository(路段路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(路段路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsSectionRouteRepository extends BaseRepository<LsSectionRoute, Integer> {
+
+	/**
+	 * 查询待更新线路的路段路由
+	 */
+	@Query(value = "SELECT sr FROM LsSectionRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3")
+	public List<LsSectionRoute> findupdated(Integer lineId,String lineCode,Integer versions);
+	
+	/**
+     * 更新路线前删除线路版本下历史原有路段路由
+     */
+    @Modifying
+    @Query(value="DELETE from bsth_c_ls_sectionroute where line = ?1  and directions = ?2 and versions=?3", nativeQuery=true)
+    public void batchDelete(Integer line, Integer dir, Integer versions);
+}
+package com.bsth.repository;
+
+import java.util.List;
+
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import com.bsth.entity.LsStationRoute;
+
+/**
+ * 
+ * @Interface: StationRouteRepository(站点路由Repository数据持久层接口)
+ * 
+ * @Extends : BaseRepository
+ * 
+ * @Description: TODO(站点路由Repository数据持久层接口)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Repository
+public interface LsStationRouteRepository extends BaseRepository<LsStationRoute, Integer> {
+	
+	/**
+	 * 查询待更新线路的站点路由
+	 */
+	@EntityGraph(value = "ls_stationRoute_station", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "SELECT DISTINCT sr FROM LsStationRoute sr where sr.line.id =?1 and sr.lineCode=?2 and sr.versions=?3")
+	List<LsStationRoute> findupdated(Integer lineId, String lineCode, Integer versions);
+	
+	/**
+     * 更新路线前删除线路版本号历史原有站点路由
+     * 
+     * @param line
+     * @param dir
+     */
+    @Modifying
+    @Query(value="DELETE from bsth_c_ls_stationroute where line = ?1  and directions = ?2 and versions = ?3", nativeQuery=true)
+    public void batchDelete(Integer line,Integer dir, Integer versions);
+}
@@ -192,4 +192,14 @@ public interface SectionRouteRepository extends BaseRepository&lt;SectionRoute, Int
     @Modifying
     @Query(value="update bsth_c_sectionroute set directions = case directions when 1 then 0 when 0 then 1 end where line_code = ?1   ", nativeQuery=true)
 	public void sectionRouteDir(Integer line);
+    
+    // 更具线路批量撤销
+    @Modifying
+    @Query(value="UPDATE SectionRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
+	public void batchUpdate(Integer lineId, String lineCode);
+
+    // 批量删除
+    @Modifying
+    @Query(value="delete from SectionRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
+	public void batchDelete(Integer lineId, String lineCode);
 }
@@ -313,7 +313,7 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
    	public void stationRouteIsDestroyUpdBatch(Integer ids);
  
     /**
-     * 更新路线前撤销线路原有站点
+     * 
      * 
      * @param line
      * @param dir
@@ -321,4 +321,14 @@ public interface StationRouteRepository extends BaseRepository&lt;StationRoute, Int
     @Modifying
     @Query(value="insert into (select * from bsth_c_stationroute_cache where line = ?1  and directions = ?2) bsth_c_stationroute", nativeQuery=true)
     public void stationRouteUpdate(Integer line,Integer dir);
+
+    // 更具线路批量撤销
+    @Modifying
+    @Query(value="UPDATE StationRoute sr set sr.destroy = 1 where sr.line.id = ?1  and sr.lineCode = ?2")
+	void batchUpdate(Integer lineId, String lineCode);
+
+    // 批量删除    
+    @Modifying
+    @Query(value="delete from StationRoute sr where sr.line.id = ?1  and sr.lineCode = ?2")
+	void batchDelete(Integer lineId, String lineCode);
 }
+package com.bsth.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.bsth.entity.LineVersions;
+
+/**
+ * 
+ * @Interface: LineVersionsService(线路版本service业务层实现接口)
+ * 
+ * @extends : BaseService
+ * 
+ * @Description: TODO(线路版本service业务层实现接口)
+ * 
+ * @Author bsth@lq
+ * 
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+public interface LineVersionsService extends BaseService<LineVersions, Integer> {
+	
+	/**
+	 * 获取线路版本
+	 * 
+	 */
+	List<LineVersions> findByLineCode(int lineId);
+
+	Map<String, Object> update(Map<String, Object> map);
+
+	List<LineVersions> findupdated();
+
+	List<LineVersions> lineUpdate();
+
+}
@@ -62,5 +62,7 @@ public interface SectionRouteService extends BaseService&lt;SectionRoute, Integer&gt; 
 	 List<Map<String, Object>> findUpSectionRouteCode(Map<String, Object> map);
  
 	 Map<String, Object> quoteSection(Map<String, Object> map);
+
+	void batchUpdate(Integer lineId, String lineCode);
  
 }
@@ -35,4 +35,6 @@ public interface SectionService extends BaseService&lt;Section, Integer&gt; {
 	Map<String, Object> sectionCut(Map<String, Object> map);
  
 	Map<String, Object> sectionCacheUpdate(Map<String, Object> map);
+
+	Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map);
 }
@@ -112,5 +112,7 @@ public interface StationRouteService extends BaseService&lt;StationRoute, Integer&gt; 
 	 * @return
 	 */
 	Map<String, Object> getSectionRouteExport(Integer id, HttpServletResponse resp);
+
+	void batchUpdate(Integer lineId, String lineCode);
  
 }
@@ -958,6 +958,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(tsSet.contains(schedule2.getId()) || schedule2.getBcType().toString().equals("in") || schedule2.getBcType().toString().equals("out")){
 						fcsj2 = schedule1.getZdsjT();
 					}
+					if(fcsj2 < fcsj1)
+						fcsj2 += 1440l;
 					if(sfqr == 1 && time1 > fcsj1){
 						jhyysj += fcsj2 - time1;
 					}else if(sfqr == 1 && time2 < fcsj2){
@@ -966,7 +968,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						jhyysj += fcsj2 - fcsj1;
 					}
 					if(jhyysj < 0){
-						System.out.println(fcsj2 + " - " + fcsj1);
+						System.out.println(fcsj2 + " - " + fcsj1 + " = " + (fcsj2 - fcsj1));
 					}
 					jhyysj1 += fcsj2 - fcsj1;
 				}
@@ -1010,7 +1012,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					List<ChildTaskPlan> cTasks = cMap.get(schedule.getId());
 					for(ChildTaskPlan childTaskPlan : cTasks){
 						Map<String, Object> temp = new HashMap<String, Object>();
-						if(childTaskPlan.getMileageType().equals("empty") || childTaskPlan.isDestroy()){
+						if(!childTaskPlan.getMileageType().equals("service") || childTaskPlan.isDestroy()
+								|| !childTaskPlan.getType1().equals("正常") || childTaskPlan.getCcId() != null){
 							temp.put("lc", null);
 							temp.put("fcsj", null);
 							temp.put("zdsj", null);
@@ -1071,6 +1074,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				} else if(i == keyList.size() - 1){
 					fcsj2 = Long.valueOf(m2.get("zdsj").toString());
 				}
+				if(fcsj2 < fcsj1){
+					fcsj2 += 1440l;
+				}
 				if(sfqr == 1 && time1 > fcsj1){
 					sjyysj += fcsj2 - time1;
 				}else if(sfqr == 1 && time2 < fcsj2){
+package com.bsth.service.impl;
+
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.core.time.impl.PseudoClockScheduler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BatchPreparedStatementSetter;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
+import com.bsth.entity.SectionRoute;
+import com.bsth.entity.StationRoute;
+import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
+import com.bsth.repository.LsSectionRouteRepository;
+import com.bsth.repository.LsStationRouteRepository;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.SectionRouteService;
+import com.bsth.service.StationRouteService;
+
+/**
+ * 
+ * @ClassName: LineVersionsServiceImpl(线路service业务层实现类)
+ * 
+ * @Extends : BaseService
+ * 
+ * @Description: TODO(线路service业务层)
+ * 
+ * @Author bsth@lq
+ *
+ * @Version 公交调度系统BS版 0.1
+ * 
+ */
+
+@Service
+public class LineVersionsServiceImpl extends BaseServiceImpl<LineVersions, Integer> implements LineVersionsService{
+	
+	@Autowired
+	private LineVersionsRepository repository;
+	
+	@Autowired
+	LineRepository lineRepository;
+	
+	@Autowired
+    SectionRouteService sectionRouteService;
+    
+    @Autowired
+    StationRouteService stationRouteService;
+    
+    @Autowired
+    com.bsth.repository.SectionRouteRepository  sectionRouteRepository ;
+    
+    @Autowired
+    com.bsth.repository.StationRouteRepository  stationRouteRepository ;
+    
+    @Autowired
+    LsSectionRouteRepository  lsSectionRouteRepository ;
+    
+    @Autowired
+    LsStationRouteRepository  lsStationRouteRepository ;
+	
+	@Override
+	public List<LineVersions> findByLineCode(int lineId) {
+		return repository.findBylineCode(lineId);
+	}
+
+	@Override
+	public Map<String, Object> update(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<>();
+		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		try {
+			Date startDate = simpleDateFormat.parse(map.get("startDate").toString());
+			Date endDate = simpleDateFormat.parse(map.get("endDate").toString());
+			Integer id = Integer.valueOf(map.get("Id").toString());
+			Integer lineid = Integer.valueOf(map.get("lineId").toString());
+			String lineCode = map.get("lineCode").toString();
+			Integer versions = Integer.valueOf(map.get("versions").toString());
+			Integer status = Integer.valueOf(map.get("status").toString());
+			String remark = map.get("remark").toString();
+			
+			Line line = lineRepository.findOne(lineid);
+			
+			int statu = repository.update(id,line,lineCode,new java.sql.Date(startDate.getTime()),
+					new java.sql.Date(endDate.getTime()),versions,status,remark);
+			if (statu==1) {
+				resultMap.put("status", ResponseCode.SUCCESS);
+			} else {
+				resultMap.put("status", ResponseCode.ERROR);
+			}
+		} catch (ParseException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+			resultMap.put("status", ResponseCode.ERROR);
+			return resultMap;
+		}
+		return resultMap;
+	}
+
+	@Override
+	public List<LineVersions> findupdated() {
+		return repository.findupdated();
+	}
+	
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	
+	// 线路更新
+	@Transactional
+	@Override
+	public List<LineVersions> lineUpdate() {
+		List<LineVersions> list = findupdated();
+    	for (LineVersions lineVersions : list) {
+    		Integer lineId = lineVersions.getLine().getId();
+    		String lineCode = lineVersions.getLineCode();
+    		Integer versions = lineVersions.getVersions();
+    		// 需要更新线路的路由
+    		List<LsSectionRoute> lsSectionRoutes = lsSectionRouteRepository.findupdated(lineId, lineCode, versions);
+    		List<LsStationRoute> lsStationRoutes = lsStationRouteRepository.findupdated(lineId, lineCode, versions);
+    		if (lsSectionRoutes.size() != 0 && lsStationRoutes.size() != 0) {
+    			// 更新
+    			final List<SectionRoute> sectionRoutes = JSONArray.parseArray(JSON.toJSONString(lsSectionRoutes), SectionRoute.class);
+    			final List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
+    			//sectionRouteService.batchUpdate(lineId, lineCode);
+    			//sectionRouteRepository.batchDelete(lineId, lineCode);
+    			
+    			jdbcTemplate.update("delete from bsth_c_stationroute where line = ?  and line_code = ?", lineId, lineCode);
+    			
+    			String stationSql ="insert into bsth_c_stationroute(id,line,station,station_name,station_route_code,"
+    					+ "line_code,station_code,station_mark,out_station_nmber,directions,distances,"
+    					+ "to_time,first_time,end_time,descriptions,destroy,versions,create_by,create_date,"
+    					+ "update_by,update_date) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    			jdbcTemplate.batchUpdate(stationSql, new BatchPreparedStatementSetter() {
+					
+					@Override
+					public void setValues(PreparedStatement ps, int i) throws SQLException {
+						StationRoute sRoute = stationRoutes.get(i);
+						sRoute.getStationRouteCode();
+						ps.setInt(1, sRoute.getId());
+						ps.setInt(2, sRoute.getLine().getId());
+						ps.setInt(3, sRoute.getStation().getId());
+						ps.setString(4, sRoute.getStationName());
+						ps.setInt(5, sRoute.getStationRouteCode());
+						ps.setString(6, sRoute.getLineCode());
+						ps.setString(7, sRoute.getStationCode());
+						ps.setString(8, sRoute.getStationMark());
+						ps.setInt(9, sRoute.getOutStationNmber()==null ? 0:sRoute.getOutStationNmber());
+						ps.setInt(10, sRoute.getDirections());
+						ps.setDouble(11, sRoute.getDistances());
+						ps.setDouble(12, sRoute.getToTime());
+						ps.setString(13, sRoute.getFirstTime()==null ? "":sRoute.getFirstTime());
+						ps.setString(14, sRoute.getEndTime()==null ? "":sRoute.getEndTime());
+						ps.setString(15, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
+						ps.setInt(16, sRoute.getDestroy());
+						ps.setInt(17, sRoute.getVersions());
+						ps.setInt(18, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
+						ps.setDate(19, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setInt(20, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
+						ps.setDate(21, new java.sql.Date(sRoute.getUpdateDate().getTime()));						
+					}
+					
+					@Override
+					public int getBatchSize() {
+						// TODO Auto-generated method stub
+						return stationRoutes.size();
+					}
+				} );
+    			jdbcTemplate.update("delete from bsth_c_sectionroute where line = ?  and line_code = ?", lineId, lineCode);
+    			
+    			String sectionSql ="insert into bsth_c_sectionroute(id,line_code,section_code,sectionroute_code,"
+    					+ "directions,line,section,descriptions,create_by,create_date,update_by,update_date,versions,"
+    					+ "destroy,is_roade_speed) values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
+    			jdbcTemplate.batchUpdate(sectionSql, new BatchPreparedStatementSetter() {
+					
+					@Override
+					public void setValues(PreparedStatement ps, int i) throws SQLException {
+						SectionRoute sRoute = sectionRoutes.get(i);
+						ps.setInt(1, sRoute.getId());
+						ps.setString(2, sRoute.getLineCode());
+						ps.setString(3, sRoute.getSectionCode());
+						ps.setInt(4, sRoute.getSectionrouteCode());
+						ps.setInt(5, sRoute.getDirections());
+						ps.setInt(6, sRoute.getLine().getId());
+						ps.setInt(7, sRoute.getSection().getId());
+						ps.setString(8, sRoute.getDescriptions()==null ? "":sRoute.getDescriptions());
+						ps.setInt(9, sRoute.getCreateBy()==null ? 0:sRoute.getCreateBy());
+						ps.setDate(10, new java.sql.Date(sRoute.getCreateDate().getTime()));
+						ps.setInt(11, sRoute.getUpdateBy()==null ? 0:sRoute.getUpdateBy());
+						ps.setDate(12, new java.sql.Date(sRoute.getUpdateDate().getTime()));
+						ps.setInt(13, sRoute.getVersions());
+						ps.setInt(14, sRoute.getDestroy());
+						ps.setInt(15, sRoute.getIsRoadeSpeed()==null ? 0:sRoute.getIsRoadeSpeed());
+					}
+					
+					@Override
+					public int getBatchSize() {
+						// TODO Auto-generated method stub
+						return sectionRoutes.size();
+					}
+				} );
+    			/*for (SectionRoute sectionRoute : sectionRoutes) {
+    				sectionRouteService.save(sectionRoute);
+				}*/
+//    			sectionRouteService.bulkSave(sectionRoutes);
+    			//List<StationRoute> stationRoutes = JSONArray.parseArray(JSON.toJSONString(lsStationRoutes), StationRoute.class);
+//    			stationRouteService.batchUpdate(lineId, lineCode);
+    			
+    			//stationRouteRepository.batchDelete(lineId, lineCode);
+    			/*for (StationRoute stationRoute : stationRoutes) {
+    				stationRouteService.save(stationRoute);
+				}*/
+//    			stationRouteService.bulkSave(stationRoutes);
+    			// 更新线路版本
+    			repository.updateOdlVersions(lineId, lineCode);
+    			repository.updateNewVersions(lineId,lineCode,versions);
+			}
+		}
+    	return list;
+	}
+	
+}
@@ -385,4 +385,10 @@ public class SectionRouteServiceImpl extends BaseServiceImpl&lt;SectionRoute, Integ
 		}
 		return resultMap;
 	}
+	
+	// 更具线路批量撤销
+	@Override
+	public void batchUpdate(Integer lineId, String lineCode) {
+		repository.batchUpdate(lineId,lineCode);
+	}
 }
 \ No newline at end of file
@@ -17,12 +17,18 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.Line;
+import com.bsth.entity.LineVersions;
+import com.bsth.entity.LsSectionRoute;
+import com.bsth.entity.LsStationRoute;
 import com.bsth.entity.Section;
 import com.bsth.entity.SectionRoute;
 import com.bsth.entity.SectionRouteCache;
 import com.bsth.entity.StationRoute;
 import com.bsth.entity.StationRouteCache;
 import com.bsth.repository.LineRepository;
+import com.bsth.repository.LineVersionsRepository;
+import com.bsth.repository.LsSectionRouteRepository;
+import com.bsth.repository.LsStationRouteRepository;
 import com.bsth.repository.SectionRepository;
 import com.bsth.repository.SectionRouteCacheRepository;
 import com.bsth.repository.SectionRouteRepository;
@@ -62,15 +68,24 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	LineRepository lineRepository;
  
 	@Autowired
+	LineVersionsRepository lineVersionsRepository;
+	
+	@Autowired
 	SectionRouteRepository routeRepository;
  
 	@Autowired
+	LsSectionRouteRepository lsRouteRepository;
+	
+	@Autowired
 	SectionRouteCacheRepository routeCacheRepository;
  
 	@Autowired
 	StationRouteRepository stationRouteRepository;
  
 	@Autowired
+	LsStationRouteRepository lsStationRouteRepository;
+	
+	@Autowired
 	StationRouteCacheRepository stationRouteCacheRepository;
  
 	/**
@@ -88,119 +103,12 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段点List
 			List<Point> bPointsList = new ArrayList<>();
 			// 截取路段点List
-			List<Point> bPointsCutList = new ArrayList<>();
+//			List<Point> bPointsCutList = new ArrayList<>();
 			// 截取后的路段
 			List<Map<String, String>> sectionArrayList = new ArrayList<>();
 			String bsectionVector = map.get("sectionBsectionVector").equals("") ? "" :map.get("sectionBsectionVector").toString();
 			String bsectionVectorCutList = map.get("cutSectionList").equals("") ? "" :map.get("cutSectionList").toString();
-			if(!bsectionVector.equals("")) {
-				// 转换成JSON数组
-				JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
-				// 遍历
-				for(int s = 0 ;s<sectionsArray.size();s++) {
-					String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
-					String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
-					bPointsList.add(new Point(Double.parseDouble(pointsLngStr), Double.parseDouble(pointsLatStr)));
-				}
-			}
-			if(!bsectionVectorCutList.equals("")) {
-				// 转换成JSON数组
-				JSONArray sectionsArrayList = JSONArray.parseArray(bsectionVectorCutList);
-				// 截取路段在总路段中的下表
-				int firstTemp = 0;
-				int lastTemp = 0;
-				// 每个截取的路段去总路段中获取
-				for (int i = 0; i < sectionsArrayList.size(); i++) {
-					// 切点列表
-					JSONObject sectionsArray = sectionsArrayList.getJSONObject(i);
-					String sectionName = sectionsArray.get("name").toString();
-					JSONArray sectionPoints = sectionsArray.getJSONArray("section");
-					// 用两个坐标点去截取总路段
-					if (i == 0) {
-						for(int s = 0 ;s<sectionPoints.size();s++) {
-							String bpointsLngStr = sectionPoints.getJSONObject(s).get("lng").toString();
-							String bpointsLatStr = sectionPoints.getJSONObject(s).get("lat").toString();
-							Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
-							double distance = 0;
-							// 寻找最近点
-							for (int index = firstTemp; index < bPointsList.size(); index++) {
-								if (index == firstTemp) {
-									distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-								} else {
-									double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-									if(distance > distanceTemp) {
-										distance = distanceTemp;
-										lastTemp = index;
-									}					
-								}
-							}	
-							if (s == 0) {
-								// 第一个点作为路段的起点
-								firstTemp = lastTemp;
-							}
-							// 用切点替换最近点
-							if(lastTemp == firstTemp) {
-								bPointsList.add(++lastTemp, bPointcut);
-							} else {
-								bPointsList.set(lastTemp, bPointcut);	
-							}						
-						}
-					} else {
-						String bpointsLngStr = sectionPoints.getJSONObject(1).get("lng").toString();
-						String bpointsLatStr = sectionPoints.getJSONObject(1).get("lat").toString();
-						Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
-						double distance = 0;
-						// 寻找最近点
-						for (int index = firstTemp; index < bPointsList.size(); index++) {
-							if (index == firstTemp) {
-								distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-							} else {
-								double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
-								if(distance > distanceTemp) {
-									distance = distanceTemp;
-									lastTemp = index;
-								}					
-							}
-						}
-						// 用切点替换最近点
-						if(lastTemp == firstTemp) {
-							bPointsList.add(++lastTemp, bPointcut);
-						} else {
-							bPointsList.set(lastTemp, bPointcut);	
-						}
-					}
-					// 切路段
-					if (sectionName != "" && sectionName != null ) {
-						// 原始线状图形坐标集合
-						String sectionsBpoints = "";
-						// WGS线状图形坐标集合
-						String sectionsWJPpoints = "";		
-						for (int j = firstTemp; j <= lastTemp; j++) {
-							Point point =  bPointsList.get(j);
-							String pointsLngStr = String.valueOf(point.getLon());
-							String pointsLatStr = String.valueOf(point.getLat());
-							/** to WGS坐标 */
-							Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
-							String WGSLngStr = String.valueOf(resultPoint.getLng());
-							String WGSLatStr = String.valueOf(resultPoint.getLat());
-							if(j == firstTemp) {
-								sectionsBpoints = pointsLngStr + " " + pointsLatStr;
-								sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
-							}else {
-								sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
-								sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
-							}
-						}
-						Map<String, String> sectionCutMap = new HashMap<String, String>();
-						sectionCutMap.put("sectionName", sectionName);
-						sectionCutMap.put("sectionsBpoints", sectionsBpoints);
-						sectionCutMap.put("sectionsWJPpoints", sectionsWJPpoints);
-						sectionArrayList.add(sectionCutMap);
-					}
-					// 上一个路段的终点作为下一个路段的起点
-					firstTemp = lastTemp;	
-				}		
-			}			
+			sectionListCut(bPointsList, sectionArrayList, bsectionVector, bsectionVectorCutList);			
  
 			// 原坐标类型
 			String dbType = map.get("sectiondbType").equals("") ? "" : map.get("sectiondbType").toString();
@@ -217,7 +125,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 路段长度
 			Double sectionDistance = 0.0;
 			// 路段路由Id
-			Integer sectionRouteId = map.get("sectionrouteId").equals("") ? null : Integer.valueOf(map.get("sectionrouteId").toString());
+//			Integer sectionRouteId = map.get("sectionrouteId").equals("") ? null : Integer.valueOf(map.get("sectionrouteId").toString());
 			// 线路编码
 			String lineCode =map.get("sectionrouteLineCode").equals("") ? "" : map.get("sectionrouteLineCode").toString();
 			// 路段时长
@@ -227,7 +135,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			// 限速
 			Double speedLimit = map.get("sectionSpeedLimet").equals("") ? null : Double.valueOf(map.get("sectionSpeedLimet").toString());
 			// 版本
-			Integer version = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
  
 			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
 			String createDate = map.get("createDate").equals("") ? null : map.get("createDate").toString();
@@ -243,8 +151,8 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 			String middleNode="";
 			String sectionType="";
 			String csectionVector="";	
-			// 撤销原有路段
-			routeRepository.sectionRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			// 撤销原有路段路由
+			routeRepository.sectionRouteUpdDestroy(sectionRouteLine,directions);
 			// 路段保存
 			for (int i = 0; i < sectionArrayList.size(); i++) {
 				long sectionMaxId = GetUIDAndCode.getSectionId();
@@ -263,7 +171,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				String bsectionVectorS = null;
 				if(!sectionsBpoints.equals(""))
 					 bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
-				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, version, sectionId);
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, versions, sectionId);
 				SectionRoute route = new SectionRoute();
 				Line line = lineRepository.findOne(sectionRouteLine);
 				Section section = repository.findOne(sectionId);
@@ -271,7 +179,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				route.setLineCode(lineCode);
 				route.setSectionCode(sectionCode);
 				route.setDirections(directions);
-				route.setVersions(version);
+				route.setVersions(versions);
 				route.setDestroy(destroy);
 				route.setDescriptions(descriptions);
 				route.setCreateBy(createBy);
@@ -282,9 +190,9 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				routeRepository.save(route);
 			}
 			// 删除缓存路段
-			routeCacheRepository.sectionRouteCacheDel(Integer.parseInt(lineCode),directions);
-			// 撤销原有站点
-			stationRouteRepository.stationRouteUpdDestroy(Integer.parseInt(lineCode),directions);
+			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			// 撤销原有站点路由
+			stationRouteRepository.stationRouteUpdDestroy(sectionRouteLine,directions);
 			// 站点保存
 			List<StationRouteCache> stationRouteList = stationRouteCacheRepository.findstationRoute(lineCode,directions);			
 			for(int i=0; i < stationRouteList.size(); i++) {
@@ -305,7 +213,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				stationRoute.setEndTime(stationRouteCache.getEndTime());
 				stationRoute.setDescriptions(stationRouteCache.getDescriptions());
 				stationRoute.setDestroy(stationRouteCache.getDestroy());
-				stationRoute.setVersions(stationRouteCache.getVersions());
+				stationRoute.setVersions(versions);
 				stationRoute.setCreateBy(stationRouteCache.getCreateBy());
 				stationRoute.setCreateDate(stationRouteCache.getCreateDate());
 				stationRoute.setUpdateBy(stationRouteCache.getCreateBy());
@@ -313,7 +221,7 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 				stationRouteRepository.save(stationRoute);
 			}
 			// 删除缓存站点
-			stationRouteCacheRepository.stationRouteCacheDel(Integer.parseInt(lineCode),directions);
+			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
  
 			resultMap.put("status", ResponseCode.SUCCESS);			
 		} catch (Exception e) {
@@ -324,6 +232,251 @@ public class SectionServiceImpl extends BaseServiceImpl&lt;Section, Integer&gt; implem
 	}
  
 	/**
+	 * @Description :TODO(编辑线路走向保存到线路历史表)
+	 * 
+	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
+	 * 
+	 * @return Map<String, Object> <SUCCESS ; ERROR>
+	 */
+	@Override
+	@Transactional
+	public Map<String, Object> sectionCutSaveLineLS(Map<String, Object> map) {
+		Map<String, Object> resultMap = new HashMap<String, Object>();
+		try {
+			// 路段点List
+			List<Point> bPointsList = new ArrayList<>();
+			// 截取后的路段
+			List<Map<String, String>> sectionArrayList = new ArrayList<>();
+			String bsectionVector = map.get("sectionBsectionVector").equals("") ? "" :map.get("sectionBsectionVector").toString();
+			String bsectionVectorCutList = map.get("cutSectionList").equals("") ? "" :map.get("cutSectionList").toString();
+			sectionListCut(bPointsList, sectionArrayList, bsectionVector, bsectionVectorCutList);			
+			
+			// 原坐标类型
+			String dbType = map.get("sectiondbType").equals("") ? "" : map.get("sectiondbType").toString();
+			// 说明
+			String descriptions = map.get("descriptions").equals("") ? "" : map.get("descriptions").toString();
+			// 是否撤销
+			Integer destroy = map.get("destroy").equals("") ? null : Integer.parseInt(map.get("destroy").toString());
+			// 方向
+			Integer directions = map.get("sectionrouteDirections").equals("") ? null : Integer.parseInt(map.get("sectionrouteDirections").toString());
+			// 线路ID
+			Integer sectionRouteLine = map.get("sectionrouteLine").equals("") ? null : Integer.parseInt(map.get("sectionrouteLine").toString());
+			// 道路编码
+			String roadCoding = map.get("sectionRoadCoding").equals("") ? "" : map.get("sectionRoadCoding").toString();
+			// 路段长度
+			Double sectionDistance = 0.0;
+			// 线路编码
+			String lineCode =map.get("sectionrouteLineCode").equals("") ? "" : map.get("sectionrouteLineCode").toString();
+			// 路段时长
+			Double  sectionTime = 0.0;
+			// 路段路由
+			Integer sectionrouteCode = map.get("sectionrouteCode").equals("") ? null : Integer.valueOf(map.get("sectionrouteCode").toString());
+			// 限速
+			Double speedLimit = map.get("sectionSpeedLimet").equals("") ? null : Double.valueOf(map.get("sectionSpeedLimet").toString());
+			// 版本
+			Integer versions = map.get("versions").equals("") ? null : Integer.valueOf(map.get("versions").toString());
+			
+			Integer createBy = map.get("createBy").equals("") ? null : Integer.valueOf(map.get("createBy").toString());
+			Integer updateBy = map.get("updateBy").equals("") ?null : Integer.valueOf(map.get("updateBy").toString());
+			Integer isRoadeSpeed = map.get("isRoadeSpeed").equals("") ? null : Integer.valueOf(map.get("isRoadeSpeed").toString());
+			String crosesRoad="";
+			String endNode="";
+			String startNode="";
+			String middleNode="";
+			String sectionType="";
+			String csectionVector="";	
+			// 删除原有历史版本路段路由
+			lsRouteRepository.batchDelete(sectionRouteLine,directions,versions);
+			// 路段保存
+			for (int i = 0; i < sectionArrayList.size(); i++) {
+				long sectionMaxId = GetUIDAndCode.getSectionId();
+				// 路段编码
+				String sectionCode = String.valueOf(sectionMaxId);
+				// 路段ID
+				int sectionId = (int)sectionMaxId;
+				String sectionName = sectionArrayList.get(i).get("sectionName").toString();
+				String sectionsBpoints = sectionArrayList.get(i).get("sectionsBpoints").toString();
+				String sectionsWJPpoints = sectionArrayList.get(i).get("sectionsWJPpoints").toString();
+				// WGS坐标点集合
+				String gsectionVector = null;
+				if(!sectionsWJPpoints.equals(""))
+					gsectionVector = "LINESTRING(" + sectionsWJPpoints +")";
+				// 原坐标点集合
+				String bsectionVectorS = null;
+				if(!sectionsBpoints.equals(""))
+					bsectionVectorS = "LINESTRING(" + sectionsBpoints + ")";				
+				repository.systemSave(sectionCode, sectionName, crosesRoad, endNode, startNode, middleNode, gsectionVector, bsectionVectorS, sectionType, csectionVector, roadCoding, sectionDistance, sectionTime, dbType, speedLimit, descriptions, 1, sectionId);
+				LsSectionRoute route = new LsSectionRoute();
+				Line line = lineRepository.findOne(sectionRouteLine);
+				Section section = repository.findOne(sectionId);
+				route.setSectionrouteCode(sectionrouteCode+i*100);
+				route.setLineCode(lineCode);
+				route.setSectionCode(sectionCode);
+				route.setDirections(directions);
+				route.setVersions(versions);
+				route.setDestroy(destroy);
+				route.setDescriptions(descriptions);
+				route.setCreateBy(createBy);
+				route.setUpdateBy(updateBy);
+				route.setLine(line);
+				route.setSection(section);
+				route.setIsRoadeSpeed(isRoadeSpeed);
+				lsRouteRepository.save(route);
+			}
+			// 删除缓存路段
+			routeCacheRepository.sectionRouteCacheDel(sectionRouteLine,directions);
+			// 删除原有历史表站点路由
+			lsStationRouteRepository.batchDelete(sectionRouteLine,directions,versions);
+			// 站点保存
+			List<StationRouteCache> stationRouteList = stationRouteCacheRepository.findstationRoute(lineCode,directions);			
+			for(int i=0; i < stationRouteList.size(); i++) {
+				StationRouteCache stationRouteCache = stationRouteList.get(i);				
+				LsStationRoute stationRoute = new LsStationRoute();
+				stationRoute.setLine(stationRouteCache.getLine());
+				stationRoute.setStation(stationRouteCache.getStation());
+				stationRoute.setStationName(stationRouteCache.getStationName());
+				stationRoute.setStationRouteCode(stationRouteCache.getStationRouteCode());
+				stationRoute.setLineCode(stationRouteCache.getLineCode());
+				stationRoute.setStationCode(stationRouteCache.getStationCode());
+				stationRoute.setStationMark(stationRouteCache.getStationMark());
+				stationRoute.setOutStationNmber(stationRouteCache.getOutStationNmber());
+				stationRoute.setDirections(stationRouteCache.getDirections());
+				stationRoute.setDistances(stationRouteCache.getDistances());
+				stationRoute.setToTime(stationRouteCache.getToTime());
+				stationRoute.setFirstTime(stationRouteCache.getFirstTime());
+				stationRoute.setEndTime(stationRouteCache.getEndTime());
+				stationRoute.setDescriptions(stationRouteCache.getDescriptions());
+				stationRoute.setDestroy(stationRouteCache.getDestroy());
+				stationRoute.setVersions(versions);
+				stationRoute.setCreateBy(stationRouteCache.getCreateBy());
+				stationRoute.setCreateDate(stationRouteCache.getCreateDate());
+				stationRoute.setUpdateBy(stationRouteCache.getCreateBy());
+				stationRoute.setUpdateDate(stationRouteCache.getUpdateDate());
+				lsStationRouteRepository.save(stationRoute);
+			}
+			// 删除缓存站点
+			stationRouteCacheRepository.stationRouteCacheDel(sectionRouteLine,directions);
+			resultMap.put("status", ResponseCode.SUCCESS);			
+		} catch (Exception e) {
+			resultMap.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+		}
+		return resultMap;
+	}
+
+	private void sectionListCut(List<Point> bPointsList, List<Map<String, String>> sectionArrayList,
+			String bsectionVector, String bsectionVectorCutList) {
+		if(!bsectionVector.equals("")) {
+			// 转换成JSON数组
+			JSONArray sectionsArray = JSONArray.parseArray(bsectionVector);
+			// 遍历
+			for(int s = 0 ;s<sectionsArray.size();s++) {
+				String pointsLngStr = sectionsArray.getJSONObject(s).get("lng").toString();
+				String pointsLatStr = sectionsArray.getJSONObject(s).get("lat").toString();
+				bPointsList.add(new Point(Double.parseDouble(pointsLngStr), Double.parseDouble(pointsLatStr)));
+			}
+		}
+		if(!bsectionVectorCutList.equals("")) {
+			// 转换成JSON数组
+			JSONArray sectionsArrayList = JSONArray.parseArray(bsectionVectorCutList);
+			// 截取路段在总路段中的下表
+			int firstTemp = 0;
+			int lastTemp = 0;
+			// 每个截取的路段去总路段中获取
+			for (int i = 0; i < sectionsArrayList.size(); i++) {
+				// 切点列表
+				JSONObject sectionsArray = sectionsArrayList.getJSONObject(i);
+				String sectionName = sectionsArray.get("name").toString();
+				JSONArray sectionPoints = sectionsArray.getJSONArray("section");
+				// 用两个坐标点去截取总路段
+				if (i == 0) {
+					for(int s = 0 ;s<sectionPoints.size();s++) {
+						String bpointsLngStr = sectionPoints.getJSONObject(s).get("lng").toString();
+						String bpointsLatStr = sectionPoints.getJSONObject(s).get("lat").toString();
+						Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+						double distance = 0;
+						// 寻找最近点
+						for (int index = firstTemp; index < bPointsList.size(); index++) {
+							if (index == firstTemp) {
+								distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+							} else {
+								double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+								if(distance > distanceTemp) {
+									distance = distanceTemp;
+									lastTemp = index;
+								}					
+							}
+						}	
+						if (s == 0) {
+							// 第一个点作为路段的起点
+							firstTemp = lastTemp;
+						}
+						// 用切点替换最近点
+						if(lastTemp == firstTemp) {
+							bPointsList.add(++lastTemp, bPointcut);
+						} else {
+							bPointsList.set(lastTemp, bPointcut);	
+						}						
+					}
+				} else {
+					String bpointsLngStr = sectionPoints.getJSONObject(1).get("lng").toString();
+					String bpointsLatStr = sectionPoints.getJSONObject(1).get("lat").toString();
+					Point bPointcut = new Point(Double.parseDouble(bpointsLngStr), Double.parseDouble(bpointsLatStr));
+					double distance = 0;
+					// 寻找最近点
+					for (int index = firstTemp; index < bPointsList.size(); index++) {
+						if (index == firstTemp) {
+							distance = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+						} else {
+							double distanceTemp = GeoUtils.getDistance(bPointcut,bPointsList.get(index));
+							if(distance > distanceTemp) {
+								distance = distanceTemp;
+								lastTemp = index;
+							}					
+						}
+					}
+					// 用切点替换最近点
+					if(lastTemp == firstTemp) {
+						bPointsList.add(++lastTemp, bPointcut);
+					} else {
+						bPointsList.set(lastTemp, bPointcut);	
+					}
+				}
+				// 切路段
+				if (sectionName != "" && sectionName != null ) {
+					// 原始线状图形坐标集合
+					String sectionsBpoints = "";
+					// WGS线状图形坐标集合
+					String sectionsWJPpoints = "";		
+					for (int j = firstTemp; j <= lastTemp; j++) {
+						Point point =  bPointsList.get(j);
+						String pointsLngStr = String.valueOf(point.getLon());
+						String pointsLatStr = String.valueOf(point.getLat());
+						/** to WGS坐标 */
+						Location resultPoint = FromBDPointToWGSPoint(pointsLngStr,pointsLatStr);
+						String WGSLngStr = String.valueOf(resultPoint.getLng());
+						String WGSLatStr = String.valueOf(resultPoint.getLat());
+						if(j == firstTemp) {
+							sectionsBpoints = pointsLngStr + " " + pointsLatStr;
+							sectionsWJPpoints = WGSLngStr + " " + WGSLatStr;
+						}else {
+							sectionsBpoints = sectionsBpoints + "," +  pointsLngStr + " " + pointsLatStr;
+							sectionsWJPpoints = sectionsWJPpoints + ","  +   WGSLngStr + " " + WGSLatStr;
+						}
+					}
+					Map<String, String> sectionCutMap = new HashMap<String, String>();
+					sectionCutMap.put("sectionName", sectionName);
+					sectionCutMap.put("sectionsBpoints", sectionsBpoints);
+					sectionCutMap.put("sectionsWJPpoints", sectionsWJPpoints);
+					sectionArrayList.add(sectionCutMap);
+				}
+				// 上一个路段的终点作为下一个路段的起点
+				firstTemp = lastTemp;	
+			}		
+		}
+	}
+	
+	/**
 	 * @Description :TODO(编辑线路走向)
 	 * 
 	 * @param map <sectionId:路段ID； sectionJSON：路段信息>
@@ -84,7 +84,7 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 			List<String> title = new ArrayList<String>();
 			title.add("线路ID");
 			title.add("方向");
-			title.add("站点ID");
+			title.add("站点编码");
 			title.add("站点顺序号");
 			title.add("站点备注");
 			title.add("站点名称");
@@ -1268,4 +1268,10 @@ public class StationRouteServiceImpl extends BaseServiceImpl&lt;StationRoute, Integ
 		}
 		return rs;
 	}
+
+	// 更具线路批量撤销
+	@Override
+	public void batchUpdate(Integer lineId, String lineCode) {
+		repository.batchUpdate(lineId,lineCode);
+	}
 }
@@ -60,6 +60,9 @@ import com.bsth.service.schedule.SchedulePlanInfoService;
 import com.bsth.service.sys.DutyEmployeeService;
 import com.bsth.util.*;
 import com.bsth.websocket.handler.SendUtils;
+import com.github.stuxuhai.jpinyin.PinyinException;
+import com.github.stuxuhai.jpinyin.PinyinFormat;
+import com.github.stuxuhai.jpinyin.PinyinHelper;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -2464,6 +2467,12 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> map = new HashMap<String, Object>();
     	if(list.size()>0){
 	        map.put("xlName", list.get(0).getXlName());
+	        try {
+				map.put("xlNamePy", PinyinHelper.convertToPinyinString(list.get(0).getXlName(), "" , PinyinFormat.WITHOUT_TONE));
+			} catch (PinyinException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 	        double jhyygl=culateService.culateJhgl(list);//计划营运公里
 	        double jhjcclc= culateService.culateJhJccgl(list);//计划进出场公里(计划空驶公里)
 	        map.put("jhlc", jhyygl);
@@ -2480,8 +2489,17 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	        map.put("sjzgl", Arith.add(zyygl, zksgl));
 	        map.put("sjgl",zyygl);
 	        map.put("sjksgl", zksgl);
-	
-	        map.put("ssgl", culateService.culateLbgl(list));
+	        double ssgl= culateService.culateLbgl(list);
+	        map.put("ssgl", ssgl);
+	        
+	        //计划+临加-少驶=实驶
+	        double jl=Arith.add(jhyygl, ljgl);
+	        if(Arith.sub(jl, ssgl)==sjyygl){
+	        	map.put("zt", 0);
+	        }else{
+	        	map.put("zt", 1);
+	        }
+	        
 	        map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
 	        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
 	        map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -2568,7 +2586,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 }
             }
         }
-
+        
+        Collections.sort(lMap,new AccountXlbm());
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("xlName", "合计");
         double jhyygl=culateService.culateJhgl(list);//计划营运公里
@@ -2587,7 +2606,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("sjzgl", Arith.add(zyygl, zksgl));
         map.put("sjgl",zyygl);
         map.put("sjksgl", zksgl);
-        map.put("ssgl", culateService.culateLbgl(list));
+        
+        double ssgl= culateService.culateLbgl(list);
+        map.put("ssgl", ssgl);
+        //计划+临加-少驶=实驶
+        double jl=Arith.add(jhyygl, ljgl);
+        if(Arith.sub(jl, ssgl)==sjyygl){
+        	map.put("zt", 0);
+        }else{
+        	map.put("zt", 1);
+        }
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
         map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
         map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
@@ -4949,3 +4977,14 @@ class AccountMap2 implements Comparator&lt;Map&lt;String, Object&gt;&gt;{
 			return  o2.get("clZbh").toString().compareTo(o1.get("clZbh").toString());
 		}
 }
+
+class AccountXlbm implements Comparator<Map<String, Object>>{
+	 @Override
+		public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+			// TODO Auto-generated method stub
+//		 PinyinHelper.convertToPinyinString(ppy.getName(),
+//		 "" , PinyinFormat.WITHOUT_TONE)
+			return  o1.get("xlNamePy").toString().compareTo(
+					o2.get("xlNamePy").toString());
+		}
+}
@@ -882,7 +882,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
             else if(isInOut(sch))
                 continue;
             //主任务烂班
-            else if(sch.getStatus() == -1){
+            else if(sch.getStatus() == -1 && !sch.isCcService()){
                 if(sch.getAdjustExps().equals(item) ||
                         (StringUtils.isEmpty(sch.getAdjustExps()) && item.equals("其他"))){
                     sum = Arith.add(sum, sch.getJhlcOrig());
-server.port=9088
-management.port= 9001
-management.address= 127.0.0.1
-
-spring.jpa.hibernate.ddl-auto= none
-spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
-#DATABASE
-spring.jpa.database= MYSQL
-spring.jpa.show-sql= false
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root2jsp@JSP
-#DATASOURCE
-spring.datasource.max-active=100
-spring.datasource.max-idle=8
-spring.datasource.min-idle=8
-spring.datasource.initial-size=5
-
-spring.datasource.test-on-borrow=true
-spring.datasource.test-on-connect=true
-spring.datasource.test-on-return=true
-spring.datasource.test-while-idle=true
-spring.datasource.validation-query=select 1
-
-## gps client data
-http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/
-## gateway send directive
+server.port=9088
+management.port= 9001
+management.address= 127.0.0.1
+
+spring.jpa.hibernate.ddl-auto= none
+spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
+#DATABASE
+spring.jpa.database= MYSQL
+spring.jpa.show-sql= false
+spring.datasource.driver-class-name= com.mysql.jdbc.Driver
+spring.datasource.url= jdbc:mysql://10.10.150.20:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root2jsp@JSP
+#DATASOURCE
+spring.datasource.max-active=100
+spring.datasource.max-idle=8
+spring.datasource.min-idle=8
+spring.datasource.initial-size=5
+
+spring.datasource.test-on-borrow=true
+spring.datasource.test-on-connect=true
+spring.datasource.test-on-return=true
+spring.datasource.test-while-idle=true
+spring.datasource.validation-query=select 1
+
+## gps client data
+http.gps.real.cache.url= http://10.10.150.24:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://10.10.150.21:8080/transport_server/rtgps/
+## gateway send directive
 http.send.directive = http://10.10.150.21:8080/transport_server/message/
 \ No newline at end of file
 <!-- 手动添加站点 -->
-<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic" aria-hidden="true">
-	
+<div class="modal fade" id="edit_route_mobal" tabindex="-1" role="basic"
+	aria-hidden="true">
+
 	<div class="modal-dialog">
-		
+
 		<div class="modal-content">
-		
+
 			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
 				<h4 class="modal-title">生成路线（站点和路段）</h4>
 			</div>
-			
+
 			<div class="modal-body">
-				
-				<form class="form-horizontal" role="form" id="save_route_template_form" action="" method="">
-				
-					<div class="alert alert-danger display-hide"> <button class="close" data-close="alert"></button>
+
+				<form class="form-horizontal" role="form"
+					id="save_route_template_form" action="" method="">
+
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>
 						您的输入有误，请检查下面的输入项
 					</div>
-					
+
 					<!-- 站点名称 -->
 					<div class="form-body">
-					
+
 						<div class="form-group">
-							<label class="control-label col-md-2">
-          						<span class="required"> * </span> 坐标：
-                    		</label>
+							<label class="control-label col-md-2"> <span
+								class="required"> * </span> 坐标：
+							</label>
 							<div class="col-md-10">
-								<textarea class="form-control" rows="12" name="points" id="pointInput" placeholder="坐标点"></textarea> 
+								<textarea class="form-control" rows="12" name="points"
+									id="pointInput" placeholder="坐标点"></textarea>
 							</div>
-						</div>						
+						</div>
 					</div>
 					<div class="form-group">
 						<label class="col-md-3 control-label">选择方向：</label>
 						<div class="col-md-9">
 							<div class="icheck-list">
-								<label>
-										<input type="radio" class="icheck" name="dirCheck" value='0' checked> 上行
-								</label>
-								<label>
-										<input type="radio" class="icheck" name="dirCheck" value='1' > 下行
+								<label> <input type="radio" class="icheck"
+									name="dirCheck" value='0' checked> 上行
+								</label> <label> <input type="radio" class="icheck"
+									name="dirCheck" value='1'> 下行
 								</label>
 							</div>
 						</div>
 					</div>
-					 <div class="form-group">
-					 	<div class="alert alert-info font-blue-chambray" style="background-color: #2C3E50">
-                            <h5 class="block"><span class="help-block" style="color:#1bbc9b;"> *　坐标生成路线规划说明： </span></h5>
-                            <p>
-                            	<span class="help-block" style="color:#1bbc9b;">
-                            		&nbsp;请在文本域中按顺序依次输坐标点（如果是站点，请将在坐标后面用【Tab】键隔开后加(站点名/stop);没有(站点名/stop)默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行.
-                            		例如：<br>
-                            		121.715623	31.224058	042408.000<br>
-									121.715623	31.224065	042409.000	Stop<br>
-									121.715623	31.224065	042410.000<br>
-                            	</span> 
-                            </p>
-                        </div>
-					 </div>
+					<div class="form-group">
+						<div class="alert alert-info font-blue-chambray"
+							style="background-color: #2C3E50">
+							<h5 class="block">
+								<span class="help-block" style="color: #1bbc9b;"> *
+									坐标生成路线规划说明： </span>
+							</h5>
+							<p>
+								<span class="help-block" style="color: #1bbc9b;">
+									&nbsp;请在文本域中按顺序依次输坐标点,每行中的数据之间用【Tab】键隔开（如果是站点，请将在坐标后面加 stop;没有
+									stop默认是路段点）,每输入完一个坐标时请按回车键【Enter】换行. 例如：<!-- <br> 121.715623
+									31.224058 042408.000<br> 121.715623 31.224065 042409.000
+									Stop<br> 121.715623 31.224065 042410.000<br> -->
+									<br>121.511870	31.180638	043703.000
+									<br>121.511870	31.180643	043705.000
+									<br>121.511870	31.180648	043706.000	Stop
+									<br>121.511872	31.180653	043707.000
+									<br>121.511873	31.180658	043708.000
+								</span>
+							</p>
+						</div>
+					</div>
 				</form>
 			</div>
 			<div class="modal-footer">
-				<button type="button" class="btn default" data-dismiss="modal" id="addMobalHiden">取消</button>
+				<button type="button" class="btn default" data-dismiss="modal"
+					id="addMobalHiden">取消</button>
 				<button type="button" class="btn btn-primary" id="templateSaveData">提交数据</button>
 			</div>
 		</div>
@@ -139,20 +152,21 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 			var directionData = $("input[name='dirCheck']:checked").val();
 			editRoute.setLineDir(directionData);
 			// 弹出正在加载层
-			var i = layer.load(0,{offset:['200px', '280px']});
+			var i = layer.load(2);
 			// 表单序列化
 			var paramsForm = form.serializeJSON();
 			// 切割坐标点
 			var array = paramsForm.points.split('\r\n');
 			// 把坐标点转换为站点或路段
 			var arrayFormat = inputStationValueFormat(array);
-			var stationList = arrayFormat.stationList;			
+			var stationList = arrayFormat.stationList;		
 			var sectionListTemp = arrayFormat.sectionList;
 			var sectionList = [];
 			// 隔30个取一个点（相当于30s）
 			for(var i = 0; i*30 < sectionListTemp.length; i++) {
 				sectionList[i] = sectionListTemp[i*30];
 			}
+			sectionList[sectionList.length] = sectionListTemp[sectionListTemp.length-1];
  
 			var sectionListFinal = [];
 			sectionListFinal.push({sectionName : lineNameV, points : sectionList});
@@ -227,7 +241,7 @@ $(&#39;#edit_route_mobal&#39;).on(&#39;editRouteMobal.show&#39;, function(e,transGPS,editRoute,m
 		}
 		for(var i = 0 ;i<sectionList.length;i++) {
 			if(sectionList[i] == "" || typeof(sectionList[i]) == "undefined" || sectionList[i] == null) {
-				sectionList.splice(i,1);
+				sectionList.splice(i,1);//删除数组中下表i-i+1之间的值
 				i= i-1;
 			}
  
@@ -94,13 +94,13 @@ $(function(){
 		// 需要验证的表单元素
 		rules : {
 			'name' : {required : true,maxlength: 30},// 线路名称 必填项、 最大长度.
-			'lineCode' : {required : true,maxlength: 6,digits:true ,remote:{type: 'GET',
-												                url: '/line/lineCodeVerification',
-												                data:{'lineCode':function(){ return $("#lineCodeInput").val();}},
-												                dataFilter: function (data,type) {
-												                	return data;  //要返回data   否则会影响到后续验证   并且阻碍提交【即使验证通过】，也不会提交
-										                        },
-												                delay: 2000}},// 线路编码 必填项、最大长度.
+			'lineCode' : {required : true,maxlength: 6,digits:true ,
+				remote:{type: 'GET',
+		                url: '/line/lineCodeVerification',
+		                cache:false,
+                        async:false,
+		                data:{'lineCode':function(){ return $("#lineCodeInput").val();}}
+						}},// 线路编码 必填项、最大长度.
 			'company' : {required : true,maxlength: 30},// 所属公司  必填项、最大长度.
 			'brancheCompany' : {required : true,maxlength: 30},// 所属分公司  必填项、最大长度.
 			'level' : {required : true,maxlength: 30},// 线路等级 必填项、最大长度.
@@ -120,7 +120,6 @@ var WorldsBMapLine = function () {
 					 var index = parseInt(arguments.callee.count) - 1;
  
 					 if (index >= len-1) {
-						 
 						 callback && callback(points);
  
 			              return;
@@ -347,27 +347,14 @@
 			return ;
     	}else {
     		id = arrChk.data('id');
-    		/*$('#uploadRoute').on('click', function() {
-    			EditRoute.setLineId(id);
-    			EditRoute.setLineDir(direction);
-    			$.get('editRoute.html', function(m){
-    				$(pjaxContainer).append(m);
-    				$('#edit_route_mobal').trigger('editRouteMobal.show',[TransGPS,EditRoute,WorldsBMapLine,DrawingManagerObj,GetAjaxData,PublicFunctions]);
-    			});
-    			// 更新section_table 和缓存中的一切过的点数
-    			WorldsBMapLine.initCutSectionPoint();
-    			WorldsBMapLine.setPointIndex(0);
-    		});*/
-    		// 设置路线的线路id
-    		//var a =  EditRoute.setLineId(id);
-    		// 显示地图
-    		/*var param = {};
-    		var list = [1,2,3];
-    		param.id = id;
-    		param.list = list;
-    		
-    		$get('/pages/base/line/map.html',param);*/
- 			window.location.href = "/pages/base/line/map.html?no="+id;
+			$.get('/lineVersions/findByLineId',{'lineId':id},function(lineVersions){
+				if(lineVersions != null && lineVersions != "") {
+					window.location.href = "/pages/base/line/map.html?no="+id;
+				} else {
+					layer.msg('此线路没有线路版本,请先到线路版本信息页面添加改线路版本！');
+					return ;
+				}
+			});
     	}
 	});	
  
@@ -41,7 +41,7 @@
 							<a href="javascript:;" data-action="1" id="editRoute" class="tool-action"> <i class="fa fa-level-up"></i>上传GPS生成路线</a>
 						</li>
 						<li>
-							<a href="javascript:;" data-action="2" id="exportStation" class="tool-action"> <i class="fa fa-level-up"></i>导出线路站点Excel</a>
+							<a href="javascript:;" data-action="2" id="exportStation" class="tool-action"> <i class="fa fa-level-down"></i>导出线路站点Excel</a>
 						</li>
 						<!-- <li><a href="javascript:;" data-action="0" class="tool-action"> <i class="fa fa-print"></i> 打印
 						</a></li>
-< <link href="/pages/base/line/css/bmap_base.css" rel="stylesheet" type="text/css" /> 
+<
+<link href="/pages/base/line/css/bmap_base.css" rel="stylesheet"
+	type="text/css" />
 <div class="portlet-body">
 	<!-- 地图 -->
-	<div  id="bmap_basic" class="bmaps"></div>	
+	<div id="bmap_basic" class="bmaps"></div>
 	<!-- 右边显示栏 -->
 	<div class="cut-section" id="scrllmouseEvent_div">
-		<div class="portlet-title" >
-			<div class="caption" >
-				途径站点 
+		<div class="portlet-title">
+			<div class="caption">途径站点</div>
+		</div>
+		<div class="portlet-body">
+			<div class="table-toolbar" style="text-align: center;" id="upload">
+				<button class="btn btn-circle blue" id="uploadRoute">
+					<i class="fa fa-plus"></i> 生成路线
+				</button>
 			</div>
-		</div>	
-		 <div class="portlet-body">
-           	<div class="table-toolbar" style="text-align:center;" id="upload">
-				<button class="btn btn-circle blue" id="uploadRoute" ><i class="fa fa-plus"></i> 生成路线 </button>						
-           	</div>
-           	<div class="portlet-body hidden" id="upload_show">
-           		<div class="defeat-scroll" style="height: auto;max-height:600px;overflow-y:auto; border-left: 10px;">
-					<table class="table table-bordered table-hover table-checkable " id="section_table" style="color:#B7B7B7;">
+			<div class="portlet-body hidden" id="upload_show">
+				<div class="defeat-scroll"
+					style="height: auto; max-height: 600px; overflow-y: auto; border-left: 10px;">
+					<table class="table table-bordered table-hover table-checkable "
+						id="section_table" style="color: #B7B7B7;">
 						<thead>
 							<tr role="row" class="heading">
-								<th >截取路段</th>
+								<th>截取路段</th>
 							</tr>
 						</thead>
 						<tbody></tbody>
 					</table>
 				</div>
-	           	<div class="table-toolbar" style="text-align:center;">
-	           		<button class="btn btn-circle blue" id="cutSection">提交路段</button>
-					<button class="btn btn-circle blue" id="Undo">撤销切点</button>			
-	           	</div>
-           	</div>	           	
+				<div class="table-toolbar" style="text-align: center;">
+					<button class="btn btn-circle blue" id="cutSection">提交选项</button>
+					<button class="btn btn-circle blue" id="Undo">撤销切点</button>
+				</div>
+			</div>
 		</div>
 	</div>
 </div>
@@ -45,8 +49,9 @@
 		</tr>
 	{{/if}}
 </script>
-<!--上传GPS坐标生成路线监听事件 -->
-<<script type="text/javascript">
+<!--上传GPS坐标生成路线监听事件 -->
+<
+<script type="text/javascript">
 $(function(){
 	// 关闭左侧栏
 	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
@@ -111,7 +116,16 @@ $(function(){
 	// 提交截取事件
 	$('#cutSection').on('click', function() {		
 		if(WorldsBMapLine.getPointIndex() > 0) {
-			layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
+			var sectionList = WorldsBMapLine.getSectionList();
+			var data = {};
+			var section = EditSectionObj.getEitdSection();
+			var josnSectionList = JSON.stringify(sectionList);
+			section.cutSectionList = josnSectionList;
+			$.get('submit_select.html', function(m){
+				$(pjaxContainer).append(m);
+				$('#submit_select_mobal').trigger('submitSelectMobal.show',[section,EditRoute]);
+			});
+			/* layer.confirm('提交会把原有的站点和路段覆盖，您确定要提交吗？', {
 				btn: ['提交','取消'] //按钮
 			}, function(){
 				var sectionList = WorldsBMapLine.getSectionList();
@@ -131,7 +145,7 @@ $(function(){
 						layer.msg('提交失败...');
 					}
 				});
-			});	
+			}); */	
 		} else {
 			layer.msg("请先截取路段！！！");
 		}
@@ -170,11 +184,11 @@ $(function(){
 	}).on('mouseleave',function() {
 		$('.defeat-scroll').css('overflow','hidden');
 	});	
-});
+});
 </script>
 <!--编辑路线类 -->
 <script src="/pages/base/line/js/editRoute.js"></script>
- <!--坐标转换类 -->
+<!--坐标转换类 -->
 <script src="/pages/base/line/js/transGPS.js"></script>
 <!-- 地图类 -->
 <script src="/pages/base/line/js/line-list-map.js"></script>
+<!-- 提交选项 -->
+<div class="modal fade" id="submit_select_mobal" tabindex="-1"
+	role="basic" aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal"
+					aria-hidden="true"></button>
+				<h4 class="modal-title">
+					提交选项
+				</h4>
+			</div>
+			<div class="modal-body">
+				<form class="form-horizontal" action="/" method="post"
+					id="formBootbox" role="form">
+					
+					<div class="form-group">
+						<label class="col-md-3 control-label">选择版本：</label>
+						<div class="col-md-9">
+							<select class="form-control" name="lineVersions" id="lineVersions" style="width: 370px;"></select>
+						</div>
+					 </div>			 
+				</form>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn default" data-dismiss="modal">取消</button>
+				<button type="button" class="btn btn-primary"
+					id="submitSelectnextButton">提交</button>
+			</div>
+		</div>
+	</div>
+</div>
+<script type="text/javascript">
+	$('#submit_select_mobal').on('submitSelectMobal.show',function(e,section) {
+		// 加载显示mobal
+		$('#submit_select_mobal').modal({
+			show : true,
+			backdrop : 'static',
+			keyboard : false
+			});
+		// 给版本号下拉框赋值
+		$.get('/lineVersions/findByLineId',{'lineId':section.sectionrouteLine},function(lineVersions){
+			var options = "";
+			$.each(lineVersions, function () {
+				var startDate;
+				if(this.startDate != "" && this.startDate != null){
+					startDate = moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
+				} else {
+					startDate = "无";
+				}
+				if(this.status==1){
+					//当前版本为默认
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'"  > 版本'+this.versions+' 启用时间：'+startDate+' 当前版本</option>';
+				} else if(this.status==2){
+					options += '<option value="'+this.versions+','+this.status+','+startDate+'" selected = "selected"> 版本'+this.versions+' 启用时间：'+startDate+' 待更新版本</option>';
+				}
+			});
+			$('#lineVersions').html(options);
+		});
+		
+		// 获取表单元素
+		var form = $('#formBootbox');
+		// 下一步点击事件
+		$('#submitSelectnextButton').on('click', function() {
+			// 表单提交
+			form.submit();
+		});
+		// 表单验证
+		form.validate({
+			// 表单序列化
+			submitHandler : function(f) {
+				var lineVersions = $('#lineVersions').val();
+				var line = lineVersions.split(",");
+				// 即时更新 
+				if(line[1] == 1) {
+					section.versions = line[0];
+					// 隐藏选项mobal
+					$('#submit_select_mobal').modal('hide');
+					layer.confirm('提交马上会把原有的站点和路段覆盖，您确定要提交吗？', {
+						btn: ['提交','取消'] //按钮
+					}, function(){
+						$.post('/section/sectionCut', section, function(resuntDate){
+							if(resuntDate.status=='SUCCESS') {
+								// 弹出添加成功提示消息
+								layer.msg('提交成功，跳转到线路详情页面！');
+								window.location.href = "/pages/base/stationroute/list.html?no="+section.sectionrouteLine+","+section.sectionrouteDirections;
+							}else {
+								// 弹出添加失败提示消息
+								layer.msg('提交失败...');
+							}
+						});
+					});	
+				// 定时更新
+				} else if(line[1] == 2) {
+					section.versions = line[0];
+					// 隐藏选项mobal
+					$('#submit_select_mobal').modal('hide');
+					layer.confirm('提交后线路将在'+line[2]+'时间以后启用您提交的版本：'+line[0], {
+						btn: ['提交','取消'] //按钮
+					}, function(rs){
+						$.post('/section/sectionCutSaveLineLS', section, function(resuntDate){
+							if(resuntDate.status=='SUCCESS') {
+								// 关闭提示弹出层
+								layer.close(rs);								
+								// 弹出添加成功提示消息
+								layer.msg('提交成功！');
+								// 返回线路list页面
+								loadPage('/pages/base/line/list.html');
+// 								window.location.href = "/pages/base/stationroute/list.html?no="+section.sectionrouteLine+","+section.sectionrouteDirections;
+							}else {
+								// 弹出添加失败提示消息
+								layer.msg('提交失败...');
+							}
+						});
+					});	
+				}
+			}
+		});
+	});
+</script>
 \ No newline at end of file
+<!-- 片段标题 START -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>修改添加信息</h1>
+	</div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">修改添加信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<!-- 信息容器组件 START -->
+<div class="portlet light bordered">
+
+	<!-- 信息容器组件标题 START -->
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> 
+			<span class="caption-subject font-red-sunglo bold uppercase">添加线路信息</span>
+		</div>
+	</div>
+	<!-- 信息容器组件标题 END -->
+	
+	<!-- 表单容器组件 START -->
+	<div class="portlet-body form" id="lineEditForm">
+		
+		<!-- START FORM -->
+		<form action="/lineVersions" class="form-horizontal" id="lineVersions_add_form" >
+			
+			<!-- 错误提示信息组件 START -->
+			<div class="alert alert-danger display-hide">
+				<button class="close" data-close="alert"></button>
+				您的输入有误，请检查下面的输入项
+			</div>
+			<!-- 错误提示信息组件 END -->
+			
+			<!-- 表单内容 START -->
+			<div class="form-body">
+				<input type="hidden" name="lineId" id="lineIdInput" />
+				<input type="hidden" name="lineCode" id="lineCodeInput" />
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                  <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>启用时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="startDate" id="startDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>终止时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="endDate" id="endDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                 <div class="form-group">
+						<label class="control-label col-md-5"> 
+							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                    <div class="col-md-4">
+	                  		<select name="status" class="form-control" id="statusInput">
+								<option value="">请选择...</option>
+								<option value="1">当前版本</option>
+								<option value="2">待更新版本</option>
+								<option value="0">历史版本</option>
+							</select>
+						</div>
+	              </div>
+	              
+                 <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                   	<div class="col-md-4">
+                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                   	</div>
+                </div>
+                <!-- 表单分组组件 form-group END -->
+			</div>
+			
+			<!-- 表单按钮组件 START -->
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-5 col-md-7">
+						<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>
+			<!-- 表单按钮组件 END -->
+		</form>
+		<!-- END FORM-->
+	</div>
+	<!-- 表单组件 END -->
+</div>
+<!-- 信息容器组件 END -->
+
+<!-- 线路信息添加片段JS模块 -->
+<script src="/pages/base/lineversions/js/lineversions-add-from.js"></script>
 \ No newline at end of file
+<!-- 片段标题 START -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>修改线路信息</h1>
+	</div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><a href="/pages/base/line/list.html" data-pjax>线路信息</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">修改线路信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<!-- 信息容器组件 START -->
+<div class="portlet light bordered">
+
+	<!-- 信息容器组件标题 START -->
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> 
+			<span class="caption-subject font-red-sunglo bold uppercase">修改线路信息</span>
+		</div>
+	</div>
+	<!-- 信息容器组件标题 END -->
+	
+	<!-- 表单容器组件 START -->
+	<div class="portlet-body form" id="lineEditForm">
+		
+		<!-- START FORM -->
+		<form action="/lineVersions" class="form-horizontal" id="lineVersions_edit_form" >
+			
+			<!-- 错误提示信息组件 START -->
+			<div class="alert alert-danger display-hide">
+				<button class="close" data-close="alert"></button>
+				您的输入有误，请检查下面的输入项
+			</div>
+			<!-- 错误提示信息组件 END -->
+			
+			<!-- 表单内容 START -->
+			<div class="form-body">
+				<input type="hidden" name="lineId" id="lineIdInput" />
+				<input type="hidden" name="lineCode" id="lineCodeInput" />
+				
+				<!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本Id&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="Id" id="IdInput" readonly="readonly" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                 <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路名称&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<select name="line" class="form-control" style="width:100%" id="lineSelect"></select>
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                  <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>启用时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="startDate" id="startDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                 
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>终止时间&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="endDate" id="endDateInput" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                   <!-- 表单分组组件 form-group START -->
+				<div class="form-group">
+						<label class="control-label col-md-5">
+          					<span class="required"> * </span>线路版本&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+                    	</label>
+	                    <div class="col-md-4">
+	                     	<input type="text" class="form-control" name="versions" id="versionsInput" placeholder="线路版本" />
+	                    </div>
+                 </div>
+                 <!-- 表单分组组件 form-group END -->
+                  
+                 <div class="form-group">
+						<label class="control-label col-md-5"> 
+							<span class="required"> * </span>线路版本状态&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
+						</label>
+	                    <div class="col-md-4">
+	                  		<select name="status" class="form-control" id="statusInput">
+								<option value="">请选择...</option>
+								<option value="1">当前版本</option>
+								<option value="2">待更新版本</option>
+								<option value="0">历史版本</option>
+							</select>
+						</div>
+	              </div>
+	              
+                 <!-- 表单分组组件 form-group START -->
+                 <div class="form-group">
+					<label class="control-label col-md-5"> 描述/说明&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;: </label>
+                   	<div class="col-md-4">
+                    		<textarea class="form-control" rows="3" name="remark" id="remarkTextarea" placeholder="请填写更换版本原因，方便排班人员操作！"></textarea>
+                   	</div>
+                </div>
+                <!-- 表单分组组件 form-group END -->
+			</div>
+			
+			<!-- 表单按钮组件 START -->
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-5 col-md-7">
+						<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>
+			<!-- 表单按钮组件 END -->
+		</form>
+		<!-- END FORM-->
+	</div>
+	<!-- 表单组件 END -->
+</div>
+<!-- 信息容器组件 END -->
+
+<!-- 线路信息修改片段JS模块 -->
+<script src="/pages/base/lineversions/js/lineversions-edit-from.js"></script>
 \ No newline at end of file
+// 线路版本添加js
+(function(){
+	//获取参数ID
+	var id = $.url().param('no');
+	
+	$("#startDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	
+	$("#endDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	// 初始化线路名称select
+	lineAllInfo();
+	
+	function getComp (cb) {
+		$.get('/user/companyData',null,function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			return cb && cb(params);
+		});
+	}
+	
+	// 填充公司下拉框选择值
+	function lineAllInfo(){
+		getComp(function(params) {
+			$get('/line/all', params, function(array){
+				// get请求获取公司
+				$get('/business/all', {upCode_eq: '88'}, function(compD){
+					var len_ = array.length,paramsD = new Array();
+					if(len_>0) {
+						$.each(array, function(i, g){
+							if(g.name!='' || g.name != null) {
+								paramsD.push({'id':g.id + '_' + g.lineCode,
+											  'text':g.name + gsdmTogsName(compD,g.company)});
+							}
+						});
+						if($('span').hasClass('select2-selection'))
+							$('span .select2-selection').remove();
+						initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+							selector.select2("val", splitxlName(window.localStorage.xlName_AgursData));
+						});
+					}
+				});
+			});
+		});
+	}
+	
+	// 监听线路名称下拉框值改变事件.
+	$('#lineSelect').on("change", function (e) { 
+		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
+		if(lineSelectValue=='' || lineSelectValue==null) {
+			$('#lineCodeInput').val('');// 设值线路编码.
+			$('#lineIdInput').val('');// 设值线路ID.
+		}else {
+			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
+			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+		}
+	});
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+	// 切割线路名称值.获取线路ID及编码.
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	// 定义表单
+	var form = $('#lineVersions_add_form');
+	// 定义表单异常
+	var error = $('.alert-danger',form);
+	// 表单验证
+	form.validate({
+		// 错误提示元素span对象
+		errorElement : 'span',
+		// 错误提示元素class名称
+		errorClass : 'help-block help-block-error', 
+		// 验证错误获取焦点
+		focusInvalid : true, 
+		// 需要验证的表单元素
+		rules : {
+			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
+			'startDate' : {required : true},// 启用时间 不为空.
+			'endDate' : {required : true},// 结束时间.
+			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
+			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
+		},
+		
+		/**
+		 * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。
+		 * 
+		 * 参数：该回调函数有两个参数：第一个为一个事件对象，第二个为验证器（validator）
+		 */
+		invalidHandler : function(event, validator) {
+			// 显示表单未通过提示信息
+			error.show();
+			// 把提示信息放到指定的位置。
+			App.scrollTo(error, -200);
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：添加errorClass("has-error")到表单元素。将未通过验证的表单元素设置高亮。
+		 */
+		highlight : function(element) { 
+			// 添加errorClass("has-error")到表单元素
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：移除errorClass("has-error")。与highlight操作相反
+		 */
+		unhighlight : function(element) { 
+			// 移除errorClass("has-error")
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：String,Callback。
+		 * 
+		 * 如果指定它，当验证通过时显示一个消息。
+		 * 
+		 * 如果是String类型的，则添加该样式到标签中；
+		 * 
+		 * 如果是一个回调函数，则将标签作为其唯一的参数。
+		 */
+		success : function(label) {
+			// 当验证通过时,移除errorClass("has-error")
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
+		 */
+		submitHandler : function(f) {
+			// 隐藏错误提示
+			error.hide();
+			// 表单序列化
+			var params = form.serializeJSON();
+			submit();
+			// 提交
+			function submit() {
+				// 添加数据
+				$post('/lineVersions/add', params, function(result) {
+					// 如果返回结果不为空
+					if(result){
+						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
+						if(result.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							layer.msg('添加成功...');
+						} else if(result.status=='ERROR') {
+							// 弹出添加失败提示消息
+							layer.msg('添加失败...');
+						}
+					}
+					// 返回list.html页面
+					loadPage('list.html');
+				});
+			}
+		}
+	});
+})();
 \ No newline at end of file
+// 线路版本修改js
+(function(){
+	//获取参数ID
+	var id = $.url().param('no');
+	
+	$("#startDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	
+	$("#endDateInput").datetimepicker({
+		format : 'YYYY-MM-DD HH:mm:ss',
+		locale : 'zh-cn'
+	});
+	// 初始化线路名称select
+	lineAllInfo();
+	
+	function getComp (cb) {
+		$.get('/user/companyData',null,function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			return cb && cb(params);
+		});
+	}
+	
+	// 填充公司下拉框选择值
+	function lineAllInfo(){
+		getComp(function(params) {
+			$get('/line/all', params, function(array){
+				// get请求获取公司
+				$get('/business/all', {upCode_eq: '88'}, function(compD){
+					var len_ = array.length,paramsD = new Array();
+					if(len_>0) {
+						$.each(array, function(i, g){
+							if(g.name!='' || g.name != null) {
+								paramsD.push({'id':g.id + '_' + g.lineCode,
+											  'text':g.name + gsdmTogsName(compD,g.company)});
+							}
+						});
+						if($('span').hasClass('select2-selection'))
+							$('span .select2-selection').remove();
+						initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+							selector.select2("val", splitxlName(window.localStorage.xlName_AgursData));
+						});
+					}
+				});
+			});
+		});
+	}
+	
+	// 监听线路名称下拉框值改变事件.
+	$('#lineSelect').on("change", function (e) { 
+		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
+		if(lineSelectValue=='' || lineSelectValue==null) {
+			$('#lineCodeInput').val('');// 设值线路编码.
+			$('#lineIdInput').val('');// 设值线路ID.
+		}else {
+			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
+			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
+			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+		}
+	});
+	
+	// 如果参数ID不为空
+	if(id) {
+		setTimeout(function(){
+				/** 根据ID查询详细信息 */
+				$get('/lineVersions/findById',{'id':id}, function(result){
+					// 如果不为空
+					if(result) {	
+						$("#IdInput").val(result.id);
+						$("#lineIdInput").val(result.line);
+						$("#lineCodeInput").val(result.lineCode);
+						$("#lineSelect").val();
+						$("#lineSelect").val(result.line.id+"_"+result.lineCode).trigger("change");
+						$("#startDateInput").val(moment(result.startDate).format('YYYY-MM-DD HH:mm:ss'));
+						$("#endDateInput").val(moment(result.endDate).format('YYYY-MM-DD HH:mm:ss'));
+						$("#versionsInput").val(result.versions);
+						$("#statusInput").val(result.status);
+						$("#remarkTextarea").val(result.remark);
+					}
+					 
+				});
+		}, 500);
+		
+	} else {
+		// 缺少ID
+		layer.confirm('【ID缺失，请点击返回，重新进行修改操作】', {btn : [ '返回' ],icon: 3, title:'提示'}, function(index){
+			// 关闭弹出层
+			layer.close(index);
+			// 跳转到list页面
+			loadPage('list.html');
+		});
+	}
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+	// 切割线路名称值.获取线路ID及编码.
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	// 定义表单
+	var form = $('#lineVersions_edit_form');
+	// 定义表单异常
+	var error = $('.alert-danger',form);
+	// 表单验证
+	form.validate({
+		// 错误提示元素span对象
+		errorElement : 'span',
+		// 错误提示元素class名称
+		errorClass : 'help-block help-block-error', 
+		// 验证错误获取焦点
+		focusInvalid : true, 
+		// 需要验证的表单元素
+		rules : {
+			'line' : {required : true,maxlength: 30},// 线路名称 必填项、最大长度.
+			'startDate' : {required : true},// 启用时间 不为空.
+			'endDate' : {required : true},// 结束时间.
+			'versions' : {required : true, digits : true, maxlength: 10},// 版本号  必填项、数字、最大长度10.
+			'status' : {required : true, digits : true, maxlength: 10},// 版本状态 必填项、数字、最大长度10.
+		},
+		
+		/**
+		 * 类型：Callback。当未通过验证的表单提交时，可以在该回调函数中处理一些事情。
+		 * 
+		 * 参数：该回调函数有两个参数：第一个为一个事件对象，第二个为验证器（validator）
+		 */
+		invalidHandler : function(event, validator) {
+			// 显示表单未通过提示信息
+			error.show();
+			// 把提示信息放到指定的位置。
+			App.scrollTo(error, -200);
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：添加errorClass("has-error")到表单元素。将未通过验证的表单元素设置高亮。
+		 */
+		highlight : function(element) { 
+			// 添加errorClass("has-error")到表单元素
+			$(element).closest('.form-group').addClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：移除errorClass("has-error")。与highlight操作相反
+		 */
+		unhighlight : function(element) { 
+			// 移除errorClass("has-error")
+			$(element).closest('.form-group').removeClass('has-error'); 
+		},
+		
+		/**
+		 * 类型：String,Callback。
+		 * 
+		 * 如果指定它，当验证通过时显示一个消息。
+		 * 
+		 * 如果是String类型的，则添加该样式到标签中；
+		 * 
+		 * 如果是一个回调函数，则将标签作为其唯一的参数。
+		 */
+		success : function(label) {
+			// 当验证通过时,移除errorClass("has-error")
+			label.closest('.form-group').removeClass('has-error'); 
+			
+		},
+		/**
+		 * 类型：Callback。
+		 * 
+		 * 默认：default (native) form submit;当表单通过验证，提交表单。回调函数有个默认参数form
+		 */
+		submitHandler : function(f) {
+			// 隐藏错误提示
+			error.hide();
+			// 表单序列化
+			var params = form.serializeJSON();
+			submit();
+			// 提交
+			function submit() {
+				// 添加数据
+				$post('/lineVersions/update', params, function(result) {
+					// 如果返回结果不为空
+					if(result){
+						// 返回状态码为"SUCCESS" ，则添加成功；返回状态码为"ERROR" ，则添加失败
+						if(result.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							layer.msg('修改成功...');
+						} else if(result.status=='ERROR') {
+							// 弹出添加失败提示消息
+							layer.msg('修改失败...');
+						}
+					}
+					// 返回list.html页面
+					loadPage('list.html');
+				});
+			}
+		}
+	});
+})();
 \ No newline at end of file
+/**
+ * 
+ * @JSName : lineversions-list-table.js(线路版本信息list.html页面js)
+ * @Description : TOOD(线路信息list.html页面js)
+ */
+
+(function(){
+	// 关闭左侧栏
+	if (!$('body').hasClass('page-sidebar-closed')) {$('.menu-toggler.sidebar-toggler').click();}
+	// 定义 page : 当前页；initPag ； icheckOptions:选择框
+	var page = 0,
+		initPag,
+		icheckOptions = {checkboxClass: 'icheckbox_flat-blue',increaseArea: '20%'},
+		storage = window.localStorage;
+	if(storage.xlName_AgursData!=null && storage.xlName_AgursData !='') {
+		$('.tipso-animation').children().remove();
+		// 延迟加载
+		setTimeout(function(){
+			$('.tipso-animation').tipso({
+			      speed           : 400,
+			      background      : '#0ed0e8',
+			      color           : '#ffffff',
+			      position		  :'bottom',
+			      width           : 400,
+			      delay           : 100,
+			      animationIn	  : 'fadeInDownBig',
+			      animationOut	  : 'fadeOut',
+			      offsetX         : -50,
+			      offsetY         : -195,
+			      content	      :'您可以通过点击重置按钮来清除对线路名称的记忆哦!',
+			     
+			});
+			$('.tipso-animation').tipso('show');
+			setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
+		},200);
+	}
+	initCompanySelect2(function(array) {
+		// 公司下拉options属性值
+		var options = '<option value="">请选择...</option>';
+		// 遍历array
+		$.each(array, function(i,d){
+			options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+		});
+		// 初始化公司下拉框并监听值改变事件.
+		$('#companySelect').html(options).on('change', setBrancheCompanySelectOptions);
+		// 初始化分公司下拉框.
+		setBrancheCompanySelectOptions();
+		initLineSelect2(array);
+		/** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
+		loadTableDate({'line.name_like':splitxlName(storage.xlName_AgursData)},true);
+	});
+	
+	function initLineSelect2(compD) {
+		getComp(function(rs) {
+			var params = {};
+			if(rs.length>0) {
+				var compA = new Array();
+				for(var c = 0 ; c<rs.length;c++) {
+					var comC = rs[c].companyCode;
+					var child = rs[c].children;
+					if(child.length>0) {
+						for(var d = 0 ;d< child.length;d++) {
+							compA.push(comC + '_' + child[d].code);
+						}
+					}else {
+						compA.push(comC);
+					}
+				}
+				params.cgsbm_in  = compA.toString();
+			}
+			// 填充线路拉框选择值
+			$get('/line/all', params, function(array){
+				var len_ = array.length,paramsD = new Array();
+				if(len_>0) {
+					$.each(array, function(i, g){
+						if(g.name!='' || g.name != null) {
+							paramsD.push({'id':g.name + '_' + g.id + '_' + g.lineCode ,'text':g.name + gsdmTogsName(compD,g.company)});
+						}
+					});
+					if($('span').hasClass('select2-selection'))
+						$('span .select2-selection').remove();
+					initPinYinSelect2($('#lineSelect'),paramsD,function(selector) {
+						selector.select2("val", storage.xlName_AgursData);
+					});
+				}
+			});
+		});
+	}
+	
+	function gsdmTogsName(gsD,code) {
+		var rsStr = '';
+		for(var s = 0 ; s < gsD.length; s++) {
+			if(gsD[s].businessCode == code) {
+				rsStr = rsStr + '(' + gsD[s].businessName.replace('公司','') + ')';
+				break;
+			}
+		}
+		return rsStr;
+	}
+	
+    function initCompanySelect2(cb) {
+		// get请求获取公司
+		$get('/business/all', {upCode_eq: '88'}, function(gs_d){
+			 return cb && cb(gs_d);
+		});
+	}
+	function getComp(cb) {
+		$.get('/user/companyData',null,function(rs) {
+			return cb && cb(rs);
+		});
+	}
+	function getParams() {
+		// cells 集合返回表格中所有（列）单元格的一个数组
+		var cells = $('tr.filter')[0].cells;
+		// 搜索参数集合
+		var params = {};
+		// 搜索字段名称
+		var name;
+		// 遍历cells数组
+		$.each(cells, function(i, cell){
+			// 获取第i列的input或者select集合
+			var items = $('input,select', cell);
+			// 遍历items集合
+			for(var j = 0, item; item = items[j++];){
+				// 获取字段名称
+				name = $(item).attr('name');
+				if(name){
+					// 赋取相对应的值
+					params[name] = $(item).val();
+				}
+			}
+		});
+		return params;
+	}
+	
+	/** 表格数据分页加载事件 @param:<param : 查询参数;isPon : 是否重新分页> */
+	function loadTableDate(param,isPon){
+		// 搜索参数
+		var params = {};
+		if(param) {
+			params = param;
+		}
+		// 排序（按方向与序号）
+		params['order'] = 'lineCode,versions';
+		// 排序方向.
+		params['direction'] = 'ASC,ASC';
+		// 记录当前页数
+		params['page'] = page;
+		// 弹出正在加载层
+		var i = layer.load(2);
+		// 异步请求获取表格数据
+		$.get('/lineVersions',params,function(result){
+			// 添加序号
+			result.content.page =  page;
+			// 把数据填充到模版中
+			$.each(result.content, function(){
+				this.startDateStr=moment(this.startDate).format('YYYY-MM-DD HH:mm:ss');
+				this.endDateStr=moment(this.endDate).format('YYYY-MM-DD HH:mm:ss');
+			})
+
+			var tbodyHtml = template('lineversions_list_temp',{list:result.content});
+			$('#datatable_lineversions tbody').html(tbodyHtml);
+			// 是重新分页且返回数据长度大于0
+			if(isPon && result.content.length > 0){
+				// 重新分页
+				initPag = true;
+				// 分页栏
+				showPagination(result);
+			}
+			// 关闭弹出加载层
+			layer.close(i);
+		});
+	}
+
+
+	function toDate(timestamp){
+		var date = new Date(parseInt(timestamp).toLocaleString());
+		return date;
+	}
+	
+	/** 复选框组件 */
+	function iCheckChange(){
+		// 获取当前的父节点tr
+		var tr = $(this).parents('tr');
+		// 判断当前是否选中
+		if(this.checked) {
+			// 选中，则增添父节点tr的样式
+			tr.addClass('row-active');
+		}else {
+			// 未选中，则删除父节点tr的样式
+			tr.removeClass('row-active');
+		}
+	}
+	
+	/** 分页栏组件 */
+	function showPagination(data){
+		// 分页组件
+		$('#pagination').jqPaginator({
+			// 总页数
+		    totalPages: data.totalPages,
+		    // 中间显示页数
+		    visiblePages: 6,
+		    // 当前页
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev:  '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next:  '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last:  '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page:  '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPag){
+		    		initPag = false;
+		    		return;
+		    	}	
+		    	var pData = getParams();
+		    	pData['line.name_like'] = splitxlName(pData['line.name_like']);
+		    	page = num - 1;
+		    	loadTableDate(pData, false);
+		    }
+		});
+	}
+	 /** 填充分公司下拉框选择值 */ 
+	 function setBrancheCompanySelectOptions(){
+		 // 获取公司下拉框选择值
+		 var businessCode = $('#companySelect').val();
+		 // 分公司下拉框options属性值
+		 var options = '<option value="">请选择...</option>';
+		 // 如果公司选择为空则分公司为空 ; 否则查询出所属公司下的分公司名称和相应分公司代码
+		 if(businessCode == null || businessCode ==''){
+			 // 填充分公司下拉框options
+			 $('#brancheCompanySelect').html(options);
+		  } else {
+			  /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+			  $get('/business/all', {upCode_eq: businessCode}, function(array){
+				  // 遍历array
+				  $.each(array, function(i,d){
+					  options += '<option value="'+d.businessCode+'">'+d.businessName+'</option>';
+					  // 填充分公司下拉框options
+					  $('#brancheCompanySelect').html(options);
+				  });
+			  });
+		  }
+	 }
+	
+	/** 重置按钮事件 */
+	$('tr.filter .filter-cancel').on('click',function() {
+		 // 清空搜索框值
+		 $('tr.filter input,select').val('').change();
+		 $('.tipso-animation').tipso('hide');
+		 storage.setItem('xlName_AgursData','');
+		 /** 表格数据分页加载 @param：<null：搜索参数；true：是否重新分页> */
+		 loadTableDate(null,true);
+	});
+	
+	function splitxlName(str) {
+		var rsStr = '';
+		if(str) {
+			var strArray = str.split('_');
+			rsStr = strArray[0];
+		}
+		return rsStr;
+	}
+	
+	/**  搜索按钮事件 */
+	$('tr.filter .filter-submit').on('click',function(){
+		var params =  getParams();
+		if(params['line.name_like']!='' && params['line.name_like'] != null) {
+			storage.setItem('xlName_AgursData',params['line.name_like']);
+		}
+		params['line.name_like'] = splitxlName(params['line.name_like']);
+		page = 0;
+		/** 表格数据分页加载 @param：<params：搜索参数；true：是否重新分页> */
+		loadTableDate(params,true);
+	});
+	
+})();
 \ No newline at end of file
+<!-- 片段标题 START -->
+<div class="page-head">
+	<div class="page-title">
+		<h1>线路版本信息</h1>
+	</div>
+</div>
+<!-- 片段标题 END -->
+
+<!-- 线路信息导航栏组件 START -->
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">基础信息</span> <i class="fa fa-circle"></i></li>
+	<li><span class="active">线路版本信息</span></li>
+</ul>
+<!-- 线路信息导航栏组件 END -->
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<div class="tipso-animation">
+				</div>
+				<div class="caption">
+					 <i class="fa fa-info-circle font-dark"></i> 
+					 <span class="caption-subject font-dark sbold uppercase">线路版本信息</span>
+				</div>
+				<div class="actions">
+					<div class="btn-group btn-group-devided" data-toggle="buttons">
+						<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加线路版本</a>
+					</div>
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table class="table table-striped table-bordered table-hover table-checkable" id="datatable_lineversions">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="4%">序号</th>
+								<th width="5%">线路编码</th>
+								<th width="8%">线路名称</th>
+								<th width="8%">所属公司</th>
+								<th width="9%">所属分公司</th>
+								<th width="8%">启用时间</th>
+								<th width="8%">终止时间</th>
+								<th width="6%">版本号</th>
+								<th width="6%">版本状态</th>
+								<th width="6%">描述</th>
+								<th width="12%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td>#</td>
+								<td>
+									<input type="text"  class="form-control form-filter input-sm" name="lineCode_eq">
+								</td>
+								<td>
+									<select name="line.name_like" class="form-control" style="width:100%" id="lineSelect"></select>
+									<!-- <input type="text"  class="form-control form-filter input-sm" name="name_like"> -->
+								</td>
+								<td>
+									 <!-- 公司这里没使用字典表，暂时查的公司表 -->
+									 <select name="line.company_eq" class="form-control" id="companySelect"></select>
+								</td>
+								<!-- 闵行没有下属公司，这里暂时注释掉 -->
+								<td>
+									 <select name="line.brancheCompany_eq" class="form-control" id="brancheCompanySelect"></select>
+								</td>
+								<td>
+<!-- 									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq"> -->
+								</td>
+								<td>
+<!-- 									 <input type="text" class="form-control form-filter input-sm" name="shanghaiLinecode_eq"> -->
+								</td>
+								<td>
+									 <input type="text" class="form-control form-filter input-sm" name="versions_eq">
+									 
+								</td>
+								<td>
+									 <select name="status_eq" class="form-control" id="statusSelect">
+										<option value="">请选择...</option>
+										<option value="1">当前版本</option>
+										<option value="2">待更新版本</option>
+										<option value="0">历史版本</option>
+									</select>
+								</td>
+								<td></td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+										<i class="fa fa-search"></i> 搜索
+									</button>
+                                                                
+									<button class="btn btn-sm red btn-outline filter-cancel" id="notification-trigger">
+										<i class="fa fa-times"></i> 重置
+									</button>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script type="text/html" id="lineversions_list_temp">
+	{{each list as obj i }}
+		<tr>
+			<td style="vertical-align: middle;">
+				{{(list.page*10)+(i+1)}}
+			</td>
+			<td>
+				{{obj.lineCode}}
+			</td>
+			<td>
+				{{obj.line.name}}
+			</td>
+			<td>
+				{{if obj.line.company == '55'}}
+					上南公司
+				{{else if obj.line.company == '22'}}
+					金高公司
+				{{else if obj.line.company == '05'}}
+					杨高公司
+				{{else if obj.line.company == '26'}}
+					南汇公司
+				{{else if obj.line.company == '77'}}
+					闵行公司
+				{{/if}}
+			</td>
+			<td>
+				{{if obj.line.company == '55'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						上南二分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						上南三分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						上南六分公司
+					{{else if obj.line.brancheCompany == '4'}}
+						上南一分公司
+					{{/if}}
+
+				{{else if obj.company == '22'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						四分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						二分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						三分公司
+					{{else if obj.line.brancheCompany == '5'}}
+						一分公司
+					{{/if}}
+		
+				{{else if obj.line.company == '05'}}
+					
+					{{if obj.line.brancheCompany == '1'}}
+						川沙分公司
+					{{else if obj.line.brancheCompany == '2'}}
+						金桥分公司
+					{{else if obj.line.brancheCompany == '3'}}
+						芦潮港分公司
+					{{else if obj.line.brancheCompany == '5'}}
+						杨高分公司
+					{{else if obj.line.brancheCompany == '6'}}
+						周浦分公司
+					{{/if}}
+
+				{{else if obj.line.company == '26'}}
+
+					{{if obj.line.brancheCompany == '1'}}
+						南汇一分
+					{{else if obj.line.brancheCompany == '2'}}
+						南汇二分
+					{{else if obj.line.brancheCompany == '3'}}
+						南汇三分
+					{{else if obj.line.brancheCompany == '4'}}
+						南汇维修公司
+					{{else if obj.line.brancheCompany == '5'}}
+						南汇公司
+					{{/if}}
+
+				{{/if}}
+			</td>
+			<td>
+				{{obj.startDateStr}}
+			</td>
+			<td>
+				{{obj.endDateStr}}
+			</td>
+			<td>
+				{{obj.versions}}
+			</td>
+			<td>
+				{{if obj.status == '0'}}
+						历史版本
+				{{else if obj.status == '1'}}
+						当前版本
+				{{else if obj.status == '2'}}
+						待更新版本
+				{{/if}}
+			</td>
+			<td>
+				{{obj.remark}}
+			</td>
+			<td>
+				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
+			</td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan=13><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
+</script>
+<!-- 线路信息片段JS模块 -->
+<script src="/pages/base/lineversions/js/lineversions-list-table.js"></script>
 \ No newline at end of file
@@ -245,7 +245,7 @@
 								<div class="form-group">
 									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly>
+										<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
 									</div>
 								</div>
 							</div>
@@ -6,13 +6,22 @@ $(function(){
 	// 监听线路名称下拉框值改变事件.
 	$('#lineSelect').on("change", function (e) { 
 		var lineSelectValue = $('#lineSelect').val();// 获取线路名称值.
-		if(lineSelectValue=='') {
+		if(lineSelectValue=='' || lineSelectValue==null) {
 			$('#lineCodeInput').val('');// 设值线路编码.
 			$('#lineIdInput').val('');// 设值线路ID.
 		}else {
+			debugger
 			var lineSelectValueArray = lineSelectValue.split('_');// 切割线路名称值.
 			$('#lineIdInput').val(lineSelectValueArray[0]);// 设值线路编码.
 			$('#lineCodeInput').val(lineSelectValueArray[1]);// 设值线路ID.
+			// 版本号赋值
+			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
 			// 获取该线路下的路段路由.
 			PublicFunctions.getSectionRouteInfo(lineSelectValueArray[0],function(array) {
 				// 定义路段路由长度、渲染拼音检索下拉框格式数据.
@@ -27,6 +27,7 @@
 		// 线路下拉框初始化.
 		PublicFunctions.getLineAllInfo(function(array,compD) {
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
 				$.each(array, function(i, g){
 					if(g.name!='' || g.name != null) {
@@ -33,7 +33,7 @@ var PositionsPublicFunctions = function () {
 			$('#speedLimitInput').val(Section.sectionSpeedLimit);// 道路限速
 			$('#sectionDistanceInput').val(Section.sectionDistance);// 路段长度
 			$('#sectionTimeInput').val(Section.sectionTime);// 路段长度
-			$('#versionsInput').val(Section.sectionVersion);// 版本号
+			$('#versionsInput').val(Section.sectionRouteVersions);// 版本号
 			$('#destroySelect').val(Section.sectionRouteDestroy);// 是否撤销
 			$('#descriptionsTextarea').val(Section.sectionRouteDescriptions);// 描述/说明
 			$('#isRoadeSpeedInput').val(Section.isRoadeSpeed);// 是否有路段限速数据  <0：分段；1：未分段>
@@ -288,7 +288,7 @@
 								<div class="form-group">
 									<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 									<div class="col-md-6">
-										<input type="text" class="form-control" name="versions" value='1' Readonly>
+										<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
 									</div>
 								</div>
 							</div>
@@ -184,7 +184,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -253,7 +253,7 @@ $(&#39;#editPoitsions_station_mobal&#39;).on(&#39;editStationMobal_show&#39;, function(e, map,fu
 			'stationMark' : {required : true},// 站点类型  必填项
 			'bJwpoints' : {required : true},// 经纬度坐标点  必填项
 			'shapesType' : {required : true},// 几何图形类型  必填项
-			'radius' : {required : true},// 圆形半径  必填项
+			'radius' : {required : true, number : true,},// 圆形半径  必填项
 			'destroy' : {required : true},// 是否撤销  必填项
 			'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
 			'distances' : {number : true},// 到站距离 // 到站距离
@@ -14,7 +14,7 @@ $(function(){
 	// 监听线路名称值改变事件.
 	$('#lineSelect').on("change", function (e) { 
 		var lineSelectValue = $(this).val();
-		if(lineSelectValue=='' && lineSelectValue ==null) {
+		if(lineSelectValue=='' || lineSelectValue ==null) {
 			$('#lineCodeInput').val('');
 			$('#lineIdInput').val('');
 		}else {
@@ -23,6 +23,14 @@ $(function(){
 			$('#lineIdInput').val(lineSelectValueArray[0]);
 			$('#lineCodeInput').val(lineSelectValueArray[1]);
 			var params =  {'lineCode_eq':lineSelectValueArray[1],'destroy_eq':0,'directions_eq':dir};
+			// 版本号赋值
+			$.get('/lineVersions/findByLineId',{'lineId':lineSelectValueArray[0]},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
 			initSelect(params);
 		}
 	});
@@ -58,8 +66,8 @@ $(function(){
 		PublicFunctions.getStationRouteInfo(p,function(array) {
 			// 定义路段路由长度、渲染拼音检索下拉框格式数据.
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
-				paramsD.push({'id':'','text':'请选择...'});
 				// 遍历.
 				$.each(array, function(i, g){
 					// 判断.
@@ -25,6 +25,7 @@
 		$('#destroySelect').val('0');
 		PublicFunctions.getLineAllInfo(function(array,compD) {
 			var len_ = array.length,paramsD = new Array();
+//			paramsD.push({'id':'','text':'请选择...'});
 			if(len_>0) {
 				$.each(array, function(i, g){
 					if(g.name!='' || g.name != null) {
@@ -36,7 +36,7 @@ var FormWizard = function() {
 					'directions' : 	  	 {required : true,},// 站点方向 必填项
 					'bJwpoints' : 		 {required : true,},// 经纬度坐标点 必填项
 					'shapesType' : 	     {required : true,},// 范围图形类型 必填项
-					'radius':			 {required : true,},// 圆形半径 
+					'radius':			 {required : true, number : true,},// 圆形半径 
 					'destroy' : 		 {required : true,},// 是否撤销 必填项.
 					'toTime' : 			 {number   : true,},// 路段时长 必须输入合法的数字（负数，小数）。
 					'distances' : 		 {number   : true,},// 路段时长 必须输入合法的数字（负数，小数）。
@@ -54,7 +54,7 @@
 				'stationRouteCode' : {isStart : true},// 站点序号
 				'bJwpoints' : {required : true},// 经纬度坐标点  必填项
 				'shapesType' : {required : true},// 几何图形类型  必填项
-				'radius' : {required : true},// 圆形半径  必填项
+				'radius' : {required : true, number : true,},// 圆形半径  必填项
 				'destroy' : {required : true},// 是否撤销  必填项
 				'toTime' : {number : true},// 到站时间 必须输入合法的数字（负数，小数）。
 				'distances' : {number : true},// 到站距离 // 到站距离
@@ -150,6 +150,8 @@ var PositionsPublicFunctions = function () {
 				$('#toTimeInput').val(stationObj.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(stationObj.stationRouteDistances);
+				// 版本号
+				$('#versionsInput').val(stationObj.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
 			},
@@ -194,6 +196,8 @@ var PositionsPublicFunctions = function () {
 				$('#toTimeInput').val(stationObj.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(stationObj.stationRouteDistances);
+				// 版本号
+				$('#versionsInput').val(stationObj.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(stationObj.stationRouteDescriptions);
 			},
@@ -241,7 +241,7 @@
 						<label class="control-label col-md-5"><span class="required">  </span>  版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:
 						</label>
                     	<div class="col-md-4">
-                     		<input type="text" class="form-control" name="versions"  >
+                     		<input type="text" class="form-control" name="versions" id="versionsInput" Readonly>
                     	</div>
 	                </div>
                  </div>
@@ -173,7 +173,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -236,6 +236,15 @@ $(&#39;#add_station_mobal&#39;).on(&#39;AddStationMobal.show&#39;, function(e, addMap,ajaxd,stao
 			$('#radiusInput').val(Station.radius);
 			// 是否撤销
 			$('#destroySelect').val(0); 
+			// 版本号
+			$.get('/lineVersions/findByLineId',{'lineId':Line.id},function(lineVersions){
+				$.each(lineVersions,function(){
+					if (this.status == 1) {
+						$('#versionsInput').val(this.versions); 
+					}
+				})
+			});
+			
 			var initzdlyP = {'line.id_eq':Line.id,'destroy_eq':0,'directions_eq':Station.dir};
 			initSelect(initzdlyP);
 		});
@@ -171,7 +171,7 @@
 						<div class="form-group">
 							<label class="col-md-3 control-label">版本号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;:</label>
 							<div class="col-md-6">
-								<input type="text" class="form-control" name="versions" value='1' Readonly>
+								<input type="text" class="form-control" name="versions" id='versionsInput' Readonly>
 							</div>
 						</div>
 					</div>
@@ -277,7 +277,6 @@ var PublicFunctions = function () {
  
 			/** @param directionV_ ：方向 */
 			stationRevoke : function(directionV_) {
-				debugger
 				// 获取树选中节点对象
 				var obj = PublicFunctions.getCurrSelNode(directionV_);
 				// 是否选中，选中节点是否为站点
@@ -377,6 +376,8 @@ var PublicFunctions = function () {
 				$('#toTimeInput').val(editStationParmas.stationRouteToTime);
 				// 到站距离
 				$('#distancesInput').val(editStationParmas.stationRouteDistances);
+				// 线路版本号
+				$('#versionsInput').val(editStationParmas.stationRouteVersions);
 				// 描述/说明
 				$('#descriptionsTextarea').val(editStationParmas.stationRouteDescriptions);
 			},
@@ -121,7 +121,7 @@
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
 <script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
-<script src="/pages/base/timesmodel/js/v2/core/InternalGroupBcObj.js"></script>
+<script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalLpObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/main_v2.js"></script>
@@ -797,44 +797,44 @@ var BaseFun = function() {
                 var temp = [];
                 temp.push(allLMapBc[0]);
                 console.log(temp);
-                return {'json':temp,'bxrcgs':null};
+                //return {'json':temp,'bxrcgs':null};
  
-                //// 第二步 纵向调整
-                //baseF.evenStartDepartSpace(allLMapBc , dataMap);
-                ////return {'json':allLMapBc,'bxrcgs':null};
-                //
-				//// 第三步 剔除首末班车以外的班次，并确认首末班车.
-				//var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(allLMapBc , dataMap);
-                ////return {'json':markArray,'bxrcgs':null};
-				//// 第四步 横向调整
-				//baseF.resizeByPitStopTime(cara , markArray , dataMap);
+                // 第二步 纵向调整
+                baseF.evenStartDepartSpace(allLMapBc , dataMap);
+                //return {'json':allLMapBc,'bxrcgs':null};
+
+				// 第三步 剔除首末班车以外的班次，并确认首末班车.
+				var markArray = baseF.markFirstAndLastBusAlsoDietNotInRangeBc(allLMapBc , dataMap);
+                //return {'json':markArray,'bxrcgs':null};
+				// 第四步 横向调整
+				baseF.resizeByPitStopTime(cara , markArray , dataMap);
+                //return {'json':markArray,'bxrcgs':null};
+				/**
+				 * 第五步 把班型合理的分配到各个路牌上.
+				 *
+				 * 		 切割班型/人次/配车数 字符串 为 数组对象.
+				 *
+				 * 		 把班型分配到对应的具体路牌上.
+				 */
+				// 切割班型/人次/配车数 字符串 为 数组对象.
+				var list = baseF.getBxRcListCollection(map.bxrc);
+				// 把班型分配到对应的具体路牌上.
+				baseF.bxAlloTotLp(list,cara);
                 ////return {'json':markArray,'bxrcgs':null};
-				///**
-				// * 第五步 把班型合理的分配到各个路牌上.
-				// *
-				// * 		 切割班型/人次/配车数 字符串 为 数组对象.
-				// *
-				// * 		 把班型分配到对应的具体路牌上.
-				// */
-				//// 切割班型/人次/配车数 字符串 为 数组对象.
-				//var list = baseF.getBxRcListCollection(map.bxrc);
-				//// 把班型分配到对应的具体路牌上.
-				//baseF.bxAlloTotLp(list,cara);
-                //////return {'json':markArray,'bxrcgs':null};
-                ////
-                ////
-				//// 第六步 抽车来满足工时.
-				//var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
-				////return {'json':tempA,'bxrcgs':null};
-				//// 第七步 确定吃饭时间.
-                //if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
-                 //   baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
-                //}
-				//baseF.resizeByPitStopTime(cara , tempA , dataMap);
-				//baseF.updfcno01(tempA,0);
-                ////return {'json':tempA,'bxrcgs':null};
-				//// 确定进出场、早晚例保时间.并返回班次数组集合
-				//return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
+                //
+                //
+				// 第六步 抽车来满足工时.
+				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
+				//return {'json':tempA,'bxrcgs':null};
+				// 第七步 确定吃饭时间.
+                if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
+                    baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
+                }
+				baseF.resizeByPitStopTime(cara , tempA , dataMap);
+				baseF.updfcno01(tempA,0);
+                //return {'json':tempA,'bxrcgs':null};
+				// 确定进出场、早晚例保时间.并返回班次数组集合
+				return {'json':baseF.addInOutFieldBc(cara,tempA,dataMap,saa,map),'bxrcgs':null};
 			},
  
 			markeEatTime : function(list , markArray , cara , saa , dataMap ,map) {
 /**
  * 内部班次对象。
- * @constructor
+ * @param lpObj 内部路牌对象
+ * @param groupObj 内部圈对象
+ * @param otherParamObj 其他参数对象
+ * @constructor InternalBcObj
  */
 var InternalBcObj = function(
-    bcType, // 班次类型（normal，in，out等）
-    isUp, // boolean是否上下行
-    lp, // 路牌标识符
-    fcno, // 发车顺序号
-    fcTimeObj, // 发车时间对象
-    bclc, // 班次里程
-    bcsj, // 班次历时
-    arrtime, // 到达时间对象
-    stoptime, // 停站时间
-    tccid, // 停车场id
-    ttinfoid, // 时刻表id
-    xl, // 线路id
-    qdzid, // 起点站id
-    zdzid // 终点站id
+    lpObj, // InternalLpObj路牌对象
+    otherParamObj // 班次其他参数对象
 ) {
+    // 简单验证
+    if (!lpObj) {
+        throw "new InternalBcObj 路牌对象为空";
+    }
+    if (!otherParamObj) {
+        throw "new InternalBcObj 其他参数对象为空"
+    }
+
+    // 内部重要属性
+    this._$$_internal_lp_obj = lpObj; // 班次所属的路牌对象（横轴）
+    // 之后会设定
+    this._$$_internal_group_obj; // 班次所属的圈对象（纵轴）
+
     // 属性重新复制一遍，加前缀 _$_ 表示内部属性，不要直接访问k
     // 外部函数使用 prototype 方式
-    this._$_bcType = bcType;
-    this._$_isUp = isUp;
-    this._$_lp = lp;
-    this._$_fcno = fcno;
-    this._$_fcsjObj = moment(fcTimeObj);
-    this._$_bclc = bclc;
-    this._$_bcsj = bcsj;
-    this._$_arrtime = arrtime;
-    this._$_stoptime = stoptime;
-    this._$_tccid = tccid;
-    this._$_ttinfoid = ttinfoid;
-    this._$_xlid = xl;
-    this._$_qdzid = qdzid;
-    this._$_zdzid = zdzid;
+    this._$_bcType = otherParamObj.bcType; // 班次类型（normal，in，out等）
+    this._$_isUp = otherParamObj.isUp; // boolean是否上下行
+    this._$_fcno = otherParamObj.fcno; // 发车顺序号
+    this._$_fcsjObj = moment(otherParamObj.fcTimeObj); // 发车时间对象
+    this._$_bclc = otherParamObj.bclc; // 班次里程
+    this._$_bcsj = otherParamObj.bcsj; // 班次历时
+    this._$_arrtime = otherParamObj.arrtime; // 到达时间对象
+    this._$_stoptime = otherParamObj.stoptime; // 停站时间
+    this._$_tccid = otherParamObj.tccid; // 停车场id
+    this._$_ttinfoid = otherParamObj.ttinfoid; // 时刻表id
+    this._$_xlid = otherParamObj.xl; // 线路id
+    this._$_qdzid = otherParamObj.qdzid; // 起点站id
+    this._$_zdzid = otherParamObj.zdzid; // 终点站id
  
 };
  
+//------------------- get/set 方法 -------------------//
+
+/**
+ * 设置路牌对象。
+ * @param lpObj InternalLpObj路牌对象
+ */
+InternalBcObj.prototype.setLp = function(lpObj) {
+    this._$$_internal_lp_obj = lpObj;
+};
 /**
- * 设置路牌标号。
- * @param lpNo
+ * 设置圈对象。
+ * @param groupObj
  */
-InternalBcObj.prototype.setLp = function(lpNo) {
-    this._$_lp = lpNo;
+InternalBcObj.prototype.setGroup = function(groupObj) {
+    this._$$_internal_group_obj = groupObj;
 };
  
 /**
@@ -80,16 +92,19 @@ InternalBcObj.prototype.getBcTime = function() {
 InternalBcObj.prototype.getStopTime = function() {
     return this._$_stoptime;
 };
+
+//---------------------- 其他方法 -------------------------//
+
 /**
  * 转换成显示用班次对象。
  * @returns {{}}
  */
 InternalBcObj.prototype.toGanttBcObj = function() {
     var _bcObj = {
-        parent: this._$_lp,
-        lpNo: this._$_lp,
+        parent: this._$$_internal_lp_obj.getLpNo(),
+        lpNo: this._$$_internal_lp_obj.getLpNo(),
         lp: null,
-        lpName: this._$_lp,
+        lpName: this._$$_internal_lp_obj.getLpName(),
         lpType: '普通路牌',
         bcType: this._$_bcType,
         fcno: this._$_fcno,
@@ -4,11 +4,15 @@
  * 一定是从第1圈开始，第0圈表示中标线的第一个班次，是下行班次，则第0圈的上行班次就是空的。
  * @constructor
  */
-var InternalGroupBcObj = function(
+var InternalGroupObj = function(
+    lpObj, // 所属 InternalLpObj 路牌对象
     isUp, // 是否上行，就是圈以上行开始，还是下行开始
     bc1, // 第一班次
     bc2 // 第二个班次
 ) {
+    // 所属内部路牌对象
+    this._$$_internal_lp_obj = lpObj;
+
     this._$_isUp = isUp;
  
     this._$_internalBcArray = [];
@@ -16,26 +20,39 @@ var InternalGroupBcObj = function(
     this._$_internalBcArray.push(bc2);
 };
  
-InternalGroupBcObj.prototype.getBc1 = function() {
+//------------------------ get/set 方法 ------------------------//
+
+InternalGroupObj.prototype.getBc1 = function() {
     return this._$_internalBcArray[0];
 };
-InternalGroupBcObj.prototype.getBc2 = function() {
+InternalGroupObj.prototype.getBc2 = function() {
     return this._$_internalBcArray[1];
 };
  
-InternalGroupBcObj.prototype.setBc1 = function(bc) {
+InternalGroupObj.prototype.setBc1 = function(bc) {
     this._$_internalBcArray[0] = bc;
 };
-InternalGroupBcObj.prototype.setBc2 = function(bc) {
+InternalGroupObj.prototype.removeBc1 = function() {
+    this._$_internalBcArray[0] = undefined;
+};
+InternalGroupObj.prototype.setBc2 = function(bc) {
     this._$_internalBcArray[1] = bc;
 };
-InternalGroupBcObj.prototype.setLp = function(lp) {
+InternalGroupObj.prototype.removeBc2 = function() {
+    this._$_internalBcArray[1] = undefined;
+};
+InternalGroupObj.prototype.setLp = function(lpObj) {
+    this._$$_internal_lp_obj = lpObj; // InternalLpObj 对象
+
     var bc1 = this._$_internalBcArray[0];
     var bc2 = this._$_internalBcArray[1];
     if (bc1) {
-        bc1.setLp(lp);
+        bc1.setLp(lpObj);
     }
     if (bc2) {
-        bc2.setLp(lp);
+        bc2.setLp(lpObj);
     }
-};
 \ No newline at end of file
+};
+
+
+
@@ -3,11 +3,13 @@
  * @constructor
  */
 var InternalLpObj = function(
-    lp, // 路牌编号
+    orilpObj, // 原始路牌对象
     qCount, // 总共多少圈
     isUp // 圈是以上行开始还是下行开始
 ) {
-    this._$_lp = lp;
+    // TODO：原始路牌对象（这个路牌是对接外部gantt图像，以后有机会改了）
+    this._$$_orign_lp_obj = orilpObj;
+
     this._$_isUp = isUp;
  
     // 距离上一个路牌的最小发车间隔时间
@@ -26,19 +28,85 @@ var InternalLpObj = function(
  
     var i;
     for (i = 0; i < this._$_qCount; i++) {
-        this._$_groupBcArray[i] = new InternalGroupBcObj(
-            this._$_isUp, undefined, undefined);
+        this._$_groupBcArray[i] = new InternalGroupObj(
+            this, this._$_isUp, undefined, undefined);
     }
  
     // 班型的相关变量
     this._$_bx_isLb = false; // 是否连班
     this._$_bx_isfb = false; // 是否分班
     this._$_bx_isfb_5_2 = false; // 是否5休2分班
+    this._$_bx_desc; // 班型描述（默认为路牌编号）
  
     // TODO：
  
 };
  
+//------------------- get/set 方法 -------------------//
+
+/**
+ * 获取圈
+ * @param qIndex 圈index
+ */
+InternalLpObj.prototype.getGroup = function(qIndex) {
+    return this._$_groupBcArray[qIndex];
+};
+
+/**
+ * 获取班次。
+ * @param qIndex 第几圈
+ * @param bcIndex 第几个班次
+ */
+InternalLpObj.prototype.getBc = function(qIndex, bcIndex) {
+    var group = this._$_groupBcArray[qIndex];
+    var bc;
+    if (bcIndex == 0) {
+        bc = group.getBc1();
+    } else if (bcIndex == 1) {
+        bc = group.getBc2();
+    }
+    return bc;
+};
+
+/**
+ * 在具体位置设置班次。
+ * @param qIndex 第几圈
+ * @param bcIndex 第几个班次
+ * @param bc 班次对象
+ */
+InternalLpObj.prototype.setBc = function(qIndex, bcIndex, bc) {
+    var group = this._$_groupBcArray[qIndex];
+    if (bcIndex == 0) {
+        group.setBc1(bc);
+        bc.setGroup(group);
+    } else if (bcIndex == 1) {
+        group.setBc2(bc);
+        bc.setGroup(group);
+    }
+};
+
+/**
+ * 设置原始路牌对象。
+ * @param lpObj 原始路牌对象
+ */
+InternalLpObj.prototype.setLp = function(lpObj) {
+    this._$$_orign_lp_obj = lpObj;
+    var i;
+    var group;
+    for (i = 0; i < this._$_groupBcArray.length; i++) {
+        group = this._$_groupBcArray[i];
+        if (group) {
+            group.setLp(this); // 圈和班次保存都是 InternalLpObj 对象
+        }
+    }
+};
+
+InternalLpObj.prototype.getLpNo = function() {
+    return this._$$_orign_lp_obj.lpNo;
+};
+InternalLpObj.prototype.getLpName = function() {
+    return this._$$_orign_lp_obj.lpName;
+};
 InternalLpObj.prototype.setBxFb5_2 = function(fb) {
     this._$_bx_isfb_5_2 = fb;
 };
@@ -60,6 +128,24 @@ InternalLpObj.prototype.isBxFb = function() {
 };
  
 /**
+ * 设置路牌的班型描述（最终是设置班次的路牌名字）。
+ * @param desc 描述
+ */
+InternalLpObj.prototype.setBxDesc = function(desc) {
+    // 最终原始路牌的名字
+    this._$$_orign_lp_obj.lpName = desc + "_" + this._$$_orign_lp_obj.lpNo;
+    // 内部对象的班型描述
+    this._$_bx_desc = desc;
+};
+/**
+ * 获取版型描述
+ * @returns string
+ */
+InternalLpObj.prototype.getBxDesc = function() {
+    return this._$_bx_desc;
+};
+
+/**
  * 设置纵向最小发车间隔时间。
  * @param v
  */
@@ -75,6 +161,8 @@ InternalLpObj.prototype.getVerticalMinIntervalTime = function() {
     return this._$_minVerticalIntervalTime;
 };
  
+//-------------------- 班次操作方法（查询，统计，删除） -----------------------//
+
 /**
  * 返回总共班次数。
  */
@@ -98,38 +186,6 @@ InternalLpObj.prototype.getBcCount = function() {
 };
  
 /**
- * 获取最小(最早)班次对象。
- * @return [{圈index},{班次index}]
- */
-InternalLpObj.prototype.getMinBcObjPosition = function() {
-    var i;
-    var bIndex = [];
-    for (i = 0; i < this._$_groupBcArray.length; i++) {
-        if (this._$_groupBcArray[i].getBc1()) {
-            bIndex.push(i);
-            bIndex.push(0);
-            break;
-        }
-        if (this._$_groupBcArray[i].getBc2()) {
-            bIndex.push(i);
-            bIndex.push(1);
-            break;
-        }
-    }
-    return bIndex;
-};
-
-// TODO
-
-/**
- *
- *
- */
-InternalLpObj.prototype.calcuLpBx = function() {
-
-};
-
-/**
  * 返回班次列表，过滤空的班次，将所有存在的班次连成连续的对象数组返回。
  * @returns arrays (InternalBcObj)
  */
@@ -149,149 +205,60 @@ InternalLpObj.prototype.getBcArray = function() {
 };
  
 /**
- * 从指定开始时间到结束时间创建不间断班次（连班），并初始化路牌
- * 注意，之前有班次会删除后再创建。
- * @param startTime 开始时间
- * @param endTime 结束时间
- * @param isUp 第一个班次是上行还是下行
- * @param fromQ 从第几圈开始加入
- * @param paramObj 参数对象
- * @param factory 工厂对象
- */
-InternalLpObj.prototype.initDataFromTimeToTime = function(
-    startTime,
-    endTime,
-    isUp,
-    fromQ,
-    paramObj,
-    factory) {
-
-    var bcData = []; // 班次数组
-    var bcObj;
-    var kssj = startTime;
-    var fcno = 1; // 发车顺序号
-    var bcCount = 1; // 班次数
-    do {
-        bcObj = factory.createBcObj(
-            "normal", isUp, this._$_lp, fcno, kssj, paramObj);
-        bcData.push(bcObj);
-
-        kssj = paramObj.addMinute(kssj, bcObj.getBcTime() + bcObj.getStopTime());
-        fcno ++;
-        bcCount ++;
-        isUp = !isUp;
-    } while(kssj.isBefore(endTime));
-    bcCount--;
-
-    if (bcCount > 0 && bcData[bcCount - 1].getArrTimeObj().isAfter(endTime)) {
-        // 如果最后一个班次的到达时间超过结束时间，也要去除
-        bcData.splice(bcCount - 1, 1);
-    }
-
-    this.initDataFromLbBcArray(bcData, fromQ);
-
-};
-
-/**
- * 使用连班的班次数组初始化路牌。
- * @param bcArray 连班班次数组
- * @param fromQ 从第几圈开始加入
+ * 获取最小(最早)班次对象。
+ * @returns [{圈index},{班次index}]
  */
-InternalLpObj.prototype.initDataFromLbBcArray = function(
-    bcArray,
-    fromQ
-) {
-    // 第一班次是上行还是下行
-    var isUp = bcArray[0].isUp();
-
-    if (bcArray.length > 0 && fromQ < this._$_qCount) {
-        // 构造圈数
-        if (isUp != this._$_isUp) {
-            // 如果方向不一致，意味着第一个班次是半圈
-            // 加半圈，并加在bc2上
-            this._$_groupBcArray[fromQ] =
-                new InternalGroupBcObj(
-                    this._$_isUp,
-                    undefined,
-                    bcArray.slice(0, 1)[0]
-                );
-            bcArray.splice(0, 1);
-            fromQ ++;
+InternalLpObj.prototype.getMinBcObjPosition = function() {
+    var i;
+    var bIndex = [];
+    for (i = 0; i < this._$_groupBcArray.length; i++) {
+        if (this._$_groupBcArray[i].getBc1()) {
+            bIndex.push(i);
+            bIndex.push(0);
+            break;
         }
-
-        var qCount1 = Math.floor(bcArray.length / 2); // 需要添加多少圈
-        var qCount2 = bcArray.length % 2; // 最后是否有半圈
-
-        while (fromQ < this._$_qCount) {
-            if (qCount1 > 0) {
-                this._$_groupBcArray[fromQ] =
-                    new InternalGroupBcObj(
-                        this._$_isUp,
-                        bcArray.slice(0, 1)[0],
-                        bcArray.slice(1, 2)[0]
-                    );
-                bcArray.splice(0, 2);
-                qCount1 --;
-            } else if (qCount2 > 0) {
-                // 加半圈，并加在bc1上
-                this._$_groupBcArray[fromQ] =
-                    new InternalGroupBcObj(
-                        this._$_isUp,
-                        bcArray.slice(0, 1)[0],
-                        undefined
-                    );
-            } else {
-                break;
-            }
-
-            fromQ ++;
+        if (this._$_groupBcArray[i].getBc2()) {
+            bIndex.push(i);
+            bIndex.push(1);
+            break;
         }
     }
+    return bIndex;
 };
  
 /**
- * 获取班次。
- * @param qIndex 第几圈
- * @param bcIndex 第几个班次
+ * 获取最大(最晚)班次对象。
+ * @returns [{圈index},{班次index}]
  */
-InternalLpObj.prototype.getBc = function(qIndex, bcIndex) {
-    var group = this._$_groupBcArray[qIndex];
-    var bc;
-    if (bcIndex == 0) {
-        bc = group.getBc1();
-    } else if (bcIndex == 1) {
-        bc = group.getBc2();
+InternalLpObj.prototype.getMaxBcObjPosition = function() {
+    var i;
+    var bIndex = [];
+    for (i = this._$_groupBcArray.length - 1; i >= 0; i--) {
+        if (this._$_groupBcArray[i].getBc2()) {
+            bIndex.push(i);
+            bIndex.push(1);
+            break;
+        }
+        if (this._$_groupBcArray[i].getBc1()) {
+            bIndex.push(i);
+            bIndex.push(0);
+            break;
+        }
     }
-    return bc;
+    return bIndex;
 };
  
 /**
- * 再具体位置设置班次。
+ * 在具体位置移除班次。
  * @param qIndex 第几圈
  * @param bcIndex 第几个班次
- * @param bc 班次对象
  */
-InternalLpObj.prototype.setBc = function(qIndex, bcIndex, bc) {
+InternalLpObj.prototype.removeBc = function(qIndex, bcIndex) {
     var group = this._$_groupBcArray[qIndex];
     if (bcIndex == 0) {
-        group.setBc1(bc);
+        group.removeBc1();
     } else if (bcIndex == 1) {
-        group.setBc2(bc);
-    }
-};
-
-/**
- * 设置班次的路牌编号。
- * @param lpNo
- */
-InternalLpObj.prototype.setLp = function(lpNo) {
-    var i;
-    var group;
-    for (i = 0; i < this._$_groupBcArray.length; i++) {
-        group = this._$_groupBcArray[i];
-        if (group) {
-            group.setLp(lpNo);
-        }
+        group.removeBc2();
     }
 };
  
@@ -389,3 +356,142 @@ InternalLpObj.prototype.getQBcIndexWithFcTime = function(
     return this.getgetQBcIndexWithFcTimeFromGroupArray(fctime, this._$_groupBcArray);
 };
  
+//---------------------- 内部数据初始化方法（不同于构造函数）---------------------//
+
+/**
+ * 从指定开始时间到结束时间创建不间断班次（连班），并初始化路牌
+ * 注意，之前有班次会删除后再创建。
+ * @param startTime 开始时间
+ * @param endTime 结束时间
+ * @param isUp 第一个班次是上行还是下行
+ * @param fromQ 从第几圈开始加入
+ * @param paramObj 参数对象
+ * @param factory 工厂对象
+ */
+InternalLpObj.prototype.initDataFromTimeToTime = function(
+    startTime,
+    endTime,
+    isUp,
+    fromQ,
+    paramObj,
+    factory) {
+
+    var bcData = []; // 班次数组
+    var bcObj;
+    var kssj = startTime;
+    var fcno = 1; // 发车顺序号
+    var bcCount = 1; // 班次数
+    do {
+        bcObj = factory.createBcObj(
+            this, "normal", isUp, fcno, kssj, paramObj); // this就是所属路牌对象
+        bcData.push(bcObj);
+
+        kssj = paramObj.addMinute(kssj, bcObj.getBcTime() + bcObj.getStopTime());
+        fcno ++;
+        bcCount ++;
+        isUp = !isUp;
+    } while(kssj.isBefore(endTime));
+    bcCount--;
+
+    if (bcCount > 0 && bcData[bcCount - 1].getArrTimeObj().isAfter(endTime)) {
+        // 如果最后一个班次的到达时间超过结束时间，也要去除
+        bcData.splice(bcCount - 1, 1);
+    }
+
+    this._initDataFromLbBcArray(bcData, fromQ);
+
+};
+
+/**
+ * 使用连班的班次数组初始化路牌（相应的圈会被覆盖）。
+ * @param bcArray 连班班次数组
+ * @param fromQ 从第几圈开始加入
+ */
+InternalLpObj.prototype._initDataFromLbBcArray = function(
+    bcArray,
+    fromQ
+) {
+    var _bc1Obj;
+    var _bc2Obj;
+    var _qObj;
+
+    // 第一班次是上行还是下行
+    var isUp = bcArray[0].isUp();
+
+    if (bcArray.length > 0 && fromQ < this._$_qCount) {
+        // 构造圈数
+        if (isUp != this._$_isUp) {
+            // 如果方向不一致，意味着第一个班次是半圈
+            // 加半圈，并加在bc2上
+            _bc2Obj = bcArray.slice(0, 1)[0];
+            _qObj = new InternalGroupObj(
+                this,
+                this._$_isUp,
+                undefined,
+                _bc2Obj
+            );
+            _bc2Obj.setGroup(_qObj);
+            this._$_groupBcArray[fromQ] = _qObj;
+
+            bcArray.splice(0, 1);
+            fromQ ++;
+        }
+
+        var qCount1 = Math.floor(bcArray.length / 2); // 需要添加多少圈
+        var qCount2 = bcArray.length % 2; // 最后是否有半圈
+
+        while (fromQ < this._$_qCount) {
+            if (qCount1 > 0) {
+                _bc1Obj = bcArray.slice(0, 1)[0];
+                _bc2Obj = bcArray.slice(1, 2)[0];
+                _qObj = new InternalGroupObj(
+                    this,
+                    this._$_isUp,
+                    _bc1Obj,
+                    _bc2Obj
+                );
+                _bc1Obj.setGroup(_qObj);
+                _bc2Obj.setGroup(_qObj);
+                this._$_groupBcArray[fromQ] = _qObj;
+
+                bcArray.splice(0, 2);
+                qCount1 --;
+            } else if (qCount2 > 0) {
+                // 加半圈，并加在bc1上
+                _bc1Obj = bcArray.slice(0, 1)[0];
+                _qObj = new InternalGroupObj(
+                    this,
+                    this._$_isUp,
+                    _bc1Obj,
+                    undefined
+                );
+                _bc1Obj.setGroup(_qObj);
+                this._$_groupBcArray[fromQ] = _qObj;
+            } else {
+                break;
+            }
+
+            fromQ ++;
+        }
+    }
+};
+
+//-------------------------- 其他方法 ----------------------------//
+
+
+// TODO
+
+/**
+ *
+ *
+ */
+InternalLpObj.prototype.calcuLpBx = function() {
+
+};
+
+
+
+
+
+
+
@@ -16,6 +16,9 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
     var _internalLpArray = []; // 内部对象数组
  
     var _initFun1 = function() { // 初始化方法1
+
+        //----------------------- 1、确定上标线的方向，圈的方向 -------------------//
+
         // 确定_qIsUp，哪个方向的首班车晚就用哪个
         _qIsUp = _paramObj.getUpFirstDTimeObj().isBefore(
             _paramObj.getDownFirstDTimeObj()) ? false : true;
@@ -33,27 +36,33 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             et_IsUp = true;
         }
  
-        // 以开始时间，结束时间，构造上标线用连班班次
-        var bcData = []; // 班次数组
-        var bcObj;
+        //------------------------ 2、计算总共有多少圈 ------------------------//
+
+
+
+        // 以开始时间，结束时间，构造上标线用连班班次发车时间
+        var bcFcsjArrays = []; // 班次发车时间对象数组
+        var bcArsjArrays = []; // 班次到达时间对象数组
         var isUp = _qIsUp; // 方向
-        var kssj = st;
-        var fcno = 1; // 发车顺序号
         var bcCount = 1; // 班次数
-        do {
-            bcObj = _factory.createBcObj(
-                "normal", isUp, _lpArray[0].lpNo, fcno, kssj, paramObj);
-            bcData.push(bcObj);
  
-            kssj = paramObj.addMinute(kssj, bcObj.getBcTime() + bcObj.getStopTime());
-            fcno ++;
+        var _kssj = st; // 开始时间
+        var _bcsj = paramObj.calcuTravelTime(_kssj, isUp); // 班次历时
+        var _arrsj = paramObj.addMinute(_kssj, _bcsj); // 到达时间
+        var _stoptime =  paramObj.calcuFixedStopNumber(_arrsj, !isUp); // 停站时间
+
+        do {
+            bcFcsjArrays.push(_kssj);
+            bcArsjArrays.push(_arrsj);
+            _kssj = paramObj.addMinute(_kssj, _bcsj + _stoptime);
             bcCount ++;
             isUp = !isUp;
-        } while(kssj.isBefore(et));
+        } while(_kssj.isBefore(et));
         bcCount--; // 因为先做do，所以总的班次要减1
-        if (bcCount > 0 && bcData[bcCount - 1].getArrTimeObj().isAfter(et)) {
+        if (bcCount > 0 && bcArsjArrays[bcCount - 1].isAfter(et)) {
             // 如果最后一个班次的到达时间超过结束时间，也要去除
-            bcData.splice(bcCount - 1, 1);
+            bcFcsjArrays.splice(bcCount - 1, 1);
+            bcArsjArrays.splice(bcCount - 1, 1);
             bcCount--;
         }
         var _qCount_p1 = Math.floor(bcCount / 2); // 2个班次一圈
@@ -81,13 +90,15 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             }
         }
  
+        //------------------------ 3、根据路牌数，圈数创建路牌对象 ----------------------//
+
         // 创建内部的路牌数组，并把之前的连班路牌添加进上标线路牌中
         var i;
         for (i = 0; i < _lpArray.length; i++) {
-            _internalLpArray.push(
-                new InternalLpObj(_lpArray[i].lpNo, _qCount, _qIsUp));
+            _internalLpArray.push(new InternalLpObj(_lpArray[i], _qCount, _qIsUp));
         }
-        _internalLpArray[0].initDataFromLbBcArray(bcData, 1); // 上标线从第1圈开始放班次
+        // 初始化上标线，从第1圈开始
+        _internalLpArray[0].initDataFromTimeToTime(bcFcsjArrays[0], et, _qIsUp, 1, _paramObj, _factory);
  
         console.log("//---------------- 行车计划，初始化方法1 start ----------------//");
         console.log("上行首班车时间:" + _paramObj.getUpFirstDTimeObj().format("HH:mm") +
@@ -101,16 +112,18 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
     };
  
     //------------------ 初始化方法2，以及计算关联的内部变量 ----------------//
-    var _zgfQIndex; // 早高峰车辆从第几圈开始全部发出
-    var _zgfBIndex; // 早高峰车辆从第几圈第几个班次全部发出
-    var _wgfQIndex; // 晚高峰车辆从第几圈开始全部发出
-    var _wgfBIndex; // 晚高峰车辆从第几圈第几个班次全部发出
+    var _approximate_zgfQIndex; // 预估早高峰车辆从第几圈开始全部发出
+    var _approximate_zgfBIndex; // 预估早高峰车辆从第几圈第几个班次开始全部发出（上行或下行）
+    var _approximate_wgfQIndex; // 预估晚高峰车辆从第几圈开始全部发出
+    var _approximate_wgfBIndex; // 预估晚高峰车辆从第几圈第几个班次开始全部发出（上行或下行）
  
     // 同一圈同一方向班次发车间隔的最小值
     // 注意：这个值就是用来添加班次的时间增加单位，在后面相关的方法里会具体说明
     var _qbcMinIntervalValue;
  
     var _initFun2 = function() { // 初始化方法2
+        //------------------------ 1、预估早高峰全部出车第几圈第几个班次全部出车，计算路牌之间的发车间隔 ------------------//
+
         // 以上标线为标准，查找离早高峰开始时间最近的班次作为早高峰开始班次
         // 以这个班次为早高峰起点，全部出车策略
         var qbcIndexArray = _internalLpArray[0].getQBcIndexWithFcTime(
@@ -132,11 +145,11 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 qIndex,
                 bIndex,
                 _factory.createBcObj(
+                    _internalLpArray[i - 1],
                     "normal", startbc.isUp(),
-                    _lpArray[i - 1].lpNo,
                     1, _kssj, paramObj)
             );
-            // 使用早高峰的发车间隔最为路牌纵向最小发车间隔
+            // 使用早高峰的发车间隔最为路牌纵向最小发车间隔，不能整除的话，小的放在前面的路牌
             _internalLpArray[i - 1].setVerticalMinIntervalTime(_c1);
         }
         for (i = 1; i <= _c2; i++) {
@@ -145,16 +158,18 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 qIndex,
                 bIndex,
                 _factory.createBcObj(
+                    _internalLpArray[_clCount - _c2 + i - 1],
                     "normal", startbc.isUp(),
-                    _lpArray[_clCount - _c2 + i - 1].lpNo,
                     1, _kssj, paramObj)
             );
-            // 使用早高峰的发车间隔最为路牌纵向最小发车间隔
+            // 使用早高峰的发车间隔最为路牌纵向最小发车间隔，，不能整除的话，大的放在后面的路牌
             _internalLpArray[_clCount - _c2 + i - 1].setVerticalMinIntervalTime(_c1);
         }
  
-        _zgfQIndex = qIndex;
-        _zgfBIndex = bIndex;
+        _approximate_zgfQIndex = qIndex;
+        _approximate_zgfBIndex = bIndex;
+
+        //------------------------ 2、预估晚高峰全部出车第几圈第几个班次全部出车，计算路牌之间的发车间隔 ------------------//
  
         // 以上标线为标准，查找离晚高峰开始时间最近的班次作为晚高峰开始班次
         // 以这个班次为早高峰起点，全部出车策略
@@ -176,8 +191,8 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 qIndex,
                 bIndex,
                 _factory.createBcObj(
+                    _internalLpArray[i - 1],
                     "normal", startbc.isUp(),
-                    _lpArray[i - 1].lpNo,
                     1, _kssj, _paramObj)
             );
         }
@@ -187,20 +202,20 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 qIndex,
                 bIndex,
                 _factory.createBcObj(
+                    _internalLpArray[_clCount - _c2 + i - 1],
                     "normal", startbc.isUp(),
-                    _lpArray[_clCount - _c2 + i - 1].lpNo,
                     1, _kssj, _paramObj)
             );
         }
  
-        _wgfQIndex = qIndex;
-        _wgfBIndex = bIndex;
+        _approximate_wgfQIndex = qIndex;
+        _approximate_wgfBIndex = bIndex;
         _qbcMinIntervalValue = _c1;
  
         console.log("//---------------- 行车计划，初始化方法2 start ----------------//");
-        console.log("早高峰第" + _zgfQIndex + "(index)圈,第" + _zgfBIndex + "(index)班次车辆全部发出");
-        console.log("晚高峰第" + _wgfQIndex + "(index)圈,第" + _wgfBIndex + "(index)班次车辆全部发出");
-        console.log("同圈同方向班次最小间隔(分钟):" + _qbcMinIntervalValue);
+        console.log("预估早高峰第" + _approximate_zgfQIndex + "(index)圈,第" + _approximate_zgfBIndex + "(index)班次车辆全部发出");
+        console.log("预估晚高峰第" + _approximate_wgfQIndex + "(index)圈,第" + _approximate_wgfBIndex + "(index)班次车辆全部发出");
+        console.log("预估同圈同方向班次最小间隔(分钟):" + _qbcMinIntervalValue);
         console.log("//---------------- 行车计划，初始化方法2 end ----------------//");
     };
  
@@ -208,6 +223,8 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
     var _zbx_lpIndex; // 中标线对应第几个路牌
  
     var _initFun3 = function() { // 初始化方法3
+        //---------------------------- 1、模拟一个中标线，使用临时路牌 ----------------------//
+
         // 构造中标线
         // 中标线开始时间，就是方向的首班车时间
         var st = !_qIsUp ? _paramObj.getUpFirstDTimeObj() : _paramObj.getDownFirstDTimeObj();
@@ -221,7 +238,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             et = _paramObj.getUpLastDtimeObj();
         }
  
-        var tempLpObj = new InternalLpObj(-999, _qCount, _qIsUp);
+        var tempLpObj = new InternalLpObj({lpNo: -999, lpName: "-999"}, _qCount, _qIsUp);
         tempLpObj.initDataFromTimeToTime(
             st,
             et,
@@ -231,8 +248,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             _factory
         );
  
+        //------------------------ 2、找出中标线的早高峰班次，计算应该插在当前路牌数组的那个位置 ----------------//
+        // TODO：中标线的早高峰发车班次，和插入位置的早高分班次的时间会有误差的
+        // TODO：这里是直接把中标线班次覆盖，没有根据误差调整，以后改
+
         // 找出中标线对应的早高峰的班次对象
-        var _zb_bcobj = tempLpObj.getBc(_zgfQIndex, _zgfBIndex);
+        var _zb_bcobj = tempLpObj.getBc(_approximate_zgfQIndex, _approximate_zgfBIndex);
  
         // 把所有高峰班次重新构造成一个一个的圈数组，计算对应中标线最近的是第几个路牌
         var _tempq_array = [];
@@ -240,11 +261,11 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
         var _temp_bc;
         var i;
         for (i = 0; i < _internalLpArray.length; i++) {
-            _temp_bc = _internalLpArray[i].getBc(_zgfQIndex, _zgfBIndex);
+            _temp_bc = _internalLpArray[i].getBc(_approximate_zgfQIndex, _approximate_zgfBIndex);
             if (_temp_bc.isUp() == _qIsUp) {
-                _temp_group = new InternalGroupBcObj(_qIsUp, _temp_bc, undefined);
+                _temp_group = new InternalGroupObj(_internalLpArray[i], _qIsUp, _temp_bc, undefined);
             } else {
-                _temp_group = new InternalGroupBcObj(_qIsUp, undefined, _temp_bc);
+                _temp_group = new InternalGroupObj(_internalLpArray[i], _qIsUp, undefined, _temp_bc);
             }
             _tempq_array.push(_temp_group);
         }
@@ -254,7 +275,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             _tempq_array
         );
         _zbx_lpIndex = _ttindex_[0]; // 中标线放在第几个路牌
-        tempLpObj.setLp(_lpArray[_zbx_lpIndex].lpNo);
+        tempLpObj.setLp(_lpArray[_zbx_lpIndex]); // 设置原始路牌对象
         tempLpObj.setVerticalMinIntervalTime( // 设置纵向最小发车间隔
             _internalLpArray[_zbx_lpIndex].getVerticalMinIntervalTime()
         );
@@ -309,6 +330,200 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
         console.log("//---------------- 行车计划，初始化方法4 end ----------------//");
     };
  
+    //-------------------- 重要的内部方法 -----------------------//
+    /**
+     * 在指定位置生成班次（内部重要方法）。
+     * @param lpIndex 第几个路牌
+     * @param qIndex 第几圈
+     * @param bcIndex 第几个班次
+     * @returns InternalBcObj
+     */
+    var _generateBc = function(lpIndex, qIndex, bcIndex) {
+        // 在初始化布局后使用，否则没有参照班次加不了
+        // 初始化布局后，相当于把时刻表比作一个围棋棋盘，行为路牌数，列为圈数
+        // 上标线，中标线，早晚高峰已经布局在棋盘上，其余的空格可以创建班次
+
+        // 这个生成班次是以上一班次时间，以发车间隔为基础添加的，纵向加
+        // 和生成标线时那种一直往后加班次时不一样，那种是以前一个班次为基础，横向加
+
+        // 1、生成的班次以同一圈同一个方向里离它最早的班次的发车时间为基础
+        // 2、以每个路牌的纵向最小发车间隔时间为计算发车间隔
+        // 3、如果班次发车时间越界不管，有其余方法排除这种情况
+
+        // 1、查找同圈同方向里最近的班次，找不到报错（因为有标线存在是不可能找不到的）
+        var _i;
+        var _bcObj;
+        for (_i = lpIndex - 1; _i >= 0; _i--) {
+            _bcObj = _internalLpArray[_i].getBc(qIndex, bcIndex);
+            if (_bcObj) {
+                break;
+            }
+        }
+        if (!_bcObj) {
+            return false;
+            //alert("无法在指定位置生成班次");
+            //throw "无法在路牌index=" + lpIndex + ",圈index=" + qIndex + ",班次index=" + bcIndex + "生成班次";
+        }
+
+        // 2、计算发车间隔
+        var _intervalTime = 0;
+        for (_i = _i + 1; _i <= lpIndex; _i++) {
+            _intervalTime += _internalLpArray[_i].getVerticalMinIntervalTime();
+        }
+
+        // 3、计算班次并添加班次
+        var _kssj = _paramObj.addMinute(_bcObj.getFcTimeObj(), _intervalTime);
+        _bcObj = _factory.createBcObj(
+            _internalLpArray[lpIndex],
+            "normal", _bcObj.isUp(),
+            1, _kssj, _paramObj);
+        _bcObj.setGroup(_internalLpArray[lpIndex].getGroup(qIndex));
+
+        return _bcObj;
+
+        // TODO：这种添加班次的方法，可能造成相邻班次的停站时间问题
+        // TODO：主要是由于中标线的问题，但是误差不会很大，
+        // TODO：后面有方法直接调整停站时间（所谓的平滑过度时间）
+    };
+
+    /**
+     * 在指定位置生成班次并添加到路牌指定位置中。
+     * @param lpIndex 第几个路牌
+     * @param qIndex 第几圈
+     * @param bcIndex 第几个班次
+     */
+    var _generateBcAndSetBc = function(lpIndex, qIndex, bcIndex) {
+        var _bcObj = _generateBc(lpIndex, qIndex, bcIndex);
+        _internalLpArray[lpIndex].setBc(qIndex, bcIndex, _bcObj);
+
+    };
+
+    /**
+     * 查找离指定时间最近的前面的班次索引信息
+     * @param timeObj 查找时间
+     * @param isUp 是否上行
+     * @returns [{路牌index},{圈index},{班次index}]
+     */
+    var _findUpClosedBcIndexWithTime = function(timeObj, isUp) {
+        var _lpObj;
+        var _groupObj;
+        var _bcObj;
+        var _i;
+        var _j;
+        var timediff; // 时间差取绝对值
+
+        var _lpIndex;
+        var _up_qIndex;
+        var _up_bIndex;
+
+        for (_i = 0; _i < _qCount; _i++) {
+            for (_j = 0; _j < _internalLpArray.length; _j++) {
+                _lpObj = _internalLpArray[_j];
+                _groupObj = _lpObj.getGroup(_i);
+                _bcObj = isUp ? _groupObj.getBc1() : _groupObj.getBc2();
+                if (!_bcObj) { // 没有班次动态生成一个，可能生成不出的
+                    _bcObj = _generateBc(_j, _i, isUp == _qIsUp ? 0 : 1);
+                }
+                if (_bcObj) {
+                    if (timeObj.diff(_bcObj.getFcTimeObj()) >= 0) {
+                        if (!timediff) {
+                            timediff = timeObj.diff(_bcObj.getFcTimeObj());
+                            _lpIndex = _j;
+                            _up_qIndex = _i;
+                            _up_bIndex = isUp == _qIsUp ? 0 : 1;
+                        } else {
+                            if (timeObj.diff(_bcObj.getFcTimeObj()) < timediff) {
+                                timediff = timeObj.diff(_bcObj.getFcTimeObj());
+                                _lpIndex = _j;
+                                _up_qIndex = _i;
+                                _up_bIndex = isUp == _qIsUp ? 0 : 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (_lpIndex == undefined) {
+            return false;
+        }
+
+        var bcindex = [];
+        bcindex.push(_lpIndex);
+        bcindex.push(_up_qIndex);
+        bcindex.push(_up_bIndex);
+
+        return bcindex;
+    };
+
+    /**
+     * 查找离指定时间最近的后面的班次索引信息
+     * @param timeObj 查找时间
+     * @param isUp 是否上行
+     * @returns [{路牌index},{圈index},{班次index}]
+     */
+    var _findDownClosedBcIndexWithTime = function(timeObj, isUp) {
+        var _lpObj;
+        var _groupObj;
+        var _bcObj;
+        var _i;
+        var _j;
+        var timediff; // 时间差取绝对值
+
+        var _lpIndex;
+        var _down_qIndex;
+        var _down_bIndex;
+
+        var flag;
+
+        for (_i = 0; _i < _qCount; _i++) {
+            for (_j = 0; _j < _internalLpArray.length; _j++) {
+                _lpObj = _internalLpArray[_j];
+                _groupObj = _lpObj.getGroup(_i);
+                _bcObj = isUp ? _groupObj.getBc1() : _groupObj.getBc2();
+                if (!_bcObj) { // 没有班次动态生成一个，可能生成不出的
+                    _bcObj = _generateBc(_j, _i, isUp == _qIsUp ? 0 : 1);
+                }
+                if (_bcObj) {
+                    //console.log("timeobj -> bcobj diff flag " +
+                    //    timeObj.format("HH:mm") + "->" +
+                    //    _bcObj.getFcTimeObj().format("HH:mm") +
+                    //    timeObj.diff(_bcObj.getFcTimeObj()) +
+                    //    (timeObj.diff(_bcObj.getFcTimeObj()) <= 0)
+                    //);
+
+                    flag = (timeObj.diff(_bcObj.getFcTimeObj())) <= 0;
+
+                    if (flag) {
+                        if (!timediff) {
+                            timediff = timeObj.diff(_bcObj.getFcTimeObj());
+                            _lpIndex = _j;
+                            _down_qIndex = _i;
+                            _down_bIndex = isUp == _qIsUp ? 0 : 1;
+                        } else {
+                            if ((timeObj.diff(_bcObj.getFcTimeObj())) > timediff) {
+                                timediff = timeObj.diff(_bcObj.getFcTimeObj());
+                                _lpIndex = _j;
+                                _down_qIndex = _i;
+                                _down_bIndex = isUp == _qIsUp ? 0 : 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (_lpIndex == undefined) {
+            return false;
+        }
+
+        var bcindex = [];
+        bcindex.push(_lpIndex);
+        bcindex.push(_down_qIndex);
+        bcindex.push(_down_bIndex);
+
+        return bcindex;
+    };
  
     return {
         //------------- 布局初始化方法 ------------//
@@ -347,6 +562,13 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             //this._generateBc(17, 1, 1);
             //this._generateBc(18, 1, 1);
  
+            // 6:31 8:30
+            // 16:01 18:00
+
+            // 测试找上界
+            console.log("上界:" + _findUpClosedBcIndexWithTime(_paramObj.getMPeakStartTimeObj(), false));
+            console.log("下界:" + _findDownClosedBcIndexWithTime(_paramObj.getMPeakEndTimeObj(), false));
+
             // TODO：
  
             // 测试时间判定
@@ -364,13 +586,138 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             //    _factory
             //);
  
+            // TODO：问题
+            // 1、中标线是直接赋值在具体位置的，没有修正班次时间
+            // 2、路牌间隔时间需要修正的
+
         },
  
         // TODO：
  
         /**
-         * 根据每个路牌的连班班型补充班次。
-         * 补充连班的班次，参照上标线，中标线补充不足的班次
+         * 调整高峰班次，
+         * 初始化生成早高峰，晚高峰班次并不准确，因为根据高峰时间段，并不在一个完整圈内，应该是在两个或多个圈之间
+         * 当初始化定好布局后（上标线，中标线），然后确定每个路牌的班型（连班，分班，5休2分班）后
+         * 然后重新计算框在高峰时间段内的班次索引，不足的添加，之前多加的删除（只删除分班路牌上的）
+         * @param isZgf 是否早高峰
+         * @param isUp 是否上行
+         */
+        adjustGfbc : function(isZgf, isUp) {
+            var startTime; // 开始时间
+            var endTime; // 结束时间
+            var startBcIndex; // 开始班次索引
+            var endBcIndex; // 结束班次索引
+
+            startTime = isZgf ? _paramObj.getMPeakStartTimeObj() : _paramObj.getEPeakStartTimeObj();
+            endTime = isZgf ? _paramObj.getMPeakEndTimeObj() : _paramObj.getEPeakEndTimeObj();
+
+            startBcIndex = _findUpClosedBcIndexWithTime(startTime, isUp);
+            endBcIndex = _findDownClosedBcIndexWithTime(endTime, isUp);
+
+            var _lpIndex;
+            var _qIndex;
+            var _bcIndex;
+            var _qInternelCount; // 高峰时间段中间包含的圈数
+            var i;
+            var j;
+
+            var _lp;
+
+            if (startBcIndex && endBcIndex) {
+                _lpIndex = startBcIndex[0];
+                _qIndex = startBcIndex[1];
+                _bcIndex = startBcIndex[2];
+
+                // 处理头
+                // 删除头部多余班次
+                for (j = 0; j < _lpIndex; j++) {
+                    _lp = _internalLpArray[j];
+                    if (_lp.isBxFb() && _lp.getBc(_qIndex, _bcIndex)) {
+                        _lp.removeBc(_qIndex, _bcIndex);
+                    }
+                }
+
+                for (j = _lpIndex; j < _internalLpArray.length; j++) {
+                    _lp = _internalLpArray[j];
+                    if (!_lp.getBc(_qIndex, _bcIndex)) {
+                        _generateBcAndSetBc(j, _qIndex, _bcIndex);
+                    }
+                }
+
+                // 处理中间
+                _qInternelCount = endBcIndex[1] - startBcIndex[1] - 1;
+                for (i = 1; i <= _qInternelCount; i++) {
+                    _lp = _internalLpArray[_qIndex + i];
+                    if (!_lp.getBc(_qIndex + i, _bcIndex)) {
+                        _generateBcAndSetBc(i, _qIndex + i, _bcIndex);
+                    }
+                }
+
+                // 处理尾部
+                _lpIndex = endBcIndex[0];
+                _qIndex = endBcIndex[1];
+                _bcIndex = endBcIndex[2];
+                for (j = 0; j < _lpIndex; j++) {
+                    _lp = _internalLpArray[j];
+                    if (!_lp.getBc(_qIndex, _bcIndex)) {
+                        _generateBcAndSetBc(j, _qIndex, _bcIndex);
+                    }
+                }
+                // 删除尾部多余的班次
+                for (j = _lpIndex; j < _internalLpArray.length; j++) {
+                    _lp = _internalLpArray[j];
+                    if (_lp.isBxFb() && _lp.getBc(_qIndex, _bcIndex)) {
+                        _lp.removeBc(_qIndex, _bcIndex);
+                    }
+                }
+            }
+
+        },
+
+        /**
+         * 补充做5休2的班型班次。
+         * 1、做5休2的路牌总工时不能超过7个小时
+         * 2、5休2的路牌全部从早晚高峰班次开始往前补充1个班次，组成早晚2圈
+         * 3、再根据余下工时及早晚高峰开始时间，确定向前或者向后加班次
+         */
+        calcuLpBx_5_2: function() {
+            // 1、先在早晚高峰班次前加1个班次压压惊
+            var i;
+            var _lp;
+            var _zgfbcpos; // 早高峰班次位置
+            var _wgfbcpos; // 晚高峰班次位置
+            var _qIndex;
+            var _bIndex;
+
+            //for (i = 0; i < _internalLpArray.length; i++) {
+            //    _lp = _internalLpArray[i];
+            //    if (_lp.isBxFb5_2()) {
+            //        _zgfbcpos = _lp.getMinBcObjPosition();
+            //        _wgfbcpos = _lp.getMaxBcObjPosition();
+            //
+            //        // TODO：测试向前添加一个班次
+            //        _qIndex = _zgfbcpos[0];
+            //        _bIndex = _zgfbcpos[1];
+            //        _bIndex == 0 ?
+            //            _generateBcAndSetBc(i, _qIndex - 1, 1) :
+            //            _generateBcAndSetBc(i, _qIndex, 0);
+            //
+            //        _qIndex = _wgfbcpos[0];
+            //        _bIndex = _wgfbcpos[1];
+            //        _bIndex == 0 ?
+            //            _generateBcAndSetBc(i, _qIndex - 1, 1) :
+            //            _generateBcAndSetBc(i, _qIndex, 0);
+            //
+            //    }
+            //}
+
+            // 2、
+        },
+
+        /**
+         * 补充连班路牌班次。
+         * 1、上标线，中标线中间的连班路牌班次从早高峰班次一直拉到底，从早高峰班次向上标线起始班次靠拢
+         * 2、中标线以下的连班路牌班次从早高峰班次一直拉到底，从早高峰班次向中标线起始班次靠拢
          */
         calcuLpBx_lb: function() {
             // 补充连班的班次，参照上标线，中标线补充不足的班次
@@ -419,10 +766,10 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         if (_bIndex == 0) {
                             _qIndex --;
                             _bIndex = 1;
-                            this._generateBc(i, _qIndex, _bIndex);
+                            _generateBcAndSetBc(i, _qIndex, _bIndex);
                         } else if (_bIndex == 1) {
                             _bIndex --;
-                            this._generateBc(i, _qIndex, _bIndex);
+                            _generateBcAndSetBc(i, _qIndex, _bIndex);
                         }
                     }
                 }
@@ -439,10 +786,10 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         if (_bIndex == 0) {
                             _qIndex --;
                             _bIndex = 1;
-                            this._generateBc(i, _qIndex, _bIndex);
+                            _generateBcAndSetBc(i, _qIndex, _bIndex);
                         } else if (_bIndex == 1) {
                             _bIndex --;
-                            this._generateBc(i, _qIndex, _bIndex);
+                            _generateBcAndSetBc(i, _qIndex, _bIndex);
                         }
                     }
                 }
@@ -458,6 +805,9 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
          */
         calcuLpBx_fg: function() {
             // 间隔法
+
+            //--------------------------- 1、间隔法分隔连班路牌 ----------------------//
+
             // 除去上标线，中标线的连班路牌个数
             var _lblbcount = _bx_lb_lpcount - 2;
             // 计算由标线隔开的两个区域的路牌数比率
@@ -478,10 +828,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             var _c2_start_index;
             for (i = 1; i <= _count - _c2; i++) {
                 _internalLpArray[(i - 1) * _c1].setBxLb(true);
+                _internalLpArray[(i - 1) * _c1].setBxDesc("连班");
                 _c2_start_index = (i - 1) * _c1;
             }
             for (i = 1; i <= _c2; i++) {
                 _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxLb(true);
+                _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxDesc("连班");
             }
  
             // 设定第二个区域的连班路牌
@@ -492,14 +844,18 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                 _internalLpArray[(i - 1) * _c1 + _zbx_lpIndex].setBxLb(true);
                 _internalLpArray[(i - 1) * _c1 + _zbx_lpIndex].setBxFb(false);
                 _internalLpArray[(i - 1) * _c1 + _zbx_lpIndex].setBxFb5_2(false);
+                _internalLpArray[(i - 1) * _c1 + _zbx_lpIndex].setBxDesc("连班");
                 _c2_start_index = (i - 1) * _c1 + _zbx_lpIndex;
             }
             for (i = 1; i <= _c2; i++) {
                 _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxLb(true);
                 _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxFb(false);
                 _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxFb5_2(false);
+                _internalLpArray[_c2_start_index + i * (_c1 + 1)].setBxDesc("连班");
             }
  
+            //---------------------------- 2、分隔法，分隔分班路牌 -------------------------//
+
             // 设定分班路牌
             var notlbIndexes = []; // 去除连班的路牌index列表
             for (i = 0; i < _internalLpArray.length; i++) {
@@ -507,18 +863,66 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                     notlbIndexes.push(i);
                 }
             }
-            // 先把全部放置分班路牌，在全部放置5休2路牌
-            for (i = 0; i < _bx_other_fb_lpcount; i++) {
-                _internalLpArray[notlbIndexes[i]].setBxFb(false);
-                _internalLpArray[notlbIndexes[i]].setBxFb(true);
-                _internalLpArray[notlbIndexes[i]].setBxFb5_2(false);
+            // 获取离中标线最近的分班路牌索引
+            var _temp_fg_index;
+            for (i = 0; i < notlbIndexes.length; i++) {
+                if (notlbIndexes[i] == _zbx_lpIndex - 1) {
+                    _temp_fg_index = i;
+                    break;
+                }
             }
-            while (i < _bx_other_fb_lpcount + _bx_5_2_fb_lpcount) {
-                _internalLpArray[notlbIndexes[i]].setBxFb(false);
-                _internalLpArray[notlbIndexes[i]].setBxFb(true);
-                _internalLpArray[notlbIndexes[i]].setBxFb5_2(true);
  
-                i++;
+            // 使用上面的分隔比率，分隔5休2班型
+            _p1_lpcount = _bx_5_2_fb_lpcount * _p1;
+            _p2_lpcount = _bx_5_2_fb_lpcount * _p2;
+            if (parseInt(_p1_lpcount) != _p1_lpcount) { // 没有整除
+                _p1_lpcount = Math.floor(_p1_lpcount);
+                _p2_lpcount = Math.floor(_p2_lpcount) + 1;
+            }
+            // 第一个区域
+            _count = _p1_lpcount;
+            _c1 = Math.floor(_temp_fg_index / _count);
+            _c2 = _temp_fg_index % _count;
+            for (i = 1; i <= _count - _c2; i++) {
+                _internalLpArray[notlbIndexes[(i - 1) * _c1]].setBxLb(false);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1]].setBxFb(true);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1]].setBxFb5_2(true);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1]].setBxDesc("5休2分班");
+                _c2_start_index = (i - 1) * _c1;
+            }
+            for (i = 1; i <= _c2; i++) {
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxLb(false);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxLb(true);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxFb5_2(true);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxDesc("5休2分班");
+            }
+            // 第二个区域
+            _count = _p2_lpcount;
+            _c1 = Math.floor((notlbIndexes.length - _temp_fg_index - 1) / _count);
+            _c2 = (notlbIndexes.length - _temp_fg_index - 1) % _count;
+            for (i = 1; i <= _count - _c2; i++) {
+                _internalLpArray[notlbIndexes[(i - 1) * _c1 + _temp_fg_index + 1]].setBxLb(false);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1 + _temp_fg_index + 1]].setBxFb(true);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1 + _temp_fg_index + 1]].setBxFb5_2(true);
+                _internalLpArray[notlbIndexes[(i - 1) * _c1 + _temp_fg_index + 1]].setBxDesc("5休2分班");
+                _c2_start_index = (i - 1) * _c1 + _temp_fg_index + 1;
+            }
+            for (i = 1; i <= _c2; i++) {
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxLb(false);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxFb(true);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxFb5_2(true);
+                _internalLpArray[notlbIndexes[_c2_start_index + i * (_c1 + 1)]].setBxDesc("5休2分班");
+            }
+
+            //-------------------------- 3、余下班次就是其他分班类型 ----------------------//
+
+            for (i = 0; i < notlbIndexes.length; i++) {
+                if (!_internalLpArray[notlbIndexes[i]].isBxFb5_2()) {
+                    _internalLpArray[notlbIndexes[i]].setBxLb(false);
+                    _internalLpArray[notlbIndexes[i]].setBxFb(true);
+                    _internalLpArray[notlbIndexes[i]].setBxFb5_2(false);
+                    _internalLpArray[notlbIndexes[i]].setBxDesc("其他分班");
+                }
             }
  
             // 测试打印
@@ -547,65 +951,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             console.log("5休2分班路牌indexes=" + _5_2_fbIndexes);
         },
  
-        /**
-         * 在指定位置生成班次（内部重要方法）。
-         * @param lpIndex 第几个路牌
-         * @param qIndex 第几圈
-         * @param bcIndex 第几个班次
-         */
-        _generateBc: function(lpIndex, qIndex, bcIndex) {
-            // 在初始化布局后使用，否则没有参照班次加不了
-            // 初始化布局后，相当于把时刻表比作一个围棋棋盘，行为路牌数，列为圈数
-            // 上标线，中标线，早晚高峰已经布局在棋盘上，其余的空格可以创建班次
-
-            // 这个生成班次是以上一班次时间，以发车间隔为基础添加的，纵向加
-            // 和生成标线时那种一直往后加班次时不一样，那种是以前一个班次为基础，横向加
-
-            // 1、生成的班次以同一圈同一个方向里离它最早的班次的发车时间为基础
-            // 2、以每个路牌的纵向最小发车间隔时间为计算发车间隔
-            // 3、如果班次发车时间越界不管，有其余方法排除这种情况
-
-            // 1、查找同圈同方向里最近的班次，找不到报错（因为有标线存在是不可能找不到的）
-            var _i;
-            var _bcObj;
-            for (_i = lpIndex - 1; _i >= 0; _i--) {
-                _bcObj = _internalLpArray[_i].getBc(qIndex, bcIndex);
-                if (_bcObj) {
-                    break;
-                }
-            }
-            if (!_bcObj) {
-                alert("无法在指定位置生成班次");
-                throw "无法在路牌index=" + lpIndex + ",圈index=" + qIndex + ",班次index=" + bcIndex + "生成班次";
-            }
-
-            // 2、计算发车间隔
-            var _intervalTime = 0;
-            for (_i = _i + 1; _i <= lpIndex; _i++) {
-                _intervalTime += _internalLpArray[_i].getVerticalMinIntervalTime();
-            }
-
-            // 3、计算班次并添加班次
-            var _kssj = _paramObj.addMinute(_bcObj.getFcTimeObj(), _intervalTime);
-            _bcObj = _factory.createBcObj(
-                "normal", _bcObj.isUp(),
-                _lpArray[lpIndex].lpNo,
-                1, _kssj, _paramObj);
-
-            _internalLpArray[lpIndex].setBc(qIndex, bcIndex, _bcObj);
-
-            // TODO：这种添加班次的方法，可能造成相邻班次的停站时间问题
-            // TODO：主要是由于中标线的问题，但是误差不会很大，
-            // TODO：后面有方法直接调整停站时间（所谓的平滑过度时间）
-        },
-
         //------------- 其他方法 -------------//
         /**
          * 内部数据转化成显示用的班次数组。
          */
         toGanttBcArray: function() {
             var bcData = [];
-            var i;
             var lpObj;
             for (i = 0; i < _internalLpArray.length; i++) {
                 lpObj = _internalLpArray[i];
@@ -12,7 +12,7 @@ var Main_v2 = function() {
                 return paramObj;
             },
             // 创建班次对象
-            createBcObj: function(bcType, isUp, lp, fcno, fcTimeObj, paramObj) {
+            createBcObj: function(lpObj, bcType, isUp, fcno, fcTimeObj, paramObj) {
                 var _bclc = paramObj.calcuTravelLcNumber(isUp, bcType);
                 var _bcsj = paramObj.calcuTravelTime(fcTimeObj, isUp);
                 var _arrsj = paramObj.addMinute(fcTimeObj, _bcsj);
@@ -23,22 +23,22 @@ var Main_v2 = function() {
                 var _qdz = isUp ? paramObj.getUpQdzObj().id : paramObj.getDownQdzObj().id;
                 var _zdz = isUp ? paramObj.getUpZdzObj().id : paramObj.getDownZdzObj().id;
  
-                return new InternalBcObj(
-                    bcType, // 班次类型（normal，in，out等）
-                    isUp, // boolean是否上下行
-                    lp, // 路牌标识符
-                    fcno, // 发车顺序号
-                    fcTimeObj, // 发车时间对象
-                    _bclc, // 班次里程
-                    _bcsj, // 班次历时
-                    _arrsj, // 到达时间对象
-                    _stoptime, // 停站时间
-                    _tccid, // 停车场id
-                    _ttinfoid, // 时刻表id
-                    _xl, // 线路id
-                    _qdz, // 起点站id
-                    _zdz // 终点站id
-                );
+                var bcParamObj = {};
+                bcParamObj.bcType = bcType; // 班次类型（normal，in，out等）
+                bcParamObj.isUp = isUp; // boolean是否上下行
+                bcParamObj.fcno = fcno; // 发车顺序号
+                bcParamObj.fcTimeObj = fcTimeObj; // 发车时间对象
+                bcParamObj.bclc = _bclc; // 班次里程
+                bcParamObj.bcsj = _bcsj; // 班次历时
+                bcParamObj.arrtime = _arrsj; // 到达时间对象
+                bcParamObj.stoptime = _stoptime; // 停站时间
+                bcParamObj.tccid = _tccid; // 停车场id
+                bcParamObj.ttinfoid = _ttinfoid; // 时刻表id
+                bcParamObj.xl = _xl; // 线路id
+                bcParamObj.qdzid = _qdz; // 起点站id
+                bcParamObj.zdzid = _zdz; // 终点站id
+
+                return new InternalBcObj(lpObj, bcParamObj);
             }
         };
     };
@@ -81,16 +81,25 @@ var Main_v2 = function() {
             // 1、初始化行车计划
             var schedule = new InternalScheduleObj(_paramObj, lpArray, _factory);
             schedule.initDataWithBxLayout();
-
             // 2、计算每个路牌的班型及对应工时
             schedule.calcuLpBx_fg();
-
-            // 3、根据班型补充所有的不足班次
+            // 3、将连班路牌的班次补足
             schedule.calcuLpBx_lb();
  
-            // TODO：4、确定末班车
+            // 4、修正针对初始化时生成的高峰班次，之前不足的补上，多余的删除
+            schedule.adjustGfbc(true, true); // 修正上行早高峰
+            schedule.adjustGfbc(true, false); // 修正下行早高峰
+            schedule.adjustGfbc(false, true); // 修正上行晚高峰
+            schedule.adjustGfbc(false, false); // 修正下行晚高峰
+
+            // 5、TODO：根据班型补充所有的不足班次
+            schedule.calcuLpBx_5_2();
+
+            // TODO：6、确定末班车
+
+            // TODO：8、修正不准确的停站时间，微调发车间隔
  
-            // TODO：5、补进出场班次
+            // TODO：9、补进出场报道班次
  
  
             //-------------------- 输出ganut图上的班次，班型描述 ----------------------//
@@ -231,7 +231,7 @@
  
         <div class="col-md-6">
             <label class="control-label col-md-5">
-                <span class="required"> * </span> 高峰建议配车数　:</label>
+                <span class="required"> * </span> 建议高峰配车数　:</label>
             <div class="col-md-5">
                 <input type="text" class="form-control" placeholder="车辆数" name="gfjypcs" id="gfjypcsInput" min="1">
             </div>
@@ -477,7 +477,7 @@
         </div>
  
         <div class="col-md-6">
-            <label class="control-label col-md-5"> 高峰建议配车数　: </label>
+            <label class="control-label col-md-5"> 建议高峰配车数　: </label>
             <div class="col-md-4">
                 <p class="form-control-static" data-display="gfjypcs"> </p>
             </div>
@@ -427,7 +427,7 @@
 				layer.msg("请选择时间");
 				return;
 			}
-			$("#xlmc").html(xlName);
+			$("#xlmc").html(xlName+" "+date+" ");
 // 			$("#ddrbBody").height($(window).height()-300);
 			$("c").html("全日");
 			$("#export").removeAttr("disabled");
@@ -316,7 +316,7 @@
 </script>
 <script type="text/html" id="statisticsDaily">
 	{{each list as obj i}}
-		<tr>
+		<tr {{if obj.zt==1}}style='color: red'{{/if}}>
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhzlc}}</td>
 			<td>{{obj.jhlc}}</td>
-/**
-
- @Name：layer v3.0.3 Web弹层组件
- @Author：贤心
- @Site：http://layer.layui.com
- @License：MIT
-
- */
-
-;!function(window, undefined){
-  "use strict";
-
-  var isLayui = window.layui && layui.define, $, win, ready = {
-    getPath: function(){
-      var js = document.scripts, script = js[js.length - 1], jsPath = script.src;
-      if(script.getAttribute('merge')) return;
-      return jsPath.substring(0, jsPath.lastIndexOf("/") + 1);
-    }(),
-
-    config: {}, end: {}, minIndex: 0, minLeft: [],
-    btn: ['&#x786E;&#x5B9A;', '&#x53D6;&#x6D88;'],
-
-    //五种原始层模式
-    type: ['dialog', 'page', 'iframe', 'loading', 'tips']
-  };
-
-//默认内置方法。
-  var layer = {
-    v: '3.0.3',
-    ie: function(){ //ie版本
-      var agent = navigator.userAgent.toLowerCase();
-      return (!!window.ActiveXObject || "ActiveXObject" in window) ? (
-          (agent.match(/msie\s(\d+)/) || [])[1] || '11' //由于ie11并没有msie的标识
-      ) : false;
-    }(),
-    index: (window.layer && window.layer.v) ? 100000 : 0,
-    path: ready.getPath,
-    config: function(options, fn){
-      options = options || {};
-      layer.cache = ready.config = $.extend({}, ready.config, options);
-      layer.path = ready.config.path || layer.path;
-      typeof options.extend === 'string' && (options.extend = [options.extend]);
-
-      if(ready.config.path) layer.ready();
-
-      if(!options.extend) return this;
-
-      isLayui
-          ? layui.addcss('modules/layer/' + options.extend)
-          : layer.link('skin/' + options.extend);
-
-      return this;
-    },
-
-    //载入CSS配件
-    link: function(href, fn, cssname){
-
-      //未设置路径，则不主动加载css
-      if(!layer.path) return;
-
-      var head = $('head')[0], link = document.createElement('link');
-      if(typeof fn === 'string') cssname = fn;
-      var app = (cssname || href).replace(/\.|\//g, '');
-      var id = 'layuicss-'+app, timeout = 0;
-
-      link.rel = 'stylesheet';
-      link.href = layer.path + href;
-      link.id = id;
-
-      if(!$('#'+ id)[0]){
-        head.appendChild(link);
-      }
-
-      if(typeof fn !== 'function') return;
-
-      //轮询css是否加载完毕
-      /*    (function poll() {
-       if(++timeout > 8 * 1000 / 100){
-       return window.console && console.error('layer.css: Invalid');
-       };
-       parseInt($('#'+id).css('width')) === 1989 ? fn() : setTimeout(poll, 100);
-       }());*/
-    },
-
-    ready: function(callback){
-      /*var cssname = 'skinlayercss', ver = '303';
-       isLayui ? layui.addcss('modules/layer/default/layer.css?v='+layer.v+ver, callback, cssname)
-       : layer.link('skin/default/layer.css?v='+layer.v+ver, callback, cssname);*/
-      return this;
-    },
-
-    //各种快捷引用
-    alert: function(content, options, yes){
-      var type = typeof options === 'function';
-      if(type) yes = options;
-      return layer.open($.extend({
-        content: content,
-        yes: yes
-      }, type ? {} : options));
-    },
-
-    confirm: function(content, options, yes, cancel){
-      var type = typeof options === 'function';
-      if(type){
-        cancel = yes;
-        yes = options;
-      }
-      return layer.open($.extend({
-        content: content,
-        btn: ready.btn,
-        yes: yes,
-        btn2: cancel
-      }, type ? {} : options));
-    },
-
-    msg: function(content, options, end){ //最常用提示层
-      var type = typeof options === 'function', rskin = ready.config.skin;
-      var skin = (rskin ? rskin + ' ' + rskin + '-msg' : '')||'layui-layer-msg';
-      var anim = doms.anim.length - 1;
-      if(type) end = options;
-      return layer.open($.extend({
-        content: content,
-        time: 3000,
-        shade: false,
-        skin: skin,
-        title: false,
-        closeBtn: false,
-        btn: false,
-        resize: false,
-        end: end
-      }, (type && !ready.config.skin) ? {
-        skin: skin + ' layui-layer-hui',
-        anim: anim
-      } : function(){
-        options = options || {};
-        if(options.icon === -1 || options.icon === undefined && !ready.config.skin){
-          options.skin = skin + ' ' + (options.skin||'layui-layer-hui');
-        }
-        return options;
-      }()));
-    },
-
-    load: function(icon, options){
-      return layer.open($.extend({
-        type: 3,
-        icon: icon || 0,
-        resize: false,
-        shade: 0.01
-      }, options));
-    },
-
-    tips: function(content, follow, options){
-      return layer.open($.extend({
-        type: 4,
-        content: [content, follow],
-        closeBtn: false,
-        time: 3000,
-        shade: false,
-        resize: false,
-        fixed: false,
-        maxWidth: 210
-      }, options));
-    }
-  };
-
-  var Class = function(setings){
-    var that = this;
-    that.index = ++layer.index;
-    that.config = $.extend({}, that.config, ready.config, setings);
-    document.body ? that.creat() : setTimeout(function(){
-      that.creat();
-    }, 30);
-  };
-
-  Class.pt = Class.prototype;
-
-//缓存常用字符
-  var doms = ['layui-layer', '.layui-layer-title', '.layui-layer-main', '.layui-layer-dialog', 'layui-layer-iframe', 'layui-layer-content', 'layui-layer-btn', 'layui-layer-close'];
-  doms.anim = ['layer-anim', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06'];
-
-//默认配置
-  Class.pt.config = {
-    type: 0,
-    shade: 0.3,
-    fixed: true,
-    move: doms[1],
-    title: '&#x4FE1;&#x606F;',
-    offset: 'auto',
-    area: 'auto',
-    closeBtn: 1,
-    time: 0, //0表示不自动关闭
-    zIndex: 19891014,
-    maxWidth: 360,
-    anim: 0,
-    isOutAnim: true,
-    icon: -1,
-    moveType: 1,
-    resize: true,
-    scrollbar: true, //是否允许浏览器滚动条
-    tips: 2
-  };
-
-//容器
-  Class.pt.vessel = function(conType, callback){
-    var that = this, times = that.index, config = that.config;
-    var zIndex = config.zIndex + times, titype = typeof config.title === 'object';
-    var ismax = config.maxmin && (config.type === 1 || config.type === 2);
-    var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">'
-    + (titype ? config.title[0] : config.title)
-    + '</div>' : '');
-
-    config.zIndex = zIndex;
-    callback([
-      //遮罩
-      config.shade ? ('<div class="layui-layer-shade" id="layui-layer-shade'+ times +'" times="'+ times +'" style="'+ ('z-index:'+ (zIndex-1) +'; background-color:'+ (config.shade[1]||'#000') +'; opacity:'+ (config.shade[0]||config.shade) +'; filter:alpha(opacity='+ (config.shade[0]*100||config.shade*100) +');') +'"></div>') : '',
-
-      //主体
-      '<div class="'+ doms[0] + (' layui-layer-'+ready.type[config.type]) + (((config.type == 0 || config.type == 2) && !config.shade) ? ' layui-layer-border' : '') + ' ' + (config.skin||'') +'" id="'+ doms[0] + times +'" type="'+ ready.type[config.type] +'" times="'+ times +'" showtime="'+ config.time +'" conType="'+ (conType ? 'object' : 'string') +'" style="z-index: '+ zIndex +'; width:'+ config.area[0] + ';height:' + config.area[1] + (config.fixed ? '' : ';position:absolute;') +'">'
-      + (conType && config.type != 2 ? '' : titleHTML)
-      + '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
-      + (config.type == 0 && config.icon !== -1 ? '<i class="layui-layer-ico layui-layer-ico'+ config.icon +'"></i>' : '')
-      + (config.type == 1 && conType ? '' : (config.content||''))
-      + '</div>'
-      + '<span class="layui-layer-setwin">'+ function(){
-        var closebtn = ismax ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
-        config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
-        return closebtn;
-      }() + '</span>'
-      + (config.btn ? function(){
-        var button = '';
-        typeof config.btn === 'string' && (config.btn = [config.btn]);
-        for(var i = 0, len = config.btn.length; i < len; i++){
-          button += '<a class="'+ doms[6] +''+ i +'">'+ config.btn[i] +'</a>'
-        }
-        return '<div class="'+ doms[6] + (config.btnAlign ? (' layui-layer-btn-' + config.btnAlign) : '') +'">'+ button +'</div>'
-      }() : '')
-      + (config.resize ? '<span class="layui-layer-resize"></span>' : '')
-      + '</div>'
-    ], titleHTML, $('<div class="layui-layer-move"></div>'));
-    return that;
-  };
-
-//创建骨架
-  Class.pt.creat = function(){
-    var that = this
-        ,config = that.config
-        ,times = that.index, nodeIndex
-        ,content = config.content
-        ,conType = typeof content === 'object'
-        ,body = $('body');
-
-    if(config.id && $('#'+config.id)[0])  return;
-
-    if(typeof config.area === 'string'){
-      config.area = config.area === 'auto' ? ['', ''] : [config.area, ''];
-    }
-
-    //anim兼容旧版shift
-    if(config.shift){
-      config.anim = config.shift;
-    }
-
-    if(layer.ie == 6){
-      config.fixed = false;
-    }
-
-    switch(config.type){
-      case 0:
-        config.btn = ('btn' in config) ? config.btn : ready.btn[0];
-        layer.closeAll('dialog');
-        break;
-      case 2:
-        var content = config.content = conType ? config.content : [config.content, 'auto'];
-        config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' + config.content[0] + '"></iframe>';
-        break;
-      case 3:
-        delete config.title;
-        delete config.closeBtn;
-        config.icon === -1 && (config.icon === 0);
-        layer.closeAll('loading');
-        break;
-      case 4:
-        conType || (config.content = [config.content, 'body']);
-        config.follow = config.content[1];
-        config.content = config.content[0] + '<i class="layui-layer-TipsG"></i>';
-        delete config.title;
-        config.tips = typeof config.tips === 'object' ? config.tips : [config.tips, true];
-        config.tipsMore || layer.closeAll('tips');
-        break;
-    }
-
-    //建立容器
-    that.vessel(conType, function(html, titleHTML, moveElem){
-      body.append(html[0]);
-      conType ? function(){
-        (config.type == 2 || config.type == 4) ? function(){
-          $('body').append(html[1]);
-        }() : function(){
-          if(!content.parents('.'+doms[0])[0]){
-            content.data('display', content.css('display')).show().addClass('layui-layer-wrap').wrap(html[1]);
-            $('#'+ doms[0] + times).find('.'+doms[5]).before(titleHTML);
-          }
-        }();
-      }() : body.append(html[1]);
-      $('.layui-layer-move')[0] || body.append(ready.moveElem = moveElem);
-      that.layero = $('#'+ doms[0] + times);
-      config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
-    }).auto(times);
-
-    config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]);
-
-    //坐标自适应浏览器窗口尺寸
-    config.type == 4 ? that.tips() : that.offset();
-    if(config.fixed){
-      win.on('resize', function(){
-        that.offset();
-        (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times);
-        config.type == 4 && that.tips();
-      });
-    }
-
-    config.time <= 0 || setTimeout(function(){
-      layer.close(that.index)
-    }, config.time);
-    that.move().callback();
-
-    //为兼容jQuery3.0的css动画影响元素尺寸计算
-    if(doms.anim[config.anim]){
-      that.layero.addClass(doms.anim[config.anim]);
-    };
-
-    //记录关闭动画
-    if(config.isOutAnim){
-      that.layero.data('isOutAnim', true);
-    }
-  };
-
-//自适应
-  Class.pt.auto = function(index){
-    var that = this, config = that.config, layero = $('#'+ doms[0] + index);
-    if(config.area[0] === '' && config.maxWidth > 0){
-      //为了修复IE7下一个让人难以理解的bug
-      if(layer.ie && layer.ie < 8 && config.btn){
-        layero.width(layero.innerWidth());
-      }
-      layero.outerWidth() > config.maxWidth && layero.width(config.maxWidth);
-    }
-    var area = [layero.innerWidth(), layero.innerHeight()];
-    var titHeight = layero.find(doms[1]).outerHeight() || 0;
-    var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
-    function setHeight(elem){
-      elem = layero.find(elem);
-      elem.height(area[1] - titHeight - btnHeight - 2*(parseFloat(elem.css('padding-top'))|0));
-    }
-    switch(config.type){
-      case 2:
-        setHeight('iframe');
-        break;
-      default:
-        if(config.area[1] === ''){
-          if(config.fixed && area[1] >= win.height()){
-            area[1] = win.height();
-            setHeight('.'+doms[5]);
-          }
-        } else {
-          setHeight('.'+doms[5]);
-        }
-        break;
-    }
-    return that;
-  };
-
-//计算坐标
-  Class.pt.offset = function(){
-    var that = this, config = that.config, layero = that.layero;
-    var area = [layero.outerWidth(), layero.outerHeight()];
-    var type = typeof config.offset === 'object';
-    that.offsetTop = (win.height() - area[1])/2;
-    that.offsetLeft = (win.width() - area[0])/2;
-
-    if(type){
-      that.offsetTop = config.offset[0];
-      that.offsetLeft = config.offset[1]||that.offsetLeft;
-    } else if(config.offset !== 'auto'){
-
-      if(config.offset === 't'){ //上
-        that.offsetTop = 0;
-      } else if(config.offset === 'r'){ //右
-        that.offsetLeft = win.width() - area[0];
-      } else if(config.offset === 'b'){ //下
-        that.offsetTop = win.height() - area[1];
-      } else if(config.offset === 'l'){ //左
-        that.offsetLeft = 0;
-      } else if(config.offset === 'lt'){ //左上角
-        that.offsetTop = 0;
-        that.offsetLeft = 0;
-      } else if(config.offset === 'lb'){ //左下角
-        that.offsetTop = win.height() - area[1];
-        that.offsetLeft = 0;
-      } else if(config.offset === 'rt'){ //右上角
-        that.offsetTop = 0;
-        that.offsetLeft = win.width() - area[0];
-      } else if(config.offset === 'rb'){ //右下角
-        that.offsetTop = win.height() - area[1];
-        that.offsetLeft = win.width() - area[0];
-      } else {
-        that.offsetTop = config.offset;
-      }
-
-    }
-
-    if(!config.fixed){
-      that.offsetTop = /%$/.test(that.offsetTop) ?
-      win.height()*parseFloat(that.offsetTop)/100
-          : parseFloat(that.offsetTop);
-      that.offsetLeft = /%$/.test(that.offsetLeft) ?
-      win.width()*parseFloat(that.offsetLeft)/100
-          : parseFloat(that.offsetLeft);
-      that.offsetTop += win.scrollTop();
-      that.offsetLeft += win.scrollLeft();
-    }
-
-    if(layero.attr('minLeft')){
-      that.offsetTop = win.height() - (layero.find(doms[1]).outerHeight() || 0);
-      that.offsetLeft = layero.css('left');
-    }
-
-    layero.css({top: that.offsetTop, left: that.offsetLeft});
-  };
-
-//Tips
-  Class.pt.tips = function(){
-    var that = this, config = that.config, layero = that.layero;
-    var layArea = [layero.outerWidth(), layero.outerHeight()], follow = $(config.follow);
-    if(!follow[0]) follow = $('body');
-    var goal = {
-      width: follow.outerWidth(),
-      height: follow.outerHeight(),
-      top: follow.offset().top,
-      left: follow.offset().left
-    }, tipsG = layero.find('.layui-layer-TipsG');
-
-    var guide = config.tips[0];
-    config.tips[1] || tipsG.remove();
-
-    goal.autoLeft = function(){
-      if(goal.left + layArea[0] - win.width() > 0){
-        goal.tipLeft = goal.left + goal.width - layArea[0];
-        tipsG.css({right: 12, left: 'auto'});
-      } else {
-        goal.tipLeft = goal.left;
-      };
-    };
-
-    //辨别tips的方位
-    goal.where = [function(){ //上
-      goal.autoLeft();
-      goal.tipTop = goal.top - layArea[1] - 10;
-      tipsG.removeClass('layui-layer-TipsB').addClass('layui-layer-TipsT').css('border-right-color', config.tips[1]);
-    }, function(){ //右
-      goal.tipLeft = goal.left + goal.width + 10;
-      goal.tipTop = goal.top;
-      tipsG.removeClass('layui-layer-TipsL').addClass('layui-layer-TipsR').css('border-bottom-color', config.tips[1]);
-    }, function(){ //下
-      goal.autoLeft();
-      goal.tipTop = goal.top + goal.height + 10;
-      tipsG.removeClass('layui-layer-TipsT').addClass('layui-layer-TipsB').css('border-right-color', config.tips[1]);
-    }, function(){ //左
-      goal.tipLeft = goal.left - layArea[0] - 10;
-      goal.tipTop = goal.top;
-      tipsG.removeClass('layui-layer-TipsR').addClass('layui-layer-TipsL').css('border-bottom-color', config.tips[1]);
-    }];
-    goal.where[guide-1]();
-
-    /* 8*2为小三角形占据的空间 */
-    if(guide === 1){
-      goal.top - (win.scrollTop() + layArea[1] + 8*2) < 0 && goal.where[2]();
-    } else if(guide === 2){
-      win.width() - (goal.left + goal.width + layArea[0] + 8*2) > 0 || goal.where[3]()
-    } else if(guide === 3){
-      (goal.top - win.scrollTop() + goal.height + layArea[1] + 8*2) - win.height() > 0 && goal.where[0]();
-    } else if(guide === 4){
-      layArea[0] + 8*2 - goal.left > 0 && goal.where[1]()
-    }
-
-    layero.find('.'+doms[5]).css({
-      'background-color': config.tips[1],
-      'padding-right': (config.closeBtn ? '30px' : '')
-    });
-    layero.css({
-      left: goal.tipLeft - (config.fixed ? win.scrollLeft() : 0),
-      top: goal.tipTop  - (config.fixed ? win.scrollTop() : 0)
-    });
-  }
-
-//拖拽层
-  Class.pt.move = function(){
-    var that = this
-        ,config = that.config
-        ,_DOC = $(document)
-        ,layero = that.layero
-        ,moveElem = layero.find(config.move)
-        ,resizeElem = layero.find('.layui-layer-resize')
-        ,dict = {};
-
-    if(config.move){
-      moveElem.css('cursor', 'move');
-    }
-
-    moveElem.on('mousedown', function(e){
-      e.preventDefault();
-      if(config.move){
-        dict.moveStart = true;
-        dict.offset = [
-          e.clientX - parseFloat(layero.css('left'))
-          ,e.clientY - parseFloat(layero.css('top'))
-        ];
-        ready.moveElem.css('cursor', 'move').show();
-      }
-    });
-
-    resizeElem.on('mousedown', function(e){
-      e.preventDefault();
-      dict.resizeStart = true;
-      dict.offset = [e.clientX, e.clientY];
-      dict.area = [
-        layero.outerWidth()
-        ,layero.outerHeight()
-      ];
-      ready.moveElem.css('cursor', 'se-resize').show();
-    });
-
-    _DOC.on('mousemove', function(e){
-
-      //拖拽移动
-      if(dict.moveStart){
-        var X = e.clientX - dict.offset[0]
-            ,Y = e.clientY - dict.offset[1]
-            ,fixed = layero.css('position') === 'fixed';
-
-        e.preventDefault();
-
-        dict.stX = fixed ? 0 : win.scrollLeft();
-        dict.stY = fixed ? 0 : win.scrollTop();
-
-        //控制元素不被拖出窗口外
-        if(!config.moveOut){
-          var setRig = win.width() - layero.outerWidth() + dict.stX
-              ,setBot = win.height() - layero.outerHeight() + dict.stY;
-          X < dict.stX && (X = dict.stX);
-          X > setRig && (X = setRig);
-          Y < dict.stY && (Y = dict.stY);
-          Y > setBot && (Y = setBot);
-        }
-
-        layero.css({
-          left: X
-          ,top: Y
-        });
-      }
-
-      //Resize
-      if(config.resize && dict.resizeStart){
-        var X = e.clientX - dict.offset[0]
-            ,Y = e.clientY - dict.offset[1];
-
-        e.preventDefault();
-
-        layer.style(that.index, {
-          width: dict.area[0] + X
-          ,height: dict.area[1] + Y
-        })
-        dict.isResize = true;
-        config.resizing && config.resizing(layero);
-      }
-    }).on('mouseup', function(e){
-      if(dict.moveStart){
-        delete dict.moveStart;
-        ready.moveElem.hide();
-        config.moveEnd && config.moveEnd(layero);
-      }
-      if(dict.resizeStart){
-        delete dict.resizeStart;
-        ready.moveElem.hide();
-      }
-    });
-
-    return that;
-  };
-
-  Class.pt.callback = function(){
-    var that = this, layero = that.layero, config = that.config;
-    that.openLayer();
-    if(config.success){
-      if(config.type == 2){
-        layero.find('iframe').on('load', function(){
-          config.success(layero, that.index);
-        });
-      } else {
-        config.success(layero, that.index);
-      }
-    }
-    layer.ie == 6 && that.IE6(layero);
-
-    //按钮
-    layero.find('.'+ doms[6]).children('a').on('click', function(){
-      var index = $(this).index();
-      if(index === 0){
-        if(config.yes){
-          config.yes(that.index, layero)
-        } else if(config['btn1']){
-          config['btn1'](that.index, layero)
-        } else {
-          layer.close(that.index);
-        }
-      } else {
-        var close = config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
-        close === false || layer.close(that.index);
-      }
-    });
-
-    //取消
-    function cancel(){
-      var close = config.cancel && config.cancel(that.index, layero);
-      close === false || layer.close(that.index);
-    }
-
-    //右上角关闭回调
-    layero.find('.'+ doms[7]).on('click', cancel);
-
-    //点遮罩关闭
-    if(config.shadeClose){
-      $('#layui-layer-shade'+ that.index).on('click', function(){
-        layer.close(that.index);
-      });
-    }
-
-    //最小化
-    layero.find('.layui-layer-min').on('click', function(){
-      var min = config.min && config.min(layero);
-      min === false || layer.min(that.index, config);
-    });
-
-    //全屏/还原
-    layero.find('.layui-layer-max').on('click', function(){
-      if($(this).hasClass('layui-layer-maxmin')){
-        layer.restore(that.index);
-        config.restore && config.restore(layero);
-      } else {
-        layer.full(that.index, config);
-        setTimeout(function(){
-          config.full && config.full(layero);
-        }, 100);
-      }
-    });
-
-    config.end && (ready.end[that.index] = config.end);
-  };
-
-//for ie6 恢复select
-  ready.reselect = function(){
-    $.each($('select'), function(index , value){
-      var sthis = $(this);
-      if(!sthis.parents('.'+doms[0])[0]){
-        (sthis.attr('layer') == 1 && $('.'+doms[0]).length < 1) && sthis.removeAttr('layer').show();
-      }
-      sthis = null;
-    });
-  };
-
-  Class.pt.IE6 = function(layero){
-    //隐藏select
-    $('select').each(function(index , value){
-      var sthis = $(this);
-      if(!sthis.parents('.'+doms[0])[0]){
-        sthis.css('display') === 'none' || sthis.attr({'layer' : '1'}).hide();
-      }
-      sthis = null;
-    });
-  };
-
-//需依赖原型的对外方法
-  Class.pt.openLayer = function(){
-    var that = this;
-
-    //置顶当前窗口
-    layer.zIndex = that.config.zIndex;
-    layer.setTop = function(layero){
-      var setZindex = function(){
-        layer.zIndex++;
-        layero.css('z-index', layer.zIndex + 1);
-      };
-      layer.zIndex = parseInt(layero[0].style.zIndex);
-      layero.on('mousedown', setZindex);
-      return layer.zIndex;
-    };
-  };
-
-  ready.record = function(layero){
-    var area = [
-      layero.width(),
-      layero.height(),
-      layero.position().top,
-      layero.position().left + parseFloat(layero.css('margin-left'))
-    ];
-    layero.find('.layui-layer-max').addClass('layui-layer-maxmin');
-    layero.attr({area: area});
-  };
-
-  ready.rescollbar = function(index){
-    if(doms.html.attr('layer-full') == index){
-      if(doms.html[0].style.removeProperty){
-        doms.html[0].style.removeProperty('overflow');
-      } else {
-        doms.html[0].style.removeAttribute('overflow');
-      }
-      doms.html.removeAttr('layer-full');
-    }
-  };
-
-  /** 内置成员 */
-
-  window.layer = layer;
-
-//获取子iframe的DOM
-  layer.getChildFrame = function(selector, index){
-    index = index || $('.'+doms[4]).attr('times');
-    return $('#'+ doms[0] + index).find('iframe').contents().find(selector);
-  };
-
-//得到当前iframe层的索引，子iframe时使用
-  layer.getFrameIndex = function(name){
-    return $('#'+ name).parents('.'+doms[4]).attr('times');
-  };
-
-//iframe层自适应宽高
-  layer.iframeAuto = function(index){
-    if(!index) return;
-    var heg = layer.getChildFrame('html', index).outerHeight();
-    var layero = $('#'+ doms[0] + index);
-    var titHeight = layero.find(doms[1]).outerHeight() || 0;
-    var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
-    layero.css({height: heg + titHeight + btnHeight});
-    layero.find('iframe').css({height: heg});
-  };
-
-//重置iframe url
-  layer.iframeSrc = function(index, url){
-    $('#'+ doms[0] + index).find('iframe').attr('src', url);
-  };
-
-//设定层的样式
-  layer.style = function(index, options, limit){
-    var layero = $('#'+ doms[0] + index)
-        ,contElem = layero.find('.layui-layer-content')
-        ,type = layero.attr('type')
-        ,titHeight = layero.find(doms[1]).outerHeight() || 0
-        ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
-        ,minLeft = layero.attr('minLeft');
-
-    if(type === ready.type[3] || type === ready.type[4]){
-      return;
-    }
-
-    if(!limit){
-      if(parseFloat(options.width) <= 260){
-        options.width = 260;
-      };
-
-      if(parseFloat(options.height) - titHeight - btnHeight <= 64){
-        options.height = 64 + titHeight + btnHeight;
-      };
-    }
-
-    layero.css(options);
-    btnHeight = layero.find('.'+doms[6]).outerHeight();
-
-    if(type === ready.type[2]){
-      layero.find('iframe').css({
-        height: parseFloat(options.height) - titHeight - btnHeight
-      });
-    } else {
-      contElem.css({
-        height: parseFloat(options.height) - titHeight - btnHeight
-        - parseFloat(contElem.css('padding-top'))
-        - parseFloat(contElem.css('padding-bottom'))
-      })
-    }
-  };
-
-//最小化
-  layer.min = function(index, options){
-    var layero = $('#'+ doms[0] + index)
-        ,titHeight = layero.find(doms[1]).outerHeight() || 0
-        ,left = layero.attr('minLeft') || (181*ready.minIndex)+'px'
-        ,position = layero.css('position');
-
-    ready.record(layero);
-
-    if(ready.minLeft[0]){
-      left = ready.minLeft[0];
-      ready.minLeft.shift();
-    }
-
-    layero.attr('position', position);
-
-    layer.style(index, {
-      width: 180
-      ,height: titHeight
-      ,left: left
-      ,top: win.height() - titHeight
-      ,position: 'fixed'
-      ,overflow: 'hidden'
-    }, true);
-
-    layero.find('.layui-layer-min').hide();
-    layero.attr('type') === 'page' && layero.find(doms[4]).hide();
-    ready.rescollbar(index);
-
-    if(!layero.attr('minLeft')){
-      ready.minIndex++;
-    }
-    layero.attr('minLeft', left);
-  };
-
-//还原
-  layer.restore = function(index){
-    var layero = $('#'+ doms[0] + index), area = layero.attr('area').split(',');
-    var type = layero.attr('type');
-    layer.style(index, {
-      width: parseFloat(area[0]),
-      height: parseFloat(area[1]),
-      top: parseFloat(area[2]),
-      left: parseFloat(area[3]),
-      position: layero.attr('position'),
-      overflow: 'visible'
-    }, true);
-    layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
-    layero.find('.layui-layer-min').show();
-    layero.attr('type') === 'page' && layero.find(doms[4]).show();
-    ready.rescollbar(index);
-  };
-
-//全屏
-  layer.full = function(index){
-    var layero = $('#'+ doms[0] + index), timer;
-    ready.record(layero);
-    if(!doms.html.attr('layer-full')){
-      doms.html.css('overflow','hidden').attr('layer-full', index);
-    }
-    clearTimeout(timer);
-    timer = setTimeout(function(){
-      var isfix = layero.css('position') === 'fixed';
-      layer.style(index, {
-        top: isfix ? 0 : win.scrollTop(),
-        left: isfix ? 0 : win.scrollLeft(),
-        width: win.width(),
-        height: win.height()
-      }, true);
-      layero.find('.layui-layer-min').hide();
-    }, 100);
-  };
-
-//改变title
-  layer.title = function(name, index){
-    var title = $('#'+ doms[0] + (index||layer.index)).find(doms[1]);
-    title.html(name);
-  };
-
-//关闭layer总方法
-  layer.close = function(index){
-    var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
-    if(!layero[0]) return;
-    var WRAP = 'layui-layer-wrap', remove = function(){
-      if(type === ready.type[1] && layero.attr('conType') === 'object'){
-        layero.children(':not(.'+ doms[5] +')').remove();
-        var wrap = layero.find('.'+WRAP);
-        for(var i = 0; i < 2; i++){
-          wrap.unwrap();
-        }
-        wrap.css('display', wrap.data('display')).removeClass(WRAP);
-      } else {
-        //低版本IE 回收 iframe
-        if(type === ready.type[2]){
-          try {
-            var iframe = $('#'+doms[4]+index)[0];
-            iframe.contentWindow.document.write('');
-            iframe.contentWindow.close();
-            layero.find('.'+doms[5])[0].removeChild(iframe);
-          } catch(e){}
-        }
-        layero[0].innerHTML = '';
-        layero.remove();
-      }
-      typeof ready.end[index] === 'function' && ready.end[index]();
-      delete ready.end[index];
-    };
-
-    if(layero.data('isOutAnim')){
-      layero.addClass(closeAnim);
-    }
-
-    $('#layui-layer-moves, #layui-layer-shade' + index).remove();
-    layer.ie == 6 && ready.reselect();
-    ready.rescollbar(index);
-    if(layero.attr('minLeft')){
-      ready.minIndex--;
-      ready.minLeft.push(layero.attr('minLeft'));
-    }
-
-    if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
-      remove()
-    } else {
-      setTimeout(function(){
-        remove();
-      }, 200);
-    }
-  };
-
-//关闭所有层
-  layer.closeAll = function(type){
-    $.each($('.'+doms[0]), function(){
-      var othis = $(this);
-      var is = type ? (othis.attr('type') === type) : 1;
-      is && layer.close(othis.attr('times'));
-      is = null;
-    });
-  };
-
-  /**
-
-   拓展模块，layui开始合并在一起
-
-   */
-
-  var cache = layer.cache||{}, skin = function(type){
-    return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
-  };
-
-//仿系统prompt
-  layer.prompt = function(options, yes){
-    var style = '';
-    options = options || {};
-
-    if(typeof options === 'function') yes = options;
-
-    if(options.area){
-      var area = options.area;
-      style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"';
-      delete options.area;
-    }
-    var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style +'>' + (options.value||'') +'</textarea>' : function(){
-      return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input" value="'+ (options.value||'') +'">';
-    }();
-
-    var success = options.success;
-    delete options.success;
-
-    return layer.open($.extend({
-      type: 1
-      ,btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;']
-      ,content: content
-      ,skin: 'layui-layer-prompt' + skin('prompt')
-      ,maxWidth: win.width()
-      ,success: function(layero){
-        prompt = layero.find('.layui-layer-input');
-        prompt.focus();
-        typeof success === 'function' && success(layero);
-      }
-      ,resize: false
-      ,yes: function(index){
-        var value = prompt.val();
-        if(value === ''){
-          prompt.focus();
-        } else if(value.length > (options.maxlength||500)) {
-          layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
-        } else {
-          yes && yes(value, index, prompt);
-        }
-      }
-    }, options));
-  };
-
-//tab层
-  layer.tab = function(options){
-    options = options || {};
-
-    var tab = options.tab || {}
-        ,success = options.success;
-
-    delete options.success;
-
-    return layer.open($.extend({
-      type: 1,
-      skin: 'layui-layer-tab' + skin('tab'),
-      resize: false,
-      title: function(){
-        var len = tab.length, ii = 1, str = '';
-        if(len > 0){
-          str = '<span class="layui-layer-tabnow">'+ tab[0].title +'</span>';
-          for(; ii < len; ii++){
-            str += '<span>'+ tab[ii].title +'</span>';
-          }
-        }
-        return str;
-      }(),
-      content: '<ul class="layui-layer-tabmain">'+ function(){
-        var len = tab.length, ii = 1, str = '';
-        if(len > 0){
-          str = '<li class="layui-layer-tabli xubox_tab_layer">'+ (tab[0].content || 'no content') +'</li>';
-          for(; ii < len; ii++){
-            str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
-          }
-        }
-        return str;
-      }() +'</ul>',
-      success: function(layero){
-        var btn = layero.find('.layui-layer-title').children();
-        var main = layero.find('.layui-layer-tabmain').children();
-        btn.on('mousedown', function(e){
-          e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
-          var othis = $(this), index = othis.index();
-          othis.addClass('layui-layer-tabnow').siblings().removeClass('layui-layer-tabnow');
-          main.eq(index).show().siblings().hide();
-          typeof options.change === 'function' && options.change(index);
-        });
-        typeof success === 'function' && success(layero);
-      }
-    }, options));
-  };
-
-//相册层
-  layer.photos = function(options, loop, key){
-    var dict = {};
-    options = options || {};
-    if(!options.photos) return;
-    var type = options.photos.constructor === Object;
-    var photos = type ? options.photos : {}, data = photos.data || [];
-    var start = photos.start || 0;
-    dict.imgIndex = (start|0) + 1;
-
-    options.img = options.img || 'img';
-
-    var success = options.success;
-    delete options.success;
-
-    if(!type){ //页面直接获取
-      var parent = $(options.photos), pushData = function(){
-        data = [];
-        parent.find(options.img).each(function(index){
-          var othis = $(this);
-          othis.attr('layer-index', index);
-          data.push({
-            alt: othis.attr('alt'),
-            pid: othis.attr('layer-pid'),
-            src: othis.attr('layer-src') || othis.attr('src'),
-            thumb: othis.attr('src')
-          });
-        })
-      };
-
-      pushData();
-
-      if (data.length === 0) return;
-
-      loop || parent.on('click', options.img, function(){
-        var othis = $(this), index = othis.attr('layer-index');
-        layer.photos($.extend(options, {
-          photos: {
-            start: index,
-            data: data,
-            tab: options.tab
-          },
-          full: options.full
-        }), true);
-        pushData();
-      })
-
-      //不直接弹出
-      if(!loop) return;
-
-    } else if (data.length === 0){
-      return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
-    }
-
-    //上一张
-    dict.imgprev = function(key){
-      dict.imgIndex--;
-      if(dict.imgIndex < 1){
-        dict.imgIndex = data.length;
-      }
-      dict.tabimg(key);
-    };
-
-    //下一张
-    dict.imgnext = function(key,errorMsg){
-      dict.imgIndex++;
-      if(dict.imgIndex > data.length){
-        dict.imgIndex = 1;
-        if (errorMsg) {return};
-      }
-      dict.tabimg(key)
-    };
-
-    //方向键
-    dict.keyup = function(event){
-      if(!dict.end){
-        var code = event.keyCode;
-        event.preventDefault();
-        if(code === 37){
-          dict.imgprev(true);
-        } else if(code === 39) {
-          dict.imgnext(true);
-        } else if(code === 27) {
-          layer.close(dict.index);
-        }
-      }
-    }
-
-    //切换
-    dict.tabimg = function(key){
-      if(data.length <= 1) return;
-      photos.start = dict.imgIndex - 1;
-      layer.close(dict.index);
-      return layer.photos(options, true, key);
-      setTimeout(function(){
-        layer.photos(options, true, key);
-      }, 200);
-    }
-
-    //一些动作
-    dict.event = function(){
-      dict.bigimg.hover(function(){
-        dict.imgsee.show();
-      }, function(){
-        dict.imgsee.hide();
-      });
-
-      dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
-        event.preventDefault();
-        dict.imgprev();
-      });
-
-      dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){
-        event.preventDefault();
-        dict.imgnext();
-      });
-
-      $(document).on('keyup', dict.keyup);
-    };
-
-    //图片预加载
-    function loadImage(url, callback, error) {
-      var img = new Image();
-      img.src = url;
-      if(img.complete){
-        return callback(img);
-      }
-      img.onload = function(){
-        img.onload = null;
-        callback(img);
-      };
-      img.onerror = function(e){
-        img.onerror = null;
-        error(e);
-      };
-    };
-
-    dict.loadi = layer.load(1, {
-      shade: 'shade' in options ? false : 0.9,
-      scrollbar: false
-    });
-
-    loadImage(data[start].src, function(img){
-      layer.close(dict.loadi);
-      dict.index = layer.open($.extend({
-        type: 1,
-        id: 'layui-layer-photos',
-        area: function(){
-          var imgarea = [img.width, img.height];
-          var winarea = [$(window).width() - 100, $(window).height() - 100];
-
-          //如果 实际图片的宽或者高比 屏幕大（那么进行缩放）
-          if(!options.full && (imgarea[0]>winarea[0]||imgarea[1]>winarea[1])){
-            var wh = [imgarea[0]/winarea[0],imgarea[1]/winarea[1]];//取宽度缩放比例、高度缩放比例
-            if(wh[0] > wh[1]){//取缩放比例最大的进行缩放
-              imgarea[0] = imgarea[0]/wh[0];
-              imgarea[1] = imgarea[1]/wh[0];
-            } else if(wh[0] < wh[1]){
-              imgarea[0] = imgarea[0]/wh[1];
-              imgarea[1] = imgarea[1]/wh[1];
-            }
-          }
-
-          return [imgarea[0]+'px', imgarea[1]+'px'];
-        }(),
-        title: false,
-        shade: 0.9,
-        shadeClose: true,
-        closeBtn: false,
-        move: '.layui-layer-phimg img',
-        moveType: 1,
-        scrollbar: false,
-        moveOut: true,
-        //anim: Math.random()*5|0,
-        isOutAnim: false,
-        skin: 'layui-layer-photos' + skin('photos'),
-        content: '<div class="layui-layer-phimg">'
-        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
-        +'<div class="layui-layer-imgsee">'
-        +(data.length > 1 ? '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>' : '')
-        +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt||'') +'</a><em>'+ dict.imgIndex +'/'+ data.length +'</em></span></div>'
-        +'</div>'
-        +'</div>',
-        success: function(layero, index){
-          dict.bigimg = layero.find('.layui-layer-phimg');
-          dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar');
-          dict.event(layero);
-          options.tab && options.tab(data[start], layero);
-          typeof success === 'function' && success(layero);
-        }, end: function(){
-          dict.end = true;
-          $(document).off('keyup', dict.keyup);
-        }
-      }, options));
-    }, function(){
-      layer.close(dict.loadi);
-      layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
-        time: 30000,
-        btn: ['&#x4E0B;&#x4E00;&#x5F20;', '&#x4E0D;&#x770B;&#x4E86;'],
-        yes: function(){
-          data.length > 1 && dict.imgnext(true,true);
-        }
-      });
-    });
-  };
-
-//主入口
-  ready.run = function(_$){
-    $ = _$;
-    win = $(window);
-    doms.html = $('html');
-    layer.open = function(deliver){
-      var o = new Class(deliver);
-      return o.index;
-    };
-  };
-
-//加载方式
-  window.layui && layui.define ? (
-      layer.ready()
-          ,layui.define('jquery', function(exports){ //layui加载
-        layer.path = layui.cache.dir;
-        ready.run(layui.jquery);
-
-        //暴露模块
-        window.layer = layer;
-        exports('layer', layer);
-      })
-  ) : (
-      (typeof define === 'function' && define.amd) ? define(['jquery'], function(){ //requirejs加载
-        ready.run(window.jQuery);
-        return layer;
-      }) : function(){ //普通script标签加载
-        ready.run(window.jQuery);
-        layer.ready();
-      }()
-  );
-
+/**
+
+ @Name：layer v3.0.3 Web弹层组件
+ @Author：贤心
+ @Site：http://layer.layui.com
+ @License：MIT
+
+ */
+
+;!function(window, undefined){
+  "use strict";
+
+  var isLayui = window.layui && layui.define, $, win, ready = {
+    getPath: function(){
+      var js = document.scripts, script = js[js.length - 1], jsPath = script.src;
+      if(script.getAttribute('merge')) return;
+      return jsPath.substring(0, jsPath.lastIndexOf("/") + 1);
+    }(),
+
+    config: {}, end: {}, minIndex: 0, minLeft: [],
+    btn: ['&#x786E;&#x5B9A;', '&#x53D6;&#x6D88;'],
+
+    //五种原始层模式
+    type: ['dialog', 'page', 'iframe', 'loading', 'tips']
+  };
+
+//默认内置方法。
+  var layer = {
+    v: '3.0.3',
+    ie: function(){ //ie版本
+      var agent = navigator.userAgent.toLowerCase();
+      return (!!window.ActiveXObject || "ActiveXObject" in window) ? (
+          (agent.match(/msie\s(\d+)/) || [])[1] || '11' //由于ie11并没有msie的标识
+      ) : false;
+    }(),
+    index: (window.layer && window.layer.v) ? 100000 : 0,
+    path: ready.getPath,
+    config: function(options, fn){
+      options = options || {};
+      layer.cache = ready.config = $.extend({}, ready.config, options);
+      layer.path = ready.config.path || layer.path;
+      typeof options.extend === 'string' && (options.extend = [options.extend]);
+
+      if(ready.config.path) layer.ready();
+
+      if(!options.extend) return this;
+
+      isLayui
+          ? layui.addcss('modules/layer/' + options.extend)
+          : layer.link('skin/' + options.extend);
+
+      return this;
+    },
+
+    //载入CSS配件
+    link: function(href, fn, cssname){
+
+      //未设置路径，则不主动加载css
+      if(!layer.path) return;
+
+      var head = $('head')[0], link = document.createElement('link');
+      if(typeof fn === 'string') cssname = fn;
+      var app = (cssname || href).replace(/\.|\//g, '');
+      var id = 'layuicss-'+app, timeout = 0;
+
+      link.rel = 'stylesheet';
+      link.href = layer.path + href;
+      link.id = id;
+
+      if(!$('#'+ id)[0]){
+        head.appendChild(link);
+      }
+
+      if(typeof fn !== 'function') return;
+
+      //轮询css是否加载完毕
+      /*    (function poll() {
+       if(++timeout > 8 * 1000 / 100){
+       return window.console && console.error('layer.css: Invalid');
+       };
+       parseInt($('#'+id).css('width')) === 1989 ? fn() : setTimeout(poll, 100);
+       }());*/
+    },
+
+    ready: function(callback){
+      /*var cssname = 'skinlayercss', ver = '303';
+       isLayui ? layui.addcss('modules/layer/default/layer.css?v='+layer.v+ver, callback, cssname)
+       : layer.link('skin/default/layer.css?v='+layer.v+ver, callback, cssname);*/
+      return this;
+    },
+
+    //各种快捷引用
+    alert: function(content, options, yes){
+      var type = typeof options === 'function';
+      if(type) yes = options;
+      return layer.open($.extend({
+        content: content,
+        yes: yes
+      }, type ? {} : options));
+    },
+
+    confirm: function(content, options, yes, cancel){
+      var type = typeof options === 'function';
+      if(type){
+        cancel = yes;
+        yes = options;
+      }
+      return layer.open($.extend({
+        content: content,
+        btn: ready.btn,
+        yes: yes,
+        btn2: cancel
+      }, type ? {} : options));
+    },
+
+    msg: function(content, options, end){ //最常用提示层
+      var type = typeof options === 'function', rskin = ready.config.skin;
+      var skin = (rskin ? rskin + ' ' + rskin + '-msg' : '')||'layui-layer-msg';
+      var anim = doms.anim.length - 1;
+      if(type) end = options;
+      return layer.open($.extend({
+        content: content,
+        time: 3000,
+        shade: false,
+        skin: skin,
+        title: false,
+        closeBtn: false,
+        btn: false,
+        resize: false,
+        end: end
+      }, (type && !ready.config.skin) ? {
+        skin: skin + ' layui-layer-hui',
+        anim: anim
+      } : function(){
+        options = options || {};
+        if(options.icon === -1 || options.icon === undefined && !ready.config.skin){
+          options.skin = skin + ' ' + (options.skin||'layui-layer-hui');
+        }
+        return options;
+      }()));
+    },
+
+    load: function(icon, options){
+      return layer.open($.extend({
+        type: 3,
+        icon: icon || 0,
+        resize: false,
+        shade: 0.01
+      }, options));
+    },
+
+    tips: function(content, follow, options){
+      return layer.open($.extend({
+        type: 4,
+        content: [content, follow],
+        closeBtn: false,
+        time: 3000,
+        shade: false,
+        resize: false,
+        fixed: false,
+        maxWidth: 210
+      }, options));
+    }
+  };
+
+  var Class = function(setings){
+    var that = this;
+    that.index = ++layer.index;
+    that.config = $.extend({}, that.config, ready.config, setings);
+    document.body ? that.creat() : setTimeout(function(){
+      that.creat();
+    }, 30);
+  };
+
+  Class.pt = Class.prototype;
+
+//缓存常用字符
+  var doms = ['layui-layer', '.layui-layer-title', '.layui-layer-main', '.layui-layer-dialog', 'layui-layer-iframe', 'layui-layer-content', 'layui-layer-btn', 'layui-layer-close'];
+  doms.anim = ['layer-anim', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06'];
+
+//默认配置
+  Class.pt.config = {
+    type: 0,
+    shade: 0.3,
+    fixed: true,
+    move: doms[1],
+    title: '&#x4FE1;&#x606F;',
+    offset: 'auto',
+    area: 'auto',
+    closeBtn: 1,
+    time: 0, //0表示不自动关闭
+    zIndex: 19891014,
+    maxWidth: 360,
+    anim: 0,
+    isOutAnim: true,
+    icon: -1,
+    moveType: 1,
+    resize: true,
+    scrollbar: true, //是否允许浏览器滚动条
+    tips: 2
+  };
+
+//容器
+  Class.pt.vessel = function(conType, callback){
+    var that = this, times = that.index, config = that.config;
+    var zIndex = config.zIndex + times, titype = typeof config.title === 'object';
+    var ismax = config.maxmin && (config.type === 1 || config.type === 2);
+    var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">'
+    + (titype ? config.title[0] : config.title)
+    + '</div>' : '');
+
+    config.zIndex = zIndex;
+    callback([
+      //遮罩
+      config.shade ? ('<div class="layui-layer-shade" id="layui-layer-shade'+ times +'" times="'+ times +'" style="'+ ('z-index:'+ (zIndex-1) +'; background-color:'+ (config.shade[1]||'#000') +'; opacity:'+ (config.shade[0]||config.shade) +'; filter:alpha(opacity='+ (config.shade[0]*100||config.shade*100) +');') +'"></div>') : '',
+
+      //主体
+      '<div class="'+ doms[0] + (' layui-layer-'+ready.type[config.type]) + (((config.type == 0 || config.type == 2) && !config.shade) ? ' layui-layer-border' : '') + ' ' + (config.skin||'') +'" id="'+ doms[0] + times +'" type="'+ ready.type[config.type] +'" times="'+ times +'" showtime="'+ config.time +'" conType="'+ (conType ? 'object' : 'string') +'" style="z-index: '+ zIndex +'; width:'+ config.area[0] + ';height:' + config.area[1] + (config.fixed ? '' : ';position:absolute;') +'">'
+      + (conType && config.type != 2 ? '' : titleHTML)
+      + '<div id="'+ (config.id||'') +'" class="layui-layer-content'+ ((config.type == 0 && config.icon !== -1) ? ' layui-layer-padding' :'') + (config.type == 3 ? ' layui-layer-loading'+config.icon : '') +'">'
+      + (config.type == 0 && config.icon !== -1 ? '<i class="layui-layer-ico layui-layer-ico'+ config.icon +'"></i>' : '')
+      + (config.type == 1 && conType ? '' : (config.content||''))
+      + '</div>'
+      + '<span class="layui-layer-setwin">'+ function(){
+        var closebtn = ismax ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
+        config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
+        return closebtn;
+      }() + '</span>'
+      + (config.btn ? function(){
+        var button = '';
+        typeof config.btn === 'string' && (config.btn = [config.btn]);
+        for(var i = 0, len = config.btn.length; i < len; i++){
+          button += '<a class="'+ doms[6] +''+ i +'">'+ config.btn[i] +'</a>'
+        }
+        return '<div class="'+ doms[6] + (config.btnAlign ? (' layui-layer-btn-' + config.btnAlign) : '') +'">'+ button +'</div>'
+      }() : '')
+      + (config.resize ? '<span class="layui-layer-resize"></span>' : '')
+      + '</div>'
+    ], titleHTML, $('<div class="layui-layer-move"></div>'));
+    return that;
+  };
+
+//创建骨架
+  Class.pt.creat = function(){
+    var that = this
+        ,config = that.config
+        ,times = that.index, nodeIndex
+        ,content = config.content
+        ,conType = typeof content === 'object'
+        ,body = $('body');
+
+    if(config.id && $('#'+config.id)[0])  return;
+
+    if(typeof config.area === 'string'){
+      config.area = config.area === 'auto' ? ['', ''] : [config.area, ''];
+    }
+
+    //anim兼容旧版shift
+    if(config.shift){
+      config.anim = config.shift;
+    }
+
+    if(layer.ie == 6){
+      config.fixed = false;
+    }
+
+    switch(config.type){
+      case 0:
+        config.btn = ('btn' in config) ? config.btn : ready.btn[0];
+        layer.closeAll('dialog');
+        break;
+      case 2:
+        var content = config.content = conType ? config.content : [config.content, 'auto'];
+        config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' + config.content[0] + '"></iframe>';
+        break;
+      case 3:
+        delete config.title;
+        delete config.closeBtn;
+        config.icon === -1 && (config.icon === 0);
+        layer.closeAll('loading');
+        break;
+      case 4:
+        conType || (config.content = [config.content, 'body']);
+        config.follow = config.content[1];
+        config.content = config.content[0] + '<i class="layui-layer-TipsG"></i>';
+        delete config.title;
+        config.tips = typeof config.tips === 'object' ? config.tips : [config.tips, true];
+        config.tipsMore || layer.closeAll('tips');
+        break;
+    }
+
+    //建立容器
+    that.vessel(conType, function(html, titleHTML, moveElem){
+      body.append(html[0]);
+      conType ? function(){
+        (config.type == 2 || config.type == 4) ? function(){
+          $('body').append(html[1]);
+        }() : function(){
+          if(!content.parents('.'+doms[0])[0]){
+            content.data('display', content.css('display')).show().addClass('layui-layer-wrap').wrap(html[1]);
+            $('#'+ doms[0] + times).find('.'+doms[5]).before(titleHTML);
+          }
+        }();
+      }() : body.append(html[1]);
+      $('.layui-layer-move')[0] || body.append(ready.moveElem = moveElem);
+      that.layero = $('#'+ doms[0] + times);
+      config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
+    }).auto(times);
+
+    config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]);
+
+    //坐标自适应浏览器窗口尺寸
+    config.type == 4 ? that.tips() : that.offset();
+    if(config.fixed){
+      win.on('resize', function(){
+        that.offset();
+        (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times);
+        config.type == 4 && that.tips();
+      });
+    }
+
+    config.time <= 0 || setTimeout(function(){
+      layer.close(that.index)
+    }, config.time);
+    that.move().callback();
+
+    //为兼容jQuery3.0的css动画影响元素尺寸计算
+    if(doms.anim[config.anim]){
+      that.layero.addClass(doms.anim[config.anim]);
+    };
+
+    //记录关闭动画
+    if(config.isOutAnim){
+      that.layero.data('isOutAnim', true);
+    }
+  };
+
+//自适应
+  Class.pt.auto = function(index){
+    var that = this, config = that.config, layero = $('#'+ doms[0] + index);
+    if(config.area[0] === '' && config.maxWidth > 0){
+      //为了修复IE7下一个让人难以理解的bug
+      if(layer.ie && layer.ie < 8 && config.btn){
+        layero.width(layero.innerWidth());
+      }
+      layero.outerWidth() > config.maxWidth && layero.width(config.maxWidth);
+    }
+    var area = [layero.innerWidth(), layero.innerHeight()];
+    var titHeight = layero.find(doms[1]).outerHeight() || 0;
+    var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
+    function setHeight(elem){
+      elem = layero.find(elem);
+      elem.height(area[1] - titHeight - btnHeight - 2*(parseFloat(elem.css('padding-top'))|0));
+    }
+    switch(config.type){
+      case 2:
+        setHeight('iframe');
+        break;
+      default:
+        if(config.area[1] === ''){
+          if(config.fixed && area[1] >= win.height()){
+            area[1] = win.height();
+            setHeight('.'+doms[5]);
+          }
+        } else {
+          setHeight('.'+doms[5]);
+        }
+        break;
+    }
+    return that;
+  };
+
+//计算坐标
+  Class.pt.offset = function(){
+    var that = this, config = that.config, layero = that.layero;
+    var area = [layero.outerWidth(), layero.outerHeight()];
+    var type = typeof config.offset === 'object';
+    that.offsetTop = (win.height() - area[1])/2;
+    that.offsetLeft = (win.width() - area[0])/2;
+
+    if(type){
+      that.offsetTop = config.offset[0];
+      that.offsetLeft = config.offset[1]||that.offsetLeft;
+    } else if(config.offset !== 'auto'){
+
+      if(config.offset === 't'){ //上
+        that.offsetTop = 0;
+      } else if(config.offset === 'r'){ //右
+        that.offsetLeft = win.width() - area[0];
+      } else if(config.offset === 'b'){ //下
+        that.offsetTop = win.height() - area[1];
+      } else if(config.offset === 'l'){ //左
+        that.offsetLeft = 0;
+      } else if(config.offset === 'lt'){ //左上角
+        that.offsetTop = 0;
+        that.offsetLeft = 0;
+      } else if(config.offset === 'lb'){ //左下角
+        that.offsetTop = win.height() - area[1];
+        that.offsetLeft = 0;
+      } else if(config.offset === 'rt'){ //右上角
+        that.offsetTop = 0;
+        that.offsetLeft = win.width() - area[0];
+      } else if(config.offset === 'rb'){ //右下角
+        that.offsetTop = win.height() - area[1];
+        that.offsetLeft = win.width() - area[0];
+      } else {
+        that.offsetTop = config.offset;
+      }
+
+    }
+
+    if(!config.fixed){
+      that.offsetTop = /%$/.test(that.offsetTop) ?
+      win.height()*parseFloat(that.offsetTop)/100
+          : parseFloat(that.offsetTop);
+      that.offsetLeft = /%$/.test(that.offsetLeft) ?
+      win.width()*parseFloat(that.offsetLeft)/100
+          : parseFloat(that.offsetLeft);
+      that.offsetTop += win.scrollTop();
+      that.offsetLeft += win.scrollLeft();
+    }
+
+    if(layero.attr('minLeft')){
+      that.offsetTop = win.height() - (layero.find(doms[1]).outerHeight() || 0);
+      that.offsetLeft = layero.css('left');
+    }
+
+    layero.css({top: that.offsetTop, left: that.offsetLeft});
+  };
+
+//Tips
+  Class.pt.tips = function(){
+    var that = this, config = that.config, layero = that.layero;
+    var layArea = [layero.outerWidth(), layero.outerHeight()], follow = $(config.follow);
+    if(!follow[0]) follow = $('body');
+    var goal = {
+      width: follow.outerWidth(),
+      height: follow.outerHeight(),
+      top: follow.offset().top,
+      left: follow.offset().left
+    }, tipsG = layero.find('.layui-layer-TipsG');
+
+    var guide = config.tips[0];
+    config.tips[1] || tipsG.remove();
+
+    goal.autoLeft = function(){
+      if(goal.left + layArea[0] - win.width() > 0){
+        goal.tipLeft = goal.left + goal.width - layArea[0];
+        tipsG.css({right: 12, left: 'auto'});
+      } else {
+        goal.tipLeft = goal.left;
+      };
+    };
+
+    //辨别tips的方位
+    goal.where = [function(){ //上
+      goal.autoLeft();
+      goal.tipTop = goal.top - layArea[1] - 10;
+      tipsG.removeClass('layui-layer-TipsB').addClass('layui-layer-TipsT').css('border-right-color', config.tips[1]);
+    }, function(){ //右
+      goal.tipLeft = goal.left + goal.width + 10;
+      goal.tipTop = goal.top;
+      tipsG.removeClass('layui-layer-TipsL').addClass('layui-layer-TipsR').css('border-bottom-color', config.tips[1]);
+    }, function(){ //下
+      goal.autoLeft();
+      goal.tipTop = goal.top + goal.height + 10;
+      tipsG.removeClass('layui-layer-TipsT').addClass('layui-layer-TipsB').css('border-right-color', config.tips[1]);
+    }, function(){ //左
+      goal.tipLeft = goal.left - layArea[0] - 10;
+      goal.tipTop = goal.top;
+      tipsG.removeClass('layui-layer-TipsR').addClass('layui-layer-TipsL').css('border-bottom-color', config.tips[1]);
+    }];
+    goal.where[guide-1]();
+
+    /* 8*2为小三角形占据的空间 */
+    if(guide === 1){
+      goal.top - (win.scrollTop() + layArea[1] + 8*2) < 0 && goal.where[2]();
+    } else if(guide === 2){
+      win.width() - (goal.left + goal.width + layArea[0] + 8*2) > 0 || goal.where[3]()
+    } else if(guide === 3){
+      (goal.top - win.scrollTop() + goal.height + layArea[1] + 8*2) - win.height() > 0 && goal.where[0]();
+    } else if(guide === 4){
+      layArea[0] + 8*2 - goal.left > 0 && goal.where[1]()
+    }
+
+    layero.find('.'+doms[5]).css({
+      'background-color': config.tips[1],
+      'padding-right': (config.closeBtn ? '30px' : '')
+    });
+    layero.css({
+      left: goal.tipLeft - (config.fixed ? win.scrollLeft() : 0),
+      top: goal.tipTop  - (config.fixed ? win.scrollTop() : 0)
+    });
+  }
+
+//拖拽层
+  Class.pt.move = function(){
+    var that = this
+        ,config = that.config
+        ,_DOC = $(document)
+        ,layero = that.layero
+        ,moveElem = layero.find(config.move)
+        ,resizeElem = layero.find('.layui-layer-resize')
+        ,dict = {};
+
+    if(config.move){
+      moveElem.css('cursor', 'move');
+    }
+
+    moveElem.on('mousedown', function(e){
+      e.preventDefault();
+      if(config.move){
+        dict.moveStart = true;
+        dict.offset = [
+          e.clientX - parseFloat(layero.css('left'))
+          ,e.clientY - parseFloat(layero.css('top'))
+        ];
+        ready.moveElem.css('cursor', 'move').show();
+      }
+    });
+
+    resizeElem.on('mousedown', function(e){
+      e.preventDefault();
+      dict.resizeStart = true;
+      dict.offset = [e.clientX, e.clientY];
+      dict.area = [
+        layero.outerWidth()
+        ,layero.outerHeight()
+      ];
+      ready.moveElem.css('cursor', 'se-resize').show();
+    });
+
+    _DOC.on('mousemove', function(e){
+
+      //拖拽移动
+      if(dict.moveStart){
+        var X = e.clientX - dict.offset[0]
+            ,Y = e.clientY - dict.offset[1]
+            ,fixed = layero.css('position') === 'fixed';
+
+        e.preventDefault();
+
+        dict.stX = fixed ? 0 : win.scrollLeft();
+        dict.stY = fixed ? 0 : win.scrollTop();
+
+        //控制元素不被拖出窗口外
+        if(!config.moveOut){
+          var setRig = win.width() - layero.outerWidth() + dict.stX
+              ,setBot = win.height() - layero.outerHeight() + dict.stY;
+          X < dict.stX && (X = dict.stX);
+          X > setRig && (X = setRig);
+          Y < dict.stY && (Y = dict.stY);
+          Y > setBot && (Y = setBot);
+        }
+
+        layero.css({
+          left: X
+          ,top: Y
+        });
+      }
+
+      //Resize
+      if(config.resize && dict.resizeStart){
+        var X = e.clientX - dict.offset[0]
+            ,Y = e.clientY - dict.offset[1];
+
+        e.preventDefault();
+
+        layer.style(that.index, {
+          width: dict.area[0] + X
+          ,height: dict.area[1] + Y
+        })
+        dict.isResize = true;
+        config.resizing && config.resizing(layero);
+      }
+    }).on('mouseup', function(e){
+      if(dict.moveStart){
+        delete dict.moveStart;
+        ready.moveElem.hide();
+        config.moveEnd && config.moveEnd(layero);
+      }
+      if(dict.resizeStart){
+        delete dict.resizeStart;
+        ready.moveElem.hide();
+      }
+    });
+
+    return that;
+  };
+
+  Class.pt.callback = function(){
+    var that = this, layero = that.layero, config = that.config;
+    that.openLayer();
+    if(config.success){
+      if(config.type == 2){
+        layero.find('iframe').on('load', function(){
+          config.success(layero, that.index);
+        });
+      } else {
+        config.success(layero, that.index);
+      }
+    }
+    layer.ie == 6 && that.IE6(layero);
+
+    //按钮
+    layero.find('.'+ doms[6]).children('a').on('click', function(){
+      var index = $(this).index();
+      if(index === 0){
+        if(config.yes){
+          config.yes(that.index, layero)
+        } else if(config['btn1']){
+          config['btn1'](that.index, layero)
+        } else {
+          layer.close(that.index);
+        }
+      } else {
+        var close = config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
+        close === false || layer.close(that.index);
+      }
+    });
+
+    //取消
+    function cancel(){
+      var close = config.cancel && config.cancel(that.index, layero);
+      close === false || layer.close(that.index);
+    }
+
+    //右上角关闭回调
+    layero.find('.'+ doms[7]).on('click', cancel);
+
+    //点遮罩关闭
+    if(config.shadeClose){
+      $('#layui-layer-shade'+ that.index).on('click', function(){
+        layer.close(that.index);
+      });
+    }
+
+    //最小化
+    layero.find('.layui-layer-min').on('click', function(){
+      var min = config.min && config.min(layero);
+      min === false || layer.min(that.index, config);
+    });
+
+    //全屏/还原
+    layero.find('.layui-layer-max').on('click', function(){
+      if($(this).hasClass('layui-layer-maxmin')){
+        layer.restore(that.index);
+        config.restore && config.restore(layero);
+      } else {
+        layer.full(that.index, config);
+        setTimeout(function(){
+          config.full && config.full(layero);
+        }, 100);
+      }
+    });
+
+    config.end && (ready.end[that.index] = config.end);
+  };
+
+//for ie6 恢复select
+  ready.reselect = function(){
+    $.each($('select'), function(index , value){
+      var sthis = $(this);
+      if(!sthis.parents('.'+doms[0])[0]){
+        (sthis.attr('layer') == 1 && $('.'+doms[0]).length < 1) && sthis.removeAttr('layer').show();
+      }
+      sthis = null;
+    });
+  };
+
+  Class.pt.IE6 = function(layero){
+    //隐藏select
+    $('select').each(function(index , value){
+      var sthis = $(this);
+      if(!sthis.parents('.'+doms[0])[0]){
+        sthis.css('display') === 'none' || sthis.attr({'layer' : '1'}).hide();
+      }
+      sthis = null;
+    });
+  };
+
+//需依赖原型的对外方法
+  Class.pt.openLayer = function(){
+    var that = this;
+
+    //置顶当前窗口
+    layer.zIndex = that.config.zIndex;
+    layer.setTop = function(layero){
+      var setZindex = function(){
+        layer.zIndex++;
+        layero.css('z-index', layer.zIndex + 1);
+      };
+      layer.zIndex = parseInt(layero[0].style.zIndex);
+      layero.on('mousedown', setZindex);
+      return layer.zIndex;
+    };
+  };
+
+  ready.record = function(layero){
+    var area = [
+      layero.width(),
+      layero.height(),
+      layero.position().top,
+      layero.position().left + parseFloat(layero.css('margin-left'))
+    ];
+    layero.find('.layui-layer-max').addClass('layui-layer-maxmin');
+    layero.attr({area: area});
+  };
+
+  ready.rescollbar = function(index){
+    if(doms.html.attr('layer-full') == index){
+      if(doms.html[0].style.removeProperty){
+        doms.html[0].style.removeProperty('overflow');
+      } else {
+        doms.html[0].style.removeAttribute('overflow');
+      }
+      doms.html.removeAttr('layer-full');
+    }
+  };
+
+  /** 内置成员 */
+
+  window.layer = layer;
+
+//获取子iframe的DOM
+  layer.getChildFrame = function(selector, index){
+    index = index || $('.'+doms[4]).attr('times');
+    return $('#'+ doms[0] + index).find('iframe').contents().find(selector);
+  };
+
+//得到当前iframe层的索引，子iframe时使用
+  layer.getFrameIndex = function(name){
+    return $('#'+ name).parents('.'+doms[4]).attr('times');
+  };
+
+//iframe层自适应宽高
+  layer.iframeAuto = function(index){
+    if(!index) return;
+    var heg = layer.getChildFrame('html', index).outerHeight();
+    var layero = $('#'+ doms[0] + index);
+    var titHeight = layero.find(doms[1]).outerHeight() || 0;
+    var btnHeight = layero.find('.'+doms[6]).outerHeight() || 0;
+    layero.css({height: heg + titHeight + btnHeight});
+    layero.find('iframe').css({height: heg});
+  };
+
+//重置iframe url
+  layer.iframeSrc = function(index, url){
+    $('#'+ doms[0] + index).find('iframe').attr('src', url);
+  };
+
+//设定层的样式
+  layer.style = function(index, options, limit){
+    var layero = $('#'+ doms[0] + index)
+        ,contElem = layero.find('.layui-layer-content')
+        ,type = layero.attr('type')
+        ,titHeight = layero.find(doms[1]).outerHeight() || 0
+        ,btnHeight = layero.find('.'+doms[6]).outerHeight() || 0
+        ,minLeft = layero.attr('minLeft');
+
+    if(type === ready.type[3] || type === ready.type[4]){
+      return;
+    }
+
+    if(!limit){
+      if(parseFloat(options.width) <= 260){
+        options.width = 260;
+      };
+
+      if(parseFloat(options.height) - titHeight - btnHeight <= 64){
+        options.height = 64 + titHeight + btnHeight;
+      };
+    }
+
+    layero.css(options);
+    btnHeight = layero.find('.'+doms[6]).outerHeight();
+
+    if(type === ready.type[2]){
+      layero.find('iframe').css({
+        height: parseFloat(options.height) - titHeight - btnHeight
+      });
+    } else {
+      contElem.css({
+        height: parseFloat(options.height) - titHeight - btnHeight
+        - parseFloat(contElem.css('padding-top'))
+        - parseFloat(contElem.css('padding-bottom'))
+      })
+    }
+  };
+
+//最小化
+  layer.min = function(index, options){
+    var layero = $('#'+ doms[0] + index)
+        ,titHeight = layero.find(doms[1]).outerHeight() || 0
+        ,left = layero.attr('minLeft') || (181*ready.minIndex)+'px'
+        ,position = layero.css('position');
+
+    ready.record(layero);
+
+    if(ready.minLeft[0]){
+      left = ready.minLeft[0];
+      ready.minLeft.shift();
+    }
+
+    layero.attr('position', position);
+
+    layer.style(index, {
+      width: 180
+      ,height: titHeight
+      ,left: left
+      ,top: win.height() - titHeight
+      ,position: 'fixed'
+      ,overflow: 'hidden'
+    }, true);
+
+    layero.find('.layui-layer-min').hide();
+    layero.attr('type') === 'page' && layero.find(doms[4]).hide();
+    ready.rescollbar(index);
+
+    if(!layero.attr('minLeft')){
+      ready.minIndex++;
+    }
+    layero.attr('minLeft', left);
+  };
+
+//还原
+  layer.restore = function(index){
+    var layero = $('#'+ doms[0] + index), area = layero.attr('area').split(',');
+    var type = layero.attr('type');
+    layer.style(index, {
+      width: parseFloat(area[0]),
+      height: parseFloat(area[1]),
+      top: parseFloat(area[2]),
+      left: parseFloat(area[3]),
+      position: layero.attr('position'),
+      overflow: 'visible'
+    }, true);
+    layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
+    layero.find('.layui-layer-min').show();
+    layero.attr('type') === 'page' && layero.find(doms[4]).show();
+    ready.rescollbar(index);
+  };
+
+//全屏
+  layer.full = function(index){
+    var layero = $('#'+ doms[0] + index), timer;
+    ready.record(layero);
+    if(!doms.html.attr('layer-full')){
+      doms.html.css('overflow','hidden').attr('layer-full', index);
+    }
+    clearTimeout(timer);
+    timer = setTimeout(function(){
+      var isfix = layero.css('position') === 'fixed';
+      layer.style(index, {
+        top: isfix ? 0 : win.scrollTop(),
+        left: isfix ? 0 : win.scrollLeft(),
+        width: win.width(),
+        height: win.height()
+      }, true);
+      layero.find('.layui-layer-min').hide();
+    }, 100);
+  };
+
+//改变title
+  layer.title = function(name, index){
+    var title = $('#'+ doms[0] + (index||layer.index)).find(doms[1]);
+    title.html(name);
+  };
+
+//关闭layer总方法
+  layer.close = function(index){
+    var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
+    if(!layero[0]) return;
+    var WRAP = 'layui-layer-wrap', remove = function(){
+      if(type === ready.type[1] && layero.attr('conType') === 'object'){
+        layero.children(':not(.'+ doms[5] +')').remove();
+        var wrap = layero.find('.'+WRAP);
+        for(var i = 0; i < 2; i++){
+          wrap.unwrap();
+        }
+        wrap.css('display', wrap.data('display')).removeClass(WRAP);
+      } else {
+        //低版本IE 回收 iframe
+        if(type === ready.type[2]){
+          try {
+            var iframe = $('#'+doms[4]+index)[0];
+            iframe.contentWindow.document.write('');
+            iframe.contentWindow.close();
+            layero.find('.'+doms[5])[0].removeChild(iframe);
+          } catch(e){}
+        }
+        layero[0].innerHTML = '';
+        layero.remove();
+      }
+      typeof ready.end[index] === 'function' && ready.end[index]();
+      delete ready.end[index];
+    };
+
+    if(layero.data('isOutAnim')){
+      layero.addClass(closeAnim);
+    }
+
+    $('#layui-layer-moves, #layui-layer-shade' + index).remove();
+    layer.ie == 6 && ready.reselect();
+    ready.rescollbar(index);
+    if(layero.attr('minLeft')){
+      ready.minIndex--;
+      ready.minLeft.push(layero.attr('minLeft'));
+    }
+
+    if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
+      remove()
+    } else {
+      setTimeout(function(){
+        remove();
+      }, 200);
+    }
+  };
+
+//关闭所有层
+  layer.closeAll = function(type){
+    $.each($('.'+doms[0]), function(){
+      var othis = $(this);
+      var is = type ? (othis.attr('type') === type) : 1;
+      is && layer.close(othis.attr('times'));
+      is = null;
+    });
+  };
+
+  /**
+
+   拓展模块，layui开始合并在一起
+
+   */
+
+  var cache = layer.cache||{}, skin = function(type){
+    return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
+  };
+
+//仿系统prompt
+  layer.prompt = function(options, yes){
+    var style = '';
+    options = options || {};
+
+    if(typeof options === 'function') yes = options;
+
+    if(options.area){
+      var area = options.area;
+      style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"';
+      delete options.area;
+    }
+    var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input"' + style +'>' + (options.value||'') +'</textarea>' : function(){
+      return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input" value="'+ (options.value||'') +'">';
+    }();
+
+    var success = options.success;
+    delete options.success;
+
+    return layer.open($.extend({
+      type: 1
+      ,btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;']
+      ,content: content
+      ,skin: 'layui-layer-prompt' + skin('prompt')
+      ,maxWidth: win.width()
+      ,success: function(layero){
+        prompt = layero.find('.layui-layer-input');
+        prompt.focus();
+        typeof success === 'function' && success(layero);
+      }
+      ,resize: false
+      ,yes: function(index){
+        var value = prompt.val();
+        if(value === ''){
+          prompt.focus();
+        } else if(value.length > (options.maxlength||500)) {
+          layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
+        } else {
+          yes && yes(value, index, prompt);
+        }
+      }
+    }, options));
+  };
+
+//tab层
+  layer.tab = function(options){
+    options = options || {};
+
+    var tab = options.tab || {}
+        ,success = options.success;
+
+    delete options.success;
+
+    return layer.open($.extend({
+      type: 1,
+      skin: 'layui-layer-tab' + skin('tab'),
+      resize: false,
+      title: function(){
+        var len = tab.length, ii = 1, str = '';
+        if(len > 0){
+          str = '<span class="layui-layer-tabnow">'+ tab[0].title +'</span>';
+          for(; ii < len; ii++){
+            str += '<span>'+ tab[ii].title +'</span>';
+          }
+        }
+        return str;
+      }(),
+      content: '<ul class="layui-layer-tabmain">'+ function(){
+        var len = tab.length, ii = 1, str = '';
+        if(len > 0){
+          str = '<li class="layui-layer-tabli xubox_tab_layer">'+ (tab[0].content || 'no content') +'</li>';
+          for(; ii < len; ii++){
+            str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
+          }
+        }
+        return str;
+      }() +'</ul>',
+      success: function(layero){
+        var btn = layero.find('.layui-layer-title').children();
+        var main = layero.find('.layui-layer-tabmain').children();
+        btn.on('mousedown', function(e){
+          e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
+          var othis = $(this), index = othis.index();
+          othis.addClass('layui-layer-tabnow').siblings().removeClass('layui-layer-tabnow');
+          main.eq(index).show().siblings().hide();
+          typeof options.change === 'function' && options.change(index);
+        });
+        typeof success === 'function' && success(layero);
+      }
+    }, options));
+  };
+
+//相册层
+  layer.photos = function(options, loop, key){
+    var dict = {};
+    options = options || {};
+    if(!options.photos) return;
+    var type = options.photos.constructor === Object;
+    var photos = type ? options.photos : {}, data = photos.data || [];
+    var start = photos.start || 0;
+    dict.imgIndex = (start|0) + 1;
+
+    options.img = options.img || 'img';
+
+    var success = options.success;
+    delete options.success;
+
+    if(!type){ //页面直接获取
+      var parent = $(options.photos), pushData = function(){
+        data = [];
+        parent.find(options.img).each(function(index){
+          var othis = $(this);
+          othis.attr('layer-index', index);
+          data.push({
+            alt: othis.attr('alt'),
+            pid: othis.attr('layer-pid'),
+            src: othis.attr('layer-src') || othis.attr('src'),
+            thumb: othis.attr('src')
+          });
+        })
+      };
+
+      pushData();
+
+      if (data.length === 0) return;
+
+      loop || parent.on('click', options.img, function(){
+        var othis = $(this), index = othis.attr('layer-index');
+        layer.photos($.extend(options, {
+          photos: {
+            start: index,
+            data: data,
+            tab: options.tab
+          },
+          full: options.full
+        }), true);
+        pushData();
+      })
+
+      //不直接弹出
+      if(!loop) return;
+
+    } else if (data.length === 0){
+      return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
+    }
+
+    //上一张
+    dict.imgprev = function(key){
+      dict.imgIndex--;
+      if(dict.imgIndex < 1){
+        dict.imgIndex = data.length;
+      }
+      dict.tabimg(key);
+    };
+
+    //下一张
+    dict.imgnext = function(key,errorMsg){
+      dict.imgIndex++;
+      if(dict.imgIndex > data.length){
+        dict.imgIndex = 1;
+        if (errorMsg) {return};
+      }
+      dict.tabimg(key)
+    };
+
+    //方向键
+    dict.keyup = function(event){
+      if(!dict.end){
+        var code = event.keyCode;
+        event.preventDefault();
+        if(code === 37){
+          dict.imgprev(true);
+        } else if(code === 39) {
+          dict.imgnext(true);
+        } else if(code === 27) {
+          layer.close(dict.index);
+        }
+      }
+    }
+
+    //切换
+    dict.tabimg = function(key){
+      if(data.length <= 1) return;
+      photos.start = dict.imgIndex - 1;
+      layer.close(dict.index);
+      return layer.photos(options, true, key);
+      setTimeout(function(){
+        layer.photos(options, true, key);
+      }, 200);
+    }
+
+    //一些动作
+    dict.event = function(){
+      dict.bigimg.hover(function(){
+        dict.imgsee.show();
+      }, function(){
+        dict.imgsee.hide();
+      });
+
+      dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
+        event.preventDefault();
+        dict.imgprev();
+      });
+
+      dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){
+        event.preventDefault();
+        dict.imgnext();
+      });
+
+      $(document).on('keyup', dict.keyup);
+    };
+
+    //图片预加载
+    function loadImage(url, callback, error) {
+      var img = new Image();
+      img.src = url;
+      if(img.complete){
+        return callback(img);
+      }
+      img.onload = function(){
+        img.onload = null;
+        callback(img);
+      };
+      img.onerror = function(e){
+        img.onerror = null;
+        error(e);
+      };
+    };
+
+    dict.loadi = layer.load(1, {
+      shade: 'shade' in options ? false : 0.9,
+      scrollbar: false
+    });
+
+    loadImage(data[start].src, function(img){
+      layer.close(dict.loadi);
+      dict.index = layer.open($.extend({
+        type: 1,
+        id: 'layui-layer-photos',
+        area: function(){
+          var imgarea = [img.width, img.height];
+          var winarea = [$(window).width() - 100, $(window).height() - 100];
+
+          //如果 实际图片的宽或者高比 屏幕大（那么进行缩放）
+          if(!options.full && (imgarea[0]>winarea[0]||imgarea[1]>winarea[1])){
+            var wh = [imgarea[0]/winarea[0],imgarea[1]/winarea[1]];//取宽度缩放比例、高度缩放比例
+            if(wh[0] > wh[1]){//取缩放比例最大的进行缩放
+              imgarea[0] = imgarea[0]/wh[0];
+              imgarea[1] = imgarea[1]/wh[0];
+            } else if(wh[0] < wh[1]){
+              imgarea[0] = imgarea[0]/wh[1];
+              imgarea[1] = imgarea[1]/wh[1];
+            }
+          }
+
+          return [imgarea[0]+'px', imgarea[1]+'px'];
+        }(),
+        title: false,
+        shade: 0.9,
+        shadeClose: true,
+        closeBtn: false,
+        move: '.layui-layer-phimg img',
+        moveType: 1,
+        scrollbar: false,
+        moveOut: true,
+        //anim: Math.random()*5|0,
+        isOutAnim: false,
+        skin: 'layui-layer-photos' + skin('photos'),
+        content: '<div class="layui-layer-phimg">'
+        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
+        +'<div class="layui-layer-imgsee">'
+        +(data.length > 1 ? '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>' : '')
+        +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt||'') +'</a><em>'+ dict.imgIndex +'/'+ data.length +'</em></span></div>'
+        +'</div>'
+        +'</div>',
+        success: function(layero, index){
+          dict.bigimg = layero.find('.layui-layer-phimg');
+          dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar');
+          dict.event(layero);
+          options.tab && options.tab(data[start], layero);
+          typeof success === 'function' && success(layero);
+        }, end: function(){
+          dict.end = true;
+          $(document).off('keyup', dict.keyup);
+        }
+      }, options));
+    }, function(){
+      layer.close(dict.loadi);
+      layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
+        time: 30000,
+        btn: ['&#x4E0B;&#x4E00;&#x5F20;', '&#x4E0D;&#x770B;&#x4E86;'],
+        yes: function(){
+          data.length > 1 && dict.imgnext(true,true);
+        }
+      });
+    });
+  };
+
+//主入口
+  ready.run = function(_$){
+    $ = _$;
+    win = $(window);
+    doms.html = $('html');
+    layer.open = function(deliver){
+      var o = new Class(deliver);
+      return o.index;
+    };
+  };
+
+//加载方式
+  window.layui && layui.define ? (
+      layer.ready()
+          ,layui.define('jquery', function(exports){ //layui加载
+        layer.path = layui.cache.dir;
+        ready.run(layui.jquery);
+
+        //暴露模块
+        window.layer = layer;
+        exports('layer', layer);
+      })
+  ) : (
+      (typeof define === 'function' && define.amd) ? define(['jquery'], function(){ //requirejs加载
+        ready.run(window.jQuery);
+        return layer;
+      }) : function(){ //普通script标签加载
+        ready.run(window.jQuery);
+        layer.ready();
+      }()
+  );
+
 }(window);
 \ No newline at end of file
@@ -36,7 +36,7 @@
             <div>
                 <div>
                     <label>
-                        <input type="checkbox" id="enableAutoExec"> 启用自动班次执行
+                        <input type="checkbox" id="enableAutoExec" {{autoExec?"checked":""}}> 启用自动班次执行
                     </label>
                 </div>
                 <ul class="uk-list">