Merge branch 'minhang' into pudong

潘钊
2 parents 83a1d2c1 ec57c15f
Showing 50 changed files with 2231 additions and 610 deletions
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/controller/oil/YlbController.java
src/main/java/com/bsth/controller/realcontrol/FrequentPhrasesController.java
src/main/java/com/bsth/entity/realcontrol/FrequentPhrases.java
src/main/java/com/bsth/repository/realcontrol/FrequentPhrasesRepository.java
src/main/java/com/bsth/service/gps/GpsServiceImpl.java
src/main/java/com/bsth/service/oil/DlbService.java
src/main/java/com/bsth/service/oil/YlbService.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/FrequentPhrasesService.java
src/main/java/com/bsth/service/realcontrol/impl/FrequentPhrasesServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/traffic/impl/YgcBasicDataServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/parse.js
src/main/resources/fatso/start.js
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/electricity/list/add.html
src/main/resources/static/pages/electricity/list/list.html
@@ -2,6 +2,7 @@ package com.bsth.controller.oil;
  
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -194,4 +195,30 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
  
 	}
  
+	
+	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+	public String checkJsy(@RequestParam Map<String, Object> map){
+		String list=service.checkJsy(map);
+		return list;
+	}
+	
+	@RequestMapping(value = "/deleteIds", method = RequestMethod.POST)
+    public Map<String, Object> deleteIds(@RequestParam Map<String, Object> map) {
+		Map<String, Object> maps=new HashMap<String, Object>();
+        try {
+        	maps= service.deleteIds(map);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+        return maps;
+    }
+	
+	@RequestMapping(value = "/saveDlb",method = RequestMethod.POST)
+	public Map<String, Object> saveDlb(Dlb t){
+//		SysUser user = SecurityUtils.getCurrentUser();
+		t.setCreatetime(new Date());
+//		Ylb t=new Ylb();
+		return service.saveDlb(t);
+	}
 }
@@ -209,8 +209,8 @@ public class YlbController extends BaseController&lt;Ylb, Integer&gt;{
         return maps;
     }
 	@RequestMapping(value="/oilListMonth")
-	public List<Ylb> oilListMonth(@RequestParam String line,@RequestParam String date,@RequestParam String type){
-		return yblService.oilListMonth(line, date, type);
+	public List<Ylb> oilListMonth(@RequestParam Map<String, Object> map){
+		return yblService.oilListMonth(map);
 	}
  
 	@RequestMapping(value = "/checkJsy",method = RequestMethod.GET)
+package com.bsth.controller.realcontrol;
+
+import com.bsth.controller.BaseController;
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@RestController
+@RequestMapping("frequent_phrases")
+public class FrequentPhrasesController extends BaseController<FrequentPhrases, Integer>{
+
+}
+package com.bsth.entity.realcontrol;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * 常用短语
+ * Created by panzhao on 2017/9/17.
+ */
+@Entity
+@Table(name = "bsth_c_s_frequent_phrases")
+public class FrequentPhrases {
+
+    @Id
+    @GeneratedValue
+    private Integer id;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 短语
+     */
+    private String text;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+}
+package com.bsth.repository.realcontrol;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.repository.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@Repository
+public interface FrequentPhrasesRepository extends BaseRepository<FrequentPhrases, Integer> {
+}
@@ -994,7 +994,7 @@ public class GpsServiceImpl implements GpsService {
                 fv = f.get(obj).toString();
                 v = map.get(f.getName()).toString();
  
-                if(!fv.startsWith(v) && !fv.endsWith(v))
+                if(!fv.startsWith(v)/* && !fv.endsWith(v)*/)
                     return false;
             }
         } catch (Exception e) {
@@ -20,4 +20,12 @@ public interface DlbService extends BaseService&lt;Dlb, Integer&gt;{
 	Map<String, Object> saveDlbList(Map<String, Object> map) throws Exception;
  
 	String obtainDsq() throws Exception;
+	
+	String checkJsy(Map<String, Object> map);
+	
+	Map<String, Object> saveDlb(Dlb t);
+	
+	Map<String, Object> deleteIds(Map<String, Object> map) throws Exception;
+
+
 }
@@ -19,7 +19,7 @@ public interface YlbService extends BaseService&lt;Ylb, Integer&gt;{
  
 	Map<String, Object> sumYlb(Map<String, Object> map);
 	String checkJsy(Map<String, Object> map);
-	List<Ylb> oilListMonth(String line,String date,String type);
+	List<Ylb> oilListMonth(Map<String, Object> map);
 	List<Ylb> listYlb(Map<String, Object> map);
 	StringBuffer checkNbmmNum(String rq, String gsbm,String fgsbm,String xlbm,String nbbm,int lx);
  
@@ -1032,6 +1032,87 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
  
 		return lists;
 	}
+	
+	
+	@Override
+	public String checkJsy(Map<String, Object> map) {
+		// TODO Auto-generated method stub
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=map.get("date").toString();
+		String nbbm=map.get("nbbm").toString();
+		String jsy =map.get("jsy").toString();
+		String xlbm=map.get("xlbm").toString();
+		List<Dlb> list= repository.queryListDlb(rq, nbbm, jsy, xlbm);
+		String type="1";
+		if(list.size()>0){
+			type="0";
+		}
+		return type;
+	}
+
+	@Override
+	public Map<String, Object> saveDlb(Dlb t) {
+		// TODO Auto-generated method stub
+		Map<String, Object> map = new HashMap<>();
+		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		String rq=sdf.format(t.getRq());
+		String gsdm=t.getSsgsdm();
+		String fgsdm=t.getFgsdm();
+		String xlbm=t.getXlbm();
+		String jhsj=t.getJhsj();
+		String jsy=t.getJsy();
+		String nbbm=t.getNbbm();
+		int sfkt=t.getSfkt();
+		t.setCreatetime(new Date());
+		String[] jhsjStr = jhsj.split(":");
+		long fcsjL= Long.parseLong(jhsjStr[0])*60+Long.parseLong(jhsjStr[1]);
+		List<Dlb> list=this.listOrderBy(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+//				repository.obtainYl(rq, gsdm, fgsdm, xlbm, nbbm, "jhsj");
+		int jcsx=1;
+		if(list.size()>0){
+			for (int i = 0; i < list.size(); i++) {
+				Dlb y=list.get(i);
+				String[] fcsjStr = y.getJhsj().split(":");
+				long fcsj=Long.parseLong(fcsjStr[0])*60+Long.parseLong(fcsjStr[1]);
+				if(fcsjL>fcsj){
+					jcsx=jcsx+y.getJcsx();
+				}else{
+					y.setJcsx(y.getJcsx()+1);
+					repository.save(y);
+				}
+			}
+			
+		}
+		t.setJcsx(jcsx);
+		repository.save(t);
+		map.put("status", ResponseCode.SUCCESS);
+        map.put("t", t);
+		return map;
+	}
+	
+	@Transactional  
+	@Override
+	public Map<String, Object> deleteIds(Map<String, Object> map) throws Exception{
+		// TODO Auto-generated method stub
+		Map<String, Object> maps = new HashMap<>();
+		try{
+		String json =StringEscapeUtils.unescapeHtml4(map.get("ids").toString());
+		JSONArray jsonArray=JSONArray.parseArray(json);
+		JSONObject jsonObject;
+		for (int x = 0; x < jsonArray.size(); x++) {
+			jsonObject=jsonArray.getJSONObject(x);
+			Integer id =jsonObject.getInteger("id");
+			repository.delete(id);
+		}
+		maps.put("status", ResponseCode.SUCCESS);
+		} catch (Exception e) {
+			maps.put("status", ResponseCode.ERROR);
+			logger.error("save erro.", e);
+			throw e; 
+		}
+		return maps;
+	}
+	
 }
  
 class NbbmJcsxMap implements Comparator<Map<String, Object>>{
@@ -977,17 +977,24 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
  
  
 	@Override
-	public List<Ylb> oilListMonth(String line, String date, String type) {
+	public List<Ylb> oilListMonth(Map<String, Object> map) {
+		String type=map.get("type").toString();
+		String date=map.get("date").toString().trim();
+		String gsdm=map.get("gsdm").toString();
+		String fgsdm=map.get("fgsdm").toString();
 		String date2=date.substring(0, 8)+"01";
 		String lineStr="";
+		String line =map.get("line").toString().trim();
 		if(line !=null && !line.equals("")){
 			lineStr =" and xlbm= '"+ line +"'";
+		}else{
+			lineStr =" and ssgsdm='"+gsdm+"' and fgsdm ='"+fgsdm+"' ";
 		}
 		String sql="select a.nbbm,a.rq,a.jzyl from (" +
 				" select x.nbbm,max(x.rq) as rq,max(x.jcsx) as jcsx from "
 				+ "(select nbbm,rq,max(jcsx)  as jcsx from bsth_c_ylb  where rq between  '"
 				+ date2 +"'  and '" + date+"' "+lineStr
-				+ "group by   nbbm,rq)  x group by x.nbbm ) b" 
+				+ " group by   nbbm,rq)  x group by x.nbbm ) b" 
 				+ "	left join (select nbbm,rq,jzyl,jcsx  FROM   bsth_c_ylb  "
 				+ "	where rq between  '"
 				+ date2 +"'  and '" + date+"' "+lineStr
+package com.bsth.service.realcontrol;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.service.BaseService;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+public interface FrequentPhrasesService extends BaseService<FrequentPhrases, Integer> {
+}
+package com.bsth.service.realcontrol.impl;
+
+import com.bsth.entity.realcontrol.FrequentPhrases;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.realcontrol.FrequentPhrasesService;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2017/9/17.
+ */
+@Service
+public class FrequentPhrasesServiceImpl extends BaseServiceImpl<FrequentPhrases, Integer> implements FrequentPhrasesService {
+
+    @Override
+    public Map<String, Object> save(FrequentPhrases fp) {
+        fp.setUserName(SecurityUtils.getCurrentUser().getUserName());
+        return super.save(fp);
+    }
+
+    @Override
+    public Iterable<FrequentPhrases> list(Map<String, Object> map) {
+        map.put("userName_eq", SecurityUtils.getCurrentUser().getUserName());
+        return super.list(map);
+    }
+}
@@ -226,6 +226,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
  
             ScheduleRealInfo schedule = dayOfSchedule.get(id);
  
+            if(schedule.getStatus() > 0){
+                map.put("status", ResponseCode.SUCCESS);
+                map.put("flag", "4008");
+                map.put("t", schedule);
+                return map;
+            }
+
             LineConfig config = lineConfigData.get(schedule.getXlBm());
             //小于线路开始运营时间，则默认跨过24点
             if (dfsj.compareTo(config.getStartOpt()) < 0) {
@@ -2775,25 +2782,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         }
         for (int i = 0; i < newList.size(); i++) {
             ScheduleRealInfo t1 = newList.get(i);
-            String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
-            if(reamrks1.length()>5){
-            	t1.setRemarks(reamrks1.substring(0, 5));
-            	t1.setRemark(reamrks1);
-            }
             for (int j = 0; j < list.size(); j++) {
                 ScheduleRealInfo t2 = list.get(j);
-                String reamrks2=t2.getRemarks()==null?"":t2.getRemarks();
-                if(reamrks2.length()>5){
-                	t2.setRemarks(reamrks2.substring(0, 5));
-                	t2.setRemark(reamrks2);
-                }else{
-                	t2.setRemark(reamrks2);
-                }
                 if (t1.getId() == t2.getId()) {
                     t1 = t2;
                 }
             }
         }
+        
+        for (int i = 0; i < newList.size(); i++) {
+        	ScheduleRealInfo t1=newList.get(i);
+    	    String reamrks1=t1.getRemarks()==null?"":t1.getRemarks();
+            if(reamrks1.length()>4){
+	          	t1.setRemarks(reamrks1.substring(0,4));
+	          	t1.setRemark(reamrks1);
+            }else{
+          	    t1.setRemark(reamrks1);
+            }
+		}
         return newList;
     }
  
@@ -2973,28 +2979,28 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             yesterdayDataList.get(x).put("totalKilometers", zlc);
  
         }
-        List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
+       /* List<Map<String, Object>> yesterdayDataLists = new ArrayList<Map<String, Object>>();
  
         for (int i = 0; i < yesterdayDataList.size(); i++) {
         	Map<String, Object> map=yesterdayDataList.get(i);
         	 Double zlc=map.get("totalKilometers")==null?0.0:Double.parseDouble(map.get("totalKilometers").toString());
-        	 if(zlc>0){
+//        	 if(zlc>0){
         		 yesterdayDataLists.add(map);
-        	 }
-        }
+//        	 }
+        }*/
         //增加顺序号
-        for (int i = 0; i < yesterdayDataLists.size(); i++) {
+        for (int i = 0; i < yesterdayDataList.size(); i++) {
             if (i == 0) {
-            	yesterdayDataLists.get(i).put("seqNumber", 1);
+            	yesterdayDataList.get(i).put("seqNumber", 1);
             } else {
-                if (yesterdayDataLists.get(i - 1).get("clZbh").equals(yesterdayDataLists.get(i).get("clZbh"))) {
-                	yesterdayDataLists.get(i).put("seqNumber", 1 + (int) yesterdayDataLists.get(i - 1).get("seqNumber"));
+                if (yesterdayDataList.get(i - 1).get("clZbh").equals(yesterdayDataList.get(i).get("clZbh"))) {
+                	yesterdayDataList.get(i).put("seqNumber", 1 + (int) yesterdayDataList.get(i - 1).get("seqNumber"));
                 } else {
-                	yesterdayDataLists.get(i).put("seqNumber", 1);
+                	yesterdayDataList.get(i).put("seqNumber", 1);
                 }
             }
         }
-        return yesterdayDataLists;
+        return yesterdayDataList;
     }
  
     /**
@@ -81,6 +81,7 @@ public class YgcBasicDataServiceImpl implements YgcBasicDataService{
             flag = "success";
         }catch (Exception e){
             e.printStackTrace();
+            logger.error("updateYgcBasicData:",e);
         }
         finally {
             // 删除文件
@@ -11,32 +11,34 @@ var fs = require(&#39;fs&#39;)
  
 var platform = process.platform;
 var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
+var sp = platform=='win32'?'\\':'/';
 //不参与的目录
 var pName = 'bsth_control'
     , path = process.cwd()
     //根目录
-    , root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-    , workspace = root.substr(0, root.lastIndexOf(separator + pName))
+    , root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+    , workspace = root.substr(0, root.lastIndexOf(sp + pName))
     //临时目录
-    , dest = (workspace + separator + pName + '@fatso_copy')//.replace(/\//g, '\\')
-    , _static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static';
+    , dest = (workspace + sp + pName + '@fatso_copy')//.replace(/\//g, '\\')
+    , _static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static';
  
  
-var mainFile = dest + _static + separator + 'real_control_v2'+separator+'main.html';
-var mapFile = dest + _static + separator + 'real_control_v2'+separator+'mapmonitor'+separator+'real.html';
+var mainFile = dest + _static + sp + 'real_control_v2'+sp+'main.html';
+var aloneMapWrapFile = dest + _static + sp + 'real_control_v2'+sp+'alone_page'+sp+'map'+sp+'alone_wrap.html';
+var mapFile = dest + _static + sp + 'real_control_v2'+sp+'mapmonitor'+sp+'real.html';
 var realCtl = {
     /**
      * 处理线调首页
      */
     handleMain: function (cb) {
-        //读取文件
-        var data = fs.readFileSync(mainFile, 'utf-8')
-            , $ = cheerio.load(data);
-
+        //处理main.html
+        var data = fs.readFileSync(mainFile, 'utf-8'),
+            $ = cheerio.load(data);
         handleCss($, function () {
             handleJs($, mainFile, cb);
         });
+
+
     },
     /**
      * 处理地图模块
@@ -50,6 +52,17 @@ var realCtl = {
         handleCss($, function () {
             handleJs($, mapFile, cb);
         });
+    },
+    /**
+     * 处理单屏地图页面
+     * @param cb
+     */
+    handleAlonePage: function (cb) {
+        var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
+        var $ = cheerio.load(data);
+        handleCss($, function () {
+            handleJs($, aloneMapWrapFile, cb);
+        });
     }
 };
  
@@ -84,7 +97,7 @@ var handleCss = function ($, cb) {
             var data = out.styles;
             var fName = (k + '_' + md5(data)) + '.css';
             //写入 assets css 目录下
-            var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'css' + separator + fName;
+            var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'css' + sp + fName;
             fs.open(descFile, 'a', function (err, fd) {
  
                 fs.write(fd, data, function () {
@@ -138,7 +151,7 @@ var handleJs = function ($, file, cb) {
         var data = result.code;
         var fName = (k + '_' + md5(data)) + '.js';
         //写入 assets js 目录下
-        var descFile = dest + _static + separator + 'real_control_v2'+separator+'assets'+separator+'js' + separator + fName;
+        var descFile = dest + _static + sp + 'real_control_v2'+sp+'assets'+sp+'js' + sp + fName;
         fs.open(descFile, 'a', function (err, fd) {
  
             fs.write(fd, data, function () {
@@ -64,7 +64,7 @@ function write(file, text){
 		  console.log(err.toString().red);
 		  process.exit();
 	  }
-	  console.log(file.green); 
+	  //console.log(file.green);
 	});
 }
  
@@ -14,19 +14,19 @@ var fs = require(&#39;fs&#39;)
  
 var platform = process.platform;
 var iswin = platform=='win32';
-var separator = platform=='win32'?'\\':'/';
+var sp = platform=='win32'?'\\':'/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+separator+'authorize_all', 'summary']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission'+sp+'authorize_all', 'summary', 'report'+sp+'oil']
 	,ep = new EventProxy()
 	,pName = 'bsth_control'
 	,path = process.cwd()
 	//根目录
-	,root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-	,workspace = root.substr(0, root.lastIndexOf(separator + pName))
+	,root = path.substr(0, path.indexOf(sp + 'src'+sp+'main'))
+	,workspace = root.substr(0, root.lastIndexOf(sp + pName))
 	//临时目录
-	,dest = (workspace + separator + pName+'@fatso_copy')
-	,_static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static'
-	,_pages = dest + _static + separator + 'pages';
+	,dest = (workspace + sp + pName+'@fatso_copy')
+	,_static = sp + 'src'+sp+'main'+sp+'resources'+sp+'static'
+	,_pages = dest + _static + sp + 'pages';
  
  
 //创建临时目录
@@ -45,7 +45,7 @@ ep.tail(&#39;mvn-clean&#39;,function(){
 	//ep.emit('copy-project');
 	//清理target
 	logInfo('mvn clean...');
-	cProcess = child_process.exec("mvn clean",{cwd: workspace + separator + pName},function(error){
+	cProcess = child_process.exec("mvn clean",{cwd: workspace + sp + pName},function(error){
 		if(error)
 			logError(error);
  
@@ -88,7 +88,7 @@ ep.tail(&#39;minifier-js&#39;, function(){
 	//再处理首页
 	ep.emit('handle-index', function(){
 		//递归处理片段
-		walk(dest + _static + separator + 'pages', function(item){
+		walk(dest + _static + sp + 'pages', function(item){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
@@ -96,7 +96,10 @@ ep.tail(&#39;minifier-js&#39;, function(){
 			handle_real_ctl.handleMain(function () {
 				//处理线调地图
 				handle_real_ctl.handleMap(function () {
-					ep.emit('package-jar');
+					//处理单屏页面
+					handle_real_ctl.handleAlonePage(function () {
+						ep.emit('package-jar');
+					});
 				});
 			});
 		});
@@ -112,7 +115,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
  
 		logSuccess('mvn package success');
  
-		console.log(('成功打包在 ' + dest + separator + 'target 目录下').cyan);
+		console.log(('成功打包在 ' + dest + sp + 'target 目录下').cyan);
 	});
  
 	output(cProcess);
@@ -122,7 +125,7 @@ ep.tail(&#39;package-jar&#39;, function(file){
 ep.tail('handle-fragment', function(file){
 	//要排除的文件
 	for(var i = 0, ex; ex = excludes[i++];){
-		if(file.indexOf(_pages + separator + ex) != -1)
+		if(file.indexOf(_pages + sp + ex) != -1)
 			return false;
 	}
 	handleJavascript(file, function(mini, $){
@@ -139,12 +142,12 @@ ep.tail(&#39;handle-fragment&#39;, function(file){
  
 //处理首页
 ep.tail('handle-index', function(cb){
-	var index = dest + _static + separator + 'index.html';
+	var index = dest + _static + sp + 'index.html';
 	handleJavascript(index, function(mini, $){
 		var jsMiniText = mini.inside + mini.outside;
  
 		var code = md5(jsMiniText);
-		fs.open( dest + _static + separator + 'assets'+separator+'js' + separator + code + '.js', 'a',  function(err, fd){
+		fs.open( dest + _static + sp + 'assets'+sp+'js' + sp + code + '.js', 'a',  function(err, fd){
 			if(err)
 		    	logError(err);
  
@@ -204,7 +207,7 @@ function write(file, text){
 		  console.log(err.toString().red);
 		  process.exit();
 	  }
-	  console.log(file.green); 
+	  //console.log(file.green);
 	});
 }
  
@@ -219,7 +222,7 @@ function walk(path ,handleFile, over) {
             console.log('read dir error'.red);  
         } else {  
             files.forEach(function(item) {
-                var tmpPath = path + separator + item;
+                var tmpPath = path + sp + item;
                 fs.stat(tmpPath, function(err1, stats) {  
                     if (err1) {  
                         console.log('stat error');  
@@ -796,8 +796,8 @@ var BaseFun = function() {
 				var allLMapBc = baseF.GetByArgusInitAllLpDownedBcCollections(saa , cara , map , seMap , dataMap);
                 //return {'json':allLMapBc,'bxrcgs':null};
  
-				// 第二步 纵向调整
-				baseF.evenStartDepartSpace(allLMapBc , dataMap);
+                // 第二步 纵向调整
+                baseF.evenStartDepartSpace(allLMapBc , dataMap);
                 //return {'json':allLMapBc,'bxrcgs':null};
  
 				// 第三步 剔除首末班车以外的班次，并确认首末班车.
@@ -817,12 +817,12 @@ var BaseFun = function() {
 				var list = baseF.getBxRcListCollection(map.bxrc);
 				// 把班型分配到对应的具体路牌上.
 				baseF.bxAlloTotLp(list,cara);
-                //return {'json':markArray,'bxrcgs':null};
-
-
+                ////return {'json':markArray,'bxrcgs':null};
+                //
+                //
 				// 第六步 抽车来满足工时.
 				var tempA = baseF.abstractCar(list , markArray , cara , saa , dataMap , map);
-				// return {'json':tempA,'bxrcgs':null};
+				//return {'json':tempA,'bxrcgs':null};
 				// 第七步 确定吃饭时间.
                 if (map.cfdd) { // NEW，没有选择吃饭地点，不设定吃饭班次
                     baseF.markeEatTime(list , tempA , cara , saa , dataMap ,map);
@@ -1323,6 +1323,10 @@ var BaseFun = function() {
 						sslpbcA.sort(function(a,b){return a.fcint-b.fcint});
 						// 按照规则修改停站时间.
 						for(var r = 0 ; r < sslpbcA.length-1 ; r++) {
+                            // test
+                            //if(sslpbcA[r].bcType == 'cf') {
+                            //    alert('cf' + sslpbcA[r-1].fcsj);
+                            //}
 							// 定义上一个班次的发车时间、当前班次的到达时间、发车时间.
 							var sgbcfcsj = baseF.getDateTime(sslpbcA[r+1].fcsj),
 								dqbcddsj = baseF.getDateTime(sslpbcA[r].ARRIVALTIME),
@@ -1332,7 +1336,7 @@ var BaseFun = function() {
 							// 定义每每相邻两个班次之间的时间差分钟数(也就是停站时间.)
 							var dxmin = parseInt( (sgbcfcsj - dqbcddsj)/60000);
 							// 定义是否高峰
-							var flag = baseF.isPeakTimeScope(dqbcfcsj , dataMap); 
+							var tt_flag = baseF.isPeakTimeScope(dqbcfcsj , dataMap);
 							// 获取行驶时间.
 							var xxsj = baseF.getByDirTravelTime(dataMap.zgfsjd , dataMap.wgfsjd , dqbcfcsj,
 													 dataMap.pcxssjArr , dataMap.gfxxsjArr , 
@@ -1340,16 +1344,28 @@ var BaseFun = function() {
 							normmintzsj = xxsj*0.1;
 							normmaxtzsj = xxsj*0.15;
 							var flag = false;
+
 							// 如果小于零
 							if(dxmin < 0 && sslpbcA[r].isfb ==0) {
 								// 根据不同时段的停站时间.重新赋值停站时间.
 								if(sslpbcA[r].bcType=='normal' && sslpbcA[r+1].bcType =='normal') 
-									dxmin = flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag]; 
+									//dxmin = tt_flag ?  dataMap.gftzsj[cctag] : dataMap.dgtzsj[cctag];
+                                    dxmin = 1;
 								else
 									dxmin = 0;
 								flag = true;
 							}else if(dxmin==0){
-								dxmin = 0;
+                                if (sslpbcA[r].bcType == 'cf') { // 如果是吃饭班次，停站为0
+                                    dxmin = 0;
+                                } else {
+                                    // 这里区分，如果下一个班次是吃饭班次，停站为0
+                                    if (sslpbcA[r + 1].bcType=='cf') {
+                                        dxmin = 0;
+                                    } else { // 否则使用最小停站时间
+                                        dxmin = normmintzsj;
+                                    }
+                                }
+
 								flag = true;
 							}else {
 								// 如果 大于等于低谷最大停站时间 并且 小于等于三小时.则把低谷最大停站时间 作为 停站时间.
+<div class="page-head">
+	<div class="page-title">
+		<h1>进出站电量量信息编辑</h1>
+	</div>
+</div>
+
+<ul class="page-breadcrumb breadcrumb">
+	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">用电管理</span> <i class="fa fa-circle"></i></li>
+	<li><a href="list.html" data-pjax>进出场电量</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">进出站电量信息编辑</span></li>
+</ul>
+
+<div class="portlet light bordered">
+	<div class="portlet-title">
+		<div class="caption">
+			<i class="icon-equalizer font-red-sunglo"></i> <span
+				class="caption-subject font-red-sunglo bold uppercase">表单</span>
+		</div>
+	</div>
+	<div class="portlet-body form">
+		<form action="/addYlb" class="form-horizontal" id="ylb_add_form" >
+		
+		<div class="alert alert-danger display-hide">
+			<button class="close" data-close="alert"></button>
+			您的输入有误，请检查下面的输入项
+		</div>
+			<input type="hidden" value="0" name="yhlx" />
+			<div class="form-body">
+				<div class="form-group">
+					<label class="col-md-3 control-label">公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="ssgsdm" id="ssgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">分公司</label>
+					<div class="col-md-4">
+							<select class="form-control" name="fgsdm" id="fgsdm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">线路</label>
+					<div class="col-md-4">
+							<select class="form-control" name="xlbm" id="xlbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">内部编码</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="nbbm" id="nbbm" ></select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">日期</label>
+					<div class="col-md-4">
+							<input type="text" class="form-control" name="rq" id="date">
+							<label>跨天营运</label>
+							<select id="sfkt" name="sfkt">
+								<option value="0">否</option>
+								<option value="1">是</option>
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">开始营运时间</label>
+					<div class="col-md-4">
+							<input type="time" class="form-control" name="jhsj" >
+							<span class="help-block"> 如：12:12</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">驾驶员</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="jsy" id="jsy"> </select>
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0" class="form-control" name="czlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">出场电量%</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="czcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">充电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="cdl" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场电量%</label>
+					<div class="col-md-4">
+							<input type="text" value="100"  class="form-control" name="jzcd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">耗电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="hd" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">尿素</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="ns" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				<div class="form-group">
+					<label class="col-md-3 control-label">进场里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="jzlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗原因</label>
+					<div class="col-md-4">
+							<select  class="form-control" name="shyy">
+								<option value='0'>请选择</option> 
+								<option value='1'>票务用油</option> 
+								<option value='2'>保养用油</option> 
+								<option value='3'>报废车用油</option> 
+								<option value='4'>其它用油</option> 
+								<option value='5'>人保部</option> 
+								<option value='6'>车队</option> 
+								<option value='7'>车间(高保)</option> 
+								<option value='8'>车间(小修)</option> 
+							</select>
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">损耗电量</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="sh" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				<div class="form-group">
+					<label class="col-md-3 control-label">行驶总里程</label>
+					<div class="col-md-4">
+							<input type="text" value="0"  class="form-control" name="zlc" onkeyup="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')"  
+            onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
+					</div>
+				</div>
+				
+				
+			</div>
+			<div class="form-actions">
+				<div class="row">
+					<div class="col-md-offset-3 col-md-4">
+						<button type="submit" class="btn green" ><i class="fa fa-check"></i> 提交</button>
+						<a type="button" class="btn default" href="list.html" data-pjax><i class="fa fa-times"></i> 取消</a>
+					</div>
+				</div>
+			</div>
+		</form>
+		<!-- END FORM-->
+	</div>
+</div>
+<script>
+(function(){
+	var fage=false;
+	var obj = [];
+	var xlList;
+	$.get('/report/lineList',function(result){
+		xlList=result;
+		$.get('/user/companyData', function(result){
+			obj = result;
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+			}
+			$('#ssgsdm').html(options);
+			
+			updateCompany();
+		});
+	});
+
+	$("#ssgsdm").on("change",updateCompany);
+	function updateCompany(){
+		var company = $('#ssgsdm').val();
+		var options = '';
+		for(var i = 0; i < obj.length; i++){
+			if(obj[i].companyCode == company){
+				var children = obj[i].children;
+				for(var j = 0; j < children.length; j++){
+					options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+				}
+			}
+		}
+		$('#fgsdm').html(options);
+		initXl();
+		selectNbbm();
+		selectJsy();
+	}
+	$("#fgsdm").on("change",initXl);
+	function initXl(){
+		var data=[];
+		if(fage){
+			$("#xlbm").select2("destroy").html('');
+		}
+		var fgs=$('#fgsdm').val();
+		var gs=$('#ssgsdm').val();
+		for(var i=0;i<xlList.length;i++){
+			if(gs!=""){
+				if(fgs!=""){
+					if(xlList[i]["fgsbm"]==fgs && xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}else{
+					if(xlList[i]["gsbm"]==gs){
+						data.push({id: xlList[i]["xlbm"], text: xlList[i]["xlname"]});
+					}
+				}
+			}
+		}
+		initPinYinSelect2('#xlbm',data,'');
+		fage=true;
+		selectNbbm();
+		selectJsy();
+	}
+	$("#date").datetimepicker({
+		format : 'YYYY-MM-DD',
+		locale : 'zh-cn'
+	});
+	
+	function selectNbbm(){
+		$('#nbbm').select2({
+			placeholder: '搜索车辆...',
+			ajax: {
+				url: '/report/carList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{nbbm: params.term,
+	            	    gsbm:$('#ssgsdm').val(),
+	            	    fgsbm:$('#fgsdm').val(),
+	            	    xlbm:""
+	            	    };
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				h += (repo.lineName?'&nbsp;<span class="select2-desc">'+repo.lineName+'</span>':'');
+				return h;
+			},
+			escapeMarkup: function (markup) { return markup; },
+			minimumInputLength: 1,
+			templateSelection: function(repo){
+				return repo.text;
+			},
+			language: {
+		       noResults: function(){
+		           return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+		       },
+		       inputTooShort : function(e) {
+					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+			   },
+		       searching : function() {
+					return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+			   }
+			}
+		})
+	}
+	
+	
+	function selectJsy(){
+		$('#jsy').select2({
+			placeholder: '搜索驾驶员...',
+			ajax: {
+				url: '/report/userList',
+				dataType: 'json',
+				delay: 150,
+				data: function(params){
+					return{jsy: params.term,gsbm:$('#ssgsdm').val()};
+				},
+			    processResults: function (data) {
+			      return {
+			        results: data
+			      };
+			    },
+				cache: true
+			},
+			templateResult: function(repo){
+				if (repo.loading) return repo.text;
+				var h = '<span>'+repo.text+'</span>';
+				return h;
+			},
+			escapeMarkup: function (markup) { return markup; },
+			minimumInputLength: 1,
+			templateSelection: function(repo){
+				return repo.text;
+			},
+			language: {
+		       noResults: function(){
+		           return '<span style="color:red;font-size: 12px;">没有搜索到驾驶员！</span>';
+		       },
+		       inputTooShort : function(e) {
+					return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入工号搜索驾驶员</span>';
+			   },
+		       searching : function() {
+					return '<span style="color:gray;font-size: 12px;"> 正在搜索驾驶员...</span>';
+			   }
+			}
+		});
+	}
+		$(function(){
+			/* $get('/role/all',null,function(result){
+				$.each(result,function(i,obj){
+					$("#role").append("<option value='"+obj.id+"'>"+obj.roleName+"</option>");
+				});
+			}); */
+			
+			var form = $('#ylb_add_form');
+			var error = $('.alert-danger', form);
+			
+			//表单 validate
+			form.validate({
+				errorElement : 'span', 
+				errorClass : 'help-block help-block-error', 
+				focusInvalid : false, 
+				rules : {
+					'xlbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'nbbm' : {
+						required : true,
+						maxlength: 25
+					},
+					'rq' : {
+						required : true,
+						maxlength: 25
+					},
+					'jsy' : {
+						required : true,
+						maxlength: 20
+					}
+				},
+				invalidHandler : function(event, validator) {         
+					error.show();
+					App.scrollTo(error, -200);
+				},
+
+				highlight : function(element) { 
+					$(element).closest('.form-group').addClass('has-error'); 
+				},
+
+				unhighlight : function(element) { 
+					$(element).closest('.form-group').removeClass('has-error'); 
+				},
+
+				success : function(label) {
+					label.closest('.form-group').removeClass('has-error'); 
+				},
+
+				submitHandler : function(f) {
+					var params = form.serializeJSON();
+					error.hide();
+					var nbbm=$("#nbbm").val();
+					var date=$("#date").val();
+					var jsy=$("#jsy").val();
+					var xlbm=$("#xlbm").val();
+					var map={};
+					map["nbbm"]=nbbm;
+					map["date"]=date;
+					map["jsy"]=jsy;
+					map["xlbm"]=xlbm;
+					//检查一下用户是否存在
+						$get('/dlb/checkJsy', map, function(fage){
+							if(fage=="0"){
+								layer.msg('该驾驶员当天已存在.');
+							}else{
+								$post('/dlb/saveDlb', params, function(){
+									layer.msg('添加信息成功.');
+									loadPage('list.html');
+								});
+							}
+					});
+				}
+			});
+		});
+})();
+</script>
 \ No newline at end of file
@@ -23,6 +23,9 @@
                       <button type="button" class="btn btn-circle blue" id="saveButton"><i class="fa fa-minus-square"></i>
                         	保存
                     </button>
+                     <a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加</a>
+                    <button type="button" class="btn btn-circle blue"  id="removeButton"><i class="fa fa-trash-o"></i> 删除</button>
+                    
                     <button type="button" class="btn btn-circle blue" id="obtain"><i class="fa fa-hourglass-half"></i>
                   	   获取加/存电信息
                     </button>
@@ -677,7 +680,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         }
  
  
-        //删除
+      //删除
         $('#removeButton').on('click', function () {
         	var idArray = [];
         	var x=0;
@@ -697,7 +700,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	            if(confirm('确定要删除选中的数据？')) 
 	            { 
 	            	 var i = layer.load(2);
-	            	 $post('/ylb/deleteIds', params, function (result) {
+	            	 $post('/dlb/deleteIds', params, function (result) {
 	            		 layer.close(i);
 	            		 var params=getParamsList();
 		            	  jsDoQuery(params, true);
@@ -705,17 +708,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
 	            } 
 	       	 }
         });
-
-        //搜索线路
-       /* 	$.get('/basic/lineCode2Name',function(result){
-			var data=[];
-			data.push({id: " ", text: "全部线路"});
-			for(var code in result){
-				data.push({id: code, text: result[code]});
-			}
-			initPinYinSelect2('#xlbm',data,'');
-			
-		}) */
  
  
 		$("#ylbListFgsdmId").on("change",initXl);
 <div class="page-head">
 	<div class="page-title">
-		<h1>进场站油量信息编辑</h1>
+		<h1>进出站油量信息编辑</h1>
 	</div>
 </div>
  
 <ul class="page-breadcrumb breadcrumb">
 	<li><a href="/pages/home.html" data-pjax>首页</a> <i class="fa fa-circle"></i></li>
 	<li><span class="active">用油管理</span> <i class="fa fa-circle"></i></li>
-	<li><a href="list_ph.html" data-pjax>进场场油量</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">进场站油量信息编辑</span></li>
+	<li><a href="list_ph.html" data-pjax>进出场油量</a> <i class="fa fa-circle"></i></li>
+	<li><span class="active">进出站油量信息编辑</span></li>
 </ul>
  
 <div class="portlet light bordered">
@@ -27,6 +27,14 @@
 		<div class="portlet light porttlet-fit bordered">
 			<div class="portlet-title">
 				<form class="form-inline" action="">
+					<div style="display: inline-block; margin-left: 33px;" id="gsdmDiv">
+							<span class="item-label" style="width: 80px;">公司: </span>
+							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
+						</div> 
+						<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
+							<span class="item-label" style="width: 80px;">分公司: </span>
+							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
+						</div>
 					<div style="display: inline-block;">
                         <span class="item-label" style="width: 80px;">时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
@@ -105,7 +113,7 @@
 			$("#date").val(year + "-0" + month + "-" + day);
 		}
  
-		var tempData = {};
+		/* var tempData = {};
 		$.get('/report/lineList',function(xlList){
 			var data = [];
 			$.get('/user/companyData', function(result){
@@ -125,7 +133,86 @@
 				initPinYinSelect2('#line',data,'');
  
 			});
+		}); */
+		var fage=false;
+		var obj = [];
+		var xlList;
+		$.get('/report/lineList',function(result){
+			xlList=result;
+			
+			$.get('/user/companyData', function(result){
+				obj = result;
+				console.log(obj);
+				var options = '';
+				for(var i = 0; i < obj.length; i++){
+					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
+				}
+				
+				if(obj.length ==0){
+					 $("#gsdmDiv").css('display','none');
+				}else if(obj.length ==1){
+					 $("#gsdmDiv").css('display','none');
+					if(obj[0].children.length == 1  || obj[0].children.length ==0)
+						$('#fgsdmDiv').css('display','none');
+				}
+				$('#gsdm').html(options);
+				
+				updateCompany();
+			});
 		});
+
+		$("#gsdm").on("change",updateCompany);
+		function updateCompany(){
+			var company = $('#gsdm').val();
+			var options = '';
+			for(var i = 0; i < obj.length; i++){
+				if(obj[i].companyCode == company){
+					var children = obj[i].children;
+					for(var j = 0; j < children.length; j++){
+						options += '<option value="'+children[j].code+'">'+children[j].name+'</option>';
+					}
+				}
+			}
+			$('#fgsdm').html(options);
+
+			var tempData = {};
+			$.get('/report/lineList',function(xlList){
+				var data = [];
+				data.push({id: " ", text: "全部线路"});
+				$.get('/user/companyData', function(result){
+					for(var i = 0; i < result.length; i++){
+						var companyCode = result[i].companyCode;
+						var children = result[i].children;
+						for(var j = 0; j < children.length; j++){
+							var code = children[j].code;
+							for(var k=0;k < xlList.length;k++ ){
+								if(xlList[k]["fgsbm"]==code && xlList[k]["gsbm"]==companyCode){
+									data.push({id: xlList[k]["xlbm"], text: xlList[k]["xlname"]});
+									tempData[xlList[k]["xlbm"]] = companyCode+":"+code;
+								}
+							}
+						}
+					}
+					initPinYinSelect2('#line',data,'');
+					
+				});
+			});
+			
+			$("#line").on("change", function(){
+				if($("#line").val() == " "){
+					$("#gsdm").attr("disabled", false);
+					$("#fgsdm").attr("disabled", false);
+				} else {
+					var temp = tempData[$("#line").val()].split(":");
+					$("#gsdm").val(temp[0]);
+					updateCompany();
+					$("#fgsdm").val(temp[1]);
+					$("#gsdm").attr("disabled", true);
+					$("#fgsdm").attr("disabled", true);
+				}
+			});
+		}
+		
  
  
 		//查询
@@ -136,7 +223,9 @@
 			}
 			var line = $("#line").val();
 			var date = $("#date").val();
-			$get('/ylb/oilListMonth',{line:line,date:date,type:'query'},function(result){
+			var gsdm = $("#gsdm").val();
+			var fgsdm = $("#fgsdm").val();
+			$get('/ylb/oilListMonth',{line:line,date:date,gsdm:gsdm,fgsdm,fgsdm,type:'query'},function(result){
 // 				$.each(result, function(i, obj) {
 // 	                obj.rq = moment(obj.rq).format("DD");
 // 	            });
@@ -68,8 +68,7 @@
 	background-color: #fff;
 }
 .dateRange {
-	width: 30px;
-	margin-right: 5px;
+	width: 40px;
 	text-align: center;
 }
  
@@ -79,4 +78,8 @@
  
 .inputCarPlate {
 	width: 100px;
+}
+
+.inLine_block {
+	display: inline-block;
 }
 \ No newline at end of file
+/* 基础数据管理模块 */
+
+var gb_data_basic = (function () {
+
+    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, device2nbbmMap, allPersonnel, svgAttrs;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel", "svg_attrs"
+        , function (routes, code2Name, informations, nbbm2device, all_personnel, svgAttrMap) {
+            stationRoutes = routes;
+            lineCode2NameAll = code2Name;
+            lineInformations = informations;
+            nbbm2deviceMap = nbbm2device;
+            device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
+            allPersonnel = all_personnel;
+            svgAttrs = svgAttrMap;
+
+            res_load_ep.emitLater('data-basic');
+        });
+
+    var storage = window.localStorage;
+    //激活的线路
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    //lineCode to line object
+    var codeToLine = {};
+    //lineCode idx string
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+            codeToLine[item.lineCode] = item;
+        }
+        return str.substr(1);
+    })();
+
+    //站点路由
+    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
+        var list = rs.list;//JSON.parse(rs.list);
+        var routeData = gb_common.groupBy(list, 'lineCode');
+        //排序
+        for (var lineCode in routeData) {
+            routeData[lineCode].sort(stationRouteSort);
+        }
+        ep.emit('stationRoutes', routeData);
+    });
+
+    //线路标准信息
+    /*gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+        var informations = {};
+        $.each(rs, function () {
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+        });
+        ep.emit('lineInformations', informations);
+    });*/
+    ep.emit('lineInformations', {});
+
+    //人员信息
+    ep.emit('all_personnel', {});
+    /*loadAllPersonnel(function (data) {
+        ep.emit('all_personnel', data);
+    });
+    function loadAllPersonnel(cb) {
+        $.get('/personnel/all_py', function (rs) {
+            //转换成自动补全组件需要的数据
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
+                data.push({
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
+                });
+            }
+            cb && cb(data);
+        });
+    }*/
+
+    var carparks = {};
+    //停车场数据
+/*    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
+        $.each(rs.list, function () {
+            carparks[this.parkCode] = this;
+        });
+    });*/
+
+    //车辆数据
+    var carsArray;
+    /*$.get('/basic/cars?t=' + Math.random(), function (rs) {
+        carsArray = rs;
+    });*/
+
+    var getCarparkByCode = function (code) {
+        return carparks[code];
+    };
+
+    //line code to name
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
+    });
+
+    //nbbm to device id
+    $.get('/basic/nbbm2deviceId', function (rs) {
+        ep.emit('nbbm2deviceId', rs);
+    });
+    //nbbm to 车牌号
+    var nbbm2PlateMap;
+    $.get('/basic/nbbm2PlateNo', function (rs) {
+        nbbm2PlateMap = rs;
+    });
+
+    //模拟图属性数据
+    gb_common.$get('/realSchedule/svgAttr', {idx: line_idx}, function (rs) {
+        var data = {};
+        $.each(rs.list, function () {
+            this.hideStations = JSON.parse(this.hideStations);
+            this.nicknames = JSON.parse(this.nicknames);
+            data[this.lineCode] = this;
+        });
+        ep.emit('svg_attrs', data);
+    });
+
+    //站点和停车场历时、公里对照数据
+    var stat_park_data;
+    /*var load_stat_park_data = function () {
+        $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
+            stat_park_data = rs;
+        });
+    }
+    load_stat_park_data();*/
+
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
+    }
+
+    var findCodeByLinename = function (name) {
+        for (var code in lineCode2NameAll) {
+            if (name == lineCode2NameAll[code])
+                return code;
+        }
+
+        return null;
+    };
+
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
+    };
+
+    var stationRouteSort = function (a, b) {
+        return a.stationRouteCode - b.stationRouteCode;
+    };
+
+    /**
+     * 常用的备注补全列表
+     */
+    var remarksArray = ['保养', '故障', '肇事', '加油', '维修', '援外', '路阻'
+        , '故障（离合器坏）', '故障,(方向盘坏）', '故障（排挡坏）', '故障（门坏）', '故障（雨刮器坏）','故障（刹车坏）', '故障（气打不上）'
+        ,'故障（整车无电）', '故障（故障灯常亮）', '故障（警报灯亮）', '故障（玻璃坏）', '故障（反光镜坏）', '故障（发电机坏）', '故障（漏防冻液）'
+        , '故障（漏水）','故障（轮胎坏）', '故障（无动力）', '故障（喷机油）', '故障（水温高）', '保养（一级保养）'
+        , '保养（二级保养）', '保养（三级保养）', '换车出场', '临加进场', '临加出场'];
+    var remarksMapps = [];
+    $.each(remarksArray, function (i, t) {
+        remarksMapps.push({
+            value: t,
+            fullChars: pinyin.getFullChars(t).toUpperCase(),
+            camelChars: pinyin.getCamelChars(t)
+        });
+    });
+
+    //文件载入完毕
+    res_load_ep.emitLater('load_data_basic');
+
+    return {
+        activeLines: activeLines,
+        line_idx: line_idx,
+        codeToLine: codeToLine,
+        nbbm2deviceMap: function () {
+            return nbbm2deviceMap;
+        },
+        device2nbbmMap: function () {
+            return device2nbbmMap;
+        },
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
+        findLineByCodes: findLineByCodes,
+        lineCode2NameAll: function () {
+            return lineCode2NameAll
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
+        findCodeByLinename: findCodeByLinename,
+        getCarparkByCode: getCarparkByCode,
+        getSvgAttr: function (lineCode) {
+            return svgAttrs[lineCode];
+        },
+        setSvgAttr: function (attr) {
+            attr.hideStations = JSON.parse(attr.hideStations);
+            attr.nicknames = JSON.parse(attr.nicknames);
+            svgAttrs[attr.lineCode] = attr;
+        },
+        //是否是环线
+        isLoopLine: function (lineCode) {
+            var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
+            //下行只有2个站点
+            var len = data[0].length;
+            if (len > 0 && data[1].length == 2) {
+                var first = data[0][0],
+                    end = data[0][len - 1];
+
+                /*if(first.stationName != end.stationName)
+                 return false;*/
+
+                var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
+                    , ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
+
+                //并且上行起终点距离200米内
+                if (geolib.getDistance(fPoint, ePoint) < 200) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+        //刷新员工信息
+        refreshAllPersonnel: function (cb) {
+            loadAllPersonnel(function (data) {
+                allPersonnel = data;
+                cb && cb();
+            });
+        },
+        nbbm2PlateMap: function () {
+            return nbbm2PlateMap;
+        },
+        carsArray: function () {
+            return carsArray;
+        },
+        simpleParksArray: function () {
+            var map = {};
+            for(var code in carparks)
+                map[code] = carparks[code].parkName;
+            return map;
+        },
+        remarksMapps: function () {
+            return remarksMapps;
+        },
+        get_stat_park_data: function () {
+            return stat_park_data;
+        },
+        reload_stat_park_data: function () {
+            load_stat_park_data();
+        }
+    };
+})();
+/* gps 数据管理模块 */
+
+var gb_data_gps = (function () {
+
+    //fixed time refresh delay
+    var delay = 1000 * 7;
+    //deviceId ——> gps
+    var realData = {};
+    //refresh after callback
+    var refreshEventCallbacks = [];
+    //register callback function
+    var registerCallback = function (cb) {
+        if (cb)
+            refreshEventCallbacks.push(cb);
+    };
+
+    var refresh = function (cb) {
+        $.ajax({
+            url: '/gps/real/line',
+            data: {lineCodes: gb_data_basic.line_idx},
+            dataType: 'json',
+            success: function (rs) {
+                //用定时的gps来检测session断开
+                if(rs.status && rs.status==407){
+                    location.href = '/login.html';
+                    return;
+                }
+                refreshData(rs);
+                cb();
+            },
+            error: function (xr, t) {
+                notify_err('刷新GPS失败，稍后重试' + t);
+                cb();
+            }
+        });
+    };
+
+    var refreshData = function (rs) {
+        var old, addArr = [],
+            upArr = [],
+            upDownChange = [];
+
+        var schArray;
+        $.each(rs, function () {
+            old = realData[this.deviceId];
+            if (old) {
+                if (this.timestamp > old.timestamp) {
+                    if (old.upDown != this.upDown)
+                        upDownChange.push(this);
+                    else
+                        upArr.push(this);
+                }
+
+            } else
+                addArr.push(this);
+
+            //班次信息
+            /*if (this.schId) {
+                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
+                if (schArray)
+                    this.sch = schArray[this.schId];
+            }*/
+
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
+            realData[this.deviceId] = this;
+        });
+
+        //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
+        //CCCallFuncN
+        $.each(refreshEventCallbacks, function (i, cb) {
+            cb(addArr, upArr, upDownChange);
+        });
+
+    };
+
+    var startFixedTime;
+    var fixedTimeRefresh = function () {
+        if (startFixedTime)
+            return;
+        startFixedTime = true;
+
+        (function () {
+            var f = arguments.callee;
+            refresh(function () {
+                setTimeout(f, delay);
+            });
+        })();
+    };
+
+    var gpsByLineCode = function (lineCode) {
+        var rs = [];
+        for (var device in realData) {
+            if (realData[device].lineId == lineCode)
+                rs.push(realData[device]);
+        }
+        return rs;
+    };
+
+    var findOne = function (deviceId) {
+        return realData[deviceId];
+    };
+
+    var findGpsByNbbm = function (nbbm) {
+        return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
+    };
+
+    /**
+     * 设备掉线事件
+     */
+    var deviceOffline = function (gps) {
+        $.each(offlineCallbacks, function (i, cb) {
+            cb(gps);
+        });
+    };
+
+    //注册掉线事件回调函数
+    var offlineCallbacks = [];
+    var registerOfflineCb = function (cb) {
+        if (cb)
+            offlineCallbacks.push(cb);
+    };
+
+    return {
+        fixedTimeRefresh: fixedTimeRefresh,
+        registerCallback: registerCallback,
+        allGps: realData,
+        gpsByLineCode: gpsByLineCode,
+        findOne: findOne,
+        findGpsByNbbm: findGpsByNbbm,
+        deviceOffline: deviceOffline,
+        registerOfflineCb: registerOfflineCb
+    };
+})();
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <title>主页模拟图</title>
+    <!-- uikit  core style-->
+    <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="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" />
+    <!-- home style -->
+    <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/>
+
+    <!-- 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"  merge="plugins"/>
+    <!-- formvalidation style -->
+    <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.css"  merge="plugins"/>
+    <!-- tooltip 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"/>
+    <!-- layer 3.0.3 -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  merge="plugins"/>
+
+
+    <style>
+        .main-container{
+            height: 100% !important;
+        }
+
+        #main-tab-content{
+            padding: 0 !important;
+        }
+
+        .home-panel{
+
+        }
+
+        #home-main-content{
+            padding: 0 !important;
+        }
+
+        #main-tab-content>.home-panel>#home-main-content{
+            overflow: inherit;
+        }
+    </style>
+</head>
+
+<body>
+<!--<div class="main-container" style="height: 100%;">
+</div>-->
+<div class="main-container">
+    <ul id="main-tab-content">
+        <li class="home-panel"></li>
+    </ul>
+</div>
+
+
+<!-- 地图相关 -->
+<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" merge="plugins"></script>
+<script src="/assets/js/TransGPS.js" merge="plugins"></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" merge="plugins"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
+
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></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" merge="plugins"></script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js"></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+
+<script>
+
+
+    var res_load_ep = EventProxy.create('load_home_layout', 'load_home_line_panel', 'load_data_basic', 'data-basic', function () {
+        //加载主页
+        gb_home_layout.layout(function () {
+            gb_home_line_panel.init(function () {
+                //gps自刷新
+                gb_data_gps.fixedTimeRefresh();
+
+                $('.uk-icon-send-o.home_alone_page').remove();
+            });
+        });
+    });
+
+    function connectArr(arr, separator, transFun) {
+        var rs = '';
+        $.each(arr, function (i, item) {
+            if (transFun)
+                item = transFun(item);
+            rs += (separator + item);
+        });
+        return rs.substr(separator.length);
+    }
+
+    var isArray = function (obj) {
+        return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+
+    var gb_form_validation_opts = {
+        framework: 'uikit',
+        locale: 'zh_CN',
+        icon: {
+            valid: 'uk-icon-check',
+            invalid: 'uk-icon-times',
+            validating: 'uk-icon-refresh'
+        }
+    };
+
+</script>
+
+<!-- uikit core -->
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/pagination.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.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"  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"  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"  merge="plugins"></script>
+<!-- simple pinyin -->
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
+<!-- qtip -->
+<script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
+<!-- layer 3.0.3 -->
+<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script>
+
+<!-- 数据 -->
+<script src="/real_control_v2/alone_page/home/alone_data_basic.js" merge="custom_js"></script>
+<script src="/real_control_v2/alone_page/home/alone_data_gps.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/data/gps_abnormal.js" merge="custom_js"></script>
+<!-- 线路模拟图 -->
+<script src="/real_control_v2/js/utils/svg_chart.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_data_convert.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_tooltip.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/svg_chart_map.js" merge="custom_js"></script>
+
+<!-- custom table js -->
+<script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
+<!-- home js -->
+<script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/home/context_menu.js" merge="custom_js"></script>
+
+
+<!-- 模态框扩展 -->
+<script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
+
+</body>
+
+</html>
-/* 基础数据管理模块 */
-
-var gb_data_basic = (function () {
-
-    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, device2nbbmMap, allPersonnel, svgAttrs;
-    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel", "svg_attrs"
-        , function (routes, code2Name, informations, nbbm2device, all_personnel, svgAttrMap) {
-            stationRoutes = routes;
-            lineCode2NameAll = code2Name;
-            lineInformations = informations;
-            nbbm2deviceMap = nbbm2device;
-            device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
-            allPersonnel = all_personnel;
-            svgAttrs = svgAttrMap;
-            //gb_main_ep.emitLater('data-basic');
-        });
-
-    var storage = window.localStorage;
-    //激活的线路
-    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
-    //lineCode to line object
-    var codeToLine = {};
-    //lineCode idx string
-    var line_idx = (function () {
-        var str = '';
-        for (var i = 0, item; item = activeLines[i++];) {
-            str += (',' + item.lineCode);
-            codeToLine[item.lineCode] = item;
-        }
-        return str.substr(1);
-    })();
-
-    //站点路由
-    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
-        var list = rs.list;//JSON.parse(rs.list);
-        var routeData = gb_common.groupBy(list, 'lineCode');
-        //排序
-        for (var lineCode in routeData) {
-            routeData[lineCode].sort(stationRouteSort);
-        }
-        ep.emit('stationRoutes', routeData);
-    });
-
-    //线路标准信息
-    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
-        var informations = {};
-        $.each(rs, function () {
-            informations[this.line.lineCode] = this;
-            delete this['line'];
-        });
-        ep.emit('lineInformations', informations);
-    });
-
-    //人员信息
-    loadAllPersonnel(function (data) {
-        ep.emit('all_personnel', data);
-    });
-    function loadAllPersonnel(cb) {
-        $.get('/personnel/all_py', function (rs) {
-            //转换成自动补全组件需要的数据
-            var data = [], code;
-            for(var i =0, p; p = rs[i++];){
-                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
-                data.push({
-                    value: code + '/' + p.name,
-                    fullChars: p.fullChars.toUpperCase(),
-                    camelChars: p.camelChars.toUpperCase()
-                });
-            }
-            cb && cb(data);
-        });
-    }
-
-    var carparks = {};
-    //停车场数据
-    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
-        rs.list.sort(function (a, b) {
-           return a.parkName.localeCompare(b.parkName);
-        });
-        $.each(rs.list, function () {
-            carparks[this.parkCode] = this;
-        });
-    });
-
-    //车辆数据
-    var carsArray;
-    $.get('/basic/cars?t=' + Math.random(), function (rs) {
-        carsArray = rs;
-    });
-
-    var getCarparkByCode = function (code) {
-        return carparks[code];
-    };
-
-    //line code to name
-    $.get('/basic/lineCode2Name', function (rs) {
-        ep.emit('lineCode2Name', rs);
-    });
-
-    //nbbm to device id
-    $.get('/basic/nbbm2deviceId', function (rs) {
-        ep.emit('nbbm2deviceId', rs);
-    });
-    //nbbm to 车牌号
-    var nbbm2PlateMap;
-    $.get('/basic/nbbm2PlateNo', function (rs) {
-        nbbm2PlateMap = rs;
-    });
-
-    //模拟图属性数据
-    gb_common.$get('/realSchedule/svgAttr', {idx: line_idx}, function (rs) {
-        var data = {};
-        $.each(rs.list, function () {
-            this.hideStations = JSON.parse(this.hideStations);
-            this.nicknames = JSON.parse(this.nicknames);
-            data[this.lineCode] = this;
-        });
-        ep.emit('svg_attrs', data);
-    });
-
-    //站点和停车场历时、公里对照数据
-    var stat_park_data;
-    var load_stat_park_data = function () {
-        $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
-            stat_park_data = rs;
-        });
-    }
-    load_stat_park_data();
-
-    function findLineByCodes(codeArr) {
-        var rs = [];
-        $.each(codeArr, function () {
-            rs.push(codeToLine[this]);
-        });
-        return rs;
-    }
-
-    var findCodeByLinename = function (name) {
-        for (var code in lineCode2NameAll) {
-            if (name == lineCode2NameAll[code])
-                return code;
-        }
-
-        return null;
-    };
-
-    var getLineInformation = function (lineCode) {
-        return lineInformations[lineCode];
-    };
-
-    var stationRouteSort = function (a, b) {
-        return a.stationRouteCode - b.stationRouteCode;
-    };
-
-    return {
-        activeLines: activeLines,
-        line_idx: line_idx,
-        codeToLine: codeToLine,
-        nbbm2deviceMap: function () {
-            return nbbm2deviceMap;
-        },
-        device2nbbmMap: function () {
-            return device2nbbmMap;
-        },
-        getLineInformation: getLineInformation,
-        allInformations: function () {
-            return lineInformations;
-        },
-        stationRoutes: function (lineCode) {
-            return stationRoutes[lineCode]
-        },
-        findLineByCodes: findLineByCodes,
-        lineCode2NameAll: function () {
-            return lineCode2NameAll
-        },
-        allPersonnel: function () {
-            return allPersonnel;
-        },
-        findCodeByLinename: findCodeByLinename,
-        getCarparkByCode: getCarparkByCode,
-        getSvgAttr: function (lineCode) {
-            return svgAttrs[lineCode];
-        },
-        setSvgAttr: function (attr) {
-            attr.hideStations = JSON.parse(attr.hideStations);
-            attr.nicknames = JSON.parse(attr.nicknames);
-            svgAttrs[attr.lineCode] = attr;
-        },
-        //是否是环线
-        isLoopLine: function (lineCode) {
-            var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
-            //下行只有2个站点
-            var len = data[0].length;
-            if (len > 0 && data[1].length == 2) {
-                var first = data[0][0],
-                    end = data[0][len - 1];
-
-                /*if(first.stationName != end.stationName)
-                 return false;*/
-
-                var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
-                    , ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
-
-                //并且上行起终点距离200米内
-                if (geolib.getDistance(fPoint, ePoint) < 200) {
-                    return true;
-                }
-            }
-
-            return false;
-        },
-        //刷新员工信息
-        refreshAllPersonnel: function (cb) {
-            loadAllPersonnel(function (data) {
-                allPersonnel = data;
-                cb && cb();
-            });
-        },
-        nbbm2PlateMap: function () {
-            return nbbm2PlateMap;
-        },
-        carsArray: function () {
-            return carsArray;
-        },
-        simpleParksArray: function () {
-            var map = {};
-            for(var code in carparks)
-                map[code] = carparks[code].parkName;
-            return map;
-        },
-        remarksMapps: function () {
-            return remarksMapps;
-        },
-        get_stat_park_data: function () {
-            return stat_park_data;
-        },
-        reload_stat_park_data: function () {
-            load_stat_park_data();
-        }
-    };
-})();
+/* 基础数据管理模块 */
+
+var gb_data_basic = (function () {
+
+    var stationRoutes, lineCode2NameAll, lineInformations, nbbm2deviceMap, device2nbbmMap, allPersonnel, svgAttrs;
+    var ep = EventProxy.create("stationRoutes", "lineCode2Name", "lineInformations", "nbbm2deviceId", "all_personnel", "svg_attrs"
+        , function (routes, code2Name, informations, nbbm2device, all_personnel, svgAttrMap) {
+            stationRoutes = routes;
+            lineCode2NameAll = code2Name;
+            lineInformations = informations;
+            nbbm2deviceMap = nbbm2device;
+            device2nbbmMap = gb_common.inverse(nbbm2deviceMap);
+            allPersonnel = all_personnel;
+            svgAttrs = svgAttrMap;
+            //gb_main_ep.emitLater('data-basic');
+        });
+
+    var storage = window.localStorage;
+    //激活的线路
+    var activeLines = JSON.parse(storage.getItem('lineControlItems'));
+    //lineCode to line object
+    var codeToLine = {};
+    //lineCode idx string
+    var line_idx = (function () {
+        var str = '';
+        for (var i = 0, item; item = activeLines[i++];) {
+            str += (',' + item.lineCode);
+            codeToLine[item.lineCode] = item;
+        }
+        return str.substr(1);
+    })();
+
+    //站点路由
+    gb_common.$get('/stationroute/multiLine', {lineIds: line_idx}, function (rs) {
+        var list = rs.list;//JSON.parse(rs.list);
+        var routeData = gb_common.groupBy(list, 'lineCode');
+        //排序
+        for (var lineCode in routeData) {
+            routeData[lineCode].sort(stationRouteSort);
+        }
+        ep.emit('stationRoutes', routeData);
+    });
+
+    //线路标准信息
+    gb_common.$get('/lineInformation/line/multi', {lineCodes: line_idx}, function (rs) {
+        var informations = {};
+        $.each(rs, function () {
+            informations[this.line.lineCode] = this;
+            delete this['line'];
+        });
+        ep.emit('lineInformations', informations);
+    });
+
+    //人员信息
+    loadAllPersonnel(function (data) {
+        ep.emit('all_personnel', data);
+    });
+    function loadAllPersonnel(cb) {
+        $.get('/personnel/all_py', function (rs) {
+            //转换成自动补全组件需要的数据
+            var data = [], code;
+            for(var i =0, p; p = rs[i++];){
+                code = p['workId'].indexOf('-')!=-1?p['workId'].split('-')[1]:p['workId'];
+                data.push({
+                    value: code + '/' + p.name,
+                    fullChars: p.fullChars.toUpperCase(),
+                    camelChars: p.camelChars.toUpperCase()
+                });
+            }
+            cb && cb(data);
+        });
+    }
+
+    var carparks = {};
+    //停车场数据
+    gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+        rs.list.sort(function (a, b) {
+           return a.parkName.localeCompare(b.parkName);
+        });
+        $.each(rs.list, function () {
+            carparks[this.parkCode] = this;
+        });
+    });
+
+    //车辆数据
+    var carsArray;
+    $.get('/basic/cars?t=' + Math.random(), function (rs) {
+        carsArray = rs;
+    });
+
+    var getCarparkByCode = function (code) {
+        return carparks[code];
+    };
+
+    //line code to name
+    $.get('/basic/lineCode2Name', function (rs) {
+        ep.emit('lineCode2Name', rs);
+    });
+
+    //nbbm to device id
+    $.get('/basic/nbbm2deviceId', function (rs) {
+        ep.emit('nbbm2deviceId', rs);
+    });
+    //nbbm to 车牌号
+    var nbbm2PlateMap;
+    $.get('/basic/nbbm2PlateNo', function (rs) {
+        nbbm2PlateMap = rs;
+    });
+
+    //模拟图属性数据
+    gb_common.$get('/realSchedule/svgAttr', {idx: line_idx}, function (rs) {
+        var data = {};
+        $.each(rs.list, function () {
+            this.hideStations = JSON.parse(this.hideStations);
+            this.nicknames = JSON.parse(this.nicknames);
+            data[this.lineCode] = this;
+        });
+        ep.emit('svg_attrs', data);
+    });
+
+    //站点和停车场历时、公里对照数据
+    var stat_park_data;
+    var load_stat_park_data = function () {
+        $.get('/basic/station2ParkData?t='+Math.random(), {idx: line_idx}, function (rs) {
+            stat_park_data = rs;
+        });
+    }
+    load_stat_park_data();
+
+    function findLineByCodes(codeArr) {
+        var rs = [];
+        $.each(codeArr, function () {
+            rs.push(codeToLine[this]);
+        });
+        return rs;
+    }
+
+    var findCodeByLinename = function (name) {
+        for (var code in lineCode2NameAll) {
+            if (name == lineCode2NameAll[code])
+                return code;
+        }
+
+        return null;
+    };
+
+    var getLineInformation = function (lineCode) {
+        return lineInformations[lineCode];
+    };
+
+    var stationRouteSort = function (a, b) {
+        return a.stationRouteCode - b.stationRouteCode;
+    };
+
+    return {
+        activeLines: activeLines,
+        line_idx: line_idx,
+        codeToLine: codeToLine,
+        nbbm2deviceMap: function () {
+            return nbbm2deviceMap;
+        },
+        device2nbbmMap: function () {
+            return device2nbbmMap;
+        },
+        getLineInformation: getLineInformation,
+        allInformations: function () {
+            return lineInformations;
+        },
+        stationRoutes: function (lineCode) {
+            return stationRoutes[lineCode]
+        },
+        findLineByCodes: findLineByCodes,
+        lineCode2NameAll: function () {
+            return lineCode2NameAll
+        },
+        allPersonnel: function () {
+            return allPersonnel;
+        },
+        findCodeByLinename: findCodeByLinename,
+        getCarparkByCode: getCarparkByCode,
+        getSvgAttr: function (lineCode) {
+            return svgAttrs[lineCode];
+        },
+        setSvgAttr: function (attr) {
+            attr.hideStations = JSON.parse(attr.hideStations);
+            attr.nicknames = JSON.parse(attr.nicknames);
+            svgAttrs[attr.lineCode] = attr;
+        },
+        //是否是环线
+        isLoopLine: function (lineCode) {
+            var data = gb_common.groupBy(stationRoutes[lineCode], 'directions');
+            //下行只有2个站点
+            var len = data[0].length;
+            if (len > 0 && data[1].length == 2) {
+                var first = data[0][0],
+                    end = data[0][len - 1];
+
+                /*if(first.stationName != end.stationName)
+                 return false;*/
+
+                var fPoint = {latitude: first.station.gLaty, longitude: first.station.gLonx}
+                    , ePoint = {latitude: end.station.gLaty, longitude: end.station.gLonx};
+
+                //并且上行起终点距离200米内
+                if (geolib.getDistance(fPoint, ePoint) < 200) {
+                    return true;
+                }
+            }
+
+            return false;
+        },
+        //刷新员工信息
+        refreshAllPersonnel: function (cb) {
+            loadAllPersonnel(function (data) {
+                allPersonnel = data;
+                cb && cb();
+            });
+        },
+        nbbm2PlateMap: function () {
+            return nbbm2PlateMap;
+        },
+        carsArray: function () {
+            return carsArray;
+        },
+        simpleParksArray: function () {
+            var map = {};
+            for(var code in carparks)
+                map[code] = carparks[code].parkName;
+            return map;
+        },
+        remarksMapps: function () {
+            return remarksMapps;
+        },
+        get_stat_park_data: function () {
+            return stat_park_data;
+        },
+        reload_stat_park_data: function () {
+            load_stat_park_data();
+        }
+    };
+})();
-/* gps 数据管理模块 */
-
-var gb_data_gps = (function () {
-
-    //fixed time refresh delay
-    var delay = 1000 * 7;
-    //deviceId ——> gps
-    var realData = {};
-    //refresh after callback
-    var refreshEventCallbacks = [];
-    //register callback function
-    var registerCallback = function (cb) {
-        if (cb)
-            refreshEventCallbacks.push(cb);
-    };
-
-    var refresh = function (cb) {
-        $.ajax({
-            url: '/gps/real/line',
-            data: {lineCodes: gb_data_basic.line_idx},
-            dataType: 'json',
-            success: function (rs) {
-                //用定时的gps来检测session断开
-                if(rs.status && rs.status==407){
-                    location.href = '/login.html';
-                    return;
-                }
-                refreshData(rs);
-                cb();
-            },
-            error: function (xr, t) {
-                notify_err('刷新GPS失败，稍后重试' + t);
-                cb();
-            }
-        });
-    };
-
-    var refreshData = function (rs) {
-        var old, addArr = [],
-            upArr = [],
-            upDownChange = [];
-
-        var schArray;
-        $.each(rs, function () {
-            old = realData[this.deviceId];
-            if (old) {
-                if (this.timestamp > old.timestamp) {
-                    if (old.upDown != this.upDown)
-                        upDownChange.push(this);
-                    else
-                        upArr.push(this);
-                }
-
-            } else
-                addArr.push(this);
-
-           /* //班次信息
-            if (this.schId) {
-                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
-                if (schArray)
-                    this.sch = schArray[this.schId];
-            }*/
-
-            //时间格式化
-            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
-            realData[this.deviceId] = this;
-        });
-
-        //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
-        //CCCallFuncN
-        $.each(refreshEventCallbacks, function (i, cb) {
-            cb(addArr, upArr, upDownChange);
-        });
-
-    };
-
-    var startFixedTime;
-    var fixedTimeRefresh = function () {
-        if (startFixedTime)
-            return;
-        startFixedTime = true;
-
-        (function () {
-            var f = arguments.callee;
-            refresh(function () {
-                setTimeout(f, delay);
-            });
-        })();
-    };
-
-    var gpsByLineCode = function (lineCode) {
-        var rs = [];
-        for (var device in realData) {
-            if (realData[device].lineId == lineCode)
-                rs.push(realData[device]);
-        }
-        return rs;
-    };
-
-    var findOne = function (deviceId) {
-        return realData[deviceId];
-    };
-
-    var findGpsByNbbm = function (nbbm) {
-        return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
-    };
-
-    /**
-     * 设备掉线事件
-     */
-    var deviceOffline = function (gps) {
-        $.each(offlineCallbacks, function (i, cb) {
-            cb(gps);
-        });
-    };
-
-    //注册掉线事件回调函数
-    var offlineCallbacks = [];
-    var registerOfflineCb = function (cb) {
-        if (cb)
-            offlineCallbacks.push(cb);
-    };
-
-    return {
-        fixedTimeRefresh: fixedTimeRefresh,
-        registerCallback: registerCallback,
-        allGps: realData,
-        gpsByLineCode: gpsByLineCode,
-        findOne: findOne,
-        findGpsByNbbm: findGpsByNbbm,
-        deviceOffline: deviceOffline,
-        registerOfflineCb: registerOfflineCb
-    };
-})();
+/* gps 数据管理模块 */
+
+var gb_data_gps = (function () {
+
+    //fixed time refresh delay
+    var delay = 1000 * 7;
+    //deviceId ——> gps
+    var realData = {};
+    //refresh after callback
+    var refreshEventCallbacks = [];
+    //register callback function
+    var registerCallback = function (cb) {
+        if (cb)
+            refreshEventCallbacks.push(cb);
+    };
+
+    var refresh = function (cb) {
+        $.ajax({
+            url: '/gps/real/line',
+            data: {lineCodes: gb_data_basic.line_idx},
+            dataType: 'json',
+            success: function (rs) {
+                //用定时的gps来检测session断开
+                if(rs.status && rs.status==407){
+                    location.href = '/login.html';
+                    return;
+                }
+                refreshData(rs);
+                cb();
+            },
+            error: function (xr, t) {
+                notify_err('刷新GPS失败，稍后重试' + t);
+                cb();
+            }
+        });
+    };
+
+    var refreshData = function (rs) {
+        var old, addArr = [],
+            upArr = [],
+            upDownChange = [];
+
+        var schArray;
+        $.each(rs, function () {
+            old = realData[this.deviceId];
+            if (old) {
+                if (this.timestamp > old.timestamp) {
+                    if (old.upDown != this.upDown)
+                        upDownChange.push(this);
+                    else
+                        upArr.push(this);
+                }
+
+            } else
+                addArr.push(this);
+
+           /* //班次信息
+            if (this.schId) {
+                schArray = gb_schedule_table.findScheduleByLine(this.lineId);
+                if (schArray)
+                    this.sch = schArray[this.schId];
+            }*/
+
+            //时间格式化
+            this.dateStr = moment(this.timestamp).format('YYYY-MM-DD HH:mm:ss');
+            realData[this.deviceId] = this;
+        });
+
+        //console.log('add array size: ' + addArr.length, 'up array size: ' + upArr.length);
+        //CCCallFuncN
+        $.each(refreshEventCallbacks, function (i, cb) {
+            cb(addArr, upArr, upDownChange);
+        });
+
+    };
+
+    var startFixedTime;
+    var fixedTimeRefresh = function () {
+        if (startFixedTime)
+            return;
+        startFixedTime = true;
+
+        (function () {
+            var f = arguments.callee;
+            refresh(function () {
+                setTimeout(f, delay);
+            });
+        })();
+    };
+
+    var gpsByLineCode = function (lineCode) {
+        var rs = [];
+        for (var device in realData) {
+            if (realData[device].lineId == lineCode)
+                rs.push(realData[device]);
+        }
+        return rs;
+    };
+
+    var findOne = function (deviceId) {
+        return realData[deviceId];
+    };
+
+    var findGpsByNbbm = function (nbbm) {
+        return realData[gb_data_basic.nbbm2deviceMap()[nbbm]];
+    };
+
+    /**
+     * 设备掉线事件
+     */
+    var deviceOffline = function (gps) {
+        $.each(offlineCallbacks, function (i, cb) {
+            cb(gps);
+        });
+    };
+
+    //注册掉线事件回调函数
+    var offlineCallbacks = [];
+    var registerOfflineCb = function (cb) {
+        if (cb)
+            offlineCallbacks.push(cb);
+    };
+
+    return {
+        fixedTimeRefresh: fixedTimeRefresh,
+        registerCallback: registerCallback,
+        allGps: realData,
+        gpsByLineCode: gpsByLineCode,
+        findOne: findOne,
+        findGpsByNbbm: findGpsByNbbm,
+        deviceOffline: deviceOffline,
+        registerOfflineCb: registerOfflineCb
+    };
+})();
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <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" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" />
-    <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.gradient.min.css" />
-
-    <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
-    <!-- north style -->
-    <link rel="stylesheet" href="/real_control_v2/css/north.css" />
-    <!-- home style -->
-    <link rel="stylesheet" href="/real_control_v2/css/home.css" />
-
-    <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.css"  />
-
-    <link rel="stylesheet" href="/real_control_v2/css/modal_extend.css" />
-    <!-- perfect-scrollbar style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <!-- layer 3.0.3 -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  />
-
-    <!-- flatpickr -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" >
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" >
-
-    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" />
-</head>
-
-<body>
-<div class="main-container" style="height: 100%;">
-</div>
-
-<!-- 地图相关 -->
-<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" 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>
-<!-- moment.js 日期处理类库 -->
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
-
-<!-- flatpickr -->
-<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js"></script>
-<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js"></script>
-
-<!-- perfect-scrollbar -->
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  ></script>
-<!-- common js -->
-<script src="/real_control_v2/js/common.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js" ></script>
-<!-- d3 -->
-<script src="/assets/js/d3.min.js"></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- uikit core -->
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js"></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.min.js" ></script>
-<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/sticky.min.js" ></script>
-
-<!-- js tree -->
-<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  ></script>
-<!-- layer 3.0.3 -->
-<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js"></script>
-
-<!-- 模态框扩展 -->
-<script src="/real_control_v2/js/modal_extend.js" ></script>
-
-<script src="/real_control_v2/mapmonitor/alone_page/alone_data_basic.js" ></script>
-<script src="/real_control_v2/mapmonitor/alone_page/alone_data_gps.js" ></script>
-<script src="/real_control_v2/js/utils/ct_table.js" ></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js" ></script>
-<script>
-    (function () {
-        gb_data_gps.fixedTimeRefresh();
-        //嵌入地图页面
-        $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
-            $('.map-system-msg.flex-left').remove();
-        });
-    })();
-</script>
-</body>
-
-</html>
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <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" />
+    <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="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" />
+    <!-- north style -->
+    <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
+    <!-- home style -->
+    <link rel="stylesheet" href="/real_control_v2/css/home.css" merge="custom_style"/>
+
+    <!-- js tree -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.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"/>
+    <!-- layer 3.0.3 -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/default/layer.css"  merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/layer3.0.3/skin/moon/style.css"  merge="plugins"/>
+
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/themes/airbnb.css" merge="plugins"/>
+
+    <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
+</head>
+
+<body>
+<div class="main-container" style="height: 100%;">
+</div>
+
+<!-- 地图相关 -->
+<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" 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" merge="plugins"></script>
+<!-- moment.js 日期处理类库 -->
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/zh-cn.js"></script>
+
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" merge="plugins"></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" merge="plugins"></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" merge="plugins"></script>
+<!-- d3 -->
+<script src="/assets/js/d3.min.js"></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- uikit core -->
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/uikit.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.min.js" merge="uikit_js"></script>
+<script src="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.min.js" merge="uikit_js"></script>
+<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/sticky.min.js" merge="uikit_js"></script>
+
+<!-- js tree -->
+<script src="/real_control_v2/assets/plugins/jstree/jstree.min.js" merge="plugins" ></script>
+<!-- layer 3.0.3 -->
+<script src="/real_control_v2/assets/plugins/layer3.0.3/layer.js" merge="plugins"></script>
+
+<!-- 模态框扩展 -->
+<script src="/real_control_v2/js/modal_extend.js" merge="custom_js"></script>
+
+<script src="/real_control_v2/alone_page/map/alone_data_basic.js" merge="custom_js"></script>
+<script src="/real_control_v2/alone_page/map/alone_data_gps.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/utils/ct_table.js" merge="custom_js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js" merge="uikit_js"></script>
+<script>
+    (function () {
+        gb_data_gps.fixedTimeRefresh();
+        //嵌入地图页面
+        $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
+            $('.map-system-msg.flex-left').remove();
+        });
+    })();
+</script>
+</body>
+
+</html>
@@ -309,4 +309,20 @@ span.signal-state-speed-limit{
 }
 .uk-tab>li:nth-child(n+2)>a{
     margin-left: 0 !important;
+}
+
+.home_alone_page{
+    cursor: pointer;
+}
+
+#send-phrase-modal .tools,
+#send-phrase-multi-modal .tools{
+    display: inline-block;
+    margin-left: 5px;
+}
+
+#send-phrase-modal .tools>span,
+#send-phrase-multi-modal .tools>span{
+    cursor: pointer;
+    margin-left: 12px;
 }
 \ No newline at end of file
@@ -1582,8 +1582,16 @@ ul.left_tabs_lg li{
     color: #929292;
 }
  
-#all-devices-modal .search-form input{
-    width: 160px;
+#all-devices-modal .search-form input[type=text]{
+    width: 100px;
+}
+
+#all-devices-modal .auto-refresh{
+    vertical-align: middle;margin-left: 5px;color: grey;
+}
+
+#all-devices-modal .auto-refresh.active{
+    color: #405dff;
 }
  
 #all-devices-modal .uk-margin-small-top {
@@ -490,4 +490,14 @@
 .ct-badge.ct-badge-LSBCTZ:hover{
     background: red;
     color: #fff;
+}
+
+span.sm-red{
+    font-size: 12px;
+    color: #ff5454;
+}
+
+span.sm-grey{
+    font-size: 12px;
+    color: grey;
 }
 \ No newline at end of file
@@ -11,11 +11,15 @@
                     <input type="hidden" value="{{nbbm}}" name="nbbm" />
                     <div class="uk-form-row">
                         <select style="width: 170px;" class="common_phrase_sel">
-                            <option value="">------ 常用短语 -------</option>
-                            <option value="天气异常，请小心驾驶">天气异常，请小心驾驶</option>
-                            <option value="请适当减速慢行，保持最佳行车间距">请适当减速慢行，保持最佳行车间距</option>
-                            <option value="请准点执行班次任务">请准点执行班次任务</option>
                         </select>
+                        <div class="tools" >
+                            <span data-uk-tooltip title="添加到常用短语" class="add_frequent_phrases">
+                                <i class="uk-icon-plus"></i>
+                            </span>
+                            <span data-uk-tooltip title="删除这条常用短语" class="minus_frequent_phrases">
+                                <i class="uk-icon-minus"></i>
+                            </span>
+                        </div>
                     </div>
                     <div class="uk-form-row">
                         <textarea cols="30" rows="5" name="text" data-fv-notempty data-fv-stringlength="true" data-fv-stringlength-max="50" placeholder="输入短语，不要超过50 个字符" style="margin: 0px; width: 100%; height: 110px;"></textarea>
@@ -43,9 +47,16 @@
                     <div class="uk-width-4-6" style="border-left: 1px solid #dddddd;">
                         <form class="uk-form fixed-tool">
                             <div class="uk-form-row">
-                                <select>
-                                  <option value="">------ 常用短语 -------</option>
-                              </select>
+                                <select style="width: 170px;" class="common_phrase_sel">
+                                </select>
+                                <div class="tools" >
+                                    <span data-uk-tooltip title="添加到常用短语" class="add_frequent_phrases">
+                                        <i class="uk-icon-plus"></i>
+                                    </span>
+                                            <span data-uk-tooltip title="删除这条常用短语" class="minus_frequent_phrases">
+                                        <i class="uk-icon-minus"></i>
+                                    </span>
+                                </div>
                             </div>
                             <br />
                             <div class="uk-form-row">
@@ -13,8 +13,12 @@
                 <li {{if i==0}}class="uk-active"{{/if}}><a> {{t}}</a></li>
                 {{/each}}
             </ul>
-            <div class="home-rb-explain-icon uk-icon-hover">
-                <i class="uk-icon-question-circle"></i>
+            <div class="home-rb-explain-icon ">
+                <a href="/real_control_v2/alone_page/home/home_wrap.html" target="_blank">
+                    <i class="uk-icon-send-o home_alone_page uk-icon-hover" ></i>
+                </a>
+                &nbsp;&nbsp;
+                <i class="uk-icon-question-circle uk-icon-hover"></i>
             </div>
         </div>
     </script>
@@ -59,7 +59,7 @@
     <script>
         (function () {
             var modal = '#bctype-major-modal'
-                    , sch, stationRoutes, parentModal;
+                    , sch, stationRoutes, parentModal, _dfsj;
  
             $('[name=sendDirective]', modal).on('click', function () {
                 if ($(this)[0].checked)
@@ -134,6 +134,8 @@
                 e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
+                if(data._dfsj)
+                    sch.dfsj = data._dfsj;
  
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -131,6 +131,8 @@
                 e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
+                if(data._dfsj)
+                    sch.dfsj = data._dfsj;
  
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -185,7 +185,7 @@
                         $(document.body).append(htmlStr);
  
                         UIkit.modal(detailModal, {bgclose: true,modal:false}).show();
-                        $(detailModal).trigger('init', {sch: sch, parentModal: modal});
+                        $(detailModal).trigger('init', {sch: sch, parentModal: modal, _dfsj: $('[name=dfsj]', modal).val()});
                     })
                 });
             });
@@ -169,7 +169,7 @@
                 half_form.addClass('repeat_main destroy_form');
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', half_form));
-                sf.after(half_form);
+                inf.after(half_form);
  
  
                 //班次类型切换
@@ -108,8 +108,8 @@
                 {{/if}}
             </dd>
             <dd>{{sch.clZbh}}</dd>
-            <dd>{{sch.jGh}}/{{sch.jName}}</dd>
-            <dd>{{sch.sGh}}/{{sch.sName}}</dd>
+            <dd data-old="{{sch.jGh}}/{{sch.jName}}">{{sch.jGh}}/{{sch.jName}}</dd>
+            <dd data-old="{{sch.sGh}}/{{sch.sName}}">{{sch.sGh}}/{{sch.sName}}</dd>
             <dd>
                 {{if sch.status==2}}
                 <span class="ct_zt_yzx">已执行</span>
@@ -160,20 +160,26 @@
                     $('.tzrc-table-wrap', modal).perfectScrollbar('update');
                 });
  
+
+                writeSch2Form(sch);
                 $(modal).on('click', '.sch-tzrc-table .ct_table_body dl', function () {
                     var cbox = $('input[type=checkbox]',this)[0];
                     //var active = $();
                     if(!$(this).hasClass('active')){
                         $(this).addClass('active');
                         cbox.checked = true;
-                        var lineCode = $('[name=lineSelect]', modal).val();
-                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
-
-                        writeSch2Form(sch);
+                        //var lineCode = $('[name=lineSelect]', modal).val();
+                        //var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
+                        renderCell();
                     }
                     else{
                         $(this).removeClass('active');
                         cbox.checked = false;
+                        //$(this).find('dd[data-old]').text()
+                        var $jsyCell = $($($(this).find('dd')[2]));
+                        var $spyCell = $($($(this).find('dd')[3]));
+                        $jsyCell.text($jsyCell.data('old'));
+                        $spyCell.text($spyCell.data('old'));
                     }
                 });
  
@@ -236,8 +242,34 @@
                     });
                     return false;
                 });
+
+                /**
+                 * 驾驶员/售票员文本框改变事件
+                 */
+                var renderRunFlag;
+                $('input[name=jsy],input[name=spy]', modal).on('input change', function () {
+                    if(renderRunFlag)
+                        return;
+                    renderRunFlag = true;
+                    setTimeout(function () {
+                        renderCell();
+                        renderRunFlag = false;
+                    }, 200);
+                });
             });
  
+            
+            function renderCell() {
+                var jsy = $('input[name=jsy]', modal).val();
+                var spy = $('input[name=spy]', modal).val();
+                $('.sch-tzrc-table .ct_table_body>dl.active').each(function () {
+                    var jsyCell = $(this).find('dd')[2];
+                    var spyCell = $(this).find('dd')[3];
+                    $(jsyCell).text(jsy);
+                    $(spyCell).text(spy);
+                });
+            }
+
             function writeSch2Form(sch) {
                 var f = $('.tzrc_form', modal);
                 $('input[name=clZbh]', f).val(sch.clZbh).trigger('input');
@@ -7,19 +7,13 @@
         <div class="uk-panel uk-panel-box uk-panel-box-primary">
             <form class="uk-form search-form">
                 <fieldset data-uk-margin>
-                    <!--<legend>
-                        数据检索
-                        &lt;!&ndash; <div class="legend-tools">
-                    <a class="uk-icon-small uk-icon-hover uk-icon-file-excel-o" data-uk-tooltip title="导出excel"></a>
-                  </div> &ndash;&gt;
-                    </legend>-->
                     <span class="horizontal-field">线路</span>
                     <div class="uk-autocomplete uk-form autocomplete-line" >
                         <input type="text" name="lineId" placeholder="线路">
                     </div>
                     <span class="horizontal-field">车辆</span>
                     <div class="uk-autocomplete uk-form autocomplete-cars" >
-                        <input type="text" name="nbbm" placeholder="车辆自编号">
+                        <input type="text" name="nbbm" placeholder="自编号">
                     </div>
                     <span class="horizontal-field">设备号</span>
                     <div class="uk-autocomplete uk-form autocomplete-device" >
@@ -35,9 +29,23 @@
                     </div>
                     <span class="horizontal-field">程序版本</span>
                     <div class="uk-autocomplete uk-form " >
-                        <input type="text" name="version" placeholder="程序版本" style="width: 110px;">
+                        <input type="text" name="version" placeholder="版本号" style="width: 60px;">
                     </div>
-                    <button class="uk-button">检索</button>
+                    <span class="horizontal-field">状态</span>
+                    <div class="uk-autocomplete uk-form " >
+                        <select name="abnormalStatus">
+                            <option value="">全部</option>
+                            <option value="outBounds">越界</option>
+                            <option value="overspeed">超速</option>
+                            <option value="offline">离线</option>
+                            <option value="gps-offline">gps 0,0</option>
+                        </select>
+                    </div>
+                    <button class="uk-button search-btn" title="只支持后模糊">检索</button>
+                    <label class="auto-refresh" >
+                        <input type="checkbox" value="1" name="schCBox" class="i-cbox">
+                        自动刷新
+                    </label>
                 </fieldset>
             </form>
         </div>
@@ -49,10 +57,10 @@
                     <th style="width: 14%;">站点</th>
                     <th style="width: 11%;">车辆</th>
                     <th style="width: 11%;">设备号</th>
-                    <th style="width: 9%;">速度</th>
                     <th style="width: 9%;">走向/营运</th>
                     <th style="width: 10%;">程序版本</th>
                     <th>最后GPS时间</th>
+                    <th style="width: 9%;">状态</th>
                     <th style="width: 8%;">来源</th>
                 </tr>
                 </thead>
@@ -72,17 +80,31 @@
             <td>{{gps.stationName}}</td>
             <td>{{gps.nbbm}}</td>
             <td>{{gps.deviceId}}</td>
-            <td>{{gps.speed}}</td>
             <td>{{gps.upDown}}/{{gps.state}}</td>
             <td>{{gps.version}}</td>
             <td>{{gps.timeStr}}</td>
             <td>
+                {{if gps.valid==1}}
+                    <span class="sm-red">invalid(-1</span>
+                {{else if gps.abnormalStatus=='outBounds'}}
+                    <span class="sm-red" title="越界距离(米) {{gps.outOfBoundDistance}}">越界</span>
+                {{else if gps.abnormalStatus=='overspeed'}}
+                    <span class="sm-red">超速({{gps.speed}})</span>
+                {{else if gps.abnormalStatus=='gps-offline'}}
+                    <span class="sm-red">GPS (0,0)</span>
+                {{else if gps.abnormalStatus=='offline'}}
+                    <span>离线</span>
+                {{else}}
+                    ...
+                {{/if}}
+            </td>
+            <td>
                 {{if gps.source==1}}
                     <span style="color: #1e1ef5;" title="已切换至新网关">网关</span>
                 {{else if gps.source==0}}
                     <span style="color: #8e8e8e;" title="转接的数据，无法下发指令">转发</span>
                 {{else}}
-                    <span>未知</span>
+                    <span class="sm-grey">未知</span>
                 {{/if}}
             </td>
         </tr>
@@ -148,7 +170,7 @@
                 query();
             });
  
-            var query = function() {
+            var query = function(cb) {
                 var data = form.serializeJSON();
                 data.page = page;
                 data.size = pageSize;
@@ -173,9 +195,75 @@
                     //pagination
                     if (resetPagination)
                         pagination(rs.totalPages + 1, rs.page);
+
+                    cb && cb();
                 })
             };
  
+            /**
+             * 自动刷新
+             */
+            $('.auto-refresh', modal).on('click', function () {
+                var checked = $('input[type=checkbox]',this)[0].checked,
+                        $sub_btn = $('.search-btn', form);
+                if(checked){
+                    $(this).addClass('active');
+                    $sub_btn.attr('disabled', 'disabled');
+                    auto_refresh.start();
+                }
+                else{
+                    $(this).removeClass('active');
+                    $sub_btn.removeAttr('disabled');
+                    auto_refresh.stop();
+                }
+            });
+
+            var auto_refresh = (function () {
+                var timer=null;
+                var span = $('.auto-refresh', modal).append('<span class="no"></span>').find('span.no');
+                var space = 10;
+                var start = function () {
+
+                    (function () {
+                        var f = arguments.callee;
+                        run();
+                        if(space == 0){
+                            space = 10;
+
+                            resetPagination = true;
+                            page=0;
+                            query(function () {
+                                timer = setTimeout(f, 1000);
+                            });
+                        }
+                        else{
+                            timer = setTimeout(f, 1000);
+                        }
+                    })();
+                };
+
+                var stop = function () {
+                    clearTimeout(timer);
+                    timer = null;
+                    space = 10;
+                    span.text('');
+                };
+
+                var run = function () {
+                    space --;
+                    span.text(space);
+                };
+
+                
+                return {
+                    start: start,
+                    stop: stop
+                }
+            })();
+
+            //注册 destroy
+            $(modal).on('ct-destroy', auto_refresh.stop);
+
             var state_up_0 = function(device) {
                 var nbbm = gb_data_basic.device2nbbmMap()[device];
                 stateChange(nbbm, 0, 0);
@@ -53,6 +53,62 @@ var gb_home_context_menu = (function() {
         });
     };
  
+    /**
+     * 常用短语
+     * @type {{add, minus}}
+     */
+    var frequent_phrases = function () {
+
+        var init = function (wrap) {
+            add(wrap);
+            minus(wrap);
+            //查询常用短语
+            $.get('/frequent_phrases/all', function (list) {
+                var t = $('textarea[name=text]', wrap).val();
+                var opts = '<option value="">------ 常用短语 -------</option>';
+                for(var i=0,obj;obj=list[i++];){
+                    opts += '<option value="'+obj.text+'" data-id="'+obj.id+'" '+(obj.text==t?"selected":"")+'>'+obj.text+'</option>';
+                }
+                $('.common_phrase_sel', wrap).html(opts);
+            });
+        };
+
+        var add = function (wrap) {
+            $('.add_frequent_phrases', wrap).unbind('click').on('click', function () {
+                var text = $('textarea[name=text]', wrap).val();
+                if(!$.trim(text))
+                    return notify_err('请在下列文本框内输入文字');
+
+                gb_common.$post('/frequent_phrases', {text: text}, function () {
+                    notify_succ('添加成功！');
+                    init(wrap);
+                });
+            });
+        };
+
+        var minus = function (wrap) {
+            $('.minus_frequent_phrases', wrap).unbind('click').on('click', function () {
+                var text = $('.common_phrase_sel', wrap).val();
+                if(!$.trim(text))
+                    return notify_err('请选中常用短语后再删除');
+
+                var id = $('.common_phrase_sel', wrap).find("option:selected").data('id');
+                if(!id)
+                    return notify_err('无法获取到索引');
+
+                gb_common.$del('/frequent_phrases/' + id, function () {
+                    notify_succ('删除成功！');
+                    $('textarea[name=text]', wrap).val('');
+                    init(wrap);
+                });
+            });
+        };
+
+        return {
+            init: init
+        }
+    }();
+
     // send phrase
     var sendPhrase = function() {
         var dom = temps['home-send-phrase-temp']({
@@ -62,10 +118,11 @@ var gb_home_context_menu = (function() {
         // show modal
         var elem = show_modal(modal, dom);
  
+        frequent_phrases.init(modal);
         //form submit
         var f = $('form', modal).formValidation(gb_form_validation_opts);
         $('.common_phrase_sel', f).on('change', function () {
-            $('[name=text]', f).text($(this).val());
+            $('[name=text]', f).val($(this).val());
         });
         f.on('success.form.fv', function(e) {
             e.preventDefault();
@@ -92,8 +149,13 @@ var gb_home_context_menu = (function() {
             },
             'plugins': ['checkbox']
         });
+
+        frequent_phrases.init(modal);
         //form submit
         var f = $('form', modal).formValidation(gb_form_validation_opts);
+        $('.common_phrase_sel', f).on('change', function () {
+            $('[name=text]', f).val($(this).val());
+        });
         f.on('success.form.fv', function(e) {
             e.preventDefault();
             //tree checked node
@@ -41,7 +41,7 @@ var gb_home_layout = (function () {
  
     //右下角说明icon
     function initRbDxplain() {
-        $(document).on('mouseenter', '.home-rb-explain-icon', function() {
+        $(document).on('mouseenter', '.home-rb-explain-icon>.uk-icon-question-circle', function() {
             $(this).qtip({
                 show: {
                     ready: true,
@@ -40,6 +40,10 @@ var gb_schedule_context_menu = (function () {
             return add_sch_doms;
         },
         dftz: function (sch) {
+            if(sch.status > 0){
+                notify_err((sch.status==1?'已发出':'已执行') + '的班次不能修改待发');
+                return;
+            }
             open_modal(folder + '/dftz.html', {
                 sch: sch
             }, modal_opts);
@@ -21,6 +21,11 @@ var gb_schedule_table_dbclick = (function() {
                 remarks: '',
                 opType: '0'
             }, function(rs) {
+                if(rs.flag && rs.flag==4008){
+                    notify_err('已发出的班次不能调整待发');
+                    gb_schedule_table.updateSchedule(rs.t);
+                    return;
+                }
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('待发调整成功！');
                 //重新计算应发未发
@@ -47,7 +47,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) {
@@ -4,7 +4,7 @@ $(document).on(&#39;hide.uk.modal&#39;, &#39;.uk-modal&#39;, function () {
     if($('.uk-modal-dialog', this).hasClass('uk-modal-dialog-lightbox')){
         return;
     }
-    $(this).remove();
+    $(this).trigger('ct-destroy').remove();
 });
  
 $(document).on('show.uk.modal', '.uk-modal.ct_move_modal', function () {
@@ -18,12 +18,12 @@ var gb_tabs = (function() {
             $('.main-container').html(tabContentHtmlStr);
  
             setTimeout(renderStyle, 4000);
-            /*//地图选项卡初始点击
+            //地图选项卡初始点击
             $('#north_tabs_map_btn').one('click', function () {
                 if(typeof(gb_map_overlay_mge)!="undefined"){
                     gb_map_overlay_mge.centerToRational();
                 }
-            });*/
+            });
  
             //班次选项卡第一次点击，更新滚动条高度
             $('.north-tabs .uk-tab li.tab-line').one('click', function(e){
@@ -108,7 +108,7 @@ var gb_svg_tooltip = (function () {
             api.set({
                 'hide.event': false,
                 'content.button': 'Close',
-                'content.title': 'GPS正常',
+                'content.title': '...',
                 'position.my': 'top center',
                 'position.at': 'bottom center'
             });
@@ -12,7 +12,21 @@
                 未知站点
                 {{/if}}
             </h5>
-            <p>设备状态：正常</p>
+            <p>设备状态：
+                {{if valid==1}}
+                    invalid(-1
+                {{else if abnormalStatus=='outBounds'}}
+                    越界
+                {{else if abnormalStatus=='overspeed'}}
+                    超速
+                {{else if abnormalStatus=='gps-offline'}}
+                    GPS掉线
+                {{else if abnormalStatus=='offline'}}
+                    离线
+                {{else}}
+                    .
+                {{/if}}
+            </p>
             <p>设备号：{{deviceId}}</p>
             <p>速度：{{speed}}</p>
             <p>角度：{{direction}}</p>
@@ -7,7 +7,7 @@
  
 <div class="map-system-msg flex-left">
     <a class="z-depth-2 old_map" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
-    <a class="z-depth-2 now_map" href="/real_control_v2/mapmonitor/alone_page/alone_wrap.html" target="_blank">
+    <a class="z-depth-2 now_map" href="/real_control_v2/alone_page/map/alone_wrap.html" target="_blank">
         <i class="uk-icon-send-o"></i>
     </a>
 </div>