1.部分内容与浦交分支合并

王通
2 parents e1018ca6 d9f05c05
Showing 46 changed files with 7551 additions and 7140 deletions
pom.xml
src/main/java/com/bsth/Application.java
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/realcontrol/ServiceDataInterface.java
src/main/java/com/bsth/controller/schedule/TrafficManageController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/entity/sys/SysUser.java
src/main/java/com/bsth/filter/BaseFilter.java
src/main/java/com/bsth/repository/sys/SysUserRepository.java
src/main/java/com/bsth/security/WebSecurityConfig.java
src/main/java/com/bsth/security/filter/LoginInterceptor.java
src/main/java/com/bsth/service/TrafficManageService.java
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/SchedulePlanServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/PwdGenerator.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/java/com/bsth/util/MailUtils.java
src/main/resources/application-dev.properties
@@ -181,27 +181,32 @@
  
 		<!-- pentaho kettle 依赖 -->
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
+			<groupId>pentaho-kettle</groupId>
 			<artifactId>kettle-core</artifactId>
 			<version>6.0.1.0-386</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-js</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
+		<dependency>
+			<groupId>pentaho-kettle</groupId>
+			<artifactId>kettle-engine</artifactId>
+			<version>6.0.1.0-386</version>
 		</dependency>
-        <dependency>
-            <groupId>com.pentaho.kettle</groupId>
-            <artifactId>kettle-engine</artifactId>
-            <version>6.0.1.0-386</version>
-        </dependency>
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
+			<groupId>pentaho</groupId>
 			<artifactId>metastore</artifactId>
 			<version>6.0.1.0-386</version>
 		</dependency>
 		<dependency>
-			<groupId>com.pentaho.kettle</groupId>
-			<artifactId>vfs2</artifactId>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-vfs2</artifactId>
 			<version>2.1-20150824</version>
 		</dependency>
  
-
 		<dependency>
 			<groupId>net.sourceforge.jexcelapi</groupId>
 			<artifactId>jxl</artifactId>
@@ -291,12 +296,6 @@
  
  
 		<dependency>
-			<groupId>ojdbc</groupId>
-			<artifactId>ojdbc</artifactId>
-			<version>14</version>
-		</dependency>
-
-		<dependency>
 			<groupId>org.apache.mina</groupId>
 			<artifactId>mina-core</artifactId>
 			<version>2.0.13</version>
@@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService;
 @SpringBootApplication
 public class Application extends SpringBootServletInitializer {
  
-	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(18);
+	public static ScheduledExecutorService mainServices = Executors.newScheduledThreadPool(21);
  
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
@@ -97,8 +97,8 @@ public class XDApplication implements CommandLineRunner {
         timeDiff = (DateUtils.getTimestamp() + 1000 * 60 * 140) - System.currentTimeMillis();
         if (timeDiff < 0)
             timeDiff += (1000 * 60 * 60 * 24);
-        // 早上07:00
-        timeDiffTraffic = (DateUtils.getTimestamp() + 1000 * 60 * 60 * 7) - System.currentTimeMillis();
+        // 早上09:00
+        timeDiffTraffic = (DateUtils.getTimestamp() + 3600000 * 9) - System.currentTimeMillis();
         if (timeDiffTraffic < 0)
             timeDiffTraffic += (1000 * 60 * 60 * 24);
     }
@@ -120,6 +120,9 @@ public class XDApplication implements CommandLineRunner {
                 case "test":
                     testInit();
                     break;
+                case "cloud":
+                    cloudInit();
+                    break;
                 default:
                     break;
             }
@@ -266,4 +269,48 @@ public class XDApplication implements CommandLineRunner {
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
     }
+
+    public void cloudInit(){
+        log.info("cloudInit...");
+        ScheduledExecutorService sexec = Application.mainServices;
+        //安全驾驶
+        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+
+        GpsDataLoaderThread.setFlag(-1);
+        /** 线调业务 */
+        sexec.scheduleWithFixedDelay(scheduleRefreshThread, 10, 120, TimeUnit.SECONDS);//班次更新线程
+        sexec.scheduleWithFixedDelay(scheduleLateThread, 140, 20, TimeUnit.SECONDS);//检查班次误点
+        sexec.scheduleWithFixedDelay(gpsDataLoader, 0, 2, TimeUnit.SECONDS);//抓取GPS数据
+        sexec.scheduleWithFixedDelay(rfidDataLoader, 5, 5, TimeUnit.SECONDS);//抓取RFID数据
+        sexec.scheduleWithFixedDelay(fixedCheckStationCodeThread, 60, 60 * 5, TimeUnit.SECONDS);//检查班次站点编码
+
+        sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);//GPS设备掉离线
+        sexec.scheduleWithFixedDelay(schedulePstThread, 180, 10, TimeUnit.SECONDS);//班次延迟入库线程
+        sexec.scheduleWithFixedDelay(seiPstThread, 180, 60, TimeUnit.SECONDS);//班次修正日志入库
+        sexec.scheduleWithFixedDelay(directivesPstThread, 120, 60, TimeUnit.SECONDS);//调度指令延迟入库
+        sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);//线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
+        sexec.scheduleWithFixedDelay(sampleTimeDataLoader, 140, 120 * 60, TimeUnit.SECONDS);//到离站预测需要的站点间耗时数据
+        sexec.scheduleWithFixedDelay(basicDataLoader, 1, 1, TimeUnit.HOURS);//基础数据更新
+        sexec.scheduleWithFixedDelay(autoExecScanThread, 180, 50, TimeUnit.SECONDS);//班次自动执行
+        DirectivePushQueue.start();//消息队列 -指令，系统下发的
+        WebSocketPushQueue.start();//消息队列 -webSocket ，推送至线调web页面的
+
+        /** 线调为其他程序提供的数据 --写入数据库 */
+        sexec.scheduleWithFixedDelay(fcxxUpdateThread, 160, 30, TimeUnit.SECONDS);//发车信息（发车屏、信息发布）
+        //线路首末班数据（网关用，班次更新时写入）
+        //com.bsth.data.schedule.f_a_l.FirstAndLastHandler
+        sexec.scheduleWithFixedDelay(schSiginUpdateDBThread, 160, 60 * 30, TimeUnit.SECONDS);//无法自动完成的班次信息（网关用，补信号）
+
+        //运管处静态数据提交
+        log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
+        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //计算油、公里加注
+        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+
+        //线路版本更新
+        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+
+        //线路版本更新
+        //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
+    }
 }
-package com.bsth.common;
-
-/**
- *
- * @ClassName: Constants
- * @Description: TODO(常量类)
- * @author PanZhao
- * @date 2016年3月18日 下午11:06:53
- *
- */
-public class Constants {
-
-	/**
-	 * 不需要拦截的资源
-	 */
-	public static final String LOGIN = "/user/login/**";
-	public static final String LOGIN_PAGE = "/login.html";
-	public static final String ASSETS_URL = "/assets/**";
-	public static final String FAVICON_URL = "/favicon.ico";
-	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
-	public static final String LOGIN_FAILURE = "/user/loginFailure";
-	public static final String CAPTCHA = "/captcha.jpg";
-
-    // springboot manage health的检测url
-    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
-    // 车辆数据同步url
-    public static final String VEHICLE_DATA_SYNC_URL = "/dataSync/vehicle/api/**";
-
-	//对外的营运数据接口
-	public static final String SERVICE_INTERFACE = "/companyService/**";
-
-	/**
-	 * 线调部分子页面不做拦截，便于浏览器缓存
-	 */
-	public static final String XD_CHILD_PAGES = "/real_control_v2/**";
-	public static final String XD_REAL_GPS = "/gps/real/line";
-	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
-
-	//车载网关上行接口
-	public static final String UPSTREAM_URL = "/control/upstream";
-	//rfid 上传入口
-	public static final String UP_RFID_URL = "/rfid/**";
-
-	public static final String SESSION_USERNAME = "sessionUserName";
-	public static final String COMPANY_AUTHORITYS = "cmyAuths";
-	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
-
-	/**
-	 * 解除调度指令和班次的外键约束
-	 */
-	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
-
-	/**
-	 * 批量解除调度指令和班次的外键约束
-	 */
-	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
-
-	/**
-	 * 批量解除子任务和班次的外键约束
-	 */
-	public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
-}
+package com.bsth.common;
+
+/**
+ *
+ * @ClassName: Constants
+ * @Description: TODO(常量类)
+ * @author PanZhao
+ * @date 2016年3月18日 下午11:06:53
+ *
+ */
+public class Constants {
+
+	/**
+	 * 不需要拦截的资源
+	 */
+	public static final String LOGIN = "/user/login/**";
+	public static final String LOGIN_PAGE = "/login.html";
+	public static final String ASSETS_URL = "/assets/**";
+	public static final String FAVICON_URL = "/favicon.ico";
+	public static final String METRONIC_URL = "/metronic_v4.5.4/**";
+	public static final String LOGIN_FAILURE = "/user/loginFailure";
+	public static final String CAPTCHA = "/captcha.jpg";
+
+    // springboot manage health的检测url
+    public static final String ACTUATOR_MANAGEMENT_HEALTH = "/manage/health";
+    // 车辆数据同步url
+    public static final String VEHICLE_DATA_SYNC_URL = "/dataSync/vehicle/api/**";
+
+	//对外的营运数据接口
+	public static final String SERVICE_INTERFACE = "/companyService/**";
+
+	/**
+	 * 线调部分子页面不做拦截，便于浏览器缓存
+	 */
+	public static final String XD_CHILD_PAGES = "/real_control_v2/**";
+	public static final String XD_REAL_GPS = "/gps/real/line";
+	//public static final String XD_TEMPS = "/pages/control/line/temps/**";
+
+	//车载网关上行接口
+	public static final String UPSTREAM_URL = "/control/upstream";
+	//rfid 上传入口
+	public static final String UP_RFID_URL = "/rfid/**";
+
+	public static final String SESSION_USERNAME = "sessionUserName";
+	public static final String COMPANY_AUTHORITYS = "cmyAuths";
+	public static final String STATION_AND_SECTION_COUNT = "/station/updateStationAndSectionCode";
+
+	/**
+	 * 解除调度指令和班次的外键约束
+	 */
+	public static final String REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch=?";
+
+	/**
+	 * 批量解除调度指令和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_DIRECTIVE_SCH_FK = "update bsth_v_directive_60 set sch=NULL where sch in ";
+
+	/**
+	 * 批量解除子任务和班次的外键约束
+	 */
+	public static final String MULTI_REMOVE_CHILDTASK_SCH_FK = "update bsth_c_s_child_task set schedule=NULL where schedule in ";
+
+	public static final String WEAK_CIPHER = "weakCipher";
+
+	public static final String FILE_AUTH = "/.well-known/pki-validation/fileauth.txt";
+}
@@ -345,8 +345,8 @@ public class ServiceDataInterface {
             for (Map.Entry<String, String> m : BasicData.lineCode2NameMap.entrySet()){
                 for (Map<String,String> emer : emergencyList){
                     for (Map.Entry<String,String> t : emer.entrySet()){
-                        if(m.getKey().equals(t.getKey())){
-                            emergencyListAll.add(emer); //
+                        if (m.getKey().equals(t.getKey())) {
+                            emergencyListAll.add(emer);
                             Line line = lineRepository.findById(Integer.parseInt(t.getKey())).get();
                             line.setName(t.getValue());
                             Map<String, Object> status = service.update(line);
-package com.bsth.controller.schedule;
-
-import com.bsth.service.TrafficManageService;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- *
- * @author BSTH
- *
- */
-@RestController
-@RequestMapping("trmg")
-public class TrafficManageController {
-
-    @Autowired
-    private TrafficManageService trManageService;
-
-
-    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
-    public String setXL(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setXL(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
-    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
-        try {
-            return trManageService.setXLByInUse(inUse);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
-    public String setCL() throws Exception {
-        try {
-            return trManageService.setCL();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
-    public String setSJ() throws Exception {
-        try {
-            return trManageService.setSJ();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
-    public String setLD() throws Exception {
-        try {
-            return trManageService.setLD();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
-    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setLD(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
-    public String setLDFile() throws Exception {
-        try {
-            return trManageService.setLDFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
-    public String setLCYH() throws Exception {
-        try {
-            return trManageService.setLCYH();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
-    public String setDDRB() throws Exception {
-        try {
-            return trManageService.setDDRB();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
-    public String setJHBC() throws Exception {
-        try {
-            return trManageService.setJHBC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
-    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
-        try {
-            return trManageService.setJHBC(theDate);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
-    public String setSKB(@RequestParam("ids") String ids) throws Exception {
-        try {
-            return trManageService.setSKB(ids);
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
-    public String setXLPC() throws Exception {
-        try {
-            return trManageService.setXLPC();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
-    public String setCS() throws Exception {
-        try {
-            return trManageService.setCS();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
-    public String getDownLoadAllDataFile() throws Exception {
-        try {
-            return trManageService.getDownLoadAllDataFile();
-        } catch (Exception exp) {
-            throw new Exception(exp.getCause());
-        }
-    }
-
-}
+package com.bsth.controller.schedule;
+
+import com.bsth.service.TrafficManageService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ * @author BSTH
+ *
+ */
+@RestController
+@RequestMapping("trmg")
+public class TrafficManageController {
+
+    @Autowired
+    private TrafficManageService trManageService;
+
+
+    @RequestMapping(value = "/setXL", method = RequestMethod.GET)
+    public String setXL(@RequestParam("ids") String ids) throws Exception {
+        try {
+            return trManageService.setXL(ids);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLByInUse", method = RequestMethod.GET)
+    public String setXLByInUse(@RequestParam("inUse") String inUse) throws Exception {
+        try {
+            return trManageService.setXLByInUse(inUse);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCL", method = RequestMethod.GET)
+    public String setCL() throws Exception {
+        try {
+            return trManageService.setCL();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSJ", method = RequestMethod.GET)
+    public String setSJ() throws Exception {
+        try {
+            return trManageService.setSJ();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLD", method = RequestMethod.GET)
+    public String setLD() throws Exception {
+        try {
+            return trManageService.setLD();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDByDate", method = RequestMethod.GET)
+    public String setLDByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setLD(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLDFile", method = RequestMethod.GET)
+    public String setLDFile() throws Exception {
+        try {
+            return trManageService.setLDFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setLCYH", method = RequestMethod.GET)
+    public String setLCYH() throws Exception {
+        try {
+            return trManageService.setLCYH();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setDDRB", method = RequestMethod.GET)
+    public String setDDRB() throws Exception {
+        try {
+            return trManageService.setDDRB();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBC", method = RequestMethod.GET)
+    public String setJHBC() throws Exception {
+        try {
+            return trManageService.setJHBC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setJHBCByDate", method = RequestMethod.GET)
+    public String setJHBCByDate(@RequestParam("theDate") String theDate) throws Exception {
+        try {
+            return trManageService.setJHBC(theDate);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setSKB", method = RequestMethod.GET)
+    public String setSKB(@RequestParam("ids") String ids, @RequestParam("qyrqs") String qyrqs) throws Exception {
+        try {
+            return trManageService.setSKB(ids, qyrqs);
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setXLPC", method = RequestMethod.GET)
+    public String setXLPC() throws Exception {
+        try {
+            return trManageService.setXLPC();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/setCS", method = RequestMethod.GET)
+    public String setCS() throws Exception {
+        try {
+            return trManageService.setCS();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+    @RequestMapping(value = "/getDownLoadAllDataFile", method = RequestMethod.GET)
+    public String getDownLoadAllDataFile() throws Exception {
+        try {
+            return trManageService.getDownLoadAllDataFile();
+        } catch (Exception exp) {
+            throw new Exception(exp.getCause());
+        }
+    }
+
+}
-package com.bsth.controller.sys;
-
-import com.bsth.common.Constants;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.sys.dto.CompanyData;
-import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.entity.sys.CompanyAuthority;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.sys.CompanyAuthorityService;
-import com.bsth.service.sys.SysUserService;
-import com.google.common.collect.ArrayListMultimap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.security.web.authentication.session.SessionAuthenticationException;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.*;
-
-@RestController
-@RequestMapping("user")
-public class UserController extends BaseController<SysUser, Integer> {
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    SysUserService sysUserService;
-
-    @Autowired
-    CompanyAuthorityService companyAuthorityService;
-
-    @RequestMapping(value = "/login/jCryptionKey")
-    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
-        //公匙返回页面
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("publickey", RSAUtils.generateBase64PublicKey());
-        return rs;
-    }
-
-    @RequestMapping(value = "/getCurrentUser")
-    public SysUser getCurrentUser() {
-        SysUser user = SecurityUtils.getCurrentUser();
-        return user;
-    }
-
-    //需要验证码的账号
-    public static Map<String, Integer> captchaMap = new HashMap<>();
-
-    @RequestMapping(value = "/login", method = RequestMethod.POST)
-    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
-                                     @RequestParam String password, String captcha) {
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("status", ResponseCode.ERROR);
-        try {
-            HttpSession session = request.getSession();
-            rs.put("captcha", session.getAttribute("captcha"));
-
-            if (captchaMap.get(userName) != null && captchaMap.get(userName) >= 3) {
-                //校验验证码
-                String verCode = (String) session
-                        .getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
-
-                if (StringUtils.isBlank(captcha))
-                    return put(rs, "msg", "请输入验证码");
-
-                if (!verCode.equals(captcha))
-                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
-            }
-
-            //解密RSA
-            try {
-                userName = RSAUtils.decryptBase64(userName);
-                password = RSAUtils.decryptBase64(password);
-            } catch (RuntimeException e) {
-                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
-            }
-
-            SysUser user = sysUserService.findByUserName(userName);
-            if (null == user)
-                return put(rs, "msg", "不存在的用户");
-
-            if (!user.isEnabled())
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
-
-            // 校验密码
-            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-            if (!matchStatus) {
-                rs.put("msg", "密码有误");
-
-                Integer captchSize = captchaMap.get(userName);
-                if (null == captchSize)
-                    captchSize = 0;
-
-                captchSize++;
-                captchaMap.put(userName, captchSize);
-                return rs;
-            }
-
-            // 登录
-            SecurityUtils.login(user, request);
-            //session里写入用户名，webSocket连接时标识身份用
-            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-            //获取公司权限数据
-            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
-            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-
-            captchaMap.remove(userName);
-            rs.put("status", ResponseCode.SUCCESS);
-            logger.error("用户:" + user.getUserName() + "登录");
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
-        }
-        return rs;
-    }
-
-    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
-    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
-                                          @RequestParam String password) {
-
-        Map<String, Object> rs = new HashMap<>();
-        rs.put("status", ResponseCode.ERROR);
-        try {
-            HttpSession session = request.getSession();
-
-            SysUser user = sysUserService.findByUserName(userName);
-            if (null == user)
-                return put(rs, "msg", "不存在的用户");
-
-            if (!user.isEnabled())
-                return put(rs, "msg", "该用户已被锁定，请联系管理员");
-
-            // 校验密码
-            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
-            if (!matchStatus)
-                return put(rs, "msg", "密码有误");
-
-            // 登录
-            SecurityUtils.login(user, request);
-            //session里写入用户名，webSocket连接时标识身份用
-            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
-
-            //获取公司权限数据
-            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
-            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
-            rs.put("status", ResponseCode.SUCCESS);
-        } catch (Exception e) {
-            logger.error("", e);
-            rs.put("msg", "服务器出现异常，请联系管理员");
-        }
-        return rs;
-    }
-
-    /**
-     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
-     *
-     * @return
-     */
-    @RequestMapping("companyData")
-    public List<CompanyData> companyData(HttpServletRequest request) {
-        List<CompanyData> rs = new ArrayList<>();
-        CompanyData companyData;
-
-        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
-        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
-
-        for (CompanyAuthority cAuth : cmyAuths) {
-            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
-        }
-
-        Set<String> keys = map.keySet();
-        String[] temps;
-        for (String k : keys) {
-            temps = k.split("_");
-
-            companyData = new CompanyData();
-            companyData.setCompanyCode(temps[0]);
-            companyData.setCompanyName(temps[1]);
-            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
-
-            cmyAuths = map.get(k);
-            for (CompanyAuthority c : cmyAuths) {
-                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
-            }
-
-            rs.add(companyData);
-        }
-
-        return rs;
-    }
-
-    @RequestMapping(value = "/login/captchaStatus")
-    public int captchaStatus(String userName) {
-        Integer size = captchaMap.get(userName);
-        return size == null ? 0 : size;
-    }
-
-    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
-        rs.put(key, val);
-        return rs;
-    }
-
-    /**
-     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
-     * request @return String 返回类型 @throws
-     */
-    @RequestMapping("/loginFailure")
-    public String loginFailure(HttpServletRequest request) {
-        String msg = "";
-        HttpSession session = request.getSession();
-
-        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-
-        if (obj instanceof BadCredentialsException)
-            msg = "登录失败，用户名或密码错误.";
-        else if (obj instanceof SessionAuthenticationException)
-            msg = "登录失败，当前策略不允许重复登录.";
-        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
-        return msg;
-    }
-
-    @RequestMapping("/currentUser")
-    public SysUser currentUser() {
-        return SecurityUtils.getCurrentUser();
-    }
-
-    /**
-     * @param id      用户ID
-     * @param enabled 状态
-     * @return
-     * @Title changeEnabled
-     * @Description: TODO(改变用户状态)
-     */
-    @RequestMapping("/changeEnabled")
-    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
-        return sysUserService.changeEnabled(id, enabled);
-    }
-
-    /**
-     * @param oldPWD  原始密码
-     * @param newPWD  新密码
-     * @param cnewPWD 确认新密码
-     * @return
-     * @Title changePWD
-     * @Description: TODO(修改密码)
-     */
-    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
-    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD) {
-        SysUser sysUser = SecurityUtils.getCurrentUser();
-        String msg = "";
-
-        //解密RSA
-        try{
-            oldPWD = (RSAUtils.decryptBase64(oldPWD));
-            newPWD = (RSAUtils.decryptBase64(newPWD));
-            cnewPWD = (RSAUtils.decryptBase64(cnewPWD));
-        }catch (RuntimeException e) {
-            return  "网络延迟，解密失败，请重新添加！";
-        }
-        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
-            if (oldPWD.equals(newPWD)) {
-                msg = "新密码不能跟原始密码一样！";
-            } else {
-                if (newPWD.equals(cnewPWD)) {
-                    sysUserService.changePWD(sysUser.getId(), newPWD);
-                    msg = "修改成功！";
-                } else {
-                    msg = "新密码两次输入不一致！";
-                }
-            }
-        } else {
-            msg = "原始密码错误！";
-        }
-        return msg;
-    }
-
-    @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public Map<String, Object> register(SysUser u) {
-        return sysUserService.register(u);
-    }
-
-    // 查询用户下所有下级角色
-    @RequestMapping(value = "/all_distinct")
-    public List<SysUser> findAll_distinct() {
-        return sysUserService.findAll_distinct();
-    }
-
-    // 重置密码
-    @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
-    public Map<String, Object> resetPassword(@RequestParam Integer id) {
-        return sysUserService.resetPassword(id);
-    }
-
-}
+package com.bsth.controller.sys;
+
+import com.bsth.common.Constants;
+import com.bsth.common.ResponseCode;
+import com.bsth.controller.BaseController;
+import com.bsth.controller.sys.dto.CompanyData;
+import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.entity.EmailBean;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
+import com.bsth.service.sys.CompanyAuthorityService;
+import com.bsth.service.sys.SysUserService;
+import com.bsth.service.sys.impl.PwdGenerator;
+import com.bsth.util.IpUtils;
+import com.google.common.collect.ArrayListMultimap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.session.SessionAuthenticationException;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RestController
+@RequestMapping("user")
+public class UserController extends BaseController<SysUser, Integer> {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    SysUserService sysUserService;
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    private Pattern pattern = Pattern.compile("^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*?[#?!@$%^&*-.]).{8,16}$");
+
+    @RequestMapping(value = "/login/jCryptionKey")
+    public Map<String, Object> jCryptionKey(HttpServletRequest request) {
+        //公匙返回页面
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("publickey", RSAUtils.generateBase64PublicKey());
+        return rs;
+    }
+
+    @RequestMapping(value = "/getCurrentUser")
+    public SysUser getCurrentUser() {
+        SysUser user = SecurityUtils.getCurrentUser();
+        return user;
+    }
+
+    //需要验证码的账号
+    public static Map<String, Integer> USER_ERRTIMES = new HashMap<>();
+    public static Map<String, Long> USER_LOCKTIME = new HashMap<>();
+
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public Map<String, Object> login(HttpServletRequest request, @RequestParam String userName,
+                                     @RequestParam String password, String captcha) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+            rs.put("captcha", session.getAttribute("captcha"));
+
+            //解密RSA
+            try {
+                userName = RSAUtils.decryptBase64(userName);
+                password = RSAUtils.decryptBase64(password);
+            } catch (RuntimeException e) {
+                return put(rs, "msg", "decrypt RSA fail！可能页面已过期，尝试刷新页面。");
+            }
+
+            SysUser user = sysUserService.findByUserName(userName);
+
+            // 校验用户状态
+            if (!user.isEnabled()) {
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+            }
+
+            // 校验临时状态
+            if (USER_LOCKTIME.get(userName) != null && USER_LOCKTIME.get(userName) >= System.currentTimeMillis()) {
+                return put(rs, "msg", "您的账户因密码错误次数过多，处于锁定状态中");
+            }
+
+            // 校验验证码
+            if (USER_ERRTIMES.get(userName) != null && USER_ERRTIMES.get(userName) > 1) {
+                String verCode = (String) session.getAttribute(com.google.code.kaptcha.Constants.KAPTCHA_SESSION_KEY);
+                if (StringUtils.isBlank(captcha)) {
+                    return put(rs, "msg", "请输入验证码");
+                }
+                if (!verCode.equals(captcha)) {
+                    return put(rs, "msg", "验证码有误，请刷新后重新输入");
+                }
+            }
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (null == user || !matchStatus) {
+                rs.put("msg", "密码有误");
+
+                Integer errTimes = USER_ERRTIMES.get(userName);
+                if (null == errTimes) {
+                    errTimes = 0;
+                }
+                USER_ERRTIMES.put(userName, ++errTimes);
+                if (errTimes > 3) {
+                    USER_LOCKTIME.put(userName, System.currentTimeMillis() + 600000);
+                    USER_ERRTIMES.put(userName, 0);
+                    put(rs, "msg", "密码错误4次，账户将被锁定10分钟");
+                }
+
+                return rs;
+            }
+
+            // 弱密码检查
+            Matcher matcher = pattern.matcher(password);
+            if (!matcher.matches()) {
+                session.setAttribute(Constants.WEAK_CIPHER, 1);
+            }
+
+            // 登录
+            SecurityUtils.login(user, request);
+            sysUserService.recordLoginDate(userName);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+
+            USER_ERRTIMES.remove(userName);
+            rs.put("status", ResponseCode.SUCCESS);
+            logger.error("用户:" + user.getUserName() + "登录");
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    @RequestMapping(value = "/change_user", method = RequestMethod.POST)
+    public Map<String, Object> changeUser(HttpServletRequest request, @RequestParam String userName,
+                                          @RequestParam String password) {
+
+        Map<String, Object> rs = new HashMap<>();
+        rs.put("status", ResponseCode.ERROR);
+        try {
+            HttpSession session = request.getSession();
+
+            SysUser user = sysUserService.findByUserName(userName);
+            if (null == user)
+                return put(rs, "msg", "不存在的用户");
+
+            if (!user.isEnabled())
+                return put(rs, "msg", "该用户已被锁定，请联系管理员");
+
+            // 校验密码
+            boolean matchStatus = new BCryptPasswordEncoder(4).matches(password, user.getPassword());
+            if (!matchStatus)
+                return put(rs, "msg", "密码有误");
+
+            // 登录
+            SecurityUtils.login(user, request);
+            //session里写入用户名，webSocket连接时标识身份用
+            session.setAttribute(Constants.SESSION_USERNAME, user.getUserName());
+
+            //获取公司权限数据
+            List<CompanyAuthority> cmyAuths = companyAuthorityService.findByUser(user);
+            session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("msg", "服务器出现异常，请联系管理员");
+        }
+        return rs;
+    }
+
+    /**
+     * 返回当前用户的公司权限数据，用于构建页面级联下拉框
+     *
+     * @return
+     */
+    @RequestMapping("companyData")
+    public List<CompanyData> companyData(HttpServletRequest request) {
+        List<CompanyData> rs = new ArrayList<>();
+        CompanyData companyData;
+
+        ArrayListMultimap<String, CompanyAuthority> map = ArrayListMultimap.create();
+        List<CompanyAuthority> cmyAuths = (List<CompanyAuthority>) request.getSession().getAttribute(Constants.COMPANY_AUTHORITYS);
+
+        for (CompanyAuthority cAuth : cmyAuths) {
+            map.put(cAuth.getCompanyCode() + "_" + cAuth.getCompanyName(), cAuth);
+        }
+
+        Set<String> keys = map.keySet();
+        String[] temps;
+        for (String k : keys) {
+            temps = k.split("_");
+
+            companyData = new CompanyData();
+            companyData.setCompanyCode(temps[0]);
+            companyData.setCompanyName(temps[1]);
+            companyData.setChildren(new ArrayList<CompanyData.ChildrenCompany>());
+
+            cmyAuths = map.get(k);
+            for (CompanyAuthority c : cmyAuths) {
+                companyData.getChildren().add(new CompanyData.ChildrenCompany(c.getSubCompanyCode(), c.getSubCompanyName()));
+            }
+
+            rs.add(companyData);
+        }
+
+        return rs;
+    }
+
+    @RequestMapping(value = "/login/captchaStatus")
+    public int captchaStatus(String userName) {
+        Integer size = USER_ERRTIMES.get(userName);
+        return size == null ? 0 : size;
+    }
+
+    public Map<String, Object> put(Map<String, Object> rs, String key, Object val) {
+        rs.put(key, val);
+        return rs;
+    }
+
+    /**
+     * @Title: loginFailure @Description: TODO(查询登录失败的详细信息) @param @param
+     * request @return String 返回类型 @throws
+     */
+    @RequestMapping("/loginFailure")
+    public String loginFailure(HttpServletRequest request) {
+        String msg = "";
+        HttpSession session = request.getSession();
+
+        Object obj = session.getAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+
+        if (obj instanceof BadCredentialsException)
+            msg = "登录失败，用户名或密码错误.";
+        else if (obj instanceof SessionAuthenticationException)
+            msg = "登录失败，当前策略不允许重复登录.";
+        session.removeAttribute("SPRING_SECURITY_LAST_EXCEPTION");
+        return msg;
+    }
+
+    @RequestMapping("/currentUser")
+    public SysUser currentUser() {
+        return SecurityUtils.getCurrentUser();
+    }
+
+    /**
+     * @param id      用户ID
+     * @param enabled 状态
+     * @return
+     * @Title changeEnabled
+     * @Description: TODO(改变用户状态)
+     */
+    @RequestMapping("/changeEnabled")
+    public int changeEnabled(@RequestParam int id, @RequestParam int enabled) {
+        return sysUserService.changeEnabled(id, enabled);
+    }
+
+    /**
+     * @param oldPWD  原始密码
+     * @param newPWD  新密码
+     * @param cnewPWD 确认新密码
+     * @return
+     * @Title changePWD
+     * @Description: TODO(修改密码)
+     */
+    @RequestMapping(value = "/changePWD", method = RequestMethod.POST)
+    public String changePWD(@RequestParam String oldPWD, @RequestParam String newPWD, @RequestParam String cnewPWD, HttpServletRequest request) {
+        SysUser sysUser = SecurityUtils.getCurrentUser();
+        String msg = "";
+
+        //解密RSA
+        try{
+            oldPWD = (RSAUtils.decryptBase64(oldPWD));
+            newPWD = (RSAUtils.decryptBase64(newPWD));
+            cnewPWD = (RSAUtils.decryptBase64(cnewPWD));
+        }catch (RuntimeException e) {
+            return  "网络延迟，解密失败，请重新添加！";
+        }
+        if (new BCryptPasswordEncoder(4).matches(oldPWD, sysUser.getPassword())) {
+            if (oldPWD.equals(newPWD)) {
+                msg = "新密码不能跟原始密码一样！";
+            } else {
+                if (newPWD.equals(cnewPWD)) {
+                    sysUserService.changePWD(sysUser.getId(), newPWD);
+                    request.getSession().setAttribute(Constants.WEAK_CIPHER, 0);
+                    msg = "修改成功！";
+                } else {
+                    msg = "新密码两次输入不一致！";
+                }
+            }
+        } else {
+            msg = "原始密码错误！";
+        }
+        return msg;
+    }
+
+    @RequestMapping(value = "/register", method = RequestMethod.POST)
+    public Map<String, Object> register(SysUser u) {
+        return sysUserService.register(u);
+    }
+
+    // 查询用户下所有下级角色
+    @RequestMapping(value = "/all_distinct")
+    public List<SysUser> findAll_distinct() {
+        return sysUserService.findAll_distinct();
+    }
+
+    // 重置密码
+    @RequestMapping(value = "/resetPassword", method = RequestMethod.POST)
+    public Map<String, Object> resetPassword(@RequestParam Integer id) {
+        return sysUserService.resetPassword(id);
+    }
+
+    /**
+     * 解除临时锁定
+     * @param userName
+     * @return
+     */
+    @RequestMapping(value = "/unlock", method = RequestMethod.POST)
+    public Map<String, Object> unlock(@RequestParam String userName) {
+        Map<String, Object> result = new HashMap<>();
+        // 获取当前用户
+        SysUser user = SecurityUtils.getCurrentUser();
+        Iterator<Role> itRole = user.getRoles().iterator();
+        Role ro = new Role();
+        boolean isSuper = false;
+        while (itRole.hasNext()) {//判断是否有下一个
+            ro = itRole.next();
+            if (ro.getLevel() == 1) {
+                isSuper = true;
+            }
+        }
+        if (isSuper) {
+            USER_LOCKTIME.remove(userName);
+            USER_ERRTIMES.remove(userName);
+            result.put("status", ResponseCode.SUCCESS);
+            result.put("msg", "用户解锁成功！");
+        } else {
+            result.put("status", ResponseCode.ERROR);
+            result.put("msg", "您不是管理员无用户解锁权限");
+        }
+
+        return result;
+    }
+
+    /**
+     * 解除临时锁定
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/isWeakCipher", method = RequestMethod.POST)
+    public Map<String, Object> isWeakCipher(HttpServletRequest request) {
+        Map<String, Object> result = new HashMap<>();
+        result.put("status", ResponseCode.SUCCESS);
+        result.put("data", request.getSession().getAttribute(Constants.WEAK_CIPHER));
+
+        return result;
+    }
+
+}
 package com.bsth.entity.sys;
  
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  
 import javax.persistence.*;
@@ -25,13 +26,16 @@ public class SysUser implements Serializable {
 	private String userName;
  
 	private String name;
-	
+
+	@JsonIgnore
 	private String password;
  
 	@Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
 	private Date createDate;
+
+	@Column(name = "update_date", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
+	private Date updateDate;
  
-	@Column(name = "last_loginDate", columnDefinition = "timestamp  DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
 	private Date lastLoginDate;
  
 	private String agencies;
@@ -74,6 +78,14 @@ public class SysUser implements Serializable {
 		this.createDate = createDate;
 	}
  
+	public Date getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(Date updateDate) {
+		this.updateDate = updateDate;
+	}
+
 	public Date getLastLoginDate() {
 		return lastLoginDate;
 	}
-package com.bsth.filter;
-
-import com.bsth.common.Constants;
-import org.springframework.util.AntPathMatcher;
-import org.springframework.util.PathMatcher;
-
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-public abstract class BaseFilter implements Filter {
-
-	private final PathMatcher pathMatcher = new AntPathMatcher();
-
-	/**
-	 * 白名单
-	 */
-	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH,
-            Constants.VEHICLE_DATA_SYNC_URL };
-
-	@Override
-	public void destroy() {
-
-	}
-
-	@Override
-	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
-
-		HttpServletRequest httpRequest = (HttpServletRequest) request;
-		HttpServletResponse httpResponse = (HttpServletResponse) response;
-
-		String currentURL = httpRequest.getServletPath();
-
-		if (isWhiteURL(currentURL)) {
-			chain.doFilter(request, response);
-			return;
-		}
-
-		doFilter(httpRequest, httpResponse, chain);
-		return;
-	}
-
-	public void doFilter(HttpServletRequest request,
-			HttpServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
-		chain.doFilter(request, response);
-	}
-
-	@Override
-	public void init(FilterConfig arg0) throws ServletException {
-
-	}
-
-	private boolean isWhiteURL(String currentURL) {
-		for (String whiteURL : whiteListURLs) {
-			if (pathMatcher.match(whiteURL, currentURL)) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
+package com.bsth.filter;
+
+import com.bsth.common.Constants;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.util.PathMatcher;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public abstract class BaseFilter implements Filter {
+
+	private final PathMatcher pathMatcher = new AntPathMatcher();
+
+	/**
+	 * 白名单
+	 */
+	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE,
+			Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.XD_REAL_GPS, Constants.UP_RFID_URL,
+			Constants.STATION_AND_SECTION_COUNT, Constants.ACTUATOR_MANAGEMENT_HEALTH, Constants.VEHICLE_DATA_SYNC_URL,
+			Constants.FILE_AUTH};
+
+	@Override
+	public void destroy() {
+
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+		String currentURL = httpRequest.getServletPath();
+
+		if (isWhiteURL(currentURL)) {
+			chain.doFilter(request, response);
+			return;
+		}
+
+		doFilter(httpRequest, httpResponse, chain);
+		return;
+	}
+
+	public void doFilter(HttpServletRequest request,
+			HttpServletResponse response, FilterChain chain)
+			throws IOException, ServletException {
+		chain.doFilter(request, response);
+	}
+
+	@Override
+	public void init(FilterConfig arg0) throws ServletException {
+
+	}
+
+	private boolean isWhiteURL(String currentURL) {
+		for (String whiteURL : whiteListURLs) {
+			if (pathMatcher.match(whiteURL, currentURL)) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
-package com.bsth.repository.sys;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.repository.BaseRepository;
-import org.springframework.data.jpa.repository.EntityGraph;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-@Repository
-public interface SysUserRepository extends BaseRepository<SysUser, Integer>{
-
-	SysUser findByUserName(String userName);
-
-	@Transactional
-	@Modifying
-	@Query(value="update bsth_c_sys_user set enabled=?2 where id=?1",nativeQuery=true)
-	int changeEnabled(int id,int enabled);
-	
-	@Transactional
-	@Modifying
-	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
-	int changePWD(int id,String newPWD);
-
-	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
-	@Query(value = "select DISTINCT u from SysUser u")
-	List<SysUser> findAll_distinct();
-}
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Repository
+public interface SysUserRepository extends BaseRepository<SysUser, Integer>{
+
+	SysUser findByUserName(String userName);
+
+	@Transactional
+	@Modifying
+	@Query(value="update bsth_c_sys_user set enabled=?2 where id=?1",nativeQuery=true)
+	int changeEnabled(int id,int enabled);
+	
+	@Transactional
+	@Modifying
+	@Query(value="update bsth_c_sys_user set password=?2 where id=?1",nativeQuery=true)
+	int changePWD(int id,String newPWD);
+
+	@EntityGraph(value = "sysUser_role", type = EntityGraph.EntityGraphType.FETCH)
+	@Query(value = "select DISTINCT u from SysUser u")
+	List<SysUser> findAll_distinct();
+
+	@Modifying
+	@Query(value="update bsth_c_sys_user set last_login_date=now() where user_name=?1",nativeQuery=true)
+	void recordLoginDate(String userName);
+}
@@ -38,7 +38,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
     public void configure(WebSecurity web) throws Exception {
         // 白名单
         web.ignoring().antMatchers(Constants.LOGIN_PAGE, Constants.LOGIN, Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.CAPTCHA,
-                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT);
+                Constants.SERVICE_INTERFACE, Constants.METRONIC_URL, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES,
+                Constants.UP_RFID_URL, Constants.STATION_AND_SECTION_COUNT, Constants.FILE_AUTH);
     }
  
     @Override
@@ -33,8 +33,9 @@ public class LoginInterceptor implements Filter {
 	 * 相比于 BaseFilter，此处对线调GPS请求进行了拦截验证
 	 */
 	private String[] whiteListURLs = { Constants.LOGIN_PAGE,Constants.CAPTCHA, Constants.SERVICE_INTERFACE,
-			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN, Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,Constants.STATION_AND_SECTION_COUNT,
-            Constants.VEHICLE_DATA_SYNC_URL };
+			Constants.ASSETS_URL, Constants.FAVICON_URL, Constants.METRONIC_URL, Constants.LOGIN,
+			Constants.LOGIN_FAILURE, Constants.UPSTREAM_URL, Constants.XD_CHILD_PAGES, Constants.UP_RFID_URL,
+			Constants.STATION_AND_SECTION_COUNT, Constants.VEHICLE_DATA_SYNC_URL, Constants.FILE_AUTH };
  
  
 	@Override
-package com.bsth.service;
-
-/**
- *
- * @Interface: LineService(线路service业务层实现接口)
- *
- * @extends : BaseService
- *
- * @Description: TODO(线路service业务层实现接口)
- *
- * @Author bsth@lq
- *
- * @Date 2016年4月28日 上午9:21:17
- *
- * @Version 公交调度系统BS版 0.1
- *
- */
-public interface TrafficManageService {
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXL(String ids);
-
-	/**
-	 * 上传线路信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setXLByInUse(String ids);
-
-	/**
-	 * 上传车辆信息
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCL();
-
-	/**
-	 * 上传司机信息
-	 * @return 调用接口返回信息
-	 */
-	String setSJ();
-
-	/**
-	 * 上传超速数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setCS();
-
-	/**
-	 * 上传线路班次时刻表数据
-	 *
-	 * @return 调用接口返回信息
-	 */
-	String setSKB(String ids);
-
-	/**
-	 * 线路人员车辆配置信息
-	 * @return 调用接口返回信息
-	 */
-	String setXLPC();
-
-	/**
-	 * 线路计划班次表
-	 * @return 调用接口返回信息
-	 */
-	String setJHBC();
-
-	String setJHBC(String theDate);
-
-	String setLD(String theDate);
-
-	String setLD();
-
-	String setLDFile();
-
-	String setLCYH();
-
-	String setDDRB();
-
-	/**
-	 * 下载全量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadAllDataFile();
-
-	/**
-	 * 下载增量的公交基础数据
-	 * @return
-	 */
-	String getDownLoadIncreaseDataFile();
-
-	/**
-	 * 指定线路查询方式公交基础数据下载
-	 * @return
-	 */
-	String getDownLoadWarrantsBusLineStation();
-}
+package com.bsth.service;
+
+/**
+ *
+ * @Interface: LineService(线路service业务层实现接口)
+ *
+ * @extends : BaseService
+ *
+ * @Description: TODO(线路service业务层实现接口)
+ *
+ * @Author bsth@lq
+ *
+ * @Date 2016年4月28日 上午9:21:17
+ *
+ * @Version 公交调度系统BS版 0.1
+ *
+ */
+public interface TrafficManageService {
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXL(String ids);
+
+	/**
+	 * 上传线路信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setXLByInUse(String ids);
+
+	/**
+	 * 上传车辆信息
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCL();
+
+	/**
+	 * 上传司机信息
+	 * @return 调用接口返回信息
+	 */
+	String setSJ();
+
+	/**
+	 * 上传超速数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setCS();
+
+	/**
+	 * 上传线路班次时刻表数据
+	 *
+	 * @return 调用接口返回信息
+	 */
+	String setSKB(String ids, String qyrqs);
+
+	/**
+	 * 线路人员车辆配置信息
+	 * @return 调用接口返回信息
+	 */
+	String setXLPC();
+
+	/**
+	 * 线路计划班次表
+	 * @return 调用接口返回信息
+	 */
+	String setJHBC();
+
+	String setJHBC(String theDate);
+
+	String setLD(String theDate);
+
+	String setLD();
+
+	String setLDFile();
+
+	String setLCYH();
+
+	String setDDRB();
+
+	/**
+	 * 下载全量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadAllDataFile();
+
+	/**
+	 * 下载增量的公交基础数据
+	 * @return
+	 */
+	String getDownLoadIncreaseDataFile();
+
+	/**
+	 * 指定线路查询方式公交基础数据下载
+	 * @return
+	 */
+	String getDownLoadWarrantsBusLineStation();
+}
@@ -19,7 +19,6 @@ import com.bsth.repository.traffic.SKBUploadLoggerRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.TrafficManageService;
 import com.bsth.service.traffic.YgcBasicDataService;
-import com.bsth.util.IpUtils;
 import com.bsth.util.TimeUtils;
 import com.bsth.util.db.DBUtils_MS;
 import com.bsth.webService.trafficManage.org.tempuri.Results;
@@ -529,7 +528,7 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			try {
 				//发送邮件
 				EmailBean mail = new EmailBean();
-				mail.setSubject(IpUtils.getLocalIpAddress() +":路单日志数据"+date);
+				mail.setSubject(InetAddress.getLocalHost().getHostAddress()+":路单日志数据"+date);
 				mail.setContent("总数：" + (listGroup == null ? 0 : listGroup.size()) + "<br/>成功数：" + scount + "<br/>跳过数：" + ccount + "<br/>耗时：" + (System.currentTimeMillis() - start));
 				sendEmailController.sendMail(emailSendToAddress, mail);
 				logger.info("setLD-sendMail:邮件发送成功！");
@@ -1474,8 +1473,6 @@ public class TrafficManageServiceImpl  implements TrafficManageService{
 			company = "浦东南汇公交公司";
 		}else if(company.equals("青浦公交")){
 			company = "浦东青浦公交公司";
-		}else if(company.equals("临港公交")){
-			company = "临港公交公司";
 		}
 	}
 	/**
@@ -205,7 +205,7 @@ public class SchedulePlanServiceImpl extends BServiceImpl&lt;SchedulePlan, Long&gt; im
  
         session.fireAllRules();
  
-        session.dispose();;
+        session.dispose();
  
         return result;
     }
-package com.bsth.service.sys;
-
-import com.bsth.entity.sys.SysUser;
-import com.bsth.service.BaseService;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-public interface SysUserService extends BaseService<SysUser, Integer>{
-	
-	SysUser findByUserName(String name);
-	
-	int changeEnabled(int id,int enabled);
-	
-	int changePWD(int id,String newPWD);
-
-	Map<String,Object> register(SysUser u);
-
-	List<SysUser> findAll_distinct();
-
-	Map<String, Object> resetPassword(@RequestParam Integer id);
-}
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SysUserService extends BaseService<SysUser, Integer>{
+	
+	SysUser findByUserName(String name);
+	
+	int changeEnabled(int id,int enabled);
+	
+	int changePWD(int id,String newPWD);
+
+	Map<String,Object> register(SysUser u);
+
+	List<SysUser> findAll_distinct();
+
+	Map<String, Object> resetPassword(@RequestParam Integer id);
+
+	void recordLoginDate(String userName);
+}
+package com.bsth.service.sys.impl;
+
+import java.util.Random;
+
+public class PwdGenerator {
+    private static final String SPECIAL_CHARS = "!@#$%^&*_=+-/";
+
+    /**
+     * 查找一个char数组中还没有填充字符的位置
+     */
+    private static int nextIndex(char[] chars, Random rnd) {
+        int index = rnd.nextInt(chars.length);
+        while (chars[index] != 0) {
+            index = rnd.nextInt(chars.length);
+        }
+        return index;
+    }
+
+    /**
+     * 返回一个随机的特殊字符
+     */
+    private static char nextSpecialChar(Random rnd) {
+        return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+    }
+
+    /**
+     * 返回一个随机的大写字母
+     */
+    private static char nextUpperLetter(Random rnd) {
+        return (char) ('A' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的小写字母
+     */
+    private static char nextLowerLetter(Random rnd) {
+        return (char) ('a' + rnd.nextInt(26));
+    }
+
+    /**
+     * 返回一个随机的数字
+     */
+    private static char nextNumLetter(Random rnd) {
+        return (char) ('0' + rnd.nextInt(10));
+    }
+
+    /**
+     * 返回一个随机的字符
+     */
+    private static char nextChar(Random rnd) {
+        switch (rnd.nextInt(4)) {
+            case 0:
+                return (char) ('a' + rnd.nextInt(26));
+            case 1:
+                return (char) ('A' + rnd.nextInt(26));
+            case 2:
+                return (char) ('0' + rnd.nextInt(10));
+            default:
+                return SPECIAL_CHARS.charAt(rnd.nextInt(SPECIAL_CHARS.length()));
+        }
+    }
+
+    /**
+     * 生成指定位数的随机数
+     */
+    public static String randomPassword(int length) {
+        if(length < 3){
+            return "";
+        }
+        char[] chars = new char[length];
+        Random rnd = new Random();
+
+        //1. 至少生成一个大写字母、小写字母、特殊字符、数字
+        chars[nextIndex(chars, rnd)] = nextUpperLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextLowerLetter(rnd);
+        chars[nextIndex(chars, rnd)] = nextNumLetter(rnd);
+
+        //2. 填补其他位置的字符
+        for (int i = 0; i < length; i++) {
+            if (chars[i] == 0) {
+                chars[i] = nextChar(rnd);
+            }
+        }
+
+        //3. 返回结果
+        return new String(chars);
+    }
+
+
+    /**
+     * 测试代码
+     */
+    public static void main(String[] args) {
+        for (int i = 0; i < 10; i++) {
+            System.out.println(randomPassword(16));
+        }
+
+    }
+
+}
@@ -2,6 +2,8 @@ package com.bsth.service.sys.impl;
  
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.sys.util.RSAUtils;
+import com.bsth.email.SendEmailController;
+import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
 import com.bsth.repository.sys.SysUserRepository;
@@ -9,6 +11,8 @@ import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.RoleService;
 import com.bsth.service.sys.SysUserService;
+import com.bsth.util.IpUtils;
+import com.bsth.util.MailUtils;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.slf4j.Logger;
@@ -16,6 +20,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestParam;
  
 import java.util.ArrayList;
@@ -33,6 +38,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	@Autowired
 	RoleService roleService;
  
+	// 发送邮件
+	@Autowired
+	private MailUtils mailUtils;
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
  
 	@Override
@@ -166,12 +175,19 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 					Legality = true;
 			}
 			if(Legality){
-				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode("123456"));
+				String pwd = PwdGenerator.randomPassword(16);
+				sysUserRepository.changePWD(id,new BCryptPasswordEncoder(4).encode(pwd));
+				//发送邮件
+				EmailBean mail = new EmailBean();
+				mail.setSubject(IpUtils.getLocalIpAddress() +":密码重置");
+				mail.setContent(pwd);
+				mailUtils.sendMail(mail);
+				logger.info("setLD-sendMail:邮件发送成功！");
 				rs.put("status", ResponseCode.SUCCESS);
 				rs.put("msg", "密码重置成功！");
 			}else {
 				rs.put("status", ResponseCode.ERROR);
-				rs.put("msg", "您不是超级管理员无权限重置其他用户密码");
+				rs.put("msg", "您不是管理员无权限重置其他用户密码");
 			}
 		}catch (Exception e){
 			logger.error("", e);
@@ -180,4 +196,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 		}
 		return rs;
 	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void recordLoginDate(String userName) {
+		sysUserRepository.recordLoginDate(userName);
+	}
 }
+package com.bsth.util;
+
+import com.bsth.email.SimpleMailSender;
+import com.bsth.email.entity.EmailBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Hill
+ */
+@Component
+public class MailUtils {
+
+    @Value("${admin.mail}")
+    private String emailSendToAddress;
+
+    private Tools tools = new Tools("mailbox.properties");
+
+    private SimpleMailSender sms = new SimpleMailSender(tools.getValue("username"),tools.getValue("password"));
+
+    public String getEmailSendToAddress() {
+        return emailSendToAddress;
+    }
+
+    public void setEmailSendToAddress(String emailSendToAddress) {
+        this.emailSendToAddress = emailSendToAddress;
+    }
+
+    /**
+     * recipients
+     * 收件人集合
+     * mail
+     * 邮件
+     */
+    public int sendMail(List<String> recipients, EmailBean mail){
+        try {
+            for (String recipient : recipients) {
+                sms.send(recipient, mail.getSubject(),mail.getContent());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    /**
+     * recipient
+     * 收件人
+     * mail
+     * 邮件
+     */
+    public int sendMail(String recipient,EmailBean mail){
+        try {
+            sms.send(recipient, mail.getSubject(),mail.getContent());
+        } catch (Exception e) {
+            e.printStackTrace();
+            return -1;
+        }
+        return 1;
+    }
+
+    public int sendMail(EmailBean mail){
+        return sendMail(emailSendToAddress, mail);
+    }
+}
@@ -52,4 +52,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -54,4 +54,6 @@ ms.fl.generate=true
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
@@ -54,4 +54,6 @@ ms.fl.generate=false
 ## dsm ack interface
 dsm.ack.url= http://211.95.61.66:9008/modules/dsmCheckTheRecord/addDsm?
 ## cp ack interface
-cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
 \ No newline at end of file
+cp.ack.url= http://114.80.178.12:8778/prod-api/serverApi/instructionsIssue/confirm/
+## admin mail
+admin.mail= 3090342880@qq.com
 \ No newline at end of file
-.maplibTc {
-	font-size: 12px;
-	width: 253px;
-	padding: 8px 5px 8px 8px;
-	background: #3B3F51;
-	position: absolute;
-	color: white;
-	box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0
-		rgba(0, 0, 0, 0.19);
-	top: 63px;
-}
-
-.maplibTc a {
-	text-decoration: none;
-}
-
-.maplibTcColor {
-	background: url("../img/tools_menu.png") no-repeat scroll 128px -86px
-		transparent;
-	font-weight: bold;
-	margin-bottom: 9px;
-	height: 18px;
-}
-
-.maplibTcUpdate {
-	float: left;
-	width: 13px;
-	height: 14px;
-	background: url(../img/tools_menu.png) no-repeat -12px -19px;
-	margin-left: 5px;
-	cursor: pointer;
-	margin-top: 2px;
-}
-
-.maplibTcView {
-	float: right;
-	color: #26c281;
-	text-decoration: none;
-	line-height: 15px;
-	*line-height: 18px
-}
-
-a.maplibTcView:hover {
-	color: #C6DDD3;
-}
-
-a.maplibTcView:focus {
-	color: #26c281;
-}
-
-.maplibTcCurTime {
-	float: left;
-	color: #ddd;
-}
-
-.maplibTcTime {
-	height: 20px;
-	padding: 5px 3px 0 0;
-}
-
-.maplibTcWeekDay {
-	height: 22px;
-	color: #6688CA;
-	padding: 3px 0;
-}
-
-.maplibTcWeekDay a {
-	color: #6688CA;
-	padding: 3px 2px;
-}
-
-.maplibTcWeekDay ul {
-	float: left;
-	margin: 0;
-	padding: 0;
-}
-
-.maplibTcWeekDay span {
-	float: left;
-	line-height: 23px;
-}
-
-.maplibTcWeekDay li {
-	float: left;
-	padding: 0 6px;
-	list-style: none;
-	line-height: 23px;
-}
-
-.maplibTcRule {
-	background: url("../img/bar.png") no-repeat scroll 0 10px transparent;
-	width: 195px;
-	float: left;
-	margin-left: 20px;
-	*margin-left: 10px;
-}
-
-.maplibTcRuleTxt {
-	float: left;
-	line-height: 44px;
-}
-
-.maplibTcClear {
-	clear: both;
-}
-
-.maplibTcTimeBox {
-	color: #6688CA;
-	margin-left: 137.5px;
-	font-size: 11px;
-	overflow: hidden;
-}
-
-.maplibTcTimeline {
-	height: 34px;
-}
-
-.maplibTcTimelinePrev {
-	overflow: hidden;
-	width: 9px;
-	height: 9px;
-	cursor: pointer;
-	float: left;
-	margin-top: 3px
-}
-
-.maplibTcTimelineNext {
-	overflow: hidden;
-	width: 11px;
-	*width: 10px;
-	height: 9px;
-	cursor: pointer;
-	float: right;
-	margin-top: 3px
-}
-
-.maplibTcTimeMove {
-	width: 9px;
-	height: 18px;
-	background: url("../img/tools_menu.png") no-repeat scroll 0pt -32px
-		transparent;
-	float: left;
-	cursor: pointer;
-	margin-left: 137.5px;
-	margin-top: 0px;
-}
-
-.maplibTcHide {
-	display: none;
-}
-
-.maplibTcBtn_deskTop {
-	background: url(http://api.map.baidu.com/images/bgs.gif) no-repeat
-		scroll 0px -271px transparent;
-	cursor: pointer;
-	height: 22px;
-	width: 73px;
-	z-index: 10;
-	position: absolute;
-}
-
-.maplibTcBtn_mobile {
-	background: url(http://api.map.baidu.com/images/traffic_bgs.png)
-		rgba(255, 255, 255, 0.8) no-repeat scroll -30px 0px;
-	border: 1px solid #AFAFAF;
-	background-size: 60px 30px;
-	cursor: pointer;
-	height: 30px;
-	width: 30px;
-	z-index: 10;
-	position: absolute;
-}
-
-.maplibTcBtn_deskTop {
-	background-position: 0px -249px
-}
-
-.maplibTcBtnOff_mobile {
-	background-position: 0px 0px;
-}
-
-.maplibTcColon {
-	float: left;
-}
-
-.maplibTcOn {
-	background: #E6EFF8;
-}
-
-.maplibTcClose {
-	background: url("../img/tools_menu.png") no-repeat scroll 2px -19px
-		transparent;
-	border: 0 none;
-	cursor: pointer;
-	height: 12px;
-	position: absolute;
-	right: 7px;
-	top: 9px;
-	width: 15px;
-}
-
-/*s--------------交通流量-----------------*/
-.maplibTfctr {
-	min-width: 9em;
-	height: 2.2em;
-	display: -webkit-box;
-	-webkit-box-align: center;
-	-webkit-border-radius: 0.3em;
-	border: .1em solid #989898;
-	-webkit-box-sizing: border-box;
-	background-color: #fff;
-	font-size: 14px;
-}
-
-.maplibTfctrHide {
-	display: none;
-}
-
-.maplibTfctr_c {
-	-webkit-box-flex: 1;
-}
-
-.maplibTfctr_status {
-	width: 4em;
-	margin-right: .45em;
-}
-
-.maplibTfctr_status span {
-	display: inline-block;
-	margin-left: .3em;
-	font-size: 14px;
-}
-
-.maplibTfctr div,.maplibTfctr span {
-	-webkit-box-sizing: border-box;
-}
-
-.maplibTfctr_l {
-	margin: 0 .15em;
-}
-
-.maplibY {
-	background: #ffae00;
-}
-
-.maplibR {
-	background: #ff0000;
-}
-
-.maplibG {
-	background: #1fba00;
-}
+.maplibTc {
+	font-size: 12px;
+	width: 253px;
+	padding: 8px 5px 8px 8px;
+	background: #3B3F51;
+	position: absolute;
+	color: white;
+	box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0
+		rgba(0, 0, 0, 0.19);
+	top: 63px;
+}
+
+.maplibTc a {
+	text-decoration: none;
+}
+
+.maplibTcColor {
+	background: url("../img/tools_menu.png") no-repeat scroll 128px -86px
+		transparent;
+	font-weight: bold;
+	margin-bottom: 9px;
+	height: 18px;
+}
+
+.maplibTcUpdate {
+	float: left;
+	width: 13px;
+	height: 14px;
+	background: url(../img/tools_menu.png) no-repeat -12px -19px;
+	margin-left: 5px;
+	cursor: pointer;
+	margin-top: 2px;
+}
+
+.maplibTcView {
+	float: right;
+	color: #26c281;
+	text-decoration: none;
+	line-height: 15px;
+	*line-height: 18px
+}
+
+a.maplibTcView:hover {
+	color: #C6DDD3;
+}
+
+a.maplibTcView:focus {
+	color: #26c281;
+}
+
+.maplibTcCurTime {
+	float: left;
+	color: #ddd;
+}
+
+.maplibTcTime {
+	height: 20px;
+	padding: 5px 3px 0 0;
+}
+
+.maplibTcWeekDay {
+	height: 22px;
+	color: #6688CA;
+	padding: 3px 0;
+}
+
+.maplibTcWeekDay a {
+	color: #6688CA;
+	padding: 3px 2px;
+}
+
+.maplibTcWeekDay ul {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+
+.maplibTcWeekDay span {
+	float: left;
+	line-height: 23px;
+}
+
+.maplibTcWeekDay li {
+	float: left;
+	padding: 0 6px;
+	list-style: none;
+	line-height: 23px;
+}
+
+.maplibTcRule {
+	background: url("../img/bar.png") no-repeat scroll 0 10px transparent;
+	width: 195px;
+	float: left;
+	margin-left: 20px;
+	*margin-left: 10px;
+}
+
+.maplibTcRuleTxt {
+	float: left;
+	line-height: 44px;
+}
+
+.maplibTcClear {
+	clear: both;
+}
+
+.maplibTcTimeBox {
+	color: #6688CA;
+	margin-left: 137.5px;
+	font-size: 11px;
+	overflow: hidden;
+}
+
+.maplibTcTimeline {
+	height: 34px;
+}
+
+.maplibTcTimelinePrev {
+	overflow: hidden;
+	width: 9px;
+	height: 9px;
+	cursor: pointer;
+	float: left;
+	margin-top: 3px
+}
+
+.maplibTcTimelineNext {
+	overflow: hidden;
+	width: 11px;
+	*width: 10px;
+	height: 9px;
+	cursor: pointer;
+	float: right;
+	margin-top: 3px
+}
+
+.maplibTcTimeMove {
+	width: 9px;
+	height: 18px;
+	background: url("../img/tools_menu.png") no-repeat scroll 0pt -32px
+		transparent;
+	float: left;
+	cursor: pointer;
+	margin-left: 137.5px;
+	margin-top: 0px;
+}
+
+.maplibTcHide {
+	display: none;
+}
+
+.maplibTcBtn_deskTop {
+	background: url(//api.map.baidu.com/images/bgs.gif) no-repeat
+		scroll 0px -271px transparent;
+	cursor: pointer;
+	height: 22px;
+	width: 73px;
+	z-index: 10;
+	position: absolute;
+}
+
+.maplibTcBtn_mobile {
+	background: url(//api.map.baidu.com/images/traffic_bgs.png)
+		rgba(255, 255, 255, 0.8) no-repeat scroll -30px 0px;
+	border: 1px solid #AFAFAF;
+	background-size: 60px 30px;
+	cursor: pointer;
+	height: 30px;
+	width: 30px;
+	z-index: 10;
+	position: absolute;
+}
+
+.maplibTcBtn_deskTop {
+	background-position: 0px -249px
+}
+
+.maplibTcBtnOff_mobile {
+	background-position: 0px 0px;
+}
+
+.maplibTcColon {
+	float: left;
+}
+
+.maplibTcOn {
+	background: #E6EFF8;
+}
+
+.maplibTcClose {
+	background: url("../img/tools_menu.png") no-repeat scroll 2px -19px
+		transparent;
+	border: 0 none;
+	cursor: pointer;
+	height: 12px;
+	position: absolute;
+	right: 7px;
+	top: 9px;
+	width: 15px;
+}
+
+/*s--------------交通流量-----------------*/
+.maplibTfctr {
+	min-width: 9em;
+	height: 2.2em;
+	display: -webkit-box;
+	-webkit-box-align: center;
+	-webkit-border-radius: 0.3em;
+	border: .1em solid #989898;
+	-webkit-box-sizing: border-box;
+	background-color: #fff;
+	font-size: 14px;
+}
+
+.maplibTfctrHide {
+	display: none;
+}
+
+.maplibTfctr_c {
+	-webkit-box-flex: 1;
+}
+
+.maplibTfctr_status {
+	width: 4em;
+	margin-right: .45em;
+}
+
+.maplibTfctr_status span {
+	display: inline-block;
+	margin-left: .3em;
+	font-size: 14px;
+}
+
+.maplibTfctr div,.maplibTfctr span {
+	-webkit-box-sizing: border-box;
+}
+
+.maplibTfctr_l {
+	margin: 0 .15em;
+}
+
+.maplibY {
+	background: #ffae00;
+}
+
+.maplibR {
+	background: #ff0000;
+}
+
+.maplibG {
+	background: #1fba00;
+}
 /*e--------------交通流量-----------------*/
 \ No newline at end of file
-/**
- * @fileoverview 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。
- * 主入口类是<a href="symbols/BMapLib.TextIconOverlay.html">TextIconOverlay</a>，
- * 基于Baidu Map API 1.2。
- *
- * @author Baidu Map Api Group 
- * @version 1.2
- */
- 
-
- /** 
- * @namespace BMap的所有library类均放在BMapLib命名空间下
- */
-var BMapLib = window.BMapLib = BMapLib || {};
-
-(function () { 
-   
-    /**
-     * 声明baidu包
-     */
-    var T,
-    baidu = T = baidu || {version: "1.3.8"}; 
-    
-    (function (){
-        //提出guid，防止在与老版本Tangram混用时
-        //在下一行错误的修改window[undefined]
-        baidu.guid = "$BAIDU$";
-
-        //Tangram可能被放在闭包中
-        //一些页面级别唯一的属性，需要挂载在window[baidu.guid]上
-        window[baidu.guid] = window[baidu.guid] || {};
-
-        /**         
-        * @ignore
-        * @namespace baidu.dom 操作dom的方法。
-        */
-        baidu.dom = baidu.dom || {};
-    
-        
-        /**
-         * 从文档中获取指定的DOM元素
-         * @name baidu.dom.g
-         * @function
-         * @grammar baidu.dom.g(id)
-         * @param {string|HTMLElement} id 元素的id或DOM元素
-         * @shortcut g,T.G
-         * @meta standard
-         * @see baidu.dom.q
-         *             
-         * @returns {HTMLElement|null} 获取的元素，查找不到时返回null,如果参数不合法，直接返回参数
-         */
-        baidu.dom.g = function (id) {
-            if ('string' == typeof id || id instanceof String) {
-                return document.getElementById(id);
-            } else if (id && id.nodeName && (id.nodeType == 1 || id.nodeType == 9)) {
-                return id;
-            }
-            return null;
-        };
-
-        // 声明快捷方法
-        baidu.g = baidu.G = baidu.dom.g;
-
-        /**
-         * 获取目标元素所属的document对象
-         * @name baidu.dom.getDocument
-         * @function
-         * @grammar baidu.dom.getDocument(element)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @meta standard
-         * @see baidu.dom.getWindow
-         *             
-         * @returns {HTMLDocument} 目标元素所属的document对象
-         */
-        baidu.dom.getDocument = function (element) {
-            element = baidu.dom.g(element);
-            return element.nodeType == 9 ? element : element.ownerDocument || element.document;
-        };
-
-        /**
-           * @ignore
-         * @namespace baidu.lang 对语言层面的封装，包括类型判断、模块扩展、继承基类以及对象自定义事件的支持。
-        */
-        baidu.lang = baidu.lang || {};
-
-        /**
-         * 判断目标参数是否string类型或String对象
-         * @name baidu.lang.isString
-         * @function
-         * @grammar baidu.lang.isString(source)
-         * @param {Any} source 目标参数
-         * @shortcut isString
-         * @meta standard
-         * @see baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
-         *             
-         * @returns {boolean} 类型判断结果
-         */
-        baidu.lang.isString = function (source) {
-            return '[object String]' == Object.prototype.toString.call(source);
-        };
-
-        // 声明快捷方法
-        baidu.isString = baidu.lang.isString;
-
-        /**
-         * 从文档中获取指定的DOM元素
-         * **内部方法**
-         * 
-         * @param {string|HTMLElement} id 元素的id或DOM元素
-         * @meta standard
-         * @return {HTMLElement} DOM元素，如果不存在，返回null，如果参数不合法，直接返回参数
-         */
-        baidu.dom._g = function (id) {
-            if (baidu.lang.isString(id)) {
-                return document.getElementById(id);
-            }
-            return id;
-        };
-
-        // 声明快捷方法
-        baidu._g = baidu.dom._g;
-
-        /**
-         * @ignore
-         * @namespace baidu.browser 判断浏览器类型和特性的属性。
-         */
-        baidu.browser = baidu.browser || {};
-
-        if (/msie (\d+\.\d)/i.test(navigator.userAgent)) {
-            //IE 8下，以documentMode为准
-            //在百度模板中，可能会有$，防止冲突，将$1 写成 \x241
-            /**
-             * 判断是否为ie浏览器
-             * @property ie ie版本号
-             * @grammar baidu.browser.ie
-             * @meta standard
-             * @shortcut ie
-             * @see baidu.browser.firefox,baidu.browser.safari,baidu.browser.opera,baidu.browser.chrome,baidu.browser.maxthon 
-             */
-           baidu.browser.ie = baidu.ie = document.documentMode || + RegExp['\x241'];
-        }
-
-        /**
-         * 获取目标元素的computed style值。如果元素的样式值不能被浏览器计算，则会返回空字符串（IE）
-         *
-         * @author berg
-         * @name baidu.dom.getComputedStyle
-         * @function
-         * @grammar baidu.dom.getComputedStyle(element, key)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @param {string} key 要获取的样式名
-         *
-         * @see baidu.dom.getStyle
-         *             
-         * @returns {string} 目标元素的computed style值
-         */
-
-        baidu.dom.getComputedStyle = function(element, key){
-            element = baidu.dom._g(element);
-            var doc = baidu.dom.getDocument(element),
-                styles;
-            if (doc.defaultView && doc.defaultView.getComputedStyle) {
-                styles = doc.defaultView.getComputedStyle(element, null);
-                if (styles) {
-                    return styles[key] || styles.getPropertyValue(key);
-                }
-            }
-            return ''; 
-        };
-
-        /**
-         * 提供给setStyle与getStyle使用
-         */
-        baidu.dom._styleFixer = baidu.dom._styleFixer || {};
-
-        /**
-         * 提供给setStyle与getStyle使用
-         */
-        baidu.dom._styleFilter = baidu.dom._styleFilter || [];
-
-        /**
-         * 为获取和设置样式的过滤器
-         * @private
-         * @meta standard
-         */
-        baidu.dom._styleFilter.filter = function (key, value, method) {
-            for (var i = 0, filters = baidu.dom._styleFilter, filter; filter = filters[i]; i++) {
-                if (filter = filter[method]) {
-                    value = filter(key, value);
-                }
-            }
-            return value;
-        };
-
-        /**
-           * @ignore
-         * @namespace baidu.string 操作字符串的方法。
-         */
-        baidu.string = baidu.string || {};
-
-        /**
-         * 将目标字符串进行驼峰化处理
-         * @name baidu.string.toCamelCase
-         * @function
-         * @grammar baidu.string.toCamelCase(source)
-         * @param {string} source 目标字符串
-         * @remark
-         * 支持单词以“-_”分隔
-         * @meta standard
-         *             
-         * @returns {string} 驼峰化处理后的字符串
-         */
-        baidu.string.toCamelCase = function (source) {
-            //提前判断，提高getStyle等的效率 thanks xianwei
-            if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
-                return source;
-            }
-            return source.replace(/[-_][^-_]/g, function (match) {
-                return match.charAt(1).toUpperCase();
-            });
-        };
-
-        /**
-         * 获取目标元素的样式值
-         * @name baidu.dom.getStyle
-         * @function
-         * @grammar baidu.dom.getStyle(element, key)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @param {string} key 要获取的样式名
-         * @remark
-         * 
-         * 为了精简代码，本模块默认不对任何浏览器返回值进行归一化处理（如使用getStyle时，不同浏览器下可能返回rgb颜色或hex颜色），也不会修复浏览器的bug和差异性（如设置IE的float属性叫styleFloat，firefox则是cssFloat）。<br />
-         * baidu.dom._styleFixer和baidu.dom._styleFilter可以为本模块提供支持。<br />
-         * 其中_styleFilter能对颜色和px进行归一化处理，_styleFixer能对display，float，opacity，textOverflow的浏览器兼容性bug进行处理。	
-         * @shortcut getStyle
-         * @meta standard
-         * @see baidu.dom.setStyle,baidu.dom.setStyles, baidu.dom.getComputedStyle
-         *             
-         * @returns {string} 目标元素的样式值
-         */
-        baidu.dom.getStyle = function (element, key) {
-            var dom = baidu.dom;
-
-            element = dom.g(element);
-            key = baidu.string.toCamelCase(key);
-            //computed style, then cascaded style, then explicitly set style.
-            var value = element.style[key] ||
-                        (element.currentStyle ? element.currentStyle[key] : "") || 
-                        dom.getComputedStyle(element, key);
-
-            // 在取不到值的时候，用fixer进行修正
-            if (!value) {
-                var fixer = dom._styleFixer[key];
-                if(fixer){
-                    value = fixer.get ? fixer.get(element) : baidu.dom.getStyle(element, fixer);
-                }
-            }
-    
-            /* 检查结果过滤器 */
-            if (fixer = dom._styleFilter) {
-                value = fixer.filter(key, value, 'get');
-            }
-
-            return value;
-        };
-
-        // 声明快捷方法
-        baidu.getStyle = baidu.dom.getStyle;
-
-
-        if (/opera\/(\d+\.\d)/i.test(navigator.userAgent)) {
-        /**
-         * 判断是否为opera浏览器
-         * @property opera opera版本号
-         * @grammar baidu.browser.opera
-         * @meta standard
-         * @see baidu.browser.ie,baidu.browser.firefox,baidu.browser.safari,baidu.browser.chrome 
-         */
-            baidu.browser.opera = + RegExp['\x241'];
-        }
-
-        /**
-         * 判断是否为webkit内核
-         * @property isWebkit 
-         * @grammar baidu.browser.isWebkit
-         * @meta standard
-         * @see baidu.browser.isGecko
-         */
-        baidu.browser.isWebkit = /webkit/i.test(navigator.userAgent);
-
-        /**
-         * 判断是否为gecko内核
-         * @property isGecko 
-         * @grammar baidu.browser.isGecko
-         * @meta standard
-         * @see baidu.browser.isWebkit
-         */
-        baidu.browser.isGecko = /gecko/i.test(navigator.userAgent) && !/like gecko/i.test(navigator.userAgent);
-
-        /**
-         * 判断是否严格标准的渲染模式
-         * @property isStrict 
-         * @grammar baidu.browser.isStrict
-         * @meta standard
-         */
-        baidu.browser.isStrict = document.compatMode == "CSS1Compat";
-
-        /**
-         * 获取目标元素相对于整个文档左上角的位置
-         * @name baidu.dom.getPosition
-         * @function
-         * @grammar baidu.dom.getPosition(element)
-         * @param {HTMLElement|string} element 目标元素或目标元素的id
-         * @meta standard
-         *             
-         * @returns {Object} 目标元素的位置，键值为top和left的Object。
-         */
-        baidu.dom.getPosition = function (element) {
-            element = baidu.dom.g(element);
-            var doc = baidu.dom.getDocument(element), 
-                browser = baidu.browser,
-                getStyle = baidu.dom.getStyle,
-            // Gecko 1.9版本以下用getBoxObjectFor计算位置
-            // 但是某些情况下是有bug的
-            // 对于这些有bug的情况
-            // 使用递归查找的方式
-                BUGGY_GECKO_BOX_OBJECT = browser.isGecko > 0 && 
-                                         doc.getBoxObjectFor &&
-                                         getStyle(element, 'position') == 'absolute' &&
-                                         (element.style.top === '' || element.style.left === ''),
-                pos = {"left":0,"top":0},
-                viewport = (browser.ie && !browser.isStrict) ? doc.body : doc.documentElement,
-                parent,
-                box;
-    
-            if(element == viewport){
-                return pos;
-            }
-
-            if(element.getBoundingClientRect){ // IE and Gecko 1.9+
-        
-                //当HTML或者BODY有border width时, 原生的getBoundingClientRect返回值是不符合预期的
-                //考虑到通常情况下 HTML和BODY的border只会设成0px,所以忽略该问题.
-                box = element.getBoundingClientRect();
-
-                pos.left = Math.floor(box.left) + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft);
-                pos.top  = Math.floor(box.top)  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop);
-        
-                // IE会给HTML元素添加一个border，默认是medium（2px）
-                // 但是在IE 6 7 的怪异模式下，可以被html { border: 0; } 这条css规则覆盖
-                // 在IE7的标准模式下，border永远是2px，这个值通过clientLeft 和 clientTop取得
-                // 但是。。。在IE 6 7的怪异模式，如果用户使用css覆盖了默认的medium
-                // clientTop和clientLeft不会更新
-                pos.left -= doc.documentElement.clientLeft;
-                pos.top  -= doc.documentElement.clientTop;
-        
-                var htmlDom = doc.body,
-                    // 在这里，不使用element.style.borderLeftWidth，只有computedStyle是可信的
-                    htmlBorderLeftWidth = parseInt(getStyle(htmlDom, 'borderLeftWidth')),
-                    htmlBorderTopWidth = parseInt(getStyle(htmlDom, 'borderTopWidth'));
-                if(browser.ie && !browser.isStrict){
-                    pos.left -= isNaN(htmlBorderLeftWidth) ? 2 : htmlBorderLeftWidth;
-                    pos.top  -= isNaN(htmlBorderTopWidth) ? 2 : htmlBorderTopWidth;
-                }
-            } else { 
-                // safari/opera/firefox
-                parent = element;
-
-                do {
-                    pos.left += parent.offsetLeft;
-                    pos.top  += parent.offsetTop;
-      
-                    // safari里面，如果遍历到了一个fixed的元素，后面的offset都不准了
-                    if (browser.isWebkit > 0 && getStyle(parent, 'position') == 'fixed') {
-                        pos.left += doc.body.scrollLeft;
-                        pos.top  += doc.body.scrollTop;
-                        break;
-                    }
-            
-                    parent = parent.offsetParent;
-                } while (parent && parent != element);
-
-                // 对body offsetTop的修正
-                if(browser.opera > 0 || (browser.isWebkit > 0 && getStyle(element, 'position') == 'absolute')){
-                    pos.top  -= doc.body.offsetTop;
-                }
-
-                // 计算除了body的scroll
-                parent = element.offsetParent;
-                while (parent && parent != doc.body) {
-                    pos.left -= parent.scrollLeft;
-                    // see https://bugs.opera.com/show_bug.cgi?id=249965
-                    if (!browser.opera || parent.tagName != 'TR') {
-                        pos.top -= parent.scrollTop;
-                    }
-                    parent = parent.offsetParent;
-                }
-            }
-
-            return pos;
-        };
-
-        /**
-         * @ignore
-         * @namespace baidu.event 屏蔽浏览器差异性的事件封装。
-         * @property target 	事件的触发元素
-         * @property pageX 		鼠标事件的鼠标x坐标
-         * @property pageY 		鼠标事件的鼠标y坐标
-         * @property keyCode 	键盘事件的键值
-         */
-        baidu.event = baidu.event || {};
-
-        /**
-         * 事件监听器的存储表
-         * @private
-         * @meta standard
-         */
-        baidu.event._listeners = baidu.event._listeners || [];
-
-        /**
-         * 为目标元素添加事件监听器
-         * @name baidu.event.on
-         * @function
-         * @grammar baidu.event.on(element, type, listener)
-         * @param {HTMLElement|string|window} element 目标元素或目标元素id
-         * @param {string} type 事件类型
-         * @param {Function} listener 需要添加的监听器
-         * @remark
-         * 
-        1. 不支持跨浏览器的鼠标滚轮事件监听器添加<br>
-        2. 改方法不为监听器灌入事件对象，以防止跨iframe事件挂载的事件对象获取失败
-    
-         * @shortcut on
-         * @meta standard
-         * @see baidu.event.un
-         *             
-         * @returns {HTMLElement|window} 目标元素
-         */
-        baidu.event.on = function (element, type, listener) {
-            type = type.replace(/^on/i, '');
-            element = baidu.dom._g(element);
-
-            var realListener = function (ev) {
-                    // 1. 这里不支持EventArgument,  原因是跨frame的事件挂载
-                    // 2. element是为了修正this
-                    listener.call(element, ev);
-                },
-                lis = baidu.event._listeners,
-                filter = baidu.event._eventFilter,
-                afterFilter,
-                realType = type;
-            type = type.toLowerCase();
-            // filter过滤
-            if(filter && filter[type]){
-                afterFilter = filter[type](element, type, realListener);
-                realType = afterFilter.type;
-                realListener = afterFilter.listener;
-            }
-    
-            // 事件监听器挂载
-            if (element.addEventListener) {
-                element.addEventListener(realType, realListener, false);
-            } else if (element.attachEvent) {
-                element.attachEvent('on' + realType, realListener);
-            }
-  
-            // 将监听器存储到数组中
-            lis[lis.length] = [element, type, listener, realListener, realType];
-            return element;
-        };
-
-        // 声明快捷方法
-        baidu.on = baidu.event.on;
-
-        /**
-         * 返回一个当前页面的唯一标识字符串。
-         * @name baidu.lang.guid
-         * @function
-         * @grammar baidu.lang.guid()
-         * @version 1.1.1
-         * @meta standard
-         *             
-         * @returns {String} 当前页面的唯一标识字符串
-         */
-
-        (function(){
-            //不直接使用window，可以提高3倍左右性能
-            var guid = window[baidu.guid];
-
-            baidu.lang.guid = function() {
-                return "TANGRAM__" + (guid._counter ++).toString(36);
-            };
-
-            guid._counter = guid._counter || 1;
-        })();
-
-        /**
-         * 所有类的实例的容器
-         * key为每个实例的guid
-         * @meta standard
-         */
-
-        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
-
-        /**
-         * 判断目标参数是否为function或Function实例
-         * @name baidu.lang.isFunction
-         * @function
-         * @grammar baidu.lang.isFunction(source)
-         * @param {Any} source 目标参数
-         * @version 1.2
-         * @see baidu.lang.isString,baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
-         * @meta standard
-         * @returns {boolean} 类型判断结果
-         */
-        baidu.lang.isFunction = function (source) {
-            // chrome下,'function' == typeof /a/ 为true.
-            return '[object Function]' == Object.prototype.toString.call(source);
-        };
-
-        /**
-         *    
-         * @ignore
-         * @class  Tangram继承机制提供的一个基类，用户可以通过继承baidu.lang.Class来获取它的属性及方法。
-         * @name 	baidu.lang.Class
-         * @grammar baidu.lang.Class(guid)
-         * @param 	{string}	guid	对象的唯一标识
-         * @meta standard
-         * @remark baidu.lang.Class和它的子类的实例均包含一个全局唯一的标识guid。guid是在构造函数中生成的，因此，继承自baidu.lang.Class的类应该直接或者间接调用它的构造函数。<br>baidu.lang.Class的构造函数中产生guid的方式可以保证guid的唯一性，及每个实例都有一个全局唯一的guid。
-         * @meta standard
-         * @see baidu.lang.inherits,baidu.lang.Event
-         */
-        baidu.lang.Class = function(guid) {
-            this.guid = guid || baidu.lang.guid();
-            window[baidu.guid]._instances[this.guid] = this;
-        };
-        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
-
-        /**
-         * 释放对象所持有的资源，主要是自定义事件。
-         * @name dispose
-         * @grammar obj.dispose()
-         */
-        baidu.lang.Class.prototype.dispose = function(){
-            delete window[baidu.guid]._instances[this.guid];
-
-            for(var property in this){
-                if (!baidu.lang.isFunction(this[property])) {
-                    delete this[property];
-                }
-            }
-            this.disposed = true;
-        };
-
-        /**
-         * 重载了默认的toString方法，使得返回信息更加准确一些。
-         * @return {string} 对象的String表示形式
-         */
-        baidu.lang.Class.prototype.toString = function(){
-            return "[object " + (this._className || "Object" ) + "]";
-        };
-
-        /**
-         * @ignore
-         * @class   自定义的事件对象。
-         * @name 	baidu.lang.Event
-         * @grammar baidu.lang.Event(type[, target])
-         * @param 	{string} type	 事件类型名称。为了方便区分事件和一个普通的方法，事件类型名称必须以"on"(小写)开头。
-         * @param 	{Object} [target]触发事件的对象
-         * @meta standard
-         * @remark 引入该模块，会自动为Class引入3个事件扩展方法：addEventListener、removeEventListener和dispatchEvent。
-         * @meta standard
-         * @see baidu.lang.Class
-         */
-        baidu.lang.Event = function (type, target) {
-            this.type = type;
-            this.returnValue = true;
-            this.target = target || null;
-            this.currentTarget = null;
-        };
-
-        /**
-         * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.addEventListener(type, handlers[, key])
-         * @param 	{string}   type         自定义事件的名称
-         * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
-         * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
-         * @remark 	事件类型区分大小写。如果自定义事件名称不是以小写"on"开头，该方法会给它加上"on"再进行判断，即"click"和"onclick"会被认为是同一种事件。 
-         */
-        baidu.lang.Class.prototype.addEventListener = function (type, handler, key) {
-            if (!baidu.lang.isFunction(handler)) {
-                return;
-            }
-
-            !this.__listeners && (this.__listeners = {});
-
-            var t = this.__listeners, id;
-            if (typeof key == "string" && key) {
-                if (/[^\w\-]/.test(key)) {
-                    throw("nonstandard key:" + key);
-                } else {
-                    handler.hashCode = key; 
-                    id = key;
-                }
-            }
-            type.indexOf("on") != 0 && (type = "on" + type);
-
-            typeof t[type] != "object" && (t[type] = {});
-            id = id || baidu.lang.guid();
-            handler.hashCode = id;
-            t[type][id] = handler;
-        };
- 
-        /**
-         * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.removeEventListener(type, handlers)
-         * @param {string}   type     事件类型
-         * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
-         * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
-         */
-        baidu.lang.Class.prototype.removeEventListener = function (type, handler) {
-            if (typeof handler != "undefined") {
-                if ( (baidu.lang.isFunction(handler) && ! (handler = handler.hashCode))
-                    || (! baidu.lang.isString(handler))
-                ){
-                    return;
-                }
-            }
-
-            !this.__listeners && (this.__listeners = {});
-
-            type.indexOf("on") != 0 && (type = "on" + type);
-
-            var t = this.__listeners;
-            if (!t[type]) {
-                return;
-            }
-            if (typeof handler != "undefined") {
-                t[type][handler] && delete t[type][handler];
-            } else {
-                for(var guid in t[type]){
-                    delete t[type][guid];
-                }
-            }
-        };
-
-        /**
-         * 派发自定义事件，使得绑定到自定义事件上面的函数都会被执行。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.dispatchEvent(event, options)
-         * @param {baidu.lang.Event|String} event 	Event对象，或事件名称(1.1.1起支持)
-         * @param {Object} 					options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
-         * @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
-        myobj.onMyEvent = function(){}<br>
-        myobj.addEventListener("onMyEvent", function(){});
-         */
-        baidu.lang.Class.prototype.dispatchEvent = function (event, options) {
-            if (baidu.lang.isString(event)) {
-                event = new baidu.lang.Event(event);
-            }
-            !this.__listeners && (this.__listeners = {});
-
-            // 20100603 添加本方法的第二个参数，将 options extend到event中去传递
-            options = options || {};
-            for (var i in options) {
-                event[i] = options[i];
-            }
-
-            var i, t = this.__listeners, p = event.type;
-            event.target = event.target || this;
-            event.currentTarget = this;
-
-            p.indexOf("on") != 0 && (p = "on" + p);
-
-            baidu.lang.isFunction(this[p]) && this[p].apply(this, arguments);
-
-            if (typeof t[p] == "object") {
-                for (i in t[p]) {
-                    t[p][i].apply(this, arguments);
-                }
-            }
-            return event.returnValue;
-        };
-
-
-        baidu.lang.inherits = function (subClass, superClass, className) {
-            var key, proto,
-                selfProps = subClass.prototype,
-                clazz = new Function();
-
-            clazz.prototype = superClass.prototype;
-            proto = subClass.prototype = new clazz();
-            for (key in selfProps) {
-                proto[key] = selfProps[key];
-            }
-            subClass.prototype.constructor = subClass;
-            subClass.superClass = superClass.prototype;
-
-            // 类名标识，兼容Class的toString，基本没用
-            if ("string" == typeof className) {
-                proto._className = className;
-            }
-        };
-        // 声明快捷方法
-        baidu.inherits = baidu.lang.inherits;
-    })();
-
-
-    /**
-    
-     * 图片的路径
-
-     * @private
-     * @type {String}
-    
-     */
-    var _IMAGE_PATH = 'http://api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
-
-    /**
-    
-     * 图片的后缀名
-
-      * @private
-     * @type {String}
-    
-     */
-    var _IMAGE_EXTENSION  = 'png';
-
-    /**
-     *@exports TextIconOverlay as BMapLib.TextIconOverlay
-     */
-    var TextIconOverlay = 
-        /**
-        * TextIconOverlay
-        * @class 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。文字通常是数字（0-9）或字母（A-Z ），而文字与图标之间有一定的映射关系。
-        *该覆盖物适用于以下类似的场景：需要在地图上添加一系列覆盖物，这些覆盖物之间用不同的图标和文字来区分，文字可能表示了该覆盖物的某一属性值，根据该文字和一定的映射关系，自动匹配相应颜色和大小的图标。
-        *
-        *@constructor
-        *@param {Point} position 表示一个经纬度坐标位置。
-        *@param {String} text 表示该覆盖物显示的文字信息。
-        *@param {Json Object} options 可选参数，可选项包括：<br />
-        *"<b>styles</b>":{Array<IconStyle>} 一组图标风格。单个图表风格包括以下几个属性：<br />
-        *   url	{String}	 图片的url地址。(必选)<br />
-        *   size {Size}	图片的大小。（必选）<br />
-        *   anchor {Size} 图标定位在地图上的位置相对于图标左上角的偏移值，默认偏移值为图标的中心位置。（可选）<br />
-        *   offset {Size} 图片相对于可视区域的偏移值，此功能的作用等同于CSS中的background-position属性。（可选）<br />
-        *   textSize {Number} 文字的大小。（可选，默认10）<br />
-        *   textColor {String} 文字的颜色。（可选，默认black）<br />
-        */
-        BMapLib.TextIconOverlay = function(position, text, options){
-            this._position = position;
-            this._text = text;
-            this._options = options || {};
-            this._styles = this._options['styles'] || [];
-            (!this._styles.length) && this._setupDefaultStyles();                  
-        };
-
-    T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
-
-    TextIconOverlay.prototype._setupDefaultStyles = function(){  
-        var sizes = [53, 56, 66, 78, 90];
-        for(var i = 0, size; size = sizes[i]; i++){
-            this._styles.push({
-                url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
-                size: new BMap.Size(size, size)
-            });
-        }//for循环的简洁写法
-    };
-
-    /**
-    *继承Overlay的intialize方法，自定义覆盖物时必须。
-    *@param {Map} map BMap.Map的实例化对象。
-    *@return {HTMLElement} 返回覆盖物对应的HTML元素。
-    */
-    TextIconOverlay.prototype.initialize = function(map){
-        this._map = map;
-    
-        this._domElement = document.createElement('div');     
-        this._updateCss();    
-        this._updateText();
-        this._updatePosition(); 
-        
-        this._bind();
-
-        this._map.getPanes().markerMouseTarget.appendChild(this._domElement);
-        return this._domElement;   
-    };
-
-    /**
-    *继承Overlay的draw方法，自定义覆盖物时必须。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.draw = function(){
-        this._map && this._updatePosition();
-    };
-    
-    /**
-    *获取该覆盖物上的文字。
-    *@return {String} 该覆盖物上的文字。
-    */
-    TextIconOverlay.prototype.getText = function(){
-        return this._text;
-    };
-
-    /**
-    *设置该覆盖物上的文字。
-    *@param {String} text 要设置的文字，通常是字母A-Z或数字0-9。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.setText = function(text){
-        if(text && (!this._text || (this._text.toString() != text.toString()))){
-            this._text = text;
-            this._updateText();
-            this._updateCss();
-            this._updatePosition(); 
-        }
-    };
-
-    /**
-    *获取该覆盖物的位置。
-    *@return {Point} 该覆盖物的经纬度坐标。
-    */
-    TextIconOverlay.prototype.getPosition = function () {
-        return this._position;
-    };
-   
-    /**
-    *设置该覆盖物的位置。
-    *@param {Point}  position 要设置的经纬度坐标。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype.setPosition = function (position) {
-        if(position && (!this._position || !this._position.equals(position))){
-            this._position = position;  
-            this._updatePosition();
-        }
-    };
-
-    /**
-    *由文字信息获取风格数组的对应索引值。
-    *内部默认的对应函数为文字转换为数字除以10的结果，比如文字8返回索引0，文字25返回索引2.
-    *如果需要自定义映射关系，请覆盖该函数。
-    *@param {String} text  文字。
-    *@param {Array<IconStyle>}  styles 一组图标风格。
-    *@return {Number} 对应的索引值。
-    */
-    TextIconOverlay.prototype.getStyleByText = function(text, styles){
-        var count = parseInt(text);
-        var index = parseInt(count / 10);
-        index = Math.max(0, index);
-        index = Math.min(index, styles.length - 1);
-        return styles[index]; 
-    }
-
-    /**
-    *更新相应的CSS。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updateCss = function(){
-        var style = this.getStyleByText(this._text, this._styles);
-        this._domElement.style.cssText = this._buildCssText(style);
-    };
-
-    /**
-    *更新覆盖物的显示文字。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updateText = function(){
-        if (this._domElement) {
-            this._domElement.innerHTML = this._text;
-        }
-    };
-
-    /**
-    *调整覆盖物在地图上的位置更新覆盖物的显示文字。
-    *@return 无返回值。
-    */
-    TextIconOverlay.prototype._updatePosition = function(){
-        if (this._domElement && this._position) {
-            var style = this._domElement.style;
-            var pixelPosition= this._map.pointToOverlayPixel(this._position); 
-            pixelPosition.x -= Math.ceil(parseInt(style.width) / 2);
-            pixelPosition.y -= Math.ceil(parseInt(style.height) / 2);       
-            style.left = pixelPosition.x + "px";
-            style.top = pixelPosition.y + "px";
-        }
-    };
-    
-    /**
-    * 为该覆盖物的HTML元素构建CSS
-    * @param {IconStyle}  一个图标的风格。
-    * @return {String} 构建完成的CSSTEXT。
-    */
-    TextIconOverlay.prototype._buildCssText = function(style) {    
-        //根据style来确定一些默认值
-        var url = style['url'];
-        var size = style['size'];
-        var anchor = style['anchor'];
-        var offset = style['offset'];
-        var textColor = style['textColor'] || 'black';
-        var textSize = style['textSize'] || 10;
-
-        var csstext = [];
-        if (T.browser["ie"] < 7) {
-            csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
-                'sizingMethod=scale,src="' + url + '");');
-        } else {
-            csstext.push('background-image:url(' + url + ');');
-            var backgroundPosition = '0 0';
-            (offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');          
-            csstext.push('background-position:' + backgroundPosition + ';');
-        }
-
-        if (size instanceof BMap.Size){
-            if (anchor instanceof BMap.Size) {
-                if (anchor.height > 0 && anchor.height < size.height) {
-                      csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
-                }
-                if(anchor.width > 0 && anchor.width < size.width){
-                    csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');                
-                }
-            } else {
-                csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
-                csstext.push('width:' + size.width + 'px; text-align:center;');
-            }
-        }
-   
-        csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
-            textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
-        return csstext.join('');
-    };
-
-
-    /**
-    
-     * 当鼠标点击该覆盖物时会触发该事件
-
-     * @name TextIconOverlay#click
-
-     * @event
-
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-    
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     *
-
-     */
-
-    /**
-
-     * 当鼠标进入该覆盖物区域时会触发该事件
-
-     * @name TextIconOverlay#mouseover
-
-     * @event
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-    
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
-
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
-
-     *
-
-     * @example <b>参考示例：</b><br />
-
-     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
-
-     */
-
-    /**
-
-     * 当鼠标离开该覆盖物区域时会触发该事件
-
-     * @name TextIconOverlay#mouseout
-
-     * @event
-
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
-
-     * <br />"<b>type</b> : {String} 事件类型
-
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
-
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
-
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
-
-     *
-
-     * @example <b>参考示例：</b><br />
-
-     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
-
-     */
-
-
-    /**
-    * 为该覆盖物绑定一系列事件
-    * 当前支持click mouseover mouseout
-    * @return 无返回值。
-    */
-    TextIconOverlay.prototype._bind = function(){
-        if (!this._domElement){
-            return;
-        }
-
-        var me = this;
-        var map = this._map;
-
-        var BaseEvent = T.lang.Event;
-        function eventExtend(e, be){
-            var elem = e.srcElement || e.target;
-            var x = e.clientX || e.pageX;
-            var y = e.clientY || e.pageY;
-            if (e && be && x && y && elem){
-                var offset = T.dom.getPosition(map.getContainer());
-                be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
-                be.point = map.pixelToPoint(be.pixel);
-            }
-            return be;
-        }//给事件参数增加pixel和point两个值
-
-        T.event.on(this._domElement,"mouseover", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseover")));
-        });
-        T.event.on(this._domElement,"mouseout", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseout")));
-        });
-        T.event.on(this._domElement,"click", function(e){
-            me.dispatchEvent(eventExtend(e, new BaseEvent("onclick")));
-        });
-    };
-
+/**
+ * @fileoverview 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。
+ * 主入口类是<a href="symbols/BMapLib.TextIconOverlay.html">TextIconOverlay</a>，
+ * 基于Baidu Map API 1.2。
+ *
+ * @author Baidu Map Api Group 
+ * @version 1.2
+ */
+ 
+
+ /** 
+ * @namespace BMap的所有library类均放在BMapLib命名空间下
+ */
+var BMapLib = window.BMapLib = BMapLib || {};
+
+(function () { 
+   
+    /**
+     * 声明baidu包
+     */
+    var T,
+    baidu = T = baidu || {version: "1.3.8"}; 
+    
+    (function (){
+        //提出guid，防止在与老版本Tangram混用时
+        //在下一行错误的修改window[undefined]
+        baidu.guid = "$BAIDU$";
+
+        //Tangram可能被放在闭包中
+        //一些页面级别唯一的属性，需要挂载在window[baidu.guid]上
+        window[baidu.guid] = window[baidu.guid] || {};
+
+        /**         
+        * @ignore
+        * @namespace baidu.dom 操作dom的方法。
+        */
+        baidu.dom = baidu.dom || {};
+    
+        
+        /**
+         * 从文档中获取指定的DOM元素
+         * @name baidu.dom.g
+         * @function
+         * @grammar baidu.dom.g(id)
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @shortcut g,T.G
+         * @meta standard
+         * @see baidu.dom.q
+         *             
+         * @returns {HTMLElement|null} 获取的元素，查找不到时返回null,如果参数不合法，直接返回参数
+         */
+        baidu.dom.g = function (id) {
+            if ('string' == typeof id || id instanceof String) {
+                return document.getElementById(id);
+            } else if (id && id.nodeName && (id.nodeType == 1 || id.nodeType == 9)) {
+                return id;
+            }
+            return null;
+        };
+
+        // 声明快捷方法
+        baidu.g = baidu.G = baidu.dom.g;
+
+        /**
+         * 获取目标元素所属的document对象
+         * @name baidu.dom.getDocument
+         * @function
+         * @grammar baidu.dom.getDocument(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         * @see baidu.dom.getWindow
+         *             
+         * @returns {HTMLDocument} 目标元素所属的document对象
+         */
+        baidu.dom.getDocument = function (element) {
+            element = baidu.dom.g(element);
+            return element.nodeType == 9 ? element : element.ownerDocument || element.document;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.lang 对语言层面的封装，包括类型判断、模块扩展、继承基类以及对象自定义事件的支持。
+        */
+        baidu.lang = baidu.lang || {};
+
+        /**
+         * 判断目标参数是否string类型或String对象
+         * @name baidu.lang.isString
+         * @function
+         * @grammar baidu.lang.isString(source)
+         * @param {Any} source 目标参数
+         * @shortcut isString
+         * @meta standard
+         * @see baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         *             
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isString = function (source) {
+            return '[object String]' == Object.prototype.toString.call(source);
+        };
+
+        // 声明快捷方法
+        baidu.isString = baidu.lang.isString;
+
+        /**
+         * 从文档中获取指定的DOM元素
+         * **内部方法**
+         * 
+         * @param {string|HTMLElement} id 元素的id或DOM元素
+         * @meta standard
+         * @return {HTMLElement} DOM元素，如果不存在，返回null，如果参数不合法，直接返回参数
+         */
+        baidu.dom._g = function (id) {
+            if (baidu.lang.isString(id)) {
+                return document.getElementById(id);
+            }
+            return id;
+        };
+
+        // 声明快捷方法
+        baidu._g = baidu.dom._g;
+
+        /**
+         * @ignore
+         * @namespace baidu.browser 判断浏览器类型和特性的属性。
+         */
+        baidu.browser = baidu.browser || {};
+
+        if (/msie (\d+\.\d)/i.test(navigator.userAgent)) {
+            //IE 8下，以documentMode为准
+            //在百度模板中，可能会有$，防止冲突，将$1 写成 \x241
+            /**
+             * 判断是否为ie浏览器
+             * @property ie ie版本号
+             * @grammar baidu.browser.ie
+             * @meta standard
+             * @shortcut ie
+             * @see baidu.browser.firefox,baidu.browser.safari,baidu.browser.opera,baidu.browser.chrome,baidu.browser.maxthon 
+             */
+           baidu.browser.ie = baidu.ie = document.documentMode || + RegExp['\x241'];
+        }
+
+        /**
+         * 获取目标元素的computed style值。如果元素的样式值不能被浏览器计算，则会返回空字符串（IE）
+         *
+         * @author berg
+         * @name baidu.dom.getComputedStyle
+         * @function
+         * @grammar baidu.dom.getComputedStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         *
+         * @see baidu.dom.getStyle
+         *             
+         * @returns {string} 目标元素的computed style值
+         */
+
+        baidu.dom.getComputedStyle = function(element, key){
+            element = baidu.dom._g(element);
+            var doc = baidu.dom.getDocument(element),
+                styles;
+            if (doc.defaultView && doc.defaultView.getComputedStyle) {
+                styles = doc.defaultView.getComputedStyle(element, null);
+                if (styles) {
+                    return styles[key] || styles.getPropertyValue(key);
+                }
+            }
+            return ''; 
+        };
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFixer = baidu.dom._styleFixer || {};
+
+        /**
+         * 提供给setStyle与getStyle使用
+         */
+        baidu.dom._styleFilter = baidu.dom._styleFilter || [];
+
+        /**
+         * 为获取和设置样式的过滤器
+         * @private
+         * @meta standard
+         */
+        baidu.dom._styleFilter.filter = function (key, value, method) {
+            for (var i = 0, filters = baidu.dom._styleFilter, filter; filter = filters[i]; i++) {
+                if (filter = filter[method]) {
+                    value = filter(key, value);
+                }
+            }
+            return value;
+        };
+
+        /**
+           * @ignore
+         * @namespace baidu.string 操作字符串的方法。
+         */
+        baidu.string = baidu.string || {};
+
+        /**
+         * 将目标字符串进行驼峰化处理
+         * @name baidu.string.toCamelCase
+         * @function
+         * @grammar baidu.string.toCamelCase(source)
+         * @param {string} source 目标字符串
+         * @remark
+         * 支持单词以“-_”分隔
+         * @meta standard
+         *             
+         * @returns {string} 驼峰化处理后的字符串
+         */
+        baidu.string.toCamelCase = function (source) {
+            //提前判断，提高getStyle等的效率 thanks xianwei
+            if (source.indexOf('-') < 0 && source.indexOf('_') < 0) {
+                return source;
+            }
+            return source.replace(/[-_][^-_]/g, function (match) {
+                return match.charAt(1).toUpperCase();
+            });
+        };
+
+        /**
+         * 获取目标元素的样式值
+         * @name baidu.dom.getStyle
+         * @function
+         * @grammar baidu.dom.getStyle(element, key)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @param {string} key 要获取的样式名
+         * @remark
+         * 
+         * 为了精简代码，本模块默认不对任何浏览器返回值进行归一化处理（如使用getStyle时，不同浏览器下可能返回rgb颜色或hex颜色），也不会修复浏览器的bug和差异性（如设置IE的float属性叫styleFloat，firefox则是cssFloat）。<br />
+         * baidu.dom._styleFixer和baidu.dom._styleFilter可以为本模块提供支持。<br />
+         * 其中_styleFilter能对颜色和px进行归一化处理，_styleFixer能对display，float，opacity，textOverflow的浏览器兼容性bug进行处理。	
+         * @shortcut getStyle
+         * @meta standard
+         * @see baidu.dom.setStyle,baidu.dom.setStyles, baidu.dom.getComputedStyle
+         *             
+         * @returns {string} 目标元素的样式值
+         */
+        baidu.dom.getStyle = function (element, key) {
+            var dom = baidu.dom;
+
+            element = dom.g(element);
+            key = baidu.string.toCamelCase(key);
+            //computed style, then cascaded style, then explicitly set style.
+            var value = element.style[key] ||
+                        (element.currentStyle ? element.currentStyle[key] : "") || 
+                        dom.getComputedStyle(element, key);
+
+            // 在取不到值的时候，用fixer进行修正
+            if (!value) {
+                var fixer = dom._styleFixer[key];
+                if(fixer){
+                    value = fixer.get ? fixer.get(element) : baidu.dom.getStyle(element, fixer);
+                }
+            }
+    
+            /* 检查结果过滤器 */
+            if (fixer = dom._styleFilter) {
+                value = fixer.filter(key, value, 'get');
+            }
+
+            return value;
+        };
+
+        // 声明快捷方法
+        baidu.getStyle = baidu.dom.getStyle;
+
+
+        if (/opera\/(\d+\.\d)/i.test(navigator.userAgent)) {
+        /**
+         * 判断是否为opera浏览器
+         * @property opera opera版本号
+         * @grammar baidu.browser.opera
+         * @meta standard
+         * @see baidu.browser.ie,baidu.browser.firefox,baidu.browser.safari,baidu.browser.chrome 
+         */
+            baidu.browser.opera = + RegExp['\x241'];
+        }
+
+        /**
+         * 判断是否为webkit内核
+         * @property isWebkit 
+         * @grammar baidu.browser.isWebkit
+         * @meta standard
+         * @see baidu.browser.isGecko
+         */
+        baidu.browser.isWebkit = /webkit/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否为gecko内核
+         * @property isGecko 
+         * @grammar baidu.browser.isGecko
+         * @meta standard
+         * @see baidu.browser.isWebkit
+         */
+        baidu.browser.isGecko = /gecko/i.test(navigator.userAgent) && !/like gecko/i.test(navigator.userAgent);
+
+        /**
+         * 判断是否严格标准的渲染模式
+         * @property isStrict 
+         * @grammar baidu.browser.isStrict
+         * @meta standard
+         */
+        baidu.browser.isStrict = document.compatMode == "CSS1Compat";
+
+        /**
+         * 获取目标元素相对于整个文档左上角的位置
+         * @name baidu.dom.getPosition
+         * @function
+         * @grammar baidu.dom.getPosition(element)
+         * @param {HTMLElement|string} element 目标元素或目标元素的id
+         * @meta standard
+         *             
+         * @returns {Object} 目标元素的位置，键值为top和left的Object。
+         */
+        baidu.dom.getPosition = function (element) {
+            element = baidu.dom.g(element);
+            var doc = baidu.dom.getDocument(element), 
+                browser = baidu.browser,
+                getStyle = baidu.dom.getStyle,
+            // Gecko 1.9版本以下用getBoxObjectFor计算位置
+            // 但是某些情况下是有bug的
+            // 对于这些有bug的情况
+            // 使用递归查找的方式
+                BUGGY_GECKO_BOX_OBJECT = browser.isGecko > 0 && 
+                                         doc.getBoxObjectFor &&
+                                         getStyle(element, 'position') == 'absolute' &&
+                                         (element.style.top === '' || element.style.left === ''),
+                pos = {"left":0,"top":0},
+                viewport = (browser.ie && !browser.isStrict) ? doc.body : doc.documentElement,
+                parent,
+                box;
+    
+            if(element == viewport){
+                return pos;
+            }
+
+            if(element.getBoundingClientRect){ // IE and Gecko 1.9+
+        
+                //当HTML或者BODY有border width时, 原生的getBoundingClientRect返回值是不符合预期的
+                //考虑到通常情况下 HTML和BODY的border只会设成0px,所以忽略该问题.
+                box = element.getBoundingClientRect();
+
+                pos.left = Math.floor(box.left) + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft);
+                pos.top  = Math.floor(box.top)  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop);
+        
+                // IE会给HTML元素添加一个border，默认是medium（2px）
+                // 但是在IE 6 7 的怪异模式下，可以被html { border: 0; } 这条css规则覆盖
+                // 在IE7的标准模式下，border永远是2px，这个值通过clientLeft 和 clientTop取得
+                // 但是。。。在IE 6 7的怪异模式，如果用户使用css覆盖了默认的medium
+                // clientTop和clientLeft不会更新
+                pos.left -= doc.documentElement.clientLeft;
+                pos.top  -= doc.documentElement.clientTop;
+        
+                var htmlDom = doc.body,
+                    // 在这里，不使用element.style.borderLeftWidth，只有computedStyle是可信的
+                    htmlBorderLeftWidth = parseInt(getStyle(htmlDom, 'borderLeftWidth')),
+                    htmlBorderTopWidth = parseInt(getStyle(htmlDom, 'borderTopWidth'));
+                if(browser.ie && !browser.isStrict){
+                    pos.left -= isNaN(htmlBorderLeftWidth) ? 2 : htmlBorderLeftWidth;
+                    pos.top  -= isNaN(htmlBorderTopWidth) ? 2 : htmlBorderTopWidth;
+                }
+            } else { 
+                // safari/opera/firefox
+                parent = element;
+
+                do {
+                    pos.left += parent.offsetLeft;
+                    pos.top  += parent.offsetTop;
+      
+                    // safari里面，如果遍历到了一个fixed的元素，后面的offset都不准了
+                    if (browser.isWebkit > 0 && getStyle(parent, 'position') == 'fixed') {
+                        pos.left += doc.body.scrollLeft;
+                        pos.top  += doc.body.scrollTop;
+                        break;
+                    }
+            
+                    parent = parent.offsetParent;
+                } while (parent && parent != element);
+
+                // 对body offsetTop的修正
+                if(browser.opera > 0 || (browser.isWebkit > 0 && getStyle(element, 'position') == 'absolute')){
+                    pos.top  -= doc.body.offsetTop;
+                }
+
+                // 计算除了body的scroll
+                parent = element.offsetParent;
+                while (parent && parent != doc.body) {
+                    pos.left -= parent.scrollLeft;
+                    // see https://bugs.opera.com/show_bug.cgi?id=249965
+                    if (!browser.opera || parent.tagName != 'TR') {
+                        pos.top -= parent.scrollTop;
+                    }
+                    parent = parent.offsetParent;
+                }
+            }
+
+            return pos;
+        };
+
+        /**
+         * @ignore
+         * @namespace baidu.event 屏蔽浏览器差异性的事件封装。
+         * @property target 	事件的触发元素
+         * @property pageX 		鼠标事件的鼠标x坐标
+         * @property pageY 		鼠标事件的鼠标y坐标
+         * @property keyCode 	键盘事件的键值
+         */
+        baidu.event = baidu.event || {};
+
+        /**
+         * 事件监听器的存储表
+         * @private
+         * @meta standard
+         */
+        baidu.event._listeners = baidu.event._listeners || [];
+
+        /**
+         * 为目标元素添加事件监听器
+         * @name baidu.event.on
+         * @function
+         * @grammar baidu.event.on(element, type, listener)
+         * @param {HTMLElement|string|window} element 目标元素或目标元素id
+         * @param {string} type 事件类型
+         * @param {Function} listener 需要添加的监听器
+         * @remark
+         * 
+        1. 不支持跨浏览器的鼠标滚轮事件监听器添加<br>
+        2. 改方法不为监听器灌入事件对象，以防止跨iframe事件挂载的事件对象获取失败
+    
+         * @shortcut on
+         * @meta standard
+         * @see baidu.event.un
+         *             
+         * @returns {HTMLElement|window} 目标元素
+         */
+        baidu.event.on = function (element, type, listener) {
+            type = type.replace(/^on/i, '');
+            element = baidu.dom._g(element);
+
+            var realListener = function (ev) {
+                    // 1. 这里不支持EventArgument,  原因是跨frame的事件挂载
+                    // 2. element是为了修正this
+                    listener.call(element, ev);
+                },
+                lis = baidu.event._listeners,
+                filter = baidu.event._eventFilter,
+                afterFilter,
+                realType = type;
+            type = type.toLowerCase();
+            // filter过滤
+            if(filter && filter[type]){
+                afterFilter = filter[type](element, type, realListener);
+                realType = afterFilter.type;
+                realListener = afterFilter.listener;
+            }
+    
+            // 事件监听器挂载
+            if (element.addEventListener) {
+                element.addEventListener(realType, realListener, false);
+            } else if (element.attachEvent) {
+                element.attachEvent('on' + realType, realListener);
+            }
+  
+            // 将监听器存储到数组中
+            lis[lis.length] = [element, type, listener, realListener, realType];
+            return element;
+        };
+
+        // 声明快捷方法
+        baidu.on = baidu.event.on;
+
+        /**
+         * 返回一个当前页面的唯一标识字符串。
+         * @name baidu.lang.guid
+         * @function
+         * @grammar baidu.lang.guid()
+         * @version 1.1.1
+         * @meta standard
+         *             
+         * @returns {String} 当前页面的唯一标识字符串
+         */
+
+        (function(){
+            //不直接使用window，可以提高3倍左右性能
+            var guid = window[baidu.guid];
+
+            baidu.lang.guid = function() {
+                return "TANGRAM__" + (guid._counter ++).toString(36);
+            };
+
+            guid._counter = guid._counter || 1;
+        })();
+
+        /**
+         * 所有类的实例的容器
+         * key为每个实例的guid
+         * @meta standard
+         */
+
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 判断目标参数是否为function或Function实例
+         * @name baidu.lang.isFunction
+         * @function
+         * @grammar baidu.lang.isFunction(source)
+         * @param {Any} source 目标参数
+         * @version 1.2
+         * @see baidu.lang.isString,baidu.lang.isObject,baidu.lang.isNumber,baidu.lang.isArray,baidu.lang.isElement,baidu.lang.isBoolean,baidu.lang.isDate
+         * @meta standard
+         * @returns {boolean} 类型判断结果
+         */
+        baidu.lang.isFunction = function (source) {
+            // chrome下,'function' == typeof /a/ 为true.
+            return '[object Function]' == Object.prototype.toString.call(source);
+        };
+
+        /**
+         *    
+         * @ignore
+         * @class  Tangram继承机制提供的一个基类，用户可以通过继承baidu.lang.Class来获取它的属性及方法。
+         * @name 	baidu.lang.Class
+         * @grammar baidu.lang.Class(guid)
+         * @param 	{string}	guid	对象的唯一标识
+         * @meta standard
+         * @remark baidu.lang.Class和它的子类的实例均包含一个全局唯一的标识guid。guid是在构造函数中生成的，因此，继承自baidu.lang.Class的类应该直接或者间接调用它的构造函数。<br>baidu.lang.Class的构造函数中产生guid的方式可以保证guid的唯一性，及每个实例都有一个全局唯一的guid。
+         * @meta standard
+         * @see baidu.lang.inherits,baidu.lang.Event
+         */
+        baidu.lang.Class = function(guid) {
+            this.guid = guid || baidu.lang.guid();
+            window[baidu.guid]._instances[this.guid] = this;
+        };
+        window[baidu.guid]._instances = window[baidu.guid]._instances || {};
+
+        /**
+         * 释放对象所持有的资源，主要是自定义事件。
+         * @name dispose
+         * @grammar obj.dispose()
+         */
+        baidu.lang.Class.prototype.dispose = function(){
+            delete window[baidu.guid]._instances[this.guid];
+
+            for(var property in this){
+                if (!baidu.lang.isFunction(this[property])) {
+                    delete this[property];
+                }
+            }
+            this.disposed = true;
+        };
+
+        /**
+         * 重载了默认的toString方法，使得返回信息更加准确一些。
+         * @return {string} 对象的String表示形式
+         */
+        baidu.lang.Class.prototype.toString = function(){
+            return "[object " + (this._className || "Object" ) + "]";
+        };
+
+        /**
+         * @ignore
+         * @class   自定义的事件对象。
+         * @name 	baidu.lang.Event
+         * @grammar baidu.lang.Event(type[, target])
+         * @param 	{string} type	 事件类型名称。为了方便区分事件和一个普通的方法，事件类型名称必须以"on"(小写)开头。
+         * @param 	{Object} [target]触发事件的对象
+         * @meta standard
+         * @remark 引入该模块，会自动为Class引入3个事件扩展方法：addEventListener、removeEventListener和dispatchEvent。
+         * @meta standard
+         * @see baidu.lang.Class
+         */
+        baidu.lang.Event = function (type, target) {
+            this.type = type;
+            this.returnValue = true;
+            this.target = target || null;
+            this.currentTarget = null;
+        };
+
+        /**
+         * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.addEventListener(type, handlers[, key])
+         * @param 	{string}   type         自定义事件的名称
+         * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
+         * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
+         * @remark 	事件类型区分大小写。如果自定义事件名称不是以小写"on"开头，该方法会给它加上"on"再进行判断，即"click"和"onclick"会被认为是同一种事件。 
+         */
+        baidu.lang.Class.prototype.addEventListener = function (type, handler, key) {
+            if (!baidu.lang.isFunction(handler)) {
+                return;
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            var t = this.__listeners, id;
+            if (typeof key == "string" && key) {
+                if (/[^\w\-]/.test(key)) {
+                    throw("nonstandard key:" + key);
+                } else {
+                    handler.hashCode = key; 
+                    id = key;
+                }
+            }
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            typeof t[type] != "object" && (t[type] = {});
+            id = id || baidu.lang.guid();
+            handler.hashCode = id;
+            t[type][id] = handler;
+        };
+ 
+        /**
+         * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.removeEventListener(type, handlers)
+         * @param {string}   type     事件类型
+         * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
+         * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
+         */
+        baidu.lang.Class.prototype.removeEventListener = function (type, handler) {
+            if (typeof handler != "undefined") {
+                if ( (baidu.lang.isFunction(handler) && ! (handler = handler.hashCode))
+                    || (! baidu.lang.isString(handler))
+                ){
+                    return;
+                }
+            }
+
+            !this.__listeners && (this.__listeners = {});
+
+            type.indexOf("on") != 0 && (type = "on" + type);
+
+            var t = this.__listeners;
+            if (!t[type]) {
+                return;
+            }
+            if (typeof handler != "undefined") {
+                t[type][handler] && delete t[type][handler];
+            } else {
+                for(var guid in t[type]){
+                    delete t[type][guid];
+                }
+            }
+        };
+
+        /**
+         * 派发自定义事件，使得绑定到自定义事件上面的函数都会被执行。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
+         * @grammar obj.dispatchEvent(event, options)
+         * @param {baidu.lang.Event|String} event 	Event对象，或事件名称(1.1.1起支持)
+         * @param {Object} 					options 扩展参数,所含属性键值会扩展到Event对象上(1.2起支持)
+         * @remark 处理会调用通过addEventListenr绑定的自定义事件回调函数之外，还会调用直接绑定到对象上面的自定义事件。例如：<br>
+        myobj.onMyEvent = function(){}<br>
+        myobj.addEventListener("onMyEvent", function(){});
+         */
+        baidu.lang.Class.prototype.dispatchEvent = function (event, options) {
+            if (baidu.lang.isString(event)) {
+                event = new baidu.lang.Event(event);
+            }
+            !this.__listeners && (this.__listeners = {});
+
+            // 20100603 添加本方法的第二个参数，将 options extend到event中去传递
+            options = options || {};
+            for (var i in options) {
+                event[i] = options[i];
+            }
+
+            var i, t = this.__listeners, p = event.type;
+            event.target = event.target || this;
+            event.currentTarget = this;
+
+            p.indexOf("on") != 0 && (p = "on" + p);
+
+            baidu.lang.isFunction(this[p]) && this[p].apply(this, arguments);
+
+            if (typeof t[p] == "object") {
+                for (i in t[p]) {
+                    t[p][i].apply(this, arguments);
+                }
+            }
+            return event.returnValue;
+        };
+
+
+        baidu.lang.inherits = function (subClass, superClass, className) {
+            var key, proto,
+                selfProps = subClass.prototype,
+                clazz = new Function();
+
+            clazz.prototype = superClass.prototype;
+            proto = subClass.prototype = new clazz();
+            for (key in selfProps) {
+                proto[key] = selfProps[key];
+            }
+            subClass.prototype.constructor = subClass;
+            subClass.superClass = superClass.prototype;
+
+            // 类名标识，兼容Class的toString，基本没用
+            if ("string" == typeof className) {
+                proto._className = className;
+            }
+        };
+        // 声明快捷方法
+        baidu.inherits = baidu.lang.inherits;
+    })();
+
+
+    /**
+    
+     * 图片的路径
+
+     * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_PATH = '//api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
+
+    /**
+    
+     * 图片的后缀名
+
+      * @private
+     * @type {String}
+    
+     */
+    var _IMAGE_EXTENSION  = 'png';
+
+    /**
+     *@exports TextIconOverlay as BMapLib.TextIconOverlay
+     */
+    var TextIconOverlay = 
+        /**
+        * TextIconOverlay
+        * @class 此类表示地图上的一个覆盖物，该覆盖物由文字和图标组成，从Overlay继承。文字通常是数字（0-9）或字母（A-Z ），而文字与图标之间有一定的映射关系。
+        *该覆盖物适用于以下类似的场景：需要在地图上添加一系列覆盖物，这些覆盖物之间用不同的图标和文字来区分，文字可能表示了该覆盖物的某一属性值，根据该文字和一定的映射关系，自动匹配相应颜色和大小的图标。
+        *
+        *@constructor
+        *@param {Point} position 表示一个经纬度坐标位置。
+        *@param {String} text 表示该覆盖物显示的文字信息。
+        *@param {Json Object} options 可选参数，可选项包括：<br />
+        *"<b>styles</b>":{Array<IconStyle>} 一组图标风格。单个图表风格包括以下几个属性：<br />
+        *   url	{String}	 图片的url地址。(必选)<br />
+        *   size {Size}	图片的大小。（必选）<br />
+        *   anchor {Size} 图标定位在地图上的位置相对于图标左上角的偏移值，默认偏移值为图标的中心位置。（可选）<br />
+        *   offset {Size} 图片相对于可视区域的偏移值，此功能的作用等同于CSS中的background-position属性。（可选）<br />
+        *   textSize {Number} 文字的大小。（可选，默认10）<br />
+        *   textColor {String} 文字的颜色。（可选，默认black）<br />
+        */
+        BMapLib.TextIconOverlay = function(position, text, options){
+            this._position = position;
+            this._text = text;
+            this._options = options || {};
+            this._styles = this._options['styles'] || [];
+            (!this._styles.length) && this._setupDefaultStyles();                  
+        };
+
+    T.lang.inherits(TextIconOverlay, BMap.Overlay, "TextIconOverlay");
+
+    TextIconOverlay.prototype._setupDefaultStyles = function(){  
+        var sizes = [53, 56, 66, 78, 90];
+        for(var i = 0, size; size = sizes[i]; i++){
+            this._styles.push({
+                url:_IMAGE_PATH + i + '.' + _IMAGE_EXTENSION,
+                size: new BMap.Size(size, size)
+            });
+        }//for循环的简洁写法
+    };
+
+    /**
+    *继承Overlay的intialize方法，自定义覆盖物时必须。
+    *@param {Map} map BMap.Map的实例化对象。
+    *@return {HTMLElement} 返回覆盖物对应的HTML元素。
+    */
+    TextIconOverlay.prototype.initialize = function(map){
+        this._map = map;
+    
+        this._domElement = document.createElement('div');     
+        this._updateCss();    
+        this._updateText();
+        this._updatePosition(); 
+        
+        this._bind();
+
+        this._map.getPanes().markerMouseTarget.appendChild(this._domElement);
+        return this._domElement;   
+    };
+
+    /**
+    *继承Overlay的draw方法，自定义覆盖物时必须。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.draw = function(){
+        this._map && this._updatePosition();
+    };
+    
+    /**
+    *获取该覆盖物上的文字。
+    *@return {String} 该覆盖物上的文字。
+    */
+    TextIconOverlay.prototype.getText = function(){
+        return this._text;
+    };
+
+    /**
+    *设置该覆盖物上的文字。
+    *@param {String} text 要设置的文字，通常是字母A-Z或数字0-9。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setText = function(text){
+        if(text && (!this._text || (this._text.toString() != text.toString()))){
+            this._text = text;
+            this._updateText();
+            this._updateCss();
+            this._updatePosition(); 
+        }
+    };
+
+    /**
+    *获取该覆盖物的位置。
+    *@return {Point} 该覆盖物的经纬度坐标。
+    */
+    TextIconOverlay.prototype.getPosition = function () {
+        return this._position;
+    };
+   
+    /**
+    *设置该覆盖物的位置。
+    *@param {Point}  position 要设置的经纬度坐标。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype.setPosition = function (position) {
+        if(position && (!this._position || !this._position.equals(position))){
+            this._position = position;  
+            this._updatePosition();
+        }
+    };
+
+    /**
+    *由文字信息获取风格数组的对应索引值。
+    *内部默认的对应函数为文字转换为数字除以10的结果，比如文字8返回索引0，文字25返回索引2.
+    *如果需要自定义映射关系，请覆盖该函数。
+    *@param {String} text  文字。
+    *@param {Array<IconStyle>}  styles 一组图标风格。
+    *@return {Number} 对应的索引值。
+    */
+    TextIconOverlay.prototype.getStyleByText = function(text, styles){
+        var count = parseInt(text);
+        var index = parseInt(count / 10);
+        index = Math.max(0, index);
+        index = Math.min(index, styles.length - 1);
+        return styles[index]; 
+    }
+
+    /**
+    *更新相应的CSS。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateCss = function(){
+        var style = this.getStyleByText(this._text, this._styles);
+        this._domElement.style.cssText = this._buildCssText(style);
+    };
+
+    /**
+    *更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updateText = function(){
+        if (this._domElement) {
+            this._domElement.innerHTML = this._text;
+        }
+    };
+
+    /**
+    *调整覆盖物在地图上的位置更新覆盖物的显示文字。
+    *@return 无返回值。
+    */
+    TextIconOverlay.prototype._updatePosition = function(){
+        if (this._domElement && this._position) {
+            var style = this._domElement.style;
+            var pixelPosition= this._map.pointToOverlayPixel(this._position); 
+            pixelPosition.x -= Math.ceil(parseInt(style.width) / 2);
+            pixelPosition.y -= Math.ceil(parseInt(style.height) / 2);       
+            style.left = pixelPosition.x + "px";
+            style.top = pixelPosition.y + "px";
+        }
+    };
+    
+    /**
+    * 为该覆盖物的HTML元素构建CSS
+    * @param {IconStyle}  一个图标的风格。
+    * @return {String} 构建完成的CSSTEXT。
+    */
+    TextIconOverlay.prototype._buildCssText = function(style) {    
+        //根据style来确定一些默认值
+        var url = style['url'];
+        var size = style['size'];
+        var anchor = style['anchor'];
+        var offset = style['offset'];
+        var textColor = style['textColor'] || 'black';
+        var textSize = style['textSize'] || 10;
+
+        var csstext = [];
+        if (T.browser["ie"] < 7) {
+            csstext.push('filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(' +
+                'sizingMethod=scale,src="' + url + '");');
+        } else {
+            csstext.push('background-image:url(' + url + ');');
+            var backgroundPosition = '0 0';
+            (offset instanceof BMap.Size) && (backgroundPosition = offset.width + 'px' + ' ' + offset.height + 'px');          
+            csstext.push('background-position:' + backgroundPosition + ';');
+        }
+
+        if (size instanceof BMap.Size){
+            if (anchor instanceof BMap.Size) {
+                if (anchor.height > 0 && anchor.height < size.height) {
+                      csstext.push('height:' + (size.height - anchor.height) + 'px; padding-top:' + anchor.height + 'px;');
+                }
+                if(anchor.width > 0 && anchor.width < size.width){
+                    csstext.push('width:' + (size.width - anchor.width) + 'px; padding-left:' + anchor.width + 'px;');                
+                }
+            } else {
+                csstext.push('height:' + size.height + 'px; line-height:' + size.height + 'px;');
+                csstext.push('width:' + size.width + 'px; text-align:center;');
+            }
+        }
+   
+        csstext.push('cursor:pointer; color:' + textColor + '; position:absolute; font-size:' +
+            textSize + 'px; font-family:Arial,sans-serif; font-weight:bold');
+        return csstext.join('');
+    };
+
+
+    /**
+    
+     * 当鼠标点击该覆盖物时会触发该事件
+
+     * @name TextIconOverlay#click
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     *
+
+     */
+
+    /**
+
+     * 当鼠标进入该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseover
+
+     * @event
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+    
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
+
+     */
+
+    /**
+
+     * 当鼠标离开该覆盖物区域时会触发该事件
+
+     * @name TextIconOverlay#mouseout
+
+     * @event
+
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+
+     * <br />"<b>type</b> : {String} 事件类型
+
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+
+     *
+
+     * @example <b>参考示例：</b><br />
+
+     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
+
+     */
+
+
+    /**
+    * 为该覆盖物绑定一系列事件
+    * 当前支持click mouseover mouseout
+    * @return 无返回值。
+    */
+    TextIconOverlay.prototype._bind = function(){
+        if (!this._domElement){
+            return;
+        }
+
+        var me = this;
+        var map = this._map;
+
+        var BaseEvent = T.lang.Event;
+        function eventExtend(e, be){
+            var elem = e.srcElement || e.target;
+            var x = e.clientX || e.pageX;
+            var y = e.clientY || e.pageY;
+            if (e && be && x && y && elem){
+                var offset = T.dom.getPosition(map.getContainer());
+                be.pixel = new BMap.Pixel(x - offset.left, y - offset.top);
+                be.point = map.pixelToPoint(be.pixel);
+            }
+            return be;
+        }//给事件参数增加pixel和point两个值
+
+        T.event.on(this._domElement,"mouseover", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseover")));
+        });
+        T.event.on(this._domElement,"mouseout", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onmouseout")));
+        });
+        T.event.on(this._domElement,"click", function(e){
+            me.dispatchEvent(eventExtend(e, new BaseEvent("onclick")));
+        });
+    };
+
 })();
 \ No newline at end of file
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="UTF-8">
-<title>GPS点测试</title>
-<meta name=”renderer” content=”webkit”>
-<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″>
-
-<meta http-equiv="Pragma" content="no-cache">
-<meta http-equiv="Cache-control" content="no-cache">
-<meta http-equiv="Cache" content="no-cache">
-<head>
-<!-- select2 下拉框插件 -->
-<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
-	rel="stylesheet" type="text/css" />
-<style type="text/css">
-html,body {
-	height: 100%;
-	overflow: hidden;
-}
-
-#mapContainer {
-	width: 100%;
-	height: calc(100% -   93px);
-}
-
-form {
-	padding: 25px;
-}
-
-form .item {
-	display: inline-block;
-}
-
-form .item input {
-	height: 26px;
-	width: 110px;
-}
-
-form .item select {
-	height: 32px;
-}
-</style>
-</head>
-<body>
-	<form action="">
-		<div class="item">
-			线路： <select name="xl" style="width: 150px;">
-			</select>
-		</div>
-		<div class="item">
-			方向： <select name="directions" style="width: 70px;">
-				<option value="0">上行</option>
-				<option value="1">下行</option>
-			</select>
-		</div>
-		<div class="item">
-			设备号： <input name="device" value="059L0903" />
-		</div>
-		<div class="item">
-			开始时间戳： <input type="number" name="startTime" value="1461380940000" />
-		</div>
-		<div class="item">
-			结束时间戳： <input type="number" name="endTime" value="1461381960000" />
-		</div>
-		<div class="item">
-			<input type="button" value="查询GPS轨迹" onclick="searchGps()">
-		</div>
-		<div class="item">
-			<input type="button" value="开启测距" onclick="myDis.open();"
-				style="width: 75px" /> <input type="button" value="关闭测距"
-				onclick="myDis.close()" style="width: 75px" />
-
-		</div>
-
-		<div class="item">
-			<a target="_blank" href="http://tool.chinaz.com/Tools/unixtime.aspx"
-				style="font-size: 12px; color: red;">毫秒时间戳转换</a>
-		</div>
-	</form>
-
-	<div id="mapContainer"></div>
-	<script src="/assets/plugins/pinyin.js"></script>
-	<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-	<script src="/assets/plugins/jquery.serializejson.js"></script>
-	<script
-		src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-	<script type="text/javascript"
-		src="http://api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
-	<!-- moment.js 日期处理类库 -->
-	<script src="/assets/plugins/moment-with-locales.js"></script>
-	<!-- select2 下拉框 -->
-	<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
-	<script>
-
-	var inMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAA1CAYAAABSrotqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAGW0lEQVRYw62XX2wc1RWHv3vv7NhrQkKCIa0poaKRmjdUFUGr+IH+ITy0Kg/0qVRV1ZamVV95al94oPSBVmoRUZTIKRFBLW1aapBK6gIChYTgFJRQHoITqCCO7eC1vY7t2Z1/954+zK69Xs9mx4mPdLWjmTvnO79z7zl3VlHAvv3XmXuM8R4EBpVSu1DqpiQRBJlH5APn5KQ4NzzycP/pbr7U1R5+6y+Vr2njP6EVX1FKoRTZAOJUQMBlP4gIIrwtNvnlyMO3vL4u4AND49vMjZsOaqMfUgpMA+ZEiBJIrJAkQslT+B4YrXACzknj1x4N6rWfnfrJ7XNdgd888NEOs+XmEaPVLq0zRVEiRGnmsGlJsnKtFfT4ih5PIQJWwDr3QRJUHzix9wsXOwLvOzDW72269ZQxeqcxIAL1WLAtoDzgMlgr+vwsG6kTrOXDoDL91Xcf/eLM8pxWuJT7j4hSO5UC66AW5cM6mXNCEDmsA60UAjv9rf1HWoU1L9Tg0OT3dU/5Wd9TeFpRiwWRFZhNhSvTMbX5hDh0uNhR6jWUb/LYvL0H460kSyko+xrrhCgVJAp/MPrzgecAMVkuH/PuuHv335VSW3s8TZgIrgUWzKdMXagRLqU4KygF4gRnhSiwLFZivF6N32tWAhTwPUWSCmhz18RC3z4+fsNpgN3f+/H9oO4ESO3qNNaupFQ+qWeRa5U7AGY/rlO7kq5Kb+qkUUrqzru/+8M9zTXUeKUHs92miG3LmlhhbjJCGVVoVCdCnG3ZyamgVRaQLvV+B9AeoJUu3QtgdLZWy6mspgigzdpyFS+/ZwTVhBv7/WyOgDbZBtTa3NMEKqX0Dsg6RqvFoUN3cOyczr2f1F3+FtbmDkB5gEKzFQFr215OBe3lO9Yu33GSrg47XUnxtiYQRKUgpdadCaAbnSMfmK+8Pf3L74ssATSAtorSt7a/vKnPUA87pMhTa9cAKJfzMwKysAwU56aUWQvcssUQJ/lA6aBw8xaPJHe+m4asLERcOpb3cvkGg1/SeEatGSZn+CVFeZPJDQRnxwDJgDY5nzcniIXbBkq5zo3Jyqg5PAMDAz5BlL/oLo0uLAOT4MqZvEnWCbEoPjfgU/LUKoDRK/BSSXHbgE8kqmOzt+HiGUA8QBY+Ov127823u0YAq1VGDno0n9/hs7BoWQocSSKIQKmk6OvTbN5sqAZCLeqw3uBmz791ChBFdmL4g4dnziptdnXYYhit2FxWlH2N72WHcmqhFjkW61c/xsTZc6OP3PIlIPayAHA2Dt/wem/oCLROqAZCNchU5B3AnczF9dcBR0sKxQZzI4U9rNOS+vwrDWHLJ76bOH7gTZBwo2GCBDOv/OF4Q+EyUCb+sW/JJeGxDQfG4b8vjRwK2hUKYNPF6gsbDUyC6lHAtgMB3NTfnv5ns+dtkL6F2eF9/6KRznagXDyxvyZx9PJG4WxUf+niif01Wtr8KiBgo8VPj24UMA5mXqAlne1AAPfhc79+DZHZ66aJq0wM/eJVWtKZB5Tqu0frNlr80/Xy0jB4fmbsZNQVCNj6+LlDoFxh7+2mkHjy3OFGOtse5U2H3sE/Xn5ZeT33dfJ5tdYmNjk5+tPt9wMhbd8Fed8DAqTJwuyhaxWYLM4MASk5HyGdPkDshT8/+hLiLq8XJuIu/+/Ir4bz0nk1oMyNHgttuPTseoGuvnh4/uzwqtorBATszNnXDqyvoUu48N6rB2mrvSJAAHd+/48mbVgr3AhsGDw/NvTIFG2lUBQoQFr/5L2nipSIgAvH//s0HTZL01QXPwro3X3o8rAu9expfdBeFpJGx0b3fvYhckqhqMJllVFl/PfdFNanx5/qpq6IwmZQvYPPTB9XpvTlPIWSxqOjez/z9YY6181ZN3NAEs5d+k2nCfHc5JNA0g1WVGGLyspbynh3tSp0aXLm9N7tg0XUFVXYVJlG81NPrlE3P/k7srUr1OyLAgHS/zzxjRex9v3mDbHp+2d/u+fFBrBwqoqaUKnEYfXS480b4dzk41QqMV125vWYBvoGn5l+596Dn74D9K0z6MY/4M7WvqkESOPK+GNRlsRm3eXNK+SwVYkPlBpBacA05uvGfVgpBSFr2K4RRALE5GykTif+toZT1WFu87pVSft1Asy1q70WhYrVwOa4ZoXred7JOq7h/wF6az0ukZgX/AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yNVQyMTo1MDo0MyswODowMOgS43cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTMtMTEtMjBUMjI6NDc6MTErMDg6MDAou1syAAAATnRFWHRzb2Z0d2FyZQBJbWFnZU1hZ2ljayA2LjguOC0xMCBRMTYgeDg2XzY0IDIwMTUtMDctMTkgaHR0cDovL3d3dy5pbWFnZW1hZ2ljay5vcmcFDJw1AAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAA1Mwmpb+QAAAAWdEVYdFRodW1iOjpJbWFnZTo6V2lkdGgAMjgpleAmAAAAGXRFWHRUaHVtYjo6TWltZXR5cGUAaW1hZ2UvcG5nP7JWTgAAABd0RVh0VGh1bWI6Ok1UaW1lADEzODQ5NTg4MzEXUMEwAAAAE3RFWHRUaHVtYjo6U2l6ZQA0LjUzS0JC/AyPiAAAAFp0RVh0VGh1bWI6OlVSSQBmaWxlOi8vL2hvbWUvd3d3cm9vdC93d3cuZWFzeWljb24ubmV0L2Nkbi1pbWcuZWFzeWljb24uY24vc3JjLzExMjk3LzExMjk3NzIucG5nqXNeUQAAAABJRU5ErkJggg==';
-	var outMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAvCAMAAAC18jgTAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABO1BMVEUAAAAiu4ggv40gvowgvowgvosgvowfvo0jv44hv40gvosgvowcxo4fvowgvowdvYogv4whvo0gvowhvYwrqoAhv4wnxIkgv4wA//8gvIshvosgvowhvIshvowgvowrv5Ugv4ohvosgvowhv4wgv4whvYwXuYsgvowgvowiu4gfvo0zzJkhvowktpIgvowgv40hvo0gv4wgvowAqqogvosgvowjv4sgvowivIskv4khvowgvYsiu44hvosfvI0hv4sgvYofvowgvowgv40gv4wjuYsgvowhvowfvIsgvYsgvo0hvoxAv4Agv4wgvowgvoshvo0mv4whvowgvowfwo8gv4wgv40duokAAAAfvYsgvYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAYjGUYj2kAAAAAAAAAAAAgvoz///9v2GMAAAAAZ3RSTlMAD1eZyOr4miSc950Jivoj0i/pfAarDaoBWH3JLuv5DDDL0ZunbQvu/h6CBbQO5jhOkNwDtfAsz0Qc42EtdUGLYKKOwsYW7/s5f7nMBCj9N40U8/YZh48aAaOmAggNERMWF0lLGBkanzLKGQAAAAFiS0dEaMts9CIAAAGZSURBVDjLfZRnW8IwFIUvyN6FUlCx4AZxKw7cA/eeKKNUwfz/f2ChZNAmnC+U+54m9548KQCRwznicns8bpfX6QC7fP4AIgoEfRYcCkfQgCLhEMujMWRTLEq55EYcuSXyPpcbjv4aoRgSKGb2EUZChXvzRcSGSHfaIP0fT0iyLCXitOI38qP5JBWzKSVFE3OAk/I0HiudJMVR8JL1FRqMQgb3ggs/Jthox3B1HIg3wxoyuDoBKn6UWYOMqyp4uIYsNfC3yNEtJoc3OQXT3DFJmDNMUCkaFI1yFubmqcMedb4AsMAeVqaYzbGHtWj4l5bFx51f6a64mhca/OaeayK+3m9qY5PPS1tk7G0eV3doMLtlToN7bLT7JZvhYPByHqoWfmS93ceD/CRtNcApy89kG4fiOeXlCucLAoULzC+vgCvSxjUIdGPy2zuR4b53jx8eQagn5gi5en5B6PVtiAHeEfoYxqHiUT9FrNrT17f5a8O1eqOptXT951fXW1qzUa9ZXtfanU7nry/jsa1VuSsYtjZ3BdIDFin/A1AVNdoKDyAYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTI1VDIxOjUwOjQzKzA4OjAw6BLjdwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMy0xMS0yMFQyMjo0NzoxMyswODowML8kShsAAABOdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOC44LTEwIFExNiB4ODZfNjQgMjAxNS0wNy0xOSBodHRwOi8vd3d3LmltYWdlbWFnaWNrLm9yZwUMnDUAAAAYdEVYdFRodW1iOjpEb2N1bWVudDo6UGFnZXMAMaf/uy8AAAAXdEVYdFRodW1iOjpJbWFnZTo6SGVpZ2h0ADQ3F9+avAAAABZ0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAAzMtBbOHkAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9wbmc/slZOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTM4NDk1ODgzM/leoBwAAAATdEVYdFRodW1iOjpTaXplADQuMDFLQkKe5chzAAAAWnRFWHRUaHVtYjo6VVJJAGZpbGU6Ly8vaG9tZS93d3dyb290L3d3dy5lYXN5aWNvbi5uZXQvY2RuLWltZy5lYXN5aWNvbi5jbi9zcmMvMTEyOTcvMTEyOTc4Ni5wbmetpUpEAAAAAElFTkSuQmCC';
-
-	var inOuts = [outMark, inMark];
-	
-	var stationCodeMap = {};
-	
-	var map = new BMap.Map("mapContainer");
-	map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
-	map.enableScrollWheelZoom();
-	//中心点和缩放级别
-	map.setCurrentCity("上海");  
-	var myDis = new BMapLib.DistanceTool(map);
-
-	
-	$.get('/line/all', function(rs){
-		var data = [];
-		$.each(rs, function(){
-			data.push({id: this.id, text: this.name});
-		});
-		
-		initPinYinSelect2('select[name=xl]', data);
-	});
-	
-	function searchGps(){
-		var params = $('form').serializeJSON();
-		//查询线路路由站点
-		$.get('/test/gps/route', params, function(rs){
-			var array = rs[0].children[0].children
-				,coords,circle, cdsArray, points, polygon;
-			//画出站点
-			console.log(array);
-			$.each(array, function(){
-				stationCodeMap[this.stationStationCod] = this.name;
-				if(this.stationShapesType === 'r'){
-					//画圆
-					coords = this.stationBJwpoints.split(' ');
-					circle = new BMap.Circle(new BMap.Point(coords[0], coords[1]),this.stationRadius);
-					circle.setStrokeColor('red');
-					circle.setStrokeWeight(2)
-					map.addOverlay(circle);
-				}
-				else if(this.stationShapesType === 'd'){
-					//画多边形
-					coords = this.stationBPolygonGrid.substring(9, this.stationBPolygonGrid.length - 2);
-					cdsArray = coords.split(',');
-					points = [];
-					$.each(cdsArray, function(){
-						coords = this.split(' ');
-						points.push(new BMap.Point(coords[0], coords[1]));
-					});
-					
-					polygon = new BMap.Polygon(points, {strokeColor:"red", strokeWeight:2, strokeOpacity:0.5});
-					map.addOverlay(polygon);
-				}
-			});
-			coords = array[array.length / 2].stationBJwpoints.split(' ');
-			map.setCenter(new BMap.Point(coords[0], coords[1]))
-		});
-		
-		//查询gps点
-		$.get('/gps/history/' + params.device, params, function(gpsArray){
-			console.log(stationCodeMap);
-			var marker, label, point, state, text;
-			$.each(gpsArray, function(){
-				point = new BMap.Point(this.lon, this.lat);
-				marker = new BMap.Marker(point);
-				state = this.inout_stop;
-				
-				if(state == 0 || state == 1){
-					text = state == 0?'出':'进';
-					
-					console.log(stationCodeMap[this.stopNo], this);
-					marker.setIcon(new BMap.Icon(inOuts[this.inout_stop], new BMap.Size(25,25)));
-					label = new BMap.Label(
-							stationCodeMap[this.stopNo] + '/' +moment(this.ts).format('HH:mm.ss') + ' -'+text
-							, {position: point, offset: new BMap.Size(-25,-18)});
-					marker.setLabel(label);
-				}
-				else{
-					label = new BMap.Label(moment(this.ts).format('HH:mm.ss')
-							, {position: point, offset: new BMap.Size(-25,-18)});
-					marker.setLabel(label);
-				}
-				
-				map.addOverlay(marker);
-			});
-		});
-	}
-	
-	
-	/**
-	 * 支持拼音搜索的select2
-	 * @param selector
-	 * @param data
-	 */
-	function initPinYinSelect2(selector, data, cb){
-		
-		$.each(data, function(){
-			this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
-			this.camelChars = pinyin.getCamelChars(this.text);
-		});
-		
-		$.fn.select2.amd.require(['select2/compat/matcher'], function (oldMatcher) {
-			$(selector).select2({
-				data: data,
-			    matcher: oldMatcher(function(term, text, item){
-			    	var upTerm = term.toUpperCase();
-					if(item.fullChars.indexOf(upTerm) != -1
-							|| item.camelChars.indexOf(upTerm) != -1)
-						return true;
-					
-					return text.indexOf(term) != -1;
-			    })
-			});
-			
-			cb && cb();
-		});
-		
-		return $(selector);
-	}
-</script>
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>GPS点测试</title>
+<meta name=”renderer” content=”webkit”>
+<meta http-equiv=”X-UA-Compatible” content=”IE=Edge,chrome=1″>
+
+<meta http-equiv="Pragma" content="no-cache">
+<meta http-equiv="Cache-control" content="no-cache">
+<meta http-equiv="Cache" content="no-cache">
+<head>
+<!-- select2 下拉框插件 -->
+<link href="/metronic_v4.5.4/plugins/select2/css/select2.min.css"
+	rel="stylesheet" type="text/css" />
+<style type="text/css">
+html,body {
+	height: 100%;
+	overflow: hidden;
+}
+
+#mapContainer {
+	width: 100%;
+	height: calc(100% -   93px);
+}
+
+form {
+	padding: 25px;
+}
+
+form .item {
+	display: inline-block;
+}
+
+form .item input {
+	height: 26px;
+	width: 110px;
+}
+
+form .item select {
+	height: 32px;
+}
+</style>
+</head>
+<body>
+	<form action="">
+		<div class="item">
+			线路： <select name="xl" style="width: 150px;">
+			</select>
+		</div>
+		<div class="item">
+			方向： <select name="directions" style="width: 70px;">
+				<option value="0">上行</option>
+				<option value="1">下行</option>
+			</select>
+		</div>
+		<div class="item">
+			设备号： <input name="device" value="059L0903" />
+		</div>
+		<div class="item">
+			开始时间戳： <input type="number" name="startTime" value="1461380940000" />
+		</div>
+		<div class="item">
+			结束时间戳： <input type="number" name="endTime" value="1461381960000" />
+		</div>
+		<div class="item">
+			<input type="button" value="查询GPS轨迹" onclick="searchGps()">
+		</div>
+		<div class="item">
+			<input type="button" value="开启测距" onclick="myDis.open();"
+				style="width: 75px" /> <input type="button" value="关闭测距"
+				onclick="myDis.close()" style="width: 75px" />
+
+		</div>
+
+		<div class="item">
+			<a target="_blank" href="http://tool.chinaz.com/Tools/unixtime.aspx"
+				style="font-size: 12px; color: red;">毫秒时间戳转换</a>
+		</div>
+	</form>
+
+	<div id="mapContainer"></div>
+	<script src="/assets/plugins/pinyin.js"></script>
+	<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+	<script src="/assets/plugins/jquery.serializejson.js"></script>
+	<script
+		src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+	<script type="text/javascript"
+		src="//api.map.baidu.com/library/DistanceTool/1.2/src/DistanceTool_min.js"></script>
+	<!-- moment.js 日期处理类库 -->
+	<script src="/assets/plugins/moment-with-locales.js"></script>
+	<!-- select2 下拉框 -->
+	<script src="/metronic_v4.5.4/plugins/select2/js/select2.full.min.js"></script>
+	<script>
+
+	var inMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAA1CAYAAABSrotqAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QA/wD/AP+gvaeTAAAGW0lEQVRYw62XX2wc1RWHv3vv7NhrQkKCIa0poaKRmjdUFUGr+IH+ITy0Kg/0qVRV1ZamVV95al94oPSBVmoRUZTIKRFBLW1aapBK6gIChYTgFJRQHoITqCCO7eC1vY7t2Z1/954+zK69Xs9mx4mPdLWjmTvnO79z7zl3VlHAvv3XmXuM8R4EBpVSu1DqpiQRBJlH5APn5KQ4NzzycP/pbr7U1R5+6y+Vr2njP6EVX1FKoRTZAOJUQMBlP4gIIrwtNvnlyMO3vL4u4AND49vMjZsOaqMfUgpMA+ZEiBJIrJAkQslT+B4YrXACzknj1x4N6rWfnfrJ7XNdgd888NEOs+XmEaPVLq0zRVEiRGnmsGlJsnKtFfT4ih5PIQJWwDr3QRJUHzix9wsXOwLvOzDW72269ZQxeqcxIAL1WLAtoDzgMlgr+vwsG6kTrOXDoDL91Xcf/eLM8pxWuJT7j4hSO5UC66AW5cM6mXNCEDmsA60UAjv9rf1HWoU1L9Tg0OT3dU/5Wd9TeFpRiwWRFZhNhSvTMbX5hDh0uNhR6jWUb/LYvL0H460kSyko+xrrhCgVJAp/MPrzgecAMVkuH/PuuHv335VSW3s8TZgIrgUWzKdMXagRLqU4KygF4gRnhSiwLFZivF6N32tWAhTwPUWSCmhz18RC3z4+fsNpgN3f+/H9oO4ESO3qNNaupFQ+qWeRa5U7AGY/rlO7kq5Kb+qkUUrqzru/+8M9zTXUeKUHs92miG3LmlhhbjJCGVVoVCdCnG3ZyamgVRaQLvV+B9AeoJUu3QtgdLZWy6mspgigzdpyFS+/ZwTVhBv7/WyOgDbZBtTa3NMEKqX0Dsg6RqvFoUN3cOyczr2f1F3+FtbmDkB5gEKzFQFr215OBe3lO9Yu33GSrg47XUnxtiYQRKUgpdadCaAbnSMfmK+8Pf3L74ssATSAtorSt7a/vKnPUA87pMhTa9cAKJfzMwKysAwU56aUWQvcssUQJ/lA6aBw8xaPJHe+m4asLERcOpb3cvkGg1/SeEatGSZn+CVFeZPJDQRnxwDJgDY5nzcniIXbBkq5zo3Jyqg5PAMDAz5BlL/oLo0uLAOT4MqZvEnWCbEoPjfgU/LUKoDRK/BSSXHbgE8kqmOzt+HiGUA8QBY+Ov127823u0YAq1VGDno0n9/hs7BoWQocSSKIQKmk6OvTbN5sqAZCLeqw3uBmz791ChBFdmL4g4dnziptdnXYYhit2FxWlH2N72WHcmqhFjkW61c/xsTZc6OP3PIlIPayAHA2Dt/wem/oCLROqAZCNchU5B3AnczF9dcBR0sKxQZzI4U9rNOS+vwrDWHLJ76bOH7gTZBwo2GCBDOv/OF4Q+EyUCb+sW/JJeGxDQfG4b8vjRwK2hUKYNPF6gsbDUyC6lHAtgMB3NTfnv5ns+dtkL6F2eF9/6KRznagXDyxvyZx9PJG4WxUf+niif01Wtr8KiBgo8VPj24UMA5mXqAlne1AAPfhc79+DZHZ66aJq0wM/eJVWtKZB5Tqu0frNlr80/Xy0jB4fmbsZNQVCNj6+LlDoFxh7+2mkHjy3OFGOtse5U2H3sE/Xn5ZeT33dfJ5tdYmNjk5+tPt9wMhbd8Fed8DAqTJwuyhaxWYLM4MASk5HyGdPkDshT8/+hLiLq8XJuIu/+/Ir4bz0nk1oMyNHgttuPTseoGuvnh4/uzwqtorBATszNnXDqyvoUu48N6rB2mrvSJAAHd+/48mbVgr3AhsGDw/NvTIFG2lUBQoQFr/5L2nipSIgAvH//s0HTZL01QXPwro3X3o8rAu9expfdBeFpJGx0b3fvYhckqhqMJllVFl/PfdFNanx5/qpq6IwmZQvYPPTB9XpvTlPIWSxqOjez/z9YY6181ZN3NAEs5d+k2nCfHc5JNA0g1WVGGLyspbynh3tSp0aXLm9N7tg0XUFVXYVJlG81NPrlE3P/k7srUr1OyLAgHS/zzxjRex9v3mDbHp+2d/u+fFBrBwqoqaUKnEYfXS480b4dzk41QqMV125vWYBvoGn5l+596Dn74D9K0z6MY/4M7WvqkESOPK+GNRlsRm3eXNK+SwVYkPlBpBacA05uvGfVgpBSFr2K4RRALE5GykTif+toZT1WFu87pVSft1Asy1q70WhYrVwOa4ZoXred7JOq7h/wF6az0ukZgX/AAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxNS0wNy0yNVQyMTo1MDo0MyswODowMOgS43cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTMtMTEtMjBUMjI6NDc6MTErMDg6MDAou1syAAAATnRFWHRzb2Z0d2FyZQBJbWFnZU1hZ2ljayA2LjguOC0xMCBRMTYgeDg2XzY0IDIwMTUtMDctMTkgaHR0cDovL3d3dy5pbWFnZW1hZ2ljay5vcmcFDJw1AAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAA1Mwmpb+QAAAAWdEVYdFRodW1iOjpJbWFnZTo6V2lkdGgAMjgpleAmAAAAGXRFWHRUaHVtYjo6TWltZXR5cGUAaW1hZ2UvcG5nP7JWTgAAABd0RVh0VGh1bWI6Ok1UaW1lADEzODQ5NTg4MzEXUMEwAAAAE3RFWHRUaHVtYjo6U2l6ZQA0LjUzS0JC/AyPiAAAAFp0RVh0VGh1bWI6OlVSSQBmaWxlOi8vL2hvbWUvd3d3cm9vdC93d3cuZWFzeWljb24ubmV0L2Nkbi1pbWcuZWFzeWljb24uY24vc3JjLzExMjk3LzExMjk3NzIucG5nqXNeUQAAAABJRU5ErkJggg==';
+	var outMark = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAvCAMAAAC18jgTAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAABO1BMVEUAAAAiu4ggv40gvowgvowgvosgvowfvo0jv44hv40gvosgvowcxo4fvowgvowdvYogv4whvo0gvowhvYwrqoAhv4wnxIkgv4wA//8gvIshvosgvowhvIshvowgvowrv5Ugv4ohvosgvowhv4wgv4whvYwXuYsgvowgvowiu4gfvo0zzJkhvowktpIgvowgv40hvo0gv4wgvowAqqogvosgvowjv4sgvowivIskv4khvowgvYsiu44hvosfvI0hv4sgvYofvowgvowgv40gv4wjuYsgvowhvowfvIsgvYsgvo0hvoxAv4Agv4wgvowgvoshvo0mv4whvowgvowfwo8gv4wgv40duokAAAAfvYsgvYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAYjGUYj2kAAAAAAAAAAAAgvoz///9v2GMAAAAAZ3RSTlMAD1eZyOr4miSc950Jivoj0i/pfAarDaoBWH3JLuv5DDDL0ZunbQvu/h6CBbQO5jhOkNwDtfAsz0Qc42EtdUGLYKKOwsYW7/s5f7nMBCj9N40U8/YZh48aAaOmAggNERMWF0lLGBkanzLKGQAAAAFiS0dEaMts9CIAAAGZSURBVDjLfZRnW8IwFIUvyN6FUlCx4AZxKw7cA/eeKKNUwfz/f2ChZNAmnC+U+54m9548KQCRwznicns8bpfX6QC7fP4AIgoEfRYcCkfQgCLhEMujMWRTLEq55EYcuSXyPpcbjv4aoRgSKGb2EUZChXvzRcSGSHfaIP0fT0iyLCXitOI38qP5JBWzKSVFE3OAk/I0HiudJMVR8JL1FRqMQgb3ggs/Jthox3B1HIg3wxoyuDoBKn6UWYOMqyp4uIYsNfC3yNEtJoc3OQXT3DFJmDNMUCkaFI1yFubmqcMedb4AsMAeVqaYzbGHtWj4l5bFx51f6a64mhca/OaeayK+3m9qY5PPS1tk7G0eV3doMLtlToN7bLT7JZvhYPByHqoWfmS93ceD/CRtNcApy89kG4fiOeXlCucLAoULzC+vgCvSxjUIdGPy2zuR4b53jx8eQagn5gi5en5B6PVtiAHeEfoYxqHiUT9FrNrT17f5a8O1eqOptXT951fXW1qzUa9ZXtfanU7nry/jsa1VuSsYtjZ3BdIDFin/A1AVNdoKDyAYAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTA3LTI1VDIxOjUwOjQzKzA4OjAw6BLjdwAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMy0xMS0yMFQyMjo0NzoxMyswODowML8kShsAAABOdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOC44LTEwIFExNiB4ODZfNjQgMjAxNS0wNy0xOSBodHRwOi8vd3d3LmltYWdlbWFnaWNrLm9yZwUMnDUAAAAYdEVYdFRodW1iOjpEb2N1bWVudDo6UGFnZXMAMaf/uy8AAAAXdEVYdFRodW1iOjpJbWFnZTo6SGVpZ2h0ADQ3F9+avAAAABZ0RVh0VGh1bWI6OkltYWdlOjpXaWR0aAAzMtBbOHkAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9wbmc/slZOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTM4NDk1ODgzM/leoBwAAAATdEVYdFRodW1iOjpTaXplADQuMDFLQkKe5chzAAAAWnRFWHRUaHVtYjo6VVJJAGZpbGU6Ly8vaG9tZS93d3dyb290L3d3dy5lYXN5aWNvbi5uZXQvY2RuLWltZy5lYXN5aWNvbi5jbi9zcmMvMTEyOTcvMTEyOTc4Ni5wbmetpUpEAAAAAElFTkSuQmCC';
+
+	var inOuts = [outMark, inMark];
+	
+	var stationCodeMap = {};
+	
+	var map = new BMap.Map("mapContainer");
+	map.centerAndZoom(new BMap.Point(121.544336, 31.221315), 15);
+	map.enableScrollWheelZoom();
+	//中心点和缩放级别
+	map.setCurrentCity("上海");  
+	var myDis = new BMapLib.DistanceTool(map);
+
+	
+	$.get('/line/all', function(rs){
+		var data = [];
+		$.each(rs, function(){
+			data.push({id: this.id, text: this.name});
+		});
+		
+		initPinYinSelect2('select[name=xl]', data);
+	});
+	
+	function searchGps(){
+		var params = $('form').serializeJSON();
+		//查询线路路由站点
+		$.get('/test/gps/route', params, function(rs){
+			var array = rs[0].children[0].children
+				,coords,circle, cdsArray, points, polygon;
+			//画出站点
+			console.log(array);
+			$.each(array, function(){
+				stationCodeMap[this.stationStationCod] = this.name;
+				if(this.stationShapesType === 'r'){
+					//画圆
+					coords = this.stationBJwpoints.split(' ');
+					circle = new BMap.Circle(new BMap.Point(coords[0], coords[1]),this.stationRadius);
+					circle.setStrokeColor('red');
+					circle.setStrokeWeight(2)
+					map.addOverlay(circle);
+				}
+				else if(this.stationShapesType === 'd'){
+					//画多边形
+					coords = this.stationBPolygonGrid.substring(9, this.stationBPolygonGrid.length - 2);
+					cdsArray = coords.split(',');
+					points = [];
+					$.each(cdsArray, function(){
+						coords = this.split(' ');
+						points.push(new BMap.Point(coords[0], coords[1]));
+					});
+					
+					polygon = new BMap.Polygon(points, {strokeColor:"red", strokeWeight:2, strokeOpacity:0.5});
+					map.addOverlay(polygon);
+				}
+			});
+			coords = array[array.length / 2].stationBJwpoints.split(' ');
+			map.setCenter(new BMap.Point(coords[0], coords[1]))
+		});
+		
+		//查询gps点
+		$.get('/gps/history/' + params.device, params, function(gpsArray){
+			console.log(stationCodeMap);
+			var marker, label, point, state, text;
+			$.each(gpsArray, function(){
+				point = new BMap.Point(this.lon, this.lat);
+				marker = new BMap.Marker(point);
+				state = this.inout_stop;
+				
+				if(state == 0 || state == 1){
+					text = state == 0?'出':'进';
+					
+					console.log(stationCodeMap[this.stopNo], this);
+					marker.setIcon(new BMap.Icon(inOuts[this.inout_stop], new BMap.Size(25,25)));
+					label = new BMap.Label(
+							stationCodeMap[this.stopNo] + '/' +moment(this.ts).format('HH:mm.ss') + ' -'+text
+							, {position: point, offset: new BMap.Size(-25,-18)});
+					marker.setLabel(label);
+				}
+				else{
+					label = new BMap.Label(moment(this.ts).format('HH:mm.ss')
+							, {position: point, offset: new BMap.Size(-25,-18)});
+					marker.setLabel(label);
+				}
+				
+				map.addOverlay(marker);
+			});
+		});
+	}
+	
+	
+	/**
+	 * 支持拼音搜索的select2
+	 * @param selector
+	 * @param data
+	 */
+	function initPinYinSelect2(selector, data, cb){
+		
+		$.each(data, function(){
+			this.fullChars = pinyin.getFullChars(this.text).toUpperCase();
+			this.camelChars = pinyin.getCamelChars(this.text);
+		});
+		
+		$.fn.select2.amd.require(['select2/compat/matcher'], function (oldMatcher) {
+			$(selector).select2({
+				data: data,
+			    matcher: oldMatcher(function(term, text, item){
+			    	var upTerm = term.toUpperCase();
+					if(item.fullChars.indexOf(upTerm) != -1
+							|| item.camelChars.indexOf(upTerm) != -1)
+						return true;
+					
+					return text.indexOf(term) != -1;
+			    })
+			});
+			
+			cb && cb();
+		});
+		
+		return $(selector);
+	}
+</script>
+</body>
+</html>
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				临港公交调度系统 </a>
+				浦东公交调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">临港公交调度系统</h3>
+        <h3 class="logo-text">浦东公交调度系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
-<!DOCTYPE html>
-<html lang="zh-cn">
-
-<head>
-    <meta charset="UTF-8">
-    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
-    <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
-    <link rel="stylesheet"
-          href="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
-          type="text/css" />
-    <!-- main css -->
-    <link rel="stylesheet" href="/pages/base/geo_data_edit/css/mian.css"  />
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
-</head>
-
-<body>
-<div class="loading">
-    <div><span uk-spinner></span><span class="text">正在加载...</span></div>
-</div>
-<div class="ct_page" >
-    <div class="instructions_tips uk-animation-slide-top-medium">
-        <button type="button" uk-close></button>
-        <div>
-            <h4>说明</h4>
-            <ul class="uk-list">
-                <li>1、所有的改道、缩线、并线等对走向调整都必须新建版本，以保留原走向版本。</li>
-                <li>2、只有在人工数据录入错误的情况下，才有理由对当前启用的版本进行走向编辑。</li>
-                <li>3、走向版本可以任意切换，但是必须维护好一个准确的“版本切换记录”。</li>
-                <hr>
-                <li>4、调整缓冲区、修改站点名称、修改路段名称 不算走向调整，不需要新建版本。</li>
-            </ul>
-        </div>
-    </div>
-    <div id="map_wrap"></div>
-    <div class="main_left_panel_m_layer"></div>
-    <div class="main_left_panel">
-        <div class="_line_info">
-            <div class="_line_name">
-                <a class="dropdown_txt"></a>
-                <div class="line_change_panel" uk-dropdown="mode: click">
-                    <div class="uk-inline">
-                        <a class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></a>
-                        <input class="uk-input" type="text" id="line_search_input">
-                    </div>
-                    <ul class="uk-list"></ul>
-                </div>
-
-
-
-                <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
-                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
-            </div>
-            <div class="_version_dropdown_wrap">
-                <a class="_version_text"></a>
-                <div uk-dropdown>
-                    <ul class="uk-nav uk-dropdown-nav all_version_list">
-                    </ul>
-                </div>
-            </div>
-            <a class="clock_enable_version"></a>
-        </div>
-
-        <div class="_route_info_wrap">
-            <ul uk-tab>
-                <li><a>上行</a></li>
-                <li><a>下行</a></li>
-
-            </ul>
-
-            <ul class="uk-switcher uk-margin up_down_route_list">
-                <li>
-                    <div class="station_route"></div>
-                    <div class="road_route"></div>
-                </li>
-                <li>
-                    <div class="station_route"></div>
-                    <div class="road_route"></div>
-                </li>
-            </ul>
-            <div class="pos_tb_icon">
-                <a uk-icon="icon: chevron-down;"></a>
-            </div>
-        </div>
-    </div>
-    <div class="main_lt_search_panel">
-        <div class="uk-inline ct_s_i_wrap">
-            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
-            <input class="uk-input ct_search_input" placeholder="搜索地图位置" type="text">
-        </div>
-        <div class="ct_search_result"></div>
-    </div>
-    <div class="main_rt_tools_panel">
-        <!--<a style="color: red;" uk-icon="icon: unlock;ratio: .9" class="_icon" title="当前版本有变更未启用" uk-tooltip="pos:bottom"></a>-->
-
-        <a uk-icon="icon: bookmark;ratio: .9" class="_icon" title="走向版本变更记录" uk-tooltip="pos:bottom"></a>
-        <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
-    </div>
-</div>
-
-<script id="geo_d_e_search_result-temp" type="text/html">
-    <ul class="s_list uk-list">
-        {{each list as obj i}}
-        <li data-lat="{{obj.point.lat}}" data-lng="{{obj.point.lng}}">
-            <span class="_title">{{obj.title}}</span>
-            <span class="_address">{{obj.address}}</span>
-        </li>
-        {{/each}}
-
-        {{if list.length==0}}
-            <li class="_empty">没有搜索到相关数据！</li>
-        {{/if}}
-    </ul>
-</script>
-
-<script id="geo_d_e_dropdown_list-temp" type="text/html">
-    {{each list as obj i}}
-    <li data-code="{{obj.code}}">
-        <div class="name">{{obj.name}}</div>
-        <div class="code">{{obj.code}}</div>
-    </li>
-    {{/each}}
-    {{if ellipsis}}
-        <li>...</li>
-    {{/if}}
-</script>
-<!-- 百度 -->
-<script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
-<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
-<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
-<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
-<!-- EventProxy  -->
-<script src="/assets/js/eventproxy.js"></script>
-<!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
-<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
-<!-- jquery.serializejson JSON序列化插件 -->
-<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
-<!-- common js -->
-<script src="/pages/base/geo_data_edit/js/ct_common.js"></script>
-<script src="/assets/js/TransGPS.js" ></script>
-<!-- Geolib -->
-<script src="/real_control_v2/geolib/geolib.js" ></script>
-<!-- jquery contextMenu -->
-<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  ></script>
-<script src="/assets/js/baidu/bd_GeoUtils_min.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>
-<script src="/assets/plugins/pinyin.js"></script>
-
-<script>
-    var $loadPanel = $('body>.loading');
-    //___________________________________
-    var storage = window.localStorage;
-    //___________________________________
-
-    top.document.title = "绘制线路";
-
-    // 关闭左侧栏
-    if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
-    //全屏
-    $('.full_screen_icon').on('click', function () {
-        var $iframe = window.parent.$('#geo_edit_wrap_iframe'),
-                icon;
-        if($(this).attr('uk-icon').indexOf('expand') != -1){
-            $iframe.addClass('full_screen');
-            icon = 'shrink';
-        }
-        else{
-            $iframe.removeClass('full_screen');
-            icon = 'expand';
-        }
-        $(this).attr('uk-icon', 'icon: '+icon+';ratio: .9');
-    });
-
-    var gb_main_ep;
-    //文件加载
-    var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
-            , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
-                startup(function () {
-                    $('.instructions_tips').show();
-                });
-
-                gb_change_line.init();
-            });
-
-    var g_line_code;
-    var g_version;
-    var startup = function (cb) {
-        g_line_code = storage.getItem('geo_data_edit_line_code');
-
-        gb_main_ep = new EventProxy();
-        var eq = gb_main_ep;
-
-        //站点
-        gb_station_route.init(g_emit('init_road'));
-        //路段
-        eq.once('init_road', function () {
-            gb_road_route.init(g_emit('init_map'))
-        });
-        //地图
-        eq.once('init_map', function () {
-            gb_ct_map._render(g_emit('end'));
-        });
-
-        eq.once('end', function () {
-            //线路版本信息
-            gb_version_manage.init(storage.getItem("geo_data_edit_line_version"));
-
-            $loadPanel.hide();
-            gb_ct_search.init();
-
-            cb && cb();
-        });
-    };
-    
-    var clearAll = function () {
-        $('.up_down_route_list .station_route').empty();
-        $('.up_down_route_list .road_route').empty();
-        gb_ct_map.clearAll();
-    };
-
-    function g_emit(id) {
-        console.log('g_emit [' + id + ']');
-        return function () {
-            console.log('eq.emitLater(' + id + ')');
-            return gb_main_ep.emitLater(id);
-        };
-    }
-
-    //滚动条
-    $('._route_info_wrap>ul.uk-switcher').perfectScrollbar({suppressScrollX: true});
-
-    //to top btttom
-    $('.pos_tb_icon a').on('click', function () {
-        UIkit.notification('top top...');
-    });
-
-    function getUpDown(){
-        return $('.up_down_route_list>li:first').hasClass('uk-active')?0:1;
-    }
-
-    //切换上下行显示
-    $('.up_down_route_list').on('show', function () {
-        gb_ct_map.changeUpDown();
-    });
-
-    $(document).on('submit', 'form', function (e) {
-        e.stopPropagation();
-        return false;
-    });
-
-    $(document).on('click', 'button.cancel', function (e) {
-        e.stopPropagation();
-        return false;
-    });
-
-    //关闭说明
-    $('.instructions_tips .uk-close').on('click', function () {
-        $('.instructions_tips').remove();
-    });
-</script>
-
-
-<script src="/pages/base/geo_data_edit/js/server_timer.js" ></script>
-<!--- js -->
-<script src="/pages/base/geo_data_edit/js/common_data.js" ></script>
-<script src="/pages/base/geo_data_edit/js/station_route.js" ></script>
-<script src="/pages/base/geo_data_edit/js/road_route.js" ></script>
-<script src="/pages/base/geo_data_edit/js/version_manage.js" ></script>
-<script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script>
-<script src="/pages/base/geo_data_edit/js/map.js" ></script>
-<script src="/pages/base/geo_data_edit/js/submit.js" ></script>
-<script src="/pages/base/geo_data_edit/js/search.js" ></script>
-<script src="/pages/base/geo_data_edit/js/change_line.js" ></script>
-
-<script type="text/javascript"
-        src="http://api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
-</body>
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- jquery contextMenu style -->
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
+    <link rel="stylesheet"
+          href="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.css"
+          type="text/css" />
+    <!-- main css -->
+    <link rel="stylesheet" href="/pages/base/geo_data_edit/css/mian.css"  />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+</head>
+
+<body>
+<div class="loading">
+    <div><span uk-spinner></span><span class="text">正在加载...</span></div>
+</div>
+<div class="ct_page" >
+    <div class="instructions_tips uk-animation-slide-top-medium">
+        <button type="button" uk-close></button>
+        <div>
+            <h4>说明</h4>
+            <ul class="uk-list">
+                <li>1、所有的改道、缩线、并线等对走向调整都必须新建版本，以保留原走向版本。</li>
+                <li>2、只有在人工数据录入错误的情况下，才有理由对当前启用的版本进行走向编辑。</li>
+                <li>3、走向版本可以任意切换，但是必须维护好一个准确的“版本切换记录”。</li>
+                <hr>
+                <li>4、调整缓冲区、修改站点名称、修改路段名称 不算走向调整，不需要新建版本。</li>
+            </ul>
+        </div>
+    </div>
+    <div id="map_wrap"></div>
+    <div class="main_left_panel_m_layer"></div>
+    <div class="main_left_panel">
+        <div class="_line_info">
+            <div class="_line_name">
+                <a class="dropdown_txt"></a>
+                <div class="line_change_panel" uk-dropdown="mode: click">
+                    <div class="uk-inline">
+                        <a class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></a>
+                        <input class="uk-input" type="text" id="line_search_input">
+                    </div>
+                    <ul class="uk-list"></ul>
+                </div>
+
+
+
+                <a uk-icon="icon: trash" class="remove_line_version_icon uk-animation-slide-right-small" title="删除线路版本" style="display: none" uk-tooltip></a>
+                <a uk-icon="icon: plus" class="add_line_version_icon" title="新增一个线路版本" uk-tooltip></a>
+            </div>
+            <div class="_version_dropdown_wrap">
+                <a class="_version_text"></a>
+                <div uk-dropdown>
+                    <ul class="uk-nav uk-dropdown-nav all_version_list">
+                    </ul>
+                </div>
+            </div>
+            <a class="clock_enable_version"></a>
+        </div>
+
+        <div class="_route_info_wrap">
+            <ul uk-tab>
+                <li><a>上行</a></li>
+                <li><a>下行</a></li>
+
+            </ul>
+
+            <ul class="uk-switcher uk-margin up_down_route_list">
+                <li>
+                    <div class="station_route"></div>
+                    <div class="road_route"></div>
+                </li>
+                <li>
+                    <div class="station_route"></div>
+                    <div class="road_route"></div>
+                </li>
+            </ul>
+            <div class="pos_tb_icon">
+                <a uk-icon="icon: chevron-down;"></a>
+            </div>
+        </div>
+    </div>
+    <div class="main_lt_search_panel">
+        <div class="uk-inline ct_s_i_wrap">
+            <span class="uk-form-icon uk-form-icon-flip" uk-icon="icon: search"></span>
+            <input class="uk-input ct_search_input" placeholder="搜索地图位置" type="text">
+        </div>
+        <div class="ct_search_result"></div>
+    </div>
+    <div class="main_rt_tools_panel">
+        <!--<a style="color: red;" uk-icon="icon: unlock;ratio: .9" class="_icon" title="当前版本有变更未启用" uk-tooltip="pos:bottom"></a>-->
+
+        <a uk-icon="icon: bookmark;ratio: .9" class="_icon" title="走向版本变更记录" uk-tooltip="pos:bottom"></a>
+        <a uk-icon="icon: expand;ratio: .9" class="_icon full_screen_icon"></a>
+    </div>
+</div>
+
+<script id="geo_d_e_search_result-temp" type="text/html">
+    <ul class="s_list uk-list">
+        {{each list as obj i}}
+        <li data-lat="{{obj.point.lat}}" data-lng="{{obj.point.lng}}">
+            <span class="_title">{{obj.title}}</span>
+            <span class="_address">{{obj.address}}</span>
+        </li>
+        {{/each}}
+
+        {{if list.length==0}}
+            <li class="_empty">没有搜索到相关数据！</li>
+        {{/if}}
+    </ul>
+</script>
+
+<script id="geo_d_e_dropdown_list-temp" type="text/html">
+    {{each list as obj i}}
+    <li data-code="{{obj.code}}">
+        <div class="name">{{obj.name}}</div>
+        <div class="code">{{obj.code}}</div>
+    </li>
+    {{/each}}
+    {{if ellipsis}}
+        <li>...</li>
+    {{/if}}
+</script>
+<!-- 百度 -->
+<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- common js -->
+<script src="/pages/base/geo_data_edit/js/ct_common.js"></script>
+<script src="/assets/js/TransGPS.js" ></script>
+<!-- Geolib -->
+<script src="/real_control_v2/geolib/geolib.js" ></script>
+<!-- jquery contextMenu -->
+<script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  ></script>
+<script src="/assets/js/baidu/bd_GeoUtils_min.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>
+<script src="/assets/plugins/pinyin.js"></script>
+
+<script>
+    var $loadPanel = $('body>.loading');
+    //___________________________________
+    var storage = window.localStorage;
+    //___________________________________
+
+    top.document.title = "绘制线路";
+
+    // 关闭左侧栏
+    if (!top.$('body').hasClass('page-sidebar-closed')) {top.$('.menu-toggler.sidebar-toggler').click();}
+    //全屏
+    $('.full_screen_icon').on('click', function () {
+        var $iframe = window.parent.$('#geo_edit_wrap_iframe'),
+                icon;
+        if($(this).attr('uk-icon').indexOf('expand') != -1){
+            $iframe.addClass('full_screen');
+            icon = 'shrink';
+        }
+        else{
+            $iframe.removeClass('full_screen');
+            icon = 'expand';
+        }
+        $(this).attr('uk-icon', 'icon: '+icon+';ratio: .9');
+    });
+
+    var gb_main_ep;
+    //文件加载
+    var res_load_ep = EventProxy.create('load_common_data', 'load_station_route','load_road_route'
+            , 'load_version_manage', 'load_history_edit_logs', 'load_map', function () {
+                startup(function () {
+                    $('.instructions_tips').show();
+                });
+
+                gb_change_line.init();
+            });
+
+    var g_line_code;
+    var g_version;
+    var startup = function (cb) {
+        g_line_code = storage.getItem('geo_data_edit_line_code');
+
+        gb_main_ep = new EventProxy();
+        var eq = gb_main_ep;
+
+        //站点
+        gb_station_route.init(g_emit('init_road'));
+        //路段
+        eq.once('init_road', function () {
+            gb_road_route.init(g_emit('init_map'))
+        });
+        //地图
+        eq.once('init_map', function () {
+            gb_ct_map._render(g_emit('end'));
+        });
+
+        eq.once('end', function () {
+            //线路版本信息
+            gb_version_manage.init(storage.getItem("geo_data_edit_line_version"));
+
+            $loadPanel.hide();
+            gb_ct_search.init();
+
+            cb && cb();
+        });
+    };
+    
+    var clearAll = function () {
+        $('.up_down_route_list .station_route').empty();
+        $('.up_down_route_list .road_route').empty();
+        gb_ct_map.clearAll();
+    };
+
+    function g_emit(id) {
+        console.log('g_emit [' + id + ']');
+        return function () {
+            console.log('eq.emitLater(' + id + ')');
+            return gb_main_ep.emitLater(id);
+        };
+    }
+
+    //滚动条
+    $('._route_info_wrap>ul.uk-switcher').perfectScrollbar({suppressScrollX: true});
+
+    //to top btttom
+    $('.pos_tb_icon a').on('click', function () {
+        UIkit.notification('top top...');
+    });
+
+    function getUpDown(){
+        return $('.up_down_route_list>li:first').hasClass('uk-active')?0:1;
+    }
+
+    //切换上下行显示
+    $('.up_down_route_list').on('show', function () {
+        gb_ct_map.changeUpDown();
+    });
+
+    $(document).on('submit', 'form', function (e) {
+        e.stopPropagation();
+        return false;
+    });
+
+    $(document).on('click', 'button.cancel', function (e) {
+        e.stopPropagation();
+        return false;
+    });
+
+    //关闭说明
+    $('.instructions_tips .uk-close').on('click', function () {
+        $('.instructions_tips').remove();
+    });
+</script>
+
+
+<script src="/pages/base/geo_data_edit/js/server_timer.js" ></script>
+<!--- js -->
+<script src="/pages/base/geo_data_edit/js/common_data.js" ></script>
+<script src="/pages/base/geo_data_edit/js/station_route.js" ></script>
+<script src="/pages/base/geo_data_edit/js/road_route.js" ></script>
+<script src="/pages/base/geo_data_edit/js/version_manage.js" ></script>
+<script src="/pages/base/geo_data_edit/js/history_edit_logs.js" ></script>
+<script src="/pages/base/geo_data_edit/js/map.js" ></script>
+<script src="/pages/base/geo_data_edit/js/submit.js" ></script>
+<script src="/pages/base/geo_data_edit/js/search.js" ></script>
+<script src="/pages/base/geo_data_edit/js/change_line.js" ></script>
+
+<script type="text/javascript"
+        src="//api.map.baidu.com/library/DrawingManager/1.4/src/DrawingManager_min.js"></script>
+</body>
 </html>
 \ No newline at end of file
-/**
- * 百度地图
- * 
- * - - - - - -》init：地图初始化
- * 
- * - - - - - -》getDistanceAndDuration：获取距离与时间
- * 
- * - - - - - -》drawingUpline：在地图上画出上行线路走向
- * 
- * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
- */
-
-var WorldsBMapLine = function () {
-	
-	/** WorldsBMapLine 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
-	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
-	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = null, isCutSection = false;
-	
-	var Bmap = {
-			
-			init : function() {
-				
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				
-				// 初始化百度地图
-				mapBValue = new BMap.Map("bmap_basic");
-				
-				//中心点和缩放级别
-				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 20);
-				
-				//启用地图拖拽事件，默认启用(可不写)
-				mapBValue.enableDragging(); 
-				
-				//启用地图滚轮放大缩小
-				mapBValue.enableScrollWheelZoom(); 
-				
-				//禁用鼠标双击放大
-				mapBValue.disableDoubleClickZoom();
-				
-				//启用键盘上下左右键移动地图
-				mapBValue.enableKeyboard();
-				
-				return mapBValue;
-			},
-			/** 获取第一个切路段的点  @return Point*/
-			getFirstPoint : function() {
-				return firstPoint;
-			},
-			/** 第一个切路段的点 */
-			setFirstPoint : function(Point) {
-				firstPoint = Point;
-			},
-			/** 获取地图对象 @return 地图对象map */
-			getmapBValue : function() {
-				
-				return mapBValue;
-				
-			},
-			
-			getPolyUpline : function() {
-				
-				return polyUpline;
-			},
-			
-			/** 获取截取过的路段 @return 路段对象List */
-			getSectionList : function() {
-				
-				return sectionList;
-				
-			},
-			setSectionList : function(list) {
-				
-				sectionList = list;
-			},
-			initCutSectionPoint : function() {
-				sectionList = [];
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			/** 获取切路段的点下标  @return int*/
-			setPointIndex : function(index) {
-				pointIndex = index;
-			},
-			getPointIndex : function() {
-				
-				return pointIndex;
-				
-			},
-			/** 获取路段是否在编辑状态 @return boolean*/
-			getIsEditStatus : function() {
-				return iseditStatus;
-			},			
-			setIsEditStatus : function(v) {
-				iseditStatus = v ;
-			},
-					
-			/** 获取路段是否在截取状态 @return boolean*/
-			getIsCutSection : function() {
-				return isCutSection;
-			},			
-			setIsCutSection : function(v) {
-				isCutSection = v ;
-			},
-			
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				
-				// 获取长度
-				var len = points.length;
-				(function(){
-					
-					if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1) {
-						 callback && callback(points);
-			        	  
-			              return;
-			          }
-					 
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 var region = '上海';
-					 
-					 var origin_region = '上海';
-					 
-					 var destination_region = '上海';
-					 
-					 var output = 'json';
-					 
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 
-					 /** 
-					  *  origin：起点名称或经纬度；
-					  * 
-					  *  destination：终点名称或经纬度；
-					  *  
-					  *  origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  destination_region：终点所在城市，驾车导航时必填。
-					  * 
-					  *  output :表示输出类型，可设置为xml或json，默认为xml。
-					  *  
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              
-			              data: paramsB,
-			              
-			              dataType: 'jsonp',
-			              
-			              success: function(r){
-			            	  
-			            	  if(r) {
-			            		  
-			            		  if(r.message=='ok') {
-			            			  
-			            			  if(r.result.taxi==null) {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = 0;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = 0;
-			            				  
-			            			  }else {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = r.result.taxi.distance;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = r.result.taxi.duration;
-			            				  
-			            			  }
-			            			  
-			            			  
-			            		  }
-			            		  
-			            	  }
-			            	  
-			            	  f();
-			              }
-			          });
-					
-				})();
-				
-			},
-			drawingSection: function(data){
-				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
-				WorldsBMapLine.clearMarkAndOverlays();
-				// 编辑路段数据
-				if(data) {
-					// 地图折线坐标点集合
-					var polylineArray = [];
-					// 获取路段折线坐标字符串
-					var sectionBsectionVectorStr = data.sectionBsectionVector;
-					if(sectionBsectionVectorStr==null) {
-						return;
-					}
-					// 切割段折线坐标字符串
-					var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
-					// 分割折线坐标字符串
-					var lineArray = tempStr.split(',');
-					for(var i = 0;i<lineArray.length;i++) {
-						polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
-					}
-					var index = parseInt(polylineArray.length/2);
-					var center = polylineArray[index];
-					/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
-					WorldsBMapLine.drawingUpline(polylineArray,center);
-					/** 在地图上画点 @param：<point_center：中心坐标点> */
-					WorldsBMapLine.drawingUpStationPoint(center,data.sectionName,1);
-				}
-			},
-			// 在地图上画出上行线路走向（单路段）
-			drawingUpline : function (polylineArray,polyline_center,data) {
-				/*WorldsBMap.clearMarkAndOverlays();*/
-				polyUpline = '';
-				// 创建线路走向
-				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				// polyUpline.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline);
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			
-			// 在地图上画出上行线路走向（多路段）
-			drawingUpline01 : function (polylineArray,polyline_center,data) {
-				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
-				// 创建线路走向
-				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				polyUpline01.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline01);
-				var sectionPoint = [];
-				// 线路单击事件
-				polyUpline01.addEventListener('click',function(e) {
-					if(WorldsBMapLine.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					if(WorldsBMapLine.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					polyUpline01.enableEditing();
-					WorldsBMapLine.setIsEditStatus(true);
-					// 关闭按钮事件
-					PublicFunctions.addAChangeCssAddDisabled();
-				});
-				
-				// 添加路段双击事件
-				polyUpline01.addEventListener("dblclick",function(e){
-					if(WorldsBMapLine.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					WorldsBMapLine.setIsEditStatus(false);
-					// 关闭
-					layer.closeAll();
-					polyUpline01.disableEditing();
-					EditSectionObj.setEitdSection(polyUpline01.data);
-					// 获取折线坐标集合
-					var editPloyLineArray = polyUpline01.getPath();
-					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					sectionList = [];
-					var tbodyHtml = template('section_list',{list : sectionList});
-					// 截取路段
-					$('#section_table tbody').html(tbodyHtml);
-					// 加载修改路段弹出层mobal页面
-					$.get('editsection.html', function(m){
-						$(pjaxContainer).append(m);
-						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [WorldsBMapLine,MapGetAjaxData,EditSectionObj,PublicFunctions]);
-					});
-					// 打开按钮事件
-					PublicFunctions.editAChangeCssRemoveDisabled();
-				});
-				
-				// 路段右击事件
-				var editSection = function(e,ee,marker){
-					if(WorldsBMapLine.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					var lng = e.lng;
-					var lat = e.lat;	
-					var sectionName = null;
-					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
-					var label = new BMap.Label(pointIndex+1,{offset:new BMap.Size(pointIndex>8?0:4,0)});
-					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
-					marker.setLabel(label);
-					marker.isFlag = true;
-					if(pointIndex == 0) {
-						sectionPoint[pointIndex] = {lng:lng , lat:lat};
-						layer.msg('进入切路段状态，请选择本路段的终点！');
-						mapBValue.addOverlay(marker);// 添加覆盖物
-						firstPoint = {lng:lng, lat:lat};
-						pointIndex++;
-						EditSectionObj.setEitdSection(polyUpline01.data);
-						// 获取折线坐标集合
-						var editPloyLineArray = polyUpline01.getPath();
-						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					} else if (pointIndex > 0) {
-						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
-							pointList = [];
-							sectionPoint[pointIndex] = {lng:lng , lat:lat};
-							pointList[0] = sectionPoint[pointIndex-1];
-							pointList[1] = sectionPoint[pointIndex];
-							sectionList.push({name:sectionName, section:pointList});	
-							layer.close(index);
-							layer.msg('路段截取成功，请选择下一个路段的终点');
-							mapBValue.addOverlay(marker);// 添加覆盖物
-							var tbodyHtml = template('section_list',{list : sectionList});
-							// 截取路段
-							$('#section_table tbody').html(tbodyHtml);
-							pointIndex++;
-						});
-					}
-					WorldsBMapLine.setIsCutSection(true);
-				}
-				// 路段生成类型位gps上传时才开启右击事件
-				if(EditRoute.getLineGenerationType() == 'uploadGPS') {
-					var markerMenu=new BMap.ContextMenu();
-					markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
-					polyUpline01.addContextMenu(markerMenu);
-				}
-				
-				
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			// 删除点刷新cutSectionTable
-			refreshCutSectionTable : function() {
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			// 删除点刷新覆盖物
-			deleteCutSectionPoint : function(point) {
-				var lng = point.lng;
-				var lat = point.lat;
-				var allOverlay = mapBValue.getOverlays();
-				// 删除最后一个点
-				for (var i = 0; i < allOverlay.length -1; i++){
-					if(allOverlay[i].isFlag) {
-						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
-							mapBValue.removeOverlay(allOverlay[i]);
-							break;
-						}
-					}
-				}		
-			},
-			// 批量画点
-			batchPaintingPoint : function() {
-				// 画第一个点
-				var Point = WorldsBMapLine.getFirstPoint();
-				if(Point){
-					var marker = new BMap.Marker(new BMap.Point(Point.lng, Point.lat)); // 创建点
-					var label = new BMap.Label(1,{offset:new BMap.Size(4,0)});
-					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
-					marker.setLabel(label);
-					marker.isFlag = true;
-					mapBValue.addOverlay(marker);// 添加覆盖物
-					
-					WorldsBMapLine.getFirstPoint();
-				}
-				$.each(sectionList, function(index, value) {
-					var section = value.section;
-					
-					var marker = new BMap.Marker(new BMap.Point(section[1].lng, section[1].lat)); // 创建点
-					var label = new BMap.Label(index+2,{offset:new BMap.Size(index>7?0:4,0)});
-					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
-					marker.setLabel(label);
-					marker.isFlag = true;
-					mapBValue.addOverlay(marker);// 添加覆盖物
-				});
-
-			},
-			/** 在地图上画点 @param：<point_center：中心坐标点> */
-			drawingUpStationPoint : function(point_center,stationName,s) {
-				
-				// 自定义标注物图片
-			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
-			  		
-			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
-			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
-						+ 		'</div>'
-						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
-						 
-						
-				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
-                        "anchor" : new BMap.Size(-10,8),
-						  "enableDragging" : true});
-				
-			
-				myRichMarker1.disableDragging();
-				mapBValue.addOverlay(myRichMarker1);
-		  		
-		  		
-		  		// 创建标注物
-		  		marker = new BMap.Marker(point_center,{icon : icon_target});
-  				
-		  		// 允许覆盖物在map.clearOverlays方法中被清除。
-		  		marker.enableMassClear();
-		  		
-		  		mapBValue.addOverlay(marker);
-			},
-			
-			// 根据站点坐标匹配库中的公交站点
-			stationsPointsToLibraryPoint : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var station = {};
-				var stationList = [];
-				(function(){
-					if (!arguments.callee.count) {
-						arguments.callee.count = 0;
-					}
-					arguments.callee.count++;
-					var index = parseInt(arguments.callee.count) - 1;
-					if (index >= len) {
-						callback && callback(stationList);
-			        	return ; 
-			        }
-					var f = arguments.callee;
-					station = arra[index];					
-					if(arra[index].name!=''){
-						
-						$.get('/station/matchStation',station,function(resultStation) {
-							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
-							f();
-						});							 
-					 }else {
-						 f();
-					 }	
-				})()
-			},
-			// 地图画多边形
-			pointsPolygon : function(objStation) {
-				
-				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapBValue.setZoom(15);
-				
-				// 如果不为空
-				if(objStation) {
-					
-					// 清除地图覆盖物
-					mapBValue.clearOverlays();
-					
-					// 获取中心点坐标字符串
-					var testpointStr = objStation.stationBJwpoints;
-					
-					// 按空格切割中心点坐标字符串
-					var BJwpointsPolygon = testpointStr.split(' ');
-					
-					// 中心点坐标
-					var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
-					
-					// 获取多边形坐标字符串
-					var stationBPolygonGrid = objStation.stationBPolygonGrid;
-					
-					// 截取多边形坐标字符串
-					var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
-					
-					// 按逗号切割
-					var pointPolygonArray = stationBPolygonGridStr.split(',');
-					
-					// 多边形坐标集合
-					var polygonP = [];
-					
-					for(var v = 0;v<pointPolygonArray.length;v++) {
-						
-						polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
-						
-					}
-					
-					// 画多边形
-					polygon = new BMap.Polygon(polygonP, {
-						
-						// 线条显色
-			  			strokeColor : "blue",
-			  			
-			  			// 边线的宽度，以像素为单位。
-			  			strokeWeight : 2,
-			  			
-			  			// 边线透明度，取值范围0 - 1。
-			  			strokeOpacity : 0.5
-			  		});
-					
-					// 增加地图覆盖物多边形
-					mapBValue.addOverlay(polygon);  
-					
-					// 信息窗口属性
-					var opts_polygon = {
-			  				
-		  					// 信息窗口宽度
-		  					width : 200,
-		  					
-		  					// 信息窗口高度
-		  					height : 400,
-		  					
-		  					// 信息窗位置偏移值。	
-		  					offset: new BMap.Size(500,20),
-		  					
-		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
-		  					//设置不允许信窗发送短息
-		  					enableMessage : false,
-		  					
-		  					//是否开启点击地图关闭信息窗口
-		  					enableCloseOnClick : false
-		  			};
-			  		
-					var markTypeStr = '';
-					
-					if(objStation.stationRouteStationMark=='B') {
-						
-						markTypeStr='起点站';
-						
-					}else if(objStation.stationRouteStationMark=='Z') {
-						
-						markTypeStr ='中途站';
-						
-						
-					}else if(objStation.stationRouteStationMark=='E') {
-						
-						markTypeStr='终点站';
-						
-					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode) + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions)+ '</span>' ;
-					
-					// 创建信息窗口
-					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
-				  	// 自定义标注物图片
-			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-			  	  	
-			  	  	// 创建点
-		  			marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
-		  			
-		  			// 把标注添物加到地图上
-		  			mapBValue.addOverlay(marker);
-		  	  		
-		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  	  		var PanOptions_ ={noAnimation :true};
-		  	  		
-		  	  		// 将地图的中心点更改为给定的点。
-		  	  		mapBValue.panTo(pointPolygon,PanOptions_);
-		  	  		
-		  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
-		  	  		mapBValue.panBy(10,-150,PanOptions_);
-		  	  		
-		  	  		//开启信息窗口
-		  	  		mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
-					
-				}
-				
-			},
-			
-			// 画圆
-			pointsCircle : function(objStation) {
-				
-				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapBValue.setZoom(16);
-				
-				if(objStation) {
-					
-					// 清除地图覆盖物
-					mapBValue.clearOverlays();
-					
-					// 获取中心坐标点字符串分割
-					var BJwpoints = objStation.stationBJwpoints.split(' ');
-					
-					// 中心坐标点
-					var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
-					
-					//创建圆
-			  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
-			  		
-			  		// 允许覆盖物在map.clearOverlays方法中被清除
-			  		circle.enableMassClear();
-			  		
-			  		// 百度地图添加覆盖物圆
-			  		mapBValue.addOverlay(circle);
-			  		
-			  		// 信息窗口参数属性
-			  		var opts = {
-			  				
-		  					// 信息窗口宽度
-		  					width : 200,
-		  					
-		  					// 信息窗口高度
-		  					height : 450,
-		  					
-		  					// 信息窗位置偏移值。
-		  					offset: new BMap.Size(500,120),
-		  					
-		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
-		  					//设置不允许信窗发送短息
-		  					enableMessage : false,
-		  					
-		  					//是否开启点击地图关闭信息窗口
-		  					enableCloseOnClick : false,
-		  					
-		  					// 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
-		  					enableAutoPan:false
-		  			};
-			  		
-			  		var markTypeStr = '';
-					
-					if(objStation.stationRouteStationMark=='B') {
-						
-						markTypeStr='起点站';
-						
-					}else if(objStation.stationRouteStationMark=='Z') {
-						
-						markTypeStr ='中途站';
-						
-						
-					}else if(objStation.stationRouteStationMark=='E') {
-						
-						markTypeStr='终点站';
-						
-					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode)+ '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions) + '</span>' ;
-			  		
-			  		// 创建信息窗口
-			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
-				  	// 自定义标注物图片
-			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-			  	  	
-			  	  	// 创建点
-		  			marker = new BMap.Marker(point,{icon : icon_target}); 
-		  			
-		  			// 把标注添物加到地图上
-		  			mapBValue.addOverlay(marker);
-		  	  		
-		  	  		setTimeout(function(){
-		  	  			//开启信息窗口
-			  	  		marker.openInfoWindow(infoWindow_target,point);
-		  			
-		  	  		},100);
-		  	  		
-		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  	  		var PanOptions_ ={noAnimation :true};
-		  	  		
-		  	  		// 将地图的中心点更改为给定的点。
-		  	  		mapBValue.panTo(point,PanOptions_);
-		  	  		
-		  	  		mapBValue.panBy(10,-200,PanOptions_);
-		  	  		
-		  	  		// 添加标志物监听事件
-		  	  		marker.addEventListener("click",function() {
-		  	  			
-		  	  			//开启信息窗口
-		  	  			marker.openInfoWindow(infoWindow_target,point);
-		  	  			
-		  	  		});
-					
-				}
-			 
-			},
-			// 编辑图形
-			editShapes : function(objStation) {
-				
-				// 清空地图
-				WorldsBMapLine.clearMarkAndOverlays();
-				
-				// 站点对象不为空
-				if(objStation) {
-					var stationShapesType = objStation.stationShapesType;
-					
-					// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-					mapBValue.setZoom(16);
-					
-					// 编辑圆
-					if(stationShapesType =='r') {
-						
-						// 获取中心坐标点字符串分割
-						var BJwpoints = objStation.stationBJwpoints.split(' ');
-						
-						// 中心坐标点
-						var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
-						
-						//创建圆
-				  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
-				  		
-				  		// 允许覆盖物在map.clearOverlays方法中被清除
-				  		circle.enableMassClear();
-				  		
-				  		// 百度地图添加覆盖物圆
-				  		mapBValue.addOverlay(circle);
-						
-						// 开启编辑功能
-						circle.enableEditing();
-						
-						// 是否在平移过程中禁止动画。（自1.2新增）
-			  	  		var PanOptions_ ={noAnimation :true};
-						
-						// 将地图的中心点更改为给定的点。
-			  	  		mapBValue.panTo(point,PanOptions_);
-			  	  		
-			  	  		mapBValue.panBy(10,-200,PanOptions_);
-						
-						// 编辑圆监听事件
-						circle.addEventListener('dblclick',function() {
-							
-							// 返回圆形的半径，单位为米。
-							var newRadius = circle.getRadius();
-							
-							// 返回圆形的中心点坐标。
-							var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
-							
-							/**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-							objStation.stationBJwpoints = newCenter;
-								
-							/**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-//							objStation.stationBJwpoints = 'r';
-								
-							/**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-							objStation.stationRadius =  Math.round(newRadius);
-								
-							/**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-							objStation.stationBPolygonGrid = '';
-							
-							// 加载编辑页面
-							$.get('editstation.html', function(m){
-								
-								$(pjaxContainer).append(m);
-								
-								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
-							
-							}); 
-							
-							// 打开按钮事件
-							PublicFunctions.editAChangeCssRemoveDisabled();
-						});
-					
-					// 编辑多边行
-					}else if(stationShapesType =='d') {
-							
-						// 清除地图覆盖物
-						mapBValue.clearOverlays();
-						
-						// 获取中心点坐标字符串
-						var testpointStr = objStation.stationBJwpoints;
-						
-						// 按空格切割中心点坐标字符串
-						var BJwpointsPolygon = testpointStr.split(' ');
-						
-						// 中心点坐标
-						var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
-						
-						// 获取多边形坐标字符串
-						var stationBPolygonGrid = objStation.stationBPolygonGrid;
-						
-						// 截取多边形坐标字符串
-						var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
-						
-						// 按逗号切割
-						var pointPolygonArray = stationBPolygonGridStr.split(',');
-						
-						// 多边形坐标集合
-						var polygonP = [];
-						
-						for(var v = 0;v<pointPolygonArray.length;v++) {
-							
-							polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
-							
-						}
-						
-						// 画多边形
-						polygon = new BMap.Polygon(polygonP, {
-							
-							// 线条显色
-				  			strokeColor : "blue",
-				  			
-				  			// 边线的宽度，以像素为单位。
-				  			strokeWeight : 2,
-				  			
-				  			// 边线透明度，取值范围0 - 1。
-				  			strokeOpacity : 0.5
-				  		});
-						
-						// 增加地图覆盖物多边形
-						mapBValue.addOverlay(polygon);  
-						
-						// 开启编辑功能(自 1.1 新增)
-						polygon.enableEditing();
-						
-						// 是否在平移过程中禁止动画。（自1.2新增）
-			  	  		var PanOptions_ ={noAnimation :true};
-			  	  		
-			  	  		// 将地图的中心点更改为给定的点。
-			  	  		mapBValue.panTo(pointPolygon,PanOptions_);
-			  	  		
-			  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
-			  	  		mapBValue.panBy(10,-150,PanOptions_);
-						
-						// 添加多变行编辑事件
-						polygon.addEventListener('dblclick',function(e) {
-							 
-							 // 获取编辑的多边形对象
-							 var edit_pointE = polygon;
-							 
-							 var edit_bPloygonGrid = "";
-							 
-							 var editPolyGonLen_ = edit_pointE.getPath().length;
-							 
-							 for(var k =0;k<editPolyGonLen_;k++) {
-									
-								 if(k==0) {
-										
-									 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-										
-								 }else {
-										
-									 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-										
-								 }
-									
-							 }
-							 
-							 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
-							 
-							 // 多边形中心点
-							 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
-							 
-							 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-							 objStation.stationBJwpoints = centre_points;
-								
-							 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-							 objStation.stationShapesType = 'd';;
-								
-							 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-							 objStation.stationRadius = '';
-								
-							 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-							 objStation.stationBPolygonGrid = edit_bPloygonGrid;
-							 
-							 $.get('editstation.html', function(m){
-								 
-								 $(pjaxContainer).append(m);
-								 
-								 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
-								 
-							 });
-							
-							 // 打开按钮事件
-							 PublicFunctions.editAChangeCssRemoveDisabled();
-						});
-						
-					}
-				}
-			},
-			
-			localtionPoint : function(stationNameV) {
-				
-				WorldsBMapLine.localSearchFromAdreesToPoint(stationNameV,function(Points) {
-					
-					if(Points) {
-						
-						var BJwpointsArray = Points.split(' ');
-						
-						var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
-						
-				  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
-				  		
-				  		var PanOptions ={noAnimation :true};
-				  		
-				  		mapBValue.panTo(stationNameChangePoint,PanOptions);
-				  		
-				  		mapBValue.panBy(0,-100);
-				  		
-				  		// 将标注添加到地图中
-				  		mapBValue.addOverlay(marker_stargt2);  
-				  		
-				  		//跳动的动画
-				  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
-						
-					}
-					
-				});
-				
-			},
-			
-			// 根据地理名称获取百度经纬度坐标
-			localSearchFromAdreesToPoint: function(Address,callback) {
-				
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapBValue);
-				
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					
-					var resultPoints = '';
-					
-					if(searchResult) {
-						
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						
-						if(poi) {
-							
-							//获取经度和纬度
-							resultPoints = poi.point.lng + ' ' + poi.point.lat;
-							
-							callback && callback(resultPoints);
-							
-						}else {
-							
-							callback && callback(false);
-							
-						}
-						
-					}else {
-						
-						callback && callback(false);
-					}
-					
-				});
-				
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-				
-			},
-			
-			clearMarkAndOverlays : function() {
-				
-				// 清楚地图覆盖物
-				mapBValue.clearOverlays();
-				
-				mapBValue.removeOverlay();
-				
-			}
-			
-	}
-	
-	return Bmap;
-	
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
+ */
+
+var WorldsBMapLine = function () {
+	
+	/** WorldsBMapLine 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = null, isCutSection = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("bmap_basic");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 20);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
+			/** 第一个切路段的点 */
+			setFirstPoint : function(Point) {
+				firstPoint = Point;
+			},
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			drawingSection: function(data){
+				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
+				WorldsBMapLine.clearMarkAndOverlays();
+				// 编辑路段数据
+				if(data) {
+					// 地图折线坐标点集合
+					var polylineArray = [];
+					// 获取路段折线坐标字符串
+					var sectionBsectionVectorStr = data.sectionBsectionVector;
+					if(sectionBsectionVectorStr==null) {
+						return;
+					}
+					// 切割段折线坐标字符串
+					var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
+					// 分割折线坐标字符串
+					var lineArray = tempStr.split(',');
+					for(var i = 0;i<lineArray.length;i++) {
+						polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+					}
+					var index = parseInt(polylineArray.length/2);
+					var center = polylineArray[index];
+					/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
+					WorldsBMapLine.drawingUpline(polylineArray,center);
+					/** 在地图上画点 @param：<point_center：中心坐标点> */
+					WorldsBMapLine.drawingUpStationPoint(center,data.sectionName,1);
+				}
+			},
+			// 在地图上画出上行线路走向（单路段）
+			drawingUpline : function (polylineArray,polyline_center,data) {
+				/*WorldsBMap.clearMarkAndOverlays();*/
+				polyUpline = '';
+				// 创建线路走向
+				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				// polyUpline.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline);
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			
+			// 在地图上画出上行线路走向（多路段）
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(WorldsBMapLine.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(WorldsBMapLine.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					WorldsBMapLine.setIsEditStatus(true);
+					// 关闭按钮事件
+					PublicFunctions.addAChangeCssAddDisabled();
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(WorldsBMapLine.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					WorldsBMapLine.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [WorldsBMapLine,MapGetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+					// 打开按钮事件
+					PublicFunctions.editAChangeCssRemoveDisabled();
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(WorldsBMapLine.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					var label = new BMap.Label(pointIndex+1,{offset:new BMap.Size(pointIndex>8?0:4,0)});
+					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
+					marker.setLabel(label);
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					WorldsBMapLine.setIsCutSection(true);
+				}
+				// 路段生成类型位gps上传时才开启右击事件
+				if(EditRoute.getLineGenerationType() == 'uploadGPS') {
+					var markerMenu=new BMap.ContextMenu();
+					markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+					polyUpline01.addContextMenu(markerMenu);
+				}
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},
+			// 批量画点
+			batchPaintingPoint : function() {
+				// 画第一个点
+				var Point = WorldsBMapLine.getFirstPoint();
+				if(Point){
+					var marker = new BMap.Marker(new BMap.Point(Point.lng, Point.lat)); // 创建点
+					var label = new BMap.Label(1,{offset:new BMap.Size(4,0)});
+					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
+					marker.setLabel(label);
+					marker.isFlag = true;
+					mapBValue.addOverlay(marker);// 添加覆盖物
+					
+					WorldsBMapLine.getFirstPoint();
+				}
+				$.each(sectionList, function(index, value) {
+					var section = value.section;
+					
+					var marker = new BMap.Marker(new BMap.Point(section[1].lng, section[1].lat)); // 创建点
+					var label = new BMap.Label(index+2,{offset:new BMap.Size(index>7?0:4,0)});
+					label.setStyle({border :"0", color : "white",backgroundColor:"rgba(0,0,0,0)"});
+					marker.setLabel(label);
+					marker.isFlag = true;
+					mapBValue.addOverlay(marker);// 添加覆盖物
+				});
+
+			},
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			// 地图画多边形
+			pointsPolygon : function(objStation) {
+				
+				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+				mapBValue.setZoom(15);
+				
+				// 如果不为空
+				if(objStation) {
+					
+					// 清除地图覆盖物
+					mapBValue.clearOverlays();
+					
+					// 获取中心点坐标字符串
+					var testpointStr = objStation.stationBJwpoints;
+					
+					// 按空格切割中心点坐标字符串
+					var BJwpointsPolygon = testpointStr.split(' ');
+					
+					// 中心点坐标
+					var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
+					
+					// 获取多边形坐标字符串
+					var stationBPolygonGrid = objStation.stationBPolygonGrid;
+					
+					// 截取多边形坐标字符串
+					var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
+					
+					// 按逗号切割
+					var pointPolygonArray = stationBPolygonGridStr.split(',');
+					
+					// 多边形坐标集合
+					var polygonP = [];
+					
+					for(var v = 0;v<pointPolygonArray.length;v++) {
+						
+						polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
+						
+					}
+					
+					// 画多边形
+					polygon = new BMap.Polygon(polygonP, {
+						
+						// 线条显色
+			  			strokeColor : "blue",
+			  			
+			  			// 边线的宽度，以像素为单位。
+			  			strokeWeight : 2,
+			  			
+			  			// 边线透明度，取值范围0 - 1。
+			  			strokeOpacity : 0.5
+			  		});
+					
+					// 增加地图覆盖物多边形
+					mapBValue.addOverlay(polygon);  
+					
+					// 信息窗口属性
+					var opts_polygon = {
+			  				
+		  					// 信息窗口宽度
+		  					width : 200,
+		  					
+		  					// 信息窗口高度
+		  					height : 400,
+		  					
+		  					// 信息窗位置偏移值。	
+		  					offset: new BMap.Size(500,20),
+		  					
+		  					//标题
+		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
+		  					
+		  					//设置不允许信窗发送短息
+		  					enableMessage : false,
+		  					
+		  					//是否开启点击地图关闭信息窗口
+		  					enableCloseOnClick : false
+		  			};
+			  		
+					var markTypeStr = '';
+					
+					if(objStation.stationRouteStationMark=='B') {
+						
+						markTypeStr='起点站';
+						
+					}else if(objStation.stationRouteStationMark=='Z') {
+						
+						markTypeStr ='中途站';
+						
+						
+					}else if(objStation.stationRouteStationMark=='E') {
+						
+						markTypeStr='终点站';
+						
+					}
+			  		
+			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
+								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode) + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
+								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
+								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
+								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions)+ '</span>' ;
+					
+					// 创建信息窗口
+					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
+				  	// 自定义标注物图片
+			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+			  	  	
+			  	  	// 创建点
+		  			marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
+		  			
+		  			// 把标注添物加到地图上
+		  			mapBValue.addOverlay(marker);
+		  	  		
+		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  	  		var PanOptions_ ={noAnimation :true};
+		  	  		
+		  	  		// 将地图的中心点更改为给定的点。
+		  	  		mapBValue.panTo(pointPolygon,PanOptions_);
+		  	  		
+		  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
+		  	  		mapBValue.panBy(10,-150,PanOptions_);
+		  	  		
+		  	  		//开启信息窗口
+		  	  		mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
+					
+				}
+				
+			},
+			
+			// 画圆
+			pointsCircle : function(objStation) {
+				
+				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+				mapBValue.setZoom(16);
+				
+				if(objStation) {
+					
+					// 清除地图覆盖物
+					mapBValue.clearOverlays();
+					
+					// 获取中心坐标点字符串分割
+					var BJwpoints = objStation.stationBJwpoints.split(' ');
+					
+					// 中心坐标点
+					var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
+					
+					//创建圆
+			  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+			  		
+			  		// 允许覆盖物在map.clearOverlays方法中被清除
+			  		circle.enableMassClear();
+			  		
+			  		// 百度地图添加覆盖物圆
+			  		mapBValue.addOverlay(circle);
+			  		
+			  		// 信息窗口参数属性
+			  		var opts = {
+			  				
+		  					// 信息窗口宽度
+		  					width : 200,
+		  					
+		  					// 信息窗口高度
+		  					height : 450,
+		  					
+		  					// 信息窗位置偏移值。
+		  					offset: new BMap.Size(500,120),
+		  					
+		  					//标题
+		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
+		  					
+		  					//设置不允许信窗发送短息
+		  					enableMessage : false,
+		  					
+		  					//是否开启点击地图关闭信息窗口
+		  					enableCloseOnClick : false,
+		  					
+		  					// 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
+		  					enableAutoPan:false
+		  			};
+			  		
+			  		var markTypeStr = '';
+					
+					if(objStation.stationRouteStationMark=='B') {
+						
+						markTypeStr='起点站';
+						
+					}else if(objStation.stationRouteStationMark=='Z') {
+						
+						markTypeStr ='中途站';
+						
+						
+					}else if(objStation.stationRouteStationMark=='E') {
+						
+						markTypeStr='终点站';
+						
+					}
+			  		
+			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
+								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">行业编码：' + (objStation.industryCode  == null ? "":objStation.industryCode)+ '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本号&nbsp&nbsp：' + objStation.stationRouteVersions + '</span>' +
+								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
+								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
+								objStation.stationRouteDescriptions +'" >说明/描述：' + (objStation.stationRouteDescriptions  == null ? "":objStation.stationRouteDescriptions) + '</span>' ;
+			  		
+			  		// 创建信息窗口
+			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
+				  	// 自定义标注物图片
+			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+			  	  	
+			  	  	// 创建点
+		  			marker = new BMap.Marker(point,{icon : icon_target}); 
+		  			
+		  			// 把标注添物加到地图上
+		  			mapBValue.addOverlay(marker);
+		  	  		
+		  	  		setTimeout(function(){
+		  	  			//开启信息窗口
+			  	  		marker.openInfoWindow(infoWindow_target,point);
+		  			
+		  	  		},100);
+		  	  		
+		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  	  		var PanOptions_ ={noAnimation :true};
+		  	  		
+		  	  		// 将地图的中心点更改为给定的点。
+		  	  		mapBValue.panTo(point,PanOptions_);
+		  	  		
+		  	  		mapBValue.panBy(10,-200,PanOptions_);
+		  	  		
+		  	  		// 添加标志物监听事件
+		  	  		marker.addEventListener("click",function() {
+		  	  			
+		  	  			//开启信息窗口
+		  	  			marker.openInfoWindow(infoWindow_target,point);
+		  	  			
+		  	  		});
+					
+				}
+			 
+			},
+			// 编辑图形
+			editShapes : function(objStation) {
+				
+				// 清空地图
+				WorldsBMapLine.clearMarkAndOverlays();
+				
+				// 站点对象不为空
+				if(objStation) {
+					var stationShapesType = objStation.stationShapesType;
+					
+					// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+					mapBValue.setZoom(16);
+					
+					// 编辑圆
+					if(stationShapesType =='r') {
+						
+						// 获取中心坐标点字符串分割
+						var BJwpoints = objStation.stationBJwpoints.split(' ');
+						
+						// 中心坐标点
+						var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
+						
+						//创建圆
+				  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+				  		
+				  		// 允许覆盖物在map.clearOverlays方法中被清除
+				  		circle.enableMassClear();
+				  		
+				  		// 百度地图添加覆盖物圆
+				  		mapBValue.addOverlay(circle);
+						
+						// 开启编辑功能
+						circle.enableEditing();
+						
+						// 是否在平移过程中禁止动画。（自1.2新增）
+			  	  		var PanOptions_ ={noAnimation :true};
+						
+						// 将地图的中心点更改为给定的点。
+			  	  		mapBValue.panTo(point,PanOptions_);
+			  	  		
+			  	  		mapBValue.panBy(10,-200,PanOptions_);
+						
+						// 编辑圆监听事件
+						circle.addEventListener('dblclick',function() {
+							
+							// 返回圆形的半径，单位为米。
+							var newRadius = circle.getRadius();
+							
+							// 返回圆形的中心点坐标。
+							var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
+							
+							/**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+							objStation.stationBJwpoints = newCenter;
+								
+							/**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+//							objStation.stationBJwpoints = 'r';
+								
+							/**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+							objStation.stationRadius =  Math.round(newRadius);
+								
+							/**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+							objStation.stationBPolygonGrid = '';
+							
+							// 加载编辑页面
+							$.get('editstation.html', function(m){
+								
+								$(pjaxContainer).append(m);
+								
+								$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
+							
+							}); 
+							
+							// 打开按钮事件
+							PublicFunctions.editAChangeCssRemoveDisabled();
+						});
+					
+					// 编辑多边行
+					}else if(stationShapesType =='d') {
+							
+						// 清除地图覆盖物
+						mapBValue.clearOverlays();
+						
+						// 获取中心点坐标字符串
+						var testpointStr = objStation.stationBJwpoints;
+						
+						// 按空格切割中心点坐标字符串
+						var BJwpointsPolygon = testpointStr.split(' ');
+						
+						// 中心点坐标
+						var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
+						
+						// 获取多边形坐标字符串
+						var stationBPolygonGrid = objStation.stationBPolygonGrid;
+						
+						// 截取多边形坐标字符串
+						var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
+						
+						// 按逗号切割
+						var pointPolygonArray = stationBPolygonGridStr.split(',');
+						
+						// 多边形坐标集合
+						var polygonP = [];
+						
+						for(var v = 0;v<pointPolygonArray.length;v++) {
+							
+							polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
+							
+						}
+						
+						// 画多边形
+						polygon = new BMap.Polygon(polygonP, {
+							
+							// 线条显色
+				  			strokeColor : "blue",
+				  			
+				  			// 边线的宽度，以像素为单位。
+				  			strokeWeight : 2,
+				  			
+				  			// 边线透明度，取值范围0 - 1。
+				  			strokeOpacity : 0.5
+				  		});
+						
+						// 增加地图覆盖物多边形
+						mapBValue.addOverlay(polygon);  
+						
+						// 开启编辑功能(自 1.1 新增)
+						polygon.enableEditing();
+						
+						// 是否在平移过程中禁止动画。（自1.2新增）
+			  	  		var PanOptions_ ={noAnimation :true};
+			  	  		
+			  	  		// 将地图的中心点更改为给定的点。
+			  	  		mapBValue.panTo(pointPolygon,PanOptions_);
+			  	  		
+			  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
+			  	  		mapBValue.panBy(10,-150,PanOptions_);
+						
+						// 添加多变行编辑事件
+						polygon.addEventListener('dblclick',function(e) {
+							 
+							 // 获取编辑的多边形对象
+							 var edit_pointE = polygon;
+							 
+							 var edit_bPloygonGrid = "";
+							 
+							 var editPolyGonLen_ = edit_pointE.getPath().length;
+							 
+							 for(var k =0;k<editPolyGonLen_;k++) {
+									
+								 if(k==0) {
+										
+									 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+										
+								 }else {
+										
+									 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+										
+								 }
+									
+							 }
+							 
+							 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
+							 
+							 // 多边形中心点
+							 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
+							 
+							 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+							 objStation.stationBJwpoints = centre_points;
+								
+							 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+							 objStation.stationShapesType = 'd';;
+								
+							 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+							 objStation.stationRadius = '';
+								
+							 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+							 objStation.stationBPolygonGrid = edit_bPloygonGrid;
+							 
+							 $.get('editstation.html', function(m){
+								 
+								 $(pjaxContainer).append(m);
+								 
+								 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMapLine,MapGetAjaxData,PublicFunctions,objStation]);
+								 
+							 });
+							
+							 // 打开按钮事件
+							 PublicFunctions.editAChangeCssRemoveDisabled();
+						});
+						
+					}
+				}
+			},
+			
+			localtionPoint : function(stationNameV) {
+				
+				WorldsBMapLine.localSearchFromAdreesToPoint(stationNameV,function(Points) {
+					
+					if(Points) {
+						
+						var BJwpointsArray = Points.split(' ');
+						
+						var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
+						
+				  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
+				  		
+				  		var PanOptions ={noAnimation :true};
+				  		
+				  		mapBValue.panTo(stationNameChangePoint,PanOptions);
+				  		
+				  		mapBValue.panBy(0,-100);
+				  		
+				  		// 将标注添加到地图中
+				  		mapBValue.addOverlay(marker_stargt2);  
+				  		
+				  		//跳动的动画
+				  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
+						
+					}
+					
+				});
+				
+			},
+			
+			// 根据地理名称获取百度经纬度坐标
+			localSearchFromAdreesToPoint: function(Address,callback) {
+				
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapBValue);
+				
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					
+					var resultPoints = '';
+					
+					if(searchResult) {
+						
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						
+						if(poi) {
+							
+							//获取经度和纬度
+							resultPoints = poi.point.lng + ' ' + poi.point.lat;
+							
+							callback && callback(resultPoints);
+							
+						}else {
+							
+							callback && callback(false);
+							
+						}
+						
+					}else {
+						
+						callback && callback(false);
+					}
+					
+				});
+				
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+				
+			},
+			
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
 }();
 \ No newline at end of file
-var SectionVmapWorlds = function() {
-	var mapB = '', drawingManager = '';
-	var Bmap = {
-			init : function() {
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
-				mapB = new BMap.Map("roadBmap_basic");// 初始化百度地图
-				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
-				mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
-				mapB.enableScrollWheelZoom(); //启用地图滚轮放大缩小
-				mapB.disableDoubleClickZoom();//禁用鼠标双击放大
-				mapB.enableKeyboard();//启用键盘上下左右键移动地图
-				var styleOptions = {
-						strokeColor : "blue",//边线颜色。
-						fillColor : "blue",//填充颜色。当参数为空时，圆形将没有填充效果。
-						strokeWeight : 3,//边线的宽度，以像素为单位。
-						strokeOpacity : 0.8,//边线的宽度，以像素为单位。
-						fillOpacity : 0.6,//填充的透明度，取值范围0 - 1。
-						strokeStyle : 'solid' //边线的样式，solid或dashed。
-				};
-				// 创建鼠标绘制管理类
-				drawingManager = new BMapLib.DrawingManager(mapB, {
-					isOpen : false,//是否开启绘制模式
-					enableDrawingTool : false,//是否显示工具栏
-					drawingToolOptions : {
-						anchor : BMAP_ANCHOR_TOP_RIGHT,//位置
-						offset : new BMap.Size(5, 5),//偏离值
-						scale : 0.8//工具栏缩放比例
-						
-					},
-					polylineOptions : styleOptions//线的样式
-				});
-				// 添加绘画完成事件
-				drawingManager.addEventListener('polylinecomplete', function(e) {
-					drawingManager.close();
-					var editPloyLineArray = e.getPath();// 获取折线坐标集合
-					$('#bRoadVectorInput').val(JSON.stringify(editPloyLineArray));
-				});
-				return mapB;
-			},
-			// 根据地理名称获取百度经纬度坐标进行定位.
-			localSearchFromAdreesToPoint: function(Address) {
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapB);
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					var resultPoints = '';
-					if(searchResult) {
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						if(poi) {
-							//获取经度和纬度
-            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
-            		  		marker = new BMap.Marker(stationNameChangePoint); 
-            		  		var PanOptions ={noAnimation :true};
-            		  		mapB.panTo(stationNameChangePoint,PanOptions);
-            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-            		  		mapB.setZoom(16);
-            		  		mapB.panBy(-300,-50);
-            		  		// 将标注添加到地图中
-            		  		mapB.addOverlay(marker);  
-            		  		//跳动的动画
-            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
-						}else {
-							// 弹出添加成功提示消息
-							layer.msg('无法获取【'+Address+'】地理位置！');
-						}
-					}else {
-						// 弹出添加成功提示消息
-						layer.msg('无法获取【'+Address+'】地理位置！');
-					}
-				});
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-			},
-			// 根据名称获取坐标.
-			stationsNameToPoints : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var stationList = [];
-				(function(){
-					 if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len) {
-						 callback && callback(stationList);
-			              return;
-			          }
-					 var f = arguments.callee;
-					 if(arra[index]!=''){
-						 var localSearch = new BMap.LocalSearch(mapB);
-						 localSearch.search(arra[index]);
-						 localSearch.setSearchCompleteCallback(function (searchResult) {
-							 var poi = searchResult.getPoi(0);
-							 if(poi) {
-								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
-								 f();
-							 }
-						 });
-					 }else {
-						 f();
-					 }
-				})();
-			},
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				// 获取长度
-				var len = points.length;
-				(function(){
-					if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len-1) {
-						 callback && callback(points);
-			              return;
-			          }
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 var region = '上海';
-					 var origin_region = '上海';
-					 var destination_region = '上海';
-					 var output = 'json';
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 /** 
-					  *  @param :< origin：起点名称或经纬度；destination：终点名称或经纬度；origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  		 destination_region：终点所在城市，驾车导航时必填。output :表示输出类型，可设置为xml或json，默认为xml。>
-					  *  
-					  *  @returns :r <jsonp格式> 
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              data: paramsB,
-			              dataType: 'jsonp',
-			              success: function(r){
-			            	  if(r) {
-			            		  if(r.message=='ok') {
-			            			  // 获取距离(单位：米)
-			            			  points[index+1].distance = r.result.taxi.distance;
-			            			  // 获取时间(单位：秒)
-			            			  points[index+1].duration = r.result.taxi.duration;
-			            		  }
-			            	  }
-			            	  f();
-			              }
-			          });
-				})();
-			},
-			// 获取路段几何图形坐标集合.
-			getSectionListPlonly : function(stationsPoint,cb) {
-				var len = stationsPoint.length;
-				var sectionList = [];
-				(function(){
-					 if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len-1 ) {
-						cb && cb(sectionList);
-			              return;
-			          }
-					 var f = arguments.callee;
-					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
-					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
-					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
-					 function searchPolylinesSet(results){
-						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
-						 }else {
-							 var sectionArrayList = [];
-							 for (i = 0; i < results.length; i++){
-								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
-							 }
-							 sectionList = sectionArrayList;
-						 }
-						f();
-					}
-					 transit.search(poiOne,poiTwo);
-				})();
-			},
-			// 清楚地图覆盖物
-			clearMarkAndOverlays : function() {
-				mapB.clearOverlays();
-			},
-			// 关闭绘画工具.
-			drawingManagerClose : function() {
-				drawingManager.close();
-			},
-			// 打开绘画工具.
-			drawingManagerOpen : function() {
-				drawingManager.open();// 打开鼠标绘画工具.
-				drawingManager.setDrawingMode(BMAP_DRAWING_POLYLINE);// 设置属性.
-			}
-	}
-	
-	return Bmap;
-
+var SectionVmapWorlds = function() {
+	var mapB = '', drawingManager = '';
+	var Bmap = {
+			init : function() {
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
+				mapB = new BMap.Map("roadBmap_basic");// 初始化百度地图
+				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
+				mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
+				mapB.enableScrollWheelZoom(); //启用地图滚轮放大缩小
+				mapB.disableDoubleClickZoom();//禁用鼠标双击放大
+				mapB.enableKeyboard();//启用键盘上下左右键移动地图
+				var styleOptions = {
+						strokeColor : "blue",//边线颜色。
+						fillColor : "blue",//填充颜色。当参数为空时，圆形将没有填充效果。
+						strokeWeight : 3,//边线的宽度，以像素为单位。
+						strokeOpacity : 0.8,//边线的宽度，以像素为单位。
+						fillOpacity : 0.6,//填充的透明度，取值范围0 - 1。
+						strokeStyle : 'solid' //边线的样式，solid或dashed。
+				};
+				// 创建鼠标绘制管理类
+				drawingManager = new BMapLib.DrawingManager(mapB, {
+					isOpen : false,//是否开启绘制模式
+					enableDrawingTool : false,//是否显示工具栏
+					drawingToolOptions : {
+						anchor : BMAP_ANCHOR_TOP_RIGHT,//位置
+						offset : new BMap.Size(5, 5),//偏离值
+						scale : 0.8//工具栏缩放比例
+						
+					},
+					polylineOptions : styleOptions//线的样式
+				});
+				// 添加绘画完成事件
+				drawingManager.addEventListener('polylinecomplete', function(e) {
+					drawingManager.close();
+					var editPloyLineArray = e.getPath();// 获取折线坐标集合
+					$('#bRoadVectorInput').val(JSON.stringify(editPloyLineArray));
+				});
+				return mapB;
+			},
+			// 根据地理名称获取百度经纬度坐标进行定位.
+			localSearchFromAdreesToPoint: function(Address) {
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapB);
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					var resultPoints = '';
+					if(searchResult) {
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						if(poi) {
+							//获取经度和纬度
+            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
+            		  		marker = new BMap.Marker(stationNameChangePoint); 
+            		  		var PanOptions ={noAnimation :true};
+            		  		mapB.panTo(stationNameChangePoint,PanOptions);
+            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+            		  		mapB.setZoom(16);
+            		  		mapB.panBy(-300,-50);
+            		  		// 将标注添加到地图中
+            		  		mapB.addOverlay(marker);  
+            		  		//跳动的动画
+            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
+						}else {
+							// 弹出添加成功提示消息
+							layer.msg('无法获取【'+Address+'】地理位置！');
+						}
+					}else {
+						// 弹出添加成功提示消息
+						layer.msg('无法获取【'+Address+'】地理位置！');
+					}
+				});
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+			},
+			// 根据名称获取坐标.
+			stationsNameToPoints : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var stationList = [];
+				(function(){
+					 if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len) {
+						 callback && callback(stationList);
+			              return;
+			          }
+					 var f = arguments.callee;
+					 if(arra[index]!=''){
+						 var localSearch = new BMap.LocalSearch(mapB);
+						 localSearch.search(arra[index]);
+						 localSearch.setSearchCompleteCallback(function (searchResult) {
+							 var poi = searchResult.getPoi(0);
+							 if(poi) {
+								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
+								 f();
+							 }
+						 });
+					 }else {
+						 f();
+					 }
+				})();
+			},
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				// 获取长度
+				var len = points.length;
+				(function(){
+					if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len-1) {
+						 callback && callback(points);
+			              return;
+			          }
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 var origin_region = '上海';
+					 var destination_region = '上海';
+					 var output = 'json';
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 /** 
+					  *  @param :< origin：起点名称或经纬度；destination：终点名称或经纬度；origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  		 destination_region：终点所在城市，驾车导航时必填。output :表示输出类型，可设置为xml或json，默认为xml。>
+					  *  
+					  *  @returns :r <jsonp格式> 
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              data: paramsB,
+			              dataType: 'jsonp',
+			              success: function(r){
+			            	  if(r) {
+			            		  if(r.message=='ok') {
+			            			  // 获取距离(单位：米)
+			            			  points[index+1].distance = r.result.taxi.distance;
+			            			  // 获取时间(单位：秒)
+			            			  points[index+1].duration = r.result.taxi.duration;
+			            		  }
+			            	  }
+			            	  f();
+			              }
+			          });
+				})();
+			},
+			// 获取路段几何图形坐标集合.
+			getSectionListPlonly : function(stationsPoint,cb) {
+				var len = stationsPoint.length;
+				var sectionList = [];
+				(function(){
+					 if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len-1 ) {
+						cb && cb(sectionList);
+			              return;
+			          }
+					 var f = arguments.callee;
+					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
+					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
+					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
+					 function searchPolylinesSet(results){
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+						 }else {
+							 var sectionArrayList = [];
+							 for (i = 0; i < results.length; i++){
+								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
+							 }
+							 sectionList = sectionArrayList;
+						 }
+						f();
+					}
+					 transit.search(poiOne,poiTwo);
+				})();
+			},
+			// 清楚地图覆盖物
+			clearMarkAndOverlays : function() {
+				mapB.clearOverlays();
+			},
+			// 关闭绘画工具.
+			drawingManagerClose : function() {
+				drawingManager.close();
+			},
+			// 打开绘画工具.
+			drawingManagerOpen : function() {
+				drawingManager.open();// 打开鼠标绘画工具.
+				drawingManager.setDrawingMode(BMAP_DRAWING_POLYLINE);// 设置属性.
+			}
+	}
+	
+	return Bmap;
+
 }();
 \ No newline at end of file
-var SectionVmapWorlds = function() {
-	var mapB = '', drawingManager = '';
-	var Bmap = {
-			init : function() {
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
-				mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
-				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
-				mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
-				mapB.enableScrollWheelZoom(); //启用地图滚轮放大缩小
-				mapB.disableDoubleClickZoom();//禁用鼠标双击放大
-				mapB.enableKeyboard();//启用键盘上下左右键移动地图
-				var styleOptions = {
-						strokeColor : "blue",//边线颜色。
-						fillColor : "blue",//填充颜色。当参数为空时，圆形将没有填充效果。
-						strokeWeight : 3,//边线的宽度，以像素为单位。
-						strokeOpacity : 0.8,//边线的宽度，以像素为单位。
-						fillOpacity : 0.6,//填充的透明度，取值范围0 - 1。
-						strokeStyle : 'solid' //边线的样式，solid或dashed。
-				};
-				// 创建鼠标绘制管理类
-				drawingManager = new BMapLib.DrawingManager(mapB, {
-					isOpen : false,//是否开启绘制模式
-					enableDrawingTool : false,//是否显示工具栏
-					drawingToolOptions : {
-						anchor : BMAP_ANCHOR_TOP_RIGHT,//位置
-						offset : new BMap.Size(5, 5),//偏离值
-						scale : 0.8//工具栏缩放比例
-						
-					},
-					polylineOptions : styleOptions//线的样式
-				});
-				// 添加绘画完成事件
-				drawingManager.addEventListener('polylinecomplete', function(e) {
-					drawingManager.close();
-					var editPloyLineArray = e.getPath();// 获取折线坐标集合
-					$('#bsectionVectorInput').val(JSON.stringify(editPloyLineArray));
-				});
-				return mapB;
-			},
-			// 根据地理名称获取百度经纬度坐标进行定位.
-			localSearchFromAdreesToPoint: function(Address) {
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapB);
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					var resultPoints = '';
-					if(searchResult) {
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						if(poi) {
-							//获取经度和纬度
-            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
-            		  		marker = new BMap.Marker(stationNameChangePoint); 
-            		  		var PanOptions ={noAnimation :true};
-            		  		mapB.panTo(stationNameChangePoint,PanOptions);
-            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-            		  		mapB.setZoom(16);
-            		  		mapB.panBy(-300,-50);
-            		  		// 将标注添加到地图中
-            		  		mapB.addOverlay(marker);  
-            		  		//跳动的动画
-            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
-						}else {
-							// 弹出添加成功提示消息
-							layer.msg('无法获取【'+Address+'】地理位置！');
-						}
-					}else {
-						// 弹出添加成功提示消息
-						layer.msg('无法获取【'+Address+'】地理位置！');
-					}
-				});
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-			},
-			// 根据名称获取坐标.
-			stationsNameToPoints : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var stationList = [];
-				(function(){
-					 if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len) {
-						 callback && callback(stationList);
-			              return;
-			          }
-					 var f = arguments.callee;
-					 if(arra[index]!=''){
-						 var localSearch = new BMap.LocalSearch(mapB);
-						 localSearch.search(arra[index]);
-						 localSearch.setSearchCompleteCallback(function (searchResult) {
-							 var poi = searchResult.getPoi(0);
-							 if(poi) {
-								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
-								 f();
-							 }
-						 });
-					 }else {
-						 f();
-					 }
-				})();
-			},
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				// 获取长度
-				var len = points.length;
-				(function(){
-					if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len-1) {
-						 callback && callback(points);
-			              return;
-			          }
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 var region = '上海';
-					 var origin_region = '上海';
-					 var destination_region = '上海';
-					 var output = 'json';
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 /** 
-					  *  @param :< origin：起点名称或经纬度；destination：终点名称或经纬度；origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  		 destination_region：终点所在城市，驾车导航时必填。output :表示输出类型，可设置为xml或json，默认为xml。>
-					  *  
-					  *  @returns :r <jsonp格式> 
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              data: paramsB,
-			              dataType: 'jsonp',
-			              success: function(r){
-			            	  if(r) {
-			            		  if(r.message=='ok') {
-			            			  // 获取距离(单位：米)
-			            			  points[index+1].distance = r.result.taxi.distance;
-			            			  // 获取时间(单位：秒)
-			            			  points[index+1].duration = r.result.taxi.duration;
-			            		  }
-			            	  }
-			            	  f();
-			              }
-			          });
-				})();
-			},
-			// 获取路段几何图形坐标集合.
-			getSectionListPlonly : function(stationsPoint,cb) {
-				var len = stationsPoint.length;
-				var sectionList = [];
-				(function(){
-					 if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len-1 ) {
-						cb && cb(sectionList);
-			              return;
-			          }
-					 var f = arguments.callee;
-					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
-					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
-					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
-					 function searchPolylinesSet(results){
-						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
-						 }else {
-							 var sectionArrayList = [];
-							 for (i = 0; i < results.length; i++){
-								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
-							 }
-							 sectionList = sectionArrayList;
-						 }
-						f();
-					}
-					 transit.search(poiOne,poiTwo);
-				})();
-			},
-			// 清楚地图覆盖物
-			clearMarkAndOverlays : function() {
-				mapB.clearOverlays();
-			},
-			// 关闭绘画工具.
-			drawingManagerClose : function() {
-				drawingManager.close();
-			},
-			// 打开绘画工具.
-			drawingManagerOpen : function() {
-				drawingManager.open();// 打开鼠标绘画工具.
-				drawingManager.setDrawingMode(BMAP_DRAWING_POLYLINE);// 设置属性.
-			}
-	}
-	
-	return Bmap;
-
+var SectionVmapWorlds = function() {
+	var mapB = '', drawingManager = '';
+	var Bmap = {
+			init : function() {
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};// 设置中心点.
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';// 百度API Key
+				mapB = new BMap.Map("sectionBmap_basic");// 初始化百度地图
+				mapB.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);//中心点和缩放级别
+				mapB.enableDragging(); //启用地图拖拽事件，默认启用(可不写)
+				mapB.enableScrollWheelZoom(); //启用地图滚轮放大缩小
+				mapB.disableDoubleClickZoom();//禁用鼠标双击放大
+				mapB.enableKeyboard();//启用键盘上下左右键移动地图
+				var styleOptions = {
+						strokeColor : "blue",//边线颜色。
+						fillColor : "blue",//填充颜色。当参数为空时，圆形将没有填充效果。
+						strokeWeight : 3,//边线的宽度，以像素为单位。
+						strokeOpacity : 0.8,//边线的宽度，以像素为单位。
+						fillOpacity : 0.6,//填充的透明度，取值范围0 - 1。
+						strokeStyle : 'solid' //边线的样式，solid或dashed。
+				};
+				// 创建鼠标绘制管理类
+				drawingManager = new BMapLib.DrawingManager(mapB, {
+					isOpen : false,//是否开启绘制模式
+					enableDrawingTool : false,//是否显示工具栏
+					drawingToolOptions : {
+						anchor : BMAP_ANCHOR_TOP_RIGHT,//位置
+						offset : new BMap.Size(5, 5),//偏离值
+						scale : 0.8//工具栏缩放比例
+						
+					},
+					polylineOptions : styleOptions//线的样式
+				});
+				// 添加绘画完成事件
+				drawingManager.addEventListener('polylinecomplete', function(e) {
+					drawingManager.close();
+					var editPloyLineArray = e.getPath();// 获取折线坐标集合
+					$('#bsectionVectorInput').val(JSON.stringify(editPloyLineArray));
+				});
+				return mapB;
+			},
+			// 根据地理名称获取百度经纬度坐标进行定位.
+			localSearchFromAdreesToPoint: function(Address) {
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapB);
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					var resultPoints = '';
+					if(searchResult) {
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						if(poi) {
+							//获取经度和纬度
+            				var stationNameChangePoint = new BMap.Point( poi.point.lng, poi.point.lat);
+            		  		marker = new BMap.Marker(stationNameChangePoint); 
+            		  		var PanOptions ={noAnimation :true};
+            		  		mapB.panTo(stationNameChangePoint,PanOptions);
+            		  		// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+            		  		mapB.setZoom(16);
+            		  		mapB.panBy(-300,-50);
+            		  		// 将标注添加到地图中
+            		  		mapB.addOverlay(marker);  
+            		  		//跳动的动画
+            		  		marker.setAnimation(BMAP_ANIMATION_BOUNCE); 
+						}else {
+							// 弹出添加成功提示消息
+							layer.msg('无法获取【'+Address+'】地理位置！');
+						}
+					}else {
+						// 弹出添加成功提示消息
+						layer.msg('无法获取【'+Address+'】地理位置！');
+					}
+				});
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+			},
+			// 根据名称获取坐标.
+			stationsNameToPoints : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var stationList = [];
+				(function(){
+					 if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len) {
+						 callback && callback(stationList);
+			              return;
+			          }
+					 var f = arguments.callee;
+					 if(arra[index]!=''){
+						 var localSearch = new BMap.LocalSearch(mapB);
+						 localSearch.search(arra[index]);
+						 localSearch.setSearchCompleteCallback(function (searchResult) {
+							 var poi = searchResult.getPoi(0);
+							 if(poi) {
+								 stationList.push({name:arra[index],potion:{lng:poi.point.lng,lat:poi.point.lat}});
+								 f();
+							 }
+						 });
+					 }else {
+						 f();
+					 }
+				})();
+			},
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				// 获取长度
+				var len = points.length;
+				(function(){
+					if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len-1) {
+						 callback && callback(points);
+			              return;
+			          }
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 var origin_region = '上海';
+					 var destination_region = '上海';
+					 var output = 'json';
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 /** 
+					  *  @param :< origin：起点名称或经纬度；destination：终点名称或经纬度；origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  		 destination_region：终点所在城市，驾车导航时必填。output :表示输出类型，可设置为xml或json，默认为xml。>
+					  *  
+					  *  @returns :r <jsonp格式> 
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              data: paramsB,
+			              dataType: 'jsonp',
+			              success: function(r){
+			            	  if(r) {
+			            		  if(r.message=='ok') {
+			            			  // 获取距离(单位：米)
+			            			  points[index+1].distance = r.result.taxi.distance;
+			            			  // 获取时间(单位：秒)
+			            			  points[index+1].duration = r.result.taxi.duration;
+			            		  }
+			            	  }
+			            	  f();
+			              }
+			          });
+				})();
+			},
+			// 获取路段几何图形坐标集合.
+			getSectionListPlonly : function(stationsPoint,cb) {
+				var len = stationsPoint.length;
+				var sectionList = [];
+				(function(){
+					 if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len-1 ) {
+						cb && cb(sectionList);
+			              return;
+			          }
+					 var f = arguments.callee;
+					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
+					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
+					 var transit = new BMap.DrivingRoute(mapB, {renderOptions: {map: mapB,enableDragging : true},onPolylinesSet: searchPolylinesSet});
+					 function searchPolylinesSet(results){
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+						 }else {
+							 var sectionArrayList = [];
+							 for (i = 0; i < results.length; i++){
+								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
+							 }
+							 sectionList = sectionArrayList;
+						 }
+						f();
+					}
+					 transit.search(poiOne,poiTwo);
+				})();
+			},
+			// 清楚地图覆盖物
+			clearMarkAndOverlays : function() {
+				mapB.clearOverlays();
+			},
+			// 关闭绘画工具.
+			drawingManagerClose : function() {
+				drawingManager.close();
+			},
+			// 打开绘画工具.
+			drawingManagerOpen : function() {
+				drawingManager.open();// 打开鼠标绘画工具.
+				drawingManager.setDrawingMode(BMAP_DRAWING_POLYLINE);// 设置属性.
+			}
+	}
+	
+	return Bmap;
+
 }();
 \ No newline at end of file
@@ -192,7 +192,7 @@ window.WorldsBMap = function () {
                 /** @description :未认证开发者默认配额为：2000次/天。 */
                 $.ajax({
                     // 百度地图根据坐标获取两点之间的时间与距离
-                    url: 'http://api.map.baidu.com/direction/v1?mode=transit',
+                    url: '//api.map.baidu.com/direction/v1?mode=transit',
                     data: paramsB,
                     dataType: 'jsonp',
                     success: function (r) {
@@ -1447,7 +1447,7 @@ window.WorldsBMap = function () {
 				 $.ajax({
  
 					  // 百度地图根据坐标获取两点之间的时间与距离
-		              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
+		              url: '//api.map.baidu.com/direction/v1?mode=transit',
  
 		              data: paramsB,
  
@@ -1547,7 +1547,6 @@ window.WorldsBMap = function () {
         },
  
         drawPolyLine: function (points, data, start, end) {
-            debugger
             let bdPoints = new Array(), i = 0, point, polyline;
             for (i = 0;i < points.length;i++) {
                 point = points[i].split(' ');
-/**
- * 百度地图
- * 
- * - - - - - -》init：地图初始化
- * 
- * - - - - - -》getDistanceAndDuration：获取距离与时间
- * 
- * - - - - - -》drawingUpline：在地图上画出上行线路走向
- * 
- * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
- */
-
-var BasicMap = function () {
-	
-	/** BasicMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
-	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
-	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
-	
-	var Bmap = {
-			
-			init : function() {
-				
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				
-				// 初始化百度地图
-				mapBValue = new BMap.Map("BasicMap");
-				
-				//中心点和缩放级别
-				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
-				
-				//启用地图拖拽事件，默认启用(可不写)
-				mapBValue.enableDragging(); 
-				
-				//启用地图滚轮放大缩小
-				mapBValue.enableScrollWheelZoom(); 
-				
-				//禁用鼠标双击放大
-				mapBValue.disableDoubleClickZoom();
-				
-				//启用键盘上下左右键移动地图
-				mapBValue.enableKeyboard();
-				
-				return mapBValue;
-			},
-			/** 获取第一个切路段的点  @return Point*/
-			getFirstPoint : function() {
-				return firstPoint;
-			},
-			/** 获取地图对象 @return 地图对象map */
-			getmapBValue : function() {
-				
-				return mapBValue;
-				
-			},
-			
-			getPolyUpline : function() {
-				
-				return polyUpline;
-			},
-			
-			/** 获取截取过的路段 @return 路段对象List */
-			getSectionList : function() {
-				
-				return sectionList;
-				
-			},
-			setSectionList : function(list) {
-				
-				sectionList = list;
-			},
-			initCutSectionPoint : function() {
-				sectionList = [];
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			/** 获取切路段的点下标  @return int*/
-			setPointIndex : function(index) {
-				pointIndex = index;
-			},
-			getPointIndex : function() {
-				
-				return pointIndex;
-				
-			},
-			/** 获取路段是否在编辑状态 @return boolean*/
-			getIsEditStatus : function() {
-				return iseditStatus;
-			},			
-			setIsEditStatus : function(v) {
-				iseditStatus = v ;
-			},
-					
-			/** 获取路段是否在截取状态 @return boolean*/
-			getIsCutSection : function() {
-				return isCutSection;
-			},			
-			setIsCutSection : function(v) {
-				isCutSection = v ;
-			},
-			
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				
-				// 获取长度
-				var len = points.length;
-				(function(){
-					
-					if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1) {
-						 
-						 callback && callback(points);
-			        	  
-			              return;
-			          }
-					 
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 var region = '上海';
-					 
-					 var origin_region = '上海';
-					 
-					 var destination_region = '上海';
-					 
-					 var output = 'json';
-					 
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 
-					 /** 
-					  *  origin：起点名称或经纬度；
-					  * 
-					  *  destination：终点名称或经纬度；
-					  *  
-					  *  origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  destination_region：终点所在城市，驾车导航时必填。
-					  * 
-					  *  output :表示输出类型，可设置为xml或json，默认为xml。
-					  *  
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              
-			              data: paramsB,
-			              
-			              dataType: 'jsonp',
-			              
-			              success: function(r){
-			            	  
-			            	  if(r) {
-			            		  
-			            		  if(r.message=='ok') {
-			            			  
-			            			  if(r.result.taxi==null) {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = 0;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = 0;
-			            				  
-			            			  }else {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = r.result.taxi.distance;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = r.result.taxi.duration;
-			            				  
-			            			  }
-			            			  
-			            			  
-			            		  }
-			            		  
-			            	  }
-			            	  
-			            	  f();
-			              }
-			          });
-					
-				})();
-				
-			},
-			// 在地图上画出上行线路走向
-			drawingUpline01 : function (polylineArray,polyline_center,data) {
-				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
-				// 创建线路走向
-				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				polyUpline01.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline01);
-				var sectionPoint = [];
-				// 线路单击事件
-				polyUpline01.addEventListener('click',function(e) {
-					if(BasicMap.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					if(BasicMap.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					polyUpline01.enableEditing();
-					BasicMap.setIsEditStatus(true);
-				});
-				
-				// 添加路段双击事件
-				polyUpline01.addEventListener("dblclick",function(e){
-					if(BasicMap.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					BasicMap.setIsEditStatus(false);
-					// 关闭
-					layer.closeAll();
-					polyUpline01.disableEditing();
-					EditSectionObj.setEitdSection(polyUpline01.data);
-					// 获取折线坐标集合
-					var editPloyLineArray = polyUpline01.getPath();
-					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					sectionList = [];
-					var tbodyHtml = template('section_list',{list : sectionList});
-					// 截取路段
-					$('#section_table tbody').html(tbodyHtml);
-					// 加载修改路段弹出层mobal页面
-					$.get('editsection.html', function(m){
-						$(pjaxContainer).append(m);
-						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [BasicMap,GetAjaxData,EditSectionObj,PublicFunctions]);
-					});
-				});
-				
-				// 路段右击事件
-				var editSection = function(e,ee,marker){
-					if(BasicMap.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					var lng = e.lng;
-					var lat = e.lat;	
-					var sectionName = null;
-					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
-					marker.isFlag = true;
-					if(pointIndex == 0) {
-						sectionPoint[pointIndex] = {lng:lng , lat:lat};
-						layer.msg('进入切路段状态，请选择本路段的终点！');
-						mapBValue.addOverlay(marker);// 添加覆盖物
-						firstPoint = {lng:lng, lat:lat};
-						pointIndex++;
-						EditSectionObj.setEitdSection(polyUpline01.data);
-						// 获取折线坐标集合
-						var editPloyLineArray = polyUpline01.getPath();
-						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					} else if (pointIndex > 0) {
-						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
-							pointList = [];
-							sectionPoint[pointIndex] = {lng:lng , lat:lat};
-							pointList[0] = sectionPoint[pointIndex-1];
-							pointList[1] = sectionPoint[pointIndex];
-							sectionList.push({name:sectionName, section:pointList});	
-							layer.close(index);
-							layer.msg('路段截取成功，请选择下一个路段的终点');
-							mapBValue.addOverlay(marker);// 添加覆盖物
-							var tbodyHtml = template('section_list',{list : sectionList});
-							// 截取路段
-							$('#section_table tbody').html(tbodyHtml);
-							pointIndex++;
-						});
-					}
-					BasicMap.setIsCutSection(true);
-				}
-				var markerMenu=new BMap.ContextMenu();
-				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
-				polyUpline01.addContextMenu(markerMenu);
-				
-				
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			// 删除点刷新cutSectionTable
-			refreshCutSectionTable : function() {
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			// 删除点刷新覆盖物
-			deleteCutSectionPoint : function(point) {
-				var lng = point.lng;
-				var lat = point.lat;
-				var allOverlay = mapBValue.getOverlays();
-				// 删除最后一个点
-				for (var i = 0; i < allOverlay.length -1; i++){
-					if(allOverlay[i].isFlag) {
-						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
-							mapBValue.removeOverlay(allOverlay[i]);
-							break;
-						}
-					}
-				}		
-			},			
-			/** 在地图上画点 @param：<point_center：中心坐标点> */
-			drawingUpStationPoint : function(point_center,stationName,s) {
-				
-				// 自定义标注物图片
-			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
-			  		
-			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
-			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
-						+ 		'</div>'
-						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
-						 
-						
-				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
-                        "anchor" : new BMap.Size(-10,8),
-						  "enableDragging" : true});
-				
-			
-				myRichMarker1.disableDragging();
-				mapBValue.addOverlay(myRichMarker1);
-		  		
-		  		
-		  		// 创建标注物
-		  		marker = new BMap.Marker(point_center,{icon : icon_target});
-  				
-		  		// 允许覆盖物在map.clearOverlays方法中被清除。
-		  		marker.enableMassClear();
-		  		
-		  		mapBValue.addOverlay(marker);
-			},
-			
-			// 根据站点坐标匹配库中的公交站点（手动规划）
-			stationsPointsToLibraryPoint : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var station = {};
-				var stationList = [];
-				(function(){
-					if (!arguments.callee.count) {
-						arguments.callee.count = 0;
-					}
-					arguments.callee.count++;
-					var index = parseInt(arguments.callee.count) - 1;
-					if (index >= len) {
-						callback && callback(stationList);
-			        	return ; 
-			        }
-					var f = arguments.callee;
-					station = arra[index];					
-					if(arra[index].name!=''){
-						
-						$.get('/station/matchStation',station,function(resultStation) {
-							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
-							f();
-						});							 
-					 }else {
-						 f();
-					 }	
-				})()
-			},
-			clearMarkAndOverlays : function() {
-				
-				// 清楚地图覆盖物
-				mapBValue.clearOverlays();
-				
-				mapBValue.removeOverlay();
-				
-			}
-			
-	}
-	
-	return Bmap;
-	
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
+ */
+
+var BasicMap = function () {
+	
+	/** BasicMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("BasicMap");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(BasicMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(BasicMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					BasicMap.setIsEditStatus(true);
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(BasicMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					BasicMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [BasicMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(BasicMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					BasicMap.setIsCutSection(true);
+				}
+				var markerMenu=new BMap.ContextMenu();
+				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+				polyUpline01.addContextMenu(markerMenu);
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点（手动规划）
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
 }();
 \ No newline at end of file
-/**
- * 百度地图
- * 
- * - - - - - -》init：地图初始化
- * 
- * - - - - - -》lineInfoPanl：从百度地图抓去站点与路段数据
- * 
- * - - - - - -》getDistanceAndDuration：获取距离与时间
- * 
- * - - - - - -》pointsPolygon：地图画多边行
- * 
- * - - - - - -》pointsCircle：画圆
- * 
- * - - - - - -》localSearchFromAdreesToPoint：根据地理名称获取百度经纬度坐标
- * 
- * - - - - - -》drawingUpline：在地图上画出上行线路走向
- * 
- * - - - - - -》stationsNameToPoints：站点名称获取百度坐标（手动规划）
- * 
- * - - - - - -》getDistanceAndTotime：根据坐标点获取两点之间的时间与距离（手动规划）
- * 
- * - - - - - -》getSectionListPlonly：根据坐标点获取两点之间的折线路段（手动规划）
- */
-
-var WorldsBMap = function () {
-	
-	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 */
-	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;
-	
-	var Bmap = {
-			
-			init : function() {
-				
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				
-				// 初始化百度地图
-				mapBValue = new BMap.Map("bmap_basic");
-				
-				//中心点和缩放级别
-				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
-				
-				//启用地图拖拽事件，默认启用(可不写)
-				mapBValue.enableDragging(); 
-				
-				//启用地图滚轮放大缩小
-				mapBValue.enableScrollWheelZoom(); 
-				
-				//禁用鼠标双击放大
-				mapBValue.disableDoubleClickZoom();
-				
-				//启用键盘上下左右键移动地图
-				mapBValue.enableKeyboard();
-				
-				return mapBValue;
-			},
-			
-			/** 获取地图对象 @return 地图对象map */
-			getmapBValue : function() {
-				
-				return mapBValue;
-				
-			},
-			
-			getPolygon : function(){
-				
-				return polygon;
-			},
-			
-			getPolyUpline : function() {
-				
-				return polyUpline;
-			},
-			
-			getCircle : function() {
-				
-				return circle;
-			},
-			
-			getIsEditStatus : function() {
-				return iseditStatus;
-			},
-			
-			setIsEditStatus : function(v) {
-				iseditStatus = v ;
-			},
-			
-			initDrawingManager: function(map,styleOptions) {
-				
-			},
-			
-			getDrawingManagerObj : function() {
-				
-				return drawingManagerInitV;
-			},
-			
-			// 从百度地图抓去站点与路段数据
-			lineInfoPanl : function(lineNameValue,i,cb) {
-				
-				/** 根据线路名称与方向从百度地图获取站点与路段  @param lineNameValue：线路名称；i：方向<0：上行；1：下行>  */
-				WorldsBMap.getBmapStationNames(lineNameValue,i,function(BusLine){
-					
-					return cb && cb(BusLine);
-					
-				});
-				
-			},
-			
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				
-				// 获取长度
-				var len = points.length;
-				
-				(function(){
-					
-					if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1) {
-						 
-						 callback && callback(points);
-			        	  
-			              return;
-			          }
-					 
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 
-					 var region = '上海';
-					 
-					 var origin_region = '上海';
-					 
-					 var destination_region = '上海';
-					 
-					 var output = 'json';
-					 
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 
-					 /** 
-					  *  origin：起点名称或经纬度；
-					  * 
-					  *  destination：终点名称或经纬度；
-					  *  
-					  *  origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  destination_region：终点所在城市，驾车导航时必填。
-					  * 
-					  *  output :表示输出类型，可设置为xml或json，默认为xml。
-					  *  
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              
-			              data: paramsB,
-			              
-			              dataType: 'jsonp',
-			              
-			              success: function(r){
-			            	  
-			            	  if(r) {
-			            		  
-			            		  if(r.message=='ok') {
-			            			  
-			            			  if(r.result.taxi==null) {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = 0;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = 0;
-			            				  
-			            			  }else {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = r.result.taxi.distance;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = r.result.taxi.duration;
-			            				  
-			            			  }
-			            			  
-			            			  
-			            		  }
-			            		  
-			            	  }
-			            	  
-			            	  f();
-			              }
-			          });
-					
-				})();
-				
-			},
-			
-			// 地图画多边形
-			pointsPolygon : function(objStation) {
-				
-				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapBValue.setZoom(15);
-				
-				// 如果不为空
-				if(objStation) {
-					
-					// 获取中心点坐标字符串
-					var testpointStr = objStation.stationBJwpoints;
-					
-					// 按空格切割中心点坐标字符串
-					var BJwpointsPolygon = testpointStr.split(' ');
-					
-					// 中心点坐标
-					var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
-					
-					// 获取多边形坐标字符串
-					var stationBPolygonGrid = objStation.stationBPolygonGrid;
-					
-					// 截取多边形坐标字符串
-					var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
-					
-					// 按逗号切割
-					var pointPolygonArray = stationBPolygonGridStr.split(',');
-					
-					// 多边形坐标集合
-					var polygonP = [];
-					
-					for(var v = 0;v<pointPolygonArray.length;v++) {
-						
-						polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
-						
-					}
-					
-					// 画多边形
-					polygon = new BMap.Polygon(polygonP, {
-						
-						// 线条显色
-			  			strokeColor : "blue",
-			  			
-			  			// 边线的宽度，以像素为单位。
-			  			strokeWeight : 2,
-			  			
-			  			// 边线透明度，取值范围0 - 1。
-			  			strokeOpacity : 0.5
-			  		});
-					
-					// 增加地图覆盖物多边形
-					mapBValue.addOverlay(polygon);  
-					
-					// 信息窗口属性
-					var opts_polygon = {
-			  				
-		  					// 信息窗口宽度
-		  					width : 200,
-		  					
-		  					// 信息窗口高度
-		  					height : 400,
-		  					
-		  					// 信息窗位置偏移值。	
-		  					offset: new BMap.Size(500,20),
-		  					
-		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
-		  					//设置不允许信窗发送短息
-		  					enableMessage : false,
-		  					
-		  					//是否开启点击地图关闭信息窗口
-		  					enableCloseOnClick : false
-		  			};
-			  		
-					var markTypeStr = '';
-					
-					if(objStation.stationRouteStationMark=='B') {
-						
-						markTypeStr='起点站';
-						
-					}else if(objStation.stationRouteStationMark=='Z') {
-						
-						markTypeStr ='中途站';
-						
-						
-					}else if(objStation.stationRouteStationMark=='E') {
-						
-						markTypeStr='终点站';
-						
-					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
-					
-					// 创建信息窗口
-					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
-				  	// 自定义标注物图片
-			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-			  	  	
-			  	  	// 创建点
-		  			marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
-		  			
-		  			// 把标注添物加到地图上
-		  			mapBValue.addOverlay(marker);
-		  	  		
-		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  	  		var PanOptions_ ={noAnimation :true};
-		  	  		
-		  	  		// 将地图的中心点更改为给定的点。
-		  	  		mapBValue.panTo(pointPolygon,PanOptions_);
-		  	  		
-		  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
-		  	  		mapBValue.panBy(10,-150,PanOptions_);
-		  	  		
-		  	  		//开启信息窗口
-		  	  		mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
-					
-				}
-				
-			},
-			
-			editPolyUpline : function() {
-				// 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
-				polyUpline.disableMassClear();
-				WorldsBMap.clearMarkAndOverlays();
-				// 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
-				polyUpline.enableMassClear();
-				//  开启线路编辑
-				polyUpline.enableEditing();
-				// 添加双击折线保存事件
-				polyUpline.addEventListener('dblclick',function(e) {
-					// 关闭
-					layer.closeAll();
-					polyUpline.disableEditing();
-					// 获取折线坐标集合
-					var editPloyLineArray = polyUpline.getPath();
-					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					polyUpline= '';
-					// 加载修改路段弹出层mobal页面
-					$.get('editsection.html', function(m){
-						$(pjaxContainer).append(m);
-						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
-					});
-				});
-			},
-			
-			// 画圆
-			pointsCircle : function(objStation) {
-				
-				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
-				mapBValue.setZoom(16);
-				
-				if(objStation) {
-					
-					// 清除地图覆盖物
-					mapBValue.clearOverlays();
-					
-					// 获取中心坐标点字符串分割
-					var BJwpoints = objStation.stationBJwpoints.split(' ');
-					
-					// 中心坐标点
-					var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
-					
-					//创建圆
-			  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
-			  		
-			  		// 允许覆盖物在map.clearOverlays方法中被清除
-			  		circle.enableMassClear();
-			  		
-			  		// 百度地图添加覆盖物圆
-			  		mapBValue.addOverlay(circle);
-			  		
-			  		// 信息窗口参数属性
-			  		var opts = {
-			  				
-		  					// 信息窗口宽度
-		  					width : 200,
-		  					
-		  					// 信息窗口高度
-		  					height : 450,
-		  					
-		  					// 信息窗位置偏移值。
-		  					offset: new BMap.Size(500,120),
-		  					
-		  					//标题
-		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
-		  					
-		  					//设置不允许信窗发送短息
-		  					enableMessage : false,
-		  					
-		  					//是否开启点击地图关闭信息窗口
-		  					enableCloseOnClick : false,
-		  					
-		  					// 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
-		  					enableAutoPan:false
-		  			};
-			  		
-			  		var markTypeStr = '';
-					
-					if(objStation.stationRouteStationMark=='B') {
-						
-						markTypeStr='起点站';
-						
-					}else if(objStation.stationRouteStationMark=='Z') {
-						
-						markTypeStr ='中途站';
-						
-						
-					}else if(objStation.stationRouteStationMark=='E') {
-						
-						markTypeStr='终点站';
-						
-					}
-			  		
-			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
-								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
-								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
-								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
-								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
-								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
-			  		
-			  		// 创建信息窗口
-			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
-				  	// 自定义标注物图片
-			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
-			  	  	
-			  	  	// 创建点
-		  			marker = new BMap.Marker(point,{icon : icon_target}); 
-		  			
-		  			// 把标注添物加到地图上
-		  			mapBValue.addOverlay(marker);
-		  	  		
-		  	  		setTimeout(function(){
-		  	  			//开启信息窗口
-			  	  		marker.openInfoWindow(infoWindow_target,point);
-		  			
-		  	  		},100);
-		  	  		
-		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
-		  	  		var PanOptions_ ={noAnimation :true};
-		  	  		
-		  	  		// 将地图的中心点更改为给定的点。
-		  	  		mapBValue.panTo(point,PanOptions_);
-		  	  		
-		  	  		mapBValue.panBy(10,-200,PanOptions_);
-		  	  		
-		  	  		// 添加标志物监听事件
-		  	  		marker.addEventListener("click",function() {
-		  	  			
-		  	  			//开启信息窗口
-		  	  			marker.openInfoWindow(infoWindow_target,point);
-		  	  			
-		  	  		});
-					
-				}
-			 
-			},
-			
-			// 根据地理名称获取百度经纬度坐标
-			localSearchFromAdreesToPoint: function(Address,callback) {
-				
-				// 创建一个搜索类实例
-				var localSearch = new BMap.LocalSearch(mapBValue);
-				
-				// 检索完成后的回调函数。
-				localSearch.setSearchCompleteCallback(function (searchResult) {
-					
-					var resultPoints = '';
-					
-					if(searchResult) {
-						
-						// 返回索引指定的结果。索引0表示第1条结果
-						var poi = searchResult.getPoi(0);
-						
-						if(poi) {
-							
-							//获取经度和纬度
-							resultPoints = poi.point.lng + ' ' + poi.point.lat;
-							
-							callback && callback(resultPoints);
-							
-						}else {
-							
-							callback && callback(false);
-							
-						}
-						
-					}else {
-						
-						callback && callback(false);
-					}
-					
-				});
-				
-				// 根据检索词发起检索。
-				localSearch.search(Address);
-				
-			},
-			
-			// 编辑图形
-			editShapes : function(editStationName,stationShapesTypeV,mindex) {
-				
-				// 关闭信息窗口
-				marker.closeInfoWindow();
-				
-				// 清除marker
-				mapBValue.removeOverlay(marker);
-				
-				// 编辑圆
-				if(stationShapesTypeV =='r') {
-					
-					// 开启编辑功能
-					circle.enableEditing();
-					
-					// 编辑圆监听事件
-					circle.addEventListener('dblclick',function() {
-						
-						// 关闭提示弹出层
-						layer.close(mindex);
-						
-						// 返回圆形的半径，单位为米。
-						var newRadius = circle.getRadius();
-						
-						// 返回圆形的中心点坐标。
-						var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
-						
-						var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
-						
-						/**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-						EditStationObj.setEitdStationBJwpoints(newCenter);
-							
-						/**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-						EditStationObj.setEitdStationShapesType('r');
-							
-						/**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-						EditStationObj.setEitdStationRadius(Math.round(newRadius));
-							
-						/**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-						EditStationObj.setEitdBPolygonGrid('');
-						
-						// 加载编辑页面
-						$.get('edit.html', function(m){
-							
-							$(pjaxContainer).append(m);
-							
-							$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
-						
-						}); 
-						
-					});
-				
-				// 编辑多变行
-				}else if(stationShapesTypeV =='d') {
-					
-					// 开启编辑功能(自 1.1 新增)
-					polygon.enableEditing();
-					
-					// 添加多变行编辑事件
-					polygon.addEventListener('dblclick',function(e) {
-						 
-						 // 获取编辑的多边形对象
-						 var edit_pointE = polygon;
-						 
-						 var edit_bPloygonGrid = "";
-						 
-						 var editPolyGonLen_ = edit_pointE.getPath().length;
-						 
-						 for(var k =0;k<editPolyGonLen_;k++) {
-								
-							 if(k==0) {
-									
-								 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-									
-							 }else {
-									
-								 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
-									
-							 }
-								
-						 }
-						 
-						 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
-						 
-						 // 多边形中心点
-						 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
-						 
-						 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
-						 EditStationObj.setEitdStationBJwpoints(centre_points);
-							
-						 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
-						 EditStationObj.setEitdStationShapesType('d');
-							
-						 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
-						 EditStationObj.setEitdStationRadius('');
-							
-						 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
-						 EditStationObj.setEitdBPolygonGrid(edit_bPloygonGrid);
-						 
-						 $.get('edit.html', function(m){
-							 
-							 $(pjaxContainer).append(m);
-							 
-							 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
-							 
-						 });
-						
-					});
-					
-				}
-				
-			},
-			
-			// 在地图上画出上行线路走向
-			drawingUpline : function (polylineArray,polyline_center,data) {
-				/*WorldsBMap.clearMarkAndOverlays();*/
-				polyUpline = '';
-				// 创建线路走向
-				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				// polyUpline.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline);
-		  		/*var ceter_index = Math.round(resultdata.length / 2);
-		  		
-		  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
-		  		
-		  		var ceterPointsArray = ceterPointsStr.split(' ');
-  				
-  				var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);*/
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			
-			//在地图上画出公交位置。
-			drawingBus :function(lon,lat){
-				var point = new BMap.Point(lon,lat);
-				var myIcon = new BMap.Icon("/pages/excep/img/bus.png", new BMap.Size(300,157));
-				var marker = new BMap.Marker(point,{icon:myIcon});  // 创建标注
-				mapBValue.addOverlay(marker);
-				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
-			},
-			
-			// 在地图上画出上行线路走向
-			drawingUpline01 : function (polylineArray,polyline_center,data) {
-				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
-				// 创建线路走向
-				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				polyUpline01.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline01);
-				polyUpline01.addEventListener('click',function(e) {
-					if(WorldsBMap.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					polyUpline01.enableEditing();
-					WorldsBMap.setIsEditStatus(true);
-				});
-				// 添加双击折线保存事件
-				polyUpline01.addEventListener('dblclick',function(e) {
-					WorldsBMap.setIsEditStatus(false);
-					// 关闭
-					layer.closeAll();
-					polyUpline01.disableEditing();
-					EditSectionObj.setEitdSection(polyUpline01.data);
-					// 获取折线坐标集合
-					var editPloyLineArray = polyUpline01.getPath();
-					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					// polyUpline= '';
-					// 加载修改路段弹出层mobal页面
-					$.get('editsection.html', function(m){
-						$(pjaxContainer).append(m);
-						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
-					});
-				});
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			
-			/** 在地图上画点 @param：<point_center：中心坐标点> */
-			drawingUpStationPoint : function(point_center,stationName,s) {
-				
-				// 自定义标注物图片
-			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
-			  		
-			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
-			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
-						+ 		'</div>'
-						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
-						 
-						
-				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
-                        "anchor" : new BMap.Size(-10,8),
-						  "enableDragging" : true});
-				
-			
-				myRichMarker1.disableDragging();
-				mapBValue.addOverlay(myRichMarker1);
-		  		
-		  		
-		  		// 创建标注物
-		  		marker = new BMap.Marker(point_center,{icon : icon_target});
-  				
-		  		// 允许覆盖物在map.clearOverlays方法中被清除。
-		  		marker.enableMassClear();
-		  		
-		  		mapBValue.addOverlay(marker);
-			},
-			
-			// 站点名称获取百度坐标（手动规划）
-			stationsNameToPoints : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var stationList = [];
-				(function(){
-					 if (!arguments.callee.count) {
-						 arguments.callee.count = 0;
-					 }
-					 arguments.callee.count++;
-					 var index = parseInt(arguments.callee.count) - 1;
-					 if (index >= len) {
-						 callback && callback(stationList);
-			        	 return ; 
-			          }
-					 var f = arguments.callee;
-					 if(arra[index].name!=''){
-						 var localSearch = new BMap.LocalSearch(mapBValue);
-						 localSearch.search(arra[index].name);
-						 localSearch.setSearchCompleteCallback(function (searchResult) {
-							 var poi = searchResult.getPoi(0);
-							 if(poi) {
-								 stationList.push({name:arra[index].name.replace('公交车站',''),wgs:arra[index].wgs,potion:{lng:poi.point.lng,lat:poi.point.lat}});
-							 }else {
-								 stationList.push({name:arra[index].name.replace('公交车站',''),wgs:arra[index].wgs,potion:{lng:arra[index].wgs.x,lat:arra[index].wgs.y}});
-							 }
-							 f();
-						 });
-					 }else {
-						 f();
-					 }
-				})();
-			},
-			
-			// 根据坐标点获取两点之间的时间与距离（手动规划）
-			getDistanceAndTotime : function(stationList,cb) {
-				
-				stationList[0].distance = '';
-				
-				stationList[0].duration = '';
-				
-				// var sectionList = [];
-				
-				// 获取长度
-				var len = stationList.length;
-				
-				(function(){
-					
-					 if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1) {
-						 
-						// cb && cb(stationList,sectionList);
-						 cb && cb(stationList);
-			              return;
-			          }
-					 
-					 var f = arguments.callee;
-					 
-					 var poiOne =  new BMap.Point(stationList[index].potion.lng,stationList[index].potion.lat);
-					 
-					 var poiTwo =  new BMap.Point(stationList[index+1].potion.lng,stationList[index+1].potion.lat);
-					 
-					 var transit = new BMap.TransitRoute(mapBValue, {renderOptions: {map: mapBValue},onSearchComplete: searchComplete});
-					 
-					 transit.search(poiOne,poiTwo);
-					 
-					 function searchComplete(results){
-						 
-						 var plan = results.getPlan(0);
-						 
-						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
-								
-								stationList[index+1].distance = '';
-								
-								stationList[index+1].duration = '';
-								
-								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:''});
-								
-						 }else {
-								
-								stationList[index+1].distance = plan.getDistance(true);
-								
-								stationList[index+1].duration = plan.getDuration(true);
-								
-								// var line = plan.getRoute(0);
-								
-								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:line.getPath()});
-								 
-						 }
-						 
-						f();
-					}
-					 
-				})();
-				
-			},
-			
-			// 根据坐标点获取两点之间的折线路段（手动规划）
-			getSectionListPlonly : function(stationsPoint,cb) {
-				
-				var len = stationsPoint.length;
-				
-				var sectionList = [];
-				
-				(function(){
-					
-					 if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1 ) {
-						 
-						cb && cb(sectionList);
-			              return;
-			          }
-					 
-					 var f = arguments.callee;
-					 
-					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
-					 
-					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
-					 
-					/* var transit = new BMap.TransitRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet});*/
-					 
-					 var transit = new BMap.DrivingRoute(mapBValue, {renderOptions: {map: mapBValue},onPolylinesSet: searchPolylinesSet});
-					 
-					 function searchPolylinesSet(results){
-						 
-						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
-								
-								
-						 }else {
-							 
-							 var sectionArrayList = [];
-							 for (i = 0; i < results.length; i++){
-								 
-								// console.log(results[i].getPolyline().getPath());
-								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
-							
-							 }
-							 
-							 var sectionName = stationsPoint[index].name + '至' + stationsPoint[index+1].name;
-							 
-							 sectionList.push({sectionName:sectionName,points:sectionArrayList});
-								 
-						 }
-						 
-						f();
-					}
-					
-					 transit.search(poiOne,poiTwo);
-					 
-				})();
-				
-			},
-			
-			localtionPoint : function(stationNameV) {
-				
-				WorldsBMap.localSearchFromAdreesToPoint(stationNameV,function(Points) {
-					
-					if(Points) {
-						
-						var BJwpointsArray = Points.split(' ');
-						
-						var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
-						
-				  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
-				  		
-				  		var PanOptions ={noAnimation :true};
-				  		
-				  		mapBValue.panTo(stationNameChangePoint,PanOptions);
-				  		
-				  		mapBValue.panBy(0,-100);
-				  		
-				  		// 将标注添加到地图中
-				  		mapBValue.addOverlay(marker_stargt2);  
-				  		
-				  		//跳动的动画
-				  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
-						
-					}
-					
-				});
-				
-			},
-			
-			/** 系统规划抓去数据 @param  lineNameValue:线路名称；i：方向*/
-			getBmapStationNames : function(lineNameValue,i,callback) {
-				
-				var busline = new BMap.BusLineSearch(mapBValue,{
-					 
-					// 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
-					onGetBusListComplete:function(BusListResult) {
-						
-						// 如果不为空
-						if(BusListResult){
-							
-							//获取第一个公交列表显示到map上
-							var fstLine = BusListResult.getBusListItem(i);
-							
-							/*if(fstLine==undefined){
-								
-								layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
-									
-									layer.closeAll();
-									
-									if(i==0){
-										
-										$('#upToolsMobal').show();
-										
-									}else if(i==1){
-										
-										$('#downToolsMobal').show();
-										
-									}
-									
-									return;
-								});
-								
-							}*/
-							
-							if(fstLine==undefined){
-								
-								
-								callback && callback(null);
-								
-							}
-							
-							busline.getBusLine(fstLine);
-							
-						}
-						
-					},
-					
-					//设置公交线路查询后的回调函数.参数：rs: BusLine类型
-					onGetBusLineComplete: function(BusLine){
-						
-						// 如果不为空
-						if(BusLine){
-							
-							callback && callback(BusLine);
-							
-						}
-						
-					}
-					
-				});
-				
-				busline.getBusList(lineNameValue);
-				
-			},
-			
-			clearMarkAndOverlays : function() {
-				
-				// 清楚地图覆盖物
-				mapBValue.clearOverlays();
-				
-				mapBValue.removeOverlay();
-				
-			}
-			
-	}
-	
-	return Bmap;
-	
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》lineInfoPanl：从百度地图抓去站点与路段数据
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》pointsPolygon：地图画多边行
+ * 
+ * - - - - - -》pointsCircle：画圆
+ * 
+ * - - - - - -》localSearchFromAdreesToPoint：根据地理名称获取百度经纬度坐标
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsNameToPoints：站点名称获取百度坐标（手动规划）
+ * 
+ * - - - - - -》getDistanceAndTotime：根据坐标点获取两点之间的时间与距离（手动规划）
+ * 
+ * - - - - - -》getSectionListPlonly：根据坐标点获取两点之间的折线路段（手动规划）
+ */
+
+var WorldsBMap = function () {
+	
+	/** WorldsBMap 全局变量定义 mapBValue：地图对象；polygon：多边形；polyUpline：走向折线；circle：圆 */
+	var mapBValue = '';polygon='',polyUpline='',circle='',iseditStatus = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("bmap_basic");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolygon : function(){
+				
+				return polygon;
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			getCircle : function() {
+				
+				return circle;
+			},
+			
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},
+			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+			
+			initDrawingManager: function(map,styleOptions) {
+				
+			},
+			
+			getDrawingManagerObj : function() {
+				
+				return drawingManagerInitV;
+			},
+			
+			// 从百度地图抓去站点与路段数据
+			lineInfoPanl : function(lineNameValue,i,cb) {
+				
+				/** 根据线路名称与方向从百度地图获取站点与路段  @param lineNameValue：线路名称；i：方向<0：上行；1：下行>  */
+				WorldsBMap.getBmapStationNames(lineNameValue,i,function(BusLine){
+					
+					return cb && cb(BusLine);
+					
+				});
+				
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			
+			// 地图画多边形
+			pointsPolygon : function(objStation) {
+				
+				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+				mapBValue.setZoom(15);
+				
+				// 如果不为空
+				if(objStation) {
+					
+					// 获取中心点坐标字符串
+					var testpointStr = objStation.stationBJwpoints;
+					
+					// 按空格切割中心点坐标字符串
+					var BJwpointsPolygon = testpointStr.split(' ');
+					
+					// 中心点坐标
+					var pointPolygon = new BMap.Point(BJwpointsPolygon[0], BJwpointsPolygon[1]);
+					
+					// 获取多边形坐标字符串
+					var stationBPolygonGrid = objStation.stationBPolygonGrid;
+					
+					// 截取多边形坐标字符串
+					var stationBPolygonGridStr = stationBPolygonGrid.substring(9,stationBPolygonGrid.length-2);
+					
+					// 按逗号切割
+					var pointPolygonArray = stationBPolygonGridStr.split(',');
+					
+					// 多边形坐标集合
+					var polygonP = [];
+					
+					for(var v = 0;v<pointPolygonArray.length;v++) {
+						
+						polygonP.push(new BMap.Point(pointPolygonArray[v].split(" ")[0],pointPolygonArray[v].split(" ")[1]));
+						
+					}
+					
+					// 画多边形
+					polygon = new BMap.Polygon(polygonP, {
+						
+						// 线条显色
+			  			strokeColor : "blue",
+			  			
+			  			// 边线的宽度，以像素为单位。
+			  			strokeWeight : 2,
+			  			
+			  			// 边线透明度，取值范围0 - 1。
+			  			strokeOpacity : 0.5
+			  		});
+					
+					// 增加地图覆盖物多边形
+					mapBValue.addOverlay(polygon);  
+					
+					// 信息窗口属性
+					var opts_polygon = {
+			  				
+		  					// 信息窗口宽度
+		  					width : 200,
+		  					
+		  					// 信息窗口高度
+		  					height : 400,
+		  					
+		  					// 信息窗位置偏移值。	
+		  					offset: new BMap.Size(500,20),
+		  					
+		  					//标题
+		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
+		  					
+		  					//设置不允许信窗发送短息
+		  					enableMessage : false,
+		  					
+		  					//是否开启点击地图关闭信息窗口
+		  					enableCloseOnClick : false
+		  			};
+			  		
+					var markTypeStr = '';
+					
+					if(objStation.stationRouteStationMark=='B') {
+						
+						markTypeStr='起点站';
+						
+					}else if(objStation.stationRouteStationMark=='Z') {
+						
+						markTypeStr ='中途站';
+						
+						
+					}else if(objStation.stationRouteStationMark=='E') {
+						
+						markTypeStr='终点站';
+						
+					}
+			  		
+			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
+								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
+								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
+								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
+								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
+					
+					// 创建信息窗口
+					var infoWindow_target = new BMap.InfoWindow(htm, opts_polygon);
+				  	// 自定义标注物图片
+			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+			  	  	
+			  	  	// 创建点
+		  			marker = new BMap.Marker(pointPolygon,{icon : icon_target}); 
+		  			
+		  			// 把标注添物加到地图上
+		  			mapBValue.addOverlay(marker);
+		  	  		
+		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  	  		var PanOptions_ ={noAnimation :true};
+		  	  		
+		  	  		// 将地图的中心点更改为给定的点。
+		  	  		mapBValue.panTo(pointPolygon,PanOptions_);
+		  	  		
+		  	  		// 将地图在水平位置上移动x像素，垂直位置上移动y像素。
+		  	  		mapBValue.panBy(10,-150,PanOptions_);
+		  	  		
+		  	  		//开启信息窗口
+		  	  		mapBValue.openInfoWindow(infoWindow_target,pointPolygon);
+					
+				}
+				
+			},
+			
+			editPolyUpline : function() {
+				// 禁止覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
+				polyUpline.disableMassClear();
+				WorldsBMap.clearMarkAndOverlays();
+				// 允许覆盖物在map.clearOverlays方法中被清除。(自 1.1 新增)
+				polyUpline.enableMassClear();
+				//  开启线路编辑
+				polyUpline.enableEditing();
+				// 添加双击折线保存事件
+				polyUpline.addEventListener('dblclick',function(e) {
+					// 关闭
+					layer.closeAll();
+					polyUpline.disableEditing();
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					polyUpline= '';
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+			},
+			
+			// 画圆
+			pointsCircle : function(objStation) {
+				
+				// 将视图切换到指定的缩放等级，中心点坐标不变。注意：当有信息窗口在地图上打开时，地图缩放将保证信息窗口所在的坐标位置不动。（自1.2新增）
+				mapBValue.setZoom(16);
+				
+				if(objStation) {
+					
+					// 清除地图覆盖物
+					mapBValue.clearOverlays();
+					
+					// 获取中心坐标点字符串分割
+					var BJwpoints = objStation.stationBJwpoints.split(' ');
+					
+					// 中心坐标点
+					var point = new BMap.Point(BJwpoints[0], BJwpoints[1]);
+					
+					//创建圆
+			  		circle = new BMap.Circle(point,objStation.stationRadius,{strokeColor:"blue", strokeWeight:2, strokeOpacity:0.5});
+			  		
+			  		// 允许覆盖物在map.clearOverlays方法中被清除
+			  		circle.enableMassClear();
+			  		
+			  		// 百度地图添加覆盖物圆
+			  		mapBValue.addOverlay(circle);
+			  		
+			  		// 信息窗口参数属性
+			  		var opts = {
+			  				
+		  					// 信息窗口宽度
+		  					width : 200,
+		  					
+		  					// 信息窗口高度
+		  					height : 450,
+		  					
+		  					// 信息窗位置偏移值。
+		  					offset: new BMap.Size(500,120),
+		  					
+		  					//标题
+		  					title : '<h4 style="color:#FFFFFF">'+objStation.stationStationName+'站详情</h4>',
+		  					
+		  					//设置不允许信窗发送短息
+		  					enableMessage : false,
+		  					
+		  					//是否开启点击地图关闭信息窗口
+		  					enableCloseOnClick : false,
+		  					
+		  					// 是否开启信息窗口打开时地图自动移动（默认开启）。(自 1.1 新增)
+		  					enableAutoPan:false
+		  			};
+			  		
+			  		var markTypeStr = '';
+					
+					if(objStation.stationRouteStationMark=='B') {
+						
+						markTypeStr='起点站';
+						
+					}else if(objStation.stationRouteStationMark=='Z') {
+						
+						markTypeStr ='中途站';
+						
+						
+					}else if(objStation.stationRouteStationMark=='E') {
+						
+						markTypeStr='终点站';
+						
+					}
+			  		
+			  		var htm = 	'<HR style="border:1 dashed #987cb9" width="100%" color=#987cb9 SIZE=1>'+
+								'<span style="color:#DDD;font-size: 15px;">站点名称：' + objStation.stationStationName + '</span>' + 
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点编码：' + objStation.stationStationCod + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点序号：' + objStation.stationRouteStationRouteCode + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">站点类型：' + markTypeStr + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">纬度坐标：' + objStation.stationBJwpoints + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站时间：' + objStation.stationRouteToTime + '&nbsp;分钟</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">到站距离：' + objStation.stationRouteDistances + '&nbsp;公里</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">范围半径：' + objStation.stationRadius + '</span>' +
+								'<span class="help-block" style="color:#DDD;font-size: 15px;">版本　号：' + objStation.stationRouteVersions + '</span>' +
+								'<span class="help-block"  style="width: 100%;font-size: 15px;;color:#DDD;'+ 
+								'overflow: hidden; white-space: nowrap;  text-overflow: ellipsis; " title="'+ 
+								objStation.stationRouteDescriptions +'" >说明/描述：' + objStation.stationRouteDescriptions + '</span>' ;
+			  		
+			  		// 创建信息窗口
+			  		var infoWindow_target = new BMap.InfoWindow(htm, opts);
+				  	// 自定义标注物图片
+			  	    var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/cz.png',new BMap.Size(20, 20));
+			  	  	
+			  	  	// 创建点
+		  			marker = new BMap.Marker(point,{icon : icon_target}); 
+		  			
+		  			// 把标注添物加到地图上
+		  			mapBValue.addOverlay(marker);
+		  	  		
+		  	  		setTimeout(function(){
+		  	  			//开启信息窗口
+			  	  		marker.openInfoWindow(infoWindow_target,point);
+		  			
+		  	  		},100);
+		  	  		
+		  	  		// 是否在平移过程中禁止动画。（自1.2新增）
+		  	  		var PanOptions_ ={noAnimation :true};
+		  	  		
+		  	  		// 将地图的中心点更改为给定的点。
+		  	  		mapBValue.panTo(point,PanOptions_);
+		  	  		
+		  	  		mapBValue.panBy(10,-200,PanOptions_);
+		  	  		
+		  	  		// 添加标志物监听事件
+		  	  		marker.addEventListener("click",function() {
+		  	  			
+		  	  			//开启信息窗口
+		  	  			marker.openInfoWindow(infoWindow_target,point);
+		  	  			
+		  	  		});
+					
+				}
+			 
+			},
+			
+			// 根据地理名称获取百度经纬度坐标
+			localSearchFromAdreesToPoint: function(Address,callback) {
+				
+				// 创建一个搜索类实例
+				var localSearch = new BMap.LocalSearch(mapBValue);
+				
+				// 检索完成后的回调函数。
+				localSearch.setSearchCompleteCallback(function (searchResult) {
+					
+					var resultPoints = '';
+					
+					if(searchResult) {
+						
+						// 返回索引指定的结果。索引0表示第1条结果
+						var poi = searchResult.getPoi(0);
+						
+						if(poi) {
+							
+							//获取经度和纬度
+							resultPoints = poi.point.lng + ' ' + poi.point.lat;
+							
+							callback && callback(resultPoints);
+							
+						}else {
+							
+							callback && callback(false);
+							
+						}
+						
+					}else {
+						
+						callback && callback(false);
+					}
+					
+				});
+				
+				// 根据检索词发起检索。
+				localSearch.search(Address);
+				
+			},
+			
+			// 编辑图形
+			editShapes : function(editStationName,stationShapesTypeV,mindex) {
+				
+				// 关闭信息窗口
+				marker.closeInfoWindow();
+				
+				// 清除marker
+				mapBValue.removeOverlay(marker);
+				
+				// 编辑圆
+				if(stationShapesTypeV =='r') {
+					
+					// 开启编辑功能
+					circle.enableEditing();
+					
+					// 编辑圆监听事件
+					circle.addEventListener('dblclick',function() {
+						
+						// 关闭提示弹出层
+						layer.close(mindex);
+						
+						// 返回圆形的半径，单位为米。
+						var newRadius = circle.getRadius();
+						
+						// 返回圆形的中心点坐标。
+						var newCenter = circle.getCenter().lng + ' ' + circle.getCenter().lat;
+						
+						var centre_New = [{potion:{lng:circle.getCenter().lng,lat:circle.getCenter().lat}}];
+						
+						/**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+						EditStationObj.setEitdStationBJwpoints(newCenter);
+							
+						/**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+						EditStationObj.setEitdStationShapesType('r');
+							
+						/**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+						EditStationObj.setEitdStationRadius(Math.round(newRadius));
+							
+						/**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+						EditStationObj.setEitdBPolygonGrid('');
+						
+						// 加载编辑页面
+						$.get('edit.html', function(m){
+							
+							$(pjaxContainer).append(m);
+							
+							$('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
+						
+						}); 
+						
+					});
+				
+				// 编辑多变行
+				}else if(stationShapesTypeV =='d') {
+					
+					// 开启编辑功能(自 1.1 新增)
+					polygon.enableEditing();
+					
+					// 添加多变行编辑事件
+					polygon.addEventListener('dblclick',function(e) {
+						 
+						 // 获取编辑的多边形对象
+						 var edit_pointE = polygon;
+						 
+						 var edit_bPloygonGrid = "";
+						 
+						 var editPolyGonLen_ = edit_pointE.getPath().length;
+						 
+						 for(var k =0;k<editPolyGonLen_;k++) {
+								
+							 if(k==0) {
+									
+								 edit_bPloygonGrid = edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+									
+							 }else {
+									
+								 edit_bPloygonGrid = edit_bPloygonGrid + ',' + edit_pointE.getPath()[k].lng + ' ' + edit_pointE.getPath()[k].lat;
+									
+							 }
+								
+						 }
+						 
+						 edit_bPloygonGrid  = edit_bPloygonGrid + ',' + edit_pointE.getPath()[0].lng + ' ' + edit_pointE.getPath()[0].lat;
+						 
+						 // 多边形中心点
+						 var centre_points = edit_pointE.getBounds().getCenter().lng + ' ' + edit_pointE.getBounds().getCenter().lat;
+						 
+						 /**  设置修改站点集合对象站点中心点百度坐标属性值 @param：<bJwpoints：中心点百度坐标） */
+						 EditStationObj.setEitdStationBJwpoints(centre_points);
+							
+						 /**  设置修改站点集合对象范围图形类型属性值 @param：<shapesType：范围图形类型） */
+						 EditStationObj.setEitdStationShapesType('d');
+							
+						 /**  设置修改站点集合对象圆形半径属性值 @param：<radius：圆形半径） */
+						 EditStationObj.setEitdStationRadius('');
+							
+						 /**  设置修改站点集合对象图形百度坐标集合属性值 @param：<bPolygonGrid：图形百度坐标集合） */
+						 EditStationObj.setEitdBPolygonGrid(edit_bPloygonGrid);
+						 
+						 $.get('edit.html', function(m){
+							 
+							 $(pjaxContainer).append(m);
+							 
+							 $('#edit_station_mobal').trigger('editSelectMobal_show', [WorldsBMap,GetAjaxData,EditStationObj,LineObj,PublicFunctions]);
+							 
+						 });
+						
+					});
+					
+				}
+				
+			},
+			
+			// 在地图上画出上行线路走向
+			drawingUpline : function (polylineArray,polyline_center,data) {
+				/*WorldsBMap.clearMarkAndOverlays();*/
+				polyUpline = '';
+				// 创建线路走向
+				polyUpline = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				// polyUpline.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline);
+		  		/*var ceter_index = Math.round(resultdata.length / 2);
+		  		
+		  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
+		  		
+		  		var ceterPointsArray = ceterPointsStr.split(' ');
+  				
+  				var polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);*/
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			
+			//在地图上画出公交位置。
+			drawingBus :function(lon,lat){
+				var point = new BMap.Point(lon,lat);
+				var myIcon = new BMap.Icon("/pages/excep/img/bus.png", new BMap.Size(300,157));
+				var marker = new BMap.Marker(point,{icon:myIcon});  // 创建标注
+				mapBValue.addOverlay(marker);
+				marker.setAnimation(BMAP_ANIMATION_BOUNCE); //跳动的动画
+			},
+			
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				polyUpline01.addEventListener('click',function(e) {
+					if(WorldsBMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					WorldsBMap.setIsEditStatus(true);
+				});
+				// 添加双击折线保存事件
+				polyUpline01.addEventListener('dblclick',function(e) {
+					WorldsBMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					// polyUpline= '';
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal').trigger('editSectionMobal_show', [WorldsBMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 站点名称获取百度坐标（手动规划）
+			stationsNameToPoints : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var stationList = [];
+				(function(){
+					 if (!arguments.callee.count) {
+						 arguments.callee.count = 0;
+					 }
+					 arguments.callee.count++;
+					 var index = parseInt(arguments.callee.count) - 1;
+					 if (index >= len) {
+						 callback && callback(stationList);
+			        	 return ; 
+			          }
+					 var f = arguments.callee;
+					 if(arra[index].name!=''){
+						 var localSearch = new BMap.LocalSearch(mapBValue);
+						 localSearch.search(arra[index].name);
+						 localSearch.setSearchCompleteCallback(function (searchResult) {
+							 var poi = searchResult.getPoi(0);
+							 if(poi) {
+								 stationList.push({name:arra[index].name.replace('公交车站',''),wgs:arra[index].wgs,potion:{lng:poi.point.lng,lat:poi.point.lat}});
+							 }else {
+								 stationList.push({name:arra[index].name.replace('公交车站',''),wgs:arra[index].wgs,potion:{lng:arra[index].wgs.x,lat:arra[index].wgs.y}});
+							 }
+							 f();
+						 });
+					 }else {
+						 f();
+					 }
+				})();
+			},
+			
+			// 根据坐标点获取两点之间的时间与距离（手动规划）
+			getDistanceAndTotime : function(stationList,cb) {
+				
+				stationList[0].distance = '';
+				
+				stationList[0].duration = '';
+				
+				// var sectionList = [];
+				
+				// 获取长度
+				var len = stationList.length;
+				
+				(function(){
+					
+					 if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						// cb && cb(stationList,sectionList);
+						 cb && cb(stationList);
+			              return;
+			          }
+					 
+					 var f = arguments.callee;
+					 
+					 var poiOne =  new BMap.Point(stationList[index].potion.lng,stationList[index].potion.lat);
+					 
+					 var poiTwo =  new BMap.Point(stationList[index+1].potion.lng,stationList[index+1].potion.lat);
+					 
+					 var transit = new BMap.TransitRoute(mapBValue, {renderOptions: {map: mapBValue},onSearchComplete: searchComplete});
+					 
+					 transit.search(poiOne,poiTwo);
+					 
+					 function searchComplete(results){
+						 
+						 var plan = results.getPlan(0);
+						 
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+								
+								stationList[index+1].distance = '';
+								
+								stationList[index+1].duration = '';
+								
+								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:''});
+								
+						 }else {
+								
+								stationList[index+1].distance = plan.getDistance(true);
+								
+								stationList[index+1].duration = plan.getDuration(true);
+								
+								// var line = plan.getRoute(0);
+								
+								// sectionList.push({sectionName:stationList[index].name+stationList[index+1].name,points:line.getPath()});
+								 
+						 }
+						 
+						f();
+					}
+					 
+				})();
+				
+			},
+			
+			// 根据坐标点获取两点之间的折线路段（手动规划）
+			getSectionListPlonly : function(stationsPoint,cb) {
+				
+				var len = stationsPoint.length;
+				
+				var sectionList = [];
+				
+				(function(){
+					
+					 if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1 ) {
+						 
+						cb && cb(sectionList);
+			              return;
+			          }
+					 
+					 var f = arguments.callee;
+					 
+					 var poiOne =  new BMap.Point(stationsPoint[index].potion.lng,stationsPoint[index].potion.lat);
+					 
+					 var poiTwo =  new BMap.Point(stationsPoint[index+1].potion.lng,stationsPoint[index+1].potion.lat);
+					 
+					/* var transit = new BMap.TransitRoute(mapB, {renderOptions: {map: mapB},onPolylinesSet: searchPolylinesSet});*/
+					 
+					 var transit = new BMap.DrivingRoute(mapBValue, {renderOptions: {map: mapBValue},onPolylinesSet: searchPolylinesSet});
+					 
+					 function searchPolylinesSet(results){
+						 
+						 if (transit.getStatus() != BMAP_STATUS_SUCCESS){
+								
+								
+						 }else {
+							 
+							 var sectionArrayList = [];
+							 for (i = 0; i < results.length; i++){
+								 
+								// console.log(results[i].getPolyline().getPath());
+								sectionArrayList =  sectionArrayList.concat(results[i].getPolyline().getPath());
+							
+							 }
+							 
+							 var sectionName = stationsPoint[index].name + '至' + stationsPoint[index+1].name;
+							 
+							 sectionList.push({sectionName:sectionName,points:sectionArrayList});
+								 
+						 }
+						 
+						f();
+					}
+					
+					 transit.search(poiOne,poiTwo);
+					 
+				})();
+				
+			},
+			
+			localtionPoint : function(stationNameV) {
+				
+				WorldsBMap.localSearchFromAdreesToPoint(stationNameV,function(Points) {
+					
+					if(Points) {
+						
+						var BJwpointsArray = Points.split(' ');
+						
+						var stationNameChangePoint = new BMap.Point(BJwpointsArray[0], BJwpointsArray[1]);
+						
+				  		var marker_stargt2 = new BMap.Marker(stationNameChangePoint); 
+				  		
+				  		var PanOptions ={noAnimation :true};
+				  		
+				  		mapBValue.panTo(stationNameChangePoint,PanOptions);
+				  		
+				  		mapBValue.panBy(0,-100);
+				  		
+				  		// 将标注添加到地图中
+				  		mapBValue.addOverlay(marker_stargt2);  
+				  		
+				  		//跳动的动画
+				  		marker_stargt2.setAnimation(BMAP_ANIMATION_BOUNCE); 
+						
+					}
+					
+				});
+				
+			},
+			
+			/** 系统规划抓去数据 @param  lineNameValue:线路名称；i：方向*/
+			getBmapStationNames : function(lineNameValue,i,callback) {
+				
+				var busline = new BMap.BusLineSearch(mapBValue,{
+					 
+					// 设置公交列表查询后的回调函数。参数：rs: BusListResult类型
+					onGetBusListComplete:function(BusListResult) {
+						
+						// 如果不为空
+						if(BusListResult){
+							
+							//获取第一个公交列表显示到map上
+							var fstLine = BusListResult.getBusListItem(i);
+							
+							/*if(fstLine==undefined){
+								
+								layer.confirm('系统无法生成该线路【'+lineNameValue+'】的站点与路段！请点击返回选择其它方式规划', {btn : [ '返回' ],icon: 3, title:'提示' }, function(index){
+									
+									layer.closeAll();
+									
+									if(i==0){
+										
+										$('#upToolsMobal').show();
+										
+									}else if(i==1){
+										
+										$('#downToolsMobal').show();
+										
+									}
+									
+									return;
+								});
+								
+							}*/
+							
+							if(fstLine==undefined){
+								
+								
+								callback && callback(null);
+								
+							}
+							
+							busline.getBusLine(fstLine);
+							
+						}
+						
+					},
+					
+					//设置公交线路查询后的回调函数.参数：rs: BusLine类型
+					onGetBusLineComplete: function(BusLine){
+						
+						// 如果不为空
+						if(BusLine){
+							
+							callback && callback(BusLine);
+							
+						}
+						
+					}
+					
+				});
+				
+				busline.getBusList(lineNameValue);
+				
+			},
+			
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
 }();
 \ No newline at end of file
-/**
- * 百度地图
- * 
- * - - - - - -》init：地图初始化
- * 
- * - - - - - -》getDistanceAndDuration：获取距离与时间
- * 
- * - - - - - -》drawingUpline：在地图上画出上行线路走向
- * 
- * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
- */
-
-var SpeedingMap = function () {
-	
-	/** SpeedingMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
-	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
-	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
-	
-	var Bmap = {
-			
-			init : function() {
-				
-				// 设置中心点,
-				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
-				
-				// 百度API Key
-				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-				
-				// 初始化百度地图
-				mapBValue = new BMap.Map("speedingMap");
-				
-				//中心点和缩放级别
-				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
-				
-				//启用地图拖拽事件，默认启用(可不写)
-				mapBValue.enableDragging(); 
-				
-				//启用地图滚轮放大缩小
-				mapBValue.enableScrollWheelZoom(); 
-				
-				//禁用鼠标双击放大
-				mapBValue.disableDoubleClickZoom();
-				
-				//启用键盘上下左右键移动地图
-				mapBValue.enableKeyboard();
-				
-				return mapBValue;
-			},
-			/** 获取第一个切路段的点  @return Point*/
-			getFirstPoint : function() {
-				return firstPoint;
-			},
-			/** 获取地图对象 @return 地图对象map */
-			getmapBValue : function() {
-				
-				return mapBValue;
-				
-			},
-			
-			getPolyUpline : function() {
-				
-				return polyUpline;
-			},
-			
-			/** 获取截取过的路段 @return 路段对象List */
-			getSectionList : function() {
-				
-				return sectionList;
-				
-			},
-			setSectionList : function(list) {
-				
-				sectionList = list;
-			},
-			initCutSectionPoint : function() {
-				sectionList = [];
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			/** 获取切路段的点下标  @return int*/
-			setPointIndex : function(index) {
-				pointIndex = index;
-			},
-			getPointIndex : function() {
-				
-				return pointIndex;
-				
-			},
-			/** 获取路段是否在编辑状态 @return boolean*/
-			getIsEditStatus : function() {
-				return iseditStatus;
-			},			
-			setIsEditStatus : function(v) {
-				iseditStatus = v ;
-			},
-					
-			/** 获取路段是否在截取状态 @return boolean*/
-			getIsCutSection : function() {
-				return isCutSection;
-			},			
-			setIsCutSection : function(v) {
-				isCutSection = v ;
-			},
-			
-			/** 获取距离与时间 @param <points：坐标点集合> */
-			getDistanceAndDuration : function(points,callback){
-				
-				// 获取长度
-				var len = points.length;
-				(function(){
-					
-					if (!arguments.callee.count) {
-						 
-						 arguments.callee.count = 0;
-						 
-					 }
-					 
-					 arguments.callee.count++;
-					 
-					 var index = parseInt(arguments.callee.count) - 1;
-					 
-					 if (index >= len-1) {
-						 
-						 callback && callback(points);
-			        	  
-			              return;
-			          }
-					 
-					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
-					 var f = arguments.callee;
-					 // 起点坐标 <坐标格式：40.056878,116.30815>
-					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
-					 
-					 // 终点坐标 <坐标格式：40.056878,116.30815>
-					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
-					 var region = '上海';
-					 
-					 var origin_region = '上海';
-					 
-					 var destination_region = '上海';
-					 
-					 var output = 'json';
-					 
-					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
-					 
-					 /** 
-					  *  origin：起点名称或经纬度；
-					  * 
-					  *  destination：终点名称或经纬度；
-					  *  
-					  *  origin_region：起始点所在城市，驾车导航时必填。
-					  *  
-					  *  destination_region：终点所在城市，驾车导航时必填。
-					  * 
-					  *  output :表示输出类型，可设置为xml或json，默认为xml。
-					  *  
-					  **/
-					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
-					 
-					 /** @description :未认证开发者默认配额为：2000次/天。 */
-					 $.ajax({
-						  
-						  // 百度地图根据坐标获取两点之间的时间与距离
-			              url: 'http://api.map.baidu.com/direction/v1?mode=transit',
-			              
-			              data: paramsB,
-			              
-			              dataType: 'jsonp',
-			              
-			              success: function(r){
-			            	  
-			            	  if(r) {
-			            		  
-			            		  if(r.message=='ok') {
-			            			  
-			            			  if(r.result.taxi==null) {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = 0;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = 0;
-			            				  
-			            			  }else {
-			            				  
-			            				  // 获取距离(单位：米)
-				            			  points[index+1].distance = r.result.taxi.distance;
-				            			  
-				            			  // 获取时间(单位：秒)
-				            			  points[index+1].duration = r.result.taxi.duration;
-			            				  
-			            			  }
-			            			  
-			            			  
-			            		  }
-			            		  
-			            	  }
-			            	  
-			            	  f();
-			              }
-			          });
-					
-				})();
-				
-			},
-			// 在地图上画出上行线路走向
-			drawingUpline01 : function (polylineArray,polyline_center,data) {
-				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
-				// 创建线路走向
-				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
-				polyUpline01.data = data;
-				// 把折线添加到地图上
-				mapBValue.addOverlay(polyUpline01);
-				var sectionPoint = [];
-				// 线路单击事件
-				polyUpline01.addEventListener('click',function(e) {
-					if(SpeedingMap.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					if(SpeedingMap.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					polyUpline01.enableEditing();
-					SpeedingMap.setIsEditStatus(true);
-				});
-				
-				// 添加路段双击事件
-				polyUpline01.addEventListener("dblclick",function(e){
-					if(SpeedingMap.getIsCutSection()) {
-						layer.msg('请先撤销所有切路段的点...');
-						return false;
-					}
-					SpeedingMap.setIsEditStatus(false);
-					// 关闭
-					layer.closeAll();
-					polyUpline01.disableEditing();
-					EditSectionObj.setEitdSection(polyUpline01.data);
-					// 获取折线坐标集合
-					var editPloyLineArray = polyUpline01.getPath();
-					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					sectionList = [];
-					var tbodyHtml = template('section_list',{list : sectionList});
-					// 截取路段
-					$('#section_table tbody').html(tbodyHtml);
-					// 加载修改路段弹出层mobal页面
-					$.get('editsection.html', function(m){
-						$(pjaxContainer).append(m);
-						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [SpeedingMap,GetAjaxData,EditSectionObj,PublicFunctions]);
-					});
-				});
-				
-				// 路段右击事件
-				var editSection = function(e,ee,marker){
-					if(SpeedingMap.getIsEditStatus()) {
-						layer.msg('请先保存正在编辑的路段信息...');
-						return false;
-					}
-					var lng = e.lng;
-					var lat = e.lat;	
-					var sectionName = null;
-					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
-					marker.isFlag = true;
-					if(pointIndex == 0) {
-						sectionPoint[pointIndex] = {lng:lng , lat:lat};
-						layer.msg('进入切路段状态，请选择本路段的终点！');
-						mapBValue.addOverlay(marker);// 添加覆盖物
-						firstPoint = {lng:lng, lat:lat};
-						pointIndex++;
-						EditSectionObj.setEitdSection(polyUpline01.data);
-						// 获取折线坐标集合
-						var editPloyLineArray = polyUpline01.getPath();
-						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
-					} else if (pointIndex > 0) {
-						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
-							pointList = [];
-							sectionPoint[pointIndex] = {lng:lng , lat:lat};
-							pointList[0] = sectionPoint[pointIndex-1];
-							pointList[1] = sectionPoint[pointIndex];
-							sectionList.push({name:sectionName, section:pointList});	
-							layer.close(index);
-							layer.msg('路段截取成功，请选择下一个路段的终点');
-							mapBValue.addOverlay(marker);// 添加覆盖物
-							var tbodyHtml = template('section_list',{list : sectionList});
-							// 截取路段
-							$('#section_table tbody').html(tbodyHtml);
-							pointIndex++;
-						});
-					}
-					SpeedingMap.setIsCutSection(true);
-				}
-				var markerMenu=new BMap.ContextMenu();
-				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
-				polyUpline01.addContextMenu(markerMenu);
-				
-				
-		  		var PanOptions_ ={noAnimation :true};
-		  		mapBValue.reset();
-		  		mapBValue.panTo(polyline_center,PanOptions_);
-		  		mapBValue.panBy(500,-510,PanOptions_);
-		  		mapBValue.setZoom(14);
-			},
-			// 删除点刷新cutSectionTable
-			refreshCutSectionTable : function() {
-				var tbodyHtml = template('section_list',{list : sectionList});
-				$('#section_table tbody').html(tbodyHtml);
-			},
-			// 删除点刷新覆盖物
-			deleteCutSectionPoint : function(point) {
-				var lng = point.lng;
-				var lat = point.lat;
-				var allOverlay = mapBValue.getOverlays();
-				// 删除最后一个点
-				for (var i = 0; i < allOverlay.length -1; i++){
-					if(allOverlay[i].isFlag) {
-						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
-							mapBValue.removeOverlay(allOverlay[i]);
-							break;
-						}
-					}
-				}		
-			},			
-			/** 在地图上画点 @param：<point_center：中心坐标点> */
-			drawingUpStationPoint : function(point_center,stationName,s) {
-				
-				// 自定义标注物图片
-			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
-			  		
-			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
-			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
-						+ 		'</div>'
-						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
-						 
-						
-				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
-                        "anchor" : new BMap.Size(-10,8),
-						  "enableDragging" : true});
-				
-			
-				myRichMarker1.disableDragging();
-				mapBValue.addOverlay(myRichMarker1);
-		  		
-		  		
-		  		// 创建标注物
-		  		marker = new BMap.Marker(point_center,{icon : icon_target});
-  				
-		  		// 允许覆盖物在map.clearOverlays方法中被清除。
-		  		marker.enableMassClear();
-		  		
-		  		mapBValue.addOverlay(marker);
-			},
-			
-			// 根据站点坐标匹配库中的公交站点（手动规划）
-			stationsPointsToLibraryPoint : function(arra,callback) {
-				// 获取长度
-				var len = arra.length;
-				var station = {};
-				var stationList = [];
-				(function(){
-					if (!arguments.callee.count) {
-						arguments.callee.count = 0;
-					}
-					arguments.callee.count++;
-					var index = parseInt(arguments.callee.count) - 1;
-					if (index >= len) {
-						callback && callback(stationList);
-			        	return ; 
-			        }
-					var f = arguments.callee;
-					station = arra[index];					
-					if(arra[index].name!=''){
-						
-						$.get('/station/matchStation',station,function(resultStation) {
-							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
-							f();
-						});							 
-					 }else {
-						 f();
-					 }	
-				})()
-			},
-			clearMarkAndOverlays : function() {
-				
-				// 清楚地图覆盖物
-				mapBValue.clearOverlays();
-				
-				mapBValue.removeOverlay();
-				
-			}
-			
-	}
-	
-	return Bmap;
-	
+/**
+ * 百度地图
+ * 
+ * - - - - - -》init：地图初始化
+ * 
+ * - - - - - -》getDistanceAndDuration：获取距离与时间
+ * 
+ * - - - - - -》drawingUpline：在地图上画出上行线路走向
+ * 
+ * - - - - - -》stationsPointsToLibraryPoint：根据站点坐标匹配库中的公交站点（手动规划）
+ */
+
+var SpeedingMap = function () {
+	
+	/** SpeedingMap 全局变量定义 mapBValue：地图对象；polyUpline：走向折线；sectionList：截取过的路段 ；pointIndex：计算路段被切的次数;
+	 * firstPoint:截取路段的第一个点;iseditStatus：路段是否在编辑状态；isCutSection ： 获取路段是否在截取状态*/
+	var mapBValue = '', polyUpline='', sectionList = [], pointIndex = 0, iseditStatus = false, firstPoint = {}, isCutSection = false;
+	
+	var Bmap = {
+			
+			init : function() {
+				
+				// 设置中心点,
+				var CENTER_POINT = {lng : 121.528733,lat : 31.237425};
+				
+				// 百度API Key
+				var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+				
+				// 初始化百度地图
+				mapBValue = new BMap.Map("speedingMap");
+				
+				//中心点和缩放级别
+				mapBValue.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat),15);
+				
+				//启用地图拖拽事件，默认启用(可不写)
+				mapBValue.enableDragging(); 
+				
+				//启用地图滚轮放大缩小
+				mapBValue.enableScrollWheelZoom(); 
+				
+				//禁用鼠标双击放大
+				mapBValue.disableDoubleClickZoom();
+				
+				//启用键盘上下左右键移动地图
+				mapBValue.enableKeyboard();
+				
+				return mapBValue;
+			},
+			/** 获取第一个切路段的点  @return Point*/
+			getFirstPoint : function() {
+				return firstPoint;
+			},
+			/** 获取地图对象 @return 地图对象map */
+			getmapBValue : function() {
+				
+				return mapBValue;
+				
+			},
+			
+			getPolyUpline : function() {
+				
+				return polyUpline;
+			},
+			
+			/** 获取截取过的路段 @return 路段对象List */
+			getSectionList : function() {
+				
+				return sectionList;
+				
+			},
+			setSectionList : function(list) {
+				
+				sectionList = list;
+			},
+			initCutSectionPoint : function() {
+				sectionList = [];
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			/** 获取切路段的点下标  @return int*/
+			setPointIndex : function(index) {
+				pointIndex = index;
+			},
+			getPointIndex : function() {
+				
+				return pointIndex;
+				
+			},
+			/** 获取路段是否在编辑状态 @return boolean*/
+			getIsEditStatus : function() {
+				return iseditStatus;
+			},			
+			setIsEditStatus : function(v) {
+				iseditStatus = v ;
+			},
+					
+			/** 获取路段是否在截取状态 @return boolean*/
+			getIsCutSection : function() {
+				return isCutSection;
+			},			
+			setIsCutSection : function(v) {
+				isCutSection = v ;
+			},
+			
+			/** 获取距离与时间 @param <points：坐标点集合> */
+			getDistanceAndDuration : function(points,callback){
+				
+				// 获取长度
+				var len = points.length;
+				(function(){
+					
+					if (!arguments.callee.count) {
+						 
+						 arguments.callee.count = 0;
+						 
+					 }
+					 
+					 arguments.callee.count++;
+					 
+					 var index = parseInt(arguments.callee.count) - 1;
+					 
+					 if (index >= len-1) {
+						 
+						 callback && callback(points);
+			        	  
+			              return;
+			          }
+					 
+					 // 当函数被调用时，它的arguments.callee对象就会指向自身，也就是一个对自己的引用。(当前正在执行的函数。)
+					 var f = arguments.callee;
+					 // 起点坐标 <坐标格式：40.056878,116.30815>
+					 var origin = points[index].potion.lat + ',' + points[index].potion.lng;
+					 
+					 // 终点坐标 <坐标格式：40.056878,116.30815>
+					 var destination = points[index+1].potion.lat + ',' + points[index+1].potion.lng;
+					 var region = '上海';
+					 
+					 var origin_region = '上海';
+					 
+					 var destination_region = '上海';
+					 
+					 var output = 'json';
+					 
+					 var ak_My = 'wjlITmXeCek5MxyU3ZUBkTeU8B0o0npk';
+					 
+					 /** 
+					  *  origin：起点名称或经纬度；
+					  * 
+					  *  destination：终点名称或经纬度；
+					  *  
+					  *  origin_region：起始点所在城市，驾车导航时必填。
+					  *  
+					  *  destination_region：终点所在城市，驾车导航时必填。
+					  * 
+					  *  output :表示输出类型，可设置为xml或json，默认为xml。
+					  *  
+					  **/
+					 var paramsB = {origin:origin,destination:destination,region:region,origin_region:origin_region,destination_region:destination_region,output:output,ak:ak_My};
+					 
+					 /** @description :未认证开发者默认配额为：2000次/天。 */
+					 $.ajax({
+						  
+						  // 百度地图根据坐标获取两点之间的时间与距离
+			              url: '//api.map.baidu.com/direction/v1?mode=transit',
+			              
+			              data: paramsB,
+			              
+			              dataType: 'jsonp',
+			              
+			              success: function(r){
+			            	  
+			            	  if(r) {
+			            		  
+			            		  if(r.message=='ok') {
+			            			  
+			            			  if(r.result.taxi==null) {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = 0;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = 0;
+			            				  
+			            			  }else {
+			            				  
+			            				  // 获取距离(单位：米)
+				            			  points[index+1].distance = r.result.taxi.distance;
+				            			  
+				            			  // 获取时间(单位：秒)
+				            			  points[index+1].duration = r.result.taxi.duration;
+			            				  
+			            			  }
+			            			  
+			            			  
+			            		  }
+			            		  
+			            	  }
+			            	  
+			            	  f();
+			              }
+			          });
+					
+				})();
+				
+			},
+			// 在地图上画出上行线路走向
+			drawingUpline01 : function (polylineArray,polyline_center,data) {
+				var polyUpline01 = 'polyline' + '_' + data.sectionrouteId;
+				// 创建线路走向
+				polyUpline01 = new BMap.Polyline(polylineArray, {strokeColor : "blue",strokeWeight : 6,strokeOpacity : 0.5});
+				polyUpline01.data = data;
+				// 把折线添加到地图上
+				mapBValue.addOverlay(polyUpline01);
+				var sectionPoint = [];
+				// 线路单击事件
+				polyUpline01.addEventListener('click',function(e) {
+					if(SpeedingMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					if(SpeedingMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					polyUpline01.enableEditing();
+					SpeedingMap.setIsEditStatus(true);
+				});
+				
+				// 添加路段双击事件
+				polyUpline01.addEventListener("dblclick",function(e){
+					if(SpeedingMap.getIsCutSection()) {
+						layer.msg('请先撤销所有切路段的点...');
+						return false;
+					}
+					SpeedingMap.setIsEditStatus(false);
+					// 关闭
+					layer.closeAll();
+					polyUpline01.disableEditing();
+					EditSectionObj.setEitdSection(polyUpline01.data);
+					// 获取折线坐标集合
+					var editPloyLineArray = polyUpline01.getPath();
+					EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					sectionList = [];
+					var tbodyHtml = template('section_list',{list : sectionList});
+					// 截取路段
+					$('#section_table tbody').html(tbodyHtml);
+					// 加载修改路段弹出层mobal页面
+					$.get('editsection.html', function(m){
+						$(pjaxContainer).append(m);
+						$('#edit_section_mobal_cache').trigger('editSectionMobalCache_show', [SpeedingMap,GetAjaxData,EditSectionObj,PublicFunctions]);
+					});
+				});
+				
+				// 路段右击事件
+				var editSection = function(e,ee,marker){
+					if(SpeedingMap.getIsEditStatus()) {
+						layer.msg('请先保存正在编辑的路段信息...');
+						return false;
+					}
+					var lng = e.lng;
+					var lat = e.lat;	
+					var sectionName = null;
+					var marker = new BMap.Marker(new BMap.Point(lng, lat)); // 创建点
+					marker.isFlag = true;
+					if(pointIndex == 0) {
+						sectionPoint[pointIndex] = {lng:lng , lat:lat};
+						layer.msg('进入切路段状态，请选择本路段的终点！');
+						mapBValue.addOverlay(marker);// 添加覆盖物
+						firstPoint = {lng:lng, lat:lat};
+						pointIndex++;
+						EditSectionObj.setEitdSection(polyUpline01.data);
+						// 获取折线坐标集合
+						var editPloyLineArray = polyUpline01.getPath();
+						EditSectionObj.setEitdBsectionVector(JSON.stringify(editPloyLineArray));
+					} else if (pointIndex > 0) {
+						layer.prompt({title: '请输入路段名！'}, function(sectionName, index){
+							pointList = [];
+							sectionPoint[pointIndex] = {lng:lng , lat:lat};
+							pointList[0] = sectionPoint[pointIndex-1];
+							pointList[1] = sectionPoint[pointIndex];
+							sectionList.push({name:sectionName, section:pointList});	
+							layer.close(index);
+							layer.msg('路段截取成功，请选择下一个路段的终点');
+							mapBValue.addOverlay(marker);// 添加覆盖物
+							var tbodyHtml = template('section_list',{list : sectionList});
+							// 截取路段
+							$('#section_table tbody').html(tbodyHtml);
+							pointIndex++;
+						});
+					}
+					SpeedingMap.setIsCutSection(true);
+				}
+				var markerMenu=new BMap.ContextMenu();
+				markerMenu.addItem(new BMap.MenuItem('切路段',editSection.bind(polyUpline01)));
+				polyUpline01.addContextMenu(markerMenu);
+				
+				
+		  		var PanOptions_ ={noAnimation :true};
+		  		mapBValue.reset();
+		  		mapBValue.panTo(polyline_center,PanOptions_);
+		  		mapBValue.panBy(500,-510,PanOptions_);
+		  		mapBValue.setZoom(14);
+			},
+			// 删除点刷新cutSectionTable
+			refreshCutSectionTable : function() {
+				var tbodyHtml = template('section_list',{list : sectionList});
+				$('#section_table tbody').html(tbodyHtml);
+			},
+			// 删除点刷新覆盖物
+			deleteCutSectionPoint : function(point) {
+				var lng = point.lng;
+				var lat = point.lat;
+				var allOverlay = mapBValue.getOverlays();
+				// 删除最后一个点
+				for (var i = 0; i < allOverlay.length -1; i++){
+					if(allOverlay[i].isFlag) {
+						if(allOverlay[i].point.lng == lng && allOverlay[i].point.lat == lat){
+							mapBValue.removeOverlay(allOverlay[i]);
+							break;
+						}
+					}
+				}		
+			},			
+			/** 在地图上画点 @param：<point_center：中心坐标点> */
+			drawingUpStationPoint : function(point_center,stationName,s) {
+				
+				// 自定义标注物图片
+			  	var icon_target = new BMap.Icon('/pages/base/stationroute/css/img/gjzd.png',new BMap.Size(10, 10));
+			  		
+			  	var html2 = '<div style="position: absolute; margin: 0pt; padding: 0pt; width: 160px; height: 26px; left: -10px; top: -35px; overflow: hidden;">'
+			            +     		'<img class="rm3_image" style="border:none;left:0px; top:0px; position:absolute;" src="/pages/base/stationroute/css/img/back160.png">'
+						+ 		'</div>'
+						+ 		'<label class=" BMapLabel" unselectable="on" style="position: absolute; -moz-user-select: none; display: inline; cursor: inherit; border: 0px none; padding: 2px 1px 1px; white-space: nowrap; font: 12px arial,simsun; z-index: 80; color: rgb(255, 102, 0); left: 15px; top: -35px;"><span style="float: left; color: #fdfdfd; margin-left: -22px;  font-size: 6px;">'+ s+'</span>'+ stationName+'</label>';
+						 
+						
+				var	myRichMarker1 = new BMapLib.RichMarker(html2, point_center,{
+                        "anchor" : new BMap.Size(-10,8),
+						  "enableDragging" : true});
+				
+			
+				myRichMarker1.disableDragging();
+				mapBValue.addOverlay(myRichMarker1);
+		  		
+		  		
+		  		// 创建标注物
+		  		marker = new BMap.Marker(point_center,{icon : icon_target});
+  				
+		  		// 允许覆盖物在map.clearOverlays方法中被清除。
+		  		marker.enableMassClear();
+		  		
+		  		mapBValue.addOverlay(marker);
+			},
+			
+			// 根据站点坐标匹配库中的公交站点（手动规划）
+			stationsPointsToLibraryPoint : function(arra,callback) {
+				// 获取长度
+				var len = arra.length;
+				var station = {};
+				var stationList = [];
+				(function(){
+					if (!arguments.callee.count) {
+						arguments.callee.count = 0;
+					}
+					arguments.callee.count++;
+					var index = parseInt(arguments.callee.count) - 1;
+					if (index >= len) {
+						callback && callback(stationList);
+			        	return ; 
+			        }
+					var f = arguments.callee;
+					station = arra[index];					
+					if(arra[index].name!=''){
+						
+						$.get('/station/matchStation',station,function(resultStation) {
+							stationList.push({name:resultStation.name ,wgs:arra[index].wgs,potion:{lng:resultStation.potion_lng, lat:resultStation.potion_lat}, isHave:resultStation.isHave , id:resultStation.id});
+							f();
+						});							 
+					 }else {
+						 f();
+					 }	
+				})()
+			},
+			clearMarkAndOverlays : function() {
+				
+				// 清楚地图覆盖物
+				mapBValue.clearOverlays();
+				
+				mapBValue.removeOverlay();
+				
+			}
+			
+	}
+	
+	return Bmap;
+	
 }();
 \ No newline at end of file
@@ -42,7 +42,7 @@
 					</div>
 					<div style="display: inline-block;margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">班次类型: </span>
-						<select class="form-control" name="line" id="bcType" style="width: 150px;">
+						<select class="form-control" name="bcType" id="bcType" style="width: 150px;">
 							<option value="0">全部班次</option>
 							<option value="1">全程</option>
 							<option value="2">区间</option>
@@ -59,19 +59,20 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2022-08-29 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2022-06-13 更新说明 Changelog</h2>
     <br><br>
     <ul >
         <li class="sub_title"><h6>报表</h6></li>
-        <li><span class="label s_c_change">修改</span>1.统计报表->路单线路明细月报、年报 加入氢能源的统计内容</li>
-        <!--<li class="sub_title"><h6>基础信息</h6></li>
+        <li><span class="label s_c_change">修改</span>1.统计报表->路单线路明细月报、年报 中耗电统计值偏离的问题</li>
+        <li><span class="label s_c_change">修改</span>2.统计报表->"(班次)到离站"报表，新增历史站点版本数据查询，解决站点顺序的问题</li>
+        <li class="sub_title"><h6>基础信息</h6></li>
         <li><span class="label s_c_change">修改</span>1.调度系统车辆信息与车辆库车辆信息保持同步，调度系统取消车辆的新增、编辑功能</li>
         <li><span class="label s_c_change">修改</span>2.调度系统人员信息与人事系统人员信息保持同步，调度系统取消人员的新增、编辑功能</li>
         <li class="sub_title"><h6>运管处</h6></li>
         <li><span class="label s_c_change">修改</span>1.电子路单上传至运管处时采用多次上传降低上传失败率</li>
         <li class="sub_title"><h6>线调</h6></li>
         <li><span class="label s_c_change">修改</span>1.线调->车载设备->设备管理 中"最后GPS时间"列显示异常修正</li>
-        <li><span class="label s_c_change">修改</span>2.无排班线路添加"临加班次"功能</li>-->
+        <li><span class="label s_c_change">修改</span>2.无排班线路添加"临加班次"功能</li>
     </ul>
  
 </div>
-var realMap = (function() {
-	
-	function getJSONP(url, data ,callback){
-        $.ajax({
-            url:url,
-            data: data,
-            dataType:'jsonp',
-            success:callback,
-            error: function(e){
-            	alert('error: jsonp,' + url);
-            }
-        });
-    }
-	
-	/**
-	 * 透明点，用于替换隐藏百度Marker的icon
-	 */
-	var tmIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAAbSURBVHjaYvz//z8DAwMDAxMDFAAAAAD//wMAMAYDAW/BVI8AAAAASUVORK5CYII=';
-	
-	var REAL_BAIDU_TEXT = '百度地图', REAL_GAODE_TEXT = '高德地图';
-
-	// 中心点 （上海市浦东新区政府）
-	var CENTER_POINT = {
-		lng : 121.544336,
-		lat : 31.221315
-	};
-
-	// 图层容器
-	var mapContainer = $('#mapContainer');
-	// 路况按钮
-	var trafficBtn = $('#trafficItem');
-	
-	var storage = window.localStorage;
-	
-	var currentMap;
-	
-	var city = "上海";
-	
-	//百度API Key
-	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
-	
-	var bd_gps_info_win_opts = {
-	  		width : 190,
-	  		height: 255,
-	  		enableMessage:true
-	};
-	
-	//线路路由
-	var polylines;
-	
-	//百度 -轨迹回放点聚合
-	//var historyClusterer;
-	
-	var markerClusterer;
-	
-	//设备号和marker对照
-	var markersMap;
-	var real_map = {
-		getMap: function(){
-			return currentMap;
-		},
-		init: function(){
-			var m = storage.getItem('real_map');
-			if(m && m == REAL_GAODE_TEXT)
-				real_map.gaode.init();
-			else
-				real_map.baidu.init();
-		},
-		//百度地图
-		baidu : {
-			//初始化
-			init : function() {
-				real_map.setText(REAL_BAIDU_TEXT);
-
-				var map = new BMap.Map(mapContainer[0]);
-				//中心点和缩放级别
-				map.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
-				map.enableScrollWheelZoom();
-				//加载完成
-				map.addEventListener("tilesloaded", function() {
-					layer.closeAll();
-					storage.setItem('real_map', REAL_BAIDU_TEXT);
-				});
-				
-				// 路况控件
-				var ctrl = new BMapLib.TrafficControl();
-				map.addControl(ctrl);
-
-				//historyClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 2})
-				var isVisible;
-				trafficBtn.on('click', function() {
-					if (isVisible) {
-						ctrl.hide();
-						isVisible = false;
-						//调整线路路由透明度
-						$.each(polylines, function(){
-							this.setStrokeOpacity(0.5);
-						});
-					} else {
-						ctrl.show();
-						isVisible = true;
-						//调整线路路由透明度
-						$.each(polylines, function(){
-							this.setStrokeOpacity(0.1);
-						});
-					}
-				});
-				//百度路况控件自身关闭按钮
-				$('.portlet-fullscreen').on('click', '.maplibTc .maplibTcClose', function(){
-					isVisible = false;
-					//调整线路路由透明度
-					$.each(polylines, function(){
-						this.setStrokeOpacity(0.5);
-					});
-				});
-
-				$('#tcWrap.maplibTc').addClass('animated bounceInLeft');
-				$('.maplibTcBtn_deskTop.anchorTR').remove();
-
-				//保存当前地图实例和名称
-				currentMap = {
-						map: map,
-						mapName: REAL_BAIDU_TEXT,
-						fName : 'baidu'
-				}
-				
-			},
-			clear: function(){
-				currentMap.map.clearOverlays();
-				markerClusterer && markerClusterer.clearMarkers();
-				
-			},
-			change : function() {
-				if(currentMap.mapName == REAL_BAIDU_TEXT)
-					return;
-				
-				showMsg(REAL_BAIDU_TEXT);
-
-				real_map.destroy();
-				real_map.baidu.init();
-			},
-			autocomplete: function(input, cb){
-				var ac = new BMap.Autocomplete({
-					'location' : realMap.getMap().map,
-					'input': input,
-					'onSearchComplete': function(result){
-						//隐藏默认的提示框
-						ac.hide();
-						cb && cb({type: 'baidu', result: result.wr});
-					}
-				});
-				
-				 $('#' + input).on('keyup', function(){
-		        	if(this.value == ''){
-		        		$('.search_result').html('');
-		        		return;
-		        	}
-		         });
-				
-			},
-			setPlace: function(val){
-				var map = currentMap.map;
-				map.clearOverlays();
-				var local = new BMap.LocalSearch(map, {
-					  onSearchComplete: function(){
-						  var poi = local.getResults().getPoi(0);
-						  if(!poi){
-							  return;
-						  }
-						  var pp = poi.point;
-						  map.centerAndZoom(pp, 18);
-						  map.addOverlay(new BMap.Marker(pp));
-					  }
-				});
-				
-				local.search(val);
-			},
-			drawLine: function(route){
-				var map = currentMap.map;
-				map.clearOverlays();
-				polylines = [];
-				//画线路
-				//从localStorage里读取路由信息
-				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
-				var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
-					,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
-				
-				var upPos = [], downPos = [], tempArray;
-				//上行
-				if(route.up){
-					$.each(route.up.split(','), function(){
-						tempArray = this.split(' ');
-						upPos.push(new BMap.Point(tempArray[0], tempArray[1]));
-					});
-					
-					var upLine = new BMap.Polyline(upPos, upLineOps);
-					map.addOverlay(upLine);
-					
-					polylines.push(upLine);
-					map.panTo(upPos[parseInt(upPos.length / 2)]);
-				}
-				//下行
-				if(route.down){
-					$.each(route.down.split(','), function(){
-						tempArray = this.split(' ');
-						downPos.push(new BMap.Point(tempArray[0], tempArray[1]));
-					});
-					
-					var downLine = new BMap.Polyline(downPos, downLineOps);
-					map.addOverlay(downLine);
-					polylines.push(downLine);
-					
-				}
-			},
-			//批量将GPS信号画到地图上
-			drawGpsMarker: function(gpsList){
-				markersMap = {};
-				var map = currentMap.map;
-				
-				markerClusterer && markerClusterer.clearMarkers();
-				markerClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 3});
-				real_map.baidu.coordsConvert(gpsList, function(){
-					//绘制车辆位置
-					var marker;
-					$.each(gpsList, function(i, gpsData){
-						marker = createBDMarkerByGps(gpsData)
-						map.addOverlay(marker);
-						//marker加入点聚合
-						markerClusterer.addMarker(marker); 
-						
-						markersMap[gpsData.deviceId] = marker;
-					});
-					
-				});
-			},
-			goToMarker: function(deviceId){
-				var m = markersMap[deviceId];
-				if(m){
-					currentMap.map.panTo(m.point);
-					setTimeout(function(){
-						bdOpenWindow(m);
-					}, 500);
-				}
-			},
-			coordsConvert: function(list, cb){
-				if(list.length > 100)
-					list = list.slice(0, 100);
-				
-				var coords = '';
-				//拼接GPS坐标，一次性转换
-				for (var i = 0, item; item = list[i++];) 
-					coords += item.lon + ',' + item.lat + ';';
-				coords = coords.substring(0, coords.length - 1);
-				getJSONP('http://api.map.baidu.com/geoconv/v1/',{coords: coords, ak: bdKey}
-				,function(rt){
-					$.each(rt.result, function(j, bdCoord){
-						list[j].bd_coord = bdCoord;
-					});
-					cb&&cb();
-				});
-			},
-			//绘制轨迹回放 marker
-			addHistoryMarker: function(gps){
-				
-				var marker = bdHistoryMarker(gps);
-				currentMap.map.addOverlay(marker);
-				
-				//historyClusterer.addMarker(marker);
-				return marker;
-			},
-			//移动marker
-			moveMarker: function(marker , gps){
-				marker.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
-				//重新设置颜色
-				marker.getLabel().setStyle({borderColor: bgColor(gps), backgroundColor: bgColor(gps)});
-			},
-			//居中marker
-			markerToCenter: function(marker){
-				currentMap.map.panTo(marker.getPosition());
-			},
-			//删除marker
-			removeMarker: function(marker){
-				currentMap.map.removeOverlay(marker);
-			}
-		},
-		//高德地图
-		gaode : {
-			init : function() {
-				var mapLoadAnim = '<div class="sk-cube-grid _center">'+
-									'<div class="sk-cube sk-cube1"></div>'+
-									'<div class="sk-cube sk-cube2"></div>'+
-									'<div class="sk-cube sk-cube3"></div>'+
-									'<div class="sk-cube sk-cube4"></div>'+
-									'<div class="sk-cube sk-cube5"></div>'+
-									'<div class="sk-cube sk-cube6"></div>'+
-									'<div class="sk-cube sk-cube7"></div>'+
-									'<div class="sk-cube sk-cube8"></div>'+
-									'<div class="sk-cube sk-cube9"></div>'+
-									'</div>';
-				
-				mapContainer.html(mapLoadAnim);
-				
-				real_map.gaode.setStyle();
-				real_map.setText(REAL_GAODE_TEXT);
-
-				var map = new AMap.Map(mapContainer[0]);
-				// 地图中心和缩放级别
-				map.setZoomAndCenter(14, [ CENTER_POINT.lng,CENTER_POINT.lat ]);
-				//加载完成
-				AMap.event.addListener(map, 'complete', function() {
-					layer.closeAll();
-					storage.setItem('real_map', REAL_GAODE_TEXT);
-					$('.sk-cube-grid._center').remove();
-				});
-
-				// 实时路况图层
-				var trafficLayer = new AMap.TileLayer.Traffic();
-				trafficLayer.setMap(map);
-				trafficLayer.hide();
-
-				var isVisible;
-				trafficBtn.on('click', function() {
-					if (isVisible) {
-						trafficLayer.hide();
-						isVisible = false;
-						$(this).removeClass('active');
-						
-						//调整线路路由透明度
-						$.each(polylines, function(){
-							this.setOptions({strokeOpacity: 0.5});
-						});
-					} else {
-						trafficLayer.show();
-						isVisible = true;
-						$(this).addClass('active');
-						
-						//调整线路路由透明度
-						$.each(polylines, function(){
-							this.setOptions({strokeOpacity: 0.1});
-						});
-					}
-				});
-
-				//保存当前地图实例和名称
-				currentMap = {
-						map: map,
-						mapName: REAL_GAODE_TEXT,
-						fName : 'gaode'
-				}
-				
-			},
-			change : function() {
-				if(currentMap.mapName == REAL_GAODE_TEXT)
-					return;
-				
-				showMsg(REAL_GAODE_TEXT);
-
-				real_map.destroy();
-				real_map.gaode.init();
-			},
-			setStyle : function() {
-				$('.mapRightWrap').addClass('gaode');
-				$('.mapTools').addClass('gaode');
-				$('.leftUtils').addClass('gaode');
-			},
-			clearStyle : function() {
-				$('.mapRightWrap').removeClass('gaode');
-				$('.mapTools').removeClass('gaode');
-				$('.leftUtils').removeClass('gaode');
-			},
-			autocomplete: function(input, cb){
-				
-				AMap.plugin('AMap.Autocomplete',function(){
-					var autoOptions = {
-				            city: city 
-			        };
-			        autocomplete= new AMap.Autocomplete(autoOptions);
-			        
-			        $('#' + input).on('keyup', function(){
-			        	if(this.value == ''){
-			        		$('.search_result').html('');
-			        		return;
-			        	}
-			        	autocomplete.search(this.value, function(status, result){
-			        		cb & cb({type: 'gaode', result: result.tips});
-				        });
-			        });
-				});
-			},
-			setPlace: function(val){
-				var map = currentMap.map;
-				
-				AMap.plugin(['AMap.PlaceSearch'],function(){
-				     var placeSearch = new AMap.PlaceSearch({
-				              city:city,
-				              map:map,
-				              pageSize: 1
-				     });
-				     
-				     placeSearch.search(val);
-				});
-			},
-			drawLine: function(route){
-				polylines = [];
-				var map = currentMap.map;
-				map.clearMap();
-				
-				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
-				var upArr = [], downArr = [];
-				
-				var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
-					,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
-				
-				//上行
-				if(route.up){
-					$.each(route.up_gcj.split(','), function(){
-						tempArray = this.split(' ');
-						upArr.push([tempArray[0], tempArray[1]]);
-					});
-					 var upLine = new AMap.Polyline(upLineOps);
-					//保存线条引用
-					 polylines.push(upLine);
-					 
-					 upLine.setMap(map);
-		             map.setCenter(upArr[parseInt(upArr.length / 2)]);
-					
-				}
-				//下行
-				if(route.down){
-					$.each(route.down_gcj.split(','), function(){
-						tempArray = this.split(' ');
-						downArr.push([tempArray[0], tempArray[1]]);
-					});
-					 var downLine = new AMap.Polyline(downLineOps);
-					 //保存线条引用
-					 polylines.push(downLine);
-					 
-					 downLine.setMap(map);
-				}
-			},
-			drawGpsMarker: function(gpsList){
-			}
-		},
-		setText : function(text) {
-			$('.leftUtils span.dropdown-toggle').html(
-					text + ' <i class="fa fa-angle-down"></i>');
-		},
-		destroy : function() {
-			trafficBtn.unbind('click');
-			
-			//如果当前地图实例有destroy方法即执行
-			var map = currentMap.map;
-			map.destroy && map.destroy();
-
-			if (currentMap.mapName == REAL_GAODE_TEXT) {
-				// 如果前一个地图是高德，清除相关样式
-				real_map.gaode.clearStyle();
-			}
-		}
-	}
-
-	function showMsg(text){
-		layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
-	}
-	
-	/**
-	 * 颜色
-	 */
-	var bgColor = function(g){
-		if(g.state == 0){
-			if(g.upDown == 0)
-				return '#5E96D2';
-			else if(g.upDown == 1)
-				return '#C92121';
-			else
-				return 'red';
-		}
-		else
-			return "rgb(171, 171, 171)";
-	}
-	
-	var tColor = function(g){
-		if(g.state == 0)
-			return "#fff";
-		else
-			return "rgb(229, 229, 229)";
-	}
-	
-	function createBDMarkerByGps(gpsData){
-		//marker
-		var point = new BMap.Point(gpsData.bd_coord.x, gpsData.bd_coord.y)
-		//label
-		,label = new BMap.Label(gpsData.nbbm.replace('-',''), {position: point, offset: new BMap.Size(-20,8)});
-		label.setStyle({borderColor: bgColor(gpsData), padding: '6px 6px 4px 6px', color: tColor(gpsData), backgroundColor: bgColor(gpsData)});
-		var marker = new BMap.Marker(point);
-		marker.setLabel(label);
-		//icon
-		marker.setIcon(new BMap.Icon(tmIcon, new BMap.Size(25,25)));
-		//window 绑定到 label
-		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
-		//数据绑定到label
-		marker.gpsData = gpsData;
-		
-		//mouseover
-		label.addEventListener('mouseover', function(){
-			bdOpenWindow(marker);
-		});
-		return marker;
-	}
-	
-	function bdHistoryMarker(gps){
-		//marker
-		var point = new BMap.Point(gps.bd_lon, gps.bd_lat)
-		//label
-		,label = new BMap.Label(gps.nbbm, {position: point, offset: new BMap.Size(-20,8)});
-		label.setStyle({borderColor: bgColor(gps), padding: '6px 6px 4px 6px', color: tColor(gps), backgroundColor: bgColor(gps)});
-		var marker = new BMap.Marker(point);
-		marker.setLabel(label);
-		//icon
-		marker.setIcon(new BMap.Icon(tmIcon, new BMap.Size(25,25)));
-/*		//window 绑定到 label
-		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
-		//数据绑定到label
-		marker.gpsData = gpsData;
-		
-		//mouseover
-		label.addEventListener('mouseover', function(){
-			bdOpenWindow(marker);
-		});*/
-		return marker;
-	}
-	
-	function bdOpenWindow(marker){
-		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
-		currentMap.map.openInfoWindow(marker.infoWindow, marker.point);
-	}
-	return real_map;
+var realMap = (function() {
+	
+	function getJSONP(url, data ,callback){
+        $.ajax({
+            url:url,
+            data: data,
+            dataType:'jsonp',
+            success:callback,
+            error: function(e){
+            	alert('error: jsonp,' + url);
+            }
+        });
+    }
+	
+	/**
+	 * 透明点，用于替换隐藏百度Marker的icon
+	 */
+	var tmIcon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKTWlDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVN3WJP3Fj7f92UPVkLY8LGXbIEAIiOsCMgQWaIQkgBhhBASQMWFiApWFBURnEhVxILVCkidiOKgKLhnQYqIWotVXDjuH9yntX167+3t+9f7vOec5/zOec8PgBESJpHmomoAOVKFPDrYH49PSMTJvYACFUjgBCAQ5svCZwXFAADwA3l4fnSwP/wBr28AAgBw1S4kEsfh/4O6UCZXACCRAOAiEucLAZBSAMguVMgUAMgYALBTs2QKAJQAAGx5fEIiAKoNAOz0ST4FANipk9wXANiiHKkIAI0BAJkoRyQCQLsAYFWBUiwCwMIAoKxAIi4EwK4BgFm2MkcCgL0FAHaOWJAPQGAAgJlCLMwAIDgCAEMeE80DIEwDoDDSv+CpX3CFuEgBAMDLlc2XS9IzFLiV0Bp38vDg4iHiwmyxQmEXKRBmCeQinJebIxNI5wNMzgwAABr50cH+OD+Q5+bk4eZm52zv9MWi/mvwbyI+IfHf/ryMAgQAEE7P79pf5eXWA3DHAbB1v2upWwDaVgBo3/ldM9sJoFoK0Hr5i3k4/EAenqFQyDwdHAoLC+0lYqG9MOOLPv8z4W/gi372/EAe/tt68ABxmkCZrcCjg/1xYW52rlKO58sEQjFu9+cj/seFf/2OKdHiNLFcLBWK8ViJuFAiTcd5uVKRRCHJleIS6X8y8R+W/QmTdw0ArIZPwE62B7XLbMB+7gECiw5Y0nYAQH7zLYwaC5EAEGc0Mnn3AACTv/mPQCsBAM2XpOMAALzoGFyolBdMxggAAESggSqwQQcMwRSswA6cwR28wBcCYQZEQAwkwDwQQgbkgBwKoRiWQRlUwDrYBLWwAxqgEZrhELTBMTgN5+ASXIHrcBcGYBiewhi8hgkEQcgIE2EhOogRYo7YIs4IF5mOBCJhSDSSgKQg6YgUUSLFyHKkAqlCapFdSCPyLXIUOY1cQPqQ28ggMor8irxHMZSBslED1AJ1QLmoHxqKxqBz0XQ0D12AlqJr0Rq0Hj2AtqKn0UvodXQAfYqOY4DRMQ5mjNlhXIyHRWCJWBomxxZj5Vg1Vo81Yx1YN3YVG8CeYe8IJAKLgBPsCF6EEMJsgpCQR1hMWEOoJewjtBK6CFcJg4Qxwicik6hPtCV6EvnEeGI6sZBYRqwm7iEeIZ4lXicOE1+TSCQOyZLkTgohJZAySQtJa0jbSC2kU6Q+0hBpnEwm65Btyd7kCLKArCCXkbeQD5BPkvvJw+S3FDrFiOJMCaIkUqSUEko1ZT/lBKWfMkKZoKpRzame1AiqiDqfWkltoHZQL1OHqRM0dZolzZsWQ8ukLaPV0JppZ2n3aC/pdLoJ3YMeRZfQl9Jr6Afp5+mD9HcMDYYNg8dIYigZaxl7GacYtxkvmUymBdOXmchUMNcyG5lnmA+Yb1VYKvYqfBWRyhKVOpVWlX6V56pUVXNVP9V5qgtUq1UPq15WfaZGVbNQ46kJ1Bar1akdVbupNq7OUndSj1DPUV+jvl/9gvpjDbKGhUaghkijVGO3xhmNIRbGMmXxWELWclYD6yxrmE1iW7L57Ex2Bfsbdi97TFNDc6pmrGaRZp3mcc0BDsax4PA52ZxKziHODc57LQMtPy2x1mqtZq1+rTfaetq+2mLtcu0W7eva73VwnUCdLJ31Om0693UJuja6UbqFutt1z+o+02PreekJ9cr1Dund0Uf1bfSj9Rfq79bv0R83MDQINpAZbDE4Y/DMkGPoa5hpuNHwhOGoEctoupHEaKPRSaMnuCbuh2fjNXgXPmasbxxirDTeZdxrPGFiaTLbpMSkxeS+Kc2Ua5pmutG003TMzMgs3KzYrMnsjjnVnGueYb7ZvNv8jYWlRZzFSos2i8eW2pZ8ywWWTZb3rJhWPlZ5VvVW16xJ1lzrLOtt1ldsUBtXmwybOpvLtqitm63Edptt3xTiFI8p0in1U27aMez87ArsmuwG7Tn2YfYl9m32zx3MHBId1jt0O3xydHXMdmxwvOuk4TTDqcSpw+lXZxtnoXOd8zUXpkuQyxKXdpcXU22niqdun3rLleUa7rrStdP1o5u7m9yt2W3U3cw9xX2r+00umxvJXcM970H08PdY4nHM452nm6fC85DnL152Xlle+70eT7OcJp7WMG3I28Rb4L3Le2A6Pj1l+s7pAz7GPgKfep+Hvqa+It89viN+1n6Zfgf8nvs7+sv9j/i/4XnyFvFOBWABwQHlAb2BGoGzA2sDHwSZBKUHNQWNBbsGLww+FUIMCQ1ZH3KTb8AX8hv5YzPcZyya0RXKCJ0VWhv6MMwmTB7WEY6GzwjfEH5vpvlM6cy2CIjgR2yIuB9pGZkX+X0UKSoyqi7qUbRTdHF09yzWrORZ+2e9jvGPqYy5O9tqtnJ2Z6xqbFJsY+ybuIC4qriBeIf4RfGXEnQTJAntieTE2MQ9ieNzAudsmjOc5JpUlnRjruXcorkX5unOy553PFk1WZB8OIWYEpeyP+WDIEJQLxhP5aduTR0T8oSbhU9FvqKNolGxt7hKPJLmnVaV9jjdO31D+miGT0Z1xjMJT1IreZEZkrkj801WRNberM/ZcdktOZSclJyjUg1plrQr1zC3KLdPZisrkw3keeZtyhuTh8r35CP5c/PbFWyFTNGjtFKuUA4WTC+oK3hbGFt4uEi9SFrUM99m/ur5IwuCFny9kLBQuLCz2Lh4WfHgIr9FuxYji1MXdy4xXVK6ZHhp8NJ9y2jLspb9UOJYUlXyannc8o5Sg9KlpUMrglc0lamUycturvRauWMVYZVkVe9ql9VbVn8qF5VfrHCsqK74sEa45uJXTl/VfPV5bdra3kq3yu3rSOuk626s91m/r0q9akHV0IbwDa0b8Y3lG19tSt50oXpq9Y7NtM3KzQM1YTXtW8y2rNvyoTaj9nqdf13LVv2tq7e+2Sba1r/dd3vzDoMdFTve75TsvLUreFdrvUV99W7S7oLdjxpiG7q/5n7duEd3T8Wej3ulewf2Re/ranRvbNyvv7+yCW1SNo0eSDpw5ZuAb9qb7Zp3tXBaKg7CQeXBJ9+mfHvjUOihzsPcw83fmX+39QjrSHkr0jq/dawto22gPaG97+iMo50dXh1Hvrf/fu8x42N1xzWPV56gnSg98fnkgpPjp2Snnp1OPz3Umdx590z8mWtdUV29Z0PPnj8XdO5Mt1/3yfPe549d8Lxw9CL3Ytslt0utPa49R35w/eFIr1tv62X3y+1XPK509E3rO9Hv03/6asDVc9f41y5dn3m978bsG7duJt0cuCW69fh29u0XdwruTNxdeo94r/y+2v3qB/oP6n+0/rFlwG3g+GDAYM/DWQ/vDgmHnv6U/9OH4dJHzEfVI0YjjY+dHx8bDRq98mTOk+GnsqcTz8p+Vv9563Or59/94vtLz1j82PAL+YvPv655qfNy76uprzrHI8cfvM55PfGm/K3O233vuO+638e9H5ko/ED+UPPR+mPHp9BP9z7nfP78L/eE8/sl0p8zAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAAbSURBVHjaYvz//z8DAwMDAxMDFAAAAAD//wMAMAYDAW/BVI8AAAAASUVORK5CYII=';
+	
+	var REAL_BAIDU_TEXT = '百度地图', REAL_GAODE_TEXT = '高德地图';
+
+	// 中心点 （上海市浦东新区政府）
+	var CENTER_POINT = {
+		lng : 121.544336,
+		lat : 31.221315
+	};
+
+	// 图层容器
+	var mapContainer = $('#mapContainer');
+	// 路况按钮
+	var trafficBtn = $('#trafficItem');
+	
+	var storage = window.localStorage;
+	
+	var currentMap;
+	
+	var city = "上海";
+	
+	//百度API Key
+	var bdKey = 'IGGrr4UjwIYzatoCRFKEL8sT';
+	
+	var bd_gps_info_win_opts = {
+	  		width : 190,
+	  		height: 255,
+	  		enableMessage:true
+	};
+	
+	//线路路由
+	var polylines;
+	
+	//百度 -轨迹回放点聚合
+	//var historyClusterer;
+	
+	var markerClusterer;
+	
+	//设备号和marker对照
+	var markersMap;
+	var real_map = {
+		getMap: function(){
+			return currentMap;
+		},
+		init: function(){
+			var m = storage.getItem('real_map');
+			if(m && m == REAL_GAODE_TEXT)
+				real_map.gaode.init();
+			else
+				real_map.baidu.init();
+		},
+		//百度地图
+		baidu : {
+			//初始化
+			init : function() {
+				real_map.setText(REAL_BAIDU_TEXT);
+
+				var map = new BMap.Map(mapContainer[0]);
+				//中心点和缩放级别
+				map.centerAndZoom(new BMap.Point(CENTER_POINT.lng,CENTER_POINT.lat), 15);
+				map.enableScrollWheelZoom();
+				//加载完成
+				map.addEventListener("tilesloaded", function() {
+					layer.closeAll();
+					storage.setItem('real_map', REAL_BAIDU_TEXT);
+				});
+				
+				// 路况控件
+				var ctrl = new BMapLib.TrafficControl();
+				map.addControl(ctrl);
+
+				//historyClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 2})
+				var isVisible;
+				trafficBtn.on('click', function() {
+					if (isVisible) {
+						ctrl.hide();
+						isVisible = false;
+						//调整线路路由透明度
+						$.each(polylines, function(){
+							this.setStrokeOpacity(0.5);
+						});
+					} else {
+						ctrl.show();
+						isVisible = true;
+						//调整线路路由透明度
+						$.each(polylines, function(){
+							this.setStrokeOpacity(0.1);
+						});
+					}
+				});
+				//百度路况控件自身关闭按钮
+				$('.portlet-fullscreen').on('click', '.maplibTc .maplibTcClose', function(){
+					isVisible = false;
+					//调整线路路由透明度
+					$.each(polylines, function(){
+						this.setStrokeOpacity(0.5);
+					});
+				});
+
+				$('#tcWrap.maplibTc').addClass('animated bounceInLeft');
+				$('.maplibTcBtn_deskTop.anchorTR').remove();
+
+				//保存当前地图实例和名称
+				currentMap = {
+						map: map,
+						mapName: REAL_BAIDU_TEXT,
+						fName : 'baidu'
+				}
+				
+			},
+			clear: function(){
+				currentMap.map.clearOverlays();
+				markerClusterer && markerClusterer.clearMarkers();
+				
+			},
+			change : function() {
+				if(currentMap.mapName == REAL_BAIDU_TEXT)
+					return;
+				
+				showMsg(REAL_BAIDU_TEXT);
+
+				real_map.destroy();
+				real_map.baidu.init();
+			},
+			autocomplete: function(input, cb){
+				var ac = new BMap.Autocomplete({
+					'location' : realMap.getMap().map,
+					'input': input,
+					'onSearchComplete': function(result){
+						//隐藏默认的提示框
+						ac.hide();
+						cb && cb({type: 'baidu', result: result.wr});
+					}
+				});
+				
+				 $('#' + input).on('keyup', function(){
+		        	if(this.value == ''){
+		        		$('.search_result').html('');
+		        		return;
+		        	}
+		         });
+				
+			},
+			setPlace: function(val){
+				var map = currentMap.map;
+				map.clearOverlays();
+				var local = new BMap.LocalSearch(map, {
+					  onSearchComplete: function(){
+						  var poi = local.getResults().getPoi(0);
+						  if(!poi){
+							  return;
+						  }
+						  var pp = poi.point;
+						  map.centerAndZoom(pp, 18);
+						  map.addOverlay(new BMap.Marker(pp));
+					  }
+				});
+				
+				local.search(val);
+			},
+			drawLine: function(route){
+				var map = currentMap.map;
+				map.clearOverlays();
+				polylines = [];
+				//画线路
+				//从localStorage里读取路由信息
+				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
+				var upLineOps = {strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+					,downLineOps = {strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+				
+				var upPos = [], downPos = [], tempArray;
+				//上行
+				if(route.up){
+					$.each(route.up.split(','), function(){
+						tempArray = this.split(' ');
+						upPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+					});
+					
+					var upLine = new BMap.Polyline(upPos, upLineOps);
+					map.addOverlay(upLine);
+					
+					polylines.push(upLine);
+					map.panTo(upPos[parseInt(upPos.length / 2)]);
+				}
+				//下行
+				if(route.down){
+					$.each(route.down.split(','), function(){
+						tempArray = this.split(' ');
+						downPos.push(new BMap.Point(tempArray[0], tempArray[1]));
+					});
+					
+					var downLine = new BMap.Polyline(downPos, downLineOps);
+					map.addOverlay(downLine);
+					polylines.push(downLine);
+					
+				}
+			},
+			//批量将GPS信号画到地图上
+			drawGpsMarker: function(gpsList){
+				markersMap = {};
+				var map = currentMap.map;
+				
+				markerClusterer && markerClusterer.clearMarkers();
+				markerClusterer = new BMapLib.MarkerClusterer(map, {isAverangeCenter : true,minClusterSize : 3});
+				real_map.baidu.coordsConvert(gpsList, function(){
+					//绘制车辆位置
+					var marker;
+					$.each(gpsList, function(i, gpsData){
+						marker = createBDMarkerByGps(gpsData)
+						map.addOverlay(marker);
+						//marker加入点聚合
+						markerClusterer.addMarker(marker); 
+						
+						markersMap[gpsData.deviceId] = marker;
+					});
+					
+				});
+			},
+			goToMarker: function(deviceId){
+				var m = markersMap[deviceId];
+				if(m){
+					currentMap.map.panTo(m.point);
+					setTimeout(function(){
+						bdOpenWindow(m);
+					}, 500);
+				}
+			},
+			coordsConvert: function(list, cb){
+				if(list.length > 100)
+					list = list.slice(0, 100);
+				
+				var coords = '';
+				//拼接GPS坐标，一次性转换
+				for (var i = 0, item; item = list[i++];) 
+					coords += item.lon + ',' + item.lat + ';';
+				coords = coords.substring(0, coords.length - 1);
+				getJSONP('//api.map.baidu.com/geoconv/v1/',{coords: coords, ak: bdKey}
+				,function(rt){
+					$.each(rt.result, function(j, bdCoord){
+						list[j].bd_coord = bdCoord;
+					});
+					cb&&cb();
+				});
+			},
+			//绘制轨迹回放 marker
+			addHistoryMarker: function(gps){
+				
+				var marker = bdHistoryMarker(gps);
+				currentMap.map.addOverlay(marker);
+				
+				//historyClusterer.addMarker(marker);
+				return marker;
+			},
+			//移动marker
+			moveMarker: function(marker , gps){
+				marker.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
+				//重新设置颜色
+				marker.getLabel().setStyle({borderColor: bgColor(gps), backgroundColor: bgColor(gps)});
+			},
+			//居中marker
+			markerToCenter: function(marker){
+				currentMap.map.panTo(marker.getPosition());
+			},
+			//删除marker
+			removeMarker: function(marker){
+				currentMap.map.removeOverlay(marker);
+			}
+		},
+		//高德地图
+		gaode : {
+			init : function() {
+				var mapLoadAnim = '<div class="sk-cube-grid _center">'+
+									'<div class="sk-cube sk-cube1"></div>'+
+									'<div class="sk-cube sk-cube2"></div>'+
+									'<div class="sk-cube sk-cube3"></div>'+
+									'<div class="sk-cube sk-cube4"></div>'+
+									'<div class="sk-cube sk-cube5"></div>'+
+									'<div class="sk-cube sk-cube6"></div>'+
+									'<div class="sk-cube sk-cube7"></div>'+
+									'<div class="sk-cube sk-cube8"></div>'+
+									'<div class="sk-cube sk-cube9"></div>'+
+									'</div>';
+				
+				mapContainer.html(mapLoadAnim);
+				
+				real_map.gaode.setStyle();
+				real_map.setText(REAL_GAODE_TEXT);
+
+				var map = new AMap.Map(mapContainer[0]);
+				// 地图中心和缩放级别
+				map.setZoomAndCenter(14, [ CENTER_POINT.lng,CENTER_POINT.lat ]);
+				//加载完成
+				AMap.event.addListener(map, 'complete', function() {
+					layer.closeAll();
+					storage.setItem('real_map', REAL_GAODE_TEXT);
+					$('.sk-cube-grid._center').remove();
+				});
+
+				// 实时路况图层
+				var trafficLayer = new AMap.TileLayer.Traffic();
+				trafficLayer.setMap(map);
+				trafficLayer.hide();
+
+				var isVisible;
+				trafficBtn.on('click', function() {
+					if (isVisible) {
+						trafficLayer.hide();
+						isVisible = false;
+						$(this).removeClass('active');
+						
+						//调整线路路由透明度
+						$.each(polylines, function(){
+							this.setOptions({strokeOpacity: 0.5});
+						});
+					} else {
+						trafficLayer.show();
+						isVisible = true;
+						$(this).addClass('active');
+						
+						//调整线路路由透明度
+						$.each(polylines, function(){
+							this.setOptions({strokeOpacity: 0.1});
+						});
+					}
+				});
+
+				//保存当前地图实例和名称
+				currentMap = {
+						map: map,
+						mapName: REAL_GAODE_TEXT,
+						fName : 'gaode'
+				}
+				
+			},
+			change : function() {
+				if(currentMap.mapName == REAL_GAODE_TEXT)
+					return;
+				
+				showMsg(REAL_GAODE_TEXT);
+
+				real_map.destroy();
+				real_map.gaode.init();
+			},
+			setStyle : function() {
+				$('.mapRightWrap').addClass('gaode');
+				$('.mapTools').addClass('gaode');
+				$('.leftUtils').addClass('gaode');
+			},
+			clearStyle : function() {
+				$('.mapRightWrap').removeClass('gaode');
+				$('.mapTools').removeClass('gaode');
+				$('.leftUtils').removeClass('gaode');
+			},
+			autocomplete: function(input, cb){
+				
+				AMap.plugin('AMap.Autocomplete',function(){
+					var autoOptions = {
+				            city: city 
+			        };
+			        autocomplete= new AMap.Autocomplete(autoOptions);
+			        
+			        $('#' + input).on('keyup', function(){
+			        	if(this.value == ''){
+			        		$('.search_result').html('');
+			        		return;
+			        	}
+			        	autocomplete.search(this.value, function(status, result){
+			        		cb & cb({type: 'gaode', result: result.tips});
+				        });
+			        });
+				});
+			},
+			setPlace: function(val){
+				var map = currentMap.map;
+				
+				AMap.plugin(['AMap.PlaceSearch'],function(){
+				     var placeSearch = new AMap.PlaceSearch({
+				              city:city,
+				              map:map,
+				              pageSize: 1
+				     });
+				     
+				     placeSearch.search(val);
+				});
+			},
+			drawLine: function(route){
+				polylines = [];
+				var map = currentMap.map;
+				map.clearMap();
+				
+				//var route = JSON.parse(storage.getItem(lineCode + '_route'));
+				var upArr = [], downArr = [];
+				
+				var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
+					,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
+				
+				//上行
+				if(route.up){
+					$.each(route.up_gcj.split(','), function(){
+						tempArray = this.split(' ');
+						upArr.push([tempArray[0], tempArray[1]]);
+					});
+					 var upLine = new AMap.Polyline(upLineOps);
+					//保存线条引用
+					 polylines.push(upLine);
+					 
+					 upLine.setMap(map);
+		             map.setCenter(upArr[parseInt(upArr.length / 2)]);
+					
+				}
+				//下行
+				if(route.down){
+					$.each(route.down_gcj.split(','), function(){
+						tempArray = this.split(' ');
+						downArr.push([tempArray[0], tempArray[1]]);
+					});
+					 var downLine = new AMap.Polyline(downLineOps);
+					 //保存线条引用
+					 polylines.push(downLine);
+					 
+					 downLine.setMap(map);
+				}
+			},
+			drawGpsMarker: function(gpsList){
+			}
+		},
+		setText : function(text) {
+			$('.leftUtils span.dropdown-toggle').html(
+					text + ' <i class="fa fa-angle-down"></i>');
+		},
+		destroy : function() {
+			trafficBtn.unbind('click');
+			
+			//如果当前地图实例有destroy方法即执行
+			var map = currentMap.map;
+			map.destroy && map.destroy();
+
+			if (currentMap.mapName == REAL_GAODE_TEXT) {
+				// 如果前一个地图是高德，清除相关样式
+				real_map.gaode.clearStyle();
+			}
+		}
+	}
+
+	function showMsg(text){
+		layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
+	}
+	
+	/**
+	 * 颜色
+	 */
+	var bgColor = function(g){
+		if(g.state == 0){
+			if(g.upDown == 0)
+				return '#5E96D2';
+			else if(g.upDown == 1)
+				return '#C92121';
+			else
+				return 'red';
+		}
+		else
+			return "rgb(171, 171, 171)";
+	}
+	
+	var tColor = function(g){
+		if(g.state == 0)
+			return "#fff";
+		else
+			return "rgb(229, 229, 229)";
+	}
+	
+	function createBDMarkerByGps(gpsData){
+		//marker
+		var point = new BMap.Point(gpsData.bd_coord.x, gpsData.bd_coord.y)
+		//label
+		,label = new BMap.Label(gpsData.nbbm.replace('-',''), {position: point, offset: new BMap.Size(-20,8)});
+		label.setStyle({borderColor: bgColor(gpsData), padding: '6px 6px 4px 6px', color: tColor(gpsData), backgroundColor: bgColor(gpsData)});
+		var marker = new BMap.Marker(point);
+		marker.setLabel(label);
+		//icon
+		marker.setIcon(new BMap.Icon(tmIcon, new BMap.Size(25,25)));
+		//window 绑定到 label
+		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
+		//数据绑定到label
+		marker.gpsData = gpsData;
+		
+		//mouseover
+		label.addEventListener('mouseover', function(){
+			bdOpenWindow(marker);
+		});
+		return marker;
+	}
+	
+	function bdHistoryMarker(gps){
+		//marker
+		var point = new BMap.Point(gps.bd_lon, gps.bd_lat)
+		//label
+		,label = new BMap.Label(gps.nbbm, {position: point, offset: new BMap.Size(-20,8)});
+		label.setStyle({borderColor: bgColor(gps), padding: '6px 6px 4px 6px', color: tColor(gps), backgroundColor: bgColor(gps)});
+		var marker = new BMap.Marker(point);
+		marker.setLabel(label);
+		//icon
+		marker.setIcon(new BMap.Icon(tmIcon, new BMap.Size(25,25)));
+/*		//window 绑定到 label
+		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
+		//数据绑定到label
+		marker.gpsData = gpsData;
+		
+		//mouseover
+		label.addEventListener('mouseover', function(){
+			bdOpenWindow(marker);
+		});*/
+		return marker;
+	}
+	
+	function bdOpenWindow(marker){
+		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
+		currentMap.map.openInfoWindow(marker.infoWindow, marker.point);
+	}
+	return real_map;
 })();
 \ No newline at end of file
@@ -174,6 +174,7 @@
                 '26_4': '南汇公司（南汇维修公司）',
                 '26_5': '南汇公司（南汇公司）',
                 '26_6': '南汇公司（南汇六分）',
+                '26_7': '南汇公司（南汇五分）',
                 '05_5': '杨高公司（杨高分公司）',
                 '05_6': '杨高公司（周浦分公司）',
                 '05_3': '杨高公司（芦潮港分公司）',
@@ -54,11 +54,27 @@ $(function(){
     //表单 validate
     var error = $('.alert-danger', form);
  
+    var validate = function (pwd) {
+		var flag = true;
+		for (var i = 1; i < pwd.length - 1; i++) {
+			var first = pwd.charCodeAt(i - 1);
+			var second = pwd.charCodeAt(i);
+			var third = pwd.charCodeAt(i + 1);
+			if (!(first >= 48 && third <= 57 || first >= 65 && third <= 90 || first >= 97 && third <= 122)) {
+				continue;
+			}
+			if (third - second == 1 && second - first == 1) {
+				flag =  false;
+			}
+		}
+		
+		return flag;
+	}
+
     $.validator.addMethod("passwordrule", function(value, element) {
         var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-.]).{8,16}$/;
-        // var reg = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
-        return this.optional(element) ||(reg.test(value));
-    }, "需包含大小写字母、数字、以及特殊符号的8-16位字符");
+        return this.optional(element) || reg.test(value) && validate(value);
+    }, "需包含大小写字母、数字、以及特殊符号的8-16位字符,并不能有123、abc这样的连续字符");
  
     //表单 validate
     form.validate({
 <div class="row">
-<div class="col-md-12">
-<!-- BEGIN VALIDATION STATES-->
-<div class="portlet light portlet-fit portlet-form bordered">
-<div class="portlet-body">
-	<form class="form-horizontal" id="forceChangePWDForm">
-		<div class="alert alert-danger display-hide">
-            <button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
-        </div>
-		<div class="form-group" style="margin-top: 60px">
-		    <label class="control-label col-md-5">原始密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="oldPWD" /> </div>
-		    </div>
+	<div class="col-md-12">
+		<!-- BEGIN VALIDATION STATES-->
+		<div class="portlet light portlet-fit portlet-form bordered">
+			<div class="portlet-body">
+				<form class="form-horizontal" id="forceChangePWDForm">
+					<div class="alert alert-danger display-hide">
+						<button class="close" data-close="alert"></button>您的输入有误，请检查下面的输入项
+					</div>
+					<div class="form-group" style="margin-top: 60px">
+						<label class="control-label col-md-5">原始密码：
+						</label>
+						<div class="col-md-4">
+							<div class="input-icon right">
+								<i class="fa"></i>
+								<input type="password" class="form-control" name="oldPWD" /> </div>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label col-md-5">输入新密码：
+						</label>
+						<div class="col-md-4">
+							<div class="input-icon right">
+								<i class="fa"></i>
+								<input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label col-md-5">确认新密码：
+						</label>
+						<div class="col-md-4">
+							<div class="input-icon right">
+								<i class="fa"></i>
+								<input type="password" class="form-control" name="cnewPWD" /> </div>
+						</div>
+					</div>
+					<div class="form-actions">
+						<div class="row">
+							<div class="col-md-offset-5 col-md-7">
+								<button type="submit" id="confirm" class="btn green">确定</button>
+							</div>
+						</div>
+					</div>
+				</form>
+			</div>
 		</div>
-		<div class="form-group">
-		    <label class="control-label col-md-5">输入新密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="newPWD" id="newPWD"/> </div>
-		    </div>
-		</div>
-		<div class="form-group">
-		    <label class="control-label col-md-5">确认新密码：
-		    </label>
-		    <div class="col-md-4">
-		        <div class="input-icon right">
-		            <i class="fa"></i>
-		            <input type="password" class="form-control" name="cnewPWD" /> </div>
-		    </div>
-		</div>
-		<div class="form-actions">
-	        <div class="row">
-	            <div class="col-md-offset-5 col-md-7">
-	                <button type="submit" id="confirm" class="btn green">确定</button>
-	            </div>
-	        </div>
-	    </div>
-	</form>
-</div>
-</div>
-</div>
+	</div>
 </div>
  
 <script>
-$(function(){
-	var form = $('#forceChangePWDForm');
-    //表单 validate
-    var error = $('.alert-danger', form);
+	$(function(){
+		var form = $('#forceChangePWDForm');
+		//表单 validate
+		var error = $('.alert-danger', form);
+
+		var validate = function (pwd) {
+			var flag = true;
+			for (var i = 1; i < pwd.length - 1; i++) {
+				var first = pwd.charCodeAt(i - 1);
+				var second = pwd.charCodeAt(i);
+				var third = pwd.charCodeAt(i + 1);
+				if (!(first >= 48 && third <= 57 || first >= 65 && third <= 90 || first >= 97 && third <= 122)) {
+					continue;
+				}
+				if (third - second == 1 && second - first == 1) {
+					flag =  false;
+				}
+			}
+
+			return flag;
+		}
  
-    $.validator.addMethod("passwordrule", function(value, element) {
-        var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-]).{8,16}$/;
-        //var reg = /^(?=.*[a-zA-Z])(?=.*\d).{8,16}$/;
-        return this.optional(element) ||(reg.test(value));
-    }, "需包含字母、数字的8-16位字符");
+		$.validator.addMethod("passwordrule", function(value, element) {
+			var reg = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*?[#?!@$%^&*-.]).{8,16}$/;
+			return this.optional(element) || reg.test(value) && validate(value);
+		}, "需包含大小写字母、数字、以及特殊符号的8-16位字符,并不能有123、abc这样的连续字符");
  
-    //表单 validate
-    form.validate({
-        errorElement : 'span',
-        errorClass : 'help-block help-block-error',
-        focusInvalid : false,
-        rules : {
-            'newPWD' : {
-                required : true,
-                minlength: 8,
-                maxlength: 16,
-                passwordrule:true
-            },
-            'cnewPWD' : {
-                equalTo: '#newPWD'
-            }
-        },
-        invalidHandler : function(event, validator) {
-            error.show();
-            App.scrollTo(error, -200);
-        },
+		//表单 validate
+		form.validate({
+			errorElement : 'span',
+			errorClass : 'help-block help-block-error',
+			focusInvalid : false,
+			rules : {
+				'newPWD' : {
+					required : true,
+					minlength: 6,
+					maxlength: 16,
+					passwordrule:true
+				},
+				'cnewPWD' : {
+					equalTo: '#newPWD'
+				}
+			},
+			invalidHandler : function(event, validator) {
+				error.show();
+				App.scrollTo(error, -200);
+			},
  
-        highlight : function(element) {
-            $(element).closest('.form-group').addClass('has-error');
-        },
+			highlight : function(element) {
+				$(element).closest('.form-group').addClass('has-error');
+			},
  
-        unhighlight : function(element) {
-            $(element).closest('.form-group').removeClass('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();
+			success : function(label) {
+				label.closest('.form-group').removeClass('has-error');
+			},
  
-            var keys;
-            $.ajax({
-                url: "/user/login/jCryptionKey?t="+Math.random(),
-                type: "Get",
-                async:false,
-                data: null,
-                success: function(data) {
-                    keys = data.publickey;
-                }
-            });
-            //RSA加密
-            var encrypt = new JSEncrypt();
-            encrypt.setPublicKey(keys);
-            params.oldPWD = encrypt.encrypt(params.oldPWD);
-            params.newPWD = encrypt.encrypt(params.newPWD);
-            params.cnewPWD = encrypt.encrypt(params.cnewPWD);
-            $.ajax({
-                url: '/user/changePWD',
-                type: 'POST',
-                traditional: true,
-                data: params,
-                success: function(msg){
-                    layer.close();
-                }
-            });
-        }
-    });
-});
+			submitHandler : function(f) {
+				var params = form.serializeJSON();
+				error.hide();
+				var keys;
+				$.ajax({
+					url: "/user/login/jCryptionKey?t="+Math.random(),
+					type: "Get",
+					async:false,
+					data: null,
+					success: function(data) {
+						keys = data.publickey;
+					}
+				});
+				//RSA加密
+				var encrypt = new JSEncrypt();
+				encrypt.setPublicKey(keys);
+				params.oldPWD = encrypt.encrypt(params.oldPWD);
+				params.newPWD = encrypt.encrypt(params.newPWD);
+				params.cnewPWD = encrypt.encrypt(params.cnewPWD);
+				$.ajax({
+					url: '/user/changePWD',
+					type: 'POST',
+					traditional: true,
+					data: params,
+					success: function(msg){
+						layer.alert(msg);
+						layer.closeAll('page');
+					}
+				});
+			}
+		});
+	});
 </script>
 \ No newline at end of file
-<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><span class="active">用户管理</span></li>
-</ul>
-
-<div class="row">
-	<div class="col-md-12">
-		<!-- Begin: life time stats -->
-		<div class="portlet light portlet-fit portlet-datatable bordered">
-			<div class="portlet-title">
-				<div class="caption">
-					 <i class="fa fa-users font-dark"></i> <span
-						class="caption-subject font-dark sbold uppercase">用户数据表</span>
-				</div>
-				<div class="actions">
-					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a>
-
-				</div>
-			</div>
-			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px">
-					<table
-						class="table table-striped table-bordered table-hover table-checkable"
-						id="datatable_user">
-						<thead>
-							<tr role="row" class="heading">
-								<th width="3%">#</th>
-								<th width="15%">登录名</th>
-								<th width="13%">姓名</th>
-								<th width="100">所属机构</th>
-								<th width="11%">角色</th>
-								<th width="10%">状态</th>
-								<th width="18%">最后登录时间</th>
-								<th width="18%">操作</th>
-							</tr>
-							<tr role="row" class="filter">
-								<td></td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="userName_like">
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="name_like">
-								</td>
-								<td>
-									<input type="text" class="form-control form-filter input-sm" name="agencies_like">
-								</td>
-								<td></td>
-								<td>
-									<select class="form-control form-filter " name="enabled_eq">
-                                         <option value="">请选择...</option>
-                                         <option value="true">可用</option>
-                                         <option value="false">禁用</option>
-                                     </select>
-								</td>
-								<td></td>
-
-								<td>
-									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
-                                                                <i class="fa fa-search"></i> 搜索</button>
-
-									<button class="btn btn-sm red btn-outline filter-cancel">
-                                                            <i class="fa fa-times"></i> 重置</button>
-								</td>
-							</tr>
-						</thead>
-						<tbody></tbody>
-					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script id="user_list_temp" type="text/html">
-{{each list as obj i}}
-<tr>
-	<td style="vertical-align: middle;">
-		<!--<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">-->
-		{{++i}}
-	</td>
-	<td>
-		{{obj.userName}}
-	</td>
-	<td>
-		{{obj.name}}
-	</td>
-	<td>
-		{{obj.agencies}}
-	</td>
-	<td>
-		{{each obj.roles as role j}}
-			{{role.roleName}}、
-		{{/each}}
-	</td>
-	<td>
-		{{if obj.enabled}}
-			可用
-		{{else}}
-			禁用
-		{{/if}}
-	</td>
-	<td>
-		{{obj.lastLoginDate}}
-	</td>
-	<td>
-		{{if obj.isEdit == 0}}
-			<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
-			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
-		{{/if}}
-		{{if obj.isAdmin}}
-			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
-		{{/if}}
-	</td>
-</tr>
-{{/each}}
-{{if list.length == 0}}
-<tr>
-	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
-</tr>
-{{/if}}
-</script>
-
-<script>
-$(function(){
-	var page = 0, initPagination;
-	var user,isAdmin = false;
-	var icheckOptions = {
-	    checkboxClass: 'icheckbox_flat-blue',
-	    increaseArea: '20%'
-	};
-	$.get('/user/getCurrentUser', function(data) {
-        user = data;
-        var roles = user.roles;
-        $.each(roles,function () {
-            if(this.level == 1)
-                isAdmin = true;
-        })
-
-    });
-
-	setTimeout(function () {
-        $(document).on('click', 'a.reset_password', function () {
-            var id = $(this).data('id');
-            var name = $(this).data('name');
-            swal({
-                    title: "重装密码",
-                    text: "将登录名为"+name+"的用户，密码重置为默认密码！",
-                    type: "warning",
-                    showCancelButton: true,
-                    confirmButtonColor: "#DD6B55",
-                    confirmButtonText: "重置",
-                    cancelButtonText: "取消",
-                    closeOnConfirm: false },
-                function(){
-                    $.post('/user/resetPassword',{'id':id},function(result){
-                        if(result.status=='SUCCESS') {
-                            // 弹出添加成功提示消息
-                            swal("登录名为"+name+"的用户密码重置成功！", "success");
-                        } else if(result.status=='ERROR') {
-                            // 弹出添加失败提示消息
-                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
-                        }
-                        //				loadPage('list.html');
-                        // 发布后刷新页面
-                        jsDoQuery(getParams(), true);
-                    });
-                });
-        });
-        jsDoQuery(null,true);
-
-        //重置
-        $('tr.filter .filter-cancel').on('click', function(){
-            $('tr.filter input, select').val('').change();
-            jsDoQuery(null, true);
-        });
-
-		function getParams() {
-		 var cells = $('tr.filter')[0].cells
-			 ,params = {}
-			 ,name;
-		 $.each(cells, function(i, cell){
-			 var items = $('input,select', cell);
-			 for(var j = 0, item; item = items[j++];){
-				 name = $(item).attr('name');
-				 if(name){
-					 params[name] = $(item).val();
-				 }
-			 }
-		 });
-		 return params;
-		}
-
-        //提交
-        $('tr.filter .filter-submit').on('click', function(){
-            jsDoQuery(getParams(), true);
-        });
-
-        /*
-        * 获取数据 p: 要提交的参数， pagination: 是否重新分页
-        */
-        function jsDoQuery(p, pagination){
-            var roles = new Map();
-            // 查询下级角色
-            $.ajax({
-                url: "/role/findSubordinate",
-                type: "Get",
-                async:false,
-                data: null,
-                success: function (rs) {
-                    if(rs.status == "SUCCESS"){
-                        $.each(rs.list,function(i,obj){
-                            roles[obj.id] = obj;
-                        });
-                    }
-                }
-            });
-            var params = {};
-            if(p)
-                params = p;
-            //更新时间排序
-            params['order'] = 'lastLoginDate';
-            params['page'] = page;
-            // params['id_eq'] = "1";
-            var i = layer.load(2);
-            $get('/user' ,params, function(data){
-                var list = data.content;
-                $.each(list, function(i, obj) {
-                    if(roles[obj.roles[0].id] != null && roles[obj.roles[0].id] != undefined){
-                        obj.isEdit = 0;
-                    } else{
-                        obj.isEdit = 1;
-                    }
-                    obj.isAdmin = isAdmin;
-                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
-                });
-
-                var bodyHtm = template('user_list_temp', {list: list});
-
-                $('#datatable_user tbody').html(bodyHtm)
-                    .find('.icheck').iCheck(icheckOptions)
-                    .on('ifChanged', iCheckChange);
-                if(pagination && list.length > 0){
-                    //重新分页
-                    initPagination = true;
-                    showPagination(data);
-                }
-                layer.close(i);
-
-                $('.line_allot_btn').on('click', openAllotWindow);
-            });
-        }
-
-        function iCheckChange(){
-            var tr = $(this).parents('tr');
-            if(this.checked)
-                tr.addClass('row-active');
-            else
-                tr.removeClass('row-active');
-
-            if($('#datatable_resource input.icheck:checked').length == 1)
-                $('#removeButton').removeAttr('disabled');
-            else
-                $('#removeButton').attr('disabled', 'disabled');
-        }
-
-        function showPagination(data){
-            //分页
-            $('#pagination').jqPaginator({
-                totalPages: data.totalPages,
-                visiblePages: 6,
-                currentPage: page + 1,
-                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
-                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
-                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
-                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
-                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
-                onPageChange: function (num, type) {
-                    if(initPagination){
-                        initPagination = false;
-                        return;
-                    }
-
-
-                    page = num - 1;
-                    jsDoQuery(null, false);
-                }
-            });
-        }
-
-        function openAllotWindow() {
-            var id = $(this).data('id');
-            $.get('/pages/permission/user/controlAllot.html', function (content) {
-                layer.open({
-                    type: 1,
-                    area: ['600px', '395px'],
-                    content: content,
-                    title: '线路调度权限分配',
-                    shift: 5,
-                    scrollbar: false,
-                    success: function () {
-                        $('#pageRealControlAllotWrap').trigger('init', id);
-                    }
-                });
-            });
-        }
-
-        //删除
-        $('#removeButton').on('click', function(){
-            if($(this).attr('disabled'))
-                return;
-
-            var id = $('#datatable_resource input.icheck:checked').data('id');
-
-            removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
-                $('tr.filter .filter-submit').click();
-            });
-        });
-    },1000);
-
-});
-//改变状态
-function changeEnabled(id,enabled){
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
+<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><span class="active">用户管理</span></li>
+</ul>
+
+<div class="row">
+	<div class="col-md-12">
+		<!-- Begin: life time stats -->
+		<div class="portlet light portlet-fit portlet-datatable bordered">
+			<div class="portlet-title">
+				<div class="caption">
+					 <i class="fa fa-users font-dark"></i> <span
+						class="caption-subject font-dark sbold uppercase">用户数据表</span>
+				</div>
+				<div class="actions">
+					<a class="btn btn-circle blue" href="add.html" data-pjax><i class="fa fa-plus"></i> 添加用户</a>
+
+				</div>
+			</div>
+			<div class="portlet-body">
+				<div class="table-container" style="margin-top: 10px">
+					<table
+						class="table table-striped table-bordered table-hover table-checkable"
+						id="datatable_user">
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="10%">登录名</th>
+								<th width="10%">姓名</th>
+								<th width="12%">所属机构</th>
+								<th width="11%">角色</th>
+								<th width="10%">状态</th>
+								<th width="18%">最后登录时间</th>
+								<th width="26%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="userName_like">
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="name_like">
+								</td>
+								<td>
+									<input type="text" class="form-control form-filter input-sm" name="agencies_like">
+								</td>
+								<td></td>
+								<td>
+									<select class="form-control form-filter " name="enabled_eq">
+                                         <option value="">请选择...</option>
+                                         <option value="true">可用</option>
+                                         <option value="false">禁用</option>
+                                     </select>
+								</td>
+								<td></td>
+
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+                                                                <i class="fa fa-search"></i> 搜索</button>
+
+									<button class="btn btn-sm red btn-outline filter-cancel">
+                                                            <i class="fa fa-times"></i> 重置</button>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script id="user_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<!--<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">-->
+		{{++i}}
+	</td>
+	<td>
+		{{obj.userName}}
+	</td>
+	<td>
+		{{obj.name}}
+	</td>
+	<td>
+		{{obj.agencies}}
+	</td>
+	<td>
+		{{each obj.roles as role j}}
+			{{role.roleName}}、
+		{{/each}}
+	</td>
+	<td>
+		{{if obj.enabled}}
+			可用
+		{{else}}
+			禁用
+		{{/if}}
+	</td>
+	<td>
+		{{obj.lastLoginDate}}
+	</td>
+	<td>
+		{{if obj.isEdit == 0}}
+			<a class="btn btn-sm blue btn-outline" href="edit.html?no={{obj.id}}" data-pjax><i class="fa fa-edit"></i> 编辑</a>
+			<!--<button type="button" class="btn btn-sm line_allot_btn" data-id="{{obj.id}}">线调线路分配</button>-->
+		{{/if}}
+		{{if obj.isAdmin}}
+			<a class="btn btn-sm red btn-outline reset_password" data-id="{{obj.id}}" data-name="{{obj.userName}}" data-pjax><i class="fa fa-undo"></i> 重置密码</a>
+		{{/if}}
+		{{if obj.isAdmin}}
+			<a class="btn btn-sm red btn-outline unlock" data-name="{{obj.userName}}" data-pjax><i class="fa fa-unlock"></i> 解除锁定</a>
+		{{/if}}
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script>
+$(function(){
+	var page = 0, initPagination;
+	var user,isAdmin = false;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
+	};
+	$.get('/user/getCurrentUser', function(data) {
+        user = data;
+        var roles = user.roles;
+        $.each(roles,function () {
+            if(this.level == 1)
+                isAdmin = true;
+        })
+
+    });
+
+	setTimeout(function () {
+        $(document).on('click', 'a.reset_password', function () {
+            var id = $(this).data('id');
+            var name = $(this).data('name');
+            swal({
+				title: "重置密码",
+				text: "将登录名为"+name+"的用户，密码重置为随机密码！",
+				type: "warning",
+				showCancelButton: true,
+				confirmButtonColor: "#DD6B55",
+				confirmButtonText: "重置",
+				cancelButtonText: "取消",
+				closeOnConfirm: false },
+                function(){
+                    $.post('/user/resetPassword',{'id':id},function(result){
+                        if(result.status=='SUCCESS') {
+                            // 弹出添加成功提示消息
+                            swal("登录名为"+name+"的用户密码重置成功！", "success");
+                        } else if(result.status=='ERROR') {
+                            // 弹出添加失败提示消息
+                            swal("重置失败！", result.msg+"，请联系开发人员！", "ERROR");
+                        }
+                        //				loadPage('list.html');
+                        // 发布后刷新页面
+                        jsDoQuery(getParams(), true);
+                    });
+                });
+        }).on('click', 'a.unlock', function () {
+			var name = $(this).data('name');
+			swal({
+				title: "解除锁定",
+				text: "将登录名为"+name+"的用户，锁定状态解除！",
+				type: "warning",
+				showCancelButton: true,
+				confirmButtonColor: "#DD6B55",
+				confirmButtonText: "重置",
+				cancelButtonText: "取消",
+				closeOnConfirm: false },
+				function(){
+					$.post('/user/unlock',{'userName':name},function(result){
+						if(result.status=='SUCCESS') {
+							// 弹出添加成功提示消息
+							swal("登录名为"+name+"的用户锁定解除成功！", "success");
+						} else if(result.status=='ERROR') {
+							// 弹出添加失败提示消息
+							swal("锁定解除失败！", result.msg+"，请联系开发人员！", "ERROR");
+						}
+						jsDoQuery(getParams(), true);
+					});
+				});
+		});
+        jsDoQuery(null,true);
+
+        //重置
+        $('tr.filter .filter-cancel').on('click', function(){
+            $('tr.filter input, select').val('').change();
+            jsDoQuery(null, true);
+        });
+
+		function getParams() {
+		 var cells = $('tr.filter')[0].cells
+			 ,params = {}
+			 ,name;
+		 $.each(cells, function(i, cell){
+			 var items = $('input,select', cell);
+			 for(var j = 0, item; item = items[j++];){
+				 name = $(item).attr('name');
+				 if(name){
+					 params[name] = $(item).val();
+				 }
+			 }
+		 });
+		 return params;
+		}
+
+        //提交
+        $('tr.filter .filter-submit').on('click', function(){
+            jsDoQuery(getParams(), true);
+        });
+
+        /*
+        * 获取数据 p: 要提交的参数， pagination: 是否重新分页
+        */
+        function jsDoQuery(p, pagination){
+            var roles = new Map();
+            // 查询下级角色
+            $.ajax({
+                url: "/role/findSubordinate",
+                type: "Get",
+                async:false,
+                data: null,
+                success: function (rs) {
+                    if(rs.status == "SUCCESS"){
+                        $.each(rs.list,function(i,obj){
+                            roles[obj.id] = obj;
+                        });
+                    }
+                }
+            });
+            var params = {};
+            if(p)
+                params = p;
+            //更新时间排序
+            params['order'] = 'lastLoginDate';
+            params['page'] = page;
+            // params['id_eq'] = "1";
+            var i = layer.load(2);
+            $get('/user' ,params, function(data){
+                var list = data.content;
+                $.each(list, function(i, obj) {
+                    if(roles[obj.roles[0].id] != null && roles[obj.roles[0].id] != undefined){
+                        obj.isEdit = 0;
+                    } else{
+                        obj.isEdit = 1;
+                    }
+                    obj.isAdmin = isAdmin;
+                    obj.lastLoginDate = moment(obj.lastLoginDate).format("YYYY-MM-DD HH:mm:ss");
+                });
+
+                var bodyHtm = template('user_list_temp', {list: list});
+
+                $('#datatable_user tbody').html(bodyHtm)
+                    .find('.icheck').iCheck(icheckOptions)
+                    .on('ifChanged', iCheckChange);
+                if(pagination && list.length > 0){
+                    //重新分页
+                    initPagination = true;
+                    showPagination(data);
+                }
+                layer.close(i);
+
+                $('.line_allot_btn').on('click', openAllotWindow);
+            });
+        }
+
+        function iCheckChange(){
+            var tr = $(this).parents('tr');
+            if(this.checked)
+                tr.addClass('row-active');
+            else
+                tr.removeClass('row-active');
+
+            if($('#datatable_resource input.icheck:checked').length == 1)
+                $('#removeButton').removeAttr('disabled');
+            else
+                $('#removeButton').attr('disabled', 'disabled');
+        }
+
+        function showPagination(data){
+            //分页
+            $('#pagination').jqPaginator({
+                totalPages: data.totalPages,
+                visiblePages: 6,
+                currentPage: page + 1,
+                first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+                prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+                next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+                last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+                page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+                onPageChange: function (num, type) {
+                    if(initPagination){
+                        initPagination = false;
+                        return;
+                    }
+
+
+                    page = num - 1;
+                    jsDoQuery(null, false);
+                }
+            });
+        }
+
+        function openAllotWindow() {
+            var id = $(this).data('id');
+            $.get('/pages/permission/user/controlAllot.html', function (content) {
+                layer.open({
+                    type: 1,
+                    area: ['600px', '395px'],
+                    content: content,
+                    title: '线路调度权限分配',
+                    shift: 5,
+                    scrollbar: false,
+                    success: function () {
+                        $('#pageRealControlAllotWrap').trigger('init', id);
+                    }
+                });
+            });
+        }
+
+        //删除
+        $('#removeButton').on('click', function(){
+            if($(this).attr('disabled'))
+                return;
+
+            var id = $('#datatable_resource input.icheck:checked').data('id');
+
+            removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
+                $('tr.filter .filter-submit').click();
+            });
+        });
+    },1000);
+
+});
+//改变状态
+function changeEnabled(id,enabled){
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
 </script>
 \ No newline at end of file
@@ -277,7 +277,6 @@ ScheduleApp.factory(
  
                     // 处理错误，springboot会包装返回的错误数据
                     // 如：{"timestamp":1478674739246,"status":500,"error":"Internal Server Error","exception":"java.lang.ClassCastException","message":"java.lang.String cannot be cast to java.lang.Long","path":"/tidc/importfile"}
-
                     var output = [];
                     if (!rejection.status) {
                         // alert("我擦，后台返回连个状态码都没返回，见鬼了，服务器可能重启了");
@@ -287,7 +286,13 @@ ScheduleApp.factory(
                         console.log("貌似服务端连接不上");
                     } else {
                         output.push("状态编码：" + rejection.status);
-                        output.push("错误内容：" + angular.toJson(rejection.data));
+                        // output.push("错误内容：" + angular.toJson(rejection.data));
+                        if (rejection.data) {
+                            output.push("错误内容：" + rejection.data.message);
+                        } else {
+                            output.push("错误内容：" + rejection.message);
+                        }
+
                         if (rejection.status == 500) {
                             alert("服务端错误：" + "\n" + output.join("\n"));
                         } else if (rejection.status == 407) {
@@ -388,4 +393,4 @@ $.ajaxTransport(&quot;+binary&quot;, function(options, originalOptions, jqXHR){
             }
         };
     }
-});
 \ No newline at end of file
+});
-<!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;
-            list-style: none;
-        }
-
-        .home-panel{
-
-        }
-
-        #home-main-content{
-            padding: 0 !important;
-        }
-
-        #main-tab-content>.home-panel>#home-main-content{
-            overflow: inherit !important;
-        }
-    </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>
-<!-- Geolib -->
-<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></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>
+<!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;
+            list-style: none;
+        }
+
+        .home-panel{
+
+        }
+
+        #home-main-content{
+            padding: 0 !important;
+        }
+
+        #main-tab-content>.home-panel>#home-main-content{
+            overflow: inherit !important;
+        }
+    </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="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//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>
+<!-- Geolib -->
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></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>
-<!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"/>
-
-    <style>
-        .main-container .map-panel{
-            position: absolute;
-            top:0;
-            left: 0;
-            width: 20px;
-            z-index: 999;
-            height: 20px;
-        }
-    </style>
-</head>
-
-<body>
-<div class="main-container" style="height: 100%;">
-    <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
-</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 src="/assets/plugins/pinyin.js" merge="plugins"></script>
-</body>
-<script>
-    gb_data_gps.fixedTimeRefresh();
-    var res_load_ep = EventProxy.create('data-basic', function () {
-
-        //嵌入地图页面
-        $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
-            $('.map-system-msg.flex-left').remove();
-
-            $(this).append('<span class="map-panel"></span>');//判断里有JS判定这个容器是否显示
-        });
-    });
-
-    var isArray = function (obj) {
-        return Object.prototype.toString.call(obj) === '[object Array]';
-    };
-</script>
-</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"/>
+
+    <style>
+        .main-container .map-panel{
+            position: absolute;
+            top:0;
+            left: 0;
+            width: 20px;
+            z-index: 999;
+            height: 20px;
+        }
+    </style>
+</head>
+
+<body>
+<div class="main-container" style="height: 100%;">
+    <span style="position: absolute;left: calc(50% - 35px);top: calc(45% - 35px);">加载中...</span>
+</div>
+<!-- 地图相关 -->
+<script src="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//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="//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 src="/assets/plugins/pinyin.js" merge="plugins"></script>
+</body>
+<script>
+    gb_data_gps.fixedTimeRefresh();
+    var res_load_ep = EventProxy.create('data-basic', function () {
+
+        //嵌入地图页面
+        $('.main-container').load('/real_control_v2/mapmonitor/real.html', function () {
+            $('.map-system-msg.flex-left').remove();
+
+            $(this).append('<span class="map-panel"></span>');//判断里有JS判定这个容器是否显示
+        });
+    });
+
+    var isArray = function (obj) {
+        return Object.prototype.toString.call(obj) === '[object Array]';
+    };
+</script>
+</html>
@@ -110,12 +110,12 @@
 </script>
  
 <!-- 地图相关 -->
-<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="//api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+<script src="//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>
+<script src="//webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
 <script src="/real_control_v2/assets/js/jquery.min.js"></script>
 <!-- jquery actual -->
@@ -236,7 +236,7 @@
     </div>
 </script>
 <script id="cp_plat_msg_template" type="text/html">
-    <div class="multi_plat_msg_pop uk-animation-slide-bottom" data-type="{{type}}" data-id="{{id}}" data-confirm="{{responseState}}" data-ts="{{ts}}">
+    <div class="multi_plat_msg_pop uk-animation-slide-bottom" data-type="{{type}}" data-id="{{id}}" data-title="{{responseState}}" data-ts="{{ts}}">
         <div>
             <span class="title">应急预案</span>
             <span class="text"> {{instructionsContent}}</span>
@@ -244,9 +244,19 @@
         </div>
     </div>
 </script>
+<script id="mt_plat_msg_template" type="text/html">
+    <div class="multi_plat_msg_pop uk-animation-slide-bottom" style="background-color: #0aae0a;" data-type="{{type}}" data-confirm="维修保养计划" data-line="{{line}}" data-zbh="{{zbh}}" data-bydj="{{bydj}}" data-bysj="{{dateTimeStr}}" data-bydd="{{bydd}}">
+        <div>
+            <span class="title">维修保养计划</span>
+            <span class="text"> {{zbh}}&nbsp;&nbsp;{{timeStr}}&nbsp;&nbsp;进场保养</span>
+            <span class="desc">--浦东公交维修库</span>
+        </div>
+    </div>
+</script>
  
 <script src="/real_control_v2/js/safe_driv/safeDriv.js"  merge="custom_js"></script>
 <script src="/real_control_v2/js/con_plan/conPlan.js"  merge="custom_js"></script>
+<script src="/real_control_v2/js/mt_plan/mtPlan.js"  merge="custom_js"></script>
 <!-- #### 安全驾驶 end ###  -->
  
 <!-- 打电话 -->
@@ -266,7 +276,7 @@
                 </div>
             </div>
             <div class="uk-form-row">
-                <label class="uk-form-label" ">分机号:</label>
+                <label class="uk-form-label">分机号:</label>
                 <div class="uk-form-controls">
                     <input type="text" name="dn" value="" >
                 </div>