Merge branch 'minhang' of http://192.168.168.201:8888/panzhaov5/bsth_control into minhang

sgz
2 parents cd85505c fef9b8c5
Showing 118 changed files with 3928 additions and 1428 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/BaseController.java
src/main/java/com/bsth/controller/BaseController2.java
src/main/java/com/bsth/controller/CarsController.java
src/main/java/com/bsth/controller/PersonnelController.java
src/main/java/com/bsth/controller/realcontrol/DataManagerController.java
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/java/com/bsth/data/schedule/thread/ScheduleLateThread.java → src/main/java/com/bsth/data/schedule/late_adjust/ScheduleLateThread.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1Flat.java
src/main/java/com/bsth/entity/schedule/temp/SchedulePlanRuleResult.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/DataManagerService.java
src/main/java/com/bsth/service/realcontrol/impl/DataManagerServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
@@ -36,4 +36,14 @@ public class Constants {
 	public static final String SESSION_USERNAME = "sessionUserName";
 	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
 }
 package com.bsth.controller;
-import com.bsth.common.ResponseCode;
 import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
 import com.google.common.base.Splitter;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,8 +29,6 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
     @Autowired
     protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
     /**
      * @param @param map 查询条件
@@ -126,115 +118,4 @@ public class BaseController&lt;T, ID extends Serializable&gt; {
         return baseService.delete(id);
     }
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     *
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     *
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        String filePath = outputfile.getAbsolutePath();
-        String fp[] = filePath.split(File.separator);
-        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        BufferedInputStream bis = new BufferedInputStream(is);
-
-        int length = 0;
-        byte[] temp = new byte[1 * 1024 * 10];
-
-        while ((length = bis.read(temp)) != -1) {
-            bos.write(temp, 0, length);
-        }
-        bos.flush();
-        bis.close();
-        bos.close();
-        is.close();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
 }
-package com.bsth.controller;
-
-
-import com.bsth.common.ResponseCode;
-import com.bsth.service.BaseService;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.google.common.base.Splitter;
-import jxl.Sheet;
-import jxl.Workbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by xu on 16/11/3.
- */
-public class BaseController2<T, ID extends Serializable> {
-
-    @Autowired
-    protected BaseService<T, ID> baseService;
-    @Autowired
-    DataImportExportService dataImportExportService;
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件分页查询)
-     * @param @param map 查询条件
-     * @param @param page 页码
-     * @param @param size 每页显示数量
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.GET)
-    public Page<T> list(@RequestParam Map<String, Object> map,
-                        @RequestParam(defaultValue = "0") int page,
-                        @RequestParam(defaultValue = "10") int size,
-                        @RequestParam(defaultValue = "id") String order,
-                        @RequestParam(defaultValue = "DESC") String direction){
-
-        // 允许多个字段排序，order可以写单个字段，也可以写多个字段
-        // 多个字段格式：{col1},{col2},{col3},....,{coln}
-        List<String> order_columns = Splitter.on(",").trimResults().splitToList(order);
-        // 多字段排序：DESC,ASC...
-        List<String> order_dirs = Splitter.on(",").trimResults().splitToList(direction);
-
-        if (order_dirs.size() == 1) { // 所有字段采用一种排序
-            if (null != order_dirs.get(0) && order_dirs.get(0).equals("ASC")) {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.ASC, order_columns)));
-            } else {
-                return baseService.list(map, new PageRequest(page, size, new Sort(Sort.Direction.DESC, order_columns)));
-            }
-        } else if (order_columns.size() == order_dirs.size()) {
-            List<Sort.Order> orderList = new ArrayList<>();
-            for (int i = 0; i < order_columns.size(); i++) {
-                if (null != order_dirs.get(i) && order_dirs.get(i).equals("ASC")) {
-                    orderList.add(new Sort.Order(Sort.Direction.ASC, order_columns.get(i)));
-                } else {
-                    orderList.add(new Sort.Order(Sort.Direction.DESC, order_columns.get(i)));
-                }
-            }
-            return baseService.list(map, new PageRequest(page, size, new Sort(orderList)));
-        } else {
-            throw new RuntimeException("多字段排序参数格式问题，排序顺序和字段数不一致");
-        }
-    }
-
-    /**
-     *
-     * @Title: list
-     * @Description: TODO(多条件查询)
-     * @param @param map
-     * @throws
-     */
-    @RequestMapping(value = "/all", method = RequestMethod.GET)
-    public Iterable<T> list(@RequestParam Map<String, Object> map){
-        return baseService.list(map);
-    }
-
-    /**
-     * 这里保存直接返回保存后的对象，不自己定义Map返回了，和前端angularjs配合。
-     * form也可以提交，但是页面参数可能不全，
-     * json的化比较灵活，但是貌似有多余属性也会报错，或者碰到lazy属性值，也有问题
-     * 不论form，还是json提交都能解决问题，就看哪个方便哪个来
-     *
-     * @param t 参数需要使用@RequestBody转换json成对象
-     * @return
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public T save(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    @RequestMapping(value="/{id}", method = RequestMethod.POST)
-    public T update(@RequestBody T t) {
-        baseService.save(t);
-        return t;
-    }
-
-    /**
-     *
-     * @Title: findById
-     * @Description: TODO(根据主键获取单个对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.GET)
-    public T findById(@PathVariable("id") ID id){
-        return baseService.findById(id);
-    }
-
-    /**
-     *
-     * @Title: delete
-     * @Description: TODO(根据主键删除对象)
-     * @param @param id
-     * @throws
-     */
-    @RequestMapping(value="/{id}",method = RequestMethod.DELETE)
-    public Map<String, Object> delete(@PathVariable("id") ID id){
-        return baseService.delete(id);
-    }
-
-    /**
-     * 上传数据文件，并使用ktr转换文件导入数据。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataImport", method = RequestMethod.POST)
-    public Map<String, Object> uploadDataAndImport(MultipartFile file) throws Exception {
-        Map<String, Object> resultMap = new HashMap<>();
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(file, ktrfile);
-
-            resultMap.put("status", ResponseCode.SUCCESS);
-            resultMap.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            resultMap.put("status", ResponseCode.ERROR);
-            resultMap.put("msg", exp.getLocalizedMessage());
-        }
-
-        return resultMap;
-    }
-
-    /**
-     * 使用ktr导出数据。
-     * @param response
-     * @throws Exception
-     */
-    @RequestMapping(value = "/dataExport", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response) throws Exception {
-        dataExport(response, null);
-    }
-
-    @RequestMapping(value = "/dataExportExt", method = RequestMethod.GET)
-    public void dataExport(HttpServletResponse response, @RequestParam Map<String, Object> param) throws Exception {
-        // 1、使用ktr转换获取输出文件
-        File ktrfile = new File(this.getClass().getResource(getDataExportKtrClasspath()).toURI());
-        File outputfile = null;
-        if (!CollectionUtils.isEmpty(param)) {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile,
-                    param);
-        } else {
-            outputfile = dataImportExportService.fileDataOutput(
-                    getDataExportFilename(),
-                    ktrfile);
-        }
-
-        System.out.println(outputfile.getName());
-        System.out.println(outputfile.getAbsolutePath());
-
-        String filePath = outputfile.getAbsolutePath();
-//        String fp[] = filePath.split(File.separator);
-//        String fileName = fp[fp.length - 1];
-
-        // TODO：使用ktr获取导出数据
-
-        response.setHeader("conent-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        response.setHeader("Content-Disposition", "attachment; filename=" + "东东");
-
-        OutputStream os = response.getOutputStream();
-        BufferedOutputStream bos = new BufferedOutputStream(os);
-
-        InputStream is = null;
-
-        is = new FileInputStream(filePath);
-        BufferedInputStream bis = new BufferedInputStream(is);
-
-        int length = 0;
-        byte[] temp = new byte[1 * 1024 * 10];
-
-        while ((length = bis.read(temp)) != -1) {
-            bos.write(temp, 0, length);
-        }
-        bos.flush();
-        bis.close();
-        bos.close();
-        is.close();
-    }
-
-    /**
-     * @return 数据导出的ktr转换文件类路径。
-     */
-    protected String getDataExportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-    /**
-     * @return 导出文件名。
-     */
-    protected String getDataExportFilename() {
-        // 默认返回异常，子类如果要使用导出功能，必须覆写此方法，指定导出的文件路径名
-        throw new RuntimeException("必须override，并指定导出文件名");
-    }
-
-    /**
-     * @return 数据导入的ktr转换文件类路径。
-     */
-    protected String getDataImportKtrClasspath() {
-        // 默认返回异常，子类如果要使用导入功能，必须覆写此方法，指定ktr文件类路径
-        throw new RuntimeException("必须override，并指定ktr classpath");
-    }
-
-
-    public static class ExcelFileOutput {
-        private String fileName;
-        private List<Map<String, Object>> sheetnames = new ArrayList<>();
-
-        public String getFileName() {
-            return fileName;
-        }
-
-        public void setFileName(String fileName) {
-            this.fileName = fileName;
-        }
-
-        public List<Map<String, Object>> getSheetnames() {
-            return sheetnames;
-        }
-
-        public void setSheetnames(List<Map<String, Object>> sheetnames) {
-            this.sheetnames = sheetnames;
-        }
-    }
-
-    /**
-     * 上传Excel文件，返回文件全路径名，工作区名称列表。
-     * @param file
-     * @return
-     * @throws Exception
-     */
-    @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
-    public ExcelFileOutput fileUpload(MultipartFile file) throws Exception {
-        // 返回对象
-        ExcelFileOutput rs = new ExcelFileOutput();
-
-        // 上传文件
-        File file1 = dataImportExportService.uploadFile(file);
-        // 获取文件的sheet
-        Workbook book = Workbook.getWorkbook(file1);
-        for (Sheet sheet : book.getSheets()) {
-            String sheetname = sheet.getName();
-            Map<String, Object> s = new HashMap<>();
-            s.put("name", sheetname);
-            rs.getSheetnames().add(s);
-        }
-
-        rs.setFileName(file1.getAbsolutePath());
-        return rs;
-    }
-
-}
 package com.bsth.controller;
-import com.bsth.common.ResponseCode;
 import com.bsth.entity.Cars;
-import com.bsth.service.schedule.utils.DataImportExportService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by xu on 16/5/31.
  */
 @RestController
 @RequestMapping("cars")
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class CarsController extends BaseController2<Cars, Integer> {
-
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-    @Autowired
-    private DataImportExportService dataImportExportService;
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较自编号是否重复
-        return baseService.validateEquale(map);
-    }
-
-    // uploadFile post
-
-    // 验证excel sheet
-    @RequestMapping(value = "/validate/sheet", method = RequestMethod.GET)
-    public Map<String, Object> validateSheet() throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-
-        rtn.put("status", ResponseCode.SUCCESS);
-        return rtn;
-    }
-
-    @RequestMapping(value = "/importfile", method = RequestMethod.POST)
-    public Map<String, Object> importData(
-            @RequestParam Map<String, Object> form)
-            throws Exception {
-        Map<String, Object> rtn = new HashMap<>();
-
-        // TODO：
-        String filename = (String) form.get("filename");
-
-
-        try {
-            // 获取ktr转换文件绝对路径
-            File ktrfile = new File(this.getClass().getResource(getDataImportKtrClasspath()).toURI());
-            System.out.println(ktrfile.getAbsolutePath());
-            // 导入数据
-            dataImportExportService.fileDataImport(new File(filename), ktrfile);
-
-            rtn.put("status", ResponseCode.SUCCESS);
-            rtn.put("msg", "导入成功");
-        } catch (Exception exp) {
-            exp.printStackTrace();
-            rtn.put("status", ResponseCode.ERROR);
-            rtn.put("msg", exp.getLocalizedMessage());
-        }
-
-        return rtn;
-    }
-
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getCarsDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getCarsDataoutputktr();
-    }
+public class CarsController extends BaseController<Cars, Integer> {
-    @Override
-    protected String getDataExportFilename() {
-        return "车辆基础数据";
-    }
 }
@@ -2,10 +2,11 @@ package com.bsth.controller;
 import com.bsth.entity.Personnel;
 import com.bsth.service.PersonnelService;
-import com.bsth.service.schedule.utils.DataToolsProperties;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 import java.util.Map;
@@ -15,54 +16,11 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("personnel")
-@EnableConfigurationProperties(DataToolsProperties.class)
 public class PersonnelController extends BaseController<Personnel, Integer> {
     @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    @Autowired
     private PersonnelService service;
-    /**
-     * 覆写方法，因为form提交的方式参数不全，改用 json形式提交 @RequestBody
-     * @Title: save
-     * @Description: TODO(持久化对象)
-     * @param @param t
-     * @param @return    设定文件
-     * @return Map<String,Object>  {status: 1（成功），-1（失败）}
-     * @throws
-     */
-    @RequestMapping(method = RequestMethod.POST)
-    public Map<String, Object> save(@RequestBody Personnel t){
-        return baseService.save(t);
-    }
-
-    /**
-     * 验证。
-     * @param map
-     * @return
-     */
-    @RequestMapping(value = "/validate/equale", method = RequestMethod.GET)
-    public Map<String, Object> validateData(@RequestParam Map<String, Object> map) {
-        // 一般比较相同公司下工号是否相同
-        return baseService.validateEquale(map);
-    }
-
-    @Override
-    protected String getDataImportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDatainputktr();
-    }
-
-    @Override
-    protected String getDataExportKtrClasspath() {
-        return dataToolsProperties.getEmployeesDataoutputktr();
-    }
-    @Override
-    protected String getDataExportFilename() {
-        return "人员基础信息";
-    }
-    
     @RequestMapping(value = "/sreachPersonnel", method = RequestMethod.GET)
 	public List<Map<String, String>> sreachPersonnel(@RequestParam String jobCode) {
 		return service.sreachPersonnel(jobCode);
+package com.bsth.controller.realcontrol;
+
+import com.bsth.service.realcontrol.DataManagerService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 数据管理，包括从老系统的数据迁移。新系统的数据校验等
+ * Created by panzhao on 2017/4/17.
+ */
+@RestController
+@RequestMapping("dataManager")
+public class DataManagerController {
+
+    @Autowired
+    DataManagerService dataManagerService;
+
+    @RequestMapping("cars/old_now")
+    public Map<String, Object> carInfos(@RequestParam Integer lineId){
+        return dataManagerService.carInfos(lineId);
+    }
+
+    @RequestMapping("car/updateDevices")
+    public Map<String, Object> updateDevices(@RequestParam String jsonStr){
+        jsonStr = StringEscapeUtils.unescapeHtml4(jsonStr);
+        return dataManagerService.updateDevices(jsonStr);
+    }
+}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
@@ -237,4 +237,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		return msg;
 	}
+
+	@RequestMapping(value = "/register" ,method = RequestMethod.POST)
+	public Map<String, Object> register(SysUser u){
+		return sysUserService.register(u);
+	}
 }
@@ -3,12 +3,14 @@ package com.bsth.data.schedule;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.bsth.Application;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.directive.DirectivesPstThread;
 import com.bsth.data.gpsdata.GpsRealData;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
+import com.bsth.data.schedule.late_adjust.ScheduleLateThread;
 import com.bsth.data.schedule.thread.*;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -27,6 +29,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.core.annotation.Order;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 import java.text.ParseException;
@@ -383,6 +387,11 @@ public class DayOfSchedule implements CommandLineRunner {
                     sch.setLate(false);
                 }
+                //售票员为空设置为""字符串
+                if(StringUtils.isEmpty(sch.getsGh())){
+                    sch.setsGh("");
+                    sch.setsName("");
+                }
                 sch.setJhlcOrig(sch.getJhlc());
                 //保留备注
                 if(StringUtils.isNotEmpty(sch.getRemark()))
@@ -855,6 +864,9 @@ public class DayOfSchedule implements CommandLineRunner {
         return false;
     }
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
     /**
      * 删除实际排班
      * @param lineCode
@@ -866,20 +878,33 @@ public class DayOfSchedule implements CommandLineRunner {
         try {
             String rq = currSchDateMap.get(lineCode);
             if(StringUtils.isNotEmpty(rq)){
+                List<ScheduleRealInfo> all = findByLineCode(lineCode);
                 //解除gps 和班次之间的关联
-                List<ScheduleRealInfo> unions = calcUnion(findByLineCode(lineCode), carExecutePlanMap.values());
+                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());
                 //删除班次数据
                 removeRealSch(lineCode, rq);
                 //删除相关班次修正记录
+
             }
             rs.put("status", ResponseCode.SUCCESS);
         }catch (Exception e){
             logger.error("", e);
             rs.put("status", ResponseCode.ERROR);
+            if(e instanceof DataIntegrityViolationException)
+                rs.put("msg", "失败，违反数据约束！！");
+            else
+                rs.put("msg", e.getMessage());
         }
         return rs;
@@ -902,4 +927,16 @@ public class DayOfSchedule implements CommandLineRunner {
         }
         return rs;
     }
+
+    /**
+     * 覆盖一辆车的所有班次
+     * @param nbbm
+     * @param sets
+     */
+    public void replaceByNbbm(String nbbm, Set<ScheduleRealInfo> sets){
+        nbbmScheduleMap.removeAll(nbbm);
+        nbbmScheduleMap.putAll(nbbm, sets);
+        //重新计算班次应到时间
+        updateQdzTimePlan(nbbm);
+    }
 }
 \ No newline at end of file
+
+package com.bsth.data.schedule.late_adjust;
+
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+import java.util.Map;
+
+/**
+ * 误点调整处理程序
+ * Created by panzhao on 2017/4/16.
+ */
+public class LateAdjustHandle {
+
+    /**
+     * 误点的车辆 和 班次
+     */
+    private static Map<String, ScheduleRealInfo> lateSchMap;
+
+
+    /**
+     * 误点的班次ID 和 停靠时间（秒）
+     */
+    private static Map<Long, Integer> stopTimeMap;
+
+
+    /**
+     * 班次误点（考虑停靠时间）
+     * @param sch
+     */
+    public static void schLate(ScheduleRealInfo sch){
+
+    }
+}
-package com.bsth.data.schedule.thread;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.data.schedule.ScheduleComparator;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.websocket.handler.SendUtils;
-
-/**
- * 
- * @ClassName: ScheduleLateThread 
- * @Description: TODO(班次误点扫描线程) 
- * @author PanZhao 
- * @date 2016年8月31日 下午3:09:02 
- *
- */
-@Component
-public class ScheduleLateThread extends Thread{
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-	
-	@Autowired
-	SendUtils sendUtils;
-	
-	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
-	
-	@Override
-	public void run() {
-		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
-		Collections.sort(all, cpm);
-		
-		long t = System.currentTimeMillis();
-		int size = all.size();
-		
-		ScheduleRealInfo sch;
-		for(int i = 0; i < size; i ++){
-			sch = all.get(i);
-			if(sch.getDfsjT() > t)
-				break;
-			
-			if(sch.isLate() == false 
-					&& sch.getStatus() == 0 
-					&& sch.getFcsjActual() == null){
-				//应发未发
-				sch.setLate(true);
-				//通知客户端
-				sendUtils.refreshSch(sch);
-			}
-		}
-	}
-}
+package com.bsth.data.schedule.late_adjust;
+
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.data.schedule.ScheduleComparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.websocket.handler.SendUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 
+ * @ClassName: ScheduleLateThread 
+ * @Description: TODO(班次误点扫描线程) 
+ * @author PanZhao 
+ * @date 2016年8月31日 下午3:09:02 
+ *
+ */
+@Component
+public class ScheduleLateThread extends Thread{
+
+	@Autowired
+	DayOfSchedule dayOfSchedule;
+	
+	@Autowired
+	SendUtils sendUtils;
+	
+	private static Comparator<ScheduleRealInfo> cpm = new ScheduleComparator.FCSJ();
+	
+	@Override
+	public void run() {
+		List<ScheduleRealInfo> all = new ArrayList<>(dayOfSchedule.findAll());
+		Collections.sort(all, cpm);
+		
+		long t = System.currentTimeMillis();
+		int size = all.size();
+		
+		ScheduleRealInfo sch;
+		for(int i = 0; i < size; i ++){
+			sch = all.get(i);
+			if(sch.getDfsjT() > t)
+				break;
+			
+			if(sch.isLate() == false 
+					&& sch.getStatus() == 0 
+					&& sch.getFcsjActual() == null){
+				//应发未发
+				sch.setLate(true);
+				//通知客户端
+				sendUtils.refreshSch(sch);
+			}
+		}
+	}
+}
@@ -22,6 +22,17 @@ public class Shiftuehiclemanth {
 	private String jgh;
 	private String zbh;
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	private String sgh;
+	
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -773,6 +773,7 @@ public class ScheduleRealInfo {
 	public void destroy(){
 		this.jhlc = 0.0;
 		this.status = -1;
+		this.clearFcsjActual();
 	}
 	public boolean isDestroy(){
@@ -57,6 +57,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String lpNames;
     /** 对应的路牌ids（用逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String lpIds;
     /** 起始路牌（从0开始） */
     @NotNull
@@ -66,6 +67,7 @@ public class ScheduleRule1Flat extends BEntity {
     private String ryDbbms;
     /** 对应的人员配置ids（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
+    @Column(length = 1000)
     private String ryConfigIds;
     /** 起始人员（从0开始） */
     @NotNull
@@ -2,10 +2,7 @@ package com.bsth.entity.schedule.temp;
 import com.bsth.entity.schedule.SchedulePlan;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.util.Date;
 /**
@@ -32,12 +29,14 @@ public class SchedulePlanRuleResult {
     private String ccZbh;
     /** 路牌id列表字符串 */
+    @Column(length = 1000)
     private String gids;
     /** 路牌名字列表字符串 */
     private String gnames;
     /** 翻到哪个路牌索引 */
     private String gidindex;
     /** 人员配置id列表字符串 */
+    @Column(length = 1000)
     private String ecids;
     /** 人员配置搭班编码列表字符串 */
     private String ecdbbms;
@@ -156,7 +156,10 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name " 
+		String sql = "select"
+				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
+//				+ "r.gs_bm,r.gs_name,"
+//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
 		        + " from bsth_c_s_sp_info_real r "
 		    	+ " where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
@@ -169,19 +172,23 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("line")!=null&&!map.get("line").equals("")){
 			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
 		}
-			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
-		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
-			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
-		}
+//			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+//		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
+			sql+=" and r.gs_bm like'%"+gsdmManth+"%' ";
+//		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
 		}	
 		if(empnames.equals("售票员")){
 			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
-			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			sql	+= " GROUP BY "
+					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+//					+ ",r.gs_bm,r.gs_name,"
+//					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
-	
+//			r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,"
+//					+ " r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
 			@Override
@@ -191,12 +198,13 @@ public class FormsServiceImpl implements FormsService {
 					shif.setjName(arg0.getString("j_name"));
 				}else if(empnames.equals("售票员")){
 					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				
 				shif.setJgh(arg0.getString("j_gh"));
 		        shif.setZbh(arg0.getString("cl_zbh"));
+//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -208,9 +216,24 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					sList.add(s);
+//				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+//					sList.add(s);
+//				}
+				if(empnames.equals("驾驶员")){
+					if(d.getJgh().equals(s.getjGh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("售票员")){
+					String sgh=s.getsGh()==null?"":s.getsGh();
+					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("车辆自编号")){
+					if(d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
 				}
+				
 			}
 			double ksgl=culateMileageService.culateKsgl(sList);
@@ -219,16 +242,17 @@ public class FormsServiceImpl implements FormsService {
 			double ljgl=culateMileageService.culateLjgl(sList);
 			double sjgl=culateMileageService.culateSjgl(sList);
 			double zyygl=Arith.add(ljgl, sjgl);
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double cjgl=culateMileageService.culateLbgl(sList);
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(zyygl));//运营里程
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setRemMileage(String.valueOf(cjgl));//抽检里程
 			d.setAddMileage(String.valueOf(zjgl));//增加里程
@@ -258,13 +282,16 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
 			fgsdmShif =map.get("fgsdmShif").toString();
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name FROM bsth_c_s_sp_info_real r  where 1=1  "
+		String sql ="select t.* from (select r.schedule_date,r.j_name,"
+				+ "IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
+				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
 				+ " and to_days(r.schedule_date)=to_days('"+date + "')  "
 				+ " and r.xl_bm like '%"+line+"%' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
+				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  ";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -302,22 +329,23 @@ public class FormsServiceImpl implements FormsService {
 			double zyygl=Arith.add(ljgl, sjgl);
 			double jhgl=culateMileageService.culateJhgl(sList);
 			double cjgl=culateMileageService.culateLbgl(sList);
-			double jhbc	=culateMileageService.culateJhbc(sList,"");
-			double cjbc=culateMileageService.culateLbbc(sList);
-			double Ljbc=culateMileageService.culateLjbc(sList,"");
+			int jhbc	=culateMileageService.culateJhbc(sList,"");
+			int cjbc=culateMileageService.culateLbbc(sList);
+			int ljbc=culateMileageService.culateLjbc(sList,"");
+			int sjbc=culateMileageService.culateSjbc(sList, "");
 			double zjgl=culateMileageService.culateLjgl(sList);
 			d.setEmptMileage(String.valueOf(zksgl));//空驶公里
 			d.setTotalm(String.valueOf(Arith.add(zksgl, zyygl)));//总公里
-			d.setSjbc(String.valueOf(culateMileageService.culateSjbc(sList, "")+culateMileageService.culateLjbc(sList, "")));
+			d.setSjbc(String.valueOf(sjbc+ljbc));
 			d.setJhlc(String.valueOf(jhgl));//计划里程
 			d.setYygl(String.valueOf(zyygl));//运营公里
 			d.setSjjhlc(String.valueOf(sjgl));//实际计划里程
 			d.setRemMileage(String.valueOf(cjgl));//抽减里程
 			d.setJhbc(String.valueOf(jhbc));//计划班次
 			d.setCjbc(String.valueOf(cjbc));//抽检班次
-			d.setLjbc(String.valueOf(Ljbc));//增加班次
+			d.setLjbc(String.valueOf(ljbc));//增加班次
 			d.setAddMileage(String.valueOf(zjgl));//增加公里
-			d.setSjjhbc(String.valueOf(culateMileageService.culateSjbc(sList, "")));//实际计划班次
+			d.setSjjhbc(String.valueOf(sjbc));//实际计划班次
 			}
 		return list;
 	}
@@ -806,7 +834,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " and  y.ssgsdm like '%"+gsbm+"%' "
 				+ " and y.fgsdm like '%"+fgsbm+"%'"
 				+ " ) x"
-				+ " on t.cl_zbh = x.nbbm ";
+				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -106,8 +106,6 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		List<Cdl> cdyList=cdlRepository.obtainCdl();
 		//从排班表中计算出行驶的总里程
 		List<Map<String,Object>> listpb=scheduleRealInfoService.yesterdayDataList(line,rq,"","","","");
-		List<Ylb> addList=new ArrayList<Ylb>();
-		List<Ylb> updateList=new ArrayList<Ylb>();
 		for(int x=0;x<listpb.size();x++){
 			String type="add";
 			boolean sfdc=false;
+package com.bsth.service.realcontrol;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+public interface DataManagerService {
+
+    Map<String, Object> carInfos(Integer lineId);
+
+    Map<String,Object> updateDevices(String jsonStr);
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.ResponseCode;
+import com.bsth.data.BasicData;
+import com.bsth.entity.Cars;
+import com.bsth.repository.CarsRepository;
+import com.bsth.service.realcontrol.DataManagerService;
+import com.bsth.util.db.DBUtils_oldSystem;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/4/18.
+ */
+@Service
+public class DataManagerServiceImpl implements DataManagerService{
+
+    @Autowired
+    CarsRepository carsRepository;
+
+    @Autowired
+    JdbcTemplate controlJdbcTemp;
+
+    @Autowired
+    BasicData.BasicDataLoader dataLoader;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public Map<String, Object> carInfos(Integer lineId) {
+
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            List<Map<String, String>> nowData = new ArrayList<>();
+            List<Map<String, String>> oldData = new ArrayList<>();
+            Map<String, String> map;
+
+            //查询新系统车辆信息
+            List<Cars> list = carsRepository.findCarsByLineId(lineId);
+            for(Cars c : list){
+                map = new HashMap<>();
+                map.put("nbbm", c.getInsideCode());
+                map.put("device", c.getEquipmentCode());
+                nowData.add(map);
+            }
+
+            //获取老系统数据
+            JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_oldSystem.getDataSource());
+            List<Map<String, Object>> oyList = jdbcTemplate.queryForList("select NBBM,SBBH from JJWGPS_T_CLXXB t where xlbm=?", BasicData.lineId2CodeMap.get(lineId));
+            for(Map<String, Object> tempMap : oyList){
+                map = new HashMap<>();
+                map.put("nbbm", tempMap.get("NBBM").toString());
+                map.put("device", tempMap.get("SBBH").toString());
+                oldData.add(map);
+            }
+
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("nows", nowData);
+            rs.put("olds", oldData);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+
+        return rs;
+    }
+
+    /**
+     * 更新设备号
+     * @param jsonStr
+     * @return
+     */
+    @Override
+    public Map<String, Object> updateDevices(String jsonStr) {
+        Map<String, Object> rs = new HashMap<>();
+        try {
+            int count=0;
+            JSONArray array = JSONArray.parseArray(jsonStr);
+            JSONObject jObj;
+            for(int i = 0; i < array.size(); i ++){
+                jObj = array.getJSONObject(i);
+                count += controlJdbcTemp.update("update bsth_c_cars set equipment_code=? where inside_code=?"
+                        , jObj.getString("device"), jObj.getString("nbbm"));
+            }
+
+            //刷新缓存
+            dataLoader.loadDeviceInfo();
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("count", count);
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", e.getMessage());
+        }
+        return rs;
+    }
+}
@@ -3,6 +3,7 @@ package com.bsth.service.realcontrol.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.ChangePersonCar;
 import com.bsth.controller.realcontrol.dto.DfsjChange;
@@ -400,25 +401,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
-        ScheduleRealInfo sch = dayOfSchedule.get(id);
-        if (sch == null) {
-            rs.put("msg", "无效的id号");
-            return rs;
-        }
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
-        if (!sch.isSflj()) {
-            rs.put("msg", "你只能删除临加班次");
-            return rs;
-        }
+            if (!sch.isSflj()) {
+                rs.put("msg", "你只能删除临加班次");
+                return rs;
+            }
-        //数据库删除
-        rs = super.delete(id);
-        if(rs.get("status").equals(ResponseCode.SUCCESS)){
-            dayOfSchedule.delete(sch);
-            //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-            rs.put("ts", ts);
-            rs.put("delete", sch);
+            //解除和调度指令的外键约束
+            jdbcTemplate.update(Constants.REMOVE_DIRECTIVE_SCH_FK, id);
+
+            //数据库删除
+            rs = super.delete(id);
+            if(rs.get("status").equals(ResponseCode.SUCCESS)){
+                dayOfSchedule.delete(sch);
+                //更新起点应到时间
+                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+                rs.put("ts", ts);
+                rs.put("delete", sch);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
         }
         return rs;
@@ -494,14 +503,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         String px = type;
         if (state.equals("lpName")) {
             state = state + "+1";
-            type = "asc";
+            type = "ASC";
         }
         String sqlPlan = "select min(s.id) as id,s.j_Gh as jGh,s.cl_Zbh as clZbh,"
-                + " s.lp_Name as lpName,s.j_Name as jName"
+                + " s.lp_Name as lpName,s.j_Name as jName,min(s.schedule_date_str) as dateStr ,min(s.fcsj) as fcsj"
                 + " from bsth_c_s_sp_info_real s "
                 + " where s.xl_Bm = '" + line + "' and DATE_FORMAT(s.schedule_Date,'%Y-%m-%d') ='" + date + "' "
                 + " GROUP BY s.j_Gh,s.cl_Zbh,s.lp_Name ,s.j_Name"
-                + " order by (" + state + ") " + type;
+                + " order by (" + state + "),dateStr,fcsj " + type;
         List<ScheduleRealInfo> list = jdbcTemplate.query(sqlPlan,
                 new RowMapper<ScheduleRealInfo>() {
                     @Override
@@ -518,29 +527,41 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         if (lpname.equals("lpName")) {
             List<ScheduleRealInfo> listNew = new ArrayList<ScheduleRealInfo>();
             Pattern pattern = Pattern.compile("^[-\\+]?[\\d]*$");
-            if (px.equals("desc")) {
+//            if (px.equals("desc")) {
                 int zt = 0;
-                for (int l = 0; l < 3; l++) {
+                for (int l = 0; l < 2; l++) {
                     for (int i = 0; i < list.size(); i++) {
                         ScheduleRealInfo t = list.get(i);
                         if (t.getLpName().indexOf("+") != -1) {
                             if (zt == 0) {
                                 listNew.add(t);
                             }
-
                         } else if (pattern.matcher(t.getLpName()).matches()) {
                             if (zt == 1) {
                                 listNew.add(t);
                             }
                         } else {
-                            if (zt == 2) {
-                                listNew.add(t);
-                            }
+//                            if (zt == 2) {
+//                                listNew.add(t);
+//                            }
+                        	continue;
                         }
                     }
                     zt++;
                 }
-            } else {
+                
+           	 Collections.sort(list, new ComparableLp());
+           	 for (int i = 0; i < list.size(); i++) {
+           		 ScheduleRealInfo t = list.get(i);
+           		 if (t.getLpName().indexOf("+") != -1) {
+           			 continue;
+                 } else if (pattern.matcher(t.getLpName()).matches()) {
+                	 continue;
+                 } else {
+                	 listNew.add(t);
+                 }
+			}
+            /*} else {
                 int zt = 0;
                 for (int l = 0; l < 3; l++) {
                     for (int i = 0; i < list.size(); i++) {
@@ -563,7 +584,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
                     zt++;
                 }
-            }
+            }*/
             return listNew;
         } else {
             return list;
@@ -1382,20 +1403,20 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     			lists.add(s);
     		}
 		}
-    	double ksgl=culateService.culateKsgl(lists);
+    	double ksgl=culateService.culateKsgl(list);
     	double sjgl=culateService.culateSjgl(lists);
     	double jccgl=culateService.culateJccgl(lists);
     	double ljgl=culateService.culateLjgl(lists);
     	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
-         map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
+         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
          map.put("jhbc", culateService.culateJhbc(list,""));
-         map.put("cjbc", culateService.culateLbbc(lists));
+         map.put("cjbc", culateService.culateLbbc(list));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
          map.put("jcclc", jccgl);
@@ -3712,7 +3733,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             tempMap.put("zdsjk" + size, "");
             tempMap.put("zdsjm" + size, "");
             tempMap.put("fcsj" + size, schedule.getFcsj());
-            tempMap.put("fcsjActual" + size, schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "");
+            String fcsjActural=schedule.getFcsjActual() != null ? schedule.getFcsjActual() : "";
+            String bcType=schedule.getBcType()!=null?schedule.getBcType():"";
+            if(bcType.equals("in")){
+            	fcsjActural=fcsjActural+"(进)";
+            }
+            if(bcType.equals("out")){
+            	fcsjActural=fcsjActural+"(出)";
+            }
+            tempMap.put("fcsjActual" + size, fcsjActural);
             tempMap.put("fcsjk" + size, "");
             tempMap.put("fcsjm" + size, "");
             tempMap.put("remarks" + size, schedule.getRemarks() != null ? schedule.getRemarks() : "");
 package com.bsth.service.report.impl;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -14,6 +15,7 @@ import com.bsth.entity.realcontrol.ChildTaskPlan;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 @Service
 public class CulateMileageServiceImpl  implements CulateMileageService{
@@ -25,6 +27,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = lists.get(i);
@@ -47,7 +50,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						newMap.put("dz", scheduleRealInfo.getQdzName());
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
-						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
+						newMap.put("lblc", scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
 						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 						list.add(newMap);
 					}
@@ -71,7 +74,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 							newMap.put("dz", childTaskPlan.getStartStationName());
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
-							newMap.put("lblc", childTaskPlan.getMileage());
+							newMap.put("lblc", childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
 							list.add(newMap);
@@ -80,7 +83,33 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				m1.put("lx", 0);
+				listNew.add(m1);
+				if(lx.equals(m1.get("nr").toString())){
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 Map<String, Object> newMap = new HashMap<String, Object>();
+			 newMap.put("lx", 1);
+		 	 newMap.put("nr", lx);
+			 newMap.put("lp", "小计");
+			 newMap.put("nbbm", "少驶公里");
+			 newMap.put("dz", lbbc);
+			 newMap.put("sj", "少驶公里");
+			 newMap.put("lblc", lblc);
+			 listNew.add(newMap);
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 	@Override
@@ -364,7 +393,7 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 						time=scheduleRealInfo.getFcsj();
 					}
 					if(!time.equals("")){
-						String[] fcsjStr = scheduleRealInfo.getFcsj().split(":");
+						String[] fcsjStr = time.split(":");
 						long fcsj= Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
 						if(childTaskPlans.isEmpty()){
 							if(scheduleRealInfo.getStatus()!=-1){
@@ -8,6 +8,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -38,6 +39,7 @@ import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 import com.bsth.service.report.CulateMileageService;
 import com.bsth.service.report.ReportService;
 import com.bsth.util.Arith;
+import com.bsth.util.ComparableJob;
 import com.bsth.util.db.DBUtils_MS;
 @Service
@@ -1150,6 +1152,7 @@ public class ReportServiceImpl implements ReportService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(Map<String, Object> map) {
 		// TODO Auto-generated method stub
+		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
 		String line=map.get("line").toString();
 		String date=map.get("date").toString();
 		map.put("bcType", "normal");
@@ -1179,7 +1182,7 @@ public class ReportServiceImpl implements ReportService{
 						newMap.put("sj", scheduleRealInfo.getFcsj());
 						newMap.put("lbbc", 1);
 						newMap.put("lblc", scheduleRealInfo.getJhlcOrig());
-						newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+						newMap.put("jyqp", scheduleRealInfo.getRemarks());
 						list.add(newMap);
 					}
@@ -1205,7 +1208,7 @@ public class ReportServiceImpl implements ReportService{
 							newMap.put("sj", childTaskPlan.getStartDate());
 							newMap.put("lbbc", 0);
 							newMap.put("lblc", childTaskPlan.getMileage());
-							newMap.put("jyqp", scheduleRealInfo.getRealMileage());
+							newMap.put("jyqp", childTaskPlan.getRemarks());
 							list.add(newMap);
 						}
@@ -1213,7 +1216,36 @@ public class ReportServiceImpl implements ReportService{
 				}
 			}
 		}
-		return list;
+		List<Map<String, Object>> listNew=new ArrayList<Map<String,Object>>(); 
+		for (int i = 0; i < lblxs.length; i++) {
+			 String lx=lblxs[i];
+			 double lblc=0.0;
+			 int lbbc=0;
+			 for (int j = 0; j < list.size(); j++) {
+				Map<String, Object> m1=list.get(j);
+				if(lx.equals(m1.get("nr").toString())){
+					m1.put("lx", 0);
+					listNew.add(m1);
+					lblc =Arith.add(lblc,Double.parseDouble(m1.get("lblc").toString()));
+					lbbc += Integer.parseInt(m1.get("lbbc").toString());
+				}
+			}
+			 if(lblc>0){
+				 Map<String, Object> newMap = new HashMap<String, Object>();
+				 newMap.put("lx", 1);
+			 	 newMap.put("nr", lx);
+				 newMap.put("lp", "小计");
+				 newMap.put("nbbm", "少驶班次");
+				 newMap.put("jgh", lbbc);
+				 newMap.put("sj", "少驶公里");
+				 newMap.put("lblc", lblc);
+				 listNew.add(newMap);
+			 }
+			
+			 
+		}
+		Collections.sort(listNew, new ComparableJob());
+		return listNew;
 	}
 		//统计临加班次详细信息
@@ -65,7 +65,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param schedulePlan 排班计划对象
      * @param lpInfoResults_output 时刻表每日路牌的情况
      */
-    private ScheduleResults_output loopRuleOutput(
+    public ScheduleResults_output loopRuleOutput(
             SchedulePlan schedulePlan,
             LpInfoResults_output lpInfoResults_output) {
         // 1-1、构造drools规则输入数据，输出数据
@@ -116,7 +116,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param schedulePlan 排班计划对象
      * @return TTInfoResults_output, LpInfoResults_output
      */
-    private Object[] ttInfoOutput(SchedulePlan schedulePlan) {
+    public Object[] ttInfoOutput(SchedulePlan schedulePlan) {
         // 获取线路的所有未作废的时刻表
         List<TTInfo> ttInfos = ttInfoRepository.findInCanceledByXl(schedulePlan.getXl());
@@ -174,7 +174,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
      * @param ttInfoResults_output ttInfoOutput方法规则输出
      * @return PlanResult
      */
-    private PlanResult planResultOutput(
+    public PlanResult planResultOutput(
             SchedulePlan schedulePlan,
             ScheduleResults_output scheduleResults_output,
             TTInfoResults_output ttInfoResults_output) {
@@ -360,7 +360,7 @@ public class TTInfoDetailServiceImpl extends BServiceImpl&lt;TTInfoDetail, Long&gt; im
                 }
                 editInfo.getHeader().addAll(Arrays.asList(headarrays));
-                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.2f,营运里程=%.2f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy));
+                editInfo.setYy_desc(String.format("空驶班次=%d,营运班次=%d,空驶里程=%.2f,营运里程=%.2f,总里程=%.2f", all_bc_ks, all_bc_yy, all_lc_ks, all_lc_yy, all_lc_ks + all_lc_yy));
             }
             LOGGER.info("//---------------- 时刻表编辑用数据输出 success... ----------------//");
@@ -4,7 +4,6 @@ import org.kie.api.KieBase;
 import org.kie.api.KieBaseConfiguration;
 import org.kie.api.KieServices;
 import org.kie.api.builder.*;
-import org.kie.api.builder.Message;
 import org.kie.api.builder.model.KieBaseModel;
 import org.kie.api.builder.model.KieModuleModel;
 import org.kie.api.builder.model.KieSessionModel;
@@ -12,6 +11,8 @@ import org.kie.api.conf.EqualityBehaviorOption;
 import org.kie.api.conf.EventProcessingOption;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.conf.ClockTypeOption;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -20,6 +21,9 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class MyDroolsConfiguration {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(MyDroolsConfiguration.class);
+
     /**
      * 返回一个kiebase知识库，直接冲文件系统读入drl规则文件，
      * TODO：以后需要从数据库读入规则文件，并重新创建kbase知识库。
@@ -72,8 +76,12 @@ public class MyDroolsConfiguration {
         // 4、创建KieBuilder，使用KieFileSystem构建
         KieBuilder kieBuilder = kieServices.newKieBuilder(kfs).buildAll();
         Results results = kieBuilder.getResults();
-        if (results.hasMessages(Message.Level.ERROR))
-            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+//        if (results.hasMessages(Message.Level.ERROR))
+//            throw new IllegalStateException("构建drools6错误：" + results.getMessages());
+        if (results.hasMessages(Message.Level.ERROR)) {
+            logger.info("构建drools6错误：" + results.getMessages());
+            return null;
+        }
         // 5、获取KieContainer
         // TODO：ReleaseId用处很大，以后再议
-package com.bsth.service.schedule.utils;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.Map;
-
-/**
- * 数据导入导出服务。
- */
-public interface DataImportExportService {
-    /**
-     * 上传文件。
-     * @param file mutipartFile
-     * @return 上传后的文件路径
-     * @throws Exception
-     */
-    File uploadFile(MultipartFile file) throws Exception;
-
-    /**
-     * 上传文件，并导入文件数据。
-     * @param datafile 上传的文件
-     * @param ktrFile 导入的逻辑ktr文件
-     * @throws Exception
-     */
-    void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception;
-    void fileDataImport(File datafile, File ktrFile) throws Exception;
-
-    /**
-     * 数据导出。
-     * @param fileName 文件名
-     * @param ktrFile 导出的逻辑ktr文件
-     * @return 导出的文件
-     * @throws Exception
-     */
-    File fileDataOutput(String fileName, File ktrFile) throws Exception;
-
-
-    File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception;
-}
-package com.bsth.service.schedule.utils;
-
-import com.google.common.io.Files;
-import org.joda.time.DateTime;
-import org.pentaho.di.core.KettleEnvironment;
-import org.pentaho.di.core.util.EnvUtil;
-import org.pentaho.di.trans.Trans;
-import org.pentaho.di.trans.TransMeta;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-/**
- * Created by xu on 16/6/23.
- */
-@Service
-@EnableConfigurationProperties(DataToolsProperties.class)
-public class DataImportExportServiceImpl implements DataImportExportService, InitializingBean {
-
-    @Autowired
-    private DataToolsProperties dataToolsProperties;
-
-    /**
-     * 自定义kettle环境初始化定义。
-     */
-    private void ktrEnvironmentInit() throws Exception {
-        // 由于kettle.properties可能没有（没有安装过kettle），
-        // 导致 EnvUtil.environmentInit() 报找不到kettle.properties文件
-        // 所以这里重写 EnvUtil.environmentInit() 方法
-
-        if(Thread.currentThread().getContextClassLoader() == null) {
-            Thread.currentThread().setContextClassLoader(ClassLoader.getSystemClassLoader());
-        }
-
-        // 获取配置文件
-        File file = new File(getClass().getResource(dataToolsProperties.getKettleProperties()).toURI());
-        Properties kettleProperties = EnvUtil.readProperties(file.getAbsolutePath());
-        EnvUtil.applyKettleProperties(kettleProperties);
-        System.getProperties().put("Internal.Cluster.Size", "1");
-        System.getProperties().put("Internal.Slave.Transformation.Number", "0");
-        System.getProperties().put("Internal.Slave.Server.Name", "slave-trans-name");
-        System.getProperties().put("Internal.Step.CopyNr", "0");
-        System.getProperties().put("Internal.Step.Name", "step-name");
-        System.getProperties().put("Internal.Step.Partition.ID", "partition-id");
-        System.getProperties().put("Internal.Step.Partition.Number", "0");
-        System.getProperties().put("Internal.Step.Unique.Count", "1");
-        System.getProperties().put("Internal.Step.Unique.Number", "0");
-        if(!kettleProperties.containsKey("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT")) {
-            System.getProperties().put("vfs.sftp.org.apache.commons.vfs2.provider.sftp.SftpFileSystemConfigBuilder.USER_DIR_IS_ROOT", "false");
-        }
-
-    }
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        // 初始化kettle环境（自定义）
-        ktrEnvironmentInit();
-
-        // 添加全局ktr变量，并覆盖原来的设置
-        Map<String, String> kvars = new HashMap<>();
-        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
-        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
-        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
-        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
-        EnvUtil.applyKettleProperties(kvars, true);
-        KettleEnvironment.init();
-    }
-
-    @Override
-    public File uploadFile(MultipartFile file) throws Exception {
-        // TODO：以后的文件名要加时间戳
-        File newFile = new File(
-                dataToolsProperties.getFileuploadDir() + File.separator +
-                        file.getOriginalFilename());
-        Files.write(file.getBytes(), newFile);
-
-        return newFile;
-    }
-
-    @Override
-    public void fileDataImport(MultipartFile datafile, File ktrFile) throws Exception {
-        // 1、上传数据文件
-        File uploadFile = uploadFile(datafile);
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("filepath", uploadFile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-
-    @Override
-    public void fileDataImport(File datafile, File ktrFile) throws Exception {
-//        // 1、上传数据文件
-//        File uploadFile = datafile;
-
-        // 2、使用kettle运行封装数据导入逻辑的ktr转换文件
-        // 2.1、初始化kettle（组件初始化已经做了）
-        // 2.2、创建转换元数据，转换
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 2.3、设定命名参数，用于指定数据文件，注意每个ktr必须都有以下指定的命名参数
-        trans.setParameterValue("filepath", datafile.getAbsolutePath()); // 指定导入数据文件的位置
-        trans.setParameterValue("erroroutputdir", dataToolsProperties.getTransErrordir()); // ktr转换错误输出目录
-        // TODO：可以考虑设定日志输出
-        // 2.4、执行转换
-        trans.execute(null);
-        // 2.5、等待转换结束
-        trans.waitUntilFinished();
-
-        // 3、判定ktr错误数，注意这种错误代表部分数据错误，不会终止转换执行，一般设计ktr的时候，会有错误输出文件，TODO：以后考虑使用日志实时输出
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-    }
-
-    @Override
-    public File fileDataOutput(String fileName, File ktrFile) throws Exception {
-        return fileDataOutput(fileName, ktrFile, null);
-    }
-
-    @Override
-    public File fileDataOutput(String fileName, File ktrFile, Map<String, Object> param) throws Exception {
-        // 初始化转换，元数据，转换对象
-        TransMeta transMeta = new TransMeta(ktrFile.getAbsolutePath());
-        Trans trans = new Trans(transMeta);
-        // 设定命名参数
-        String filepath = dataToolsProperties.getFileoutputDir() +
-                File.separator +
-                fileName +
-                new DateTime().toString("yyyyMMddHHmmss") + ".xls";
-        trans.setParameterValue("filepath", filepath);
-
-        // 添加其他参数
-        if (!CollectionUtils.isEmpty(param)) {
-            for (String key : param.keySet()) {
-                trans.setParameterValue(key, String.valueOf(param.get(key)));
-            }
-        }
-
-        // 执行转换
-        trans.execute(null);
-        // 等待转换结束
-        trans.waitUntilFinished();
-
-        if (trans.getErrors() > 0) {
-            throw new Exception("转换数据部分错误，请查看相关错误输出文件！");
-        }
-
-        return new File(filepath);
-    }
-
-
-    // TODO：以后改成下面的样子
-//    import java.io.FileInputStream;
-//    import java.io.FileOutputStream;
-//    import java.io.IOException;
-//    import java.io.InputStream;
-//    import java.util.Iterator;
-//
-//    import org.apache.poi.hssf.usermodel.HSSFCell;
-//    import org.apache.poi.hssf.usermodel.HSSFRow;
-//    import org.apache.poi.hssf.usermodel.HSSFSheet;
-//    import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-//
-//    import org.apache.poi.xssf.usermodel.XSSFCell;
-//    import org.apache.poi.xssf.usermodel.XSSFRow;
-//    import org.apache.poi.xssf.usermodel.XSSFSheet;
-//    import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-//
-//    public class ReadWriteExcelFile {
-//
-//        public static void readXLSFile() throws IOException
-//        {
-//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xls");
-//            HSSFWorkbook wb = new HSSFWorkbook(ExcelFileToRead);
-//
-//            HSSFSheet sheet=wb.getSheetAt(0);
-//            HSSFRow row;
-//            HSSFCell cell;
-//
-//            Iterator rows = sheet.rowIterator();
-//
-//            while (rows.hasNext())
-//            {
-//                row=(HSSFRow) rows.next();
-//                Iterator cells = row.cellIterator();
-//
-//                while (cells.hasNext())
-//                {
-//                    cell=(HSSFCell) cells.next();
-//
-//                    if (cell.getCellType() == HSSFCell.CELL_TYPE_STRING)
-//                    {
-//                        System.out.print(cell.getStringCellValue()+" ");
-//                    }
-//                    else if(cell.getCellType() == HSSFCell.CELL_TYPE_NUMERIC)
-//                    {
-//                        System.out.print(cell.getNumericCellValue()+" ");
-//                    }
-//                    else
-//                    {
-//                        //U Can Handel Boolean, Formula, Errors
-//                    }
-//                }
-//                System.out.println();
-//            }
-//
-//        }
-//
-//        public static void writeXLSFile() throws IOException {
-//
-//            String excelFileName = "C:/Test.xls";//name of excel file
-//
-//            String sheetName = "Sheet1";//name of sheet
-//
-//            HSSFWorkbook wb = new HSSFWorkbook();
-//            HSSFSheet sheet = wb.createSheet(sheetName) ;
-//
-//            //iterating r number of rows
-//            for (int r=0;r < 5; r++ )
-//            {
-//                HSSFRow row = sheet.createRow(r);
-//
-//                //iterating c number of columns
-//                for (int c=0;c < 5; c++ )
-//                {
-//                    HSSFCell cell = row.createCell(c);
-//
-//                    cell.setCellValue("Cell "+r+" "+c);
-//                }
-//            }
-//
-//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
-//
-//            //write this workbook to an Outputstream.
-//            wb.write(fileOut);
-//            fileOut.flush();
-//            fileOut.close();
-//        }
-//
-//        public static void readXLSXFile() throws IOException
-//        {
-//            InputStream ExcelFileToRead = new FileInputStream("C:/Test.xlsx");
-//            XSSFWorkbook  wb = new XSSFWorkbook(ExcelFileToRead);
-//
-//            XSSFWorkbook test = new XSSFWorkbook();
-//
-//            XSSFSheet sheet = wb.getSheetAt(0);
-//            XSSFRow row;
-//            XSSFCell cell;
-//
-//            Iterator rows = sheet.rowIterator();
-//
-//            while (rows.hasNext())
-//            {
-//                row=(XSSFRow) rows.next();
-//                Iterator cells = row.cellIterator();
-//                while (cells.hasNext())
-//                {
-//                    cell=(XSSFCell) cells.next();
-//
-//                    if (cell.getCellType() == XSSFCell.CELL_TYPE_STRING)
-//                    {
-//                        System.out.print(cell.getStringCellValue()+" ");
-//                    }
-//                    else if(cell.getCellType() == XSSFCell.CELL_TYPE_NUMERIC)
-//                    {
-//                        System.out.print(cell.getNumericCellValue()+" ");
-//                    }
-//                    else
-//                    {
-//                        //U Can Handel Boolean, Formula, Errors
-//                    }
-//                }
-//                System.out.println();
-//            }
-//
-//        }
-//
-//        public static void writeXLSXFile() throws IOException {
-//
-//            String excelFileName = "C:/Test.xlsx";//name of excel file
-//
-//            String sheetName = "Sheet1";//name of sheet
-//
-//            XSSFWorkbook wb = new XSSFWorkbook();
-//            XSSFSheet sheet = wb.createSheet(sheetName) ;
-//
-//            //iterating r number of rows
-//            for (int r=0;r < 5; r++ )
-//            {
-//                XSSFRow row = sheet.createRow(r);
-//
-//                //iterating c number of columns
-//                for (int c=0;c < 5; c++ )
-//                {
-//                    XSSFCell cell = row.createCell(c);
-//
-//                    cell.setCellValue("Cell "+r+" "+c);
-//                }
-//            }
-//
-//            FileOutputStream fileOut = new FileOutputStream(excelFileName);
-//
-//            //write this workbook to an Outputstream.
-//            wb.write(fileOut);
-//            fileOut.flush();
-//            fileOut.close();
-//        }
-//
-//        public static void main(String[] args) throws IOException {
-//
-//            writeXLSFile();
-//            readXLSFile();
-//
-//            writeXLSXFile();
-//            readXLSXFile();
-//
-//        }
-//
-//    }
-}
@@ -13,10 +13,9 @@ import org.pentaho.di.trans.Trans;
 import org.pentaho.di.trans.TransMeta;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import java.io.File;
 import java.io.PrintWriter;
@@ -24,19 +23,41 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicBoolean;
 /**
  * Created by xu on 17/1/3.
  */
-@Service
+@Component
 @EnableConfigurationProperties(DataToolsProperties.class)
-public class DataToolsServiceImpl implements DataToolsService, InitializingBean {
+public class DataToolsServiceImpl implements DataToolsService {
     /** 日志记录器 */
     private static final Logger LOGGER = LoggerFactory.getLogger(DataToolsServiceImpl.class);
     @Autowired
     private DataToolsProperties dataToolsProperties;
+    /** 原子操作类 */
+    private AtomicBoolean flag = new AtomicBoolean(false);
+
+    private void initKettle() throws Exception {
+        if (flag.compareAndSet(false, true)) {
+            LOGGER.info("kettle初始化......");
+
+            // 初始化kettle环境（自定义）
+            ktrEnvironmentInit();
+
+            // 添加全局ktr变量，并覆盖原来的设置
+            Map<String, String> kvars = new HashMap<>();
+            kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
+            kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
+            kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
+            kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
+            EnvUtil.applyKettleProperties(kvars, true);
+            KettleEnvironment.init();
+        }
+    }
+
     /**
      * 自定义kettle环境初始化定义。
      */
@@ -70,24 +91,11 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
     }
     @Override
-    public void afterPropertiesSet() throws Exception {
-        // 初始化kettle环境（自定义）
-        ktrEnvironmentInit();
-
-        // 添加全局ktr变量，并覆盖原来的设置
-        Map<String, String> kvars = new HashMap<>();
-        kvars.put("v_db_ip", dataToolsProperties.getKvarsDbip());
-        kvars.put("v_db_uname", dataToolsProperties.getKvarsDbuname());
-        kvars.put("v_db_pwd", dataToolsProperties.getKvarsDbpwd());
-        kvars.put("v_db_dname", dataToolsProperties.getKvarsDbdname());
-        EnvUtil.applyKettleProperties(kvars, true);
-        KettleEnvironment.init();
-    }
-
-    @Override
     public File uploadFile(String filename, byte[] filedata) throws ScheduleException {
         // 上传文件
         try {
+            initKettle();
+
             LOGGER.info("start uploadFile...originalFilename={}", filename);
             File newFile = new File(dataToolsProperties.getFileuploadDir() + File.separator +
                     filename + "-upload-" + new DateTime().toString("yyyyMMddHHmmss") + ".xls");
@@ -127,6 +135,8 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
         String transLogId = "";
         String transMetaLogId = "";
         try {
+            initKettle();
+
             LOGGER.info("start importData...originalFilename={}", file.getAbsolutePath());
             // 检查参数
             String transpath = String.valueOf(params.get("transpath"));
@@ -189,6 +199,8 @@ public class DataToolsServiceImpl implements DataToolsService, InitializingBean 
         String transLogId = "";
         String transMetaLogId = "";
         try {
+            initKettle();
+
             LOGGER.info("start exportData...");
             // 检查参数
             String filename = String.valueOf(params.get("filename"));
@@ -3,6 +3,8 @@ package com.bsth.service.sys;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.service.BaseService;
+import java.util.Map;
+
 public interface SysUserService extends BaseService<SysUser, Integer>{
 	SysUser findByUserName(String name);
@@ -10,4 +12,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	int changeEnabled(int id,int enabled);
 	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
 }
 package com.bsth.service.sys.impl;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-
+import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
-import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.SysUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
 	@Autowired
 	SysUserRepository sysUserRepository;
+
+	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
 	public SysUser findByUserName(String name) {
@@ -45,4 +49,25 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	public int changePWD(int id,String newPWD) {
 		return sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(newPWD));
 	}
+
+	@Override
+	public Map<String, Object> register(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		try{
+			//检查用户名是否存在
+			if(findByUserName(u.getUserName()) != null){
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户名" + u.getUserName() + "已存在！");
+			}
+			else{
+				u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+				rs = super.save(u);
+			}
+		}catch (Exception e){
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
 }
+package com.bsth.util;
+
+import java.util.Comparator;
+import java.util.Map;
+
+
+public class ComparableJob implements Comparator<Map<String, Object>>{
+
+	@Override
+	public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+		// TODO Auto-generated method stub
+		return o1.get("nr").toString().compareTo(o2.get("nr").toString());
+	}
+
+}
+package com.bsth.util;
+
+import java.util.Comparator;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+
+public class ComparableLp implements Comparator<ScheduleRealInfo>{
+
+	@Override
+	public int compare(ScheduleRealInfo o1, ScheduleRealInfo o2) {
+		// TODO Auto-generated method stub
+		return o1.getLpName().compareTo(o2.getLpName());
+	}
+
+}
-package com.bsth.util.db;
-
-
-import org.apache.commons.lang3.CharUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-
-/**
- * 
- * @ClassName: BaseDao 
- * @author PanZhao
- * @param <T>
- * @date 2016年6月27日 上午10:33:12 
- *
- */
-public class BaseDao_MS {
-	
-	static Logger logger = LoggerFactory.getLogger(BaseDao_MS.class);
-	
-	/**
-	 * 
-	 * @Title: propertyToField 
-	 * @Description: TODO(java转数据库字段名) 
-	 * @param @param property
-	 * @throws
-	 */
-    public static String propertyToField(String property) {  
-        if (null == property) {  
-            return "";  
-        }  
-        char[] chars = property.toCharArray();  
-        StringBuffer sb = new StringBuffer();  
-        for (char c : chars) {  
-            if (CharUtils.isAsciiAlphaUpper(c)) {  
-                sb.append("_" + StringUtils.lowerCase(CharUtils.toString(c)));  
-            } else {  
-                sb.append(c);  
-            }  
-        }  
-        return sb.toString();  
-    }
-}
 package com.bsth.util.db;
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.sql.Connection;
@@ -10,15 +14,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
-import javax.sql.DataSource;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import com.mchange.v2.c3p0.DataSources;
-
 /**
- * 808GPS SQL Server数据库连接工具类
+ * 网关ms库连接池
  * @author PanZhao
  *
  */
+package com.bsth.util.db;
+
+import com.mchange.v2.c3p0.DataSources;
+import org.apache.log4j.Logger;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 老系统数据库连接池（保持少量的连接，不会对老系统有什么影响）
+ * @author PanZhao
+ *
+ */
+//@Component
+public class DBUtils_oldSystem {
+
+	private static String url = null;
+
+	private static String username = null;
+
+	private static String pwd = null;
+
+	private static DataSource ds_pooled;
+
+	static Logger logger = Logger.getLogger(DBUtils_oldSystem.class);
+	
+	static {
+
+		try {
+			// 1. 加载驱动类
+			Class.forName("oracle.jdbc.driver.OracleDriver");
+
+			url = "jdbc:oracle:thin:@10.10.200.225:1521:orcl";
+			username = "jjwgps";
+			pwd = "jjwgps";
+
+			// 设置连接数据库的配置信息
+			DataSource ds_unpooled = DataSources.unpooledDataSource(url,
+					username, pwd);
+
+			Map<String, Object> pool_conf = new HashMap<String, Object>();
+			// 设置最大连接数
+			pool_conf.put("maxPoolSize", 5);
+			
+			pool_conf.put("testConnectionOnCheckout", false);
+			//异步检测连接的有效性
+			pool_conf.put("testConnectionOnCheckin", true);
+			//10分钟检测一次
+			pool_conf.put("idleConnectionTestPeriod", 60 * 10);
+			ds_pooled = DataSources.pooledDataSource(ds_unpooled, pool_conf);
+		}  catch (ClassNotFoundException e) {
+			logger.error(e.toString());
+			e.printStackTrace();
+		} catch (SQLException e) {
+			logger.error("初始化老系统连接池失败，非正式环境请忽略这个问题！");
+			logger.error(e.toString());
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * 获取连接对象
+	 */
+	public static Connection getConnection() throws SQLException {
+		return ds_pooled.getConnection();
+	}
+
+	/**
+	 * 释放连接池资源
+	 */
+	public static void clearup() {
+		if (ds_pooled != null) {
+			try {
+				DataSources.destroy(ds_pooled);
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * 资源关闭
+	 * 
+	 * @param rs
+	 * @param stmt
+	 * @param conn
+	 */
+	public static void close(ResultSet rs, Statement stmt, Connection conn) {
+		if (rs != null) {
+			try {
+				rs.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (stmt != null) {
+			try {
+				stmt.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+
+		if (conn != null) {
+			try {
+				conn.close();
+			} catch (SQLException e) {
+				logger.error(e.toString());
+				e.printStackTrace();
+			}
+		}
+	}
+
+	public static DataSource getDataSource(){
+		return ds_pooled;
+	}
+}
@@ -86,6 +86,30 @@
   <notepads>
   </notepads>
   <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>bus_control_variable</name>
     <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
     <type>MYSQL</type>
@@ -298,6 +322,18 @@
         <group/>
       </field>
       <field>
+        <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <trim_type>none</trim_type>
+        <repeat>N</repeat>
+        <format/>
+        <currency/>
+        <decimal/>
+        <group/>
+      </field>
+      <field>
         <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
         <type>String</type>
         <length>-1</length>
@@ -358,7 +394,7 @@
         <group/>
       </field>
       <field>
-        <name>&#x4f9b;&#x5e94;&#x5546;&#x540d;&#x79f0;</name>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
         <type>String</type>
         <length>-1</length>
         <precision>-1</precision>
@@ -444,12 +480,12 @@
         <update>Y</update>
       </value>
       <value>
-        <name>inside_code</name>
-        <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
+        <name>car_code</name>
+        <rename>&#x8f66;&#x8f86;&#x7f16;&#x7801;</rename>
         <update>Y</update>
       </value>
       <value>
-        <name>car_code</name>
+        <name>inside_code</name>
         <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
         <update>Y</update>
       </value>
@@ -475,7 +511,7 @@
       </value>
       <value>
         <name>supplier_name</name>
-        <rename>&#x4f9b;&#x5e94;&#x5546;&#x540d;&#x79f0;</rename>
+        <rename>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</rename>
         <update>Y</update>
       </value>
       <value>
@@ -683,4 +719,3 @@
    <slave_transformation>N</slave_transformation>
 </transformation>
-
@@ -81,6 +81,30 @@
   <notepads>
   </notepads>
   <connection>
+    <name>192.168.168.1_jwgl_dw</name>
+    <server>192.168.168.1</server>
+    <type>ORACLE</type>
+    <access>Native</access>
+    <database>orcl</database>
+    <port>1521</port>
+    <username>jwgl_dw</username>
+    <password>Encrypted 2be98afc86aa7f2e4cb13b977d2adabcd</password>
+    <servername/>
+    <data_tablespace/>
+    <index_tablespace/>
+    <attributes>
+      <attribute><code>FORCE_IDENTIFIERS_TO_LOWERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>FORCE_IDENTIFIERS_TO_UPPERCASE</code><attribute>N</attribute></attribute>
+      <attribute><code>IS_CLUSTERED</code><attribute>N</attribute></attribute>
+      <attribute><code>PORT_NUMBER</code><attribute>1521</attribute></attribute>
+      <attribute><code>PRESERVE_RESERVED_WORD_CASE</code><attribute>N</attribute></attribute>
+      <attribute><code>QUOTE_ALL_FIELDS</code><attribute>N</attribute></attribute>
+      <attribute><code>SUPPORTS_BOOLEAN_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>SUPPORTS_TIMESTAMP_DATA_TYPE</code><attribute>Y</attribute></attribute>
+      <attribute><code>USE_POOLING</code><attribute>N</attribute></attribute>
+    </attributes>
+  </connection>
+  <connection>
     <name>bus_control_variable</name>
     <server>&#x24;&#x7b;v_db_ip&#x7d;</server>
     <type>MYSQL</type>
@@ -292,6 +316,11 @@
         <format/>
       </field>
       <field>
+        <name>&#x8f66;&#x8f86;&#x7f16;&#x7801;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>&#x5185;&#x90e8;&#x7f16;&#x7801;</name>
         <type>String</type>
         <format/>
@@ -317,6 +346,11 @@
         <format/>
       </field>
       <field>
+        <name>&#x8bbe;&#x5907;&#x4f9b;&#x5e94;&#x5382;&#x5546;</name>
+        <type>String</type>
+        <format/>
+      </field>
+      <field>
         <name>&#x8bbe;&#x5907;&#x7ec8;&#x7aef;&#x53f7;</name>
         <type>String</type>
         <format/>
@@ -362,6 +396,10 @@
         <rename>&#x8f66;&#x724c;&#x53f7;</rename>
         <length>-2</length>
         <precision>-2</precision>
+      </field>      <field>        <name>car_code</name>
+        <rename>&#x8f66;&#x8f86;&#x7f16;&#x7801;</rename>
+        <length>-2</length>
+        <precision>-2</precision>
       </field>      <field>        <name>inside_code</name>
         <rename>&#x5185;&#x90e8;&#x7f16;&#x7801;</rename>
         <length>-2</length>
+/**
+ * 处理线调文件
+ */
+var fs = require('fs')
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css')
+    , UglifyJS = require("uglify-js");
+;
+
+//不参与的目录
+var pName = 'bsth_control'
+    , path = process.cwd()
+    //根目录
+    , root = path.substr(0, path.indexOf('\\src\\main'))
+    , workspace = root.substr(0, root.indexOf('\\' + pName))
+    //临时目录
+    , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
+    , _static = '\\src\\main\\resources\\static';
+
+
+var mainFile = dest + _static + '\\real_control_v2\\main.html';
+var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
+var realCtl = {
+    /**
+     * 处理线调首页
+     */
+    handleMain: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mainFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mainFile, cb);
+        });
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
+        });
+    }
+};
+
+/**
+ * 处理css
+ * @type {any}
+ */
+var handleCss = function ($, cb) {
+    var cssArray = $('link[rel=stylesheet][merge]');
+    //按 merge 值分组
+    var cssMap = {}, mergeName;
+    for (var i = 0, c; c = cssArray[i++];) {
+        mergeName = $(c).attr('merge');
+        if (!cssMap[mergeName])
+            cssMap[mergeName] = [];
+        cssMap[mergeName].push(dest + _static + $(c).attr('href'));
+        //remove
+        $(c).remove();
+    }
+    //按 merge 合并压缩css
+    var ks = get_keys(cssMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并css
+        new CleanCSS().minify(cssMap[k], function (error, out) {
+            var data = out.styles;
+            var fName = (k + '_' + md5(data)) + '.css';
+            //写入 assets css 目录下
+            var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
+            fs.open(descFile, 'a', function (err, fd) {
+
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        if($('link').length > 0)
+                            $('link').last().before(tag);
+                        else
+                            $('div').first().before(tag);
+                    }
+                    console.log(k + ' css', '结束，下一个');
+                    f();
+                });
+            });
+        });
+    })();
+};
+
+/**
+ * 处理js
+ */
+var handleJs = function ($, file, cb) {
+    var scriptArray = $('script[merge]');
+    //按 merge 值分组
+    var jsMap = {}, mergeName;
+    for (var i = 0, s; s = scriptArray[i++];) {
+        mergeName = $(s).attr('merge');
+        if (!jsMap[mergeName])
+            jsMap[mergeName] = [];
+        jsMap[mergeName].push(dest + _static + $(s).attr('src'));
+        //remove
+        $(s).remove();
+    }
+
+    //按 merge 合并压缩js
+    var ks = get_keys(jsMap), index = 0;
+    (function () {
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'.green);
+            cb && cb();
+            return;
+        }
+        var k = ks[index];
+        index++;
+        var f = arguments.callee;
+        //合并压缩js
+        var result = UglifyJS.minify(jsMap[k]);
+        var data = result.code;
+        var fName = (k + '_' + md5(data)) + '.js';
+        //写入 assets js 目录下
+        var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
+        fs.open(descFile, 'a', function (err, fd) {
+
+            fs.write(fd, data, function () {
+                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                if ($('body').length > 0)
+                    $('body').append(tag);
+                else {
+                    //没有body 就写在尾部
+                    $('*').last().after(tag);
+                }
+                console.log(k + ' js', '结束，下一个');
+                f();
+            });
+        });
+    })();
+};
+
+var get_keys = function (json) {
+    var array = [];
+    for (var key in json) {
+        array.push(key);
+    }
+    return array;
+};
+
+function md5(text) {
+    return crypto.createHash("md5").update(text).digest("hex");
+}
+
+function write(file, text) {
+    fs.writeFile(file, text, function (err) {
+        if (err) {
+            console.log(err.toString().red);
+            process.exit();
+        }
+        console.log(file.green);
+    });
+}
+
+module.exports = realCtl;
 \ No newline at end of file
@@ -10,6 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
     "colors": "^1.1.2",
     "eventproxy": "^0.3.4",
     "uglify-js": "^2.6.2"
@@ -51,7 +51,7 @@ var parse = {
 		}
 		return {jsArray: linkArray, $: $, scriptString: scriptString};
 	}
-}
+};
 function md5(text){
@@ -8,7 +8,8 @@ var fs = require(&#39;fs&#39;)
 	,EventProxy = require('eventproxy')
 	,parse = require('./parse')
 	,minifier = require('./minifier')
-	,crypto = require("crypto");
+	,crypto = require("crypto")
+	,handle_real_ctl = require('./handle_real_ctl');
 //不参与的目录
 var excludes = ['scheduleApp', 'trafficManage', 'control']
@@ -74,15 +75,21 @@ ep.tail(&#39;check-js&#39;, function(){
 //合并压缩JS
 ep.tail('minifier-js', function(){
 	logInfo('handle index.html...');
-	
-	//先处理首页
+
+	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
 		walk(dest + _static + '\\pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
-			ep.emit('package-jar');
+			//处理线调首页
+			handle_real_ctl.handleMain(function () {
+				//处理线调地图
+				handle_real_ctl.handleMap(function () {
+					ep.emit('package-jar');
+				});
+			});
 		});
 	});
 });
@@ -277,6 +277,27 @@
 			initPinYinSelect2('#line',data,'');
 		}) */
+		
+		jQuery.fn.rowspan = function(colIdx) { //封装的一个JQuery小插件
+		      return this.each(function(){
+		         var that;
+		         $('tr', this).each(function(row) {
+		            $('td:eq('+colIdx+')', this).filter(':visible').each(function(col) {
+		               if (that!=null && $(this).html() == $(that).html()) {
+		                  rowspan = $(that).attr("rowSpan");
+		                  if (rowspan == undefined) {
+		                     $(that).attr("rowSpan",1);
+		                     rowspan = $(that).attr("rowSpan"); }
+		                  rowspan = Number(rowspan)+1;
+		                  $(that).attr("rowSpan",rowspan);
+		                  $(this).hide();
+		               } else {
+		                  that = this;
+		               }
+		            });
+		         });
+		      });
+		   }
 		$("#query").on("click",function(){
 			var line=$("#line").val();;
 			var lineName=$(".select2-selection__rendered").html();
@@ -292,6 +313,11 @@
 					 var list_lbqk = template('list_lbqk',{list:result});
 						// 把渲染好的模版html文本追加到表格中
 						$('#forms .list_lbqk').html(list_lbqk);
+						$('#forms .list_lbqk').rowspan(0);
+						$('#forms .list_lbqk').rowspan(1);
+						$('#forms .list_lbqk').rowspan(2);
+						$('#forms .list_lbqk').rowspan(3);
+						
 				})
 				$get('/report/jobLjqk',{line:line,date:date},function(result){
@@ -328,13 +354,19 @@
 			<td>{{obj.nr}}</td>
 			<td>{{obj.lp}}</td>
 			<td>{{obj.nbbm}}</td>
-			<td>{{obj.jgh}}</td>
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.jgh}}</td>
+ 				{{if obj.lx ==0}}
 			<td>{{obj.dz}}</td>
-			<td>{{obj.sj}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="3" {{/if}}>{{obj.sj}}</td>
+				{{if obj.lx ==0}}
 			<td>&nbsp;</td>
 			<td>{{obj.lbbc}}</td>
-			<td>{{obj.lblc}}</td>
+				{{/if}}
+			<td {{if obj.lx ==1}} colspan="2" {{/if}}>{{obj.lblc}}</td>
+				{{if obj.lx ==0}}
 			<td>{{obj.jyqp}}</td>
+				{{/if}}
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}
@@ -14,6 +14,17 @@
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
+	   
+	  #forms > thead > tr> td >span{
+
+	  width: 5px; 
+word-wrap: break-word; 
+letter-spacing: 20px; 
+	  }
+	  
+	   #forms   tr> td >label{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
 </style>
 <div class="page-head">
@@ -60,18 +71,18 @@
 								<th colspan="40">线路调度日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3">路线名</td>
+								<td rowspan="3"><span >路线名</span></td>
 								<td colspan="16"><c>全日</c>营运里程（公里）</td>
 								<td colspan="15"><c>全日</c>营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
-								<td rowspan="2">计划</td>
-								<td rowspan="2">实驶</td>
-								<td rowspan="2">少驶公里</td>
-								<td rowspan="2">少驶班次</td>
+								<td rowspan="2"><span >计划</span></td>
+								<td rowspan="2"><span >实驶</span></td>
+								<td rowspan="2"><span>少驶公里</span></td>
+								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="11">少驶原因（公里）</td>
-								<td rowspan="2">临加公里</td>
+								<td rowspan="2"><span >临加公里</span></td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
 								<td colspan="3">临加班次</td>
@@ -82,35 +93,35 @@
 								<td colspan="5" rowspan="2">原因</td>
 							</tr>
 							<tr>
-								<td>路阻</td>
-								<td>吊慢</td>
-								<td>故障</td>
-								<td>纠纷</td>
-								<td>肇事</td>
-								<td>缺人</td>
-								<td>缺车</td>
-								<td>客稀</td>
-								<td>气候</td>
-								<td>援外</td>
-								<td>其他</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
-								<td><c>全日</c></td>
-								<td>早高峰</td>
-								<td>晚高峰</td>
+								<td><span >路阻</span></td>
+								<td><span>吊慢</span></td>
+								<td><span >故障</span></td>
+								<td><span >纠纷</span></td>
+								<td><span >肇事</span></td>
+								<td><span>缺人</span></td>
+								<td><span>缺车</span></td>
+								<td><span >客稀</span></td>
+								<td><span>气候</span></td>
+								<td><span>援外</span></td>
+								<td><span>其他</span></td>
+								<td><span ><c>全日</c></span></td>
+								<td><span >早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
+								<td><span><c>全日</c></span></td>
+								<td><span>早高峰</span></td>
+								<td><span>晚高峰</span></td>
 							</tr>
 						</thead>
@@ -169,36 +180,36 @@
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
 						<tr>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
-							<td colspan="2">路牌</td>
-							<td colspan="2">车号</td>
-							<td>司早</td>
-							<td>售早</td>
-							<td>司晚</td>
-							<td>售晚</td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td> <label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
+							<td colspan="2"><label>路牌</label></td>
+							<td colspan="2"><label>车号</label></td>
+							<td><label>司早</label></td>
+							<td><label>售早</label></td>
+							<td><label>司晚</label></td>
+							<td><label>售晚</label></td>
 						</tr>
 						<tbody class="scheduleDaily_2">
@@ -208,17 +219,17 @@
 						</tr>
 						<tr>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
 							<td rowspan="2">路牌</td>
-							<td colspan="2" rowspan="2">起点站</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
 							<td colspan="4">到达时间</td>
 							<td colspan="4">发车时间</td>
 							<td colspan="2" rowspan="2">备注</td>
@@ -456,7 +467,7 @@
 </script>
 <script type="text/html" id="scheduleDaily_1">
 	{{each list as obj i}}
-		<tr>
+		<tr >
 			<td>{{obj.xlName}}</td>
 			<td>{{obj.jhlc}}</td>
 			<td>{{obj.sjgl}}</td>
@@ -534,13 +545,13 @@
 			<tr>
 		{{/if}}
 				<td>{{obj.lpName}}</td>
-				<td colspan="2">{{obj.qdzName}}</td>
+				<td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
 				<td>{{obj.zdsj}}</td>
 				<td>{{obj.zdsjActual}}</td>
 				<td>{{obj.fast}}</td>
 				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
-				<td>{{obj.fcsjActual}}
+				<td style="word-break: keep-all;white-space:nowrap;">{{obj.fcsjActual}}
 				{{if obj.bcType== "in"}}
 						(进)
 					{{/if}}
@@ -71,7 +71,7 @@
 								<th>车辆</th>
 								<th>计划里程</th>
 								<th>实际计划里程</th>
-								<th>运营</th>
+								<th>运营里程</th>
 								<th>空驶里程</th>
 								<th>抽减里程</th>
 								<th>增加里程</th>
@@ -239,5 +239,4 @@
 			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
-</script>
 </script>
 \ No newline at end of file
@@ -150,10 +150,26 @@
 			submitHandler : function(f) {
 				var params = form.serializeJSON();
 				error.hide();
-				console.log(params);
-				
-				//检查一下用户是否存在
-				$get('/user/all', {userName_eq: params.userName}, function(list){
+
+				$.ajax({
+					url: '/user/register',
+					type: 'POST',
+					traditional: true,
+					data: params,
+					success: function(rs){
+						if(!rs){
+							layer.msg('未知异常！');
+						}
+						if(rs.status=='SUCCESS'){
+							layer.msg('添加用户成功.');
+							loadPage('list.html');
+						}
+						else if(rs.status=='ERROR'){
+							layer.msg('添加失败[ ' + rs.msg + ']');
+						}
+					}
+				});
+				/*$get('/user/all', {userName_eq: params.userName}, function(list){
 					if(!list || list.length == 0){
 						console.log(params);
 						$.ajax({
@@ -166,14 +182,14 @@
 								loadPage('list.html');
 							}
 						});
-						/* $post('/user', params, function(res){
+						/!* $post('/user', params, function(res){
 							layer.msg('添加用户成功.');
 							loadPage('list.html');
-						}); */
+						}); *!/
 					}
 					else
 						layer.alert('用户【' + params.userName + '】已存在', {icon: 2, title: '提交被拒绝'});
-				});
+				});*/
 			}
 		});
 	});
+/**
+ * saTimeTable指令工具集，创建内部单元格类，及其他操作
+ */
+angular.module('ScheduleApp').factory(
+    'SaTimeTableUtils',
+    [
+        function() {
+            /**
+             * 表格，单元格头类
+             * 如：路牌，出1，青2......进6
+             */
+            var Cell_Header = function(str) {
+                /** 表头数据 */
+                this.headStr = str;
+            };
+            Cell_Header.prototype.setHead = function(str) {
+                this.headStr = str || "";
+            };
+
+            /**
+             * 表格，单元格内容类，在表格上只显示时间，但是内部还是保存其他值。
+             */
+            var Cell_Body_Bc = function() {
+                /** 表格单元格显示的信息 */
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = true; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+
+                this.data.ttdid = undefined; // 班次信息Id
+                this.data.fcsj = undefined; // 发车时间
+                this.data.bcType = undefined; // 班次类型
+                this.data.xldir = undefined; // 线路方向
+                this.data.isfb = undefined; // 是否分班
+                this.data.jhlc = undefined; // 计划里程
+                this.data.qdz = null; // 起点站id
+                this.data.zdz = null; // 终点站id
+                this.data.tcc = null; // 停车场id
+
+                this.self.lpId = undefined; // 路牌Id
+                this.self.lpName = undefined; // 路牌名字
+
+                this.self.fcno = undefined; // 发车序号
+                this.self.bcs = undefined; // 班次数
+            };
+            /**
+             * 路牌单元格类。
+             */
+            var Cell_Body_Lp = function() {
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = false; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+
+                this.data.lpId = undefined; // 路牌Id
+                this.data.lpName = undefined; // 路牌名字
+            };
+            /**
+             * 统计单元格类。
+             */
+            var Cell_Body_Stat = function() {
+                this.info = undefined;
+
+                this.isSel = false; // 是否被选中
+                this.isCanSel = false; // 是否能被选择
+                this.isValidInfo = false; // 数据是否有效
+
+                this.data = {}; // 内部信息
+            };
+
+            Cell_Body_Bc.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Bc.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Bc.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Bc.prototype.validInfo = function() { // 验证班次内数据是否正确
+                if (this.canSel() && this.data.ttdid) {
+                    if (this.data.bcType == 'in') {
+                        this.isValidInfo = this.data.qdz != null && this.data.tcc != null;
+                    } else if (this.data.bcType == 'out') {
+                        this.isValidInfo = this.data.tcc != null && this.data.zdz != null;
+                    } else {
+                        this.isValidInfo = this.data.qdz != null && this.data.zdz != null;
+                    }
+                } else {
+                    this.isValidInfo = true;
+                }
+                return this.isValidInfo;
+            };
+            Cell_Body_Bc.prototype.where = function(
+                    xldir, startTime_h_m, endTime_h_m, isInOut
+                ) { // 判定班次是否在指定条件内
+
+                var fcsj_m_h = [];
+                fcsj_m_h[0] = parseInt(this.data.fcsj.split(":")[0]);
+                fcsj_m_h[1] = parseInt(this.data.fcsj.split(":")[1]);
+
+                var fcsj = new Date(2000,1,1);
+                fcsj.setHours(fcsj_m_h[0]);
+                fcsj.setMinutes(fcsj_m_h[1]);
+
+                var s_temp_date = new Date(2000, 1, 1);
+                var e_temp_date = new Date(2000, 1, 1);
+
+                if (xldir == 2) { // 上下行
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.data.bcType == "in" || this.data.bcType == "out")) {
+                        return false;
+                    }
+
+                    if (startTime_h_m) {
+                        if (endTime_h_m) {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                        } else {
+                            s_temp_date.setHours(startTime_h_m[0]);
+                            s_temp_date.setMinutes(startTime_h_m[1]);
+                            return fcsj >= s_temp_date;
+                        }
+                    } else {
+                        if (endTime_h_m) {
+                            e_temp_date.setHours(endTime_h_m[0]);
+                            e_temp_date.setMinutes(endTime_h_m[1]);
+                            return fcsj <= e_temp_date;
+                        } else {
+                            return false;
+                        }
+                    }
+                } else {
+                    // 判定是否要进出场班次
+                    if (isInOut == false && (this.data.bcType == "in" || this.data.bcType == "out")) {
+                        return false;
+                    }
+
+                    if (xldir == this.xldir) {
+                        if (startTime_h_m) {
+                            if (endTime_h_m) {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj >= s_temp_date && fcsj <= e_temp_date;
+                            } else {
+                                s_temp_date.setHours(startTime_h_m[0]);
+                                s_temp_date.setMinutes(startTime_h_m[1]);
+                                return fcsj >= s_temp_date;
+                            }
+                        } else {
+                            if (endTime_h_m) {
+                                e_temp_date.setHours(endTime_h_m[0]);
+                                e_temp_date.setMinutes(endTime_h_m[1]);
+                                return fcsj <= e_temp_date;
+                            } else {
+                                return true;
+                            }
+                        }
+                    } else {
+                        return false;
+                    }
+                }
+            };
+
+            Cell_Body_Lp.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Lp.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Lp.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+
+            Cell_Body_Stat.prototype.canSel = function() { // 是否能被选中
+                return this.isCanSel;
+            };
+            Cell_Body_Stat.prototype.canUpdate = function() { // 是否能更新
+                return this.isSel && this.data.ttdid;
+            };
+            Cell_Body_Stat.prototype.canDelete = function() { // 是否能删除
+                return this.isSel && this.data.ttdid;
+            };
+
+            return {
+                // TODO：
+            };
+        }
+    ]
+);
 \ No newline at end of file
@@ -126,8 +126,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (busConfigService.dataExport()) {
-                    busConfigService.dataExport().then(
+                var p = busConfigService.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "车辆配置信息.xls");
                         },
@@ -127,8 +127,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (service.dataExport()) {
-                    service.dataExport().then(
+                var p = service.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "人员配置信息.xls");
                         },
@@ -131,8 +131,9 @@ angular.module(&#39;ScheduleApp&#39;).controller(
             // 导出excel
             self.exportData = function() {
-                if (service.dataExport()) {
-                    service.dataExport().then(
+                var p = service.dataExport();
+                if (p) {
+                    p.then(
                         function(result) {
                             fileDownload.downloadFile(result.data, "application/octet-stream", "路牌信息.xls");
                         },
-/*!
+/*
  * jQuery UI Accordion 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Autocomplete 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Button 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Datepicker 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Dialog 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Draggable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Menu 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Progressbar 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Resizable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Selectable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Selectmenu 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Slider 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Sortable 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Spinner 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI Tabs 1.11.1
  * http://jqueryui.com
  *
-/*!
+/*
  * jQuery UI CSS Framework 1.11.1
  * http://jqueryui.com
  *
@@ -30,7 +30,7 @@
 }
 .ui-widget-content {
 	border: 1px solid #aaaaaa/*{borderColorContent}*/;
-	background: #ffffff/*{bgColorContent}*/ url("images/ui-bg_flat_75_ffffff_40x100.png")/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
+	background: #ffffff/*{bgColorContent}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_75_ffffff_40x100.png")/*{bgImgUrlContent}*/ 50%/*{bgContentXPos}*/ 50%/*{bgContentYPos}*/ repeat-x/*{bgContentRepeat}*/;
 	color: #222222/*{fcContent}*/;
 }
 .ui-widget-content a {
@@ -38,7 +38,7 @@
 }
 .ui-widget-header {
 	border: 1px solid #aaaaaa/*{borderColorHeader}*/;
-	background: #cccccc/*{bgColorHeader}*/ url("images/ui-bg_highlight-soft_75_cccccc_1x100.png")/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
+	background: #cccccc/*{bgColorHeader}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png")/*{bgImgUrlHeader}*/ 50%/*{bgHeaderXPos}*/ 50%/*{bgHeaderYPos}*/ repeat-x/*{bgHeaderRepeat}*/;
 	color: #222222/*{fcHeader}*/;
 	font-weight: bold;
 }
@@ -52,7 +52,7 @@
 .ui-widget-content .ui-state-default,
 .ui-widget-header .ui-state-default {
 	border: 1px solid #d3d3d3/*{borderColorDefault}*/;
-	background: #e6e6e6/*{bgColorDefault}*/ url("images/ui-bg_glass_75_e6e6e6_1x400.png")/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
+	background: #e6e6e6/*{bgColorDefault}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png")/*{bgImgUrlDefault}*/ 50%/*{bgDefaultXPos}*/ 50%/*{bgDefaultYPos}*/ repeat-x/*{bgDefaultRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #555555/*{fcDefault}*/;
 }
@@ -69,7 +69,7 @@
 .ui-widget-content .ui-state-focus,
 .ui-widget-header .ui-state-focus {
 	border: 1px solid #999999/*{borderColorHover}*/;
-	background: #dadada/*{bgColorHover}*/ url("images/ui-bg_glass_75_dadada_1x400.png")/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
+	background: #dadada/*{bgColorHover}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_75_dadada_1x400.png")/*{bgImgUrlHover}*/ 50%/*{bgHoverXPos}*/ 50%/*{bgHoverYPos}*/ repeat-x/*{bgHoverRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #212121/*{fcHover}*/;
 }
@@ -88,7 +88,7 @@
 .ui-widget-content .ui-state-active,
 .ui-widget-header .ui-state-active {
 	border: 1px solid #aaaaaa/*{borderColorActive}*/;
-	background: #ffffff/*{bgColorActive}*/ url("images/ui-bg_glass_65_ffffff_1x400.png")/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
+	background: #ffffff/*{bgColorActive}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_65_ffffff_1x400.png")/*{bgImgUrlActive}*/ 50%/*{bgActiveXPos}*/ 50%/*{bgActiveYPos}*/ repeat-x/*{bgActiveRepeat}*/;
 	font-weight: normal/*{fwDefault}*/;
 	color: #212121/*{fcActive}*/;
 }
@@ -105,7 +105,7 @@
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
 	border: 1px solid #fcefa1/*{borderColorHighlight}*/;
-	background: #fbf9ee/*{bgColorHighlight}*/ url("images/ui-bg_glass_55_fbf9ee_1x400.png")/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
+	background: #fbf9ee/*{bgColorHighlight}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png")/*{bgImgUrlHighlight}*/ 50%/*{bgHighlightXPos}*/ 50%/*{bgHighlightYPos}*/ repeat-x/*{bgHighlightRepeat}*/;
 	color: #363636/*{fcHighlight}*/;
 }
 .ui-state-highlight a,
@@ -117,7 +117,7 @@
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
 	border: 1px solid #cd0a0a/*{borderColorError}*/;
-	background: #fef1ec/*{bgColorError}*/ url("images/ui-bg_glass_95_fef1ec_1x400.png")/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
+	background: #fef1ec/*{bgColorError}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png")/*{bgImgUrlError}*/ 50%/*{bgErrorXPos}*/ 50%/*{bgErrorYPos}*/ repeat-x/*{bgErrorRepeat}*/;
 	color: #cd0a0a/*{fcError}*/;
 }
 .ui-state-error a,
@@ -163,27 +163,27 @@
 }
 .ui-icon,
 .ui-widget-content .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png")/*{iconsContent}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_222222_256x240.png")/*{iconsContent}*/;
 }
 .ui-widget-header .ui-icon {
-	background-image: url("images/ui-icons_222222_256x240.png")/*{iconsHeader}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_222222_256x240.png")/*{iconsHeader}*/;
 }
 .ui-state-default .ui-icon {
-	background-image: url("images/ui-icons_888888_256x240.png")/*{iconsDefault}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_888888_256x240.png")/*{iconsDefault}*/;
 }
 .ui-state-hover .ui-icon,
 .ui-state-focus .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png")/*{iconsHover}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_454545_256x240.png")/*{iconsHover}*/;
 }
 .ui-state-active .ui-icon {
-	background-image: url("images/ui-icons_454545_256x240.png")/*{iconsActive}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_454545_256x240.png")/*{iconsActive}*/;
 }
 .ui-state-highlight .ui-icon {
-	background-image: url("images/ui-icons_2e83ff_256x240.png")/*{iconsHighlight}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_2e83ff_256x240.png")/*{iconsHighlight}*/;
 }
 .ui-state-error .ui-icon,
 .ui-state-error-text .ui-icon {
-	background-image: url("images/ui-icons_cd0a0a_256x240.png")/*{iconsError}*/;
+	background-image: url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-icons_cd0a0a_256x240.png")/*{iconsError}*/;
 }
 /* positioning */
@@ -396,14 +396,14 @@
 /* Overlays */
 .ui-widget-overlay {
-	background: #aaaaaa/*{bgColorOverlay}*/ url("images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
+	background: #aaaaaa/*{bgColorOverlay}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlOverlay}*/ 50%/*{bgOverlayXPos}*/ 50%/*{bgOverlayYPos}*/ repeat-x/*{bgOverlayRepeat}*/;
 	opacity: .3/*{opacityOverlay}*/;
 	filter: Alpha(Opacity=30)/*{opacityFilterOverlay}*/; /* support: IE8 */
 }
 .ui-widget-shadow {
 	margin: -8px/*{offsetTopShadow}*/ 0 0 -8px/*{offsetLeftShadow}*/;
 	padding: 8px/*{thicknessShadow}*/;
-	background: #aaaaaa/*{bgColorShadow}*/ url("images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
+	background: #aaaaaa/*{bgColorShadow}*/ url("/real_control_v2/assets/plugins/jquery.ui/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png")/*{bgImgUrlShadow}*/ 50%/*{bgShadowXPos}*/ 50%/*{bgShadowYPos}*/ repeat-x/*{bgShadowRepeat}*/;
 	opacity: .3/*{opacityShadow}*/;
 	filter: Alpha(Opacity=30)/*{opacityFilterShadow}*/; /* support: IE8 */
 	border-radius: 8px/*{cornerRadiusShadow}*/;
-/*!
+/*
  * jQuery UI Tooltip 1.11.1
  * http://jqueryui.com
  *
@@ -400,7 +400,7 @@
 }
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default .jstree-node {
   background-position: -292px -4px;
@@ -505,13 +505,13 @@
   background-position: 0 0;
 }
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default .jstree-file {
-  background: url("32px.png") -100px -68px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -100px -68px no-repeat;
 }
 .jstree-default .jstree-folder {
-  background: url("32px.png") -260px -4px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -260px -4px no-repeat;
 }
 .jstree-default > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -523,7 +523,7 @@
 }
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -573,7 +573,7 @@
 }
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default-small .jstree-node {
   background-position: -295px -7px;
@@ -678,13 +678,13 @@
   background-position: 0 0;
 }
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default-small .jstree-file {
-  background: url("32px.png") -103px -71px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -103px -71px no-repeat;
 }
 .jstree-default-small .jstree-folder {
-  background: url("32px.png") -263px -7px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -263px -7px no-repeat;
 }
 .jstree-default-small > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -696,7 +696,7 @@
 }
 #jstree-dnd.jstree-default-small .jstree-ok,
 #jstree-dnd.jstree-default-small .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -746,7 +746,7 @@
 }
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
 }
 .jstree-default-large .jstree-node {
   background-position: -288px 0px;
@@ -851,13 +851,13 @@
   background-position: 0 0;
 }
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-  background: url("throbber.gif") center center no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/throbber.gif") center center no-repeat;
 }
 .jstree-default-large .jstree-file {
-  background: url("32px.png") -96px -64px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -96px -64px no-repeat;
 }
 .jstree-default-large .jstree-folder {
-  background: url("32px.png") -256px 0px no-repeat;
+  background: url("/real_control_v2/assets/plugins/jstree/default/32px.png") -256px 0px no-repeat;
 }
 .jstree-default-large > .jstree-container-ul > .jstree-node {
   margin-left: 0;
@@ -869,7 +869,7 @@
 }
 #jstree-dnd.jstree-default-large .jstree-ok,
 #jstree-dnd.jstree-default-large .jstree-er {
-  background-image: url("32px.png");
+  background-image: url("/real_control_v2/assets/plugins/jstree/default/32px.png");
   background-repeat: no-repeat;
   background-color: transparent;
 }
@@ -904,12 +904,12 @@
     height: 40px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-position: 0 -200px;
     background-size: 120px 240px;
   }
   #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-position: -40px -200px;
     background-size: 120px 240px;
   }
@@ -928,7 +928,7 @@
 	*/
   }
   .jstree-default-responsive .jstree-icon {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
   }
   .jstree-default-responsive .jstree-node,
   .jstree-default-responsive .jstree-leaf > .jstree-ocl {
@@ -1032,7 +1032,7 @@
   .jstree-default-responsive .jstree-node > .jstree-ocl,
   .jstree-default-responsive .jstree-themeicon,
   .jstree-default-responsive .jstree-checkbox {
-    background-image: url("40px.png");
+    background-image: url("/real_control_v2/assets/plugins/jstree/default/40px.png");
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-node {
@@ -1054,11 +1054,11 @@
     background-position: 0 0;
   }
   .jstree-default-responsive .jstree-file {
-    background: url("40px.png") 0 -160px no-repeat;
+    background: url("/real_control_v2/assets/plugins/jstree/default/40px.png") 0 -160px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive .jstree-folder {
-    background: url("40px.png") -40px -40px no-repeat;
+    background: url("/real_control_v2/assets/plugins/jstree/default/40px.png") -40px -40px no-repeat;
     background-size: 120px 240px;
   }
   .jstree-default-responsive > .jstree-container-ul > .jstree-node {
-.jstree-node,.jstree-children,.jstree-container-ul{display:block;margin:0;padding:0;list-style-type:none;list-style-image:none}.jstree-node{white-space:nowrap}.jstree-anchor{display:inline-block;color:#000;white-space:nowrap;padding:0 4px 0 1px;margin:0;vertical-align:top}.jstree-anchor:focus{outline:0}.jstree-anchor,.jstree-anchor:link,.jstree-anchor:visited,.jstree-anchor:hover,.jstree-anchor:active{text-decoration:none;color:inherit}.jstree-icon{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-icon:empty{display:inline-block;text-decoration:none;margin:0;padding:0;vertical-align:top;text-align:center}.jstree-ocl{cursor:pointer}.jstree-leaf>.jstree-ocl{cursor:default}.jstree .jstree-open>.jstree-children{display:block}.jstree .jstree-closed>.jstree-children,.jstree .jstree-leaf>.jstree-children{display:none}.jstree-anchor>.jstree-themeicon{margin-right:2px}.jstree-no-icons .jstree-themeicon,.jstree-anchor>.jstree-themeicon-hidden{display:none}.jstree-hidden,.jstree-node.jstree-hidden{display:none}.jstree-rtl .jstree-anchor{padding:0 1px 0 4px}.jstree-rtl .jstree-anchor>.jstree-themeicon{margin-left:2px;margin-right:0}.jstree-rtl .jstree-node{margin-left:0}.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-wholerow-ul{position:relative;display:inline-block;min-width:100%}.jstree-wholerow-ul .jstree-leaf>.jstree-ocl{cursor:pointer}.jstree-wholerow-ul .jstree-anchor,.jstree-wholerow-ul .jstree-icon{position:relative}.jstree-wholerow-ul .jstree-wholerow{width:100%;cursor:pointer;position:absolute;left:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vakata-context{display:none}.vakata-context,.vakata-context ul{margin:0;padding:2px;position:absolute;background:#f5f5f5;border:1px solid #979797;box-shadow:2px 2px 2px #999}.vakata-context ul{list-style:none;left:100%;margin-top:-2.7em;margin-left:-4px}.vakata-context .vakata-context-right ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context li{list-style:none}.vakata-context li>a{display:block;padding:0 2em;text-decoration:none;width:auto;color:#000;white-space:nowrap;line-height:2.4em;text-shadow:1px 1px 0 #fff;border-radius:1px}.vakata-context li>a:hover{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAIORI4JlrqN1oMSnmmZDQUAOw==);background-position:right center;background-repeat:no-repeat}.vakata-context li>a:focus{outline:0}.vakata-context .vakata-context-hover>a{position:relative;background-color:#e8eff7;box-shadow:0 0 2px #0a6aa1}.vakata-context .vakata-context-separator>a,.vakata-context .vakata-context-separator>a:hover{background:#fff;border:0;border-top:1px solid #e2e3e3;height:1px;min-height:1px;max-height:1px;padding:0;margin:0 0 0 2.4em;border-left:1px solid #e0e0e0;text-shadow:0 0 0 transparent;box-shadow:0 0 0 transparent;border-radius:0}.vakata-context .vakata-contextmenu-disabled a,.vakata-context .vakata-contextmenu-disabled a:hover{color:silver;background-color:transparent;border:0;box-shadow:0 0 0}.vakata-context li>a>i{text-decoration:none;display:inline-block;width:2.4em;height:2.4em;background:0 0;margin:0 0 0 -2em;vertical-align:top;text-align:center;line-height:2.4em}.vakata-context li>a>i:empty{width:2.4em;line-height:2.4em}.vakata-context li>a .vakata-contextmenu-sep{display:inline-block;width:1px;height:2.4em;background:#fff;margin:0 .5em 0 0;border-left:1px solid #e2e3e3}.vakata-context .vakata-contextmenu-shortcut{font-size:.8em;color:silver;opacity:.5;display:none}.vakata-context-rtl ul{left:auto;right:100%;margin-left:auto;margin-right:-4px}.vakata-context-rtl li>a.vakata-context-parent{background-image:url(data:image/gif;base64,R0lGODlhCwAHAIAAACgoKP///yH5BAEAAAEALAAAAAALAAcAAAINjI+AC7rWHIsPtmoxLAA7);background-position:left center;background-repeat:no-repeat}.vakata-context-rtl .vakata-context-separator>a{margin:0 2.4em 0 0;border-left:0;border-right:1px solid #e2e3e3}.vakata-context-rtl .vakata-context-left ul{right:auto;left:100%;margin-left:-4px;margin-right:auto}.vakata-context-rtl li>a>i{margin:0 -2em 0 0}.vakata-context-rtl li>a .vakata-contextmenu-sep{margin:0 0 0 .5em;border-left-color:#fff;background:#e2e3e3}#jstree-marker{position:absolute;top:0;left:0;margin:-5px 0 0 0;padding:0;border-right:0;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid;width:0;height:0;font-size:0;line-height:0}#jstree-dnd{line-height:16px;margin:0;padding:4px}#jstree-dnd .jstree-icon,#jstree-dnd .jstree-copy{display:inline-block;text-decoration:none;margin:0 2px 0 0;padding:0;width:16px;height:16px}#jstree-dnd .jstree-ok{background:green}#jstree-dnd .jstree-er{background:red}#jstree-dnd .jstree-copy{margin:0 2px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-repeat:no-repeat;background-color:transparent}.jstree-default .jstree-anchor,.jstree-default .jstree-wholerow{transition:background-color .15s,box-shadow .15s}.jstree-default .jstree-hovered{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-context{background:#e7f4f9;border-radius:2px;box-shadow:inset 0 0 1px #ccc}.jstree-default .jstree-clicked{background:#beebff;border-radius:2px;box-shadow:inset 0 0 1px #999}.jstree-default .jstree-no-icons .jstree-anchor>.jstree-themeicon{display:none}.jstree-default .jstree-disabled{background:0 0;color:#666}.jstree-default .jstree-disabled.jstree-hovered{background:0 0;box-shadow:none}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-disabled>.jstree-icon{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default .jstree-search{font-style:italic;color:#8b0000;font-weight:700}.jstree-default .jstree-no-checkboxes .jstree-checkbox{display:none!important}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked{background:0 0;box-shadow:none}.jstree-default.jstree-checkbox-no-clicked .jstree-clicked.jstree-hovered{background:#e7f4f9}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked{background:0 0}.jstree-default.jstree-checkbox-no-clicked>.jstree-wholerow-ul .jstree-wholerow-clicked.jstree-wholerow-hovered{background:#e7f4f9}.jstree-default>.jstree-striped{min-width:100%;display:inline-block;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAkCAMAAAB/qqA+AAAABlBMVEUAAAAAAAClZ7nPAAAAAnRSTlMNAMM9s3UAAAAXSURBVHjajcEBAQAAAIKg/H/aCQZ70AUBjAATb6YPDgAAAABJRU5ErkJggg==) left top repeat}.jstree-default>.jstree-wholerow-ul .jstree-hovered,.jstree-default>.jstree-wholerow-ul .jstree-clicked{background:0 0;box-shadow:none;border-radius:0}.jstree-default .jstree-wholerow{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.jstree-default .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default .jstree-wholerow-clicked{background:#beebff;background:-webkit-linear-gradient(top,#beebff 0,#a8e4ff 100%);background:linear-gradient(to bottom,#beebff 0,#a8e4ff 100%)}.jstree-default .jstree-node{min-height:24px;line-height:24px;margin-left:24px;min-width:24px}.jstree-default .jstree-anchor{line-height:24px;height:24px}.jstree-default .jstree-icon{width:24px;height:24px;line-height:24px}.jstree-default .jstree-icon:empty{width:24px;height:24px;line-height:24px}.jstree-default.jstree-rtl .jstree-node{margin-right:24px}.jstree-default .jstree-wholerow{height:24px}.jstree-default .jstree-node,.jstree-default .jstree-icon{background-image:url(32px.png)}.jstree-default .jstree-node{background-position:-292px -4px;background-repeat:repeat-y}.jstree-default .jstree-last{background:0 0}.jstree-default .jstree-open>.jstree-ocl{background-position:-132px -4px}.jstree-default .jstree-closed>.jstree-ocl{background-position:-100px -4px}.jstree-default .jstree-leaf>.jstree-ocl{background-position:-68px -4px}.jstree-default .jstree-themeicon{background-position:-260px -4px}.jstree-default>.jstree-no-dots .jstree-node,.jstree-default>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -4px}.jstree-default>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -4px}.jstree-default .jstree-disabled{background:0 0}.jstree-default .jstree-disabled.jstree-hovered{background:0 0}.jstree-default .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default .jstree-checkbox{background-position:-164px -4px}.jstree-default .jstree-checkbox:hover{background-position:-164px -36px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default .jstree-checked>.jstree-checkbox{background-position:-228px -4px}.jstree-default.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default .jstree-checked>.jstree-checkbox:hover{background-position:-228px -36px}.jstree-default .jstree-anchor>.jstree-undetermined{background-position:-196px -4px}.jstree-default .jstree-anchor>.jstree-undetermined:hover{background-position:-196px -36px}.jstree-default .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default>.jstree-striped{background-size:auto 48px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default.jstree-rtl .jstree-open>.jstree-ocl{background-position:-132px -36px}.jstree-default.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-100px -36px}.jstree-default.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-68px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-36px -36px}.jstree-default.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-4px -36px}.jstree-default .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default .jstree-file{background:url(32px.png) -100px -68px no-repeat}.jstree-default .jstree-folder{background:url(32px.png) -260px -4px no-repeat}.jstree-default>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default{line-height:24px;padding:0 4px}#jstree-dnd.jstree-default .jstree-ok,#jstree-dnd.jstree-default .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default i{background:0 0;width:24px;height:24px;line-height:24px}#jstree-dnd.jstree-default .jstree-ok{background-position:-4px -68px}#jstree-dnd.jstree-default .jstree-er{background-position:-36px -68px}.jstree-default.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==)}.jstree-default.jstree-rtl .jstree-last{background:0 0}.jstree-default-small .jstree-node{min-height:18px;line-height:18px;margin-left:18px;min-width:18px}.jstree-default-small .jstree-anchor{line-height:18px;height:18px}.jstree-default-small .jstree-icon{width:18px;height:18px;line-height:18px}.jstree-default-small .jstree-icon:empty{width:18px;height:18px;line-height:18px}.jstree-default-small.jstree-rtl .jstree-node{margin-right:18px}.jstree-default-small .jstree-wholerow{height:18px}.jstree-default-small .jstree-node,.jstree-default-small .jstree-icon{background-image:url(32px.png)}.jstree-default-small .jstree-node{background-position:-295px -7px;background-repeat:repeat-y}.jstree-default-small .jstree-last{background:0 0}.jstree-default-small .jstree-open>.jstree-ocl{background-position:-135px -7px}.jstree-default-small .jstree-closed>.jstree-ocl{background-position:-103px -7px}.jstree-default-small .jstree-leaf>.jstree-ocl{background-position:-71px -7px}.jstree-default-small .jstree-themeicon{background-position:-263px -7px}.jstree-default-small>.jstree-no-dots .jstree-node,.jstree-default-small>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -7px}.jstree-default-small>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -7px}.jstree-default-small .jstree-disabled{background:0 0}.jstree-default-small .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-small .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-small .jstree-checkbox{background-position:-167px -7px}.jstree-default-small .jstree-checkbox:hover{background-position:-167px -39px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-small .jstree-checked>.jstree-checkbox{background-position:-231px -7px}.jstree-default-small.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-small .jstree-checked>.jstree-checkbox:hover{background-position:-231px -39px}.jstree-default-small .jstree-anchor>.jstree-undetermined{background-position:-199px -7px}.jstree-default-small .jstree-anchor>.jstree-undetermined:hover{background-position:-199px -39px}.jstree-default-small .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-small>.jstree-striped{background-size:auto 36px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-small.jstree-rtl .jstree-open>.jstree-ocl{background-position:-135px -39px}.jstree-default-small.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-103px -39px}.jstree-default-small.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-71px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-39px -39px}.jstree-default-small.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:-7px -39px}.jstree-default-small .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-small>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-small .jstree-file{background:url(32px.png) -103px -71px no-repeat}.jstree-default-small .jstree-folder{background:url(32px.png) -263px -7px no-repeat}.jstree-default-small>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-small{line-height:18px;padding:0 4px}#jstree-dnd.jstree-default-small .jstree-ok,#jstree-dnd.jstree-default-small .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-small i{background:0 0;width:18px;height:18px;line-height:18px}#jstree-dnd.jstree-default-small .jstree-ok{background-position:-7px -71px}#jstree-dnd.jstree-default-small .jstree-er{background-position:-39px -71px}.jstree-default-small.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAACAQMAAABv1h6PAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMHBgAAiABBI4gz9AAAAABJRU5ErkJggg==)}.jstree-default-small.jstree-rtl .jstree-last{background:0 0}.jstree-default-large .jstree-node{min-height:32px;line-height:32px;margin-left:32px;min-width:32px}.jstree-default-large .jstree-anchor{line-height:32px;height:32px}.jstree-default-large .jstree-icon{width:32px;height:32px;line-height:32px}.jstree-default-large .jstree-icon:empty{width:32px;height:32px;line-height:32px}.jstree-default-large.jstree-rtl .jstree-node{margin-right:32px}.jstree-default-large .jstree-wholerow{height:32px}.jstree-default-large .jstree-node,.jstree-default-large .jstree-icon{background-image:url(32px.png)}.jstree-default-large .jstree-node{background-position:-288px 0;background-repeat:repeat-y}.jstree-default-large .jstree-last{background:0 0}.jstree-default-large .jstree-open>.jstree-ocl{background-position:-128px 0}.jstree-default-large .jstree-closed>.jstree-ocl{background-position:-96px 0}.jstree-default-large .jstree-leaf>.jstree-ocl{background-position:-64px 0}.jstree-default-large .jstree-themeicon{background-position:-256px 0}.jstree-default-large>.jstree-no-dots .jstree-node,.jstree-default-large>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px 0}.jstree-default-large>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 0}.jstree-default-large .jstree-disabled{background:0 0}.jstree-default-large .jstree-disabled.jstree-hovered{background:0 0}.jstree-default-large .jstree-disabled.jstree-clicked{background:#efefef}.jstree-default-large .jstree-checkbox{background-position:-160px 0}.jstree-default-large .jstree-checkbox:hover{background-position:-160px -32px}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-large .jstree-checked>.jstree-checkbox{background-position:-224px 0}.jstree-default-large.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-large .jstree-checked>.jstree-checkbox:hover{background-position:-224px -32px}.jstree-default-large .jstree-anchor>.jstree-undetermined{background-position:-192px 0}.jstree-default-large .jstree-anchor>.jstree-undetermined:hover{background-position:-192px -32px}.jstree-default-large .jstree-checkbox-disabled{opacity:.8;filter:url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'jstree-grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#jstree-grayscale");filter:gray;-webkit-filter:grayscale(100%)}.jstree-default-large>.jstree-striped{background-size:auto 64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==);background-position:100% 1px;background-repeat:repeat-y}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}.jstree-default-large.jstree-rtl .jstree-open>.jstree-ocl{background-position:-128px -32px}.jstree-default-large.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-96px -32px}.jstree-default-large.jstree-rtl .jstree-leaf>.jstree-ocl{background-position:-64px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-node,.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-open>.jstree-ocl{background-position:-32px -32px}.jstree-default-large.jstree-rtl>.jstree-no-dots .jstree-closed>.jstree-ocl{background-position:0 -32px}.jstree-default-large .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-large>.jstree-container-ul .jstree-loading>.jstree-ocl{background:url(throbber.gif) center center no-repeat}.jstree-default-large .jstree-file{background:url(32px.png) -96px -64px no-repeat}.jstree-default-large .jstree-folder{background:url(32px.png) -256px 0 no-repeat}.jstree-default-large>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}#jstree-dnd.jstree-default-large{line-height:32px;padding:0 4px}#jstree-dnd.jstree-default-large .jstree-ok,#jstree-dnd.jstree-default-large .jstree-er{background-image:url(32px.png);background-repeat:no-repeat;background-color:transparent}#jstree-dnd.jstree-default-large i{background:0 0;width:32px;height:32px;line-height:32px}#jstree-dnd.jstree-default-large .jstree-ok{background-position:0 -64px}#jstree-dnd.jstree-default-large .jstree-er{background-position:-32px -64px}.jstree-default-large.jstree-rtl .jstree-node{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAACAQMAAAAD0EyKAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjgIIGBgABCgCBvVLXcAAAAABJRU5ErkJggg==)}.jstree-default-large.jstree-rtl .jstree-last{background:0 0}@media (max-width:768px){#jstree-dnd.jstree-dnd-responsive{line-height:40px;font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}#jstree-dnd.jstree-dnd-responsive>i{background:0 0;width:40px;height:40px}#jstree-dnd.jstree-dnd-responsive>.jstree-ok{background-image:url(40px.png);background-position:0 -200px;background-size:120px 240px}#jstree-dnd.jstree-dnd-responsive>.jstree-er{background-image:url(40px.png);background-position:-40px -200px;background-size:120px 240px}#jstree-marker.jstree-dnd-responsive{border-left-width:10px;border-top-width:10px;border-bottom-width:10px;margin-top:-10px}}@media (max-width:768px){.jstree-default-responsive .jstree-icon{background-image:url(40px.png)}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-node{min-height:40px;line-height:40px;margin-left:40px;min-width:40px;white-space:nowrap}.jstree-default-responsive .jstree-anchor{line-height:40px;height:40px}.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-icon:empty{width:40px;height:40px;line-height:40px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0}.jstree-default-responsive.jstree-rtl .jstree-node{margin-left:0;margin-right:40px;background:0 0}.jstree-default-responsive.jstree-rtl .jstree-container-ul>.jstree-node{margin-right:0}.jstree-default-responsive .jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-size:120px 240px}.jstree-default-responsive .jstree-leaf>.jstree-ocl,.jstree-default-responsive.jstree-rtl .jstree-leaf>.jstree-ocl{background:0 0}.jstree-default-responsive .jstree-open>.jstree-ocl{background-position:0 0!important}.jstree-default-responsive .jstree-closed>.jstree-ocl{background-position:0 -40px!important}.jstree-default-responsive.jstree-rtl .jstree-closed>.jstree-ocl{background-position:-40px 0!important}.jstree-default-responsive .jstree-themeicon{background-position:-40px -40px}.jstree-default-responsive .jstree-checkbox,.jstree-default-responsive .jstree-checkbox:hover{background-position:-40px -80px}.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox,.jstree-default-responsive.jstree-checkbox-selection .jstree-clicked>.jstree-checkbox:hover,.jstree-default-responsive .jstree-checked>.jstree-checkbox,.jstree-default-responsive .jstree-checked>.jstree-checkbox:hover{background-position:0 -80px}.jstree-default-responsive .jstree-anchor>.jstree-undetermined,.jstree-default-responsive .jstree-anchor>.jstree-undetermined:hover{background-position:0 -120px}.jstree-default-responsive .jstree-anchor{font-weight:700;font-size:1.1em;text-shadow:1px 1px #fff}.jstree-default-responsive>.jstree-striped{background:0 0}.jstree-default-responsive .jstree-wholerow{border-top:1px solid rgba(255,255,255,.7);border-bottom:1px solid rgba(64,64,64,.2);background:#ebebeb;height:40px}.jstree-default-responsive .jstree-wholerow-hovered{background:#e7f4f9}.jstree-default-responsive .jstree-wholerow-clicked{background:#beebff}.jstree-default-responsive .jstree-children .jstree-last>.jstree-wholerow{box-shadow:inset 0 -6px 3px -5px #666}.jstree-default-responsive .jstree-children .jstree-open>.jstree-wholerow{box-shadow:inset 0 6px 3px -5px #666;border-top:0}.jstree-default-responsive .jstree-children .jstree-open+.jstree-open{box-shadow:none}.jstree-default-responsive .jstree-node,.jstree-default-responsive .jstree-icon,.jstree-default-responsive .jstree-node>.jstree-ocl,.jstree-default-responsive .jstree-themeicon,.jstree-default-responsive .jstree-checkbox{background-image:url(40px.png);background-size:120px 240px}.jstree-default-responsive .jstree-node{background-position:-80px 0;background-repeat:repeat-y}.jstree-default-responsive .jstree-last{background:0 0}.jstree-default-responsive .jstree-leaf>.jstree-ocl{background-position:-40px -120px}.jstree-default-responsive .jstree-last>.jstree-ocl{background-position:-40px -160px}.jstree-default-responsive .jstree-themeicon-custom{background-color:transparent;background-image:none;background-position:0 0}.jstree-default-responsive .jstree-file{background:url(40px.png) 0 -160px no-repeat;background-size:120px 240px}.jstree-default-responsive .jstree-folder{background:url(40px.png) -40px -40px no-repeat;background-size:120px 240px}.jstree-default-responsive>.jstree-container-ul>.jstree-node{margin-left:0;margin-right:0}}
 \ No newline at end of file
+/* perfect-scrollbar v0.6.16 */
+.ps-container {
+  -ms-touch-action: auto;
+  touch-action: auto;
+  overflow: hidden !important;
+  -ms-overflow-style: none; }
+  @supports (-ms-overflow-style: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
+    .ps-container {
+      overflow: auto !important; } }
+  .ps-container.ps-active-x > .ps-scrollbar-x-rail,
+  .ps-container.ps-active-y > .ps-scrollbar-y-rail {
+    display: block;
+    background-color: transparent; }
+  .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container > .ps-scrollbar-x-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    bottom: 0px;
+    /* there must be 'bottom' for ps-scrollbar-x-rail */
+    height: 15px; }
+    .ps-container > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      bottom: 2px;
+      /* there must be 'bottom' for ps-scrollbar-x */
+      height: 6px; }
+    .ps-container > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x, .ps-container > .ps-scrollbar-x-rail:active > .ps-scrollbar-x {
+      height: 11px; }
+  .ps-container > .ps-scrollbar-y-rail {
+    display: none;
+    position: absolute;
+    /* please don't change 'position' */
+    opacity: 0;
+    -webkit-transition: background-color .2s linear, opacity .2s linear;
+    -o-transition: background-color .2s linear, opacity .2s linear;
+    -moz-transition: background-color .2s linear, opacity .2s linear;
+    transition: background-color .2s linear, opacity .2s linear;
+    right: 0;
+    /* there must be 'right' for ps-scrollbar-y-rail */
+    width: 15px; }
+    .ps-container > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      position: absolute;
+      /* please don't change 'position' */
+      background-color: #aaa;
+      -webkit-border-radius: 6px;
+      -moz-border-radius: 6px;
+      border-radius: 6px;
+      -webkit-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, -webkit-border-radius .2s ease-in-out;
+      -o-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      -moz-transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out;
+      transition: background-color .2s linear, height .2s linear, width .2s ease-in-out, border-radius .2s ease-in-out, -webkit-border-radius .2s ease-in-out, -moz-border-radius .2s ease-in-out;
+      right: 2px;
+      /* there must be 'right' for ps-scrollbar-y */
+      width: 6px; }
+    .ps-container > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y, .ps-container > .ps-scrollbar-y-rail:active > .ps-scrollbar-y {
+      width: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-x > .ps-scrollbar-x-rail > .ps-scrollbar-x {
+      background-color: #999;
+      height: 11px; }
+  .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover.ps-in-scrolling.ps-y > .ps-scrollbar-y-rail > .ps-scrollbar-y {
+      background-color: #999;
+      width: 11px; }
+  .ps-container:hover > .ps-scrollbar-x-rail,
+  .ps-container:hover > .ps-scrollbar-y-rail {
+    opacity: 0.6; }
+  .ps-container:hover > .ps-scrollbar-x-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-x-rail:hover > .ps-scrollbar-x {
+      background-color: #999; }
+  .ps-container:hover > .ps-scrollbar-y-rail:hover {
+    background-color: #eee;
+    opacity: 0.9; }
+    .ps-container:hover > .ps-scrollbar-y-rail:hover > .ps-scrollbar-y {
+      background-color: #999; }
+/* perfect-scrollbar v0.6.16 */
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+'use strict';
+
+var ps = require('../main');
+var psInstances = require('../plugin/instances');
+
+function mountJQuery(jQuery) {
+  jQuery.fn.perfectScrollbar = function (settingOrCommand) {
+    return this.each(function () {
+      if (typeof settingOrCommand === 'object' ||
+          typeof settingOrCommand === 'undefined') {
+        // If it's an object or none, initialize.
+        var settings = settingOrCommand;
+
+        if (!psInstances.get(this)) {
+          ps.initialize(this, settings);
+        }
+      } else {
+        // Unless, it may be a command.
+        var command = settingOrCommand;
+
+        if (command === 'update') {
+          ps.update(this);
+        } else if (command === 'destroy') {
+          ps.destroy(this);
+        }
+      }
+    });
+  };
+}
+
+if (typeof define === 'function' && define.amd) {
+  // AMD. Register as an anonymous module.
+  define(['jquery'], mountJQuery);
+} else {
+  var jq = window.jQuery ? window.jQuery : window.$;
+  if (typeof jq !== 'undefined') {
+    mountJQuery(jq);
+  }
+}
+
+module.exports = mountJQuery;
+
+},{"../main":7,"../plugin/instances":18}],2:[function(require,module,exports){
+'use strict';
+
+function oldAdd(element, className) {
+  var classes = element.className.split(' ');
+  if (classes.indexOf(className) < 0) {
+    classes.push(className);
+  }
+  element.className = classes.join(' ');
+}
+
+function oldRemove(element, className) {
+  var classes = element.className.split(' ');
+  var idx = classes.indexOf(className);
+  if (idx >= 0) {
+    classes.splice(idx, 1);
+  }
+  element.className = classes.join(' ');
+}
+
+exports.add = function (element, className) {
+  if (element.classList) {
+    element.classList.add(className);
+  } else {
+    oldAdd(element, className);
+  }
+};
+
+exports.remove = function (element, className) {
+  if (element.classList) {
+    element.classList.remove(className);
+  } else {
+    oldRemove(element, className);
+  }
+};
+
+exports.list = function (element) {
+  if (element.classList) {
+    return Array.prototype.slice.apply(element.classList);
+  } else {
+    return element.className.split(' ');
+  }
+};
+
+},{}],3:[function(require,module,exports){
+'use strict';
+
+var DOM = {};
+
+DOM.e = function (tagName, className) {
+  var element = document.createElement(tagName);
+  element.className = className;
+  return element;
+};
+
+DOM.appendTo = function (child, parent) {
+  parent.appendChild(child);
+  return child;
+};
+
+function cssGet(element, styleName) {
+  return window.getComputedStyle(element)[styleName];
+}
+
+function cssSet(element, styleName, styleValue) {
+  if (typeof styleValue === 'number') {
+    styleValue = styleValue.toString() + 'px';
+  }
+  element.style[styleName] = styleValue;
+  return element;
+}
+
+function cssMultiSet(element, obj) {
+  for (var key in obj) {
+    var val = obj[key];
+    if (typeof val === 'number') {
+      val = val.toString() + 'px';
+    }
+    element.style[key] = val;
+  }
+  return element;
+}
+
+DOM.css = function (element, styleNameOrObject, styleValue) {
+  if (typeof styleNameOrObject === 'object') {
+    // multiple set with object
+    return cssMultiSet(element, styleNameOrObject);
+  } else {
+    if (typeof styleValue === 'undefined') {
+      return cssGet(element, styleNameOrObject);
+    } else {
+      return cssSet(element, styleNameOrObject, styleValue);
+    }
+  }
+};
+
+DOM.matches = function (element, query) {
+  if (typeof element.matches !== 'undefined') {
+    return element.matches(query);
+  } else {
+    if (typeof element.matchesSelector !== 'undefined') {
+      return element.matchesSelector(query);
+    } else if (typeof element.webkitMatchesSelector !== 'undefined') {
+      return element.webkitMatchesSelector(query);
+    } else if (typeof element.mozMatchesSelector !== 'undefined') {
+      return element.mozMatchesSelector(query);
+    } else if (typeof element.msMatchesSelector !== 'undefined') {
+      return element.msMatchesSelector(query);
+    }
+  }
+};
+
+DOM.remove = function (element) {
+  if (typeof element.remove !== 'undefined') {
+    element.remove();
+  } else {
+    if (element.parentNode) {
+      element.parentNode.removeChild(element);
+    }
+  }
+};
+
+DOM.queryChildren = function (element, selector) {
+  return Array.prototype.filter.call(element.childNodes, function (child) {
+    return DOM.matches(child, selector);
+  });
+};
+
+module.exports = DOM;
+
+},{}],4:[function(require,module,exports){
+'use strict';
+
+var EventElement = function (element) {
+  this.element = element;
+  this.events = {};
+};
+
+EventElement.prototype.bind = function (eventName, handler) {
+  if (typeof this.events[eventName] === 'undefined') {
+    this.events[eventName] = [];
+  }
+  this.events[eventName].push(handler);
+  this.element.addEventListener(eventName, handler, false);
+};
+
+EventElement.prototype.unbind = function (eventName, handler) {
+  var isHandlerProvided = (typeof handler !== 'undefined');
+  this.events[eventName] = this.events[eventName].filter(function (hdlr) {
+    if (isHandlerProvided && hdlr !== handler) {
+      return true;
+    }
+    this.element.removeEventListener(eventName, hdlr, false);
+    return false;
+  }, this);
+};
+
+EventElement.prototype.unbindAll = function () {
+  for (var name in this.events) {
+    this.unbind(name);
+  }
+};
+
+var EventManager = function () {
+  this.eventElements = [];
+};
+
+EventManager.prototype.eventElement = function (element) {
+  var ee = this.eventElements.filter(function (eventElement) {
+    return eventElement.element === element;
+  })[0];
+  if (typeof ee === 'undefined') {
+    ee = new EventElement(element);
+    this.eventElements.push(ee);
+  }
+  return ee;
+};
+
+EventManager.prototype.bind = function (element, eventName, handler) {
+  this.eventElement(element).bind(eventName, handler);
+};
+
+EventManager.prototype.unbind = function (element, eventName, handler) {
+  this.eventElement(element).unbind(eventName, handler);
+};
+
+EventManager.prototype.unbindAll = function () {
+  for (var i = 0; i < this.eventElements.length; i++) {
+    this.eventElements[i].unbindAll();
+  }
+};
+
+EventManager.prototype.once = function (element, eventName, handler) {
+  var ee = this.eventElement(element);
+  var onceHandler = function (e) {
+    ee.unbind(eventName, onceHandler);
+    handler(e);
+  };
+  ee.bind(eventName, onceHandler);
+};
+
+module.exports = EventManager;
+
+},{}],5:[function(require,module,exports){
+'use strict';
+
+module.exports = (function () {
+  function s4() {
+    return Math.floor((1 + Math.random()) * 0x10000)
+               .toString(16)
+               .substring(1);
+  }
+  return function () {
+    return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
+           s4() + '-' + s4() + s4() + s4();
+  };
+})();
+
+},{}],6:[function(require,module,exports){
+'use strict';
+
+var cls = require('./class');
+var dom = require('./dom');
+
+var toInt = exports.toInt = function (x) {
+  return parseInt(x, 10) || 0;
+};
+
+var clone = exports.clone = function (obj) {
+  if (!obj) {
+    return null;
+  } else if (obj.constructor === Array) {
+    return obj.map(clone);
+  } else if (typeof obj === 'object') {
+    var result = {};
+    for (var key in obj) {
+      result[key] = clone(obj[key]);
+    }
+    return result;
+  } else {
+    return obj;
+  }
+};
+
+exports.extend = function (original, source) {
+  var result = clone(original);
+  for (var key in source) {
+    result[key] = clone(source[key]);
+  }
+  return result;
+};
+
+exports.isEditable = function (el) {
+  return dom.matches(el, "input,[contenteditable]") ||
+         dom.matches(el, "select,[contenteditable]") ||
+         dom.matches(el, "textarea,[contenteditable]") ||
+         dom.matches(el, "button,[contenteditable]");
+};
+
+exports.removePsClasses = function (element) {
+  var clsList = cls.list(element);
+  for (var i = 0; i < clsList.length; i++) {
+    var className = clsList[i];
+    if (className.indexOf('ps-') === 0) {
+      cls.remove(element, className);
+    }
+  }
+};
+
+exports.outerWidth = function (element) {
+  return toInt(dom.css(element, 'width')) +
+         toInt(dom.css(element, 'paddingLeft')) +
+         toInt(dom.css(element, 'paddingRight')) +
+         toInt(dom.css(element, 'borderLeftWidth')) +
+         toInt(dom.css(element, 'borderRightWidth'));
+};
+
+exports.startScrolling = function (element, axis) {
+  cls.add(element, 'ps-in-scrolling');
+  if (typeof axis !== 'undefined') {
+    cls.add(element, 'ps-' + axis);
+  } else {
+    cls.add(element, 'ps-x');
+    cls.add(element, 'ps-y');
+  }
+};
+
+exports.stopScrolling = function (element, axis) {
+  cls.remove(element, 'ps-in-scrolling');
+  if (typeof axis !== 'undefined') {
+    cls.remove(element, 'ps-' + axis);
+  } else {
+    cls.remove(element, 'ps-x');
+    cls.remove(element, 'ps-y');
+  }
+};
+
+exports.env = {
+  isWebKit: 'WebkitAppearance' in document.documentElement.style,
+  supportsTouch: (('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch),
+  supportsIePointer: window.navigator.msMaxTouchPoints !== null
+};
+
+},{"./class":2,"./dom":3}],7:[function(require,module,exports){
+'use strict';
+
+var destroy = require('./plugin/destroy');
+var initialize = require('./plugin/initialize');
+var update = require('./plugin/update');
+
+module.exports = {
+  initialize: initialize,
+  update: update,
+  destroy: destroy
+};
+
+},{"./plugin/destroy":9,"./plugin/initialize":17,"./plugin/update":21}],8:[function(require,module,exports){
+'use strict';
+
+module.exports = {
+  handlers: ['click-rail', 'drag-scrollbar', 'keyboard', 'wheel', 'touch'],
+  maxScrollbarLength: null,
+  minScrollbarLength: null,
+  scrollXMarginOffset: 0,
+  scrollYMarginOffset: 0,
+  suppressScrollX: false,
+  suppressScrollY: false,
+  swipePropagation: true,
+  useBothWheelAxes: false,
+  wheelPropagation: false,
+  wheelSpeed: 1,
+  theme: 'default'
+};
+
+},{}],9:[function(require,module,exports){
+'use strict';
+
+var _ = require('../lib/helper');
+var dom = require('../lib/dom');
+var instances = require('./instances');
+
+module.exports = function (element) {
+  var i = instances.get(element);
+
+  if (!i) {
+    return;
+  }
+
+  i.event.unbindAll();
+  dom.remove(i.scrollbarX);
+  dom.remove(i.scrollbarY);
+  dom.remove(i.scrollbarXRail);
+  dom.remove(i.scrollbarYRail);
+  _.removePsClasses(element);
+
+  instances.remove(element);
+};
+
+},{"../lib/dom":3,"../lib/helper":6,"./instances":18}],10:[function(require,module,exports){
+'use strict';
+
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindClickRailHandler(element, i) {
+  function pageOffset(el) {
+    return el.getBoundingClientRect();
+  }
+  var stopPropagation = function (e) { e.stopPropagation(); };
+
+  i.event.bind(i.scrollbarY, 'click', stopPropagation);
+  i.event.bind(i.scrollbarYRail, 'click', function (e) {
+    var positionTop = e.pageY - window.pageYOffset - pageOffset(i.scrollbarYRail).top;
+    var direction = positionTop > i.scrollbarYTop ? 1 : -1;
+
+    updateScroll(element, 'top', element.scrollTop + direction * i.containerHeight);
+    updateGeometry(element);
+
+    e.stopPropagation();
+  });
+
+  i.event.bind(i.scrollbarX, 'click', stopPropagation);
+  i.event.bind(i.scrollbarXRail, 'click', function (e) {
+    var positionLeft = e.pageX - window.pageXOffset - pageOffset(i.scrollbarXRail).left;
+    var direction = positionLeft > i.scrollbarXLeft ? 1 : -1;
+
+    updateScroll(element, 'left', element.scrollLeft + direction * i.containerWidth);
+    updateGeometry(element);
+
+    e.stopPropagation();
+  });
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindClickRailHandler(element, i);
+};
+
+},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],11:[function(require,module,exports){
+'use strict';
+
+var _ = require('../../lib/helper');
+var dom = require('../../lib/dom');
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindMouseScrollXHandler(element, i) {
+  var currentLeft = null;
+  var currentPageX = null;
+
+  function updateScrollLeft(deltaX) {
+    var newLeft = currentLeft + (deltaX * i.railXRatio);
+    var maxLeft = Math.max(0, i.scrollbarXRail.getBoundingClientRect().left) + (i.railXRatio * (i.railXWidth - i.scrollbarXWidth));
+
+    if (newLeft < 0) {
+      i.scrollbarXLeft = 0;
+    } else if (newLeft > maxLeft) {
+      i.scrollbarXLeft = maxLeft;
+    } else {
+      i.scrollbarXLeft = newLeft;
+    }
+
+    var scrollLeft = _.toInt(i.scrollbarXLeft * (i.contentWidth - i.containerWidth) / (i.containerWidth - (i.railXRatio * i.scrollbarXWidth))) - i.negativeScrollAdjustment;
+    updateScroll(element, 'left', scrollLeft);
+  }
+
+  var mouseMoveHandler = function (e) {
+    updateScrollLeft(e.pageX - currentPageX);
+    updateGeometry(element);
+    e.stopPropagation();
+    e.preventDefault();
+  };
+
+  var mouseUpHandler = function () {
+    _.stopScrolling(element, 'x');
+    i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler);
+  };
+
+  i.event.bind(i.scrollbarX, 'mousedown', function (e) {
+    currentPageX = e.pageX;
+    currentLeft = _.toInt(dom.css(i.scrollbarX, 'left')) * i.railXRatio;
+    _.startScrolling(element, 'x');
+
+    i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler);
+    i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler);
+
+    e.stopPropagation();
+    e.preventDefault();
+  });
+}
+
+function bindMouseScrollYHandler(element, i) {
+  var currentTop = null;
+  var currentPageY = null;
+
+  function updateScrollTop(deltaY) {
+    var newTop = currentTop + (deltaY * i.railYRatio);
+    var maxTop = Math.max(0, i.scrollbarYRail.getBoundingClientRect().top) + (i.railYRatio * (i.railYHeight - i.scrollbarYHeight));
+
+    if (newTop < 0) {
+      i.scrollbarYTop = 0;
+    } else if (newTop > maxTop) {
+      i.scrollbarYTop = maxTop;
+    } else {
+      i.scrollbarYTop = newTop;
+    }
+
+    var scrollTop = _.toInt(i.scrollbarYTop * (i.contentHeight - i.containerHeight) / (i.containerHeight - (i.railYRatio * i.scrollbarYHeight)));
+    updateScroll(element, 'top', scrollTop);
+  }
+
+  var mouseMoveHandler = function (e) {
+    updateScrollTop(e.pageY - currentPageY);
+    updateGeometry(element);
+    e.stopPropagation();
+    e.preventDefault();
+  };
+
+  var mouseUpHandler = function () {
+    _.stopScrolling(element, 'y');
+    i.event.unbind(i.ownerDocument, 'mousemove', mouseMoveHandler);
+  };
+
+  i.event.bind(i.scrollbarY, 'mousedown', function (e) {
+    currentPageY = e.pageY;
+    currentTop = _.toInt(dom.css(i.scrollbarY, 'top')) * i.railYRatio;
+    _.startScrolling(element, 'y');
+
+    i.event.bind(i.ownerDocument, 'mousemove', mouseMoveHandler);
+    i.event.once(i.ownerDocument, 'mouseup', mouseUpHandler);
+
+    e.stopPropagation();
+    e.preventDefault();
+  });
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindMouseScrollXHandler(element, i);
+  bindMouseScrollYHandler(element, i);
+};
+
+},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],12:[function(require,module,exports){
+'use strict';
+
+var _ = require('../../lib/helper');
+var dom = require('../../lib/dom');
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindKeyboardHandler(element, i) {
+  var hovered = false;
+  i.event.bind(element, 'mouseenter', function () {
+    hovered = true;
+  });
+  i.event.bind(element, 'mouseleave', function () {
+    hovered = false;
+  });
+
+  var shouldPrevent = false;
+  function shouldPreventDefault(deltaX, deltaY) {
+    var scrollTop = element.scrollTop;
+    if (deltaX === 0) {
+      if (!i.scrollbarYActive) {
+        return false;
+      }
+      if ((scrollTop === 0 && deltaY > 0) || (scrollTop >= i.contentHeight - i.containerHeight && deltaY < 0)) {
+        return !i.settings.wheelPropagation;
+      }
+    }
+
+    var scrollLeft = element.scrollLeft;
+    if (deltaY === 0) {
+      if (!i.scrollbarXActive) {
+        return false;
+      }
+      if ((scrollLeft === 0 && deltaX < 0) || (scrollLeft >= i.contentWidth - i.containerWidth && deltaX > 0)) {
+        return !i.settings.wheelPropagation;
+      }
+    }
+    return true;
+  }
+
+  i.event.bind(i.ownerDocument, 'keydown', function (e) {
+    if ((e.isDefaultPrevented && e.isDefaultPrevented()) || e.defaultPrevented) {
+      return;
+    }
+
+    var focused = dom.matches(i.scrollbarX, ':focus') ||
+                  dom.matches(i.scrollbarY, ':focus');
+
+    if (!hovered && !focused) {
+      return;
+    }
+
+    var activeElement = document.activeElement ? document.activeElement : i.ownerDocument.activeElement;
+    if (activeElement) {
+      if (activeElement.tagName === 'IFRAME') {
+        activeElement = activeElement.contentDocument.activeElement;
+      } else {
+        // go deeper if element is a webcomponent
+        while (activeElement.shadowRoot) {
+          activeElement = activeElement.shadowRoot.activeElement;
+        }
+      }
+      if (_.isEditable(activeElement)) {
+        return;
+      }
+    }
+
+    var deltaX = 0;
+    var deltaY = 0;
+
+    switch (e.which) {
+    case 37: // left
+      if (e.metaKey) {
+        deltaX = -i.contentWidth;
+      } else if (e.altKey) {
+        deltaX = -i.containerWidth;
+      } else {
+        deltaX = -30;
+      }
+      break;
+    case 38: // up
+      if (e.metaKey) {
+        deltaY = i.contentHeight;
+      } else if (e.altKey) {
+        deltaY = i.containerHeight;
+      } else {
+        deltaY = 30;
+      }
+      break;
+    case 39: // right
+      if (e.metaKey) {
+        deltaX = i.contentWidth;
+      } else if (e.altKey) {
+        deltaX = i.containerWidth;
+      } else {
+        deltaX = 30;
+      }
+      break;
+    case 40: // down
+      if (e.metaKey) {
+        deltaY = -i.contentHeight;
+      } else if (e.altKey) {
+        deltaY = -i.containerHeight;
+      } else {
+        deltaY = -30;
+      }
+      break;
+    case 33: // page up
+      deltaY = 90;
+      break;
+    case 32: // space bar
+      if (e.shiftKey) {
+        deltaY = 90;
+      } else {
+        deltaY = -90;
+      }
+      break;
+    case 34: // page down
+      deltaY = -90;
+      break;
+    case 35: // end
+      if (e.ctrlKey) {
+        deltaY = -i.contentHeight;
+      } else {
+        deltaY = -i.containerHeight;
+      }
+      break;
+    case 36: // home
+      if (e.ctrlKey) {
+        deltaY = element.scrollTop;
+      } else {
+        deltaY = i.containerHeight;
+      }
+      break;
+    default:
+      return;
+    }
+
+    updateScroll(element, 'top', element.scrollTop - deltaY);
+    updateScroll(element, 'left', element.scrollLeft + deltaX);
+    updateGeometry(element);
+
+    shouldPrevent = shouldPreventDefault(deltaX, deltaY);
+    if (shouldPrevent) {
+      e.preventDefault();
+    }
+  });
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindKeyboardHandler(element, i);
+};
+
+},{"../../lib/dom":3,"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],13:[function(require,module,exports){
+'use strict';
+
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindMouseWheelHandler(element, i) {
+  var shouldPrevent = false;
+
+  function shouldPreventDefault(deltaX, deltaY) {
+    var scrollTop = element.scrollTop;
+    if (deltaX === 0) {
+      if (!i.scrollbarYActive) {
+        return false;
+      }
+      if ((scrollTop === 0 && deltaY > 0) || (scrollTop >= i.contentHeight - i.containerHeight && deltaY < 0)) {
+        return !i.settings.wheelPropagation;
+      }
+    }
+
+    var scrollLeft = element.scrollLeft;
+    if (deltaY === 0) {
+      if (!i.scrollbarXActive) {
+        return false;
+      }
+      if ((scrollLeft === 0 && deltaX < 0) || (scrollLeft >= i.contentWidth - i.containerWidth && deltaX > 0)) {
+        return !i.settings.wheelPropagation;
+      }
+    }
+    return true;
+  }
+
+  function getDeltaFromEvent(e) {
+    var deltaX = e.deltaX;
+    var deltaY = -1 * e.deltaY;
+
+    if (typeof deltaX === "undefined" || typeof deltaY === "undefined") {
+      // OS X Safari
+      deltaX = -1 * e.wheelDeltaX / 6;
+      deltaY = e.wheelDeltaY / 6;
+    }
+
+    if (e.deltaMode && e.deltaMode === 1) {
+      // Firefox in deltaMode 1: Line scrolling
+      deltaX *= 10;
+      deltaY *= 10;
+    }
+
+    if (deltaX !== deltaX && deltaY !== deltaY/* NaN checks */) {
+      // IE in some mouse drivers
+      deltaX = 0;
+      deltaY = e.wheelDelta;
+    }
+
+    if (e.shiftKey) {
+      // reverse axis with shift key
+      return [-deltaY, -deltaX];
+    }
+    return [deltaX, deltaY];
+  }
+
+  function shouldBeConsumedByChild(deltaX, deltaY) {
+    var child = element.querySelector('textarea:hover, select[multiple]:hover, .ps-child:hover');
+    if (child) {
+      if (!window.getComputedStyle(child).overflow.match(/(scroll|auto)/)) {
+        // if not scrollable
+        return false;
+      }
+
+      var maxScrollTop = child.scrollHeight - child.clientHeight;
+      if (maxScrollTop > 0) {
+        if (!(child.scrollTop === 0 && deltaY > 0) && !(child.scrollTop === maxScrollTop && deltaY < 0)) {
+          return true;
+        }
+      }
+      var maxScrollLeft = child.scrollLeft - child.clientWidth;
+      if (maxScrollLeft > 0) {
+        if (!(child.scrollLeft === 0 && deltaX < 0) && !(child.scrollLeft === maxScrollLeft && deltaX > 0)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  function mousewheelHandler(e) {
+    var delta = getDeltaFromEvent(e);
+
+    var deltaX = delta[0];
+    var deltaY = delta[1];
+
+    if (shouldBeConsumedByChild(deltaX, deltaY)) {
+      return;
+    }
+
+    shouldPrevent = false;
+    if (!i.settings.useBothWheelAxes) {
+      // deltaX will only be used for horizontal scrolling and deltaY will
+      // only be used for vertical scrolling - this is the default
+      updateScroll(element, 'top', element.scrollTop - (deltaY * i.settings.wheelSpeed));
+      updateScroll(element, 'left', element.scrollLeft + (deltaX * i.settings.wheelSpeed));
+    } else if (i.scrollbarYActive && !i.scrollbarXActive) {
+      // only vertical scrollbar is active and useBothWheelAxes option is
+      // active, so let's scroll vertical bar using both mouse wheel axes
+      if (deltaY) {
+        updateScroll(element, 'top', element.scrollTop - (deltaY * i.settings.wheelSpeed));
+      } else {
+        updateScroll(element, 'top', element.scrollTop + (deltaX * i.settings.wheelSpeed));
+      }
+      shouldPrevent = true;
+    } else if (i.scrollbarXActive && !i.scrollbarYActive) {
+      // useBothWheelAxes and only horizontal bar is active, so use both
+      // wheel axes for horizontal bar
+      if (deltaX) {
+        updateScroll(element, 'left', element.scrollLeft + (deltaX * i.settings.wheelSpeed));
+      } else {
+        updateScroll(element, 'left', element.scrollLeft - (deltaY * i.settings.wheelSpeed));
+      }
+      shouldPrevent = true;
+    }
+
+    updateGeometry(element);
+
+    shouldPrevent = (shouldPrevent || shouldPreventDefault(deltaX, deltaY));
+    if (shouldPrevent) {
+      e.stopPropagation();
+      e.preventDefault();
+    }
+  }
+
+  if (typeof window.onwheel !== "undefined") {
+    i.event.bind(element, 'wheel', mousewheelHandler);
+  } else if (typeof window.onmousewheel !== "undefined") {
+    i.event.bind(element, 'mousewheel', mousewheelHandler);
+  }
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindMouseWheelHandler(element, i);
+};
+
+},{"../instances":18,"../update-geometry":19,"../update-scroll":20}],14:[function(require,module,exports){
+'use strict';
+
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+
+function bindNativeScrollHandler(element, i) {
+  i.event.bind(element, 'scroll', function () {
+    updateGeometry(element);
+  });
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindNativeScrollHandler(element, i);
+};
+
+},{"../instances":18,"../update-geometry":19}],15:[function(require,module,exports){
+'use strict';
+
+var _ = require('../../lib/helper');
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindSelectionHandler(element, i) {
+  function getRangeNode() {
+    var selection = window.getSelection ? window.getSelection() :
+                    document.getSelection ? document.getSelection() : '';
+    if (selection.toString().length === 0) {
+      return null;
+    } else {
+      return selection.getRangeAt(0).commonAncestorContainer;
+    }
+  }
+
+  var scrollingLoop = null;
+  var scrollDiff = {top: 0, left: 0};
+  function startScrolling() {
+    if (!scrollingLoop) {
+      scrollingLoop = setInterval(function () {
+        if (!instances.get(element)) {
+          clearInterval(scrollingLoop);
+          return;
+        }
+
+        updateScroll(element, 'top', element.scrollTop + scrollDiff.top);
+        updateScroll(element, 'left', element.scrollLeft + scrollDiff.left);
+        updateGeometry(element);
+      }, 50); // every .1 sec
+    }
+  }
+  function stopScrolling() {
+    if (scrollingLoop) {
+      clearInterval(scrollingLoop);
+      scrollingLoop = null;
+    }
+    _.stopScrolling(element);
+  }
+
+  var isSelected = false;
+  i.event.bind(i.ownerDocument, 'selectionchange', function () {
+    if (element.contains(getRangeNode())) {
+      isSelected = true;
+    } else {
+      isSelected = false;
+      stopScrolling();
+    }
+  });
+  i.event.bind(window, 'mouseup', function () {
+    if (isSelected) {
+      isSelected = false;
+      stopScrolling();
+    }
+  });
+  i.event.bind(window, 'keyup', function () {
+    if (isSelected) {
+      isSelected = false;
+      stopScrolling();
+    }
+  });
+
+  i.event.bind(window, 'mousemove', function (e) {
+    if (isSelected) {
+      var mousePosition = {x: e.pageX, y: e.pageY};
+      var containerGeometry = {
+        left: element.offsetLeft,
+        right: element.offsetLeft + element.offsetWidth,
+        top: element.offsetTop,
+        bottom: element.offsetTop + element.offsetHeight
+      };
+
+      if (mousePosition.x < containerGeometry.left + 3) {
+        scrollDiff.left = -5;
+        _.startScrolling(element, 'x');
+      } else if (mousePosition.x > containerGeometry.right - 3) {
+        scrollDiff.left = 5;
+        _.startScrolling(element, 'x');
+      } else {
+        scrollDiff.left = 0;
+      }
+
+      if (mousePosition.y < containerGeometry.top + 3) {
+        if (containerGeometry.top + 3 - mousePosition.y < 5) {
+          scrollDiff.top = -5;
+        } else {
+          scrollDiff.top = -20;
+        }
+        _.startScrolling(element, 'y');
+      } else if (mousePosition.y > containerGeometry.bottom - 3) {
+        if (mousePosition.y - containerGeometry.bottom + 3 < 5) {
+          scrollDiff.top = 5;
+        } else {
+          scrollDiff.top = 20;
+        }
+        _.startScrolling(element, 'y');
+      } else {
+        scrollDiff.top = 0;
+      }
+
+      if (scrollDiff.top === 0 && scrollDiff.left === 0) {
+        stopScrolling();
+      } else {
+        startScrolling();
+      }
+    }
+  });
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+  bindSelectionHandler(element, i);
+};
+
+},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],16:[function(require,module,exports){
+'use strict';
+
+var _ = require('../../lib/helper');
+var instances = require('../instances');
+var updateGeometry = require('../update-geometry');
+var updateScroll = require('../update-scroll');
+
+function bindTouchHandler(element, i, supportsTouch, supportsIePointer) {
+  function shouldPreventDefault(deltaX, deltaY) {
+    var scrollTop = element.scrollTop;
+    var scrollLeft = element.scrollLeft;
+    var magnitudeX = Math.abs(deltaX);
+    var magnitudeY = Math.abs(deltaY);
+
+    if (magnitudeY > magnitudeX) {
+      // user is perhaps trying to swipe up/down the page
+
+      if (((deltaY < 0) && (scrollTop === i.contentHeight - i.containerHeight)) ||
+          ((deltaY > 0) && (scrollTop === 0))) {
+        return !i.settings.swipePropagation;
+      }
+    } else if (magnitudeX > magnitudeY) {
+      // user is perhaps trying to swipe left/right across the page
+
+      if (((deltaX < 0) && (scrollLeft === i.contentWidth - i.containerWidth)) ||
+          ((deltaX > 0) && (scrollLeft === 0))) {
+        return !i.settings.swipePropagation;
+      }
+    }
+
+    return true;
+  }
+
+  function applyTouchMove(differenceX, differenceY) {
+    updateScroll(element, 'top', element.scrollTop - differenceY);
+    updateScroll(element, 'left', element.scrollLeft - differenceX);
+
+    updateGeometry(element);
+  }
+
+  var startOffset = {};
+  var startTime = 0;
+  var speed = {};
+  var easingLoop = null;
+  var inGlobalTouch = false;
+  var inLocalTouch = false;
+
+  function globalTouchStart() {
+    inGlobalTouch = true;
+  }
+  function globalTouchEnd() {
+    inGlobalTouch = false;
+  }
+
+  function getTouch(e) {
+    if (e.targetTouches) {
+      return e.targetTouches[0];
+    } else {
+      // Maybe IE pointer
+      return e;
+    }
+  }
+  function shouldHandle(e) {
+    if (e.targetTouches && e.targetTouches.length === 1) {
+      return true;
+    }
+    if (e.pointerType && e.pointerType !== 'mouse' && e.pointerType !== e.MSPOINTER_TYPE_MOUSE) {
+      return true;
+    }
+    return false;
+  }
+  function touchStart(e) {
+    if (shouldHandle(e)) {
+      inLocalTouch = true;
+
+      var touch = getTouch(e);
+
+      startOffset.pageX = touch.pageX;
+      startOffset.pageY = touch.pageY;
+
+      startTime = (new Date()).getTime();
+
+      if (easingLoop !== null) {
+        clearInterval(easingLoop);
+      }
+
+      e.stopPropagation();
+    }
+  }
+  function touchMove(e) {
+    if (!inLocalTouch && i.settings.swipePropagation) {
+      touchStart(e);
+    }
+    if (!inGlobalTouch && inLocalTouch && shouldHandle(e)) {
+      var touch = getTouch(e);
+
+      var currentOffset = {pageX: touch.pageX, pageY: touch.pageY};
+
+      var differenceX = currentOffset.pageX - startOffset.pageX;
+      var differenceY = currentOffset.pageY - startOffset.pageY;
+
+      applyTouchMove(differenceX, differenceY);
+      startOffset = currentOffset;
+
+      var currentTime = (new Date()).getTime();
+
+      var timeGap = currentTime - startTime;
+      if (timeGap > 0) {
+        speed.x = differenceX / timeGap;
+        speed.y = differenceY / timeGap;
+        startTime = currentTime;
+      }
+
+      if (shouldPreventDefault(differenceX, differenceY)) {
+        e.stopPropagation();
+        e.preventDefault();
+      }
+    }
+  }
+  function touchEnd() {
+    if (!inGlobalTouch && inLocalTouch) {
+      inLocalTouch = false;
+
+      clearInterval(easingLoop);
+      easingLoop = setInterval(function () {
+        if (!instances.get(element)) {
+          clearInterval(easingLoop);
+          return;
+        }
+
+        if (!speed.x && !speed.y) {
+          clearInterval(easingLoop);
+          return;
+        }
+
+        if (Math.abs(speed.x) < 0.01 && Math.abs(speed.y) < 0.01) {
+          clearInterval(easingLoop);
+          return;
+        }
+
+        applyTouchMove(speed.x * 30, speed.y * 30);
+
+        speed.x *= 0.8;
+        speed.y *= 0.8;
+      }, 10);
+    }
+  }
+
+  if (supportsTouch) {
+    i.event.bind(window, 'touchstart', globalTouchStart);
+    i.event.bind(window, 'touchend', globalTouchEnd);
+    i.event.bind(element, 'touchstart', touchStart);
+    i.event.bind(element, 'touchmove', touchMove);
+    i.event.bind(element, 'touchend', touchEnd);
+  } else if (supportsIePointer) {
+    if (window.PointerEvent) {
+      i.event.bind(window, 'pointerdown', globalTouchStart);
+      i.event.bind(window, 'pointerup', globalTouchEnd);
+      i.event.bind(element, 'pointerdown', touchStart);
+      i.event.bind(element, 'pointermove', touchMove);
+      i.event.bind(element, 'pointerup', touchEnd);
+    } else if (window.MSPointerEvent) {
+      i.event.bind(window, 'MSPointerDown', globalTouchStart);
+      i.event.bind(window, 'MSPointerUp', globalTouchEnd);
+      i.event.bind(element, 'MSPointerDown', touchStart);
+      i.event.bind(element, 'MSPointerMove', touchMove);
+      i.event.bind(element, 'MSPointerUp', touchEnd);
+    }
+  }
+}
+
+module.exports = function (element) {
+  if (!_.env.supportsTouch && !_.env.supportsIePointer) {
+    return;
+  }
+
+  var i = instances.get(element);
+  bindTouchHandler(element, i, _.env.supportsTouch, _.env.supportsIePointer);
+};
+
+},{"../../lib/helper":6,"../instances":18,"../update-geometry":19,"../update-scroll":20}],17:[function(require,module,exports){
+'use strict';
+
+var _ = require('../lib/helper');
+var cls = require('../lib/class');
+var instances = require('./instances');
+var updateGeometry = require('./update-geometry');
+
+// Handlers
+var handlers = {
+  'click-rail': require('./handler/click-rail'),
+  'drag-scrollbar': require('./handler/drag-scrollbar'),
+  'keyboard': require('./handler/keyboard'),
+  'wheel': require('./handler/mouse-wheel'),
+  'touch': require('./handler/touch'),
+  'selection': require('./handler/selection')
+};
+var nativeScrollHandler = require('./handler/native-scroll');
+
+module.exports = function (element, userSettings) {
+  userSettings = typeof userSettings === 'object' ? userSettings : {};
+
+  cls.add(element, 'ps-container');
+
+  // Create a plugin instance.
+  var i = instances.add(element);
+
+  i.settings = _.extend(i.settings, userSettings);
+  cls.add(element, 'ps-theme-' + i.settings.theme);
+
+  i.settings.handlers.forEach(function (handlerName) {
+    handlers[handlerName](element);
+  });
+
+  nativeScrollHandler(element);
+
+  updateGeometry(element);
+};
+
+},{"../lib/class":2,"../lib/helper":6,"./handler/click-rail":10,"./handler/drag-scrollbar":11,"./handler/keyboard":12,"./handler/mouse-wheel":13,"./handler/native-scroll":14,"./handler/selection":15,"./handler/touch":16,"./instances":18,"./update-geometry":19}],18:[function(require,module,exports){
+'use strict';
+
+var _ = require('../lib/helper');
+var cls = require('../lib/class');
+var defaultSettings = require('./default-setting');
+var dom = require('../lib/dom');
+var EventManager = require('../lib/event-manager');
+var guid = require('../lib/guid');
+
+var instances = {};
+
+function Instance(element) {
+  var i = this;
+
+  i.settings = _.clone(defaultSettings);
+  i.containerWidth = null;
+  i.containerHeight = null;
+  i.contentWidth = null;
+  i.contentHeight = null;
+
+  i.isRtl = dom.css(element, 'direction') === "rtl";
+  i.isNegativeScroll = (function () {
+    var originalScrollLeft = element.scrollLeft;
+    var result = null;
+    element.scrollLeft = -1;
+    result = element.scrollLeft < 0;
+    element.scrollLeft = originalScrollLeft;
+    return result;
+  })();
+  i.negativeScrollAdjustment = i.isNegativeScroll ? element.scrollWidth - element.clientWidth : 0;
+  i.event = new EventManager();
+  i.ownerDocument = element.ownerDocument || document;
+
+  function focus() {
+    cls.add(element, 'ps-focus');
+  }
+
+  function blur() {
+    cls.remove(element, 'ps-focus');
+  }
+
+  i.scrollbarXRail = dom.appendTo(dom.e('div', 'ps-scrollbar-x-rail'), element);
+  i.scrollbarX = dom.appendTo(dom.e('div', 'ps-scrollbar-x'), i.scrollbarXRail);
+  i.scrollbarX.setAttribute('tabindex', 0);
+  i.event.bind(i.scrollbarX, 'focus', focus);
+  i.event.bind(i.scrollbarX, 'blur', blur);
+  i.scrollbarXActive = null;
+  i.scrollbarXWidth = null;
+  i.scrollbarXLeft = null;
+  i.scrollbarXBottom = _.toInt(dom.css(i.scrollbarXRail, 'bottom'));
+  i.isScrollbarXUsingBottom = i.scrollbarXBottom === i.scrollbarXBottom; // !isNaN
+  i.scrollbarXTop = i.isScrollbarXUsingBottom ? null : _.toInt(dom.css(i.scrollbarXRail, 'top'));
+  i.railBorderXWidth = _.toInt(dom.css(i.scrollbarXRail, 'borderLeftWidth')) + _.toInt(dom.css(i.scrollbarXRail, 'borderRightWidth'));
+  // Set rail to display:block to calculate margins
+  dom.css(i.scrollbarXRail, 'display', 'block');
+  i.railXMarginWidth = _.toInt(dom.css(i.scrollbarXRail, 'marginLeft')) + _.toInt(dom.css(i.scrollbarXRail, 'marginRight'));
+  dom.css(i.scrollbarXRail, 'display', '');
+  i.railXWidth = null;
+  i.railXRatio = null;
+
+  i.scrollbarYRail = dom.appendTo(dom.e('div', 'ps-scrollbar-y-rail'), element);
+  i.scrollbarY = dom.appendTo(dom.e('div', 'ps-scrollbar-y'), i.scrollbarYRail);
+  i.scrollbarY.setAttribute('tabindex', 0);
+  i.event.bind(i.scrollbarY, 'focus', focus);
+  i.event.bind(i.scrollbarY, 'blur', blur);
+  i.scrollbarYActive = null;
+  i.scrollbarYHeight = null;
+  i.scrollbarYTop = null;
+  i.scrollbarYRight = _.toInt(dom.css(i.scrollbarYRail, 'right'));
+  i.isScrollbarYUsingRight = i.scrollbarYRight === i.scrollbarYRight; // !isNaN
+  i.scrollbarYLeft = i.isScrollbarYUsingRight ? null : _.toInt(dom.css(i.scrollbarYRail, 'left'));
+  i.scrollbarYOuterWidth = i.isRtl ? _.outerWidth(i.scrollbarY) : null;
+  i.railBorderYWidth = _.toInt(dom.css(i.scrollbarYRail, 'borderTopWidth')) + _.toInt(dom.css(i.scrollbarYRail, 'borderBottomWidth'));
+  dom.css(i.scrollbarYRail, 'display', 'block');
+  i.railYMarginHeight = _.toInt(dom.css(i.scrollbarYRail, 'marginTop')) + _.toInt(dom.css(i.scrollbarYRail, 'marginBottom'));
+  dom.css(i.scrollbarYRail, 'display', '');
+  i.railYHeight = null;
+  i.railYRatio = null;
+}
+
+function getId(element) {
+  return element.getAttribute('data-ps-id');
+}
+
+function setId(element, id) {
+  element.setAttribute('data-ps-id', id);
+}
+
+function removeId(element) {
+  element.removeAttribute('data-ps-id');
+}
+
+exports.add = function (element) {
+  var newId = guid();
+  setId(element, newId);
+  instances[newId] = new Instance(element);
+  return instances[newId];
+};
+
+exports.remove = function (element) {
+  delete instances[getId(element)];
+  removeId(element);
+};
+
+exports.get = function (element) {
+  return instances[getId(element)];
+};
+
+},{"../lib/class":2,"../lib/dom":3,"../lib/event-manager":4,"../lib/guid":5,"../lib/helper":6,"./default-setting":8}],19:[function(require,module,exports){
+'use strict';
+
+var _ = require('../lib/helper');
+var cls = require('../lib/class');
+var dom = require('../lib/dom');
+var instances = require('./instances');
+var updateScroll = require('./update-scroll');
+
+function getThumbSize(i, thumbSize) {
+  if (i.settings.minScrollbarLength) {
+    thumbSize = Math.max(thumbSize, i.settings.minScrollbarLength);
+  }
+  if (i.settings.maxScrollbarLength) {
+    thumbSize = Math.min(thumbSize, i.settings.maxScrollbarLength);
+  }
+  return thumbSize;
+}
+
+function updateCss(element, i) {
+  var xRailOffset = {width: i.railXWidth};
+  if (i.isRtl) {
+    xRailOffset.left = i.negativeScrollAdjustment + element.scrollLeft + i.containerWidth - i.contentWidth;
+  } else {
+    xRailOffset.left = element.scrollLeft;
+  }
+  if (i.isScrollbarXUsingBottom) {
+    xRailOffset.bottom = i.scrollbarXBottom - element.scrollTop;
+  } else {
+    xRailOffset.top = i.scrollbarXTop + element.scrollTop;
+  }
+  dom.css(i.scrollbarXRail, xRailOffset);
+
+  var yRailOffset = {top: element.scrollTop, height: i.railYHeight};
+  if (i.isScrollbarYUsingRight) {
+    if (i.isRtl) {
+      yRailOffset.right = i.contentWidth - (i.negativeScrollAdjustment + element.scrollLeft) - i.scrollbarYRight - i.scrollbarYOuterWidth;
+    } else {
+      yRailOffset.right = i.scrollbarYRight - element.scrollLeft;
+    }
+  } else {
+    if (i.isRtl) {
+      yRailOffset.left = i.negativeScrollAdjustment + element.scrollLeft + i.containerWidth * 2 - i.contentWidth - i.scrollbarYLeft - i.scrollbarYOuterWidth;
+    } else {
+      yRailOffset.left = i.scrollbarYLeft + element.scrollLeft;
+    }
+  }
+  dom.css(i.scrollbarYRail, yRailOffset);
+
+  dom.css(i.scrollbarX, {left: i.scrollbarXLeft, width: i.scrollbarXWidth - i.railBorderXWidth});
+  dom.css(i.scrollbarY, {top: i.scrollbarYTop, height: i.scrollbarYHeight - i.railBorderYWidth});
+}
+
+module.exports = function (element) {
+  var i = instances.get(element);
+
+  i.containerWidth = element.clientWidth;
+  i.containerHeight = element.clientHeight;
+  i.contentWidth = element.scrollWidth;
+  i.contentHeight = element.scrollHeight;
+
+  var existingRails;
+  if (!element.contains(i.scrollbarXRail)) {
+    existingRails = dom.queryChildren(element, '.ps-scrollbar-x-rail');
+    if (existingRails.length > 0) {
+      existingRails.forEach(function (rail) {
+        dom.remove(rail);
+      });
+    }
+    dom.appendTo(i.scrollbarXRail, element);
+  }
+  if (!element.contains(i.scrollbarYRail)) {
+    existingRails = dom.queryChildren(element, '.ps-scrollbar-y-rail');
+    if (existingRails.length > 0) {
+      existingRails.forEach(function (rail) {
+        dom.remove(rail);
+      });
+    }
+    dom.appendTo(i.scrollbarYRail, element);
+  }
+
+  if (!i.settings.suppressScrollX && i.containerWidth + i.settings.scrollXMarginOffset < i.contentWidth) {
+    i.scrollbarXActive = true;
+    i.railXWidth = i.containerWidth - i.railXMarginWidth;
+    i.railXRatio = i.containerWidth / i.railXWidth;
+    i.scrollbarXWidth = getThumbSize(i, _.toInt(i.railXWidth * i.containerWidth / i.contentWidth));
+    i.scrollbarXLeft = _.toInt((i.negativeScrollAdjustment + element.scrollLeft) * (i.railXWidth - i.scrollbarXWidth) / (i.contentWidth - i.containerWidth));
+  } else {
+    i.scrollbarXActive = false;
+  }
+
+  if (!i.settings.suppressScrollY && i.containerHeight + i.settings.scrollYMarginOffset < i.contentHeight) {
+    i.scrollbarYActive = true;
+    i.railYHeight = i.containerHeight - i.railYMarginHeight;
+    i.railYRatio = i.containerHeight / i.railYHeight;
+    i.scrollbarYHeight = getThumbSize(i, _.toInt(i.railYHeight * i.containerHeight / i.contentHeight));
+    i.scrollbarYTop = _.toInt(element.scrollTop * (i.railYHeight - i.scrollbarYHeight) / (i.contentHeight - i.containerHeight));
+  } else {
+    i.scrollbarYActive = false;
+  }
+
+  if (i.scrollbarXLeft >= i.railXWidth - i.scrollbarXWidth) {
+    i.scrollbarXLeft = i.railXWidth - i.scrollbarXWidth;
+  }
+  if (i.scrollbarYTop >= i.railYHeight - i.scrollbarYHeight) {
+    i.scrollbarYTop = i.railYHeight - i.scrollbarYHeight;
+  }
+
+  updateCss(element, i);
+
+  if (i.scrollbarXActive) {
+    cls.add(element, 'ps-active-x');
+  } else {
+    cls.remove(element, 'ps-active-x');
+    i.scrollbarXWidth = 0;
+    i.scrollbarXLeft = 0;
+    updateScroll(element, 'left', 0);
+  }
+  if (i.scrollbarYActive) {
+    cls.add(element, 'ps-active-y');
+  } else {
+    cls.remove(element, 'ps-active-y');
+    i.scrollbarYHeight = 0;
+    i.scrollbarYTop = 0;
+    updateScroll(element, 'top', 0);
+  }
+};
+
+},{"../lib/class":2,"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-scroll":20}],20:[function(require,module,exports){
+'use strict';
+
+var instances = require('./instances');
+
+var lastTop;
+var lastLeft;
+
+var createDOMEvent = function (name) {
+  var event = document.createEvent("Event");
+  event.initEvent(name, true, true);
+  return event;
+};
+
+module.exports = function (element, axis, value) {
+  if (typeof element === 'undefined') {
+    throw 'You must provide an element to the update-scroll function';
+  }
+
+  if (typeof axis === 'undefined') {
+    throw 'You must provide an axis to the update-scroll function';
+  }
+
+  if (typeof value === 'undefined') {
+    throw 'You must provide a value to the update-scroll function';
+  }
+
+  if (axis === 'top' && value <= 0) {
+    element.scrollTop = value = 0; // don't allow negative scroll
+    element.dispatchEvent(createDOMEvent('ps-y-reach-start'));
+  }
+
+  if (axis === 'left' && value <= 0) {
+    element.scrollLeft = value = 0; // don't allow negative scroll
+    element.dispatchEvent(createDOMEvent('ps-x-reach-start'));
+  }
+
+  var i = instances.get(element);
+
+  if (axis === 'top' && value >= i.contentHeight - i.containerHeight) {
+    // don't allow scroll past container
+    value = i.contentHeight - i.containerHeight;
+    if (value - element.scrollTop <= 1) {
+      // mitigates rounding errors on non-subpixel scroll values
+      value = element.scrollTop;
+    } else {
+      element.scrollTop = value;
+    }
+    element.dispatchEvent(createDOMEvent('ps-y-reach-end'));
+  }
+
+  if (axis === 'left' && value >= i.contentWidth - i.containerWidth) {
+    // don't allow scroll past container
+    value = i.contentWidth - i.containerWidth;
+    if (value - element.scrollLeft <= 1) {
+      // mitigates rounding errors on non-subpixel scroll values
+      value = element.scrollLeft;
+    } else {
+      element.scrollLeft = value;
+    }
+    element.dispatchEvent(createDOMEvent('ps-x-reach-end'));
+  }
+
+  if (!lastTop) {
+    lastTop = element.scrollTop;
+  }
+
+  if (!lastLeft) {
+    lastLeft = element.scrollLeft;
+  }
+
+  if (axis === 'top' && value < lastTop) {
+    element.dispatchEvent(createDOMEvent('ps-scroll-up'));
+  }
+
+  if (axis === 'top' && value > lastTop) {
+    element.dispatchEvent(createDOMEvent('ps-scroll-down'));
+  }
+
+  if (axis === 'left' && value < lastLeft) {
+    element.dispatchEvent(createDOMEvent('ps-scroll-left'));
+  }
+
+  if (axis === 'left' && value > lastLeft) {
+    element.dispatchEvent(createDOMEvent('ps-scroll-right'));
+  }
+
+  if (axis === 'top') {
+    element.scrollTop = lastTop = value;
+    element.dispatchEvent(createDOMEvent('ps-scroll-y'));
+  }
+
+  if (axis === 'left') {
+    element.scrollLeft = lastLeft = value;
+    element.dispatchEvent(createDOMEvent('ps-scroll-x'));
+  }
+
+};
+
+},{"./instances":18}],21:[function(require,module,exports){
+'use strict';
+
+var _ = require('../lib/helper');
+var dom = require('../lib/dom');
+var instances = require('./instances');
+var updateGeometry = require('./update-geometry');
+var updateScroll = require('./update-scroll');
+
+module.exports = function (element) {
+  var i = instances.get(element);
+
+  if (!i) {
+    return;
+  }
+
+  // Recalcuate negative scrollLeft adjustment
+  i.negativeScrollAdjustment = i.isNegativeScroll ? element.scrollWidth - element.clientWidth : 0;
+
+  // Recalculate rail margins
+  dom.css(i.scrollbarXRail, 'display', 'block');
+  dom.css(i.scrollbarYRail, 'display', 'block');
+  i.railXMarginWidth = _.toInt(dom.css(i.scrollbarXRail, 'marginLeft')) + _.toInt(dom.css(i.scrollbarXRail, 'marginRight'));
+  i.railYMarginHeight = _.toInt(dom.css(i.scrollbarYRail, 'marginTop')) + _.toInt(dom.css(i.scrollbarYRail, 'marginBottom'));
+
+  // Hide scrollbars not to affect scrollWidth and scrollHeight
+  dom.css(i.scrollbarXRail, 'display', 'none');
+  dom.css(i.scrollbarYRail, 'display', 'none');
+
+  updateGeometry(element);
+
+  // Update top/left scroll to trigger events
+  updateScroll(element, 'top', element.scrollTop);
+  updateScroll(element, 'left', element.scrollLeft);
+
+  dom.css(i.scrollbarXRail, 'display', '');
+  dom.css(i.scrollbarYRail, 'display', '');
+};
+
+},{"../lib/dom":3,"../lib/helper":6,"./instances":18,"./update-geometry":19,"./update-scroll":20}]},{},[1]);
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-accordion-title{margin-top:0;margin-bottom:15px;padding:5px 15px;background:#f7f7f7;font-size:18px;line-height:24px;cursor:pointer;border:1px solid #ddd;border-radius:4px}.uk-accordion-content{padding:0 15px 15px 15px}.uk-accordion-content:after,.uk-accordion-content:before{content:"";display:table}.uk-accordion-content:after{clear:both}.uk-accordion-content>:last-child{margin-bottom:0}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var i;window.UIkit&&(i=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-accordion",["uikit"],function(){return i||t(UIkit)})}(function(t){"use strict";function i(i){var e=t.$(i),o="auto";if(e.is(":visible"))o=e.outerHeight();else{var a={position:e.css("position"),visibility:e.css("visibility"),display:e.css("display")};o=e.css({position:"absolute",visibility:"hidden",display:"block"}).outerHeight(),e.css(a)}return o}return t.component("accordion",{defaults:{showfirst:!0,collapse:!0,animate:!0,easing:"swing",duration:300,toggle:".uk-accordion-title",containers:".uk-accordion-content",clsactive:"uk-active"},boot:function(){t.ready(function(i){setTimeout(function(){t.$("[data-uk-accordion]",i).each(function(){var i=t.$(this);i.data("accordion")||t.accordion(i,t.Utils.options(i.attr("data-uk-accordion")))})},0)})},init:function(){var i=this;this.element.on("click.uk.accordion",this.options.toggle,function(e){e.preventDefault(),i.toggleItem(t.$(this).data("wrapper"),i.options.animate,i.options.collapse)}),this.update(!0),t.domObserve(this.element,function(){i.element.children(i.options.containers).length&&i.update()})},toggleItem:function(e,o,a){var n=this;e.data("toggle").toggleClass(this.options.clsactive),e.data("content").toggleClass(this.options.clsactive);var s=e.data("toggle").hasClass(this.options.clsactive);a&&(this.toggle.not(e.data("toggle")).removeClass(this.options.clsactive),this.content.not(e.data("content")).removeClass(this.options.clsactive).parent().stop().css("overflow","hidden").animate({height:0},{easing:this.options.easing,duration:o?this.options.duration:0}).attr("aria-expanded","false")),e.stop().css("overflow","hidden"),o?e.animate({height:s?i(e.data("content")):0},{easing:this.options.easing,duration:this.options.duration,complete:function(){s&&(e.css({overflow:"",height:"auto"}),t.Utils.checkDisplay(e.data("content"))),n.trigger("display.uk.check")}}):(e.height(s?"auto":0),s&&(e.css({overflow:""}),t.Utils.checkDisplay(e.data("content"))),this.trigger("display.uk.check")),e.attr("aria-expanded",s),this.element.trigger("toggle.uk.accordion",[s,e.data("toggle"),e.data("content")])},update:function(i){var e,o,a,n=this;this.toggle=this.find(this.options.toggle),this.content=this.find(this.options.containers),this.content.each(function(i){e=t.$(this),e.parent().data("wrapper")?o=e.parent():(o=t.$(this).wrap('<div data-wrapper="true" style="overflow:hidden;height:0;position:relative;"></div>').parent(),o.attr("aria-expanded","false")),a=n.toggle.eq(i),o.data("toggle",a),o.data("content",e),a.data("wrapper",o),e.data("wrapper",o)}),this.element.trigger("update.uk.accordion",[this]),i&&this.options.showfirst&&this.toggleItem(this.toggle.eq(0).data("wrapper"),!1,!1)}}),t.accordion});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-autocomplete{display:inline-block;position:relative;max-width:100%;vertical-align:middle}.uk-dropdown-flip{left:auto;right:0}.uk-nav-autocomplete>li>a{color:#444}.uk-nav-autocomplete>li.uk-active>a{background:#009dd8;color:#fff;outline:0;box-shadow:inset 0 2px 4px rgba(0,0,0,.2);text-shadow:0 -1px 0 rgba(0,0,0,.2)}.uk-nav-autocomplete .uk-nav-header{color:#999}.uk-nav-autocomplete .uk-nav-divider{border-top:1px solid #ddd}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-autocomplete",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";var e;return t.component("autocomplete",{defaults:{minLength:3,param:"search",method:"post",delay:300,loadingClass:"uk-loading",flipDropdown:!1,skipClass:"uk-skip",hoverClass:"uk-active",source:null,renderer:null,template:'<ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results">{{~items}}<li data-value="{{$item.value}}"><a>{{$item.value}}</a></li>{{/items}}</ul>'},visible:!1,value:null,selected:null,boot:function(){t.$html.on("focus.autocomplete.uikit","[data-uk-autocomplete]",function(){var e=t.$(this);e.data("autocomplete")||t.autocomplete(e,t.Utils.options(e.attr("data-uk-autocomplete")))}),t.$html.on("click.autocomplete.uikit",function(t){e&&t.target!=e.input[0]&&e.hide()})},init:function(){var e=this,i=!1,s=t.Utils.debounce(function(){return i?i=!1:(e.handle(),void 0)},this.options.delay);this.dropdown=this.find(".uk-dropdown"),this.template=this.find('script[type="text/autocomplete"]').html(),this.template=t.Utils.template(this.template||this.options.template),this.input=this.find("input:first").attr("autocomplete","off"),this.dropdown.length||(this.dropdown=t.$('<div class="uk-dropdown"></div>').appendTo(this.element)),this.options.flipDropdown&&this.dropdown.addClass("uk-dropdown-flip"),this.dropdown.attr("aria-expanded","false"),this.input.on({keydown:function(t){if(t&&t.which&&!t.shiftKey&&e.visible)switch(t.which){case 13:i=!0,e.selected&&(t.preventDefault(),e.select());break;case 38:t.preventDefault(),e.pick("prev",!0);break;case 40:t.preventDefault(),e.pick("next",!0);break;case 27:case 9:e.hide()}},keyup:s}),this.dropdown.on("click",".uk-autocomplete-results > *",function(){e.select()}),this.dropdown.on("mouseover",".uk-autocomplete-results > *",function(){e.pick(t.$(this))}),this.triggercomplete=s},handle:function(){var t=this,e=this.value;return this.value=this.input.val(),this.value.length<this.options.minLength?this.hide():(this.value!=e&&t.request(),this)},pick:function(e,i){var s=this,o=t.$(this.dropdown.find(".uk-autocomplete-results").children(":not(."+this.options.skipClass+")")),n=!1;if("string"==typeof e||e.hasClass(this.options.skipClass)){if("next"==e||"prev"==e){if(this.selected){var a=o.index(this.selected);n="next"==e?o.eq(a+1<o.length?a+1:0):o.eq(0>a-1?o.length-1:a-1)}else n=o["next"==e?"first":"last"]();n=t.$(n)}}else n=e;if(n&&n.length&&(this.selected=n,o.removeClass(this.options.hoverClass),this.selected.addClass(this.options.hoverClass),i)){var l=n.position().top,h=s.dropdown.scrollTop(),r=s.dropdown.height();(l>r||0>l)&&s.dropdown.scrollTop(h+l)}},select:function(){if(this.selected){var t=this.selected.data();this.trigger("selectitem.uk.autocomplete",[t,this]),t.value&&this.input.val(t.value).trigger("change"),this.hide()}},show:function(){return this.visible?void 0:(this.visible=!0,this.element.addClass("uk-open"),e&&e!==this&&e.hide(),e=this,this.dropdown.attr("aria-expanded","true"),this)},hide:function(){return this.visible?(this.visible=!1,this.element.removeClass("uk-open"),e===this&&(e=!1),this.dropdown.attr("aria-expanded","false"),this):void 0},request:function(){var e=this,i=function(t){t&&e.render(t),e.element.removeClass(e.options.loadingClass)};if(this.element.addClass(this.options.loadingClass),this.options.source){var s=this.options.source;switch(typeof this.options.source){case"function":this.options.source.apply(this,[i]);break;case"object":if(s.length){var o=[];s.forEach(function(t){t.value&&-1!=t.value.toLowerCase().indexOf(e.value.toLowerCase())&&o.push(t)}),i(o)}break;case"string":var n={};n[this.options.param]=this.value,t.$.ajax({url:this.options.source,data:n,type:this.options.method,dataType:"json"}).done(function(t){i(t||[])});break;default:i(null)}}else this.element.removeClass(e.options.loadingClass)},render:function(t){return this.dropdown.empty(),this.selected=!1,this.options.renderer?this.options.renderer.apply(this,[t]):t&&t.length&&(this.dropdown.append(this.template({items:t})),this.show(),this.trigger("show.uk.autocomplete")),this}}),t.autocomplete});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-form input[type=radio],.uk-form input[type=checkbox]{display:inline-block;height:14px;width:14px;border:1px solid #aaa;overflow:hidden;margin-top:-4px;vertical-align:middle;-webkit-appearance:none;outline:0;background:0 0}.uk-form input[type=radio]{border-radius:50%}.uk-form input[type=checkbox]:before,.uk-form input[type=radio]:before{display:block}.uk-form input[type=radio]:checked:before{content:'';width:8px;height:8px;margin:2px auto 0;border-radius:50%;background:#00a8e6}.uk-form input[type=checkbox]:checked:before,.uk-form input[type=checkbox]:indeterminate:before{content:"\f00c";font-family:FontAwesome;font-size:12px;-webkit-font-smoothing:antialiased;text-align:center;line-height:12px;color:#00a8e6}.uk-form input[type=checkbox]:indeterminate:before{content:"\f068"}.uk-form input[type=checkbox]:disabled,.uk-form input[type=radio]:disabled{border-color:#ddd}.uk-form input[type=radio]:disabled:checked:before{background-color:#aaa}.uk-form input[type=checkbox]:disabled:checked:before,.uk-form input[type=checkbox]:disabled:indeterminate:before{color:#aaa}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* 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
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-notify{position:fixed;top:10px;left:10px;z-index:1040;box-sizing:border-box;width:350px}.uk-notify-bottom-right,.uk-notify-top-right{left:auto;right:10px}.uk-notify-bottom-center,.uk-notify-top-center{left:50%;margin-left:-175px}.uk-notify-bottom-center,.uk-notify-bottom-left,.uk-notify-bottom-right{top:auto;bottom:10px}@media (max-width:479px){.uk-notify{left:10px;right:10px;width:auto;margin:0}}.uk-notify-message{position:relative;margin-bottom:10px;padding:15px;background:#444;color:#fff;font-size:16px;line-height:22px;cursor:pointer;border:1px solid #444;border-radius:4px}.uk-notify-message>.uk-close{visibility:hidden;float:right}.uk-notify-message:hover>.uk-close{visibility:visible}.uk-notify-message-primary{background:#ebf7fd;color:#2d7091;border-color:rgba(45,112,145,.3)}.uk-notify-message-success{background:#f2fae3;color:#659f13;border-color:rgba(101,159,19,.3)}.uk-notify-message-warning{background:#fffceb;color:#e28327;border-color:rgba(226,131,39,.3)}.uk-notify-message-danger{background:#fff1f0;color:#d85030;border-color:rgba(216,80,48,.3)}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-notify",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";var e={},i={},s=function(e){return"string"==t.$.type(e)&&(e={message:e}),arguments[1]&&(e=t.$.extend(e,"string"==t.$.type(arguments[1])?{status:arguments[1]}:arguments[1])),new n(e).show()},o=function(t,e){var s;if(t)for(s in i)t===i[s].group&&i[s].close(e);else for(s in i)i[s].close(e)},n=function(s){this.options=t.$.extend({},n.defaults,s),this.uuid=t.Utils.uid("notifymsg"),this.element=t.$(['<div class="uk-notify-message">','<a class="uk-close"></a>',"<div></div>","</div>"].join("")).data("notifyMessage",this),this.content(this.options.message),this.options.status&&(this.element.addClass("uk-notify-message-"+this.options.status),this.currentstatus=this.options.status),this.group=this.options.group,i[this.uuid]=this,e[this.options.pos]||(e[this.options.pos]=t.$('<div class="uk-notify uk-notify-'+this.options.pos+'"></div>').appendTo("body").on("click",".uk-notify-message",function(){var e=t.$(this).data("notifyMessage");e.element.trigger("manualclose.uk.notify",[e]),e.close()}))};return t.$.extend(n.prototype,{uuid:!1,element:!1,timout:!1,currentstatus:"",group:!1,show:function(){if(!this.element.is(":visible")){var t=this;e[this.options.pos].show().prepend(this.element);var i=parseInt(this.element.css("margin-bottom"),10);return this.element.css({opacity:0,"margin-top":-1*this.element.outerHeight(),"margin-bottom":0}).animate({opacity:1,"margin-top":0,"margin-bottom":i},function(){if(t.options.timeout){var e=function(){t.close()};t.timeout=setTimeout(e,t.options.timeout),t.element.hover(function(){clearTimeout(t.timeout)},function(){t.timeout=setTimeout(e,t.options.timeout)})}}),this}},close:function(t){var s=this,o=function(){s.element.remove(),e[s.options.pos].children().length||e[s.options.pos].hide(),s.options.onClose.apply(s,[]),s.element.trigger("close.uk.notify",[s]),delete i[s.uuid]};this.timeout&&clearTimeout(this.timeout),t?o():this.element.animate({opacity:0,"margin-top":-1*this.element.outerHeight(),"margin-bottom":0},function(){o()})},content:function(t){var e=this.element.find(">div");return t?(e.html(t),this):e.html()},status:function(t){return t?(this.element.removeClass("uk-notify-message-"+this.currentstatus).addClass("uk-notify-message-"+t),this.currentstatus=t,this):this.currentstatus}}),n.defaults={message:"",status:"",timeout:5e3,group:null,pos:"top-center",onClose:function(){}},t.notify=s,t.notify.message=n,t.notify.closeAll=o,s});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-pagination",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";return t.component("pagination",{defaults:{items:1,itemsOnPage:1,pages:0,displayedPages:7,edges:1,currentPage:0,lblPrev:!1,lblNext:!1,onSelectPage:function(){}},boot:function(){t.ready(function(e){t.$("[data-uk-pagination]",e).each(function(){var e=t.$(this);e.data("pagination")||t.pagination(e,t.Utils.options(e.attr("data-uk-pagination")))})})},init:function(){var e=this;this.pages=this.options.pages?this.options.pages:Math.ceil(this.options.items/this.options.itemsOnPage)?Math.ceil(this.options.items/this.options.itemsOnPage):1,this.currentPage=this.options.currentPage,this.halfDisplayed=this.options.displayedPages/2,this.on("click","a[data-page]",function(i){i.preventDefault(),e.selectPage(t.$(this).data("page"))}),this._render()},_getInterval:function(){return{start:Math.ceil(this.currentPage>this.halfDisplayed?Math.max(Math.min(this.currentPage-this.halfDisplayed,this.pages-this.options.displayedPages),0):0),end:Math.ceil(this.currentPage>this.halfDisplayed?Math.min(this.currentPage+this.halfDisplayed,this.pages):Math.min(this.options.displayedPages,this.pages))}},render:function(t){this.pages=t?t:this.pages,this._render()},selectPage:function(t,e){this.currentPage=t,this.render(e),this.options.onSelectPage.apply(this,[t]),this.trigger("select.uk.pagination",[t,this])},_render:function(){var t,e=this.options,i=this._getInterval();if(this.element.empty(),e.lblPrev&&this._append(this.currentPage-1,{text:e.lblPrev}),i.start>0&&e.edges>0){var s=Math.min(e.edges,i.start);for(t=0;s>t;t++)this._append(t);e.edges<i.start&&i.start-e.edges!=1?this.element.append("<li><span>...</span></li>"):i.start-e.edges==1&&this._append(e.edges)}for(t=i.start;t<i.end;t++)this._append(t);if(i.end<this.pages&&e.edges>0){this.pages-e.edges>i.end&&this.pages-e.edges-i.end!=1?this.element.append("<li><span>...</span></li>"):this.pages-e.edges-i.end==1&&this._append(i.end++);var a=Math.max(this.pages-e.edges,i.end);for(t=a;t<this.pages;t++)this._append(t)}e.lblNext&&this._append(this.currentPage+1,{text:e.lblNext})},_append:function(e,i){var s,a;e=0>e?0:e<this.pages?e:this.pages-1,a=t.$.extend({text:e+1},i),s=e==this.currentPage?'<li class="uk-active"><span>'+a.text+"</span></li>":'<li><a href="#page-'+(e+1)+'" data-page="'+e+'">'+a.text+"</a></li>",this.element.append(s)}}),t.pagination});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-progress{box-sizing:border-box;height:20px;margin-bottom:15px;background:#f7f7f7;overflow:hidden;line-height:20px;box-shadow:inset 0 0 0 1px rgba(0,0,0,.07),inset 0 2px 2px rgba(0,0,0,.07);border-radius:4px}*+.uk-progress{margin-top:15px}.uk-progress-bar{width:0;height:100%;background:#009dd8;float:left;-webkit-transition:width .6s ease;transition:width .6s ease;font-size:12px;color:#fff;text-align:center;background-image:-webkit-linear-gradient(top,#00b4f5,#008dc5);background-image:linear-gradient(to bottom,#00b4f5,#008dc5);box-shadow:inset 0 -1px 0 rgba(0,0,0,.2),inset 0 0 0 1px rgba(0,0,0,.1);text-shadow:0 -1px 0 rgba(0,0,0,.2)}.uk-progress-mini{height:6px}.uk-progress-small{height:12px}.uk-progress-success .uk-progress-bar{background-color:#82bb42;background-image:-webkit-linear-gradient(top,#9fd256,#6fac34);background-image:linear-gradient(to bottom,#9fd256,#6fac34)}.uk-progress-warning .uk-progress-bar{background-color:#f9a124;background-image:-webkit-linear-gradient(top,#fbb450,#f89406);background-image:linear-gradient(to bottom,#fbb450,#f89406)}.uk-progress-danger .uk-progress-bar{background-color:#d32c46;background-image:-webkit-linear-gradient(top,#ee465a,#c11a39);background-image:linear-gradient(to bottom,#ee465a,#c11a39)}.uk-progress-striped .uk-progress-bar{background-image:-webkit-linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(-45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:30px 30px}.uk-progress-striped.uk-active .uk-progress-bar{-webkit-animation:uk-progress-bar-stripes 2s linear infinite;animation:uk-progress-bar-stripes 2s linear infinite}@-webkit-keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}@keyframes uk-progress-bar-stripes{0%{background-position:0 0}100%{background-position:30px 0}}.uk-progress-mini,.uk-progress-small{border-radius:500px}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-slidenav{display:inline-block;box-sizing:border-box;width:60px;height:60px;line-height:60px;color:rgba(50,50,50,.4);font-size:60px;text-align:center}.uk-slidenav:focus,.uk-slidenav:hover{outline:0;text-decoration:none;color:rgba(50,50,50,.7);cursor:pointer}.uk-slidenav:active{color:rgba(50,50,50,.9)}.uk-slidenav-previous:before{content:"\f104";font-family:FontAwesome}.uk-slidenav-next:before{content:"\f105";font-family:FontAwesome}.uk-slidenav-position{position:relative}.uk-slidenav-position .uk-slidenav{display:none;position:absolute;top:50%;z-index:1;margin-top:-30px}.uk-slidenav-position:hover .uk-slidenav{display:block}.uk-slidenav-position .uk-slidenav-previous{left:20px}.uk-slidenav-position .uk-slidenav-next{right:20px}.uk-slidenav-contrast{color:rgba(255,255,255,.5)}.uk-slidenav-contrast:focus,.uk-slidenav-contrast:hover{color:rgba(255,255,255,.7)}.uk-slidenav-contrast:active{color:rgba(255,255,255,.9)}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 [data-uk-slider]{direction:ltr}html[dir=rtl] .uk-slider>*{direction:rtl}.uk-slider{position:relative;z-index:0;touch-action:pan-y}.uk-slider:not(.uk-grid){margin:0;padding:0;list-style:none}.uk-slider>*{position:absolute;top:0;left:0}.uk-slider-container{overflow:hidden}.uk-slider:not(.uk-drag){-webkit-transition:-webkit-transform .2s linear;transition:transform .2s linear}.uk-slider.uk-drag{cursor:col-resize;-moz-user-select:none;-webkit-user-select:none;-ms-user-select:none;user-select:none}.uk-slider a,.uk-slider img{-webkit-user-drag:none;user-drag:none;-webkit-touch-callout:none}.uk-slider img{pointer-events:none}.uk-slider-fullscreen,.uk-slider-fullscreen>li{height:100vh}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-slider",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";var e,i,s,n,a={};return t.component("slider",{defaults:{center:!1,threshold:10,infinite:!0,autoplay:!1,autoplayInterval:7e3,pauseOnHover:!0,activecls:"uk-active"},boot:function(){t.ready(function(e){setTimeout(function(){t.$("[data-uk-slider]",e).each(function(){var e=t.$(this);e.data("slider")||t.slider(e,t.Utils.options(e.attr("data-uk-slider")))})},0)})},init:function(){var o=this;this.container=this.element.find(".uk-slider"),this.focus=0,t.$win.on("resize load",t.Utils.debounce(function(){o.update(!0)},100)),this.on("click.uk.slider","[data-uk-slider-item]",function(e){e.preventDefault();var i=t.$(this).attr("data-uk-slider-item");if(o.focus!=i)switch(o.stop(),i){case"next":case"previous":o["next"==i?"next":"previous"]();break;default:o.updateFocus(parseInt(i,10))}}),this.container.on({"touchstart mousedown":function(h){h.originalEvent&&h.originalEvent.touches&&(h=h.originalEvent.touches[0]),h.button&&2==h.button||!o.active||(o.stop(),s=t.$(h.target).is("a")?t.$(h.target):t.$(h.target).parents("a:first"),n=!1,s.length&&s.one("click",function(t){n&&t.preventDefault()}),i=function(t){n=!0,e=o,a={touchx:parseInt(t.pageX,10),dir:1,focus:o.focus,base:o.options.center?"center":"area"},t.originalEvent&&t.originalEvent.touches&&(t=t.originalEvent.touches[0]),e.element.data({"pointer-start":{x:parseInt(t.pageX,10),y:parseInt(t.pageY,10)},"pointer-pos-start":o.pos}),o.container.addClass("uk-drag"),i=!1},i.x=parseInt(h.pageX,10),i.threshold=o.options.threshold)},mouseenter:function(){o.options.pauseOnHover&&(o.hovering=!0)},mouseleave:function(){o.hovering=!1}}),this.update(!0),this.on("display.uk.check",function(){o.element.is(":visible")&&o.update(!0)}),this.element.find("a,img").attr("draggable","false"),this.options.autoplay&&this.start(),t.domObserve(this.element,function(){o.element.children(":not([data-slide])").length&&o.update(!0)})},update:function(e){var i,s,n,a,o=this,h=0,r=0;return this.items=this.container.children().filter(":visible"),this.vp=this.element[0].getBoundingClientRect().width,this.container.css({"min-width":"","min-height":""}),this.items.each(function(e){i=t.$(this).attr("data-slide",e),a=i.css({left:"",width:""})[0].getBoundingClientRect(),s=a.width,n=i.width(),r=Math.max(r,a.height),i.css({left:h,width:s}).data({idx:e,left:h,width:s,cwidth:n,area:h+s,center:h-(o.vp/2-n/2)}),h+=s}),this.container.css({"min-width":h,"min-height":r}),this.options.infinite&&(h<=2*this.vp||this.items.length<5)&&!this.itemsResized?(this.container.children().each(function(t){o.container.append(o.items.eq(t).clone(!0).attr("id",""))}).each(function(t){o.container.append(o.items.eq(t).clone(!0).attr("id",""))}),this.itemsResized=!0,this.update()):(this.cw=h,this.pos=0,this.active=h>=this.vp,this.container.css({"-ms-transform":"","-webkit-transform":"",transform:""}),e&&this.updateFocus(this.focus),void 0)},updatePos:function(t){this.pos=t,this.container.css({"-ms-transform":"translateX("+t+"px)","-webkit-transform":"translateX("+t+"px)",transform:"translateX("+t+"px)"})},updateFocus:function(e,i){if(this.active){i=i||(e>this.focus?1:-1);var s,n,a=this.items.eq(e);if(this.options.infinite&&this.infinite(e,i),this.options.center)this.updatePos(-1*a.data("center")),this.items.filter("."+this.options.activecls).removeClass(this.options.activecls),a.addClass(this.options.activecls);else if(this.options.infinite)this.updatePos(-1*a.data("left"));else{for(s=0,n=e;n<this.items.length;n++)s+=this.items.eq(n).data("width");if(s>this.vp)this.updatePos(-1*a.data("left"));else if(1==i){for(s=0,n=this.items.length-1;n>=0;n--){if(s+=this.items.eq(n).data("width"),s==this.vp){e=n;break}if(s>this.vp){e=n<this.items.length-1?n+1:n;break}}s>this.vp?this.updatePos(-1*(this.container.width()-this.vp)):this.updatePos(-1*this.items.eq(e).data("left"))}}var o=this.items.eq(e).data("left");this.items.removeClass("uk-slide-before uk-slide-after").each(function(i){i!==e&&t.$(this).addClass(t.$(this).data("left")<o?"uk-slide-before":"uk-slide-after")}),this.focus=e,this.trigger("focusitem.uk.slider",[e,this.items.eq(e),this])}},next:function(){var t=this.items[this.focus+1]?this.focus+1:this.options.infinite?0:this.focus;this.updateFocus(t,1)},previous:function(){var t=this.items[this.focus-1]?this.focus-1:this.options.infinite?this.items[this.focus-1]?this.items-1:this.items.length-1:this.focus;this.updateFocus(t,-1)},start:function(){this.stop();var t=this;this.interval=setInterval(function(){t.hovering||t.next()},this.options.autoplayInterval)},stop:function(){this.interval&&clearInterval(this.interval)},infinite:function(t,e){var i,s=this,n=this.items.eq(t),a=t,o=[],h=0;if(1==e){for(i=0;i<this.items.length&&(a!=t&&(h+=this.items.eq(a).data("width"),o.push(this.items.eq(a))),!(h>this.vp));i++)a=a+1==this.items.length?0:a+1;o.length&&o.forEach(function(t){var e=n.data("area");t.css({left:e}).data({left:e,area:e+t.data("width"),center:e-(s.vp/2-t.data("cwidth")/2)}),n=t})}else{for(i=this.items.length-1;i>-1&&(h+=this.items.eq(a).data("width"),a!=t&&o.push(this.items.eq(a)),!(h>this.vp));i--)a=a-1==-1?this.items.length-1:a-1;o.length&&o.forEach(function(t){var e=n.data("left")-t.data("width");t.css({left:e}).data({left:e,area:e+t.data("width"),center:e-(s.vp/2-t.data("cwidth")/2)}),n=t})}}}),t.$doc.on("mousemove.uk.slider touchmove.uk.slider",function(t){if(t.originalEvent&&t.originalEvent.touches&&(t=t.originalEvent.touches[0]),i&&Math.abs(t.pageX-i.x)>i.threshold&&(window.getSelection().toString()?e=i=!1:i(t)),e){var s,n,o,h,r,c,d,u,f,l;if(t.clientX||t.clientY?s=t.clientX:(t.pageX||t.pageY)&&(s=t.pageX-document.body.scrollLeft-document.documentElement.scrollLeft),r=a.focus,n=s-e.element.data("pointer-start").x,o=e.element.data("pointer-pos-start")+n,h=s>e.element.data("pointer-start").x?-1:1,c=e.items.eq(a.focus),1==h)for(d=c.data("left")+Math.abs(n),u=0,f=a.focus;u<e.items.length;u++){if(l=e.items.eq(f),f!=a.focus&&l.data("left")<d&&l.data("area")>d){r=f;break}f=f+1==e.items.length?0:f+1}else for(d=c.data("left")-Math.abs(n),u=0,f=a.focus;u<e.items.length;u++){if(l=e.items.eq(f),f!=a.focus&&l.data("area")<=c.data("left")&&l.data("center")<d){r=f;break}f=f-1==-1?e.items.length-1:f-1}e.options.infinite&&r!=a._focus&&e.infinite(r,h),e.updatePos(o),a.dir=h,a._focus=r,a.touchx=parseInt(t.pageX,10),a.diff=d}}),t.$doc.on("mouseup.uk.slider touchend.uk.slider",function(){if(e){e.container.removeClass("uk-drag"),e.items.eq(a.focus);var t,s,n,o=!1;if(1==a.dir){for(s=0,n=a.focus;s<e.items.length;s++){if(t=e.items.eq(n),n!=a.focus&&t.data("left")>a.diff){o=n;break}n=n+1==e.items.length?0:n+1}e.options.infinite||o||(o=e.items.length)}else{for(s=0,n=a.focus;s<e.items.length;s++){if(t=e.items.eq(n),n!=a.focus&&t.data("left")<a.diff){o=n;break}n=n-1==-1?e.items.length-1:n-1}e.options.infinite||o||(o=0)}e.updateFocus(o!==!1?o:a._focus)}e=i=!1}),t.slider});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-sortable{position:relative}.uk-sortable>*{touch-action:none}.uk-sortable a,.uk-sortable img{-webkit-touch-callout:none}.uk-sortable>:last-child{margin-bottom:0}.uk-sortable-dragged{position:absolute;z-index:1050;pointer-events:none}.uk-sortable-placeholder{opacity:0}.uk-sortable-empty{min-height:30px}.uk-sortable-handle{touch-action:none}.uk-sortable-handle:hover{cursor:move}.uk-sortable-moving,.uk-sortable-moving *{cursor:move}.uk-sortable-moving iframe{pointer-events:none}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-sortable",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";function e(e){e=t.$(e);do{if(e.data("sortable"))return e;e=t.$(e).parent()}while(e.length);return e}function o(t,e){var o=t.parentNode;if(e.parentNode!=o)return!1;for(var n=t.previousSibling;n&&9!==n.nodeType;){if(n===e)return!0;n=n.previousSibling}return!1}function n(t,e){var o=e;if(o==t)return null;for(;o;){if(o.parentNode===t)return o;if(o=o.parentNode,!o||!o.ownerDocument||11===o.nodeType)break}return null}function s(t){t.stopPropagation&&t.stopPropagation(),t.preventDefault&&t.preventDefault(),t.returnValue=!1}var a,r,i,l,d,h,u,p,c,g,f,m="ontouchstart"in window||"MSGesture"in window||window.DocumentTouch&&document instanceof DocumentTouch,v=m?"MSGesture"in window?"pointerdown":"touchstart":"mousedown",b=m?"MSGesture"in window?"pointermove":"touchmove":"mousemove",C=m?"MSGesture"in window?"pointerup":"touchend":"mouseup";return t.component("sortable",{defaults:{animation:150,threshold:10,childClass:"uk-sortable-item",placeholderClass:"uk-sortable-placeholder",overClass:"uk-sortable-over",draggingClass:"uk-sortable-dragged",dragMovingClass:"uk-sortable-moving",baseClass:"uk-sortable",noDragClass:"uk-sortable-nodrag",emptyClass:"uk-sortable-empty",dragCustomClass:"",handleClass:!1,group:!1,stop:function(){},start:function(){},change:function(){}},boot:function(){t.ready(function(e){t.$("[data-uk-sortable]",e).each(function(){var e=t.$(this);e.data("sortable")||t.sortable(e,t.Utils.options(e.attr("data-uk-sortable")))})}),t.$html.on(b,function(e){if(u){var o=e.originalEvent.targetTouches?e.originalEvent.targetTouches[0]:e;(Math.abs(o.pageX-u.pos.x)>u.threshold||Math.abs(o.pageY-u.pos.y)>u.threshold)&&u.apply(o)}if(a){d||(d=!0,a.show(),a.$current.addClass(a.$sortable.options.placeholderClass),a.$sortable.element.children().addClass(a.$sortable.options.childClass),t.$html.addClass(a.$sortable.options.dragMovingClass));var n=a.data("mouse-offset"),s=e.originalEvent.touches&&e.originalEvent.touches[0]||e.originalEvent,r=parseInt(s.pageX,10)+n.left,i=parseInt(s.pageY,10)+n.top;if(a.css({left:r,top:i}),i+a.height()/3>document.body.offsetHeight)return;i<t.$win.scrollTop()?t.$win.scrollTop(t.$win.scrollTop()-Math.ceil(a.height()/3)):i+a.height()/3>window.innerHeight+t.$win.scrollTop()&&t.$win.scrollTop(t.$win.scrollTop()+Math.ceil(a.height()/3))}}),t.$html.on(C,function(t){if(u=h=!1,!r||!a)return r=a=null,void 0;var o=e(r),n=a.$sortable,s={type:t.type};o[0]&&n.dragDrop(s,n.element),n.dragEnd(s,n.element)})},init:function(){function e(){m&&f.touches&&f.touches.length?h.addEventListener(b,y,!1):(h.addEventListener("mouseover",$,!1),h.addEventListener("mouseout",w,!1))}function o(){m&&f.touches&&f.touches.length?h.removeEventListener(b,y,!1):(h.removeEventListener("mouseover",$,!1),h.removeEventListener("mouseout",w,!1))}function a(t){r&&d.dragMove(t,d)}function l(e){return function(o){var s,a,r;f=o,o&&(s=o.touches&&o.touches[0]||o,a=s.target||o.target,m&&document.elementFromPoint&&(a=document.elementFromPoint(s.pageX-document.body.scrollLeft,s.pageY-document.body.scrollTop)),g=t.$(a)),t.$(a).hasClass("."+d.options.childClass)?e.apply(a,[o]):a!==h&&(r=n(h,a),r&&e.apply(r,[o]))}}var d=this,h=this.element[0];p=[],this.checkEmptyList(),this.element.data("sortable-group",this.options.group?this.options.group:t.Utils.uid("sortable-group"));var u=l(function(e){if(!e.data||!e.data.sortable){var o=t.$(e.target),n=o.is("a[href]")?o:o.parents("a[href]");if(!o.is(":input")){if(d.options.handleClass){var s=o.hasClass(d.options.handleClass)?o:o.closest("."+d.options.handleClass,d.element);if(!s.length)return}return e.preventDefault(),n.length&&n.one("click",function(t){t.preventDefault()}).one(C,function(){c||(n.trigger("click"),m&&n.attr("href").trim()&&(location.href=n.attr("href")))}),e.data=e.data||{},e.data.sortable=h,d.dragStart(e,this)}}}),$=l(t.Utils.debounce(function(t){return d.dragEnter(t,this)}),40),w=l(function(){var e=d.dragenterData(this);d.dragenterData(this,e-1),d.dragenterData(this)||(t.$(this).removeClass(d.options.overClass),d.dragenterData(this,!1))}),y=l(function(t){return r&&r!==this&&i!==this?(d.element.children().removeClass(d.options.overClass),i=this,d.moveElementNextTo(r,this),s(t)):!0});this.addDragHandlers=e,this.removeDragHandlers=o,window.addEventListener(b,a,!1),h.addEventListener(v,u,!1)},dragStart:function(e,o){c=!1,d=!1,l=!1;var n=this,s=t.$(e.target);if(!(!m&&2==e.button||s.is("."+n.options.noDragClass)||s.closest("."+n.options.noDragClass).length||s.is(":input"))){r=o,a&&a.remove();var i=t.$(r),h=i.offset(),p=e.touches&&e.touches[0]||e;u={pos:{x:p.pageX,y:p.pageY},threshold:n.options.handleClass?1:n.options.threshold,apply:function(){a=t.$('<div class="'+[n.options.draggingClass,n.options.dragCustomClass].join(" ")+'"></div>').css({display:"none",top:h.top,left:h.left,width:i.width(),height:i.height(),padding:i.css("padding")}).data({"mouse-offset":{left:h.left-parseInt(p.pageX,10),top:h.top-parseInt(p.pageY,10)},origin:n.element,index:i.index()}).append(i.html()).appendTo("body"),a.$current=i,a.$sortable=n,i.data({"start-list":i.parent(),"start-index":i.index(),"sortable-group":n.options.group}),n.addDragHandlers(),n.options.start(this,r),n.trigger("start.uk.sortable",[n,r,a]),c=!0,u=!1}}}},dragMove:function(e){g=t.$(document.elementFromPoint(e.pageX-(document.body.scrollLeft||document.scrollLeft||0),e.pageY-(document.body.scrollTop||document.documentElement.scrollTop||0)));var o,n=g.closest("."+this.options.baseClass),s=n.data("sortable-group"),a=t.$(r),i=a.parent(),l=a.data("sortable-group");n[0]!==i[0]&&void 0!==l&&s===l&&(n.data("sortable").addDragHandlers(),p.push(n),n.children().addClass(this.options.childClass),n.children().length>0?(o=g.closest("."+this.options.childClass),o.length?o.before(a):n.append(a)):g.append(a),UIkit.$doc.trigger("mouseover")),this.checkEmptyList(),this.checkEmptyList(i)},dragEnter:function(e,o){if(!r||r===o)return!0;var n=this.dragenterData(o);if(this.dragenterData(o,n+1),0===n){var s=t.$(o).parent(),a=t.$(r).data("start-list");if(s[0]!==a[0]){var i=s.data("sortable-group"),l=t.$(r).data("sortable-group");if((i||l)&&i!=l)return!1}t.$(o).addClass(this.options.overClass),this.moveElementNextTo(r,o)}return!1},dragEnd:function(e,o){var n=this;r&&(this.options.stop(o),this.trigger("stop.uk.sortable",[this])),r=null,i=null,p.push(this.element),p.forEach(function(e){t.$(e).children().each(function(){1===this.nodeType&&(t.$(this).removeClass(n.options.overClass).removeClass(n.options.placeholderClass).removeClass(n.options.childClass),n.dragenterData(this,!1))})}),p=[],t.$html.removeClass(this.options.dragMovingClass),this.removeDragHandlers(),a&&(a.remove(),a=null)},dragDrop:function(t){"drop"===t.type&&(t.stopPropagation&&t.stopPropagation(),t.preventDefault&&t.preventDefault()),this.triggerChangeEvents()},triggerChangeEvents:function(){if(r){var e=t.$(r),o=a.data("origin"),n=e.closest("."+this.options.baseClass),s=[],i=t.$(r);o[0]===n[0]&&a.data("index")!=e.index()?s.push({sortable:this,mode:"moved"}):o[0]!=n[0]&&s.push({sortable:t.$(n).data("sortable"),mode:"added"},{sortable:t.$(o).data("sortable"),mode:"removed"}),s.forEach(function(t){t.sortable&&t.sortable.element.trigger("change.uk.sortable",[t.sortable,i,t.mode])})}},dragenterData:function(e,o){return e=t.$(e),1==arguments.length?parseInt(e.data("child-dragenter"),10)||0:(o?e.data("child-dragenter",Math.max(0,o)):e.removeData("child-dragenter"),void 0)},moveElementNextTo:function(e,n){l=!0;var s=this,a=t.$(e).parent().css("min-height",""),r=o(e,n)?n:n.nextSibling,i=a.children(),d=i.length;return s.options.animation?(a.css("min-height",a.height()),i.stop().each(function(){var e=t.$(this),o=e.position();o.width=e.width(),e.data("offset-before",o)}),n.parentNode.insertBefore(e,r),t.Utils.checkDisplay(s.element.parent()),i=a.children().each(function(){var e=t.$(this);e.data("offset-after",e.position())}).each(function(){var e=t.$(this),o=e.data("offset-before");e.css({position:"absolute",top:o.top,left:o.left,"min-width":o.width})}),i.each(function(){var e=t.$(this),o=(e.data("offset-before"),e.data("offset-after"));e.css("pointer-events","none").width(),setTimeout(function(){e.animate({top:o.top,left:o.left},s.options.animation,function(){e.css({position:"",top:"",left:"","min-width":"","pointer-events":""}).removeClass(s.options.overClass).removeData("child-dragenter"),d--,d||(a.css("min-height",""),t.Utils.checkDisplay(s.element.parent()))})},0)}),void 0):(n.parentNode.insertBefore(e,r),t.Utils.checkDisplay(s.element.parent()),void 0)},serialize:function(){var e,o,n=[];return this.element.children().each(function(s,a){e={};for(var r,i,l=0;l<a.attributes.length;l++)o=a.attributes[l],0===o.name.indexOf("data-")&&(r=o.name.substr(5),i=t.Utils.str2json(o.value),e[r]=i||"false"==o.value||"0"==o.value?i:o.value);n.push(e)}),n},checkEmptyList:function(e){e=e?t.$(e):this.element,this.options.emptyClass&&e[e.children().length?"removeClass":"addClass"](this.options.emptyClass)}}),t.sortable});
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+[data-uk-sticky].uk-active{z-index:980;box-sizing:border-box;-webkit-backface-visibility:hidden}[data-uk-sticky][class*=uk-animation-]{-webkit-animation-duration:.2s;animation-duration:.2s}[data-uk-sticky].uk-animation-reverse{-webkit-animation-duration:.2s;animation-duration:.2s}
 \ No newline at end of file
+/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+!function(t){var i;window.UIkit&&(i=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-sticky",["uikit"],function(){return i||t(UIkit)})}(function(t){"use strict";function i(){var i=arguments.length?arguments:n;if(i.length&&!(e.scrollTop()<0))for(var o,a,r,h,p=e.scrollTop(),c=s.height(),l=e.height(),m=c-l,d=p>m?m-p:0,u=0;u<i.length;u++)if(h=i[u],h.element.is(":visible")&&!h.animate){if(h.check()){if(h.top<0?o=0:(r=h.element.outerHeight(),o=c-r-h.top-h.options.bottom-p-d,o=0>o?o+h.top:h.top),h.boundary&&h.boundary.length){var f=h.boundary.offset().top;a=h.boundtoparent?c-(f+h.boundary.outerHeight())+parseInt(h.boundary.css("padding-bottom")):c-f,o=p+r>c-a-(h.top<0?0:h.top)?c-a-(p+r):o}if(h.currentTop!=o){if(h.element.css({position:"fixed",top:o,width:h.getWidthFrom.length?h.getWidthFrom.width():h.element.width()}),!h.init&&(h.element.addClass(h.options.clsinit),location.hash&&p>0&&h.options.target)){var g=t.$(location.hash);g.length&&setTimeout(function(t,i){return function(){i.element.width();var e=t.offset(),s=e.top+t.outerHeight(),n=i.element.offset(),o=i.element.outerHeight(),a=n.top+o;n.top<s&&e.top<a&&(p=e.top-o-i.options.target,window.scrollTo(0,p))}}(g,h),0)}h.element.addClass(h.options.clsactive).removeClass(h.options.clsinactive),h.element.trigger("active.uk.sticky"),h.element.css("margin",""),h.options.animation&&h.init&&!t.Utils.isInView(h.wrapper)&&h.element.addClass(h.options.animation),h.currentTop=o}}else null!==h.currentTop&&h.reset();h.init=!0}}var e=t.$win,s=t.$doc,n=[],o=1;return t.component("sticky",{defaults:{top:0,bottom:0,animation:"",clsinit:"uk-sticky-init",clsactive:"uk-active",clsinactive:"",getWidthFrom:"",showup:!1,boundary:!1,media:!1,target:!1,disabled:!1},boot:function(){t.$doc.on("scrolling.uk.document",function(t,e){e&&e.dir&&(o=e.dir.y,i())}),t.$win.on("resize orientationchange",t.Utils.debounce(function(){if(n.length){for(var t=0;t<n.length;t++)n[t].reset(!0),n[t].self.computeWrapper();i()}},100)),t.ready(function(e){setTimeout(function(){t.$("[data-uk-sticky]",e).each(function(){var i=t.$(this);i.data("sticky")||t.sticky(i,t.Utils.options(i.attr("data-uk-sticky")))}),i()},0)})},init:function(){var i,a=this.options.boundary;this.wrapper=this.element.wrap('<div class="uk-sticky-placeholder"></div>').parent(),this.computeWrapper(),this.wrapper.css({"margin-top":this.element.css("margin-top"),"margin-bottom":this.element.css("margin-bottom"),"margin-left":this.element.css("margin-left"),"margin-right":this.element.css("margin-right")}),this.element.css("margin",0),a&&(a===!0||"!"===a[0]?(a=a===!0?this.wrapper.parent():this.wrapper.closest(a.substr(1)),i=!0):"string"==typeof a&&(a=t.$(a))),this.sticky={self:this,options:this.options,element:this.element,currentTop:null,wrapper:this.wrapper,init:!1,getWidthFrom:t.$(this.options.getWidthFrom||this.wrapper),boundary:a,boundtoparent:i,top:0,calcTop:function(){var i=this.options.top;if(this.options.top&&"string"==typeof this.options.top)if(this.options.top.match(/^(-|)(\d+)vh$/))i=window.innerHeight*parseInt(this.options.top,10)/100;else{var e=t.$(this.options.top).first();e.length&&e.is(":visible")&&(i=-1*(e.offset().top+e.outerHeight()-this.wrapper.offset().top))}this.top=i},reset:function(i){this.calcTop();var e=function(){this.element.css({position:"",top:"",width:"",left:"",margin:"0"}),this.element.removeClass([this.options.animation,"uk-animation-reverse",this.options.clsactive].join(" ")),this.element.addClass(this.options.clsinactive),this.element.trigger("inactive.uk.sticky"),this.currentTop=null,this.animate=!1}.bind(this);!i&&this.options.animation&&t.support.animation&&!t.Utils.isInView(this.wrapper)?(this.animate=!0,this.element.removeClass(this.options.animation).one(t.support.animation.end,function(){e()}).width(),this.element.addClass(this.options.animation+" uk-animation-reverse")):e()},check:function(){if(this.options.disabled)return!1;if(this.options.media)switch(typeof this.options.media){case"number":if(window.innerWidth<this.options.media)return!1;break;case"string":if(window.matchMedia&&!window.matchMedia(this.options.media).matches)return!1}var i=e.scrollTop(),n=s.height(),a=n-window.innerHeight,r=i>a?a-i:0,h=this.wrapper.offset().top,p=h-this.top-r,c=i>=p;return c&&this.options.showup&&(1==o&&(c=!1),-1==o&&!this.element.hasClass(this.options.clsactive)&&t.Utils.isInView(this.wrapper)&&(c=!1)),c}},this.sticky.calcTop(),n.push(this.sticky)},update:function(){i(this.sticky)},enable:function(){this.options.disabled=!1,this.update()},disable:function(t){this.options.disabled=!0,this.sticky.reset(t)},computeWrapper:function(){this.wrapper.css({height:-1==["absolute","fixed"].indexOf(this.element.css("position"))?this.element.outerHeight():"","float":"none"!=this.element.css("float")?this.element.css("float"):""}),"fixed"==this.element.css("position")&&this.element.css({width:this.sticky.getWidthFrom.length?this.sticky.getWidthFrom.width():this.element.width()})}}),t.sticky});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var e;window.UIkit&&(e=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-timepicker",["uikit"],function(){return e||t(UIkit)})}(function(t){"use strict";function e(t,e){t=t||0,e=e||24;var i,o,a={"12h":[],"24h":[]};for(i=t,o="";e>i;i++)o=""+i,10>i&&(o="0"+o),a["24h"].push({value:o+":00"}),a["24h"].push({value:o+":30"}),0===i&&(o=12,a["12h"].push({value:o+":00 AM"}),a["12h"].push({value:o+":30 AM"})),i>0&&13>i&&12!==i&&(a["12h"].push({value:o+":00 AM"}),a["12h"].push({value:o+":30 AM"})),i>=12&&(o-=12,0===o&&(o=12),10>o&&(o="0"+String(o)),a["12h"].push({value:o+":00 PM"}),a["12h"].push({value:o+":30 PM"}));return a}t.component("timepicker",{defaults:{format:"24h",delay:0,start:0,end:24},boot:function(){t.$html.on("focus.timepicker.uikit","[data-uk-timepicker]",function(){var e=t.$(this);if(!e.data("timepicker")){var i=t.timepicker(e,t.Utils.options(e.attr("data-uk-timepicker")));setTimeout(function(){i.autocomplete.input.focus()},40)}})},init:function(){var i,o=this,a=e(this.options.start,this.options.end);this.options.minLength=0,this.options.template='<ul class="uk-nav uk-nav-autocomplete uk-autocomplete-results">{{~items}}<li data-value="{{$item.value}}"><a>{{$item.value}}</a></li>{{/items}}</ul>',this.options.source=function(t){t(a[o.options.format]||a["12h"])},this.element.is("input")?(this.element.wrap('<div class="uk-autocomplete"></div>'),i=this.element.parent()):i=this.element.addClass("uk-autocomplete"),this.autocomplete=t.autocomplete(i,this.options),this.autocomplete.dropdown.addClass("uk-dropdown-small uk-dropdown-scrollable"),this.autocomplete.on("show.uk.autocomplete",function(){var t=o.autocomplete.dropdown.find('[data-value="'+o.autocomplete.input.val()+'"]');setTimeout(function(){o.autocomplete.pick(t,!0)},10)}),this.autocomplete.input.on("focus",function(){o.autocomplete.value=Math.random(),o.autocomplete.triggercomplete()}).on("blur",t.Utils.debounce(function(){o.checkTime()},100)),this.element.data("timepicker",this)},checkTime:function(){var t,e,i,o,a="AM",u=this.autocomplete.input.val();"12h"==this.options.format?(t=u.split(" "),e=t[0].split(":"),a=t[1]):e=u.split(":"),i=parseInt(e[0],10),o=parseInt(e[1],10),isNaN(i)&&(i=0),isNaN(o)&&(o=0),"12h"==this.options.format?(i>12?i=12:0>i&&(i=12),"am"===a||"a"===a?a="AM":("pm"===a||"p"===a)&&(a="PM"),"AM"!==a&&"PM"!==a&&(a="AM")):i>=24?i=23:0>i&&(i=0),0>o?o=0:o>=60&&(o=0),this.autocomplete.input.val(this.formatTime(i,o,a)).trigger("change")},formatTime:function(t,e,i){return t=10>t?"0"+t:t,e=10>e?"0"+e:e,t+":"+e+("12h"==this.options.format?" "+i:"")}})});
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 .uk-tooltip{display:none;position:absolute;z-index:1030;box-sizing:border-box;max-width:200px;padding:5px 8px;background:#333;color:rgba(255,255,255,.7);font-size:12px;line-height:18px;border-radius:3px;text-shadow:0 1px 0 rgba(0,0,0,.5)}.uk-tooltip:after{content:"";display:block;position:absolute;width:0;height:0;border:5px dashed #333}.uk-tooltip-top-left:after,.uk-tooltip-top-right:after,.uk-tooltip-top:after{bottom:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent;border-top-color:#333}.uk-tooltip-bottom-left:after,.uk-tooltip-bottom-right:after,.uk-tooltip-bottom:after{top:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent;border-bottom-color:#333}.uk-tooltip-bottom:after,.uk-tooltip-top:after{left:50%;margin-left:-5px}.uk-tooltip-bottom-left:after,.uk-tooltip-top-left:after{left:10px}.uk-tooltip-bottom-right:after,.uk-tooltip-top-right:after{right:10px}.uk-tooltip-left:after{right:-5px;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent;border-left-color:#333}.uk-tooltip-right:after{left:-5px;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent;border-right-color:#333}
 \ No newline at end of file
-/*! UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
+/* UIkit 2.27.1 | http://www.getuikit.com | (c) 2014 YOOtheme | MIT License */
 !function(t){var i;window.UIkit&&(i=t(UIkit)),"function"==typeof define&&define.amd&&define("uikit-tooltip",["uikit"],function(){return i||t(UIkit)})}(function(t){"use strict";var i,o,e;return t.component("tooltip",{defaults:{offset:5,pos:"top",animation:!1,delay:0,cls:"",activeClass:"uk-active",src:function(t){var i=t.attr("title");return void 0!==i&&t.data("cached-title",i).removeAttr("title"),t.data("cached-title")}},tip:"",boot:function(){t.$html.on("mouseenter.tooltip.uikit focus.tooltip.uikit","[data-uk-tooltip]",function(){var i=t.$(this);i.data("tooltip")||(t.tooltip(i,t.Utils.options(i.attr("data-uk-tooltip"))),i.trigger("mouseenter"))})},init:function(){var o=this;i||(i=t.$('<div class="uk-tooltip"></div>').appendTo("body")),this.on({focus:function(){o.show()},blur:function(){o.hide()},mouseenter:function(){o.show()},mouseleave:function(){o.hide()}})},show:function(){if(this.tip="function"==typeof this.options.src?this.options.src(this.element):this.options.src,o&&clearTimeout(o),e&&clearTimeout(e),"string"==typeof this.tip?this.tip.length:0){i.stop().css({top:-2e3,visibility:"hidden"}).removeClass(this.options.activeClass).show(),i.html('<div class="uk-tooltip-inner">'+this.tip+"</div>");var s=this,n=t.$.extend({},this.element.offset(),{width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}),l=i[0].offsetWidth,f=i[0].offsetHeight,p="function"==typeof this.options.offset?this.options.offset.call(this.element):this.options.offset,a="function"==typeof this.options.pos?this.options.pos.call(this.element):this.options.pos,h=a.split("-"),c={display:"none",visibility:"visible",top:n.top+n.height+f,left:n.left};if("fixed"==t.$html.css("position")||"fixed"==t.$body.css("position")){var r=t.$("body").offset(),d=t.$("html").offset(),u={top:d.top+r.top,left:d.left+r.left};n.left-=u.left,n.top-=u.top}"left"!=h[0]&&"right"!=h[0]||"right"!=t.langdirection||(h[0]="left"==h[0]?"right":"left");var m={bottom:{top:n.top+n.height+p,left:n.left+n.width/2-l/2},top:{top:n.top-f-p,left:n.left+n.width/2-l/2},left:{top:n.top+n.height/2-f/2,left:n.left-l-p},right:{top:n.top+n.height/2-f/2,left:n.left+n.width+p}};t.$.extend(c,m[h[0]]),2==h.length&&(c.left="left"==h[1]?n.left:n.left+n.width-l);var v=this.checkBoundary(c.left,c.top,l,f);if(v){switch(v){case"x":a=2==h.length?h[0]+"-"+(c.left<0?"left":"right"):c.left<0?"right":"left";break;case"y":a=2==h.length?(c.top<0?"bottom":"top")+"-"+h[1]:c.top<0?"bottom":"top";break;case"xy":a=2==h.length?(c.top<0?"bottom":"top")+"-"+(c.left<0?"left":"right"):c.left<0?"right":"left"}h=a.split("-"),t.$.extend(c,m[h[0]]),2==h.length&&(c.left="left"==h[1]?n.left:n.left+n.width-l)}c.left-=t.$body.position().left,o=setTimeout(function(){i.css(c).attr("class",["uk-tooltip","uk-tooltip-"+a,s.options.cls].join(" ")),s.options.animation?i.css({opacity:0,display:"block"}).addClass(s.options.activeClass).animate({opacity:1},parseInt(s.options.animation,10)||400):i.show().addClass(s.options.activeClass),o=!1,e=setInterval(function(){s.element.is(":visible")||s.hide()},150)},parseInt(this.options.delay,10)||0)}},hide:function(){if(!this.element.is("input")||this.element[0]!==document.activeElement)if(o&&clearTimeout(o),e&&clearTimeout(e),i.stop(),this.options.animation){var t=this;i.fadeOut(parseInt(this.options.animation,10)||400,function(){i.removeClass(t.options.activeClass)})}else i.hide().removeClass(this.options.activeClass)},content:function(){return this.tip},checkBoundary:function(i,o,e,s){var n="";return(0>i||i-t.$win.scrollLeft()+e>window.innerWidth)&&(n+="x"),(0>o||o-t.$win.scrollTop()+s>window.innerHeight)&&(n+="y"),n}}),t.tooltip});
 \ No newline at end of file
 /* ^_^ baidu map hide logo */
+.ps-container > .ps-scrollbar-y-rail{
+    z-index: 9 !important;
+}
+
+.ps-container > .ps-scrollbar-x-rail,
+.ps-container > .ps-scrollbar-y-rail {
+    opacity: 0.6 !important;
+    padding: 0 !important;
+}
+
 .anchorBL, .anchorBL, .amap-logo, .amap-copyright {
     display: none;
 }
@@ -952,9 +962,6 @@ option.oil_station_opt{
 .safe_driv_pop .title{
 }
-/*.safe_driv_pop i.uk-icon-times-circle{
-    margin-right: 5px;
-}*/
 .safe_driv_pop .desc{
     display: block;
     font-size: 12px;
@@ -963,20 +970,20 @@ option.oil_station_opt{
     margin-right: 5px;
 }
-/*.safe_driv_pop .detail_content{
-    display: none;
+/** 嵌入表单modal滚动条样式 */
+#formFragmentModal::-webkit-scrollbar {
+    width: 10px;
+    background-color: #F5F5F5;
 }
-
-.safe_driv_pop.open .detail_content{
-    display: block;
-    background: rgb(255, 255, 255);
-    height: 200px;
-    margin: 7px 0;
-    border-radius: 5px;
-    color: #000000;
+#formFragmentModal::-webkit-scrollbar-thumb {
+    background-color: #000000;
+}
+#formFragmentModal::-webkit-scrollbar-track {
+    border: 0;
+    background-color: #F5F5F5;
+    border-radius: 0;
 }
-.safe_driv_pop.open .desc{
-    display: none;
-}*/
-/** 安全驾驶相关css结束 */
 \ No newline at end of file
+#formFragmentModal::-webkit-scrollbar-thumb{
+    border: 5px solid rgb(226, 122, 122);
+}
 \ No newline at end of file
@@ -129,7 +129,7 @@
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
                     <div class="uk-form-controls" style="margin-top: 5px;">
-                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="20" placeholder="备注，不超过20个字符">{{sch.remarks}}</textarea>
+                        <textarea id="form-s-t" cols="30" rows="5" name="remarks" data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="备注，不超过50个字符">{{sch.remarks}}</textarea>
                     </div>
                 </div>
             </div>
@@ -22,10 +22,33 @@
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row">
-                    <label class="uk-form-label" >班次</label>
+                    <label class="uk-form-label" >路牌</label>
+                    <div class="uk-form-controls">
+                        <select name="lpName">
+                            {{if lps.length > 1}}
+                            <option value="-100">全部</option>
+                            {{/if}}
+                            {{each lps as lpName i}}
+                            <option value="{{lpName}}">{{lpName}}</option>
+                            {{/each}}
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-grid">
+            <div class="uk-width-1-1">
+                <div class="uk-form-row">
+                    <label class="uk-form-label" >班次
+                        <hr>
+                         <label>全选
+                             <input class="i-cbox" name="allCheck" type="checkbox" >
+                         </label>
+                    </label>
                     <div class="uk-form-controls sch-time-checkbox-list">
                         {{each list as sch i}}
-                        <label {{if sch.destroy}}class="destroy-sch"{{/if}}>
+                        <label data-lp="{{sch.lpName}}" {{if sch.destroy}}class="destroy-sch"{{/if}}>
                             <input class="i-cbox" name="ids[]" value="{{sch.id}}" type="checkbox" {{if sch.destroy}}disabled{{/if}}>
                             {{sch.dfsj}}
@@ -94,10 +117,17 @@
                     return item.clZbh == sch.clZbh;
                 }).sort(gb_schedule_table.schedule_sort);
+                //获取路牌
+                var lps = {};
+                $.each(schArr, function () {
+                    lps[this.lpName]=1;
+                });
+
                 var formHtml = template('schedule-jhlb-form-temp', {
                     sch: sch,
                     list: schArr,
-                    adjustExps:adjustExps
+                    adjustExps:adjustExps,
+                    lps: gb_common.get_keys(lps)
                 });
                 $('form', modal).html(formHtml);
@@ -137,6 +167,35 @@
                     var rem=$('[name=remarks]', f);
                     rem.val(rem.val() + $(this).val() + ',').trigger('input');
                 });
+
+                //路牌切换事件
+                $('[name=lpName]', f).on('change', function () {
+                    var v = $(this).val();
+                    var lbs = $('.sch-time-checkbox-list label', modal);
+                    if(v=='-100'){
+                        //显示全部
+                        lbs.show();
+                    }
+                    else {
+                        lbs.hide().each(function () {
+                            if($(this).data('lp')==v)
+                                $(this).show();
+                            else{
+                                //将隐藏的checkbox取消选中
+                                $(this).find('input[type=checkbox]')[0].checked=false;
+                            }
+                        });
+                    }
+                });
+
+                //全选
+                $('[name=allCheck]', f).on('click', function () {
+                    var cbs = $('.sch-time-checkbox-list label input[type=checkbox]:visible:enabled', modal);
+                    var status = this.checked;
+                    cbs.each(function () {
+                        this.checked = status;
+                    });
+                });
             });
         })();
     </script>
@@ -57,7 +57,7 @@
                 <a id="addChildTaskBtn" data-uk-tooltip title="添加子任务"><i
                         class="uk-icon-plus"></i> </a>
             </h3>
-            <div class="ct_table_wrap ct_table_no_border" style="height: 142px;">
+            <div class="ct_table_wrap ct_table_no_border sub_task_table_wrap" style="height: 142px;">
                 <div class="ct_table sub-task-table">
                     <div class="ct_table_head">
                         <dl>
@@ -159,8 +159,11 @@
             $(modal).on('init', function (e, data) {
                 e.stopPropagation();
-                sch = data.sch;
+                //初始化滚动条
+                $('.main-schedule-wrap', modal).perfectScrollbar({suppressScrollX: true});
+                $('.sub_task_table_wrap', modal).perfectScrollbar({suppressScrollX: true});
+                sch = data.sch;
                 f = $('.search-form', modal);
                 //线路下拉框
                 var opts = '';
@@ -192,6 +195,8 @@
                         list: list
                     });
                     $(m_t_body, modal).html(htmlBody);
+                    //更新主任务滚动条高度
+                    $('.main-schedule-wrap', modal).perfectScrollbar('update');
                     $(s_t_body, modal).empty();
                 });
                 //班次点击
@@ -252,6 +257,8 @@
                 sch.cTasks.sort(sub_task_sort);
                 htmlStr = template('sub_task-table-temp', {list: sch.cTasks});
                 tbody.html(htmlStr);
+                //更新子任务滚动条高度
+                $('.sub_task_table_wrap', modal).perfectScrollbar('update');
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', tbody));
@@ -295,7 +302,7 @@
                 var sch = getActiveSch();
                 if (!sch || !sch.sflj)
                     return notify_err('只能删除临加班次！');
-                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3>';
+                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">如果删除失败，可能正处于调度指令下行上达瞬间，等几秒再删即可。班次删除后，调度指令会保留</h5>';
                 alt_confirm(str, function () {
                     gb_common.$del('/realSchedule/' + sch.id, function (rs) {
                         //前端数据更新
-<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
+<div class="uk-modal" id="schedule-multi-tzrc-modal">
     <div class="drag-container"></div>
     <div class="uk-modal-dialog" style="width: 860px;">
         <a href="" class="uk-modal-close uk-close"></a>
@@ -122,6 +122,8 @@
                 e.stopPropagation();
                 sch = data.sch;
+                //滚动条
+                $('.tzrc-table-wrap', modal).perfectScrollbar();
                 //线路下拉框
                 var opts = '';
                 $.each(gb_data_basic.activeLines, function () {
@@ -146,6 +148,8 @@
                                 list: list
                             });
                     $('.sch-tzrc-table .ct_table_body', modal).html(htmlBody);
+                    //更新滚动条高度
+                    $('.tzrc-table-wrap', modal).perfectScrollbar('update');
                 });
                 $(modal).on('click', '.sch-tzrc-table .ct_table_body dl input[type=checkbox]', function () {
@@ -83,7 +83,10 @@
         }
         #curr-date-schedule-modal .line_list_ul li.active{
-            background: #93d1ff;
+            background: #009dd8;
+            color: #fff;
+            box-shadow: inset 0 2px 4px rgba(0,0,0,.2);
+            text-shadow: 0 -1px 0 rgba(0,0,0,.2);
         }
     </style>
@@ -98,7 +101,7 @@
                 </ul>
             </div>
             <div class="uk-width-medium-9-10">
-                <div class="ct_table_wrap" style="height: 460px;">
+                <div class="ct_table_wrap" style="height: 520px;">
                     <div class="ct_table curr-schedule-table">
                         <div class="ct_table_head">
                             <dl>
@@ -192,6 +195,10 @@
                 //默认点击第一个
                 $('.line_list_ul li:eq(0)', modal).trigger('click');
+                //滚动条
+                $('.ct_table_wrap', modal).perfectScrollbar();
+                //固定头部
+                gb_ct_table.fixedHead($('.ct_table_wrap', modal));
             });
             $(modal).on('click', '.line_list_ul li',  function () {
@@ -203,7 +210,6 @@
             var query = function (lineCode) {
                 $.get('/realSchedule/currSchedulePlanByLineCode', {lineCode: lineCode}, function (rs) {
-
                     var data=[];
                     //先按路牌分组
                     var lpMapData = gb_common.groupBy(rs, 'lpName');
@@ -214,6 +220,9 @@
                     var htmlStr = template('curr_schedule_list-temp', {list: data});
                     $('.ct_table_body', modal).html(htmlStr);
+
+                    //更新滚动条
+                    $('.ct_table_wrap', modal).perfectScrollbar('update');
                 });
             };
+<div class="uk-modal ct_move_modal" id="data_manager_car_move-modal">
+    <div class="uk-modal-dialog" style="width: 1100px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <div class="uk-modal-header">
+            <h2>车辆设备数据迁移</h2></div>
+
+        <div class="uk-alert uk-alert-warning">
+            1、新老系统的车辆清单均基于线路配车，你必须保证新老系统的线路配车是一致的。<br>
+            2、只更新车辆当前的设备号，不同步历史的设备变迁记录。
+        </div>
+        <div class="uk-grid">
+            <div class="uk-width-1-5">
+                <ul class="uk-nav uk-nav-side line_list" >
+                </ul>
+            </div>
+            <div class="uk-width-4-5 uk-grid table-wrap" id="carDataTables" style="height: 450px;overflow: auto;position: relative;">
+                <div class="uk-width-1-2">
+                    <div>
+                        <table class="uk-table uk-table-hover nowTable">
+                            <caption style="color: #2795ed;" >新系统数据</caption>
+                            <thead>
+                            <tr>
+                                <th>车辆自编号</th>
+                                <th>设备编号</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="uk-width-1-2">
+                    <div>
+                        <table class="uk-table uk-table-hover oldTable">
+                            <caption >老系统数据</caption>
+                            <thead>
+                            <tr>
+                                <th>车辆自编号</th>
+                                <th>设备编号</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="uk-modal-footer uk-text-right">
+            <em style="margin-right: 15px;">设备号不同的车辆数：<span id="diffCount"></span></em>
+            <button type="button" class="uk-button uk-modal-close">取消</button>
+            <button type="button" class="uk-button uk-button-primary" id="synchroDevicesBtn">更新设备号有差异的数据</button>
+        </div>
+    </div>
+
+    <script id="data_manager_car_move-table-temp" type="text/html">
+        {{each list as car i}}
+        <tr data-nbbm="{{car.nbbm}}" data-device="{{car.device}}" {{if car.flag=='now_non-existent'}}style="color:red;"{{/if}}>
+            <td>{{car.nbbm}}</td>
+            <td {{if car.flag=='device_unequal'}}style="color:red;"{{/if}}>{{car.device}}</td>
+        </tr>
+        {{/each}}
+    </script>
+
+    <script>
+        (function() {
+            var modal = '#data_manager_car_move-modal',
+                    $ul = $('.line_list', modal),
+                    nowArray, oldArray;
+
+            $(modal).on('init', function(e, data) {
+                e.stopPropagation();
+
+                //左侧线路list
+                var lis = '';
+                $.each(gb_data_basic.activeLines, function () {
+                    lis += '<li data-id="'+this.id+'"><a>'+this.name+'</a></li>';
+                });
+                $ul.html(lis);
+
+                //线路点击事件
+                $('li', $ul).on('click', function () {
+                    if(loading)
+                        return;
+                    $('li.uk-active', $ul).removeClass('uk-active');
+                    $(this).addClass('uk-active');
+                    //加载车辆数据
+                    queryCarInfo($(this).data('id'));
+                });
+
+                //初始化滚动条
+                $('.table-wrap', modal).perfectScrollbar({suppressScrollX: true});
+
+                //默认点击第一条线路
+                $('li:eq(0)', $ul).trigger('click');
+            });
+
+            /**
+             * 加载车辆数据
+             * @param lineCode
+             */
+            var loading, deviceUnequalCount;
+            function queryCarInfo(lineId) {
+                loading = true;
+                deviceUnequalCount = 0;
+                gb_common.$get('/dataManager/cars/old_now', {lineId: lineId}, function (rs) {
+                    console.log('数据迁移 -车辆数据', rs);
+                    nowArray = rs.nows;
+                    oldArray = rs.olds;
+                    $.each(rs.olds, function () {
+                        var car = searchDevices(rs.nows, this.nbbm);
+                        if(!car)
+                            this.flag = 'now_non-existent';//在新系统不存在的车辆
+                        else if(car.device != this.device){
+                            car.flag = 'device_unequal';
+                            deviceUnequalCount ++;
+                        }
+                    });
+
+                    //按新系统数据车辆自编号排序
+                    rs.nows.sort(function (a, b) {
+                        return a.nbbm.localeCompare(b.nbbm);
+                    });
+
+                    //老系统数据对应新系统顺序，多的放后面
+                    var ks = {};
+                    $.each(rs.nows, function (i) {
+                        ks[this.nbbm] = i;
+                    });
+                    rs.olds.sort(function (a, b) {
+                        return ks[a.nbbm] - ks[b.nbbm];
+                    });
+
+                    //渲染新系统表格
+                    var htmlStr = template('data_manager_car_move-table-temp', {list: rs.nows});
+                    $('.nowTable tbody', modal).html(htmlStr);
+
+                    //渲染老系统表格
+                    var htmlStr = template('data_manager_car_move-table-temp', {list: rs.olds});
+                    $('.oldTable tbody', modal).html(htmlStr);
+
+                    $('#diffCount', modal).text(deviceUnequalCount);
+                    if(deviceUnequalCount==0)
+                        $('#synchroDevicesBtn', modal).attr('disabled', 'disabled');
+                    else
+                        $('#synchroDevicesBtn', modal).removeAttr('disabled');
+                    loading = false;
+                });
+            }
+
+            function searchDevices(array, nbbm) {
+                for(var i =0,item; item=array[i++];){
+                    if(item.nbbm == nbbm)
+                        return item;
+                }
+            }
+
+            /**
+             * 同步数据
+             */
+            $('#synchroDevicesBtn', modal).on('click', function () {
+                $(this).attr('disabled', 'disabled');
+                var data = [];
+                $.each(oldArray, function () {
+                    var car = searchDevices(nowArray, this.nbbm);
+                    if(car.device != this.device){
+                        data.push({
+                            nbbm: this.nbbm,
+                            device: this.device
+                        });
+                    }
+                });
+
+                gb_common.$post('/dataManager/car/updateDevices', {jsonStr: JSON.stringify(data)}, function (rs) {
+                    notify_succ('成功更新' + rs.count + '辆车的设备号！');
+                    //$(this).removeAttr('disabled');
+                    //刷新表格
+                    queryCarInfo($('li.uk-active', $ul).data('id'));
+                });
+            });
+        })();
+    </script>
+</div>
+<div class="uk-modal" id="data-move-verification-modal">
+    <div class="uk-modal-dialog" style="width: 650px;">
+        <a href="" class="uk-modal-close uk-close"></a>
+        <h2>数据迁移和校验</h2>
+
+        <div class="uk-grid" data-uk-grid-margin>
+            <div class="uk-width-medium-1-3">
+                <a class="uk-panel uk-panel-hover detail_panel" data-href="/real_control_v2/fragments/north/nav/dataManager/cars_move.html">
+                    <h3 class="uk-panel-title">车辆数据</h3>
+                    对照老系统的车辆设备信息，并增量更新到新系统
+                </a>
+            </div>
+            <div class="uk-width-medium-1-3">
+                <a class="uk-panel uk-panel-hover" >
+                    <h3 class="uk-panel-title">人员数据</h3>
+                    对照老系统的人员信息，并增量更新到新系统 <code>不可用</code>
+                </a>
+            </div>
+            <div class="uk-width-medium-1-3">
+                <a class="uk-panel uk-panel-hover">
+                    <h3 class="uk-panel-title">路单数据</h3>
+                    将老系统指定日期的路单同步到新系统，全量覆盖 <code>不可用</code>
+                </a>
+            </div>
+        </div>
+
+    </div>
+
+
+    <script>
+        (function () {
+            var modal = '#data-move-verification-modal';
+            $(modal).on('init', function (e, data) {
+                e.stopPropagation();
+
+                $('.detail_panel', modal).on('click', function () {
+                    var href = $(this).data('href');
+                    if(!href)
+                        return;
+
+                    open_modal(href, {}, {center: false, bgclose: false, modal: false});
+                });
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
@@ -4,7 +4,7 @@
         <li class="uk-active" ><a>主页</a></li>
         <li id="north_tabs_map_btn"><a>地图</a></li>
         {{each list as line i}}
-        <li class="tab-line"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
+        <li class="tab-line" data-code="{{line.lineCode}}"><a>{{line.name}}（<span id="badge_untreated_num_{{line.lineCode}}">0</span>, <span id="badge_yfwf_num_{{line.lineCode}}">0</span>）</a></li>
         {{/each}}
     </ul>
   </script>
@@ -26,6 +26,15 @@
           "id": 1.4,
           "text": "历史班次维护",
           "event": "history_sch_maintain"
+        },
+        {
+          "id": 1.5,
+          "divider": true
+        },
+        {
+          "id": 1.6,
+          "text": "数据迁移和校验工具",
+          "event": "data_move_and_verification"
         }
       ],
       [
@@ -16,7 +16,6 @@
     <link href="/metronic_v4.5.4/plugins/bootstrap-datetimepicker-2/css/bootstrap-datetimepicker.min.css"
           rel="stylesheet" type="text/css"/>
-
     <!-- jQuery -->
     <script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
     <script src="/assets/plugins/pinyin.js"></script>
@@ -22,6 +22,10 @@ var gb_schedule_context_menu = (function () {
             var list = schArray.filter(function (sch) {
                 return sch.bcType != 'out' && sch.bcType != 'in' && sch.fcsjActual == null;
             });
+            if(list.length == 0){
+                notify_err('没有需要调整的班次！');
+                return;
+            }
             open_modal(folder + '/multi_dftz.html', {
                 list: list
             }, modal_opts);
@@ -8,7 +8,32 @@ var gb_schedule_table = (function () {
     //车辆应发未发车辆数
     var car_yfwf_map = {};
     var schedule_sort = function (s1, s2) {
-        return s1.dfsjT - s2.dfsjT;
+        return s1.fcsjT - s2.fcsjT;
+    };
+
+    /**
+     * 检查是否存在重复班次
+     * @param list
+     */
+    var isRepeatData = function (list) {
+        try {
+            var map = {}, reps = [];
+            for(var i = 0,sch;sch=list[i++];){
+                if(map[sch.id]){
+                    reps.push(sch.clZbh);
+                }
+                map[sch.id] = sch;
+            }
+
+            //通知服务端数据有异常
+            $.each(reps, function () {
+                $.post('/anomalyCheck/schRepeat', {nbbm: this});
+            });
+        }catch (e){
+            return list;
+        }
+
+        return gb_common.get_vals(map);
     };
     var show = function (cb) {
@@ -17,9 +42,12 @@ var gb_schedule_table = (function () {
             lines: gb_data_basic.line_idx
         }, function (rs) {
             for (var lineCode in rs) {
+                line2Schedule[lineCode] = {};
+                //------是否有重复班次 #临时代码，为服务端提供诊断信息已解决这个问题
+                rs[lineCode] = isRepeatData(rs[lineCode]);
+
                 //排序
                 rs[lineCode].sort(schedule_sort);
-                line2Schedule[lineCode] = {};
                 //calc shift
                 $.each(rs[lineCode], function () {
                     calc_sch_real_shift(this);
@@ -54,7 +82,8 @@ var gb_schedule_table = (function () {
                         list: dirData[upDown]
                     });
-                    $('.schedule-wrap .card-panel:eq(' + upDown + ')', this).html(htmlStr);
+                    $('.schedule-wrap .card-panel:eq(' + upDown + ')', this)
+                        .html(htmlStr);
                 }
                 //标记车辆最后一个班次
@@ -63,6 +92,8 @@ var gb_schedule_table = (function () {
                 gb_sch_legend.init(this);
             });
             var content = $('.line_schedule .ct_table_wrap');
+            //初始化滚动条
+            content.perfectScrollbar({suppressScrollX: true});
             //fixed table head
             gb_ct_table.fixedHead(content);
             //enable sort
@@ -153,27 +184,6 @@ var gb_schedule_table = (function () {
         //重新渲染表格
         reRenderTable(sch.xlBm);
-        /*//重新渲染表格
-        var data = gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort),
-            dirData = gb_common.groupBy(data, 'xlDir'),
-            tabCont = $('li.line_schedule[data-id=' + sch.xlBm + ']');
-
-        for (var upDown in dirData) {
-            htmlStr = temps['line-schedule-table-temp']({
-                dir: upDown,
-                line: gb_data_basic.codeToLine[sch.xlBm],
-                list: dirData[upDown]
-            });
-            $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
-        }
-        //图例相关
-        gb_sch_legend.init(tabCont);
-        //标记末班
-        markerLastByLine(sch.xlBm);
-        //计算应发未发
-        calc_yfwf_num(sch.xlBm);
-        //重新固定表头
-        gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));*/
         //定位到新添加的班次
         scroToDl(sch);
     };
@@ -206,7 +216,16 @@ var gb_schedule_table = (function () {
             //计算应发未发
             calc_yfwf_num(lineCode);
             //重新固定表头
-            gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));
+            gb_ct_table.fixedHead($('.schedule-wrap .ct_table_wrap', tabCont));
+
+            //重新初始化排序
+            gb_ct_table.enableSort($('.ct_table', tabCont), reset_seq_no, gb_schedule_table_dbclick.init);
+            //重新初始化双击待发调整
+            gb_schedule_table_dbclick.init();
+            //重新初始化双击实发发车信息微调
+            gb_schedule_table_dbclick.sfsjCellClick($('dd.fcsjActualCell', tabCont));
+            //滚动条
+            $('.schedule-wrap .ct_table_wrap', tabCont).perfectScrollbar({suppressScrollX: true});
         }
     };
@@ -518,7 +537,7 @@ var gb_schedule_table = (function () {
             }
         }
     };
-    
+
     /** 添加备注信息 */
     var addRemarks = function (list, remarks) {
         //if(!list || list)
@@ -49,7 +49,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            //showUpdateDescription();
+            showUpdateDescription();
         });
         function g_emit(id) {
@@ -171,8 +171,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-01-07',
-        text: '<h5>1、出场子任务开放使用。</h5><h5>2、班次直放调整后可再次修改班次类型。</h5><h5>3、双击实发，可打开发车信息微调，发车信息微调界面可以直接烂班。</h5><h5>4、主页模拟图可以省略、重命名站点。</h5>'
+        date: '2017-04-18',
+        text: '<h5>可在 菜单栏 数据&统计→ 数据迁移和校验→ 车辆数据 功能内同步老系统的车辆设备号</h5>'
     };
     var storage = window.localStorage
@@ -24,6 +24,15 @@ var gb_tabs = (function() {
                 }
             });
+            //班次选项卡第一次点击，更新滚动条高度
+            $('.north-tabs .uk-tab li.tab-line').one('click', function(e){
+                var code = $(this).data('code');
+                setTimeout(function () {
+                    $('.main-container .line_schedule[data-id='+code+'] .schedule-wrap .ct_table_wrap')
+                        .perfectScrollbar('update');
+                }, 200);
+            });
+
             cb && cb();
         });
     };
@@ -191,6 +191,9 @@ var gb_northToolbar = (function () {
         },
         safe_driving: function () {
             open_modal('/real_control_v2/fragments/north/nav/safeDriving.html', {}, modal_opts);
+        },
+        data_move_and_verification: function () {
+            open_modal('/real_control_v2/fragments/north/nav/dataManager/dataMoveAndVerification.html', {}, modal_opts);
         }
     };
@@ -5,16 +5,17 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/>
     <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="uikit"/>
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" merge="plugins"/>
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css" merge="custom_style"/>
+    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
     <!-- north style -->
     <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
     <!-- home style -->
@@ -25,16 +26,18 @@
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"  merge="plugins"/>
     <!-- formvalidation style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"  merge="plugins"/>
     <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css"  merge="plugins"/>
     <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/css/pace.css"  merge="plugins"/>
     <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" merge="custom_style"/>
+    <!-- perfect-scrollbar style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" merge="plugins"/>
 </head>
 <body>
@@ -43,7 +46,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <i class="uk-icon-life-ring"></i> 闵行公交线路调度
+                    <i class="uk-icon-life-ring"></i> 浦东公交线路调度
                 </h2>
             </div>
         </div>
@@ -93,22 +96,24 @@
 <!-- 地图相关 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
-<script src="/assets/js/baidu//MarkerClusterer.js"></script>
-<script src="/assets/js/TransGPS.js"></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
+<script src="/assets/js/TransGPS.js" merge="plugins"></script>
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
 <script src="/real_control_v2/assets/js/jquery.min.js"></script>
 <!-- jquery actual -->
-<script src="/real_control_v2/assets/js/jquery.actual.min.js"></script>
+<script src="/real_control_v2/assets/js/jquery.actual.min.js" merge="plugins"></script>
 <!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"></script>
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
 <!-- moment.js 日期处理类库 -->
 <script src="/assets/plugins/moment-with-locales.js"></script>
+<!-- perfect-scrollbar -->
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
 <!-- common js -->
 <script src="/real_control_v2/js/common.js"></script>
 <!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
+<script src="/assets/plugins/template.js" merge="plugins"></script>
 <!-- d3 -->
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
@@ -124,20 +129,22 @@
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" merge="uikit_js"></script>
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/timepicker.min.js" merge="uikit_js"></script>
 <script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/lightbox.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" merge="uikit_js"></script>
+
 <!-- jquery contextMenu -->
-<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"></script>
-<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"></script>
+<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/js/jquery.ui.position.min.js"  merge="plugins"></script>
 <!-- formvalidation- -->
-<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"></script>
-<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/formValidation.min.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/zh_CN.js"  merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/formvalidation/uikit.min.js"  merge="plugins"></script>
 <!-- js tree -->
-<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"></script>
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
 <!-- simple pinyin -->
-<script src="/assets/plugins/pinyin.js"></script>
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 <!-- qtip -->
-<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js"></script>
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
 <!-- 数据 -->
 <script src="/real_control_v2/js/data/data_basic.js" merge="custom_js"></script>
@@ -175,9 +182,9 @@
 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
 <!-- echart -->
-<script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
+<script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>
 <!-- Geolib -->
-<script src="/real_control_v2/geolib/geolib.js"></script>
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
 <script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
-<link href="/assets/css/TrafficControl.css" rel="stylesheet"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css"/>
+<link href="/assets/css/TrafficControl.css" rel="stylesheet" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css" merge="map_plugins"/>
 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css">
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
 <div class="map-system-msg flex-left">
     <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
@@ -50,21 +50,21 @@
     </div>
 </div>
-<script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
-<script src="/real_control_v2/mapmonitor/js/config.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/real.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
+<script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/real.js" ></script>
+<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="map_custom_js"></script>
 <!-- jquery ui -->
-<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"  merge="map_plugins"></script>
 <!-- 颜色选择器 -->
-<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"></script>
+<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"  merge="map_plugins"></script>
 <!-- play back -->
-<script src="/real_control_v2/mapmonitor/js/playback.js" merge="custom_map_js"></script>
 \ No newline at end of file
+<script src="/real_control_v2/mapmonitor/js/playback.js" merge="map_custom_js"></script>
 \ No newline at end of file
+package com.bsth.service.schedule.rules;
+
+import com.bsth.service.schedule.BaseTest;
+import org.dbunit.database.DatabaseConnection;
+import org.dbunit.database.IDatabaseConnection;
+import org.dbunit.dataset.IDataSet;
+import org.dbunit.dataset.xml.FlatXmlDataSetBuilder;
+import org.dbunit.operation.DatabaseOperation;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+
+import javax.sql.DataSource;
+
+/**
+ * 排班计划测试（手工排班测试）。
+ */
+public class SchedulePlan1Test extends BaseTest {
+    /** 日志记录器 */
+    private static final Logger logger = LoggerFactory.getLogger(SchedulePlan1Test.class);
+
+    @Autowired
+    private DataSource dataSource;
+
+    /**
+     * 初始化数据。
+     */
+    @Before
+    public void initData() throws Exception {
+        logger.info("载入数据......");
+
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d2.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 载入数据
+        DatabaseOperation.CLEAN_INSERT.execute(iDatabaseConnection, iDataSet);
+    }
+
+    /**
+     * 清除数据。
+     */
+    @After
+    public void destoryData() throws Exception {
+        logger.info("清除数据......");
+        // 获取数据库连接
+        IDatabaseConnection iDatabaseConnection = new DatabaseConnection(dataSource.getConnection());
+        // 获取Dbunit数据源
+        Resource res = new ClassPathResource("testdata/d2.xml");
+        FlatXmlDataSetBuilder flatXmlDataSetBuilder = new FlatXmlDataSetBuilder();
+        flatXmlDataSetBuilder.setColumnSensing(false);
+        flatXmlDataSetBuilder.setCaseSensitiveTableNames(false);
+        IDataSet iDataSet = flatXmlDataSetBuilder.build(res.getInputStream());
+
+        // 清除数据
+        DatabaseOperation.DELETE_ALL.execute(iDatabaseConnection, iDataSet);
+    }
+
+
+    @Test
+    public void t1() {
+
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+package com.bsth.service.schedule.rules;
+
+/**
+ * 时刻表测试（自动排班测试）。
+ */
+public class SchedulePlan2Test {
+    // TODO：
+}
+1、车狼配置，每辆车都可以配置单独的停车点及相关数据，并提供两种设置模式（早晚，复驶）
+2、规则管理，修改规则的界面图形化，更加方便修改
+3、时刻表管理，导入时刻表xls做严格数据判定，时刻表明细修改提供跟方便的图形化修改方式
+4、排班计划管理，提供每次排班的操作信息，时间段，所使用的时刻表，可以查看具体的排班明细（细化到班次）
+              生成排班时，提供详细的时刻表统计信息，提供两种排班模式（历史排班优先，规则优先）
+5、调度值勤日报，列出每天的基于线路，路牌的排班统计，可以更换车辆，人员
+              此功能从排班计划中抽取出来，单独列出，供调派人员使用
 \ No newline at end of file
+select * from jwgl_f_t_clxh_workflow_detail a where a.ID_LYSYLB = 36;
+
+select sum(amount - tl_amount) from jwgl_f_t_clxh_workflow_detail
+where
+to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
+and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
+
+select * from JWGL_D_T_LYSYLB
+
+-- all xh
+
+select
+statdateid statdate
+, ssjc gs
+, xl xl
+, zbh cl
+, b.SYLB1 || '-' || b.SYLB2 as lylb
+, (sum(amount) - sum(tl_amount)) ch
+from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
+where
+to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
+and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
+and a.ID_LYSYLB = b.ID(+)
+group by
+statdateid
+, ssjc
+, xl
+, zbh
+, b.SYLB1 || '-' || b.SYLB2
+
+-- part1
+
+select sum(ch) from
+(
+select
+statdateid statdate
+, ssjc gs
+, xl xl
+, zbh cl
+, b.SYLB1 || '-' || b.SYLB2 as lylb
+, (sum(amount) - sum(tl_amount)) ch
+from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
+where
+to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
+and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
+and a.ID_LYSYLB = b.ID(+)
+group by
+statdateid
+, ssjc
+, xl
+, zbh
+, b.SYLB1 || '-' || b.SYLB2
+)
+where lylb in (
+'路救-路救',
+'小修-小修机工',
+'专项-安检',
+'专项-节检',
+'专项-水箱',
+'专项-电瓶',
+'小修-小修电工',
+'专项-电并',
+'小修-小修车身',
+'专项-镗固',
+'保养-一级保养',
+'小修-发动机',
+'专项-轮胎',
+'分摊-轮胎',
+'专项-润滑油',
+'总成-差变速',
+'总成-大泵',
+'总成-小总成',
+'总成-发动机',
+'保养-二级保养',
+'保养-三级保养',
+'整修-整修',
+'空调-保外',
+'空调-保内',
+'事故-事故'
+)
+
+-- part2
+
+select sum(ch) from
+(
+select
+statdateid statdate
+, ssjc gs
+, xl xl
+, zbh cl
+, b.SYLB1 || '-' || b.SYLB2 as lylb
+, (sum(amount) - sum(tl_amount)) ch
+from JWGL_F_T_CLXH_WORKFLOW_DETAIL a, JWGL_D_T_LYSYLB b
+where
+to_date(statdateid, 'YYYYMMDD') >= to_date('20170301', 'YYYYMMDD')
+and to_date(statdateid, 'YYYYMMDD') <= to_date('20170331', 'YYYYMMDD')
+and a.ID_LYSYLB = b.ID(+)
+group by
+statdateid
+, ssjc
+, xl
+, zbh
+, b.SYLB1 || '-' || b.SYLB2
+)
+where lylb in(
+'分摊-镗固',
+'专项-机油',
+'分摊-机油',
+'总成-其它',
+'分摊-工具',
+'分摊-辅助料',
+'分摊-设备',
+'车间经费-车间经费'
+)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+select * from JWGL_FR_T_CH_REPORT_DATA1;
+
+select * from JWGL_FR_T_CH_REPORT_DATA2;
+
+-- sum part1
+
+select
+(
+sum(lj_lj) + sum(xx_xxjg) + sum(xx_xxdg) + sum(zx_db) + sum(xx_xxcs) + sum(zx_tg) + sum(by_b1) +
+sum(nvl(future_bx, 0)) + sum(xx_fdj) + sum(zx_lt) + sum(zx_rhy) + sum(zc_cbx) + sum(zc_db) + sum(zc_xzc) +
+sum(zc_fdj) + sum(by_b2) + sum(by_b3) + sum(nvl(future_wx_db, 0)) + sum(nvl(future_wxfy, 0)) + sum(nvl(future_ktwx, 0)) + sum(nvl(future_sx, 0)) +
+sum(nvl(future_dp, 0)) + sum(zx_zx) + sum(kt_bw) + sum(sg_sg)
+) as part1
+from JWGL_FR_T_CH_REPORT_DATA1
+where
+statdate >= to_date('20170301', 'YYYYMMDD')
+and statdate <= to_date('20170331', 'YYYYMMDD')
+
+-- sum part2
+
+select
+(
+sum(zx_tg) + sum(jy) + sum(qt) + sum(zcfl) + sum(gj) + sum(sb) + sum(cjjf)
+) as part2
+from JWGL_FR_T_CH_REPORT_DATA2
+where statdate = to_date('20170331', 'YYYYMMDD')
 \ No newline at end of file