Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

游瑞烽
2 parents 7b71578f 668bce79
Showing 24 changed files with 1260 additions and 306 deletions
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/realcontrol/dto/DftzAndDestroy.java
src/main/java/com/bsth/data/gpsdata_v2/GpsRealData.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/edit_logs/FormLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/ScheduleModifyLogger.java
src/main/java/com/bsth/data/schedule/edit_logs/entity/SchEditInfo.java
src/main/java/com/bsth/data/schedule/external/TccExternalService.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/websocket/dto/WsScheduleRealInfo.java
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.js
src/main/resources/static/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/north/nav/line_config/line_config_entity.html
src/main/resources/static/real_control_v2/fragments/north/nav/safeDriving.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -48,7 +48,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> outgoAdjust(@RequestParam Long id, @RequestParam String remarks,
 										   @RequestParam String dfsj,String bcType,
 										   @RequestParam(defaultValue = "") String opType) {
-		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType);
+		return scheduleRealInfoService.outgoAdjust(id, remarks, dfsj, bcType, opType, null);
 	}
 	/**
@@ -59,7 +59,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> destroy(@RequestParam String idsStr
 			/*, @RequestParam(defaultValue = "-1") int spaceAdjust*/,
 									   @RequestParam String remarks, @RequestParam String adjustExps/*, @RequestParam(defaultValue = "0") int spaceNum*/) {
-		return scheduleRealInfoService.destroy(idsStr/*, spaceAdjust*/, remarks, adjustExps/*, spaceNum*/);
+		return scheduleRealInfoService.destroy(idsStr, remarks, adjustExps, null);
 	}
 	/**
@@ -520,7 +520,7 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	public Map<String, Object> multi_tzrc(@RequestParam String cpcsJson){
 		cpcsJson = StringEscapeUtils.unescapeHtml4(cpcsJson);
 		List<ChangePersonCar> cpcs = JSONArray.parseArray(cpcsJson, ChangePersonCar.class);
-		return scheduleRealInfoService.multi_tzrc(cpcs);
+		return scheduleRealInfoService.multi_tzrc(cpcs, null);
 	}
 	@RequestMapping(value="/multi_dftz", method=RequestMethod.POST)
 package com.bsth.controller.realcontrol;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
 import com.bsth.data.BasicData;
 import com.bsth.data.directive.DayOfDirectives;
 import com.bsth.data.directive.DirectiveCreator;
@@ -8,10 +12,12 @@ import com.bsth.data.directive.GatewayHttpUtils;
 import com.bsth.data.gpsdata_v2.GpsRealData;
 import com.bsth.data.gpsdata_v2.entity.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.external.TccExternalService;
 import com.bsth.entity.directive.D60;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.directive.D60Repository;
 import com.google.common.base.Splitter;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,12 +50,16 @@ public class ServiceDataInterface {
     @Autowired
     GpsRealData gpsRealData;
+    @Autowired
+    TccExternalService tccExternalService;
+
     /**
      * 获取车辆 和 当前执行班次对照信息
+     *
      * @return
      */
     @RequestMapping("/execSchList")
-    public List<Map<String, Object>> execSchList(@RequestParam String secretKey){
+    public List<Map<String, Object>> execSchList(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -57,8 +67,8 @@ public class ServiceDataInterface {
         Collection<ScheduleRealInfo> list = dayOfSchedule.execPlanMap().values();
         Map<String, Object> map;
-        for(ScheduleRealInfo sch : list){
-            if(null == sch)
+        for (ScheduleRealInfo sch : list) {
+            if (null == sch)
                 continue;
             map = new HashMap<>();
             map.put("clZbh", sch.getClZbh());
@@ -105,7 +115,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnCCInfo")
-    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnCCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -123,7 +133,7 @@ public class ServiceDataInterface {
     }
     @RequestMapping("/returnJCInfo")
-    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey){
+    public List<ScheduleRealInfo> returnJCInfo(@RequestParam String companyId, @RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -141,10 +151,11 @@ public class ServiceDataInterface {
     /**
      * 获取全量的进出场数据， 仅供接口项目调用。 由接口项目负责对外所有场站输出
+     *
      * @return
      */
     @RequestMapping("/findCurrInAndOut")
-    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey){
+    public List<ScheduleRealInfo> findCurrInAndOut(@RequestParam String secretKey) {
         if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
             return null;
@@ -161,30 +172,29 @@ public class ServiceDataInterface {
     /**
      * 向指定的车辆下发消息短语
-     * @param nbbm
-     * @param txt
+     *
      * @return
      */
     @RequestMapping(value = "/send60Phrase", method = RequestMethod.POST)
-    public int send60Phrase(@RequestBody Map<String, String> map,@RequestParam String secretKey){
-        try{
+    public int send60Phrase(@RequestBody Map<String, String> map, @RequestParam String secretKey) {
+        try {
             String nbbm = map.get("nbbm");
             String txt = map.get("txt");
             String sender = map.get("sender");
-            if(txt.length() > 50)
+            if (txt.length() > 50)
                 txt = txt.substring(0, 50);
             if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
                 return -500;
             //车辆和设备号对照
             String deviceId = BasicData.deviceId2NbbmMap.inverse().get(nbbm);
-            if(StringUtils.isEmpty(deviceId))
+            if (StringUtils.isEmpty(deviceId))
                 return -404;
             //检查设备是否在线
             long t = System.currentTimeMillis();
             GpsEntity gps = gpsRealData.get(deviceId);
-            if(null == gps ||  (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
+            if (null == gps || (t - gps.getServerTimestamp()) > 1000 * 60 * 5)
                 return -405;
             Short dispatchInstruct = 0;//消息短语
@@ -199,7 +209,7 @@ public class ServiceDataInterface {
             dayOfDirectives.put60(d60);
             return d60.getMsgId();
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
             return -500;
         }
@@ -207,23 +217,24 @@ public class ServiceDataInterface {
     /**
      * 根据msg id 查询指令响应情况
-     * @param msgIDs
+     *
+     * @param msgIds
      * @return
      */
     @RequestMapping("/findD60Reply")
-    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds){
+    public List<Map<String, Object>> findD60Reply(@RequestParam String msgIds) {
         List<Map<String, Object>> rs = new ArrayList<>();
-        try{
+        try {
             Map<String, Object> map = new HashMap();
             List<String> ids = Splitter.on(",").splitToList(msgIds);
             D60 d60;
-            for(String id : ids){
-                if(StringUtils.isEmpty(id))
+            for (String id : ids) {
+                if (StringUtils.isEmpty(id))
                     continue;
                 d60 = dayOfDirectives.get(Integer.parseInt(id));
-                if(null == d60)
+                if (null == d60)
                     continue;
                 map.put("msgId", d60.getMsgId());
@@ -231,7 +242,7 @@ public class ServiceDataInterface {
                 map.put("jsyReplyTime", d60.getReply47Time());
                 rs.add(map);
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
         return rs;
@@ -239,18 +250,52 @@ public class ServiceDataInterface {
     /**
      * 获取路牌下所有班次
+     *
      * @param lineCode
      * @param lpName
      * @return
      */
     @RequestMapping("/findByLpName")
-    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode,@RequestParam String lpName){
-        try{
+    public List<ScheduleRealInfo> findByLpName(@RequestParam String lineCode, @RequestParam String lpName, @RequestParam String secretKey) {
+        try {
+            if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+                return null;
+
             List<ScheduleRealInfo> list = dayOfSchedule.getLpScheduleMap().get(lineCode + "_" + lpName);
             return list;
-        }catch (Exception e){
+        } catch (Exception e) {
             logger.error("", e);
         }
         return null;
     }
+
+    /**
+     * 调整出场班次待发，并烂掉后续班次（调派用）
+     *
+     * @param dad
+     * @return
+     */
+    @RequestMapping(value = "/dftzAndDestroy", method = RequestMethod.POST)
+    public Map<String, Object> dftzAndDestroy(@RequestBody DftzAndDestroy dad, @RequestParam String secretKey) {
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+        return tccExternalService.dftz(dad);
+    }
+
+    /**
+     * 换人换车，（调派用）
+     * @return
+     */
+    @RequestMapping(value = "/tccHrhc", method = RequestMethod.POST)
+    public Map<String, Object> hrhc(@RequestBody String jsonStr, @RequestParam String secretKey){
+
+        if (StringUtils.isEmpty(secretKey) || !secretKey.equals(SECRE_KEY))
+            return null;
+
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        JSONObject rootObj = JSON.parseObject(jsonStr);
+
+        List<ChangePersonCar> cpcs = JSONArray.parseArray(rootObj.getString("cpcs"), ChangePersonCar.class);
+        return tccExternalService.hrhc(cpcs, rootObj.getString("tccCode"), rootObj.getString("userId"));
+    }
 }
+package com.bsth.controller.realcontrol.dto;
+
+/**
+ * Created by panzhao on 2018/3/22.
+ */
+public class DftzAndDestroy {
+
+    /**
+     * 要调整待发的出场班次ID
+     */
+    private Long dftzId;
+
+    /**
+     * 要设置的待发时间
+     */
+    private String newTimeStr;
+
+    /**
+     * 要烂掉的班次的 班次id ,号分割多个
+     */
+    private String destroyIdx;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    private String reason;
+
+    /**
+     * 调派工号
+     */
+    private String userId;
+
+    public String getNewTimeStr() {
+        return newTimeStr;
+    }
+
+    public void setNewTimeStr(String newTimeStr) {
+        this.newTimeStr = newTimeStr;
+    }
+
+    public String getDestroyIdx() {
+        return destroyIdx;
+    }
+
+    public void setDestroyIdx(String destroyIdx) {
+        this.destroyIdx = destroyIdx;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public Long getDftzId() {
+        return dftzId;
+    }
+
+    public void setDftzId(Long dftzId) {
+        this.dftzId = dftzId;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
@@ -129,8 +129,11 @@ public class GpsRealData {
         Set<String> nbbmSet = dayOfSchedule.findCarByLineCode(lineCode);//计划用车
         Map<String, String> nbbm2deviceMap = BasicData.deviceId2NbbmMap.inverse();
+        String deviceId;
         for(String nbbm : nbbmSet){
-            set.add(nbbm2deviceMap.get(nbbm));
+            deviceId = nbbm2deviceMap.get(nbbm);
+            if(StringUtils.isNotEmpty(deviceId))
+                set.add(deviceId);
         }
         List<GpsEntity> rs = new ArrayList<>();
@@ -979,18 +979,21 @@ public class DayOfSchedule {
             String rq = currSchDateMap.get(lineCode);
             if (StringUtils.isNotEmpty(rq)) {
                 List<ScheduleRealInfo> all = findByLineCode(lineCode);
-                //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
-                for (ScheduleRealInfo sch : unions) {
-                    removeExecPlan(sch.getClZbh());
-                }
-                //解除调度指令和班次的外键约束
-                StringBuilder inStr = new StringBuilder("(");
-                for (ScheduleRealInfo sch : all) {
-                    inStr.append(sch.getId() + ",");
+
+                if(null != all && all.size() > 0){
+                    //解除gps 和班次之间的关联
+                    List<ScheduleRealInfo> unions = calcUnion(all, carExecutePlanMap.values());
+                    for (ScheduleRealInfo sch : unions) {
+                        removeExecPlan(sch.getClZbh());
+                    }
+                    //解除调度指令和班次的外键约束
+                    StringBuilder inStr = new StringBuilder("(");
+                    for (ScheduleRealInfo sch : all) {
+                        inStr.append(sch.getId() + ",");
+                    }
+                    inStr.deleteCharAt(inStr.length() - 1).append(")");
+                    jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 }
-                inStr.deleteCharAt(inStr.length() - 1).append(")");
-                jdbcTemplate.update(Constants.MULTI_REMOVE_DIRECTIVE_SCH_FK + " " + inStr.toString());
                 //删除班次数据
                 removeRealSch(lineCode, rq);
@@ -37,7 +37,7 @@ public class FormLogger {
     /**
      * 换人换车情况表
      */
-    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc){
+    public void saveChangetochange(ScheduleRealInfo sch, ChangePersonCar cpc, String userId){
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -51,7 +51,6 @@ public class FormLogger {
                 return;
             Date d = new Date();
-            SysUser user = SecurityUtils.getCurrentUser();
             Changetochange cc = new Changetochange();
             cc.setRq(sch.getScheduleDateStr());
             cc.setGs(sch.getGsBm());
@@ -61,8 +60,13 @@ public class FormLogger {
             cc.setFssj(sch.getFcsj());
             cc.setXgsj(fmtHHmm.print(d.getTime()));
             cc.setsId(sch.getId());
-            if(user != null)
+
+            if(StringUtils.isEmpty(userId)){
+                SysUser user = SecurityUtils.getCurrentUser();
                 cc.setXgr(user.getUserName());
+            }
+            else
+                cc.setXgr(userId);
             cc.setPcch(sch.getClZbh());
             cc.setPcry(oldJsy);
@@ -86,7 +90,7 @@ public class FormLogger {
         ChangePersonCar cpc = new ChangePersonCar();
         cpc.setClZbh(nbbm);
         cpc.setJsy(jsy);
-        saveChangetochange(sch, cpc);
+        saveChangetochange(sch, cpc, null);
     }
     public void saveDb(){
@@ -28,14 +28,14 @@ public class ScheduleModifyLogger {
     /**
      * 待发调整
-     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整
+     * opType 0: 双击调整、 1：待发调整、2：批量待发调整、3：间隔调整、4：调派系统调整
      */
-    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks) {
+    public static void dftz(ScheduleRealInfo sch, String opType, String oldDfsj, String nowDfsj, String remarks, String userId) {
         try {
             if (oldDfsj.equals(nowDfsj))
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.DFTZ);
             sei.setType2(opType);
             sei.setRemarks(remarks == null ? "" : remarks);
@@ -78,9 +78,9 @@ public class ScheduleModifyLogger {
      *
      * @param remarks
      */
-    public static void jhlb(ScheduleRealInfo sch, String remarks) {
+    public static void jhlb(ScheduleRealInfo sch, String remarks, String userId) {
         try {
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setRemarks(remarks);
             sei.setType(EditType.JHLB);
@@ -182,7 +182,7 @@ public class ScheduleModifyLogger {
      * @param sch
      * @param cpc
      */
-    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc) {
+    public static void tzrc(ScheduleRealInfo sch, ChangePersonCar cpc, String userId) {
         try {
             String newNbbm = cpc.getClZbh();
             String newJsy = cpc.getJsy();
@@ -218,7 +218,7 @@ public class ScheduleModifyLogger {
             if(jobj.size() == 0)
                 return;
-            SchEditInfo sei = SchEditInfo.getInstance(sch);
+            SchEditInfo sei = SchEditInfo.getInstance(sch, userId);
             sei.setType(EditType.TZRC);
             sei.setJsonArray(jobj.toJSONString());
@@ -160,6 +160,20 @@ public class SchEditInfo {
         return sei;
     }
+    public static SchEditInfo getInstance(ScheduleRealInfo sch, String userId){
+        SchEditInfo sei = new SchEditInfo();
+        long t = System.currentTimeMillis();
+        sei.setTs(t);
+        sei.setTimeStr(fmtHHmm.print(t));
+        sei.setUser(userId);
+        sei.setRq(sch.getScheduleDateStr());
+        sei.setSchId(sch.getId());
+        sei.setLineCode(sch.getXlBm());
+        sei.setGsbm(sch.getGsBm());
+        sei.setFgsbm(sch.getFgsBm());
+        return sei;
+    }
+
     public String getLineCode() {
         return lineCode;
     }
+package com.bsth.data.schedule.external;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.realcontrol.dto.ChangePersonCar;
+import com.bsth.controller.realcontrol.dto.DftzAndDestroy;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.realcontrol.ScheduleRealInfoService;
+import com.bsth.websocket.handler.SendUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+/**
+ * 对停车场开放的班次调度服务
+ * Created by panzhao on 2018/3/22.
+ */
+@Component
+public class TccExternalService {
+
+    Logger logger = LoggerFactory.getLogger(TccExternalService.class);
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ScheduleRealInfoService scheduleRealInfoService;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    /**
+     * 待发调整
+     *
+     * @param dad
+     * @return
+     */
+    public Map<String, Object> dftz(DftzAndDestroy dad) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            List<ScheduleRealInfo> updateList = new ArrayList<>();//要刷新的班次
+            ScheduleRealInfo sch = dayOfSchedule.get(dad.getDftzId());
+            if (null == sch) {
+                rs.put("msg", "班次已经不存在了！");
+                return rs;
+            }
+
+            if (!sch.getBcType().equals("out")) {
+                rs.put("msg", "只能操作出场班次！");
+                return rs;
+            }
+
+            //调整待发时间
+            scheduleRealInfoService.outgoAdjust(sch.getId(), dad.getRemarks(), dad.getNewTimeStr(), sch.getBcType(), "4", dad.getUserId());
+            updateList.add(sch);
+
+            //需要烂班的班次
+            if (StringUtils.isNotEmpty(dad.getDestroyIdx())) {
+                Map<String, Object> dMap =
+                        scheduleRealInfoService.destroy(dad.getDestroyIdx(), dad.getRemarks(), dad.getReason(), dad.getUserId());
+
+
+                updateList.addAll((Collection<? extends ScheduleRealInfo>) dMap.get("ts"));
+            }
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(updateList);
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("t", sch);
+        } catch (Exception e) {
+            rs.put("msg", "内部调度服务接口出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+    /**
+     * 换人换车
+     *
+     * @param cpcs
+     * @return
+     */
+    public Map<String, Object> hrhc(List<ChangePersonCar> cpcs,String tccCode, String userId) {
+        Map<String, Object> rs = new HashMap();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            rs = scheduleRealInfoService.multi_tzrc(cpcs, userId);
+
+            //通知调度客户端更新班次信息
+            sendUpdate2Page(new ArrayList<ScheduleRealInfo>((Set)rs.get("ts")));
+
+            //返回更新结果集中指定停车场的进出场班次
+            Set<ScheduleRealInfo> ts = (Set<ScheduleRealInfo>) rs.get("ts");
+            List<ScheduleRealInfo> list = new ArrayList<>();
+            for(ScheduleRealInfo sch : ts){
+                if((sch.getBcType().equals("out") && sch.getQdzCode().equals(tccCode))
+                        || (sch.getBcType().equals("in") && sch.getZdzCode().equals(tccCode)))
+                    list.add(sch);
+            }
+            rs.put("list", list);
+            rs.remove("ts");
+        } catch (Exception e) {
+            rs.put("msg", "服务器出现异常！");
+            logger.error("", e);
+        }
+        return rs;
+    }
+
+
+    public void sendUpdate2Page(List<ScheduleRealInfo> list) {
+        sendUtils.refreshSch(list);
+    }
+}
@@ -8,6 +8,7 @@ import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.util.Arith;
 import com.bsth.websocket.handler.SendUtils;
+import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
@@ -16,8 +17,7 @@ import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.List;
 /**
  * 误点自动调整待发 处理程序
@@ -35,12 +35,14 @@ public class LateAdjustHandle implements ApplicationContextAware{
     /**
      * 应发未到车辆 和 班次
+     *
+     * 起点相同的，保留最后一个班次
      */
-    private static Map<String, ScheduleRealInfo> lateSchMap;
+    private static ArrayListMultimap lateSchMaps;
     static {
-        lateSchMap = new HashMap<>();
+        lateSchMaps = ArrayListMultimap.create();
     }
     /**
@@ -48,125 +50,140 @@ public class LateAdjustHandle implements ApplicationContextAware{
      * @param sch
      */
     public static void putLate(ScheduleRealInfo sch){
-        try {
-            //出场班次不需要
-            if(sch.getBcType().equals("out"))
-                return;
+        try{
             //线路配置
             LineConfig config = lineConfigData.get(sch.getXlBm());
             if(sch.getLateMinute() == 0){
-                if(config.isEnableYjtk()){
-                    sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
-                }
-                else
+                if(!config.isEnableYjtk())
                     return;
+
+                sch.setLateMinute(sch.getXlDir().equals("0")?config.getUpStopMinute():config.getDownStopMinute());
             }
             if(sch.getDfsj().compareTo(config.getYjtkStart()) > 0
                     && sch.getDfsj().compareTo(config.getYjtkEnd()) <= 0){
-                ScheduleRealInfo cancel = null;
-                //之前存在误点班次没有发出
-                ScheduleRealInfo old = lateSchMap.get(sch.getClZbh());
+                ScheduleRealInfo old = popLateSch(sch);
+                if(null != old){
+                    //通知客户端
+                    sch.setLate2(true);
+                    sendUtils.sendAutoWdtz(sch, old);
-                if(old != null && old.getDfsjT() < sch.getDfsjT()){
-                    //如果之前班次的 待发应到时间已经过了 3 分钟
-                    long t = System.currentTimeMillis();
-                    long dfEndTime = old.getDfsjT() + (old.getBcsj() * 60 * 1000);
-                    if((t - dfEndTime) > 1000 * 60 * 3){
-
-                        remove(old);
-                        cancel = old;
-                        logger.info("【应发未到】old 班次 " + old.getId() + " -被覆盖！");
-                    }
+                    logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
                 }
-
-                lateSchMap.put(sch.getClZbh(), sch);
-                //通知客户端
-                sch.setLate2(true);
-                sendUtils.sendAutoWdtz(sch, cancel);
-
-                logger.info("【应发未到】班次 " + sch.getClZbh() + " -" + sch.getDfsj() + " -id: " + sch.getId() + " -加入误点调整！");
             }
+
         }catch (Exception e){
             logger.error("", e);
         }
     }
+    /**
+     * 压入新的误点班次
+     * @param sch
+     * @return 返回被移除的误点班次
+     */
+    private static ScheduleRealInfo popLateSch(ScheduleRealInfo sch) {
+        List<ScheduleRealInfo> list = lateSchMaps.get(sch.getXlBm());
+
+        if(null == list || list.size() == 0)
+            lateSchMaps.put(sch.getClZbh(), sch);
+        else {
+            ScheduleRealInfo old = findExistQdz(list, sch.getQdzCode(), sch.getQdzName());
+
+            //同一个起点，保留时间最大的班次
+            if(null == old || old.getDfsjT() < sch.getDfsjT()){
+                lateSchMaps.remove(old.getClZbh(), old);
+                lateSchMaps.put(sch.getClZbh(), sch);
+
+                logger.info(sch.getClZbh() + "【应发未到】old 班次 " + old.getId() + " -被覆盖！");
+                return old;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 搜索同样起点的班次
+     * @param list
+     * @return
+     */
+    private static ScheduleRealInfo findExistQdz(List<ScheduleRealInfo> list, String qdzCode, String qdzName) {
+        for(ScheduleRealInfo item : list){
+            if(item.getQdzCode().equals(qdzCode)
+                    || item.getQdzName().equals(qdzName))
+                return item;
+        }
+        return null;
+    }
+
     /**
      * 获取所有应发未到的班次
      * @return
      */
     public static Collection<ScheduleRealInfo> allLateSch(){
-        return lateSchMap.values();
+        return lateSchMaps.values();
     }
     public static void remove(ScheduleRealInfo sch){
         try {
-            if(lateSchMap.get(sch.getClZbh()) == sch){
-                lateSchMap.remove(sch.getClZbh());
+            if(lateSchMaps.containsEntry(sch.getClZbh(), sch)){
+                lateSchMaps.remove(sch.getClZbh(), sch);
+
                 sch.setLate2(false);
                 sch.setLateMinute(0);
                 sch.setDfAuto(false);
-                logger.info("移除误点调整 -" + sch.getClZbh());
+                logger.info("移除误点调整 -" + sch.getClZbh() + " -time: " + sch.getDfsj() + " -id: " + sch.getId());
             }
         }catch (Exception e){
             logger.error("", e);
         }
     }
-/*    public static void remove(String nbbm){
-        if(lateSchMap.containsKey(nbbm)){
-            ScheduleRealInfo sch = lateSchMap.get(nbbm);
-            sch.setLate2(false);
-            sch.setLateMinute(0);
-            sch.setDfAuto(false);
-
-            lateSchMap.remove(nbbm);
-            logger.info("移除误点调整 nbbm -" + nbbm);
-        }
-    }*/
-
     /**
      * 车辆到站
      * @param gps
      */
     public static void carArrive(GpsEntity gps){
         try{
-            if(gps.getInstation() != 1)
+            List<ScheduleRealInfo> list = lateSchMaps.get(gps.getNbbm());
+
+            if(null == list || list.size() == 0)
                 return;
-            ScheduleRealInfo sch = lateSchMap.get(gps.getNbbm());
-            if(sch == null)
+            String key = gps.getStopNo();
+            if(gps.getInstation()==1)//站点名称
+                key = gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo();
+
+            gps.setStationName(BasicData.stationCode2NameMap.get(key));
+            //根据起点站获取误点班次
+            ScheduleRealInfo sch = findExistQdz(list, gps.getStopNo(), gps.getStationName());
+
+            if(null == sch)
                 return;
             //可能是延迟信号，gps时间没有误点
             if(gps.getTimestamp() <= sch.getDfsjT()){
                 sch.setLate2(false);
-                lateSchMap.remove(sch.getClZbh());
+                lateSchMaps.remove(sch.getClZbh(), sch);
                 return;
             }
-            //进的是班次起点（名称一样即可）
-            gps.setStationName(BasicData.stationCode2NameMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo()));
+
             if(gps.getStationName().equals(sch.getQdzName())
-                    /*&& sch.getLateMinute() > 0*/){
+                    || gps.getStopNo().equals(sch.getQdzCode())){
+
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                //超过2小时最大阈值，放弃 -临时代码，待删除
-                if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
-                    logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
-                }
-                else{
-                    sch.setDfsjAll(dt);
-                    sch.setDfAuto(true);
-                    //取消应发未到标记
-                    sch.setLate2(false);
-                }
+                sch.setDfsjAll(dt);
+                sch.setDfAuto(true);
+                //取消应发未到标记
+                sch.setLate2(false);
-                lateSchMap.remove(sch.getClZbh());
+                lateSchMaps.remove(sch.getClZbh(), sch);
                 logger.info("【应发未到】车辆到站 " + sch.getClZbh() + " -" + sch.getDfsj() + " -到站时间：" + gps.getTimestamp() + " -停靠时间：" + sch.getLateMinute() + " -自动设置的待发时间：" + dt);
             }
         }catch (Exception e){
@@ -17,9 +17,9 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Collection<ScheduleRealInfo>> findByLines(String lines);
-	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType);
+	Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType,String userId);
-	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/);
+	Map<String, Object> destroy(String idsStr/*, int spaceAdjust*/, String  remarks, String reason/*, int spaceNum*/, String userId);
 	List<Map<String, String>> findDriverByLine(String lineCode);
@@ -135,7 +135,7 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	List<Map<String,Object>> yesterdayDataList(String line);
-	Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs);
+	Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId);
 	Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs);
@@ -229,7 +229,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     private static DateTimeFormatter fmtHHmm = DateTimeFormat.forPattern("HH:mm");
     @Override
-    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType) {
+    public Map<String, Object> outgoAdjust(Long id, String remarks, String dfsj, String bcType, String opType, String userId) {
         Map<String, Object> map = new HashMap<>();
         try {
@@ -251,7 +251,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //记录日志
-            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks);
+            ScheduleModifyLogger.dftz(schedule,opType, schedule.getDfsj(),dfsj,remarks, userId);
             schedule.setDfsjAll(dfsj);
             schedule.setDfAuto(false);
@@ -316,7 +316,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     }
     @Override
-    public Map<String, Object> destroy(String idsStr, /*int spaceAdjust, */String remarks, String reason/*, int spaceNum*/) {
+    public Map<String, Object> destroy(String idsStr, String remarks, String reason, String userId) {
         Map<String, Object> map = new HashMap<>();
         List<ScheduleRealInfo> rsList = new ArrayList<>();
@@ -333,7 +333,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     return map;
                 }
                 //记录日志
-                ScheduleModifyLogger.jhlb(schedule, remarks);
+                ScheduleModifyLogger.jhlb(schedule, remarks, userId);
                 schedule.setAdjustExps(reason);
                 schedule.destroy();
@@ -1354,7 +1354,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     sch = list.get(i);
                     //调整待发
-                    tempRs = outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3");
+                    tempRs = outgoAdjust(sch.getId(), null, fmtHHmm.print(st), null, "3", null);
                     if(null != tempRs && tempRs.get("ts") != null)
                         tempTs = (List<ScheduleRealInfo>) tempRs.get("ts");
@@ -1532,7 +1532,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
              */
             if (map.get("status") != null
                     && Integer.parseInt(map.get("status").toString()) == -1) {
-                destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null);
                 fLog.log("烂班");
             }
@@ -1544,7 +1544,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 double jhlcNum = Double.parseDouble(jhlc);
                 //烂班
                 if(jhlcNum == 0 && sch.getJhlcOrig() != 0 && !sch._isInout() && !sch.isDestroy()){
-                    destroy(sch.getId() + "", "", map.get("adjustExps").toString());
+                    destroy(sch.getId() + "", "", map.get("adjustExps").toString(), null);
                     fLog.log("里程设置为0，自动烂班");
                 }
                 else if(jhlcNum != sch.getJhlc()){
@@ -1600,7 +1600,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                 schedule = dayOfSchedule.get(id);
                 if(schedule != null)
-                    outgoAdjust(id, null, dfsj, null, "2");
+                    outgoAdjust(id, null, dfsj, null, "2", null);
             }
             rs.put("status", ResponseCode.SUCCESS);
@@ -3179,7 +3179,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
      * 批量调整人车
      */
     @Override
-    public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs) {
+    public Map<String, Object> multi_tzrc(List<ChangePersonCar> cpcs, String userId) {
         Map<String, Object> rs = new HashMap<>();
         Set<ScheduleRealInfo> set = new HashSet<>();
@@ -3218,9 +3218,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //为换人换车情况表写入数据
-            schModifyLog.saveChangetochange(sch, cpc);
+            schModifyLog.saveChangetochange(sch, cpc, userId);
             //日志记录
-            ScheduleModifyLogger.tzrc(sch, cpc);
+            ScheduleModifyLogger.tzrc(sch, cpc, userId);
             //换驾驶员
             if (StringUtils.isNotEmpty(cpc.getJsy())) {
@@ -3232,7 +3232,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             //换售票员
-            if (StringUtils.isNotEmpty(cpc.getSpy())) {
+            if (StringUtils.isNotEmpty(cpc.getSpy())
+                    && cpc.getSpy().indexOf("/")!=-1
+                    && cpc.getSpy().length() > 1) {
                 sGh = cpc.getSpy().split("/")[0];
                 sName = getPersonName(sch.getGsBm(), sGh);
                 if(StringUtils.isEmpty(sName)){
@@ -3322,7 +3324,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             if (StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
                 continue;
-            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2");
+            tempMap = outgoAdjust(dc.getSchId(), "", dc.getNew_dfsj(), null, "2", null);
             if (tempMap.get("status").equals(ResponseCode.SUCCESS)) {
                 list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
@@ -6,10 +6,7 @@ import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import javax.persistence.FetchType;
 import javax.persistence.OneToMany;
 import javax.persistence.Transient;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 /**
  * 精简字段的实际排班 entity
@@ -73,7 +70,7 @@ public class WsScheduleRealInfo {
     }
-    public static List<WsScheduleRealInfo> getMultiInstance(List<ScheduleRealInfo> list){
+    public static List<WsScheduleRealInfo> getMultiInstance(Collection<ScheduleRealInfo> list){
         List<WsScheduleRealInfo> rs = new ArrayList<>();
         for(ScheduleRealInfo sch : list){
             rs.add(getInstance(sch));
+/*! UIkit 2.25.0 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+(function(addon) {
+
+    var component;
+
+    if (window.UIkit) {
+        component = addon(UIkit);
+    }
+
+    if (typeof define == "function" && define.amd) { // AMD
+        define("uikit-lightbox", ["uikit"], function(){
+            return component || addon(UIkit);
+        });
+    }
+
+})(function(UI){
+
+    "use strict";
+
+    var modal, cache = {};
+
+    UI.component('lightbox', {
+
+        defaults: {
+            "group"      : false,
+            "duration"   : 400,
+            "keyboard"   : true
+        },
+
+        index : 0,
+        items : false,
+
+        boot: function() {
+
+            UI.$html.on('click', '[data-uk-lightbox]', function(e){
+
+                e.preventDefault();
+
+                var link = UI.$(this);
+
+                if (!link.data("lightbox")) {
+
+                    UI.lightbox(link, UI.Utils.options(link.attr("data-uk-lightbox")));
+                }
+
+                link.data("lightbox").show(link);
+            });
+
+            // keyboard navigation
+            UI.$doc.on('keyup', function(e) {
+
+                if (modal && modal.is(':visible') && modal.lightbox.options.keyboard) {
+
+                    e.preventDefault();
+
+                    switch(e.keyCode) {
+                        case 37:
+                            modal.lightbox.previous();
+                            break;
+                        case 39:
+                            modal.lightbox.next();
+                            break;
+                    }
+                }
+            });
+        },
+
+        init: function() {
+
+            var siblings = [];
+
+            this.index    = 0;
+            this.siblings = [];
+
+            if (this.element && this.element.length) {
+
+                var domSiblings  = this.options.group ? UI.$([
+                    '[data-uk-lightbox*="'+this.options.group+'"]',
+                    "[data-uk-lightbox*='"+this.options.group+"']"
+                ].join(',')) : this.element;
+
+                domSiblings.each(function() {
+
+                    var ele = UI.$(this);
+
+                    siblings.push({
+                        'source': ele.attr('href'),
+                        'title' : ele.attr('data-title') || ele.attr('title'),
+                        'type'  : ele.attr("data-lightbox-type") || 'auto',
+                        'link'  : ele
+                    });
+                });
+
+                this.index    = domSiblings.index(this.element);
+                this.siblings = siblings;
+
+            } else if (this.options.group && this.options.group.length) {
+                this.siblings = this.options.group;
+            }
+
+            this.trigger('lightbox-init', [this]);
+        },
+
+        show: function(index) {
+
+            this.modal = getModal(this);
+
+            // stop previous animation
+            this.modal.dialog.stop();
+            this.modal.content.stop();
+
+            var $this = this, promise = UI.$.Deferred(), data, item;
+
+            index = index || 0;
+
+            // index is a jQuery object or DOM element
+            if (typeof(index) == 'object') {
+
+                this.siblings.forEach(function(s, idx){
+
+                    if (index[0] === s.link[0]) {
+                        index = idx;
+                    }
+                });
+            }
+
+            // fix index if needed
+            if ( index < 0 ) {
+                index = this.siblings.length - index;
+            } else if (!this.siblings[index]) {
+                index = 0;
+            }
+
+            item   = this.siblings[index];
+
+            data = {
+                "lightbox" : $this,
+                "source"   : item.source,
+                "type"     : item.type,
+                "index"    : index,
+                "promise"  : promise,
+                "title"    : item.title,
+                "item"     : item,
+                "meta"     : {
+                    "content" : '',
+                    "width"   : null,
+                    "height"  : null
+                }
+            };
+
+            this.index = index;
+
+            this.modal.content.empty();
+
+            if (!this.modal.is(':visible')) {
+                this.modal.content.css({width:'', height:''}).empty();
+                this.modal.modal.show();
+            }
+
+            this.modal.loader.removeClass('uk-hidden');
+
+            promise.promise().done(function() {
+
+                $this.data = data;
+                $this.fitSize(data);
+
+            }).fail(function(){
+
+                data.meta.content = '<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>';
+                data.meta.width   = 400;
+                data.meta.height  = 300;
+
+                $this.data = data;
+                $this.fitSize(data);
+            });
+
+            $this.trigger('showitem.uk.lightbox', [data]);
+        },
+
+        fitSize: function() {
+
+            var $this    = this,
+                data     = this.data,
+                pad      = this.modal.dialog.outerWidth() - this.modal.dialog.width(),
+                dpadTop  = parseInt(this.modal.dialog.css('margin-top'), 10),
+                dpadBot  = parseInt(this.modal.dialog.css('margin-bottom'), 10),
+                dpad     = dpadTop + dpadBot,
+                content  = data.meta.content,
+                duration = $this.options.duration;
+
+            if (this.siblings.length > 1) {
+
+                content = [
+                    content,
+                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>',
+                    '<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'
+                ].join('');
+            }
+
+            // calculate width
+            var tmp = UI.$('<div>&nbsp;</div>').css({
+                'opacity'   : 0,
+                'position'  : 'absolute',
+                'top'       : 0,
+                'left'      : 0,
+                'width'     : '100%',
+                'max-width' : $this.modal.dialog.css('max-width'),
+                'padding'   : $this.modal.dialog.css('padding'),
+                'margin'    : $this.modal.dialog.css('margin')
+            }), maxwidth, maxheight, w = data.meta.width, h = data.meta.height;
+
+            tmp.appendTo('body').width();
+
+            maxwidth  = tmp.width();
+            maxheight = window.innerHeight - dpad;
+
+            tmp.remove();
+
+            this.modal.dialog.find('.uk-modal-caption').remove();
+
+            if (data.title) {
+                this.modal.dialog.append('<div class="uk-modal-caption">'+data.title+'</div>');
+                maxheight -= this.modal.dialog.find('.uk-modal-caption').outerHeight();
+            }
+
+            if (maxwidth < data.meta.width) {
+
+                h = Math.floor( h * (maxwidth / w) );
+                w = maxwidth;
+            }
+
+            if (maxheight < h) {
+
+                h = Math.floor(maxheight);
+                w = Math.ceil(data.meta.width * (maxheight/data.meta.height));
+            }
+
+            this.modal.content.css('opacity', 0).width(w).html(content);
+
+            if (data.type == 'iframe') {
+                this.modal.content.find('iframe:first').height(h);
+            }
+
+            var dh   = h + pad,
+                t    = Math.floor(window.innerHeight/2 - dh/2) - dpad;
+
+            if (t < 0) { t = 0; }
+
+            this.modal.closer.addClass('uk-hidden');
+
+            if ($this.modal.data('mwidth') == w &&  $this.modal.data('mheight') == h) {
+                duration = 0;
+            }
+
+            this.modal.dialog.animate({width: w + pad, height: h + pad, top: t }, duration, 'swing', function() {
+                $this.modal.loader.addClass('uk-hidden');
+                $this.modal.content.css({width:''}).animate({'opacity': 1}, function() {
+                    $this.modal.closer.removeClass('uk-hidden');
+                });
+
+                $this.modal.data({'mwidth': w, 'mheight': h});
+            });
+        },
+
+        next: function() {
+            this.show(this.siblings[(this.index+1)] ? (this.index+1) : 0);
+        },
+
+        previous: function() {
+            this.show(this.siblings[(this.index-1)] ? (this.index-1) : this.siblings.length-1);
+        }
+    });
+
+
+    // Plugins
+
+    UI.plugin('lightbox', 'image', {
+
+        init: function(lightbox) {
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                if (data.type == 'image' || data.source && data.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)) {
+
+                    var resolve = function(source, width, height) {
+
+                        data.meta = {
+                            "content" : '<img class="uk-responsive-width" width="'+width+'" height="'+height+'" src ="'+source+'">',
+                            "width"   : width,
+                            "height"  : height
+                        };
+
+                        data.type = 'image';
+
+                        data.promise.resolve();
+                    };
+
+                    if (!cache[data.source]) {
+
+                        var img = new Image();
+
+                        img.onerror = function(){
+                            data.promise.reject('Loading image failed');
+                        };
+
+                        img.onload = function(){
+                            cache[data.source] = {width: img.width, height: img.height};
+                            resolve(data.source, cache[data.source].width, cache[data.source].height);
+                        };
+
+                        img.src = data.source;
+
+                    } else {
+                        resolve(data.source, cache[data.source].width, cache[data.source].height);
+                    }
+                }
+            });
+        }
+    });
+
+    UI.plugin("lightbox", "youtube", {
+
+        init: function(lightbox) {
+
+            var youtubeRegExp = /(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,
+                youtubeRegExpShort = /youtu\.be\/(.*)/;
+
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                var id, matches, resolve = function(id, width, height) {
+
+                    data.meta = {
+                        'content': '<iframe src="//www.youtube.com/embed/'+id+'" width="'+width+'" height="'+height+'" style="max-width:100%;"></iframe>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'iframe';
+
+                    data.promise.resolve();
+                };
+
+                if (matches = data.source.match(youtubeRegExp)) {
+                    id = matches[2];
+                }
+
+                if (matches = data.source.match(youtubeRegExpShort)) {
+                    id = matches[1];
+                }
+
+                if (id) {
+
+                    if(!cache[id]) {
+
+                        var img = new Image(), lowres = false;
+
+                        img.onerror = function(){
+                            cache[id] = {width:640, height:320};
+                            resolve(id, cache[id].width, cache[id].height);
+                        };
+
+                        img.onload = function(){
+                            //youtube default 404 thumb, fall back to lowres
+                            if (img.width == 120 && img.height == 90) {
+                                if (!lowres) {
+                                    lowres = true;
+                                    img.src = '//img.youtube.com/vi/' + id + '/0.jpg';
+                                } else {
+                                    cache[id] = {width: 640, height: 320};
+                                    resolve(id, cache[id].width, cache[id].height);
+                                }
+                            } else {
+                                cache[id] = {width: img.width, height: img.height};
+                                resolve(id, img.width, img.height);
+                            }
+                        };
+
+                        img.src = '//img.youtube.com/vi/'+id+'/maxresdefault.jpg';
+
+                    } else {
+                        resolve(id, cache[id].width, cache[id].height);
+                    }
+
+                    e.stopImmediatePropagation();
+                }
+            });
+        }
+    });
+
+
+    UI.plugin("lightbox", "vimeo", {
+
+        init: function(lightbox) {
+
+            var regex = /(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/, matches;
+
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+                var id, resolve = function(id, width, height) {
+
+                    data.meta = {
+                        'content': '<iframe src="//player.vimeo.com/video/'+id+'" width="'+width+'" height="'+height+'" style="width:100%;box-sizing:border-box;"></iframe>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'iframe';
+
+                    data.promise.resolve();
+                };
+
+                if (matches = data.source.match(regex)) {
+
+                    id = matches[2];
+
+                    if(!cache[id]) {
+
+                        UI.$.ajax({
+                            type     : 'GET',
+                            url      : 'http://vimeo.com/api/oembed.json?url=' + encodeURI(data.source),
+                            jsonp    : 'callback',
+                            dataType : 'jsonp',
+                            success  : function(data) {
+                                cache[id] = {width:data.width, height:data.height};
+                                resolve(id, cache[id].width, cache[id].height);
+                            }
+                        });
+
+                    } else {
+                        resolve(id, cache[id].width, cache[id].height);
+                    }
+
+                    e.stopImmediatePropagation();
+                }
+            });
+        }
+    });
+
+    UI.plugin("lightbox", "video", {
+
+        init: function(lightbox) {
+
+            lightbox.on("showitem.uk.lightbox", function(e, data){
+
+
+                var resolve = function(source, width, height) {
+
+                    data.meta = {
+                        'content': '<video class="uk-responsive-width" src="'+source+'" width="'+width+'" height="'+height+'" controls></video>',
+                        'width': width,
+                        'height': height
+                    };
+
+                    data.type = 'video';
+
+                    data.promise.resolve();
+                };
+
+                if (data.type == 'video' || data.source.match(/\.(mp4|webm|ogv)$/i)) {
+
+                    if (!cache[data.source]) {
+
+                        var vid = UI.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr('src', data.source).appendTo('body');
+
+                        var idle = setInterval(function() {
+
+                            if (vid[0].videoWidth) {
+                                clearInterval(idle);
+                                cache[data.source] = {width: vid[0].videoWidth, height: vid[0].videoHeight};
+                                resolve(data.source, cache[data.source].width, cache[data.source].height);
+                                vid.remove();
+                            }
+
+                        }, 20);
+
+                    } else {
+                        resolve(data.source, cache[data.source].width, cache[data.source].height);
+                    }
+                }
+            });
+        }
+    });
+
+
+    function getModal(lightbox) {
+
+        if (modal) {
+            modal.lightbox = lightbox;
+            return modal;
+        }
+
+        // init lightbox container
+        modal = UI.$([
+            '<div class="uk-modal">',
+                '<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2 - 200)+'px;">',
+                    '<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>',
+                    '<div class="uk-lightbox-content"></div>',
+                    '<div class="uk-modal-spinner uk-hidden"></div>',
+                '</div>',
+            '</div>'
+        ].join('')).appendTo('body');
+
+        modal.dialog  = modal.find('.uk-modal-dialog:first');
+        modal.content = modal.find('.uk-lightbox-content:first');
+        modal.loader  = modal.find('.uk-modal-spinner:first');
+        modal.closer  = modal.find('.uk-close.uk-close-alt');
+        modal.modal   = UI.modal(modal, {modal:false, bgclose: false});
+
+        // next / previous
+/*        modal.on("swipeRight swipeLeft", function(e) {
+            modal.lightbox[e.type=='swipeLeft' ? 'next':'previous']();
+        }).on("click", "[data-lightbox-previous], [data-lightbox-next]", function(e){
+            e.preventDefault();
+            modal.lightbox[UI.$(this).is('[data-lightbox-next]') ? 'next':'previous']();
+        });*/
+
+        // destroy content on modal hide
+        modal.on("hide.uk.modal", function(e) {
+            modal.content.html('');
+        });
+
+        UI.$win.on('load resize orientationchange', UI.Utils.debounce(function(e){
+            if (modal.is(':visible') && !UI.Utils.isFullscreen()) modal.lightbox.fitSize();
+        }.bind(this), 100));
+
+        modal.lightbox = lightbox;
+
+        return modal;
+    }
+
+    UI.lightbox.create = function(items, options) {
+
+        if (!items) return;
+
+        var group = [], o;
+
+        items.forEach(function(item) {
+
+            group.push(UI.$.extend({
+                'source' : '',
+                'title'  : '',
+                'type'   : 'auto',
+                'link'   : false
+            }, (typeof(item) == 'string' ? {'source': item} : item)));
+        });
+
+        o = UI.lightbox(UI.$.extend({}, options, {'group':group}));
+
+        return o;
+    };
+
+    return UI.lightbox;
+});
-/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
-!function(i){var t;window.UIkit&&(t=i(UIkit)),"function"==typeof define&&define.amd&&define("uikit-lightbox",["uikit"],function(){return t||i(UIkit)})}(function(i){"use strict";function t(t){if(e)return e.lightbox=t,e;e=i.$(['<div class="uk-modal">','<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2-200)+'px;">','<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>','<div class="uk-lightbox-content"></div>','<div class="uk-modal-spinner uk-hidden"></div>',"</div>","</div>"].join("")).appendTo("body"),e.dialog=e.find(".uk-modal-dialog:first"),e.content=e.find(".uk-lightbox-content:first"),e.loader=e.find(".uk-modal-spinner:first"),e.closer=e.find(".uk-close.uk-close-alt"),e.modal=i.modal(e,{modal:!1}),e.on("swipeRight swipeLeft",function(i){e.lightbox["swipeLeft"==i.type?"next":"previous"]()}).on("click","[data-lightbox-previous], [data-lightbox-next]",function(t){t.preventDefault(),e.lightbox[i.$(this).is("[data-lightbox-next]")?"next":"previous"]()}),e.on("hide.uk.modal",function(){e.content.html("")});var o={w:window.innerWidth,h:window.innerHeight};return i.$win.on("load resize orientationchange",i.Utils.debounce(function(){o.w!==window.innerWidth&&e.is(":visible")&&!i.Utils.isFullscreen()&&e.lightbox.fitSize(),o={w:window.innerWidth,h:window.innerHeight}},100)),e.lightbox=t,e}var e,o={};return i.component("lightbox",{defaults:{allowfullscreen:!0,duration:400,group:!1,keyboard:!0},index:0,items:!1,boot:function(){i.$html.on("click","[data-uk-lightbox]",function(t){t.preventDefault();var e=i.$(this);e.data("lightbox")||i.lightbox(e,i.Utils.options(e.attr("data-uk-lightbox"))),e.data("lightbox").show(e)}),i.$doc.on("keyup",function(i){if(e&&e.is(":visible")&&e.lightbox.options.keyboard)switch(i.preventDefault(),i.keyCode){case 37:e.lightbox.previous();break;case 39:e.lightbox.next()}})},init:function(){var t=[];if(this.index=0,this.siblings=[],this.element&&this.element.length){var e=this.options.group?i.$(['[data-uk-lightbox*="'+this.options.group+'"]',"[data-uk-lightbox*='"+this.options.group+"']"].join(",")):this.element;e.each(function(){var e=i.$(this);t.push({source:e.attr("href"),title:e.attr("data-title")||e.attr("title"),type:e.attr("data-lightbox-type")||"auto",link:e})}),this.index=e.index(this.element),this.siblings=t}else this.options.group&&this.options.group.length&&(this.siblings=this.options.group);this.trigger("lightbox-init",[this])},show:function(e){this.modal=t(this),this.modal.dialog.stop(),this.modal.content.stop();var o,n,s=this,h=i.$.Deferred();e=e||0,"object"==typeof e&&this.siblings.forEach(function(i,t){e[0]===i.link[0]&&(e=t)}),0>e?e=this.siblings.length-e:this.siblings[e]||(e=0),n=this.siblings[e],o={lightbox:s,source:n.source,type:n.type,index:e,promise:h,title:n.title,item:n,meta:{content:"",width:null,height:null}},this.index=e,this.modal.content.empty(),this.modal.is(":visible")||(this.modal.content.css({width:"",height:""}).empty(),this.modal.modal.show()),this.modal.loader.removeClass("uk-hidden"),h.promise().done(function(){s.data=o,s.fitSize(o)}).fail(function(){o.meta.content='<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>',o.meta.width=400,o.meta.height=300,s.data=o,s.fitSize(o)}),s.trigger("showitem.uk.lightbox",[o])},fitSize:function(){var t=this,e=this.data,o=this.modal.dialog.outerWidth()-this.modal.dialog.width(),n=parseInt(this.modal.dialog.css("margin-top"),10),s=parseInt(this.modal.dialog.css("margin-bottom"),10),h=n+s,a=e.meta.content,l=t.options.duration;this.siblings.length>1&&(a=[a,'<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>','<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'].join(""));var d,r,u=i.$("<div>&nbsp;</div>").css({opacity:0,position:"absolute",top:0,left:0,width:"100%","max-width":t.modal.dialog.css("max-width"),padding:t.modal.dialog.css("padding"),margin:t.modal.dialog.css("margin")}),c=e.meta.width,g=e.meta.height;u.appendTo("body").width(),d=u.width(),r=window.innerHeight-h,u.remove(),this.modal.dialog.find(".uk-modal-caption").remove(),e.title&&(this.modal.dialog.append('<div class="uk-modal-caption">'+e.title+"</div>"),r-=this.modal.dialog.find(".uk-modal-caption").outerHeight()),d<e.meta.width&&(g=Math.floor(g*(d/c)),c=d),g>r&&(g=Math.floor(r),c=Math.ceil(e.meta.width*(r/e.meta.height))),this.modal.content.css("opacity",0).width(c).html(a),"iframe"==e.type&&this.modal.content.find("iframe:first").height(g);var m=g+o,p=Math.floor(window.innerHeight/2-m/2)-h;0>p&&(p=0),this.modal.closer.addClass("uk-hidden"),t.modal.data("mwidth")==c&&t.modal.data("mheight")==g&&(l=0),this.modal.dialog.animate({width:c+o,height:g+o,top:p},l,"swing",function(){t.modal.loader.addClass("uk-hidden"),t.modal.content.css({width:""}).animate({opacity:1},function(){t.modal.closer.removeClass("uk-hidden")}),t.modal.data({mwidth:c,mheight:g})})},next:function(){this.show(this.siblings[this.index+1]?this.index+1:0)},previous:function(){this.show(this.siblings[this.index-1]?this.index-1:this.siblings.length-1)}}),i.plugin("lightbox","image",{init:function(i){i.on("showitem.uk.lightbox",function(i,t){if("image"==t.type||t.source&&t.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)){var e=function(i,e,o){t.meta={content:'<img class="uk-responsive-width" width="'+e+'" height="'+o+'" src ="'+i+'">',width:e,height:o},t.type="image",t.promise.resolve()};if(o[t.source])e(t.source,o[t.source].width,o[t.source].height);else{var n=new Image;n.onerror=function(){t.promise.reject("Loading image failed")},n.onload=function(){o[t.source]={width:n.width,height:n.height},e(t.source,o[t.source].width,o[t.source].height)},n.src=t.source}}})}}),i.plugin("lightbox","youtube",{init:function(i){var t=/(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,n=/youtu\.be\/(.*)/;i.on("showitem.uk.lightbox",function(i,s){var h,a,l=function(i,t,o){s.meta={content:'<iframe src="//www.youtube.com/embed/'+i+'" width="'+t+'" height="'+o+'" style="max-width:100%;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},s.type="iframe",s.promise.resolve()};if((a=s.source.match(t))&&(h=a[2]),(a=s.source.match(n))&&(h=a[1]),h){if(o[h])l(h,o[h].width,o[h].height);else{var d=new Image,r=!1;d.onerror=function(){o[h]={width:640,height:320},l(h,o[h].width,o[h].height)},d.onload=function(){120==d.width&&90==d.height?r?(o[h]={width:640,height:320},l(h,o[h].width,o[h].height)):(r=!0,d.src="//img.youtube.com/vi/"+h+"/0.jpg"):(o[h]={width:d.width,height:d.height},l(h,d.width,d.height))},d.src="//img.youtube.com/vi/"+h+"/maxresdefault.jpg"}i.stopImmediatePropagation()}})}}),i.plugin("lightbox","vimeo",{init:function(t){var n,s=/(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/;t.on("showitem.uk.lightbox",function(t,h){var a,l=function(i,t,o){h.meta={content:'<iframe src="//player.vimeo.com/video/'+i+'" width="'+t+'" height="'+o+'" style="width:100%;box-sizing:border-box;"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:o},h.type="iframe",h.promise.resolve()};(n=h.source.match(s))&&(a=n[2],o[a]?l(a,o[a].width,o[a].height):i.$.ajax({type:"GET",url:"//vimeo.com/api/oembed.json?url="+encodeURI(h.source),jsonp:"callback",dataType:"jsonp",success:function(i){o[a]={width:i.width,height:i.height},l(a,o[a].width,o[a].height)}}),t.stopImmediatePropagation())})}}),i.plugin("lightbox","video",{init:function(t){t.on("showitem.uk.lightbox",function(t,e){var n=function(i,t,o){e.meta={content:'<video class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+o+'" controls></video>',width:t,height:o},e.type="video",e.promise.resolve()};if("video"==e.type||e.source.match(/\.(mp4|webm|ogv)$/i))if(o[e.source])n(e.source,o[e.source].width,o[e.source].height);else var s=i.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr("src",e.source).appendTo("body"),h=setInterval(function(){s[0].videoWidth&&(clearInterval(h),o[e.source]={width:s[0].videoWidth,height:s[0].videoHeight},n(e.source,o[e.source].width,o[e.source].height),s.remove())},20)})}}),UIkit.plugin("lightbox","iframe",{init:function(i){i.on("showitem.uk.lightbox",function(t,o){var n=function(i,t,n){o.meta={content:'<iframe class="uk-responsive-width" src="'+i+'" width="'+t+'" height="'+n+'"'+(e.lightbox.options.allowfullscreen?" allowfullscreen":"")+"></iframe>",width:t,height:n},o.type="iframe",o.promise.resolve()};("iframe"===o.type||o.source.match(/\.(html|php)$/))&&n(o.source,i.options.width||800,i.options.height||600)})}}),i.lightbox.create=function(t,e){if(t){var o,n=[];return t.forEach(function(t){n.push(i.$.extend({source:"",title:"",type:"auto",link:!1},"string"==typeof t?{source:t}:t))}),o=i.lightbox(i.$.extend({},e,{group:n}))}},i.lightbox});
 \ No newline at end of file
+(function(addon){var component;if(window.UIkit){component=addon(UIkit)}if(typeof define=="function"&&define.amd){define("uikit-lightbox",["uikit"],function(){return component||addon(UIkit)})}})(function(UI){"use strict";var modal,cache={};UI.component('lightbox',{defaults:{"group":false,"duration":400,"keyboard":true},index:0,items:false,boot:function(){UI.$html.on('click','[data-uk-lightbox]',function(e){e.preventDefault();var link=UI.$(this);if(!link.data("lightbox")){UI.lightbox(link,UI.Utils.options(link.attr("data-uk-lightbox")))}link.data("lightbox").show(link)});UI.$doc.on('keyup',function(e){if(modal&&modal.is(':visible')&&modal.lightbox.options.keyboard){e.preventDefault();switch(e.keyCode){case 37:modal.lightbox.previous();break;case 39:modal.lightbox.next();break}}})},init:function(){var siblings=[];this.index=0;this.siblings=[];if(this.element&&this.element.length){var domSiblings=this.options.group?UI.$(['[data-uk-lightbox*="'+this.options.group+'"]',"[data-uk-lightbox*='"+this.options.group+"']"].join(',')):this.element;domSiblings.each(function(){var ele=UI.$(this);siblings.push({'source':ele.attr('href'),'title':ele.attr('data-title')||ele.attr('title'),'type':ele.attr("data-lightbox-type")||'auto','link':ele})});this.index=domSiblings.index(this.element);this.siblings=siblings}else if(this.options.group&&this.options.group.length){this.siblings=this.options.group}this.trigger('lightbox-init',[this])},show:function(index){this.modal=getModal(this);this.modal.dialog.stop();this.modal.content.stop();var $this=this,promise=UI.$.Deferred(),data,item;index=index||0;if(typeof(index)=='object'){this.siblings.forEach(function(s,idx){if(index[0]===s.link[0]){index=idx}})}if(index<0){index=this.siblings.length-index}else if(!this.siblings[index]){index=0}item=this.siblings[index];data={"lightbox":$this,"source":item.source,"type":item.type,"index":index,"promise":promise,"title":item.title,"item":item,"meta":{"content":'',"width":null,"height":null}};this.index=index;this.modal.content.empty();if(!this.modal.is(':visible')){this.modal.content.css({width:'',height:''}).empty();this.modal.modal.show()}this.modal.loader.removeClass('uk-hidden');promise.promise().done(function(){$this.data=data;$this.fitSize(data)}).fail(function(){data.meta.content='<div class="uk-position-cover uk-flex uk-flex-middle uk-flex-center"><strong>Loading resource failed!</strong></div>';data.meta.width=400;data.meta.height=300;$this.data=data;$this.fitSize(data)});$this.trigger('showitem.uk.lightbox',[data])},fitSize:function(){var $this=this,data=this.data,pad=this.modal.dialog.outerWidth()-this.modal.dialog.width(),dpadTop=parseInt(this.modal.dialog.css('margin-top'),10),dpadBot=parseInt(this.modal.dialog.css('margin-bottom'),10),dpad=dpadTop+dpadBot,content=data.meta.content,duration=$this.options.duration;if(this.siblings.length>1){content=[content,'<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-previous uk-hidden-touch" data-lightbox-previous></a>','<a href="#" class="uk-slidenav uk-slidenav-contrast uk-slidenav-next uk-hidden-touch" data-lightbox-next></a>'].join('')}var tmp=UI.$('<div>&nbsp;</div>').css({'opacity':0,'position':'absolute','top':0,'left':0,'width':'100%','max-width':$this.modal.dialog.css('max-width'),'padding':$this.modal.dialog.css('padding'),'margin':$this.modal.dialog.css('margin')}),maxwidth,maxheight,w=data.meta.width,h=data.meta.height;tmp.appendTo('body').width();maxwidth=tmp.width();maxheight=window.innerHeight-dpad;tmp.remove();this.modal.dialog.find('.uk-modal-caption').remove();if(data.title){this.modal.dialog.append('<div class="uk-modal-caption">'+data.title+'</div>');maxheight-=this.modal.dialog.find('.uk-modal-caption').outerHeight()}if(maxwidth<data.meta.width){h=Math.floor(h*(maxwidth/w));w=maxwidth}if(maxheight<h){h=Math.floor(maxheight);w=Math.ceil(data.meta.width*(maxheight/data.meta.height))}this.modal.content.css('opacity',0).width(w).html(content);if(data.type=='iframe'){this.modal.content.find('iframe:first').height(h)}var dh=h+pad,t=Math.floor(window.innerHeight/2-dh/2)-dpad;if(t<0){t=0}this.modal.closer.addClass('uk-hidden');if($this.modal.data('mwidth')==w&&$this.modal.data('mheight')==h){duration=0}this.modal.dialog.animate({width:w+pad,height:h+pad,top:t},duration,'swing',function(){$this.modal.loader.addClass('uk-hidden');$this.modal.content.css({width:''}).animate({'opacity':1},function(){$this.modal.closer.removeClass('uk-hidden')});$this.modal.data({'mwidth':w,'mheight':h})})},next:function(){this.show(this.siblings[(this.index+1)]?(this.index+1):0)},previous:function(){this.show(this.siblings[(this.index-1)]?(this.index-1):this.siblings.length-1)}});UI.plugin('lightbox','image',{init:function(lightbox){lightbox.on("showitem.uk.lightbox",function(e,data){if(data.type=='image'||data.source&&data.source.match(/\.(jpg|jpeg|png|gif|svg)$/i)){var resolve=function(source,width,height){data.meta={"content":'<img class="uk-responsive-width" width="'+width+'" height="'+height+'" src ="'+source+'">',"width":width,"height":height};data.type='image';data.promise.resolve()};if(!cache[data.source]){var img=new Image();img.onerror=function(){data.promise.reject('Loading image failed')};img.onload=function(){cache[data.source]={width:img.width,height:img.height};resolve(data.source,cache[data.source].width,cache[data.source].height)};img.src=data.source}else{resolve(data.source,cache[data.source].width,cache[data.source].height)}}})}});UI.plugin("lightbox","youtube",{init:function(lightbox){var youtubeRegExp=/(\/\/.*?youtube\.[a-z]+)\/watch\?v=([^&]+)&?(.*)/,youtubeRegExpShort=/youtu\.be\/(.*)/;lightbox.on("showitem.uk.lightbox",function(e,data){var id,matches,resolve=function(id,width,height){data.meta={'content':'<iframe src="//www.youtube.com/embed/'+id+'" width="'+width+'" height="'+height+'" style="max-width:100%;"></iframe>','width':width,'height':height};data.type='iframe';data.promise.resolve()};if(matches=data.source.match(youtubeRegExp)){id=matches[2]}if(matches=data.source.match(youtubeRegExpShort)){id=matches[1]}if(id){if(!cache[id]){var img=new Image(),lowres=false;img.onerror=function(){cache[id]={width:640,height:320};resolve(id,cache[id].width,cache[id].height)};img.onload=function(){if(img.width==120&&img.height==90){if(!lowres){lowres=true;img.src='//img.youtube.com/vi/'+id+'/0.jpg'}else{cache[id]={width:640,height:320};resolve(id,cache[id].width,cache[id].height)}}else{cache[id]={width:img.width,height:img.height};resolve(id,img.width,img.height)}};img.src='//img.youtube.com/vi/'+id+'/maxresdefault.jpg'}else{resolve(id,cache[id].width,cache[id].height)}e.stopImmediatePropagation()}})}});UI.plugin("lightbox","vimeo",{init:function(lightbox){var regex=/(\/\/.*?)vimeo\.[a-z]+\/([0-9]+).*?/,matches;lightbox.on("showitem.uk.lightbox",function(e,data){var id,resolve=function(id,width,height){data.meta={'content':'<iframe src="//player.vimeo.com/video/'+id+'" width="'+width+'" height="'+height+'" style="width:100%;box-sizing:border-box;"></iframe>','width':width,'height':height};data.type='iframe';data.promise.resolve()};if(matches=data.source.match(regex)){id=matches[2];if(!cache[id]){UI.$.ajax({type:'GET',url:'http://vimeo.com/api/oembed.json?url='+encodeURI(data.source),jsonp:'callback',dataType:'jsonp',success:function(data){cache[id]={width:data.width,height:data.height};resolve(id,cache[id].width,cache[id].height)}})}else{resolve(id,cache[id].width,cache[id].height)}e.stopImmediatePropagation()}})}});UI.plugin("lightbox","video",{init:function(lightbox){lightbox.on("showitem.uk.lightbox",function(e,data){var resolve=function(source,width,height){data.meta={'content':'<video class="uk-responsive-width" src="'+source+'" width="'+width+'" height="'+height+'" controls></video>','width':width,'height':height};data.type='video';data.promise.resolve()};if(data.type=='video'||data.source.match(/\.(mp4|webm|ogv)$/i)){if(!cache[data.source]){var vid=UI.$('<video style="position:fixed;visibility:hidden;top:-10000px;"></video>').attr('src',data.source).appendTo('body');var idle=setInterval(function(){if(vid[0].videoWidth){clearInterval(idle);cache[data.source]={width:vid[0].videoWidth,height:vid[0].videoHeight};resolve(data.source,cache[data.source].width,cache[data.source].height);vid.remove()}},20)}else{resolve(data.source,cache[data.source].width,cache[data.source].height)}}})}});function getModal(lightbox){if(modal){modal.lightbox=lightbox;return modal}modal=UI.$(['<div class="uk-modal">','<div class="uk-modal-dialog uk-modal-dialog-lightbox uk-slidenav-position" style="margin-left:auto;margin-right:auto;width:200px;height:200px;top:'+Math.abs(window.innerHeight/2-200)+'px;">','<a href="#" class="uk-modal-close uk-close uk-close-alt"></a>','<div class="uk-lightbox-content"></div>','<div class="uk-modal-spinner uk-hidden"></div>','</div>','</div>'].join('')).appendTo('body');modal.dialog=modal.find('.uk-modal-dialog:first');modal.content=modal.find('.uk-lightbox-content:first');modal.loader=modal.find('.uk-modal-spinner:first');modal.closer=modal.find('.uk-close.uk-close-alt');modal.modal=UI.modal(modal,{modal:false,bgclose:false});modal.on("hide.uk.modal",function(e){modal.content.html('')});UI.$win.on('load resize orientationchange',UI.Utils.debounce(function(e){if(modal.is(':visible')&&!UI.Utils.isFullscreen())modal.lightbox.fitSize()}.bind(this),100));modal.lightbox=lightbox;return modal}UI.lightbox.create=function(items,options){if(!items)return;var group=[],o;items.forEach(function(item){group.push(UI.$.extend({'source':'','title':'','type':'auto','link':false},(typeof(item)=='string'?{'source':item}:item)))});o=UI.lightbox(UI.$.extend({},options,{'group':group}));return o};return UI.lightbox});
 \ No newline at end of file
@@ -936,17 +936,25 @@ option.oil_station_opt {
 }
 .park-and-station-wrap {
-    margin-top: 9px;
-    border: 1px solid #3dce69;
+    margin-top: 25px;
+    border: 1px solid #b9b9b9;
     width: 580px;
     padding: 12px;
     border-radius: 5px;
+    box-shadow: 0 2px 5px rgba(0,0,0,.1);
+    margin-bottom: 15px;
 }
 .park-and-station-wrap select {
     width: auto !important;
 }
+.park-and-station-wrap>span{
+    vertical-align: middle;
+    margin-top: 9px;
+    display: inline-block;
+}
+
 /** 安全驾驶相关css */
 .safe_driv_pop_wrap {
     position: absolute;
@@ -330,6 +330,8 @@
     padding-top: 20px;
     overflow: auto;
     padding-bottom: 20px;
+    position: relative;
+    padding-left: 45px;
 }
 #nav-line_config-modal select,
@@ -500,4 +502,43 @@ span.sm-red{
 span.sm-grey{
     font-size: 12px;
     color: grey;
+}
+
+.voip_call_info_panel{
+    width: 258px;
+    background: #ffffff;
+    display: inline-block;
+    vertical-align: bottom;
+    border-left: 1px solid #d8cece;
+}
+
+.uk-lightbox-content>img{
+    display: inline-block;
+}
+
+.voip_call_info_panel form{
+    padding: 15px 15px 0 15px;
+    vertical-align: bottom;
+}
+
+.voip_call_info_panel .uk-form-horizontal .uk-form-label{
+    width: 70px;
+}
+
+.voip_call_info_panel .uk-form-horizontal .uk-form-controls{
+    margin-left: 72px;
+}
+
+.voip_call_info_panel .state_txt{
+    text-align: center;
+}
+
+.voip_call_info_panel ._title{
+    padding: 15px;
+    background: #e6e6e6;
+}
+
+#line_config_entity_wrap .uk-list{
+    display: block;
+    margin-top: 25px;
 }
 \ No newline at end of file
@@ -108,13 +108,13 @@
     </script>
     <script id="park-and-station-temp" type="text/html">
-        停车场
+        <span>停车场</span>
         <select class="z-depth-input" name="twinsPark">
             {{each parks as p i}}
             <option value="{{p.code}}" {{if p.code==conf.twinsPark}}selected{{/if}}>{{p.name}}</option>
             {{/each}}
         </select>
-        既是站点
+        <span>&nbsp;既是站点</span>
         <select class="z-depth-input" name="twinsStation">
             {{each routes as r i}}
             <option value="{{r.stationCode}}" {{if r.stationCode==conf.twinsStation}}selected{{/if}}>{{r.stationName}}
@@ -79,7 +79,7 @@
                 <a class="image_link" href="{{sd.url}}.gif" data-uk-lightbox="{group:'gif_group2'}" title="{{sd.title}}">查看</a>
             </td>
             <td>
-                <a data-type="{{sd.yczltype}}" class="show_vedio_modal">DVR</a>
+                <a data-type="{{sd.yczltype}}" class="show_vedio_modal" style="color: grey">DVR</a>
             </td>
         </tr>
         {{/each}}
@@ -136,7 +136,11 @@
                         url = stm.format('YYYYMMDD')+'/'+p+'/'+p;
                         this.url = gb_safe_driv.urlPath + url;
                         //title
-                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText;
+                        var call_btn_html = '<button class="uk-button uk-button-mini uk-button-primary" ' +
+                                'id="m_voip_call_btn_001" ' +
+                                'type="button" ' +
+                                'data-nbbm="'+this.clzbh+'">打电话</button>';
+                        this.title = this.clzbh+' '+stm.format('HH时mm分ss秒')+' '+this.yczlText + '&nbsp;' + call_btn_html;
                     });
                     var bodyHtml = template('all-safe_dring-table-temp', {
@@ -163,14 +163,12 @@ var gb_schedule_table = (function () {
     //计算实发时间差值
     var calc_sch_real_shift = function (sch) {
         if (sch['fcsjActualTime']){
-            var diff = sch['fcsjActualTime'] - sch['dfsjT'], fcsj_diff;
-            fcsj_diff = parseInt(diff / 60000, 10);
-            if(diff % 60000 != 0){
-                /*if(fcsj_diff > 0)
-                    fcsj_diff ++;
-                else */if(fcsj_diff < 0)
-                    fcsj_diff --;
-            }
+            var fs = 'YYYY-MM-DD HH:mm'
+                ,m1 = moment(sch['fcsjActualTime']).format(fs)
+                ,m2 = moment(sch['dfsjT']).format(fs);//去掉秒
+
+            var diff = moment(m1, fs).format('X') - moment(m2, fs).format('X')
+                ,fcsj_diff = parseInt(diff / 60, 10);;
             if(fcsj_diff > 0)
                 sch.fcsj_diff = '( +' + fcsj_diff + ' )';
@@ -181,8 +179,6 @@ var gb_schedule_table = (function () {
         }
     };
-
-
     function arrayIsNull(array) {
         return !array || array.length == 0;
     }
@@ -2,6 +2,7 @@
 $(document).on('hide.uk.modal', '.uk-modal', function () {
     //放过灯箱
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-lightbox')){
+        gb_call_phone.hangup();
         return;
     }
     $(this).trigger('ct-destroy').remove();
 var gb_call_phone = function () {
-    var basePath = "http://180.168.57.114:4244";
-    var wsUri = "ws://180.168.57.114:21892/";
+    /**
+     * 0 已挂断
+     * 1 通话中
+     * @type {number}
+     */
+    var phoneStatus=0;
-    var nbbm2tel = {
-        "S0E-178":"915618938041",
-        "S0E-179":"915618937546",
-        "S0E-182":"915618938047",
-        "S0E-183":"915618937940",
-        "S0E-186":"915601989452",
-        "S0E-187":"915618846405",
-        "S0E-043":"915618847457",
-        "S0E-044":"915618845487",
-        "S2F-070":"915618846479",
-        "S2F-071":"915601989461",
-        "S2F-072":"915618937945",
-        "S2F-073":"915618937845",
-        "S2F-075":"915618847416",
-        "S2F-076":"915618847410",
-        "S2F-077":"915618847413",
-        "S2F-078":"915618847415",
-        "S2F-079":"915618847417",
-        "S2F-080":"915618847418",
-        "S2F-083":"915618847420",
-        "S2F-119":"915601987406",
-        "W0F-018":"915618209534",
-        "W0F-019":"915601987405",
-        "W0F-020":"915618278604",
-        "W0F-021":"915618278614",
-        "W0F-022":"915618012546",
-        "W0F-023":"915618278704",
-        "W0F-024":"915618278594",
-        "W0F-025":"915601989450",
-        "W0F-026":"915618209194",
-        "W0F-027":"915618208724",
-        "W0F-028":"915618278624",
-        "W0F-029":"915601988491",
-        "W0F-030":"915618936848",
-        "W0F-031":"915618928940",
-        "W0F-069":"915618011142",
-        "W0F-070":"915618279534",
-        "W0F-071":"915601989439",
-        "W0F-072":"915618011245",
-        "W0F-073":"915618010242",
-        "W0F-074":"915618279594",
-        "W0F-075":"915618010947",
-        "W0F-089":"915618011747",
-        "W0F-090":"915618279574",
-        "S2F-069":"915618938143",
-        "S2F-081":"915601986481"
-    };
+    var _nbbm;
+    var simNo;
+    var agentID;
+    var dn;
+    var wrap = '.voip_call_info_panel';
+    var storage = window.localStorage;
+    var loc_dn_key = 'control_sd_voip_dn';
+    var callMaxTime = 7;//拨号超时时间-秒
+    var $stateBtnTxt;
+    var init = function (nbbm) {
+        $stateBtnTxt = $('.state_txt>button', wrap);
-    var locData = window.localStorage.getItem('test_nbbm2tel_json');
-    if(locData){
-        nbbm2tel = JSON.parse(locData);
-    }
+        _nbbm = nbbm;
+        agentID = $('[name=agentID]', wrap).val();
+        dn = $('[name=dn]', wrap).val();
-    var login = function (cb) {
-        var agentID = '1002';
-        var dn = '6002';
+        //从本地读取分机号
+        var locDn = storage.getItem(loc_dn_key);
+        if(!dn && locDn){
+            dn = locDn;
+            $('[name=dn]', wrap).val(locDn);
+        }
-        var options = {
-            AgentID: agentID,
-            DN: dn,
-            wsUri: wsUri,
-            setbtnStatus: function (stateName) {
-                //setState(stateName);
-                console.log('stateName', stateName);
+        if(!dn){
+            waitInputDn();
+            return;
+        }
-                cb && cb(stateName)
+        //将分机号写入本地
+        storage.setItem(loc_dn_key, $('[name=dn]', wrap).val());
+        var $simInput = $('[name=simNo]', wrap);
+        var eq = EventProxy.create('pluginInit', 'getSimNo', function () {
+            simNo = ('9' + simNo);
+            $simInput.val(simNo);
+            if(!simNo){
+                $stateBtnTxt.text('获取SIM卡号失败！');
+                return;
             }
-        };
-        $.CallCenterInit(options);
+
+            _t = 0;
+            $stateBtnTxt.text('正在拨号（0）')
+                .attr('disabled', 'disabled');
+            //拨号
+            $.PhonePluginFun.Dialing(simNo);
+            startTimer();
+        });
+
+        //初始化插件
+        pluginInit(agentID, dn, function () {
+           eq.emitLater('pluginInit');
+        });
+
+        //获取SIM
+        $.PhonePluginFun.GetSimCardNo(nbbm, function (no) {
+            simNo = no;
+            eq.emitLater('getSimNo');
+        });
+    };
+
+    var waitInputDn = function () {
+        $stateBtnTxt.text('输入分机号，点击拨号！')
+            .removeAttr('disabled')
+            .addClass('uk-button-primary')
+            .one('click', function () {
+                init(_nbbm);
+            });;
+        $('[name=dn]', wrap).focus();
     };
-    var call = function (nbbm, loginSucc, loginFailed, callSucc) {
-        var telNumber = nbbm2tel[nbbm];
-        if(!telNumber){
-            alert('没有该车辆的对照表..');
-            loginFailed && loginFailed();
+    /**
+     * 开始计时器
+     */
+    var _t = 0, timer;
+    var startTimer = function () {
+        if(_t >= callMaxTime){
+            shutdown();
             return;
         }
-        login(function (sname) {
-            if(sname=='login'){
-                loginSucc && loginSucc();
+        _t ++;
+        $stateBtnTxt.text('正在拨号（'+_t+'）');
+        timer = setTimeout(startTimer, 1000);
+    };
+    
+    var shutdown = function () {
+        _hangup(true);
+        $stateBtnTxt.text('已超时，点击重拨！')
+            .removeAttr('disabled')
+            .addClass('uk-button-primary')
+            .one('click', function () {
+                init(_nbbm);
+            });;
+    };
-                $.CallCenterPublicFun.Dialing(telNumber);
-                setTimeout(function () {
-                    callSucc && callSucc();
-                }, 1000);
-            }
-            else{
-                //loginFailed && loginFailed();
-            }
-        });
+    var talking = function () {
+        console.log('talking');
+        clearTimeout(timer);
+        timer = null;
+        phoneStatus = 1;
+        setTimeout(function () {
+            var $stateBtnTxt = $('.state_txt>button', wrap);
+            $stateBtnTxt.text('已接通，点击挂断！')
+                .removeClass('uk-button-primary')
+                .addClass('uk-button-danger')
+                .removeAttr('disabled')
+                .off('click')
+                .one('click', function () {
+                    _hangup();
+                    _hold();
+                });
+        }, 1000);
     };
+    
+    var _hold = function () {
+        console.log('_hold');
+        phoneStatus = 0;
-    var hangup = function () {
+        var $stateBtnTxt = $('.state_txt>button', wrap);
+        $stateBtnTxt.text('点击拨号')
+            .removeClass('uk-button-danger')
+            .addClass('uk-button-primary')
+            .off('click')
+            .one('click', function () {
+                init(_nbbm);
+            });
+    };
+
+    var pluginInit = function (agentID, dn, cb) {
+        var options = {
+            AgentID: agentID,
+            DN: dn,
+            /*接通事件*/
+            OnTalking: talking,
+            /*挂机事件*/
+            OnHold: _hold
+        };
+        $.PhonePluginFun.init(options);
+        cb && cb();
+    };
+    
+    var _hangup = function (flag) {
+        clearTimeout(timer);
+        timer = null;
+        if(!flag && phoneStatus==0)
+            return;
         console.log('hangup...');
         $.CallCenterPublicFun.Hangup();
         $.CallCenterPublicFun.LoginOff();
-    };
+        phoneStatus = 0;
+    }
     return {
-        call: call,
-        hangup: hangup,
-        setNbbm2tel: function (json) {
-            nbbm2tel = json;
-
-            window.localStorage.setItem('test_nbbm2tel_json', JSON.stringify(nbbm2tel));
-        },
-        getNbbm2tel: function () {
-            return nbbm2tel;
-        }
+        init: init,
+        hangup: _hangup
     }
 }();
 \ No newline at end of file
@@ -20,11 +20,6 @@ var gb_safe_driv = (function () {
     var max = 5;
     var pop = function (sd) {
-        /*//只有admin用户能收到
-        var user = gb_northToolbar.user();
-        if (!user || user.userName.indexOf('admin') == -1)
-            return;*/
-
         //时间格式化
         var stm = moment(sd.ts);
         sd.timeStr = stm.format('HH时mm分ss秒');
@@ -43,29 +38,22 @@ 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=^^channel^^"></iframe>' +
-                        '</div>' +
-                    '</div>';*/
-
-    var phoneModal = '<div id="callPhoneModal" class="uk-modal ct_move_modal">' +
-                                '<div class="uk-modal-dialog">' +
-                                '<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 style="width: 100%;height: 280px;" id="phoneIframe" src="/real_control_v2/js/safe_driv/CallCenterPluginDemo.html"></iframe>' +
-                                '</div>' +
-                            '</div>';
+
     $wrap.on('click', '.safe_driv_pop', function () {
-        var title = $(this).data('title');// + '&nbsp;<button data-nbbm="'+$(this).data('nbbm')+'" class="uk-button uk-button-mini uk-button-primary" id="openPhoneModalBtn" type="button">打电话</button>';
+        var nbbm = $(this).data('nbbm');
+        var call_btn_html = '<button class="uk-button uk-button-mini uk-button-primary" ' +
+            'id="m_voip_call_btn_001" ' +
+            'type="button" ' +
+            'data-nbbm="'+nbbm+'">打电话</button>';
+
+        var title = $(this).data('title') + '&nbsp;' + call_btn_html;
         var url = $(this).data('url');
         $(this).remove();
+
         var lightbox = UIkit.lightbox.create([
             {title: title, 'source': url}
-        ]);
+        ], {keyboard: false});
         lightbox.show();
     });
@@ -80,7 +68,7 @@ var gb_safe_driv = (function () {
         'A6': 2,
         'A7': 2
     };
-    var showVedioModal = function (type) {
+/*    var showVedioModal = function (type) {
         var channel = channelMap[type]?channelMap[type]:1;
         open_modal_dom(vedioModal.replace('^^channel^^', channel) ,{}, {modal: false});
         $('#ssspVedioModal #vedioIframe').on('load', function () {
@@ -90,14 +78,14 @@ var gb_safe_driv = (function () {
                 $('#ssspVedioModal p.loading').remove();
             }, 500);
         });
-    };
+    };*/
-    $(document).on('click', '#openVedioModalBtn', function () {
+/*    $(document).on('click', '#openVedioModalBtn', function () {
         showVedioModal($(this).data('type'));
-    });
+    });*/
-    var showCallPhoneModal = function () {
+/*    var showCallPhoneModal = function () {
         open_modal_dom(phoneModal ,{}, {modal: false});
         $('#callPhoneModal #phoneIframe').on('load', function () {
             var that = this;
@@ -116,38 +104,30 @@ var gb_safe_driv = (function () {
                 $('#callPhoneModal p.loading').remove();
             }, 700);
         });
-    };
+    };*/
+
+    $(document).on('click', '#m_voip_call_btn_001', function () {
+        //debugger
+        var $lb = $('.uk-modal-dialog-lightbox');
+        var X = $lb.offset().top + $lb.height() - 240;
+        var Y = $lb.offset().left + $lb.width();
+
+        var nbbm = $(this).data('nbbm');
-    $(document).on('click', '#openPhoneModalBtn', function () {
-        var t = $(this).text();
-        if(t == '挂断！'){
-            gb_call_phone.hangup();
-            $(this).text('打电话').removeClass('uk-button-danger');
-            return;
-        }
-        else if(t == '打电话'){
-            var nbbm = $(this).data('nbbm');
-            var btn = this;
-
-            $(btn).text('登录坐席..');
-            gb_call_phone.call(nbbm, function () {
-                $(btn).text('拨号中..');
-            }, function () {
-                $(btn).text('登录坐席失败');
-                setTimeout(function () {
-                    $(btn).text('打电话');
-                }, 1200);
-            }, function () {
-                $(btn).text('挂断！').addClass('uk-button-danger');
-            });
-        }
+        var style = 'top: '+X+'px;left: '+Y+'px;height: '+$lb.height()+'px';
+        var htmlStr = template('voip_call_info_panel-temp', {style: style, nbbm: nbbm});
+        $lb.css('width', ($lb.width() + 260) + 'px');
+        $('.uk-lightbox-content', $lb.parent()).append(htmlStr);
+
+        $(this).remove();
+        gb_call_phone.init(nbbm);
     });
     return {
         pop: pop,
         safeCode: codes,
-        urlPath: path,
-        showVedioModal: showVedioModal
+        urlPath: path//,
+        //showVedioModal: showVedioModal
     }
 })();
 \ No newline at end of file
@@ -237,10 +237,47 @@
 <script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
-<!-- 打电话
-<script src="http://180.168.57.114:4244/Scripts/CallCenter.js" ></script>
+<!-- 打电话 -->
+<script src="http://114.80.178.12:9003/forward/voip/callCenterJs"></script>
+<script src="http://114.80.178.12:9003/forward/voip/phonePluginJs"></script>
 <script src="/real_control_v2/js/safe_driv/call_phone.js" ></script>
--->
+
+<script id="voip_call_info_panel-temp" type="text/html">
+    <div class="voip_call_info_panel" style="{{style}}">
+        <p class="_title">VOIP</p>
+        <form class="uk-form uk-form-horizontal">
+
+            <div class="uk-form-row">
+                <label class="uk-form-label" >工号:</label>
+                <div class="uk-form-controls">
+                    <input type="text" name="agentID" value="1002" disabled>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label" ">分机号:</label>
+                <div class="uk-form-controls">
+                    <input type="text" name="dn" value="" >
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label" >自编号:</label>
+                <div class="uk-form-controls">
+                    <input type="text" value="{{nbbm}}" disabled>
+                </div>
+            </div>
+            <div class="uk-form-row">
+                <label class="uk-form-label" >SIM号:</label>
+                <div class="uk-form-controls">
+                    <input type="text" name="simNo" disabled>
+                </div>
+            </div>
+            <hr>
+            <h4 class="state_txt">
+                <button class="uk-button uk-button-large" type="button" disabled>获取SIM卡号...</button>
+            </h4>
+        </form>
+    </div>
+</script>
 </body>
 </html>