Merge branch 'jiading' of

http://222.66.0.204:8090/panzhaov5/bsth_control into jiading

Merge branch 'jiading' of
http://222.66.0.204:8090/panzhaov5/bsth_control into jiading
廖磊
2 parents 19a1fcac 7a975ecf
Showing 11 changed files with 356 additions and 337 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/summary/entity/TempSchSituation.java
src/main/java/com/bsth/data/summary/service/impl/TempSchSituationServiceImpl.java
src/main/resources/application-prod.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/base/timesmodel/js/v2/ParameterObj.js
src/main/resources/static/pages/mforms/singledatas/jquery.table2excel.min.js
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/main.html
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
 package com.bsth;
 import com.bsth.data.BasicData;
+import com.bsth.data.LineVersionsData;
 import com.bsth.data.ThreadMonotor;
 import com.bsth.data.car_out_info.UpdateDBThread;
 import com.bsth.data.directive.DirectivesPstThread;
@@ -73,8 +74,8 @@ public class XDApplication implements CommandLineRunner {
     @Autowired
     OfflineMonitorThread offlineMonitorThread;
-    //@Autowired
-    //LineVersionsData lineVersionsData;
+    @Autowired
+    LineVersionsData lineVersionsData;
     @Autowired
     FixedEnableVerionsThread fixedEnableVerionsThread;
@@ -149,13 +150,13 @@ public class XDApplication implements CommandLineRunner {
         log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
-        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         /** 线调业务 */
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
         sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 30, TimeUnit.SECONDS);//检查班次误点
         gpsDataLoader.setFlag(-1);
-        sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 100, 3, TimeUnit.SECONDS);//抓取GPS数据
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
         sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
@@ -181,9 +182,9 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
 }
-package com.bsth.data.summary.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 临加情况
- * Created by panzhao on 2017/10/31.
- */
-@Entity
-@Table(name = "z_calc_temp_detail")
-public class TempSchSituation {
-
-    @Id
-    private Long id;
-
-    private String rq;
-
-    private String gsBm;
-
-    private String fgsBm;
-
-    private String lineCode;
-
-    private String lineName;
-
-    private String nbbm;
-
-    private String jGh;
-
-    private String sGh;
-
-    private int size;
-
-    private Double mileage;
-
-    private Long t;
-
-    private String remark;
-
-    private String idsStr;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getRq() {
-        return rq;
-    }
-
-    public void setRq(String rq) {
-        this.rq = rq;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public String getLineName() {
-        return lineName;
-    }
-
-    public void setLineName(String lineName) {
-        this.lineName = lineName;
-    }
-
-    public String getNbbm() {
-        return nbbm;
-    }
-
-    public void setNbbm(String nbbm) {
-        this.nbbm = nbbm;
-    }
-
-    public String getjGh() {
-        return jGh;
-    }
-
-    public void setjGh(String jGh) {
-        this.jGh = jGh;
-    }
-
-    public String getsGh() {
-        return sGh;
-    }
-
-    public void setsGh(String sGh) {
-        this.sGh = sGh;
-    }
-
-    public int getSize() {
-        return size;
-    }
-
-    public void setSize(int size) {
-        this.size = size;
-    }
-
-    public Double getMileage() {
-        return mileage;
-    }
-
-    public void setMileage(Double mileage) {
-        this.mileage = mileage;
-    }
-
-    public Long getT() {
-        return t;
-    }
-
-    public void setT(Long t) {
-        this.t = t;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getIdsStr() {
-        return idsStr;
-    }
-
-    public void setIdsStr(String idsStr) {
-        this.idsStr = idsStr;
-    }
-
-    public String getGsBm() {
-        return gsBm;
-    }
-
-    public void setGsBm(String gsBm) {
-        this.gsBm = gsBm;
-    }
-
-    public String getFgsBm() {
-        return fgsBm;
-    }
-
-    public void setFgsBm(String fgsBm) {
-        this.fgsBm = fgsBm;
-    }
+package com.bsth.data.summary.entity;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 临加情况
+ * Created by panzhao on 2017/10/31.
+ */
+@Entity
+@Table(name = "z_calc_temp_detail")
+public class TempSchSituation {
+
+    @Id
+    private Long id;
+
+    private String rq;
+
+    private String gsBm;
+
+    private String fgsBm;
+
+    private String lineCode;
+
+    private String lineName;
+
+    private String nbbm;
+
+    private String jGh;
+
+    private String sGh;
+
+    private int size;
+
+    private Double mileage;
+
+    private Long t;
+
+    private String remark;
+
+    private String idsStr;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getRq() {
+        return rq;
+    }
+
+    public void setRq(String rq) {
+        this.rq = rq;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName;
+    }
+
+    public String getNbbm() {
+        return nbbm;
+    }
+
+    public void setNbbm(String nbbm) {
+        this.nbbm = nbbm;
+    }
+
+    public String getjGh() {
+        return jGh;
+    }
+
+    public void setjGh(String jGh) {
+        this.jGh = jGh;
+    }
+
+    public String getsGh() {
+        return sGh;
+    }
+
+    public void setsGh(String sGh) {
+        this.sGh = sGh;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    public Double getMileage() {
+        return mileage;
+    }
+
+    public void setMileage(Double mileage) {
+        this.mileage = mileage;
+    }
+
+    public Long getT() {
+        return t;
+    }
+
+    public void setT(Long t) {
+        this.t = t;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getIdsStr() {
+        return idsStr;
+    }
+
+    public void setIdsStr(String idsStr) {
+        this.idsStr = idsStr;
+    }
+
+    public String getGsBm() {
+        return gsBm;
+    }
+
+    public void setGsBm(String gsBm) {
+        this.gsBm = gsBm;
+    }
+
+    public String getFgsBm() {
+        return fgsBm;
+    }
+
+    public void setFgsBm(String fgsBm) {
+        this.fgsBm = fgsBm;
+    }
 }
 \ No newline at end of file
-package com.bsth.data.summary.service.impl;
-
-import com.bsth.data.summary.entity.TempSchSituation;
-import com.bsth.data.summary.service.TempSchSituationService;
-import com.bsth.data.utils.CustomStringUtils;
-import com.bsth.service.impl.BaseServiceImpl;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.OutputStream;
-import java.net.URLEncoder;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * Created by panzhao on 2017/11/1.
- */
-@Service
-public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituation, Long> implements TempSchSituationService {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Override
-    public Iterable<TempSchSituation> list(Map<String, Object> map) {
-        List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
-
-        //排序
-        Collections.sort(list, new Comparator<TempSchSituation>() {
-            @Override
-            public int compare(TempSchSituation o1, TempSchSituation o2) {
-                int i = o1.getRq().compareTo(o2.getRq());
-                if (i != 0)
-                    return i;
-
-                i = o1.getLineName().compareTo(o2.getLineName());
-                if (i != 0)
-                    return i;
-
-                i = (int) (o1.getT() - o2.getT());
-                return i;
-            }
-        });
-        return list;
-    }
-
-    @Override
-    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
-        try {
-            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
-                    , map.get("rq_le").toString(), 62));
-
-            List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
-
-            if (list.size() == 0) {
-                response.setHeader("Content-type", "text/html;charset=UTF-8");
-                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
-                return;
-            }
-
-            //排序
-            Collections.sort(list, new Comparator<TempSchSituation>() {
-                @Override
-                public int compare(TempSchSituation o1, TempSchSituation o2) {
-                    int i = o1.getRq().compareTo(o2.getRq());
-                    if (i != 0)
-                        return i;
-
-                    i = o1.getLineName().compareTo(o2.getLineName());
-                    if (i != 0)
-                        return i;
-
-                    i = (int) (o1.getT() - o2.getT());
-                    return i;
-                }
-            });
-
-            //输出excel
-            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
-            String filePath = basePath + "/static/pages/summary/excel/临加明细情况.xls";
-            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
-            HSSFWorkbook wb = new HSSFWorkbook(fs);
-
-            //写入数据
-            Sheet sheet = wb.getSheetAt(0);
-            Row row;
-            TempSchSituation tss;
-            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
-            for (int i = 0; i < list.size(); i++) {
-                tss = list.get(i);
-                row = sheet.createRow(i + 1);
-                row.createCell(0).setCellValue(tss.getRq());
-                row.createCell(1).setCellValue(tss.getLineName());
-                row.createCell(2).setCellValue(tss.getNbbm());
-                row.createCell(3).setCellValue(tss.getjGh());
-                row.createCell(4).setCellValue(tss.getsGh());
-                row.createCell(5).setCellValue(tss.getSize());
-                row.createCell(6).setCellValue(tss.getMileage());
-                row.createCell(7).setCellValue(sdf.format(new Date(tss.getT())));
-                row.createCell(8).setCellValue(tss.getRemark());
-            }
-
-            String name = "";//list.get(0).getLineName();
-            wb.setSheetName(0, name + "临加明细");
-            //response 输出
-            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "临加明细情况.xls";
-            response.setContentType("application/x-msdownload");
-            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
-
-            OutputStream os = response.getOutputStream();
-            wb.write(os);
-            os.flush();
-            os.close();
-        } catch (Exception e) {
-            logger.error("", e);
-        }
-    }
+package com.bsth.data.summary.service.impl;
+
+import com.bsth.data.summary.entity.TempSchSituation;
+import com.bsth.data.summary.service.TempSchSituationService;
+import com.bsth.data.utils.CustomStringUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * Created by panzhao on 2017/11/1.
+ */
+@Service
+public class TempSchSituationServiceImpl extends BaseServiceImpl<TempSchSituation, Long> implements TempSchSituationService {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Iterable<TempSchSituation> list(Map<String, Object> map) {
+        List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+        //排序
+        Collections.sort(list, new Comparator<TempSchSituation>() {
+            @Override
+            public int compare(TempSchSituation o1, TempSchSituation o2) {
+                int i = o1.getRq().compareTo(o2.getRq());
+                if (i != 0)
+                    return i;
+
+                i = o1.getLineName().compareTo(o2.getLineName());
+                if (i != 0)
+                    return i;
+
+                i = (int) (o1.getT() - o2.getT());
+                return i;
+            }
+        });
+        return list;
+    }
+
+    @Override
+    public void excel(Map<String, Object> map, HttpServletRequest request, HttpServletResponse response) {
+        try {
+            map.put("rq_le", CustomStringUtils.maxEndTime(map.get("rq_ge").toString()
+                    , map.get("rq_le").toString(), 62));
+
+            List<TempSchSituation> list = (List<TempSchSituation>) super.list(map);
+
+            if (list.size() == 0) {
+                response.setHeader("Content-type", "text/html;charset=UTF-8");
+                response.getWriter().print("<span style='color:red;font-size:24px;'>根据查询条件没有搜索到数据，别导了！</span>");
+                return;
+            }
+
+            //排序
+            Collections.sort(list, new Comparator<TempSchSituation>() {
+                @Override
+                public int compare(TempSchSituation o1, TempSchSituation o2) {
+                    int i = o1.getRq().compareTo(o2.getRq());
+                    if (i != 0)
+                        return i;
+
+                    i = o1.getLineName().compareTo(o2.getLineName());
+                    if (i != 0)
+                        return i;
+
+                    i = (int) (o1.getT() - o2.getT());
+                    return i;
+                }
+            });
+
+            //输出excel
+            String basePath = Thread.currentThread().getContextClassLoader().getResource("").getPath();
+            String filePath = basePath + "/static/pages/summary/excel/临加明细情况.xls";
+            POIFSFileSystem fs = new POIFSFileSystem(new FileInputStream(filePath));
+            HSSFWorkbook wb = new HSSFWorkbook(fs);
+
+            //写入数据
+            Sheet sheet = wb.getSheetAt(0);
+            Row row;
+            TempSchSituation tss;
+            SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
+            for (int i = 0; i < list.size(); i++) {
+                tss = list.get(i);
+                row = sheet.createRow(i + 1);
+                row.createCell(0).setCellValue(tss.getRq());
+                row.createCell(1).setCellValue(tss.getLineName());
+                row.createCell(2).setCellValue(tss.getNbbm());
+                row.createCell(3).setCellValue(tss.getjGh());
+                row.createCell(4).setCellValue(tss.getsGh());
+                row.createCell(5).setCellValue(tss.getSize());
+                row.createCell(6).setCellValue(tss.getMileage());
+                row.createCell(7).setCellValue(sdf.format(new Date(tss.getT())));
+                row.createCell(8).setCellValue(tss.getRemark());
+            }
+
+            String name = "";//list.get(0).getLineName();
+            wb.setSheetName(0, name + "临加明细");
+            //response 输出
+            String filename = name + map.get("rq_ge") + "至" + map.get("rq_le") + "临加明细情况.xls";
+            response.setContentType("application/x-msdownload");
+            response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+
+            OutputStream os = response.getOutputStream();
+            wb.write(os);
+            os.flush();
+            os.close();
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+    }
 }
 \ No newline at end of file
-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://192.168.160.222:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root2jsp
-#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://192.168.160.153:12580/realGps/all
-## gateway real data
-http.gps.real.url= http://192.168.160.151: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://192.168.160.222:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username= root
+spring.datasource.password= root2jsp
+#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://192.168.160.153:12580/realGps/all
+## gateway real data
+http.gps.real.url= http://192.168.160.151:8080/transport_server/rtgps/
+## gateway send directive
 http.send.directive = http://192.168.160.151:8080/transport_server/message/
 \ No newline at end of file
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.160.222:3306/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
+ms.mysql.driver= com.mysql.jdbc.Driver
+ms.mysql.url= jdbc:mysql://192.168.160.222:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= root
 ms.mysql.password= root2jsp
 \ No newline at end of file
@@ -390,9 +390,18 @@ var ParameterObj = function() {
          */
         getUpLastDtimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.up.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.up.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         /**
          * 获取下行首班时间对象。
@@ -410,9 +419,18 @@ var ParameterObj = function() {
          */
         getDownLastDTimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.down.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.down.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         //-------------- 获取吃饭时间 ----------------//
-/*
- *  jQuery table2excel - v1.1.1
- *  jQuery plugin to export an .xls file in browser from an HTML table
- *  https://github.com/rainabba/jquery-table2excel
- *
- *  Made by rainabba
- *  Under MIT License
- */
+/*
+ *  jQuery table2excel - v1.1.1
+ *  jQuery plugin to export an .xls file in browser from an HTML table
+ *  https://github.com/rainabba/jquery-table2excel
+ *
+ *  Made by rainabba
+ *  Under MIT License
+ */
 !function(a,b,c,d){function e(b,c){this.element=b,this.settings=a.extend({},k,c),this._defaults=k,this._name=j,this.init()}function f(a){return a.filename?a.filename:"table2excel"}function g(a){var b=/(\s+alt\s*=\s*"([^"]*)"|\s+alt\s*=\s*'([^']*)')/i;return a.replace(/<img[^>]*>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}function h(a){return a.replace(/<a[^>]*>|<\/a>/gi,"")}function i(a){var b=/(\s+value\s*=\s*"([^"]*)"|\s+value\s*=\s*'([^']*)')/i;return a.replace(/<input[^>]*>|<\/input>/gi,function(a){var c=b.exec(a);return null!==c&&c.length>=2?c[2]:""})}var j="table2excel",k={exclude:".noExl",name:"Table2Excel",filename:"table2excel",fileext:".xls",exclude_img:!0,exclude_links:!0,exclude_inputs:!0};e.prototype={init:function(){var b=this;b.template={head:'<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" xmlns="http://www.w3.org/TR/REC-html40"><meta http-equiv="content-type" content="application/vnd.ms-excel; charset=UTF-8"><head>\x3c!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets>',sheet:{head:"<x:ExcelWorksheet><x:Name>",tail:"</x:Name><x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>"},mid:"</x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]--\x3e</head><body>",table:{head:"<table>",tail:"</table>"},foot:"</body></html>"},b.tableRows=[],a(b.element).each(function(c,d){var e="";a(d).find("tr").not(b.settings.exclude).each(function(c,d){e+="<tr>",a(d).find("td,th").not(b.settings.exclude).each(function(c,d){var f={rows:a(this).attr("rowspan"),cols:a(this).attr("colspan"),flag:a(d).find(b.settings.exclude)};f.flag.length>0?e+="<td> </td>":f.rows&f.cols?e+="<td>"+a(d).html()+"</td>":(e+="<td",f.rows>0&&(e+=" rowspan='"+f.rows+"' "),f.cols>0&&(e+=" colspan='"+f.cols+"' "),e+="/>"+a(d).html()+"</td>")}),e+="</tr>"}),b.settings.exclude_img&&(e=g(e)),b.settings.exclude_links&&(e=h(e)),b.settings.exclude_inputs&&(e=i(e)),b.tableRows.push(e)}),b.tableToExcel(b.tableRows,b.settings.name,b.settings.sheetName)},tableToExcel:function(d,e,g){var h,i,j,k=this,l="";if(k.format=function(a,b){return a.replace(/{(\w+)}/g,function(a,c){return b[c]})},g=void 0===g?"Sheet":g,k.ctx={worksheet:e||"Worksheet",table:d,sheetName:g},l=k.template.head,a.isArray(d))for(h in d)l+=k.template.sheet.head+g+h+k.template.sheet.tail;if(l+=k.template.mid,a.isArray(d))for(h in d)l+=k.template.table.head+"{table"+h+"}"+k.template.table.tail;l+=k.template.foot;for(h in d)k.ctx["table"+h]=d[h];if(delete k.ctx.table,!c.documentMode){var m=new Blob([k.format(l,k.ctx)],{type:"application/vnd.ms-excel"});b.URL=b.URL||b.webkitURL,i=b.URL.createObjectURL(m),j=c.createElement("a"),j.download=f(k.settings),j.href=i,c.body.appendChild(j),j.click(),c.body.removeChild(j)}else if("undefined"!=typeof Blob){l=k.format(l,k.ctx),l=[l];var n=new Blob(l,{type:"text/html"});b.navigator.msSaveBlob(n,f(k.settings))}else txtArea1.document.open("text/html","replace"),txtArea1.document.write(k.format(l,k.ctx)),txtArea1.document.close(),txtArea1.focus(),sa=txtArea1.document.execCommand("SaveAs",!0,f(k.settings));return!0}},a.fn[j]=function(b){var c=this;return c.each(function(){a.data(c,"plugin_"+j)||a.data(c,"plugin_"+j,new e(this,b))}),c}}(jQuery,window,document);
 \ No newline at end of file
@@ -97,7 +97,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(3), .line-schedule-table dl dd:nth-of-type(3) {
-    width: calc(2% + 66px);
+    width: calc(3% + 66px);
     position: relative;
 }
 .line-schedule-table dl dd:nth-of-type(3)>i{
@@ -118,7 +118,7 @@
 }
 .line-schedule-table dl dt:nth-of-type(6), .line-schedule-table dl dd:nth-of-type(6) {
-    width: calc(13% + 18px);
+    width: calc(12% + 18px);
     /*color: #676767;*/
 }
@@ -321,7 +321,7 @@
                 for(var i=0,p;p=parks[i++];)
                     park_opts += '<option value="' + p.code + '">' + p.name + '</option>';
                 /*for (var code in parks)
-                    park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
+                 park_opts += '<option value="' + code + '">' + parks[code] + '</option>';*/
                 var qdz = $f('startStation', f), zdz = $f('endStation', f), mType = $f('mileageType', f);
                 var domainsTemp;
@@ -663,9 +663,9 @@
                 });
                 /*var rs = {};
-                $.each(array, function () {
-                    rs[this.code]=this.name;
-                });*/
+                 $.each(array, function () {
+                 rs[this.code]=this.name;
+                 });*/
                 return array;
             }
@@ -181,7 +181,7 @@
                     if(lineCode)
                         data.lineId=lineCode;
                 }
-                $.get('/gps/real/all', data, function(rs) {
+                $.get('/gps/real/all?t=' + Math.random(), data, function(rs) {
                     //数据转换
                     var code2Name=gb_data_basic.lineCode2NameAll();
                     $.each(rs.list, function(){
@@ -438,12 +438,12 @@
                     });
                     //统计路单 -娄高峰
-                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('calcWaybill');
-                    });*/
+                    });
                     //统计油 -廖磊
-                    gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {
+                    gb_common.$post('/ylb/updateHistoryJd', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('ylbUpdate');
                     });