Merge branch 'minhang' of

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

Merge branch 'minhang' of
http://222.66.0.204:8090/panzhaov5/bsth_control into minhang
廖磊
2 parents b3d54b39 24a51013
Showing 36 changed files with 1967 additions and 324 deletions
src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController.java
src/main/java/com/bsth/data/safe_driv/SafeDrivCenter.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/SchModifyLog.java → src/main/java/com/bsth/data/schedule/edit_logs/FormLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/SchEditLogger.java → src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/TTInfoDetailService.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailDataToolsImpl.java
src/main/java/com/bsth/service/schedule/datatools/TTInfoDetailForEdit.java
src/main/java/com/bsth/service/schedule/impl/TTInfoDetailServiceImpl.java
src/main/java/com/bsth/service/schedule/utils/DataToolsServiceImpl.java
src/main/java/com/bsth/websocket/handler/RealControlSocketHandler.java
src/main/resources/application-dev.properties
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/layer.js
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/skin/default/icon-ext.png
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/skin/default/icon.png
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-0.gif
src/main/resources/static/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-1.gif
@@ -4,6 +4,7 @@ import com.bsth.common.ResponseCode;
 import com.bsth.controller.schedule.BController;
 import com.bsth.entity.schedule.TTInfoDetail;
 import com.bsth.service.schedule.TTInfoDetailService;
+import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
  
@@ -73,9 +74,13 @@ public class TTInfoDetailController extends BController&lt;TTInfoDetail, Long&gt; {
     @RequestMapping(value = "/edit/{xlid}/{ttid}", method = RequestMethod.GET)
     public Map<String, Object> getEditInfo(@PathVariable("xlid") Integer xlid,
                                            @PathVariable("ttid") Long ttid) {
+
+        // 获取最大的发车数，用于输出数据的数量
+        Long maxfcno = ttInfoDetailService.findMaxFcno(xlid, ttid);
+
         Map<String, Object> rtn = new HashMap<>();
         try {
-            TTInfoDetailService.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid);
+            TTInfoDetailForEdit.EditInfo editInfo = ttInfoDetailService.getEditInfo(xlid, ttid, maxfcno);
             rtn.put("status", ResponseCode.SUCCESS);
             rtn.put("data", editInfo);
         } catch (Exception exp) {
 package com.bsth.data.safe_driv;
  
+import com.bsth.Application;
 import com.bsth.websocket.handler.SendUtils;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -14,6 +15,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
  
 /**
  * 安全驾驶
@@ -67,7 +69,7 @@ public class SafeDrivCenter implements CommandLineRunner,ApplicationContextAware
     @Override
     public void run(String... strings) throws Exception {
         //定时加载安全驾驶数据
-        //Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 4, TimeUnit.SECONDS);
+        Application.mainServices.scheduleWithFixedDelay(safeDrivDataLoadThread, 60, 7, TimeUnit.SECONDS);
     }
  
     @Override
@@ -88,7 +88,7 @@ public class SafeDrivDataLoadThread extends Thread{
             httpClient.close();
             response.close();
         } catch (Exception e) {
-            logger.error(e.getMessage());
+            logger.error("安全驾驶接口报错了" , e.getMessage());
         }
     }
 }
@@ -786,13 +786,14 @@ public class DayOfSchedule {
         Collections.sort(list, schFCSJComparator);
  
         long t = System.currentTimeMillis();
-        int distance=-1;
+        int distance=-1, diff;
  
         ScheduleRealInfo sch = null;
         for(ScheduleRealInfo temp : list){
-
-            if(Math.abs(temp.getDfsjT() - t) < distance || distance == -1){
+            diff = (int) Math.abs(temp.getDfsjT() - t);
+            if(diff < distance || distance == -1){
                 sch = temp;
+                distance = diff;
             }
         }
         return sch;
-package com.bsth.data.schedule;
+package com.bsth.data.schedule.edit_logs;
  
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.entity.mcy_forms.Changetochange;
@@ -17,11 +17,11 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
  
 /**
- * 线调实际排班修改日志记录
+ * 为报表写入相关的班次修改记录
  * Created by panzhao on 2017/5/7.
  */
 @Service
-public class SchModifyLog {
+public class FormLogger {
  
     private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
@@ -4,7 +4,7 @@ package com.bsth.data.schedule.edit_logs;
  * 班次修正记录
  * Created by panzhao on 2017/5/16.
  */
-public class SchEditLogger {
+public class ScheduleModifyLogger {
  
     /**
      * 待发调整
@@ -12,4 +12,4 @@ public class SchEditLogger {
     public static void dftz(Long id, String remarks, String dfsj, String bcType, String opType){
  
     }
-}
+}
 \ No newline at end of file
@@ -13,7 +13,7 @@ import com.bsth.data.LineConfigData;
 import com.bsth.data.msg_queue.DirectivePushQueue;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.data.schedule.SchAttrCalculator;
-import com.bsth.data.schedule.SchModifyLog;
+import com.bsth.data.schedule.edit_logs.FormLogger;
 import com.bsth.data.schedule.ScheduleComparator;
 import com.bsth.data.schedule.late_adjust.LateAdjustHandle;
 import com.bsth.entity.Cars;
@@ -135,7 +135,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     CulateMileageService culateService;
  
     @Autowired
-    SchModifyLog schModifyLog;
+    FormLogger schModifyLog;
  
     @Autowired
     DirectiveService directiveService;
@@ -1081,6 +1081,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 sch.setStatus(0);
                 sch.setRemarks("");//清空备注
                 sch.setJhlc(sch.getJhlcOrig());
+
+                //入库
+                dayOfSchedule.save(sch);
                 rs.put("status", ResponseCode.SUCCESS);
                 rs.put("t", sch);
  
 package com.bsth.service.schedule;
  
 import com.bsth.entity.schedule.TTInfoDetail;
+import com.bsth.service.schedule.datatools.TTInfoDetailForEdit;
 import com.bsth.service.schedule.exception.ScheduleException;
-import org.apache.commons.lang3.StringUtils;
  
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
  
@@ -14,157 +13,21 @@ import java.util.Map;
 public interface TTInfoDetailService extends BService<TTInfoDetail, Long> {
  
     /**
-     * 发车信息内部类。
-     */
-    public static class FcInfo {
-        /** 时刻明细id */
-        private Long ttdid;
-        /** 发车时间 */
-        private String fcsj;
-        /** 班次类型 */
-        private String bc_type;
-        /** 线路上下行 */
-        private String xldir;
-        /** 是偶分班 */
-        private Boolean isfb;
-
-        /** 起点站code */
-        private String qdzCode;
-        /** 终点站code */
-        private String zdzCode;
-
-        public FcInfo() {
-        }
-
-        public FcInfo(
-                String ttdid_str,
-                String bc_type,
-                String fcsj,
-                String xldir,
-                String isfb,
-                String qdzCode,
-                String zdzCode) {
-            this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
-            this.bc_type = bc_type;
-            this.fcsj = fcsj;
-            this.xldir = xldir;
-            if ("N".equals(isfb))
-                this.isfb = false;
-            else if ("Y".equals(isfb) || "true".equals(isfb))
-                this.isfb = true;
-            else
-                this.isfb = false;
-
-            if (StringUtils.isNotEmpty(qdzCode) && !"null".equals(qdzCode)) {
-                this.qdzCode = qdzCode;
-            }
-            if (StringUtils.isNotEmpty(zdzCode) && !"null".equals(zdzCode)) {
-                this.zdzCode = zdzCode;
-            }
-
-        }
-
-        public Long getTtdid() {
-            return ttdid;
-        }
-
-        public void setTtdid(Long ttdid) {
-            this.ttdid = ttdid;
-        }
-
-        public String getFcsj() {
-            return fcsj;
-        }
-
-        public void setFcsj(String fcsj) {
-            this.fcsj = fcsj;
-        }
-
-        public String getBc_type() {
-            return bc_type;
-        }
-
-        public void setBc_type(String bc_type) {
-            this.bc_type = bc_type;
-        }
-
-        public String getXldir() {
-            return xldir;
-        }
-
-        public void setXldir(String xldir) {
-            this.xldir = xldir;
-        }
-
-        public Boolean getIsfb() {
-            return isfb;
-        }
-
-        public void setIsfb(Boolean isfb) {
-            this.isfb = isfb;
-        }
-
-        public String getQdzCode() {
-            return qdzCode;
-        }
-
-        public void setQdzCode(String qdzCode) {
-            this.qdzCode = qdzCode;
-        }
-
-        public String getZdzCode() {
-            return zdzCode;
-        }
-
-        public void setZdzCode(String zdzCode) {
-            this.zdzCode = zdzCode;
-        }
-    }
-
-    /**
-     * 时刻表编辑用的返回数据。
+     * 获取待编辑的数据。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @param maxfcno 最大发车顺序号
+     * @return
      */
-    public static class EditInfo {
-        /** 标题数据 */
-        private List<String> header = new ArrayList<>();
-        /** 内容数据 */
-        private List<List<FcInfo>> contents = new ArrayList<>();
-
-        /** 营运描述 */
-        private String yy_desc;
-
-        public List<String> getHeader() {
-            return header;
-        }
-
-        public void setHeader(List<String> header) {
-            this.header = header;
-        }
-
-        public List<List<FcInfo>> getContents() {
-            return contents;
-        }
-
-        public void setContents(List<List<FcInfo>> contents) {
-            this.contents = contents;
-        }
-
-        public String getYy_desc() {
-            return yy_desc;
-        }
-
-        public void setYy_desc(String yy_desc) {
-            this.yy_desc = yy_desc;
-        }
-    }
+    TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException;
  
     /**
-     * 获取待编辑的数据。
+     * 获取时刻表最大发车顺序号
      * @param xlid 线路id
-     * @param ttid 时刻表id
+     * @param ttinfoid 时刻表id
      * @return
      */
-    EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException;
+    Long findMaxFcno(Integer xlid, Long ttinfoid);
  
     /**
      * 验证sheet（以后放到规则引擎里去做）。
@@ -21,10 +21,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
  
 /**
  * Created by xu on 17/5/16.
@@ -206,8 +203,10 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
     }
  
     @Override
-    public File exportDataForEdit(Integer xlid, Long ttid) throws ScheduleException {
+    public EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException {
         try {
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
+
             // 创建ktr转换所需参数
             Map<String, Object> ktrParms = new HashMap<>();
             File ktrFile = new File(this.getClass().getResource(
@@ -225,9 +224,115 @@ public class TTInfoDetailDataToolsImpl implements DataToolsService, TTInfoDetail
             ktrParms.put("xlid", String.valueOf(xlid));
             ktrParms.put("ttid", String.valueOf(ttid));
  
-            return dataToolsService.exportData(ktrParms);
+            dataToolsService.exportData(ktrParms);
+
+            EditInfo editInfo = new EditInfo(); // 输出数据
+
+
+            // 1.6、获取最大的发车数，用于输出数据的数量
+            LOGGER.info("最大发车顺序号={}", maxfcno);
+            if (maxfcno != null) {
+                // 2、读取ktr生成的excel数据，组织编辑用数据返回
+                // 2-1、读取Excel文件
+                Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
+                        File.separator + outputFilePath + ".xls"));
+                Sheet sheet = book.getSheet(0);
+
+                // 2-2、处理数据
+                int all_bc_ks = 0; // 总空驶班次
+                int all_bc_yy = 0; // 总营运班次
+                double all_lc_ks = 0; // 总空驶里程
+                double all_lc_yy = 0; // 总营运里程
+
+                String[] headarrays = new String[maxfcno.intValue() + 3];
+                headarrays[0] = "路牌";
+                headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
+                headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
+
+                for (int r = 1; r < sheet.getRows(); r++) {
+                    List<FcInfo> fcInfos = new ArrayList<>();
+                    // 每行第一列都是路牌
+                    fcInfos.add(new FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
+
+                    int bc_ks = 0; // 空驶班次
+                    int bc_yy = 0; // 营运班次
+                    double lc_ks = 0; // 空驶里程
+                    double lc_yy = 0; // 营运里程
+
+                    for (int c = 1; c <= maxfcno; c++) {
+                        String content_str = sheet.getCell(c, r).getContents();
+                        try {
+                            String[] content = StringUtils.isEmpty(content_str) ? null : content_str.split(","); // 总的内容
+
+                            String ttdid_str = content == null ? "" : content[0]; // 时刻表明细id
+                            String fcsj = content == null ? "" : content[1]; // 发车时间
+                            String jhlc = content == null ? "" : content[2]; // 计划里程
+                            String fzdname = content == null ? "" : content[3]; // 发车站点名称
+                            String bctype = content == null ? "" : content[4]; // 班次类型
+                            String xldir = content == null ? "" : content[5]; // 线路上下行
+                            String isfb = content == null ? "" : content[6]; // 是否分班
+
+                            String qdzCode = content == null ? "" : content[7]; // 起点站编码
+                            String zdzCode = content == null ? "" : content[8]; // 终点站编码
+
+                            FcInfo fcInfo = new FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
+
+                            if (StringUtils.isNotEmpty(fzdname))
+                                headarrays[c] = fzdname;
+                            fcInfos.add(fcInfo);
+
+
+                            // 计算班次里程
+                            if (StringUtils.isNotEmpty(jhlc)) {
+                                if ("in".equals(bctype) || "out".equals(bctype) || "ldks".equals(bctype)) {
+                                    bc_ks += 1;
+                                    lc_ks += Double.valueOf(jhlc);
+
+                                    all_bc_ks += 1;
+                                    all_lc_ks += Double.valueOf(jhlc);
+
+                                } else {
+                                    bc_yy += 1;
+                                    lc_yy += Double.valueOf(jhlc);
+
+                                    all_bc_yy += 1;
+                                    all_lc_yy += Double.valueOf(jhlc);
+                                }
+                            }
+
+                        } catch (Exception exp) {
+                            exp.printStackTrace();
+                            LOGGER.info("第{}行，第{}列数据有问题，数据={}，异常message={}", r, c, content_str, exp.getCause());
+                            break;
+                        }
+
+                    }
+
+                    // 添加一列 空驶班次/空驶里程，fcsj放置数据
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
+
+                    // 添加一列 营运班次/营运里程，fcsj放置数据
+                    fcInfos.add(new FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
+
+                    editInfo.getContents().add(fcInfos);
+                }
+                editInfo.getHeader().addAll(Arrays.asList(headarrays));
+
+                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.3f,营运里程=%.3f,总里程=%.3f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
+            }
+
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
+
+            return editInfo;
         } catch (Exception exp) {
-            throw new ScheduleException(exp);
+            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
+
+            StringWriter sw = new StringWriter();
+            exp.printStackTrace(new PrintWriter(sw));
+            LOGGER.info(sw.toString());
+
+            throw new ScheduleException(exp.getMessage());
         }
     }
+
 }
 package com.bsth.service.schedule.datatools;
  
 import com.bsth.service.schedule.exception.ScheduleException;
+import org.apache.commons.lang3.StringUtils;
  
-import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
  
 /**
  * Created by xu on 17/5/16.
  */
 public interface TTInfoDetailForEdit {
-    File exportDataForEdit(Integer xlid, Long ttid) throws ScheduleException;
+    /**
+     * 发车信息内部类。
+     */
+    public static class FcInfo {
+        /** 时刻明细id */
+        private Long ttdid;
+        /** 发车时间 */
+        private String fcsj;
+        /** 班次类型 */
+        private String bc_type;
+        /** 线路上下行 */
+        private String xldir;
+        /** 是偶分班 */
+        private Boolean isfb;
+
+        /** 起点站code */
+        private String qdzCode;
+        /** 终点站code */
+        private String zdzCode;
+
+        public FcInfo() {
+        }
+
+        public FcInfo(
+                String ttdid_str,
+                String bc_type,
+                String fcsj,
+                String xldir,
+                String isfb,
+                String qdzCode,
+                String zdzCode) {
+            this.ttdid = StringUtils.isEmpty(ttdid_str) ? null : Long.valueOf(ttdid_str);
+            this.bc_type = bc_type;
+            this.fcsj = fcsj;
+            this.xldir = xldir;
+            if ("N".equals(isfb))
+                this.isfb = false;
+            else if ("Y".equals(isfb) || "true".equals(isfb))
+                this.isfb = true;
+            else
+                this.isfb = false;
+
+            if (StringUtils.isNotEmpty(qdzCode) && !"null".equals(qdzCode)) {
+                this.qdzCode = qdzCode;
+            }
+            if (StringUtils.isNotEmpty(zdzCode) && !"null".equals(zdzCode)) {
+                this.zdzCode = zdzCode;
+            }
+
+        }
+
+        public Long getTtdid() {
+            return ttdid;
+        }
+
+        public void setTtdid(Long ttdid) {
+            this.ttdid = ttdid;
+        }
+
+        public String getFcsj() {
+            return fcsj;
+        }
+
+        public void setFcsj(String fcsj) {
+            this.fcsj = fcsj;
+        }
+
+        public String getBc_type() {
+            return bc_type;
+        }
+
+        public void setBc_type(String bc_type) {
+            this.bc_type = bc_type;
+        }
+
+        public String getXldir() {
+            return xldir;
+        }
+
+        public void setXldir(String xldir) {
+            this.xldir = xldir;
+        }
+
+        public Boolean getIsfb() {
+            return isfb;
+        }
+
+        public void setIsfb(Boolean isfb) {
+            this.isfb = isfb;
+        }
+
+        public String getQdzCode() {
+            return qdzCode;
+        }
+
+        public void setQdzCode(String qdzCode) {
+            this.qdzCode = qdzCode;
+        }
+
+        public String getZdzCode() {
+            return zdzCode;
+        }
+
+        public void setZdzCode(String zdzCode) {
+            this.zdzCode = zdzCode;
+        }
+    }
+
+    /**
+     * 时刻表编辑用的返回数据。
+     */
+    public static class EditInfo {
+        /** 标题数据 */
+        private List<String> header = new ArrayList<>();
+        /** 内容数据 */
+        private List<List<FcInfo>> contents = new ArrayList<>();
+
+        /** 营运描述 */
+        private String yy_desc;
+
+        public List<String> getHeader() {
+            return header;
+        }
+
+        public void setHeader(List<String> header) {
+            this.header = header;
+        }
+
+        public List<List<FcInfo>> getContents() {
+            return contents;
+        }
+
+        public void setContents(List<List<FcInfo>> contents) {
+            this.contents = contents;
+        }
+
+        public String getYy_desc() {
+            return yy_desc;
+        }
+
+        public void setYy_desc(String yy_desc) {
+            this.yy_desc = yy_desc;
+        }
+    }
+
+    /**
+     * 获取待编辑的数据。
+     * @param xlid 线路id
+     * @param ttid 时刻表id
+     * @param maxfcno 最大发车顺序号
+     * @return
+     */
+    EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException;
+
 }
+
@@ -69,8 +69,6 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     @Autowired
     private TTInfoDetailRepository ttInfoDetailRepository;
     @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
     private LineRepository lineRepository;
     @Autowired
     private TTInfoRepository infoRepository;
@@ -114,6 +112,11 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
     }
  
     @Override
+    public Long findMaxFcno(Integer xlid, Long ttinfoid) {
+        return ttInfoDetailRepository.findMaxFcno(xlid, ttinfoid);
+    }
+
+    @Override
     public TTInfoDetail findById(Long aLong) {
         return ttInfoDetailRepository.findOneExtend(aLong);
     }
@@ -135,128 +138,12 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
         return dataToolsService.exportData(params);
     }
  
-    @Override
-    public TTInfoDetailService.EditInfo getEditInfo(Integer xlid, Long ttid) throws ScheduleException {
-        try {
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 start... ----------------//");
-
-            // 附加参数
-            String outputFilePath = String.format("ttinfodetail_(id=%s)_foredit-%s",
-                    String.valueOf(ttid), new DateTime().toString("yyyyMMddHHmmss"));
-
-            ttInfoDetailForEdit.exportDataForEdit(xlid, ttid);
-
-            TTInfoDetailService.EditInfo editInfo = new TTInfoDetailService.EditInfo(); // 输出数据
-
-            // 1.6、获取最大的发车数，用于输出数据的数量
-            Long maxfcno = ttInfoDetailRepository.findMaxFcno(xlid, ttid);
-            LOGGER.info("最大发车顺序号={}", maxfcno);
-            if (maxfcno != null) {
-                // 2、读取ktr生成的excel数据，组织编辑用数据返回
-                // 2-1、读取Excel文件
-                Workbook book = Workbook.getWorkbook(new File(dataToolsProperties.getTransTempdir() +
-                        File.separator + outputFilePath + ".xls"));
-                Sheet sheet = book.getSheet(0);
-
-                // 2-2、处理数据
-                int all_bc_ks = 0; // 总空驶班次
-                int all_bc_yy = 0; // 总营运班次
-                double all_lc_ks = 0; // 总空驶里程
-                double all_lc_yy = 0; // 总营运里程
-
-                String[] headarrays = new String[maxfcno.intValue() + 3];
-                headarrays[0] = "路牌";
-                headarrays[maxfcno.intValue() + 1] = "空驶班次/空驶里程";
-                headarrays[maxfcno.intValue() + 2] = "运营班次/运营里程";
-
-                for (int r = 1; r < sheet.getRows(); r++) {
-                    List<TTInfoDetailService.FcInfo> fcInfos = new ArrayList<>();
-                    // 每行第一列都是路牌
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, sheet.getCell(0, r).getContents(), null, null, null, null)); // 用fcsj放置路牌显示
-
-                    int bc_ks = 0; // 空驶班次
-                    int bc_yy = 0; // 营运班次
-                    double lc_ks = 0; // 空驶里程
-                    double lc_yy = 0; // 营运里程
-
-                    for (int c = 1; c <= maxfcno; c++) {
-                        String content_str = sheet.getCell(c, r).getContents();
-                        try {
-                            String[] content = StringUtils.isEmpty(content_str) ? null : content_str.split(","); // 总的内容
-
-                            String ttdid_str = content == null ? "" : content[0]; // 时刻表明细id
-                            String fcsj = content == null ? "" : content[1]; // 发车时间
-                            String jhlc = content == null ? "" : content[2]; // 计划里程
-                            String fzdname = content == null ? "" : content[3]; // 发车站点名称
-                            String bctype = content == null ? "" : content[4]; // 班次类型
-                            String xldir = content == null ? "" : content[5]; // 线路上下行
-                            String isfb = content == null ? "" : content[6]; // 是否分班
-
-                            String qdzCode = content == null ? "" : content[7]; // 起点站编码
-                            String zdzCode = content == null ? "" : content[8]; // 终点站编码
-
-                            TTInfoDetailService.FcInfo fcInfo = new TTInfoDetailService.FcInfo(ttdid_str, bctype, fcsj, xldir, isfb, qdzCode, zdzCode);
-
-                            if (StringUtils.isNotEmpty(fzdname))
-                                headarrays[c] = fzdname;
-                            fcInfos.add(fcInfo);
-
-
-                            // 计算班次里程
-                            if (StringUtils.isNotEmpty(jhlc)) {
-                                if ("in".equals(bctype) || "out".equals(bctype) || "ldks".equals(bctype)) {
-                                    bc_ks += 1;
-                                    lc_ks += Double.valueOf(jhlc);
-
-                                    all_bc_ks += 1;
-                                    all_lc_ks += Double.valueOf(jhlc);
-
-                                } else {
-                                    bc_yy += 1;
-                                    lc_yy += Double.valueOf(jhlc);
-
-                                    all_bc_yy += 1;
-                                    all_lc_yy += Double.valueOf(jhlc);
-                                }
-                            }
-
-                        } catch (Exception exp) {
-                            exp.printStackTrace();
-                            LOGGER.info("第{}行，第{}列数据有问题，数据={}，异常message={}", r, c, content_str, exp.getCause());
-                            break;
-                        }
-
-                    }
-
-                    // 添加一列 空驶班次/空驶里程，fcsj放置数据
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, String.format("%d/%.3f", bc_ks, lc_ks), null, null, null, null));
-
-                    // 添加一列 营运班次/营运里程，fcsj放置数据
-                    fcInfos.add(new TTInfoDetailService.FcInfo(null, null, String.format("%d/%.3f", bc_yy, lc_yy), null, null, null, null));
  
-                    editInfo.getContents().add(fcInfos);
-                }
-                editInfo.getHeader().addAll(Arrays.asList(headarrays));
-
-                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.3f,营运里程=%.3f,总里程=%.3f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
-            }
-
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
-
-            return editInfo;
-        } catch (Exception exp) {
-            LOGGER.info("//---------------- 时刻表编辑用数据输出 failed... ----------------//");
-
-            StringWriter sw = new StringWriter();
-            exp.printStackTrace(new PrintWriter(sw));
-            LOGGER.info(sw.toString());
-
-            throw new ScheduleException(exp.getMessage());
-        }
+    @Override
+    public TTInfoDetailForEdit.EditInfo getEditInfo(Integer xlid, Long ttid, Long maxfcno) throws ScheduleException {
+        return ttInfoDetailForEdit.getEditInfo(xlid, ttid, maxfcno);
     }
  
-
-
     @Override
     public void validateExcelSheet(String filename, String sheetname, Integer lineid, String linename) throws ScheduleException {
         try {
@@ -125,7 +125,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
  
-            throw new ScheduleException("上传文件错误！");
+            throw new ScheduleException(exp);
         }
     }
  
@@ -184,7 +184,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
  
-            throw new ScheduleException("导入数据错误！");
+            throw new ScheduleException(exp);
         } finally {
             // 清除日志操作
             KettleLogStore.discardLines(transLogId, true);
@@ -259,7 +259,7 @@ public class DataToolsServiceImpl implements DataToolsService {
             exp.printStackTrace(new PrintWriter(sw));
             LOGGER.info(sw.toString());
  
-            throw new ScheduleException("导出数据错误！");
+            throw new ScheduleException(exp);
         } finally {
             // 清除日志操作
             KettleLogStore.discardLines(transLogId, true);
@@ -133,13 +133,14 @@ public class RealControlSocketHandler implements WebSocketHandler {
 		WebSocketSession user;
 		while(iterator.hasNext()){
 			user = iterator.next();
-			try {
+			WebSocketPushQueue.put(user, message);
+			/*try {
 				if (user.isOpen()) {
 					user.sendMessage(message);
 				}
 			} catch (Exception e) {
 				logger.error("sendMessage error ...."+msg);
-			}
+			}*/
 		}
 	}
 }
@@ -6,7 +6,7 @@ spring.jpa.hibernate.ddl-auto= update
 spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy
 #DATABASE
 spring.jpa.database= MYSQL
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
+/**
+
+ @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);
+/**
+ 
+ @Name: layer
+ @Author: 贤心
+ 
+ **/
+
+*html{background-image: url(about:blank); background-attachment: fixed;}
+html #layuicss-skinlayercss{display: none; position: absolute; width: 1989px;}
+
+/* common */
+.layui-layer-shade, .layui-layer{position:fixed; _position:absolute; pointer-events: auto;}
+.layui-layer-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
+.layui-layer{-webkit-overflow-scrolling: touch;}
+.layui-layer{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
+.layui-layer-close{position:absolute;}
+.layui-layer-content{position:relative;}
+.layui-layer-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
+.layui-layer-load{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-1.gif") #eee center center no-repeat;}
+.layui-layer-ico{ background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/icon.png") no-repeat;}
+.layui-layer-dialog .layui-layer-ico,
+.layui-layer-setwin a,
+.layui-layer-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
+
+.layui-layer-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
+.layui-layer-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
+
+/* 动画 */
+.layui-layer{border-radius: 2px; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;}
+
+@-webkit-keyframes layer-bounceIn { /* 默认 */
+	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
+}
+@keyframes layer-bounceIn {
+	0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)}
+	100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)}
+}
+.layer-anim{-webkit-animation-name: layer-bounceIn;animation-name: layer-bounceIn}
+
+@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}
+
+@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}
+
+@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}
+
+@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}
+
+@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}
+
+@-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
+
+/* 标题栏 */
+.layui-layer-title{padding:0 80px 0 20px; height:42px; line-height:42px; border-bottom:1px solid #eee; font-size:14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; background-color: #F8F8F8; border-radius: 2px 2px 0 0;}
+.layui-layer-setwin{position:absolute; right:15px; *right:0; top:15px; font-size:0; line-height: initial;}
+.layui-layer-setwin a{position:relative; width: 16px; height:16px; margin-left:10px; font-size:12px; _overflow:hidden;}
+.layui-layer-setwin .layui-layer-min cite{position:absolute; width:14px; height:2px; left:0; top:50%; margin-top:-1px; background-color:#2E2D3C; cursor:pointer; _overflow:hidden;}
+.layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA; }
+.layui-layer-setwin .layui-layer-max{background-position:-32px -40px;}
+.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px;}
+.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px;}
+.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px;}
+.layui-layer-setwin .layui-layer-close1{background-position: 1px -40px; cursor: pointer;}
+.layui-layer-setwin .layui-layer-close1:hover{opacity:0.7;}
+.layui-layer-setwin .layui-layer-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px;  margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
+.layui-layer-setwin .layui-layer-close2:hover{ background-position:-180px -31px;}
+
+/* 按钮栏 */
+.layui-layer-btn{text-align: right; padding:0 10px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
+.layui-layer-btn a{height: 28px; line-height: 28px; margin: 6px 6px 0; padding: 0 15px; border:1px #dedede solid; background-color:#f1f1f1; color: #333; border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
+.layui-layer-btn a:hover{opacity: 0.9; text-decoration: none;}
+.layui-layer-btn a:active{opacity: 0.8;}
+.layui-layer-btn .layui-layer-btn0{border-color: #4898d5; background-color: #2e8ded; color:#fff;}
+.layui-layer-btn-l{text-align: left;}
+.layui-layer-btn-c{text-align: center;}
+
+/* 定制化 */
+.layui-layer-dialog{min-width:260px;}
+.layui-layer-dialog .layui-layer-content{position: relative; padding:20px; line-height:24px; word-break: break-all; overflow:hidden; font-size:14px; overflow-x: hidden; overflow-y:auto;}
+.layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute; top:16px; left:15px; _left:-40px; width:30px; height:30px;}
+.layui-layer-ico1{background-position:-30px 0 }
+.layui-layer-ico2{background-position:-60px 0;}
+.layui-layer-ico3{background-position:-90px 0;}
+.layui-layer-ico4{background-position:-120px 0;}
+.layui-layer-ico5{background-position:-150px 0;}
+.layui-layer-ico6{background-position:-180px 0;}
+.layui-layer-rim{border:6px solid #8D8D8D; border:6px solid rgba(0,0,0,.3); border-radius:5px; box-shadow: none;}
+.layui-layer-msg{min-width:180px; border:1px solid #D3D4D3; box-shadow: none;}
+.layui-layer-hui{min-width:100px;  background-color: #000; filter:alpha(opacity=60); background-color: rgba(0,0,0,0.6); color: #fff; border:none;}
+.layui-layer-hui .layui-layer-content{padding:12px 25px; text-align:center;}
+.layui-layer-dialog .layui-layer-padding{padding: 20px 20px 20px 55px; text-align: left;}
+.layui-layer-page .layui-layer-content{position:relative; overflow:auto;}
+.layui-layer-page .layui-layer-btn,.layui-layer-iframe .layui-layer-btn{padding-top:10px;}
+.layui-layer-nobg{background:none;}
+.layui-layer-iframe iframe{display: block; width: 100%;}
+
+.layui-layer-loading{border-radius:100%; background:none;  box-shadow:none;  border:none;}
+.layui-layer-loading .layui-layer-content{width:60px; height:24px; background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-0.gif") no-repeat;}
+.layui-layer-loading .layui-layer-loading1{width:37px; height:37px; background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-1.gif") no-repeat;}
+.layui-layer-loading .layui-layer-loading2, .layui-layer-ico16{width:32px; height:32px; background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/loading-2.gif") no-repeat;}
+.layui-layer-tips{background: none; box-shadow:none; border:none;}
+.layui-layer-tips .layui-layer-content{position: relative; line-height: 22px; min-width: 12px; padding: 5px 10px; font-size: 12px; _float:left; border-radius: 2px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;}
+.layui-layer-tips .layui-layer-close{right:-2px; top:-1px;}
+.layui-layer-tips i.layui-layer-TipsG{ position:absolute;  width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;}
+.layui-layer-tips i.layui-layer-TipsT, .layui-layer-tips i.layui-layer-TipsB{left:5px; border-right-style:solid; border-right-color: #000;}
+.layui-layer-tips i.layui-layer-TipsT{bottom:-8px;}
+.layui-layer-tips i.layui-layer-TipsB{top:-8px;}
+.layui-layer-tips i.layui-layer-TipsR, .layui-layer-tips i.layui-layer-TipsL{top:1px; border-bottom-style:solid; border-bottom-color: #000;}
+.layui-layer-tips i.layui-layer-TipsR{left:-8px;}
+.layui-layer-tips i.layui-layer-TipsL{right:-8px;}
+
+/* skin */
+.layui-layer-lan[type="dialog"]{min-width:280px;}
+.layui-layer-lan .layui-layer-title{background:#4476A7; color:#fff; border: none;}
+.layui-layer-lan .layui-layer-btn{padding: 5px 10px 10px; text-align: right; border-top:1px solid #E9E7E7}
+.layui-layer-lan .layui-layer-btn a{background:#BBB5B5; border:none;}
+.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5;}
+.layui-layer-molv .layui-layer-title{background:#009f95; color:#fff; border: none;}
+.layui-layer-molv .layui-layer-btn a{background:#009f95;}
+.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1;}
+
+
+
+/**
+ 
+ @Name: layer拓展样式
+ 
+ */
+
+.layui-layer-iconext{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/default/icon-ext.png") no-repeat;}
+
+/* prompt模式 */
+.layui-layer-prompt .layui-layer-input{display:block; width:220px; height:30px; margin:0 auto; line-height:30px; padding: 0 5px; border: 1px solid #ccc; box-shadow: 1px 1px 5px rgba(0,0,0,.1) inset; color:#333;}
+.layui-layer-prompt textarea.layui-layer-input{width:300px; height:100px; line-height:20px;}
+.layui-layer-prompt .layui-layer-content{padding: 20px;}
+.layui-layer-prompt .layui-layer-btn{padding-top: 0;}
+
+/* tab模式 */
+.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
+.layui-layer-tab .layui-layer-title{padding-left:0; border-bottom:1px solid #ccc; background-color:#eee; overflow: visible;}
+.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
+.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px; border-left:1px solid #ccc; border-right:1px solid #ccc; background-color:#fff; z-index:10;}
+.layui-layer-tab .layui-layer-title span:first-child{border-left:none;}
+.layui-layer-tabmain{line-height:24px; clear:both;}
+.layui-layer-tabmain .layui-layer-tabli{display:none;}
+.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block;}
+.xubox_tabclose{position:absolute; right:10px; top:5px; cursor:pointer;}
+
+/* photo模式 */
+.layui-layer-photos{-webkit-animation-duration: .8s; animation-duration: .8s;}
+.layui-layer-photos .layui-layer-content{overflow:hidden; text-align: center;}
+.layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-layer-imguide,.layui-layer-imgbar{display:none;}
+.layui-layer-imgprev, .layui-layer-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
+.layui-layer-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
+.layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
+.layui-layer-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
+.layui-layer-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
+.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-layer-imgtit{/*position:absolute; left:20px;*/}
+.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
+.layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
+.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
+.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
+
+/* 关闭动画 */
+@-webkit-keyframes layer-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)}
+  30% {-webkit-transform: scale(1.05); transform: scale(1.05)}
+  0% {-webkit-transform: scale(1); transform: scale(1);}
+}
+@keyframes layer-bounceOut {
+  100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
+  30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
+  0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
+}
+.layer-anim-close{-webkit-animation-name: layer-bounceOut;animation-name: layer-bounceOut; -webkit-animation-duration:.2s; animation-duration:.2s;}
+
+@media screen and (max-width: 1100px) {
+  .layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
+}
+
+
+html #layui_layer_skinmoonstylecss{display:none;position:absolute;width:1989px}body .layer-ext-moon[type=dialog]{min-width:320px}body .layer-ext-moon-msg[type=dialog]{min-width:200px}body .layer-ext-moon .layui-layer-title{background:#f6f6f6;color:#212a31;font-size:16px;font-weight:700;height:46px;line-height:46px;border-bottom:1px solid #D5D5D5}body .layer-ext-moon .layui-layer-content .layui-layer-ico{height:32px;width:32px;top:18.5px}body .layer-ext-moon .layui-layer-ico0{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -96px 0 no-repeat}body .layer-ext-moon .layui-layer-ico1{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -224px 0 no-repeat}body .layer-ext-moon .layui-layer-ico2{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -192px 0 no-repeat}body .layer-ext-moon .layui-layer-ico3{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -160px 0 no-repeat}body .layer-ext-moon .layui-layer-ico4{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -320px 0 no-repeat}body .layer-ext-moon .layui-layer-ico5{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -288px 0 no-repeat}body .layer-ext-moon .layui-layer-ico6{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -256px 0}body .layer-ext-moon .layui-layer-ico7{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -128px 0 no-repeat}body .layer-ext-moon .layui-layer-setwin{top:15px;right:15px}body .layer-ext-moon .layui-layer-setwin a{width:16px;height:16px}body .layer-ext-moon .layui-layer-setwin .layui-layer-min cite:hover{background-color:#56abe4}body .layer-ext-moon .layui-layer-setwin .layui-layer-max{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -80px 0 no-repeat}body .layer-ext-moon .layui-layer-setwin .layui-layer-max:hover{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -64px 0 no-repeat}body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -32px 0 no-repeat}body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin:hover{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -16px 0 no-repeat}body .layer-ext-moon .layui-layer-setwin .layui-layer-close1,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png")}body .layer-ext-moon .layui-layer-setwin .layui-layer-close1:hover,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2:hover{background:url("/real_control_v2/assets/plugins/layer3.0.3/skin/moon/default.png") -48px 0}body .layer-ext-moon .layui-layer-padding{padding-top:24px}body .layer-ext-moon .layui-layer-btn{text-align:center;padding-top:15px;padding-bottom:15px;background:#f0f4f7;border-top:1px #c7c7c7 solid}body .layer-ext-moon .layui-layer-btn a{font-size:12px;font-weight:400;margin:0 7px;padding:6px 20px;color:#fff;border:1px solid #0064b6;background:no-repeat #0071ce;border-radius:3px;display:inline-block;height:20px;line-height:20px;text-align:center;vertical-align:middle;text-decoration:none;outline:0}body .layer-ext-moon .layui-layer-btn .layui-layer-btn0{background:#0071ce}body .layer-ext-moon .layui-layer-btn .layui-layer-btn1{background:#fff;color:#404a58;border:1px solid #c0c4cd;border-radius:3px}body .layer-ext-moon .layui-layer-btn .layui-layer-btn2{background:#f60;color:#fff;border:1px solid #f60;border-radius:3px}body .layer-ext-moon .layui-layer-btn .layui-layer-btn3{background:red;color:#fff;border:1px solid red;border-radius:3px}body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{height:47px}
 \ No newline at end of file
@@ -15,4 +15,37 @@
 .uk-modal.ct_move_modal .uk-modal-header{
     cursor: move;
     user-select: none;
+}
+
+#ssspVedioModal .uk-modal-dialog-large{
+    height: 650px;
+}
+
+#ssspVedioModal .uk-modal-header{
+    border-bottom: 1px solid #a2bfe7;
+}
+
+#ssspVedioModal iframe{
+    width: calc(100% + 37px);
+    height: calc(100% - 32px);
+    margin-left: -18px;
+    margin-top: -15px;
+}
+
+#ssspVedioModal #vedioIframe{
+    display: none;
+}
+
+#ssspVedioModal p.loading{
+    text-align: center;
+    margin-top: 50px;
+}
+
+.layui-layer-border{
+    box-shadow: rgba(0, 0, 0, 0.2) 0px 8px 17px 0px, rgba(0, 0, 0, 0.19) 0px 6px 20px 0px !important;
+}
+
+body .layer-ext-moon .layui-layer-title{
+    background: #707070 !important;
+    color: #e2e2e2 !important;
 }
 \ No newline at end of file
@@ -154,6 +154,8 @@
                         gb_schedule_table.updateSchedule(rs.ts);
                         notify_succ('操作成功!');
                         UIkit.modal(modal).hide();
+                        //重新计算应发未发
+                        gb_schedule_table.calc_yfwf_num(sch.xlBm);
                     });
                 });
  
@@ -97,7 +97,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">烂班原因</label>
                     <div class="uk-form-controls">
-                        <select class="form-control" name="destroyReason">
+                        <select class="form-control" name="destroyReason" required>
                             <option value="">请选择...</option>
                             {{each adjustExps as exp i}}
                             <option value="{{exp}}">{{exp}}</option>
@@ -198,12 +198,11 @@
  
                 //是否烂班
                 $('[name=destroy]', f).on('click', function () {
-                    console.log(this, this.checked);
                     if (this.checked) {
-                        $('.destroy_reason_wrap', modal).show();
+                        $('.destroy_reason_wrap', modal).show();//.find('[name=destroyReason]').attr('required', 'required');
                     }
                     else {
-                        $('.destroy_reason_wrap', modal).hide();
+                        $('.destroy_reason_wrap', modal).hide();//.find('[name=destroyReason]').removeAttr('required');
                     }
                 });
  
@@ -26,6 +26,7 @@
                             <option value="A7">行驶中与人交谈</option>
                         </select>
                         <button class="uk-button">检索</button>
+                        <a id="showSSSpVedioModal" style="color: red;float: right;font-size: 12px;">查看实时视频</a>
                     </fieldset>
                 </form>
             </div>
@@ -52,6 +53,7 @@
         </div>
     </div>
  
+
     <script id="all-safe_dring-table-temp" type="text/html">
         {{each array as sd i}}
         <tr>
@@ -86,6 +88,9 @@
             var page = 0;
             var pageSize = 12;
  
+            $('#showSSSpVedioModal', modal).on('click', function () {
+                gb_safe_driv.showVedioModal();
+            });
             $(modal).on('init', function(e, data) {
                 e.stopPropagation();
  
@@ -5,6 +5,9 @@
  
 var gb_embed_form_hanlde = (function () {
  
+    layer.config({
+        skin: 'layer-ext-moon'
+    })
  
     var temps;
     $.get('/real_control_v2/js/forms/temps.html', function (dom) {
@@ -14,7 +17,7 @@ var gb_embed_form_hanlde = (function () {
     /**
      * 打开表单片段
      * @param pageUrl
-     */
+
     var open_modal_form_fragment = function (pageUrl, title) {
         //modal ID
         var id = '#formFragmentModal';
@@ -30,7 +33,36 @@ var gb_embed_form_hanlde = (function () {
         var htmlStr = gb_embed_form_hanlde.temps()['forms-embed-modal-temp']({pageUrl: wrapUrl, title: title});
         $(document.body).append(htmlStr);
         UIkit.modal(id, {bgclose: false}).show();
-    };
+    };*/
+    var open_modal_form_fragment = function (pageUrl, title) {
+        var id = '#formFragmentModal';
+        if($(id+'.uk-modal').length > 0){
+            $(id).remove();
+        }
+        //将片段路径写入 localStorage
+        window.localStorage.setItem('real_control_form_embed_pageUrl', pageUrl);
+        //包裹页面
+        var wrapUrl = '/real_control_v2/js/forms/wrap.html?origin=real_control_iframe';
+
+        layer.open({
+            type: 2,
+            title: title,
+            shadeClose: true,
+            shade: false,
+            maxmin: true, //开启最大化最小化按钮
+            area: ['1093px', '600px'],
+            moveOut: true,
+            content: wrapUrl,
+            zIndex: layer.zIndex,
+            success: function(layero){
+                layer.setTop(layero);
+            },
+            end: function () {
+
+            }
+        });
+    }
+
  
     return {
         temps: function () {
@@ -15,6 +15,9 @@
     <!-- 日期控件 -->
     <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
           rel="stylesheet" type="text/css"/>
+    <!-- layer 弹层 插件 -->
+    <link href="/assets/plugins/layer-v2.4/layer/skin/layer.css"
+          rel="stylesheet" type="text/css" />
  
     <!-- jQuery -->
     <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
@@ -28,6 +31,8 @@
     <!-- art-template 模版引擎 -->
     <script src="/assets/plugins/template.js"></script>
     <script src="/pages/forms/statement/js/jquery.PrintArea.js"></script>
+    <!-- layer 弹层 -->
+    <script src="/assets/plugins/layer-v2.4/layer/layer.js" ></script>
  
     <style>
         body{
@@ -40,6 +45,36 @@
         .form-page-content .portlet{
             margin-bottom: 0px !important;
         }
+
+        .row{
+            margin-left: 0 !important;
+            margin-right: 0 !important;
+        }
+
+        .row .col-md-12{
+            padding-left: 0 !important;
+        }
+
+        .portlet{
+            padding-top: 0 !important;
+            padding-left: 0 !important;
+        }
+
+        .form-page-content .portlet>.portlet-title{
+            position: fixed;
+            width: 100%;
+            background: #ffffff;
+            z-index: 9;
+            padding-top: 12px;
+            margin-top: -2px;
+            box-shadow: 0px 4px 2px 0 rgba(225, 225, 225, 0.2), 0px 4px 9px 0 rgba(139, 135, 135, 0.19);
+            border-bottom: 1px solid #dbdbdb;
+        }
+
+        .form-page-content .portlet.light .portlet-body{
+            padding-top: 8px;
+            margin-top: 55px;
+        }
     </style>
 </head>
 <body>
@@ -65,10 +100,25 @@
             if($("#ddrbBody").length > 0){
                 $("#ddrbBody").height("620px");
             }
+
+            //去掉公司和分公司选项
+            var company = $('select[name=company]', '.form-page-content');
+            var subCompany = $('select[name=subCompany]', '.form-page-content');
+            if(company.length > 0){
+                company.parent().remove();
+            }
+            if(subCompany.length > 0){
+                subCompany.parent().remove();
+            }
+
+            //重新构造线路下拉框
+            //var lineSelect = $('select[name=line]', '.form-page-content');
+            //lineSelect.select2('destory').html('');
+            //initPinYinSelect2(lineSelect);
         });
  
         //iframe 自适应高度
-        var iframeHeight;
+/*        var iframeHeight;
         var ifm = top.document.getElementById("formFragmentModalIframe");
  
         function changeFrameHeight() {
@@ -84,13 +134,13 @@
             var h = $('.form-page-content').height();
             if (iframeHeight != h)
                 ifm.height = h + 'px';
-        }, 600);
+        }, 600);*/
  
     })();
  
     function initPinYinSelect2(selector, data, cb) {
         //过滤线路选择框数据
-        if(selector === '#line'){
+        /*if(selector === '#line'){
             var idx = ',' + top.gb_data_basic.line_idx + ',';
             var newData = [];
             $.each(data, function () {
@@ -98,8 +148,17 @@
                     newData.push(this);
             });
             data = newData;
+        }*/
+        if(selector === '#line'){
+            //写死线路下拉框
+            data = [];
+            $.each(top.gb_data_basic.activeLines, function () {
+                data.push({
+                    id: this.lineCode,
+                    text: this.name
+                });
+            });
         }
-
         $.each(data, function () {
             this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
             this.camelChars = pinyin.getCamelChars(this.text);
@@ -22,6 +22,8 @@ var gb_schedule_table_dbclick = (function() {
             }, function(rs) {
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('待发调整成功！');
+                //重新计算应发未发
+                gb_schedule_table.calc_yfwf_num(rs.ts[0].xlBm);
             });
         }
     }
@@ -478,10 +478,11 @@ var gb_schedule_table = (function () {
  
         var carYfwfMap = {}, nbbm;
         $.each(schArr, function () {
-            if (this.fcsjT > t)
-                return false;
+            /*if (this.dfsjT > t)
+                return false;*/
  
-            if (this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1) {
+            if (this.dfsjT < t &&
+                this.fcsjActual == null && this.fcsjActualTime == null && this.status != -1) {
                 yfwf_num++;
                 nbbm = this.clZbh;
                 if (carYfwfMap[nbbm])
@@ -169,8 +169,9 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-16',
-        text: '<h5>修复了进出场班次公里设置为0后自动烂班的问题</h5>'
+        date: '2017-05-18',
+        text: '<h5>现在自定义子任务，勾选是否烂班后，烂班原因必填。</h5><h5>修复了在驾驶员请求出场时，误下发分班出场指令的问题</h5>' +
+        '<h5>调整了报表的弹出窗口<br>1、取消了窗口遮罩，可同时打开多个报表窗口，窗口堆叠时，点击窗口title切换堆叠顺序<br>2、鼠标按住窗口右下角，可随意改变窗口大小。<br>3、拖动窗口时，允许拖出页面之外<br><br>注意：将窗口和窗口title拖出页面外时，会面临窗口丢失的风险，过多丢失的窗口会影响到页面性能，你可以刷新页面以重置！</h5>'
     };
  
     var storage = window.localStorage
@@ -42,8 +42,16 @@ var gb_safe_driv = (function () {
         $wrap.append(htmlStr);
     };
  
+    var vedioModal = '<div id="ssspVedioModal" class="uk-modal ct_move_modal">' +
+                        '<div class="uk-modal-dialog uk-modal-dialog-large">' +
+                        '<button type="button" class="uk-modal-close uk-close"></button>' +
+                        '<div class="uk-modal-header"> <h2>实时视频</h2> </div> '+
+                        '<p class="loading"><i class="uk-icon-spinner uk-icon-spin"></i> 载入资源...</p><iframe id="vedioIframe" src="http://222.66.0.204:8910/transport_server/dvr_monitor1.jsp?deviceId=229L0650&channel=0"></iframe>' +
+                        '</div>' +
+                    '</div>';
+
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title');
+        var title = $(this).data('title') + '&nbsp;<button class="uk-button uk-button-mini uk-button-primary" id="openVedioModalBtn" type="button">查看实时视频</button>';
         var url = $(this).data('url');
         $(this).remove();
         var lightbox = UIkit.lightbox.create([
@@ -53,9 +61,24 @@ var gb_safe_driv = (function () {
         lightbox.show();
     });
  
+    var showVedioModal = function () {
+        open_modal_dom(vedioModal ,{}, {modal: false});
+        $('#ssspVedioModal #vedioIframe').on('load', function () {
+            var that = this;
+            setTimeout(function () {
+                $(that).show();
+                $('#ssspVedioModal p.loading').remove();
+            }, 500);
+        });
+    };
+
+    $(document).on('click', '#openVedioModalBtn', showVedioModal);
+
+
     return {
         pop: pop,
         safeCode: codes,
-        urlPath: path
+        urlPath: path,
+        showVedioModal: showVedioModal
     }
 })();
 \ No newline at end of file
@@ -40,6 +40,9 @@
     <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
     <!-- perfect-scrollbar style -->
     <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
+    <!-- layer 3.0.3 -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  merge="plugins"/>
 </head>
  
 <body>
@@ -147,6 +150,8 @@
 <script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 <!-- qtip -->
 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
+<!-- layer 3.0.3 -->
+<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script>
  
 <!-- 数据 -->
 <script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>
@@ -760,17 +760,19 @@
                 var initDropdownList = function (lineCode) {
                     //从地图模块获取停车场数据
                     parks = gb_map_spatial_data.carparkArray();
-                    console.log('parksparks', parks);
+                    //console.log('parksparks', parks);
                     //将线路标准停车场排在第一个
                     var information = gb_data_basic.getLineInformation(lineCode);
-                    var index;
-                    for(var i = 0,p; p=parks[i++];){
-                        if(p.parkCode == information.carPark){
-                            index = i - 1;
-                            break;
+                    if(information){
+                        var index;
+                        for(var i = 0,p; p=parks[i++];){
+                            if(p.parkCode == information.carPark){
+                                index = i - 1;
+                                break;
+                            }
                         }
+                        parks[index] = parks.splice(0, 1 , parks[index])[0];
                     }
-                    parks[index] = parks.splice(0, 1 , parks[index])[0];
                     //渲染
                     var htmlStr = template('pb_park_list_dropdown-temp', {list: parks});
                     $('.buffer_area_form .parks_list', modal).html(htmlStr);
@@ -833,6 +835,8 @@
                     }
  
                     //更新路段底图
+                    if(gps.upDown!=0 && gps.upDown!=1)
+                        gps.upDown = 0;
                     if(gps.upDown!=roadUpdown){
                         switchPolyline(gps.upDown);
                         //清除轨迹线
@@ -859,13 +863,13 @@
                 /**
                  * 绘制路段底图（包括站点）
                  */
-                var roadUpdown=-1;
+                var roadUpdown=-100;
                 var switchPolyline = function (upDown) {
                     if(typeof(upDown) == "undefined")
                         upDown = roadUpdown;
  
                     if(upDown!= 0 && upDown != 1)
-                        return;
+                        upDown = 0;
                     map.clearOverlays();
                     parkPolygons = {};//清除停车场对照
                     //路段
@@ -966,7 +970,7 @@
                     if(gpsMarker)
                         gpsMarker.enableMassClear();
                     map.clearOverlays();
-                    roadUpdown = -1;
+                    roadUpdown = -100;
                     trailArray=[];
                     trailPolyline = null;
                     gpsMarker = null;
@@ -20,7 +20,7 @@
 20=排班规则备注
 ##21=时刻表，两点间空驶，算空驶
 22=搭班编码自动生成
-23=时刻表明细修改终点站停驶（停止1个半小时以上）
+##23=时刻表明细修改终点站停驶（停止1个半小时以上）
 ##24=线路标准里如果里程是0，用标准里程
 ##25=规则导出的日期格式修正
 ##26=人员录入，工号规则前加 "{公司编码}-"