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

潘钊
2 parents 82e7e545 5446a295
Showing 20 changed files with 442 additions and 509 deletions
src/main/java/com/bsth/controller/forms/ExportController.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/data/LineVersionsData.java
src/main/java/com/bsth/entity/LineVersions.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/base/carpark/list.html
src/main/resources/static/pages/base/lineversions/js/lineversions-list-table.js
src/main/resources/static/pages/base/lineversions/list.html
src/main/resources/static/pages/forms/mould/shifday.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanth.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanthclzbh.xls
src/main/resources/static/pages/forms/mould/shiftuehiclemanthspy.xls
src/main/resources/static/pages/forms/mould/timeAndSpeed.xls
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/report/countInterval/countInterval.html
@@ -98,14 +98,14 @@ public class ExportController {
 			m.put("lpName", l.getLpName());
 			m.put("carPlate", l.getCarPlate());
 			m.put("jhlc", l.getJhlc());
-			// m.put("sjjhlc", l.getSjjhlc());
+			m.put("sjjhlc", l.getSjjhlc());
 			m.put("yygl", l.getYygl());
 			m.put("emptMileage", l.getEmptMileage());
 			m.put("remMileage", l.getRemMileage());
 			m.put("addMileage", l.getAddMileage());
 			m.put("totalm", l.getTotalm());
 			m.put("jhbc", l.getJhbc());
-			// m.put("sjjhbc", l.getSjjhbc());
+			m.put("sjjhbc", l.getSjjhbc());
 			m.put("cjbc", l.getCjbc());
 			m.put("ljbc", l.getLjbc());
 			m.put("sjbc", l.getSjbc());
@@ -111,6 +111,15 @@ public class TrafficManageController {
         }
     }
+    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
+    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setJHBC(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
     @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
     public String setSKB(@RequestParam("ids") String ids) throws Exception {
         try {
 package com.bsth.data;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+import com.bsth.entity.LineVersions;
+import com.bsth.service.LineVersionsService;
+import com.bsth.service.StationRouteService;
 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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 /**
  * @ClassName: LineVersionsData
@@ -25,10 +23,9 @@ public class LineVersionsData extends Thread {
     static Logger logger = LoggerFactory.getLogger(LineVersionsData.class);
-
     @Autowired
     LineVersionsService lineVersionsService;
-    
+
     @Autowired
     StationRouteService stationRouteService;
@@ -73,7 +73,7 @@ public class LineVersions{
 	 * 是否发布 int length(1)
 	 * 0（没有），1（发布）
 	 */
-	private int isupdate;
+	private int isupdate = 0;
 	public Integer getId() {
 		return id;
@@ -70,6 +70,8 @@ public interface TrafficManageService {
 	 */
 	String setJHBC();
+	String setJHBC(String theDate);
+
 	String setLD(String theDate);
 	String setLD();
@@ -1961,6 +1961,7 @@ public class FormsServiceImpl implements FormsService {
 		tempMap.put("jhbc", jhbc);
 		tempMap.put("sjbc", sjbc);
 		tempMap.put("qz", qz);
+		tempMap.put("sm", "");
 		if(jhcc != 0 && sjcc != 0){
 			tempMap.put("ccl", numberFormat.format(((float)sjcc / jhcc)*100)+"%");
 		}else{
@@ -165,9 +165,14 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						schedule.setZdsjActual(null);
 					}
 					String[] split1 = schedule.getFcsj().split(":");
-					String[] split3 = schedule.getZdsj().split(":");
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
-					long zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
+					long zdsj = 0l;
+					if(schedule.getZdsj() == null){
+						zdsj = fcsj + schedule.getBcsj();
+					} else {
+						String[] split3 = schedule.getZdsj().split(":");
+						zdsj = Long.valueOf(split3[0]) * 60 + Long.valueOf(split3[1]);
+					}
 					if(!schedule.getScheduleDateStr().equals(schedule.getRealExecDate())){
 						if(fcsj<23*60)	fcsj += 1440l;
 						if(zdsj<23*60)	zdsj += 1440l;
@@ -904,7 +909,15 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				}
 			}
-			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task order by start_date";
+			long id1 = 0, id2 = 0;
+			for(ScheduleRealInfo s : list){
+				if(s.getId() > id2)
+					id2 = s.getId();
+				if(id1 == 0 || id1 > s.getId())
+					id1 = s.getId();
+			}
+			sql = "select destroy, start_date, end_date, mileage, mileage_type, schedule from bsth_c_s_child_task";
+			sql += " where id >= "+id1+" and id <= "+id2+" order by start_date";
 			cList = jdbcTemplate.query(sql,
 					new RowMapper<ChildTaskPlan>(){
@@ -2162,9 +2175,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf + lbtz);
-			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
+			tempMap.put("dfbl", (sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0) + "%");
 //			tempMap.put("dxbl", df.format((double)(dxtz)/sjbc*100) + "%");
-			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
+			tempMap.put("lbbl", (sjbc>0?df.format((double)(lbtz)/sjbc*100):0) + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 //			tempMap.put("workList", tempList);
@@ -2294,9 +2307,9 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 //			tempMap.put("dxtz", dxtz);
 			tempMap.put("lbtz", lbtz);
 			tempMap.put("correct", sddf + zddf  + lbtz);
-			tempMap.put("dfbl", sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0 + "%");
+			tempMap.put("dfbl", (sjbc>0?df.format((double)(sddf + zddf)/sjbc*100):0) + "%");
-			tempMap.put("lbbl", sjbc>0?df.format((double)(lbtz)/sjbc*100):0 + "%");
+			tempMap.put("lbbl", (sjbc>0?df.format((double)(lbtz)/sjbc*100):0) + "%");
 //			tempMap.put("correctbl", df.format((double)(sddf + zddf + dxtz + lbtz)/sjbc*100) + "%");
 			resList.add(tempMap);
 		}
@@ -2319,11 +2332,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         		resMap.put("dxtz", dxtzz);
         		resMap.put("correct",correct+dxtzz);
         		if(sjbc<=0){
-        			resMap.put("dxbl", "0");
-        			resMap.put("correctbl", "0");
+        			resMap.put("dxbl", "0%");
+        			resMap.put("correctbl", "0%");
         		}else{
-        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzz)/sjbc*100):0 + "%");
-        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0 + "%");
+        			resMap.put("dxbl", (sjbc>0?df.format((double)(dxtzz)/sjbc*100):0) + "%");
+        			resMap.put("correctbl", (sjbc>0?df.format((double)(correct+dxtzz)/sjbc*100):0) + "%");
         		}
@@ -2374,11 +2387,11 @@ public class BusIntervalServiceImpl implements BusIntervalService {
         		resMap.put("dxtz", dxtzf);
         		resMap.put("correct",correct+dxtzf);
         		if(sjbc<=0){
-        			resMap.put("dxbl", "0");
-        			resMap.put("correctbl", "0");
+        			resMap.put("dxbl", "0%");
+        			resMap.put("correctbl", "0%");
         		}else{
-        			resMap.put("dxbl", sjbc>0?df.format((double)(dxtzf)/sjbc*100):0 + "%");
-        			resMap.put("correctbl", sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0 + "%");
+        			resMap.put("dxbl", (sjbc>0?df.format((double)(dxtzf)/sjbc*100):0) + "%");
+        			resMap.put("correctbl", (sjbc>0?df.format((double)(correct+dxtzf)/sjbc*100):0) + "%");
         		}
         		resMap.put("xlname",BasicData.lineCode2NameMap.get(xlbm));
         	}
@@ -202,6 +202,8 @@ public class LineVersionsServiceImpl extends BaseServiceImpl&lt;LineVersions, Integ
     			// 更新线路版本
     			repository.updateOdlVersions(lineId, lineCode);
     			repository.updateNewVersions(lineId,lineCode,versions);
+    			// 记录版本更新日志
+                jdbcTemplate.update("INSERT into bsth_c_line_versions_enablog(line_code,`line_versions`,`t`) VALUES (?,?,?)",lineCode,versions, lineVersions.getStartDate().getTime());
 			}
 		}
     	return list;
@@ -812,10 +812,26 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 	}
 	/**
+	 * 上传计划班次 指定日期 yyyy-MM-dd
+	 * @param theDate
+	 * @return
+	 */
+	public String setJHBC(String theDate){
+		return uploadJHBC(theDate);
+	}
+
+	/**
+	 * 上传计划班次
+	 * @return
+	 */
+	public String setJHBC(){
+		return uploadJHBC(null);
+	}
+	/**
 	 * 上传线路计划班次表
 	 */
-	@Override
-	public String setJHBC() {
+
+	private String uploadJHBC(String theDate) {
 		String result = "failure";
 		Line line;
 		StringBuffer sBuffer =new StringBuffer();
@@ -825,8 +841,8 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			SchedulePlanInfo schedulePlanInfo;
 			String xlbm,zbh = "";
 			Long lp = 0L;
-			// 取明天的日期
-			String tomorrow = sdfnyr.format(DateUtils.addDays(new Date(), +1));
+			// 取得计划班次时间
+			String tomorrow = theDate == null ? sdfnyr.format(DateUtils.addDays(new Date(), +1)) : theDate;
 			// 查询所有班次
 			List<SchedulePlanInfo> schedulePlanList = schedulePlanInfoRepository.findLineScheduleBc(tomorrow);
 			int j = 0; // 初始化标识
@@ -2164,6 +2164,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s=list.get(i);
+            if(s.getBcType().equals("out")){
+            	s.setRemark("1");
+            }else if(s.getBcType().equals("in")){
+            	s.setRemark("3");
+            }else{
+            	s.setRemark("2");
+            }
             String[] fcsj= s.getFcsj().split(":");
             Long fcsjL=Long.parseLong(fcsj[0])*60+Long.parseLong(fcsj[1]);
@@ -2190,7 +2197,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             s.setFcsjT(fscjT);
         }
-        Collections.sort(list, new ComparableReal());
+        Collections.sort(list, new compareFcsjType());
         for (int i = 0; i < list.size(); i++) {
             ScheduleRealInfo s = list.get(i);
             s.setAdjustExps(i + 1 + "");
@@ -5245,3 +5252,12 @@ class AccountXlbm implements Comparator&lt;Map&lt;String, Object&gt;&gt;{
 					o2.get("xlNamePy").toString());
 		}
 }
+
+class compareFcsjType implements Comparator<ScheduleRealInfo>{
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return (o1.getFcsjT()+o1.getRemark()).compareTo(o2.getFcsjT()+o2.getRemark());
+	}
+
+}
@@ -115,73 +115,9 @@
 			</td>
 			<td>
 				{{obj.gsmc}}
-				<!--{{if obj.company == '55'}}
-					上南公司
-				{{else if obj.company == '22'}}
-					金高公司
-				{{else if obj.company == '05'}}
-					杨高公司
-				{{else if obj.company == '26'}}
-					南汇公司
-				{{else if obj.company == '77'}}
-					闵行公司
-				{{/if}}-->
 			</td>
 			<td>
 				{{obj.fgsmc}}
-				<!--{{if obj.company == '55'}}
-
-					{{if obj.brancheCompany == '1'}}
-						上南二分公司
-					{{else if obj.brancheCompany == '2'}}
-						上南三分公司
-					{{else if obj.brancheCompany == '3'}}
-						上南六分公司
-					{{else if obj.brancheCompany == '4'}}
-						上南一分公司
-					{{/if}}
-
-				{{else if obj.company == '22'}}
-
-					{{if obj.brancheCompany == '1'}}
-						四分公司
-					{{else if obj.brancheCompany == '2'}}
-						二分公司
-					{{else if obj.brancheCompany == '3'}}
-						三分公司
-					{{else if obj.brancheCompany == '5'}}
-						一分公司
-					{{/if}}
-		
-				{{else if obj.company == '05'}}
-					
-					{{if obj.brancheCompany == '1'}}
-						川沙分公司
-					{{else if obj.brancheCompany == '2'}}
-						金桥分公司
-					{{else if obj.brancheCompany == '3'}}
-						芦潮港分公司
-					{{else if obj.brancheCompany == '5'}}
-						杨高分公司
-					{{else if obj.brancheCompany == '6'}}
-						周浦分公司
-					{{/if}}
-
-				{{else if obj.company == '26'}}
-
-					{{if obj.brancheCompany == '1'}}
-						南汇一分
-					{{else if obj.brancheCompany == '2'}}
-						南汇二分
-					{{else if obj.brancheCompany == '3'}}
-						南汇三分
-					{{else if obj.brancheCompany == '4'}}
-						南汇维修公司
-					{{else if obj.brancheCompany == '5'}}
-						南汇公司
-					{{/if}}
-
-				{{/if}}-->
 			</td>
 			<td>
 				{{obj.versions}}
 /**
- * 
  * @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);
+    }
+    // 营运公司Map[key(businessCode)] = 名字
+    var companyMap = new Map();
+    // 分公司Map[key(upCode+_+businessCode)] = 名字
+    var branchMap = new Map();
+    initCompanySelect2(function(array) {
+        $.each(array, function() {
+            companyMap[this.businessCode] = this.businessName;
+            // companyMap.put(this.businessCode.toString(), this.businessName);
+            if(this.businessCode != null || this.businessCode !=''){
+                /** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
+                $get('/business/all', {upCode_eq: this.businessCode}, function(array){
+                    // 遍历array
+                    $.each(array, function(i,d){
+                        branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
+                        // branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
+                    });
+                });
+            }
+        });
+        // 公司下拉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);
+                    });
+                }
+            });
+        });
+    }
+
+    $('#lineSelect').on('change',function() {
+        var text = $('#lineSelect').val();
+        if(text){
+            var linecode = text.split("_");
+            $("#lineCodeInput").val(linecode[2]);
+        }
+    });
+
+    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;
+    }
-	// 关闭左侧栏
-	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);
-	}
-	// 营运公司Map[key(businessCode)] = 名字
-	var companyMap = new Map();
-	// 分公司Map[key(upCode+_+businessCode)] = 名字
-	var branchMap = new Map();
-	initCompanySelect2(function(array) {
-		$.each(array, function() {
-			companyMap[this.businessCode] = this.businessName;
-			// companyMap.put(this.businessCode.toString(), this.businessName);
-			if(this.businessCode != null || this.businessCode !=''){
-				/** 查询出所属公司下的分公司名称和相应分公司代码 @param：<upCode_eq：公司代码> */
-				$get('/business/all', {upCode_eq: this.businessCode}, function(array){
-					// 遍历array
-					$.each(array, function(i,d){
-						branchMap[this.upCode+"_"+this.businessCode] = this.businessName;
-						// branchMap.put(this.upCode+"_"+this.businessCode, this.businessName);
-					});
-				});
-			}
-		});
-		// 公司下拉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);
-					});
-				}
-			});
-		});
-	}
-	
-	$('#lineSelect').on('change',function() {
-		var text = $('#lineSelect').val();
-		if(text){
-			var linecode = text.split("_");
-			$("#lineCodeInput").val(linecode[2]);
-		}
-	});
-	
-	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;
-			// 把数据填充到模版中
+        // 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(i, data) {
                 result.content[i].gsmc = companyMap[data.line.company];
                 result.content[i].fgsmc = branchMap[data.line.cgsbm];
@@ -186,169 +184,172 @@
                 data.endDateStr=moment(data.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);
-		});
-	}
+            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 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>',
+    /** 复选框组件 */
+    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);
-	});
-	 
+            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 updateVersionsRoute(obj){
-	var lineId = obj.dataset.lineid;
-	swal({
-		title: "操作须知",
-		text: "每周会更新数据，请在本周内做完线路走向并发布，不然您做的走向有可能会被覆盖！",
-		type: "warning",
-		showCancelButton: true,
-		confirmButtonColor: "#DD6B55",
-		confirmButtonText: "知道了！",
-		cancelButtonText: "不懂！",
-		closeOnConfirm: false },
-		function(isConfirm){
-			if(isConfirm){
-				var win1 = window.open("http://114.80.178.12:29088/login2.html","线路信息编辑","false");
-				setTimeout(function(){
-					window.open("http://114.80.178.12:29088/pages/base/stationroute/list.html?no="+lineId,"线路信息编辑","false");
-				},1500);
-				swal.close();
-			}
-		});
-}
+    function splitxlName(str) {
+        var rsStr = '';
+        if(str) {
+            var strArray = str.split('_');
+            rsStr = strArray[0];
+        }
+        return rsStr;
+    }
-function issueBnt(id){
-	swal({
-		title: "发布说明",
-		text: "重复发布会覆盖已有的数据，请确认线路信息正确后发布，发布后需要几分钟后才能再次发布！",
-		type: "warning",
-		showCancelButton: true,
-		confirmButtonColor: "#DD6B55",
-		confirmButtonText: "确定发布！",
-		cancelButtonText: "取消发布！",
-		closeOnConfirm: false },
-		function(){
-			$.post('/lineVersions/issueVersion',{'id':id},function(result){
-				if(result.status=='SUCCESS') {
-					// 弹出添加成功提示消息
-					swal("发布！", "线路站点及走向已发布至历史库，待到版本启用时间自动更新。", "success"); 
-				} else if(result.status=='ERROR') {
-					// 弹出添加失败提示消息
-					swal("发布失败！", "您发布的信息可能有误，请检查！", "ERROR"); 
-				}
-//				loadPage('list.html');
-				// 发布后刷新页面
-				var pData = getParams();
-		    	pData['line.name_like'] = splitxlName(pData['line.name_like']);
-		    	loadTableDate(pData, false);
-			});
-		});
-}
 \ No newline at end of file
+
+    /**  搜索按钮事件 */
+    $('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);
+    });
+    // 线路版本编辑
+    $(document).on('click', 'a.update_versions_route_btn', function () {
+    	debugger
+        var lineId = $(this).data('lineid');
+        swal({
+                title: "操作须知",
+                text: "每周会更新数据，请在本周内做完线路走向并发布，不然您做的走向有可能会被覆盖！",
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                confirmButtonText: "知道了！",
+                cancelButtonText: "不懂！",
+                closeOnConfirm: false },
+            function(isConfirm){
+                if(isConfirm){
+                    var win1 = window.open("http://114.80.178.12:29088/login2.html","线路信息编辑","false");
+                    setTimeout(function(){
+                        window.open("http://114.80.178.12:29088/pages/base/stationroute/list.html?no="+lineId,"线路信息编辑","false");
+                    },1500);
+                    swal.close();
+                }
+            });
+    });
+	// 版本发布
+    $(document).on('click', 'a.issue_btn', function () {
+    	debugger
+        var id = $(this).data('id');
+        swal({
+                title: "发布说明",
+                text: "重复发布会覆盖已有的数据，请确认线路信息正确后发布，发布后需要几分钟后才能再次发布！",
+                type: "warning",
+                showCancelButton: true,
+                confirmButtonColor: "#DD6B55",
+                confirmButtonText: "确定发布！",
+                cancelButtonText: "取消发布！",
+                closeOnConfirm: false },
+            function(){
+                $.post('/lineVersions/issueVersion',{'id':id},function(result){
+                    if(result.status=='SUCCESS') {
+                        // 弹出添加成功提示消息
+                        swal("发布！", "线路站点及走向已发布至历史库，待到版本启用时间自动更新。", "success");
+                    } else if(result.status=='ERROR') {
+                        // 弹出添加失败提示消息
+                        swal("发布失败！", "您发布的信息可能有误，请检查！", "ERROR");
+                    }
+                    //				loadPage('list.html');
+                    // 发布后刷新页面
+                    var pData = getParams();
+                    pData['line.name_like'] = splitxlName(pData['line.name_like']);
+                    loadTableDate(pData, false);
+                });
+            });
+    });
+})();
 \ No newline at end of file
@@ -119,75 +119,9 @@
 			</td>
 			<td>
 				{{obj.gsmc}}
-				<!--{{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>
 				{{obj.fgsmc}}
-				<!--{{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'}}
-						南汇公司
-					{{else if obj.brancheCompany == '6'}}
-						航头枢纽站
-					{{/if}}
-
-				{{/if}}-->
 			</td>
 			<td>
 				{{obj.startDateStr}}
@@ -213,10 +147,10 @@
 			<td>
 				<a href="edit.html?no={{obj.id}}" class="btn default blue-stripe btn-sm" data-pjax> 修改 </a>
 				{{if obj.status == '2'}}
-					<a class="btn default blue-stripe btn-sm" data-lineid="{{obj.line.id}}" onclick="updateVersionsRoute(this)" data-pjax> 编辑版本路线 </a>
+					<a class="update_versions_route_btn btn default blue-stripe btn-sm" data-lineid="{{obj.line.id}}" data-pjax> 编辑版本路线 </a>
 				{{/if}}
 				{{if obj.status == '2' && obj.isupdate!=1}}
-					<a class="btn btn-danger btn-sm" onclick = "issueBnt({{obj.id}})" data-pjax>发布</a>
+					<a class="issue_btn btn btn-danger btn-sm" data-id="{{obj.id}}" data-pjax>发布</a>
 				{{else if obj.status == '2' && obj.isupdate==1}}
 					<a class="btn btn-danger btn-sm disabled">数据同步中</a>
 				{{/if}}
@@ -170,14 +170,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
-		$("#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		$("#times1").datetimepicker({
 			format : 'HH:mm',
@@ -189,6 +181,7 @@
 		});
 		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -196,8 +189,19 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate").val(year + "-" + month + "-" + day);
-		$("#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
 		$("#times1").val("05:00");
 		$("#times2").val("23:00");
@@ -391,7 +395,8 @@
 				var tbodyHtml = template('list_lineTimeAnaly',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
-
+				$("#works_hidden").addClass("hidden");
+				$("#printArea").addClass("hidden");
 				list = result;
 			});
@@ -413,6 +418,7 @@
 					$('#works tbody').html(tbodyHtml);
 					$("#works_hidden").removeClass("hidden");
 					$("#works .hidden").removeClass("hidden");
+					$("#printArea").removeClass("hidden");
 					$("#date1").html(g.dates);
 					$("#line1").html(g.line);
 					$("#lp1").html(g.lp);
@@ -314,7 +314,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="7"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="9"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>