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

minhang # Conflicts: # src/main/resources/static/pages/forms/statement/waybill.html

Merge branch 'minhang' of 192.168.168.201:panzhaov5/bsth_control into
minhang # Conflicts: # src/main/resources/static/pages/forms/statement/waybill.html
廖磊
2 parents 483f22c7 7821e6c0
Showing 22 changed files with 1147 additions and 294 deletions
src/main/java/com/bsth/common/Constants.java
src/main/java/com/bsth/controller/sys/CompanyAuthorityController.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/controller/sys/dto/CompanyData.java
src/main/java/com/bsth/data/schedule/thread/SchedulePstThread.java
src/main/java/com/bsth/entity/sys/CompanyAuthority.java
src/main/java/com/bsth/repository/sys/CompanyAuthorityRepository.java
src/main/java/com/bsth/repository/sys/ModuleRepository.java
src/main/java/com/bsth/service/sys/CompanyAuthorityService.java
src/main/java/com/bsth/service/sys/impl/CompanyAuthorityServiceImpl.java
src/main/java/com/bsth/service/sys/impl/ModuleServiceImpl.java
src/main/resources/static/pages/forms/statement/waybill.html
src/main/resources/static/pages/permission/role/companyAuthority.html
src/main/resources/static/pages/permission/role/list.html
src/main/resources/static/real_control_v2/js/data/data_gps.js
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/iMap.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/gaode.js
@@ -32,4 +32,5 @@ public class Constants {
 	public static final String UPSTREAM_URL = "/control/upstream";
  
 	public static final String SESSION_USERNAME = "sessionUserName";
+	public static final String COMPANY_AUTHORITYS = "cmyAuths";
 }
+package com.bsth.controller.sys;
+
+import com.alibaba.fastjson.JSONArray;
+import com.bsth.controller.BaseController;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.service.sys.CompanyAuthorityService;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@RestController
+@RequestMapping("companyAuthority")
+public class CompanyAuthorityController extends BaseController<CompanyAuthority, Integer>{
+
+    @Autowired
+    CompanyAuthorityService companyAuthorityService;
+
+    @RequestMapping(value = "save")
+    public Map<String, Object> save(@RequestParam  Integer roleId, @RequestParam String authJsonStr){
+        authJsonStr = StringEscapeUtils.unescapeHtml4(authJsonStr);
+        System.out.println(authJsonStr);
+        List<CompanyAuthority> list = JSONArray.parseArray(authJsonStr, CompanyAuthority.class);
+        return companyAuthorityService.save(roleId, list);
+    }
+}
 package com.bsth.controller.sys;
  
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
+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;
@@ -18,13 +23,9 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
  
-import com.bsth.common.Constants;
-import com.bsth.common.ResponseCode;
-import com.bsth.controller.BaseController;
-import com.bsth.controller.sys.util.RSAUtils;
-import com.bsth.entity.sys.SysUser;
-import com.bsth.security.util.SecurityUtils;
-import com.bsth.service.sys.SysUserService;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import java.util.*;
  
 @RestController
 @RequestMapping("user")
@@ -34,6 +35,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
  
 	@Autowired
 	SysUserService sysUserService;
+
+	@Autowired
+	CompanyAuthorityService companyAuthorityService;
  
 	@RequestMapping(value = "/login/jCryptionKey")
 	public Map<String, Object> jCryptionKey(HttpServletRequest request){
@@ -97,7 +101,11 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 			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);
 		} catch (Exception e) {
@@ -106,6 +114,43 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 		}
 		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){
@@ -162,7 +207,7 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
 	 * @Description: TODO(修改密码)
 	 * @param oldPWD
 	 *            原始密码
-	 * @param newwPWD
+	 * @param newPWD
 	 *            新密码
 	 * @param cnewPWD
 	 *            确认新密码
+package com.bsth.controller.sys.dto;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public class CompanyData {
+
+    private String companyCode;
+
+    private String companyName;
+
+    private List<ChildrenCompany> children;
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public List<ChildrenCompany> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<ChildrenCompany> children) {
+        this.children = children;
+    }
+
+    public static class ChildrenCompany {
+        private String code;
+
+        private String name;
+
+        public ChildrenCompany(String code, String name){
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public void setCode(String code) {
+            this.code = code;
+        }
+    }
+}
 package com.bsth.data.schedule.thread;
  
-import java.util.LinkedList;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.jpa.JpaObjectRetrievalFailureException;
+import org.springframework.stereotype.Component;
+
+import javax.persistence.EntityNotFoundException;
+import java.util.LinkedList;
  
 /**
- * 
- * @ClassName: SchedulePstThread 
- * @Description: TODO(班次异步持久化) 
- * @author PanZhao 
- * @date 2016年8月24日 上午1:47:05 
- *
+ * @author PanZhao
+ * @ClassName: SchedulePstThread
+ * @Description: TODO(班次异步持久化)
+ * @date 2016年8月24日 上午1:47:05
  */
 @Component
-public class SchedulePstThread extends Thread{
-
-	@Autowired
-	ScheduleRealInfoRepository scheduleRepository;
-	
-	@Override
-	public void run() {
-		LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
-
-		ScheduleRealInfo schedule;
-		for (int i = 0; i < 1000; i++) {
-			schedule = list.poll();
-			if (null == schedule)
-				break;
-
-			scheduleRepository.save(schedule);
-		}
-	}
+public class SchedulePstThread extends Thread {
+
+    @Autowired
+    ScheduleRealInfoRepository scheduleRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Override
+    public void run() {
+
+        LinkedList<ScheduleRealInfo> list = DayOfSchedule.pstBuffer;
+
+        ScheduleRealInfo schedule;
+        for (int i = 0; i < 1000; i++) {
+            schedule = list.poll();
+            if (null == schedule)
+                break;
+
+            try {
+                scheduleRepository.save(schedule);
+            }
+            catch (JpaObjectRetrievalFailureException e1){
+                logger.error("JpaObjectRetrievalFailureException error.... 可忽略");
+            }
+            catch(EntityNotFoundException e2){
+                logger.error("EntityNotFoundException error.... 可忽略");
+            }
+            catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+    }
 }
+package com.bsth.entity.sys;
+
+import javax.persistence.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Entity
+@Table(name = "bsth_c_sys_company_auth")
+public class CompanyAuthority {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    /** 公司代码 */
+    private String companyCode;
+
+    /** 公司名称 */
+    private String companyName;
+
+    /** 分公司代码 */
+    private String subCompanyCode;
+
+    /** 分公司代码 */
+    private String subCompanyName;
+
+    private Integer roleId;
+
+    public String getSubCompanyName() {
+        return subCompanyName;
+    }
+
+    public void setSubCompanyName(String subCompanyName) {
+        this.subCompanyName = subCompanyName;
+    }
+
+    public String getSubCompanyCode() {
+        return subCompanyCode;
+    }
+
+    public void setSubCompanyCode(String subCompanyCode) {
+        this.subCompanyCode = subCompanyCode;
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+}
+package com.bsth.repository.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.repository.BaseRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Repository
+public interface CompanyAuthorityRepository extends BaseRepository<CompanyAuthority, Integer>{
+
+    @Modifying
+    @Query(value="DELETE FROM CompanyAuthority WHERE roleId = ?1")
+    void deleteByRoleId(Integer roleId);
+
+    @Query(value = "select ca from CompanyAuthority ca where ca.roleId in ?1")
+    List<CompanyAuthority> findByRoles(List<Integer> idx);
+}
 package com.bsth.repository.sys;
  
-import java.util.List;
-import java.util.Set;
-
+import com.bsth.entity.sys.Module;
+import com.bsth.repository.BaseRepository;
 import org.springframework.data.jpa.domain.Specification;
-import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
  
-import com.bsth.entity.sys.Module;
-import com.bsth.repository.BaseRepository;
+import java.util.List;
+import java.util.Set;
  
 @Repository
-public interface ModuleRepository extends BaseRepository<Module, Integer>{
-	
-	@Query("select m from Module m where m.groupType in ?1")
-	List<Module> findByGroupType(String[] groupType);
-	
-	List<Module> findByPId(Integer pId);
-	
-	@Query("select m from Module m where m.id in ?1")
-	Set<Module> findByIds(List<Integer> ids);
-	
-	@Override
-	List<Module> findAll(Specification<Module> spec);
+public interface ModuleRepository extends BaseRepository<Module, Integer> {
+
+    @Query("select m from Module m where m.groupType in ?1")
+    List<Module> findByGroupType(String[] groupType);
+
+    List<Module> findByPId(Integer pId);
+
+    @Query("select m from Module m where m.id in ?1")
+    Set<Module> findByIds(List<Integer> ids);
+
+    @Override
+    List<Module> findAll(Specification<Module> spec);
+
 }
+package com.bsth.service.sys;
+
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.service.BaseService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+public interface CompanyAuthorityService extends BaseService<CompanyAuthority, Integer> {
+    Map<String,Object> save(Integer roleId, List<CompanyAuthority> list);
+
+    List<CompanyAuthority> findByUser(SysUser user);
+}
+package com.bsth.service.sys.impl;
+
+import com.bsth.common.ResponseCode;
+import com.bsth.entity.sys.CompanyAuthority;
+import com.bsth.entity.sys.Role;
+import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.CompanyAuthorityRepository;
+import com.bsth.service.impl.BaseServiceImpl;
+import com.bsth.service.sys.CompanyAuthorityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * Created by panzhao on 2016/11/22.
+ */
+@Service
+public class CompanyAuthorityServiceImpl extends BaseServiceImpl<CompanyAuthority, Integer> implements CompanyAuthorityService {
+
+    @Autowired
+    CompanyAuthorityRepository companyAuthorityRepository;
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Transactional
+    @Override
+    public Map<String, Object> save(Integer roleId, List<CompanyAuthority> list) {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            for(CompanyAuthority cauth : list){
+                cauth.setRoleId(roleId);
+            }
+
+            //删除原数据
+            companyAuthorityRepository.deleteByRoleId(roleId);
+
+            //重新写入数据
+            companyAuthorityRepository.save(list);
+
+            rs.put("status", ResponseCode.SUCCESS);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+        }
+
+        return rs;
+    }
+
+    @Override
+    public List<CompanyAuthority> findByUser(SysUser user) {
+        Set<Role> roles = user.getRoles();
+        if(roles == null || roles.size() == 0)
+            return null;
+
+        List<Integer> idx = new ArrayList<>();
+        for(Role r : roles)
+            idx.add(r.getId());
+
+        List<CompanyAuthority> cAuths = companyAuthorityRepository.findByRoles(idx);
+        return cAuths;
+    }
+}
 package com.bsth.service.sys.impl;
  
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.domain.Sort.Direction;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.entity.sys.Module;
 import com.bsth.entity.sys.Role;
@@ -20,12 +8,23 @@ import com.bsth.repository.sys.ModuleRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.sys.ModuleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Service;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.*;
  
 @Service
 public class ModuleServiceImpl extends BaseServiceImpl<Module, Integer> implements ModuleService{
  
 	@Autowired
 	ModuleRepository moduleRepository;
+
+	@Autowired
+	JdbcTemplate jdbcTemplate;
  
 	@Override
 	public List<Module> findByGroupType(String group) {
@@ -62,26 +61,38 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 		SysUser user = SecurityUtils.getCurrentUser();
 		Set<Role> roles = user.getRoles();
  
-		List<Module> all = (List<Module>) moduleRepository.findAll(new Sort(Direction.ASC, "id"))
-					,results = new ArrayList<>();
-		
+		String inCond = "";
+		for(Role r : roles)
+			inCond += ("," + r.getId());
+
+		inCond = "(" + inCond.substring(1) + ")";
+
+		String sql = "select ID,CREATE_DATE,`ENABLE`,GROUP_TYPE,ICON,MAPP_SYMBOL,NAME,P_ID,PATH,UPDATE_DATE,CONTAINER from bsth_c_sys_module m where id in (select modules from bsth_c_sys_role_modules where roles in "+inCond+")  or group_type != 3";
+		List<Module> all = jdbcTemplate.query(sql, new ModuleRowMapper())
+				,rs = new ArrayList<>();
+
 		Map<Integer, Module> map = new HashMap<>();
 		for(Module m : all){
 			map.put(m.getId(), m);
-			for(Role r : roles){
-				if(m.getRoles().contains(r))
-					results.add(m);
-			}
+			if(m.getGroupType().equals("3"))
+				rs.add(m);
 		}
  
 		//上层目录和组节点
 		Set<Module> pSet = new HashSet<>();
-		for(Module m : results){
+		for(Module m : rs){
 			searchParentNode(m, map, pSet);
 		}
-		results.addAll(pSet);
-		
-		return results;
+		rs.addAll(pSet);
+
+		//排序
+		Collections.sort(rs, new Comparator<Module>() {
+			@Override
+			public int compare(Module o1, Module o2) {
+				return o1.getId() - o2.getId();
+			}
+		});
+		return rs;
 	}
  
 	/**
@@ -105,4 +116,24 @@ public class ModuleServiceImpl extends BaseServiceImpl&lt;Module, Integer&gt; implemen
 				searchParentNode(pModule, idMap, pSet);
 		}
 	}
+
+	public class ModuleRowMapper implements RowMapper<Module>{
+
+		@Override
+		public Module mapRow(ResultSet rs, int rowNum) throws SQLException {
+			Module module = new Module();
+			module.setId(rs.getInt("ID"));
+			module.setCreateDate(rs.getDate("CREATE_DATE"));
+			module.setEnable(rs.getBoolean("ENABLE"));
+			module.setGroupType(rs.getString("GROUP_TYPE"));
+			module.setIcon(rs.getString("ICON"));
+			module.setMappSymbol(rs.getString("MAPP_SYMBOL"));
+			module.setName(rs.getString("NAME"));
+			module.setpId(rs.getInt("P_ID"));
+			module.setPath(rs.getString("PATH"));
+			module.setUpdateDate(rs.getDate("UPDATE_DATE"));
+			module.setContainer(rs.getString("CONTAINER"));
+			return module;
+		}
+	}
 }
@@ -21,49 +21,49 @@
 		<h1>行车路单</h1>
 	</div>
 </div>
-
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
-			<div class="portlet-title">
-				<form class="form-inline" action="">
-					<div style="display: inline-block;">
+
+<div class="row">
+	<div class="col-md-12">
+		<div class="portlet light porttlet-fit bordered">
+			<div class="portlet-title">
+				<form class="form-inline" action="">
+					<div style="display: inline-block;">
 						<span class="item-label" style="width: 80px;">线路: </span>
-						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
-					</div>
-					<div style="display: inline-block;margin-left: 15px;">
-						<span class="item-label" style="width: 80px;">时间: </span>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
-					</div>
-					<div class="form-group" style="display: inline-block;margin-left: 15px;">
-						<input class="btn btn-default" type="button" id="query" value="查询"/>
-						<input class="btn btn-default" type="button" id="export" value="导出"/>
-						<input class="btn btn-default" type="button" id="print" value="打印"/>
-						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
-					</div>
-				</form>
-			</div>
-			<div class="portlet-body">
-				<div class="row">
-					<div class="col-md-3">
-						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
-							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
-								<thead>
-									<tr class="hidden">
-										<th>人员</th>
-										<th>自编号</th>
-										<th>路牌</th>
-									</tr>
-								</thead>
-								<tbody>
-									
-								</tbody>
-							</table>
-						</div>
-					</div>
-					<div class="col-md-9"  id="printArea">
-						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
-							<table class="table table-bordered table-checkable" id="forms">
+						<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+					</div>
+					<div style="display: inline-block;margin-left: 15px;">
+						<span class="item-label" style="width: 80px;">时间: </span>
+						<input class="form-control" type="text" id="date" style="width: 180px;"/>
+					</div>
+					<div class="form-group" style="display: inline-block;margin-left: 15px;">
+						<input class="btn btn-default" type="button" id="query" value="查询"/>
+						<input class="btn btn-default" type="button" id="export" value="导出"/>
+						<input class="btn btn-default" type="button" id="print" value="打印"/>
+						<input class="btn btn-default" type="button" id="exportMore" value="批量导出"/>
+					</div>
+				</form>
+			</div>
+			<div class="portlet-body">
+				<div class="row">
+					<div class="col-md-3">
+						<div class="" style="margin-top: 10px;overflow:auto;height: 860px">
+							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info">
+								<thead>
+									<tr class="hidden">
+										<th>人员</th>
+										<th>自编号</th>
+										<th>路牌</th>
+									</tr>
+								</thead>
+								<tbody>
+									
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="col-md-9"  id="printArea">
+						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+							<table class="table table-bordered table-checkable" id="forms">
 								<tbody class="ludan_1">
  
 								</tbody>
@@ -75,25 +75,25 @@
 						        </tbody>
 						        <tbody class="ludan_4">
  
-						        </tbody>
-							</table>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script>
-	$(function(){
-		// 关闭左侧栏
-		if (!$('body').hasClass('page-sidebar-closed'))
+						        </tbody>
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<script>
+	$(function(){
+		// 关闭左侧栏
+		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		
-		$("#date").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
+		
+		$("#date").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn'
 		});
  
 		$.get('/basic/lineCode2Name',function(result){
@@ -146,28 +146,29 @@
 			}
 		});
 		 */
-		var date = '';
-		$("#query").on("click",function(){
-			var line = $("#line").val();
+		
+		var date = '';
+		$("#query").on("click",function(){
+			var line = $("#line").val();
 			date = $("#date").val();
-			$(".hidden").removeClass("hidden");
-			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
-				// 把数据填充到模版中
-				var tbodyHtml = template('list_info',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#info tbody').html(tbodyHtml);
-			});
+			$(".hidden").removeClass("hidden");
+			$get('/realSchedule/queryUserInfo',{line:line,date:date},function(result){
+				// 把数据填充到模版中
+				var tbodyHtml = template('list_info',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#info tbody').html(tbodyHtml);
+			});
 		});
  
 		var params = new Array();
-		var jName = '';
+		var jName = '';
 		$("#info tbody").on("click","tr",function(){
 			if($(this).children().size() < 2){
 				return;
-			}
-			
-			$(this).children().each(function(index){
-				params[index] = $(this).text();
+			}
+			
+			$(this).children().each(function(index){
+				params[index] = $(this).text();
 			});
 			console.log(params);
 			jName = params[0].split("\\")[0];
@@ -180,18 +181,18 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
 				//$('#forms .ludan_4').html(ludan_4);
-			});
+			});
 			$post('/realSchedule/queryListWaybill',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
-			    getTime(result);
-				var ludan_2 = template('ludan_2',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#forms .ludan_2').html(ludan_2);
+			    getTime(result);
+				var ludan_2 = template('ludan_2',{list:result});
+				// 把渲染好的模版html文本追加到表格中
+				$('#forms .ludan_2').html(ludan_2);
 			});
 			$post('/realSchedule/findKMBC',{jName:jName,clZbh:params[1],lpName:params[2],date:date},function(result){
 			    var ludan_3 = template('ludan_3',result);
 			    $('#forms .ludan_3').html(ludan_3);
 			});
-			
+			
 		});
  
 		$("#export").on("click",function(){
@@ -227,22 +228,22 @@
                     }
                 }
             }); 
-		}
-	});
-</script>
-<script type="text/html" id="list_info">
-	{{each list as obj i}}
-		<tr>
-			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
-			<td width="32%">{{obj[2]}}</td>
-			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
-		</tr>
-	{{/each}}
-	{{if list.length == 0}}
-		<tr>
-			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
-		</tr>
-	{{/if}}
+		}
+	});
+</script>
+<script type="text/html" id="list_info">
+	{{each list as obj i}}
+		<tr>
+			<td width="45%">{{obj[4]}}\{{obj[1]}}</td>
+			<td width="32%">{{obj[2]}}</td>
+			<td width="23%">{{obj[3]}}<input type="hidden" id="{{obj[2]}}" value="{{obj[0]}}"></td>
+		</tr>
+	{{/each}}
+	{{if list.length == 0}}
+		<tr>
+			<td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
+		</tr>
+	{{/if}}
 </script>
 <script type="text/html" id="ludan_1">
 	  <tr>
@@ -303,31 +304,31 @@
           <td colspan="1">快</td>
           <td colspan="1">慢</td>
       </tr>
-</script>
-<script type="text/html" id="ludan_2">
-	{{each list as obj i}}
-		<tr>
-			<td>{{i+1}}</td>
-			<td>{{obj.jName}}</td>
-			<td>{{obj.sName}}</td>
-			<td>&nbsp;</td>
-			<td>{{obj.qdzName}}</td>
-			<td>{{obj.zdzName}}</td>
-			<td>{{obj.fcsj}}</td>
-			<td>{{obj.fcsjActual}}</td>
-			<td>{{obj.zdsj}}</td>
-			<td>{{obj.zdsjActual}}</td>
-			<td>{{obj.fast}}</td>
-			<td>{{obj.slow}}</td>
+</script>
+<script type="text/html" id="ludan_2">
+	{{each list as obj i}}
+		<tr>
+			<td>{{i+1}}</td>
+			<td>{{obj.jName}}</td>
+			<td>{{obj.sName}}</td>
+			<td>&nbsp;</td>
+			<td>{{obj.qdzName}}</td>
+			<td>{{obj.zdzName}}</td>
+			<td>{{obj.fcsj}}</td>
+			<td>{{obj.fcsjActual}}</td>
+			<td>{{obj.zdsj}}</td>
+			<td>{{obj.zdsjActual}}</td>
+			<td>{{obj.fast}}</td>
+			<td>{{obj.slow}}</td>
 			<td>{{obj.jhlc}}</td>
-			<td>{{obj.remarks}}</td>
-		</tr>
+			<td>{{obj.remarks}}</td>
+		</tr>
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
 			<td colspan="14"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
-	{{/if}}
+	{{/if}}
 </script>
 <script type="text/html" id="ludan_3">
 	<tr>
+<style>
+    .cmpy-auth-card {
+        width: 760px;
+        background: #fff;
+        margin: auto;
+        padding: 15px;
+        box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+    }
+
+    .cmpy-auth-card .yunyin-company-panel:last-child {
+        border-bottom: none;
+        padding-bottom: 0px;
+    }
+
+    .yunyin-company-panel {
+        border-bottom: 1px solid #e9e5e5;
+        padding-bottom: 5px;
+
+        user-select:none;
+    }
+
+    .yunyin-company-panel .company {
+        font-size: 13px;
+    }
+
+    .yunyin-company-panel .sub-company {
+        display: inline-block;
+        text-align: center;
+        padding: 5px 15px;
+        border-radius: 5px !important;
+        color: #5d5c5c;
+        font-size: 13px;
+        background: linear-gradient(to bottom, #fafafa, #eeeeee);
+        cursor: pointer;
+        border: 1px solid #eeeeee;
+    }
+
+    .yunyin-company-panel .sub-company.active {
+        background: linear-gradient(to bottom, #2ab4c0, #229ea9);
+        color: #fdfdfd;
+    }
+</style>
+
+<div id="roleCompanyAuthority">
+
+    <div class="page-head">
+        <div class="page-title">
+            <h1>模块配置</h1>
+        </div>
+    </div>
+
+    <ul class="page-breadcrumb breadcrumb">
+        <li><a href="/pages/home.html" data-pjax>首页</a> <i
+                class="fa fa-circle"></i></li>
+        <li><span class="active">权限管理</span> <i class="fa fa-circle"></i></li>
+        <li><a href="list.html" data-pjax>角色管理</a> <i class="fa fa-circle"></i></li>
+        <li><span class="active">分公司数据权限</span></li>
+    </ul>
+
+    <div class="cmpy-auth-card">
+
+        <h4>角色信息</h4>
+        <table class="table">
+            <tr>
+                <td>
+                    代码：<span id="roleCode"></span>
+                </td>
+                <td>
+                    名称：<span id="roleName"></span>
+                </td>
+            </tr>
+        </table>
+    </div>
+    <br><br>
+    <div class="cmpy-auth-card cmpy-list">
+    </div>
+
+    <div class="cmpy-auth-card" style="text-align: right;">
+        <button type="button" class="btn btn-default">返回</button>&nbsp;
+        <button type="button" class="btn btn-primary saveBtn" ><i class="fa fa-check"></i>保存</button>
+    </div>
+
+    <script id="role-company-authority-temp" type="text/html">
+        {{each list as obj i}}
+        <div class="yunyin-company-panel">
+            <h5 class="company">{{obj.name}}</h5>
+            {{each obj.childs as fgs i}}
+            <div class="sub-company" data-company="{{obj.name}}" data-id="{{fgs.upCode}}_{{fgs.businessCode}}">{{fgs.businessName}}</div>
+            {{/each}}
+        </div>
+        {{/each}}
+    </script>
+
+</div>
+
+<script>
+$(function () {
+    var id = $.url().param('no')
+            ,roleObj;
+
+    if(!id){
+        alert('缺少主键');
+    }
+    else{
+        $.get('/role/'+id , function(obj){
+            $('#roleCompanyAuthority #roleCode').text(obj.codeName);
+            $('#roleCompanyAuthority #roleName').text(obj.roleName);
+        });
+    }
+
+
+    $.get('/business/all', function (rs) {
+        var baseCode;
+        //找到跟节点
+        $.each(rs, function () {
+           if(this.upCode == 0){
+               baseCode=this.businessCode;
+               return false;
+           }
+        });
+        if(!baseCode){
+            alert('大爷找不到跟节点，数据有问题吧！！！');
+            return;
+        }
+        //提取二级节点
+        var secondMap={};
+        $.each(rs, function () {
+            if(this.upCode==baseCode){
+                secondMap[this.businessCode] = {
+                    name: this.businessName,
+                    childs: []
+                };
+            }
+        });
+        //分公司节点
+        $.each(rs, function () {
+            if(secondMap[this.upCode])
+                secondMap[this.upCode].childs.push(this);
+        });
+
+        //排序
+        for(var sid in secondMap){
+            secondMap[sid].childs.sort(naturalSort);
+        }
+
+        var htmlStr=template('role-company-authority-temp', {list: get_vals(secondMap)});
+        $('#roleCompanyAuthority .cmpy-list').html(htmlStr);
+
+        //查询公司权限信息
+        $get('/companyAuthority/all', {roleId_eq: id}, function (rs) {
+            //console.log(rs);
+            var dataId;
+            $.each(rs, function () {
+                dataId=this.companyCode+'_'+this.subCompanyCode;
+                $('.cmpy-list div.sub-company[data-id='+dataId+']').addClass('active');
+            });
+        });
+    });
+
+    $('#roleCompanyAuthority').on('click', '.cmpy-list .sub-company', function () {
+        if($(this).hasClass('active'))
+            $(this).removeClass('active');
+        else
+            $(this).addClass('active');
+    });
+
+    var get_vals = function(json) {
+        var array = [];
+        for (var key in json) {
+            array.push(json[key]);
+        }
+
+        return array;
+    }
+
+    var naturalSort=function (a, b) {
+        return a.businessCode.localeCompare(b.businessCode);
+    }
+
+    //保存
+    $('#roleCompanyAuthority .saveBtn').on('click', function () {
+        var ats=$('.cmpy-list div.sub-company.active', '#roleCompanyAuthority')
+                ,data=[];
+        var code;
+        $.each(ats, function () {
+            code = $(this).data('id').split('_');
+            data.push({
+                companyCode: code[0],
+                subCompanyCode: code[1],
+                companyName: $(this).data('company'),
+                subCompanyName: $(this).text()
+            });
+        });
+
+        $post('/companyAuthority/save', {roleId: id, authJsonStr: JSON.stringify(data)}, function (rs) {
+            alert('保存成功！');
+        })
+    });
+});
+</script>
 \ No newline at end of file
@@ -66,9 +66,15 @@
 				<a href="settings.html?no={{role.id}}" data-pjax class=" font-blue "
 					style="display: inline-block; margin-right: 5px;"> <i
 					class="fa fa-meh-o"> </i> 模块配置
-				</a> <a href="javascript:;" class=" font-blue " 
-					style="display: inline-block;" > <i class="fa fa-key">
-				</i> 分配资源
+				</a>
+				<a href="javascript:;" class=" font-blue "
+					style="display: inline-block;color: #aaaaaa !important;" > <i class="fa fa-key">
+				</i> 系统资源权限
+				</a>
+
+				<hr>
+				<a href="companyAuthority.html?no={{role.id}}" data-pjax class="font-blue"
+				   style="display: inline-block; font-size: 12px;" >  分公司数据权限
 				</a>
 			</div>
 		</div>
@@ -3,7 +3,7 @@
 var gb_data_gps = (function() {
  
     //fixed time refresh delay
-    var delay = 1000 * 8;
+    var delay = 1000 * 80;
     //deviceId ——> gps
     var realData = {};
     //refresh after callback
@@ -42,7 +42,7 @@
 /**/
 .real_bottom_panel{
     position: absolute !important;
-    height: 18px;
+    height: 180px;
     width: 100%;
     width: calc(100% - 342px);
     bottom: 2px !important;
@@ -111,7 +111,8 @@
     height: calc(100% - 7px);
     overflow: auto;
     padding-top: 7px;
-    font-size: 13px
+    font-size: 13px;
+    position: relative;
 }
  
 .real_br_cont .uk-form .uk-form-row{
@@ -163,4 +164,145 @@
     background-color: #fff;
     border-radius: 4px;
     box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+}
+
+.gps_info_win p{
+    margin: 9px 0;
+    font-size: 13px;
+}
+
+.gps_info_win h4,.gps_info_win h5{
+    color: #0E6AF9;
+    margin: 10px 0;
+}
+
+.gps_info_win .date-str{
+    color: gray;font-size: 12px;
+}
+
+.gps_info_win a{
+    color:#878887;font-size:12px;
+}
+
+
+.spinner {
+    margin: 50px auto;
+    width: 50px;
+    height: 40px;
+    text-align: center;
+    font-size: 10px;
+}
+
+.spinner > div {
+    background-color: #69D7E1;
+    height: 100%;
+    width: 6px;
+    display: inline-block;
+
+    -webkit-animation: sk-stretchdelay 1.2s infinite ease-in-out;
+    animation: sk-stretchdelay 1.2s infinite ease-in-out;
+}
+
+.spinner .rect2 {
+    -webkit-animation-delay: -1.1s;
+    animation-delay: -1.1s;
+}
+
+.spinner .rect3 {
+    -webkit-animation-delay: -1.0s;
+    animation-delay: -1.0s;
+}
+
+.spinner .rect4 {
+    -webkit-animation-delay: -0.9s;
+    animation-delay: -0.9s;
+}
+
+.spinner .rect5 {
+    -webkit-animation-delay: -0.8s;
+    animation-delay: -0.8s;
+}
+
+@-webkit-keyframes sk-stretchdelay {
+    0%, 40%, 100% { -webkit-transform: scaleY(0.4) }
+    20% { -webkit-transform: scaleY(1.0) }
+}
+
+@keyframes sk-stretchdelay {
+    0%, 40%, 100% {
+        transform: scaleY(0.4);
+        -webkit-transform: scaleY(0.4);
+    }  20% {
+           transform: scaleY(1.0);
+           -webkit-transform: scaleY(1.0);
+       }
+}
+
+.sk-cube-grid {
+    width: 40px;
+    height: 40px;
+    margin: 100px auto;
+}
+
+.sk-cube-grid .sk-cube {
+    width: 33%;
+    height: 33%;
+    background-color: #69D7E1;
+    float: left;
+    -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
+    animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
+}
+.sk-cube-grid .sk-cube1 {
+    -webkit-animation-delay: 0.2s;
+    animation-delay: 0.2s; }
+.sk-cube-grid .sk-cube2 {
+    -webkit-animation-delay: 0.3s;
+    animation-delay: 0.3s; }
+.sk-cube-grid .sk-cube3 {
+    -webkit-animation-delay: 0.4s;
+    animation-delay: 0.4s; }
+.sk-cube-grid .sk-cube4 {
+    -webkit-animation-delay: 0.1s;
+    animation-delay: 0.1s; }
+.sk-cube-grid .sk-cube5 {
+    -webkit-animation-delay: 0.2s;
+    animation-delay: 0.2s; }
+.sk-cube-grid .sk-cube6 {
+    -webkit-animation-delay: 0.3s;
+    animation-delay: 0.3s; }
+.sk-cube-grid .sk-cube7 {
+    -webkit-animation-delay: 0s;
+    animation-delay: 0s; }
+.sk-cube-grid .sk-cube8 {
+    -webkit-animation-delay: 0.1s;
+    animation-delay: 0.1s; }
+.sk-cube-grid .sk-cube9 {
+    -webkit-animation-delay: 0.2s;
+    animation-delay: 0.2s; }
+
+@-webkit-keyframes sk-cubeGridScaleDelay {
+    0%, 70%, 100% {
+        -webkit-transform: scale3D(1, 1, 1);
+        transform: scale3D(1, 1, 1);
+    } 35% {
+          -webkit-transform: scale3D(0, 0, 1);
+          transform: scale3D(0, 0, 1);
+      }
+}
+
+@keyframes sk-cubeGridScaleDelay {
+    0%, 70%, 100% {
+        -webkit-transform: scale3D(1, 1, 1);
+        transform: scale3D(1, 1, 1);
+    } 35% {
+          -webkit-transform: scale3D(0, 0, 1);
+          transform: scale3D(0, 0, 1);
+      }
+}
+.sk-cube-grid._center{
+    position: absolute;
+    top: 30%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);
 }
 \ No newline at end of file
@@ -46,9 +46,8 @@ var gb_map_config=(function () {
             $('.map_config_wrap').html(formHtml);
  
             //颜色选择器
-            $('.map_config_wrap .color_block').each(function () {
-                var c=$('.sp-placeholder-color',this).css('background-color');
-                var that=this;
+            $('.map_config_wrap .color_block .sp-placeholder .sp-placeholder-color').each(function () {
+                var c=$(this).css('background-color');
                 $(this).spectrum({
                     color: c,
                     showInput: true,
@@ -57,15 +56,74 @@ var gb_map_config=(function () {
                     preferredFormat: "rgb",
                     showAlpha: true,
                     change: function (color) {
-                        $('.sp-placeholder-color',that).css('background-color', color);
+                        $(this).css('background-color', color);
+                        //set attr
+                        recursion_set_attr(defaultConfig, $(this).data('name'), color.toString());
+                        //重新渲染地图覆盖物
+                        gb_map_overlay_mge.reDraw();
                     }
                 });
             });
  
+            $('.map_config_wrap form input').on('change', configChangeHandler);
  
         });
     }
  
+    var configChangeHandler = function () {
+        //console.log('configChangeHandler..',this);
+        var name = $(this).attr('name')
+            ,val = $(this).attr('value');
+
+        if(!name)
+            return;
+
+        handler[name] && handler[name](val);
+    };
+
+    var handler={
+        map_type: changeMapType
+    };
+
+    //切换地图类型
+    function changeMapType(val) {
+        gb_map_imap.changeMap(val, function () {
+            gb_map_overlay_mge.reDraw();
+        });
+    }
+
+    function recursion_get_attr(data, attr){
+        var ats = attr.split('.'),
+            val = data;
+
+        $.each(ats, function (i, a) {
+            val=val[a];
+
+            if(!val)
+                return false;
+        });
+
+        return val;
+    }
+    
+    function recursion_set_attr(data, attr, value) {
+        var ats = attr.split('.'),
+            tempVal = data
+            ,len = ats.length;
+
+        $.each(ats, function (i, a) {
+            if(i == len -1){
+                tempVal[a] = value;
+                return false;
+            }
+            else
+                tempVal=tempVal[a];
+
+            if(!tempVal)
+                return false;
+        });
+    }
+
     return {
         getConfig: function () {
             return defaultConfig;
@@ -16,27 +16,20 @@ var gb_map_imap = (function () {
                 currentMap = name;
             return mapProxy;
         },
-        changeDefault: function (mapName) {
+        changeMap: function (mapName, cb) {
             if (mapName == currentMap)
                 return;
             if (maps[mapName]) {
                 //原地图 destroy
                 var oldMap = maps[currentMap].instance;
                 oldMap.destroy && oldMap.destroy();
-                $(gb_map_consts.mapContainer).html('');
-                //解除实时路况按钮点击事件
-                $(gb_map_consts.trafficBtn).unbind('click');
-
                 //新地图 INIT
                 var text = maps[mapName].text;
                 //layer.msg('正在切换到' + text + '...', {icon : 16,shade : [ 0.6, '#393D49' ],time : 0});
                 var newMap = maps[mapName].instance;
-                newMap.init();
-                setText(text);
+                newMap.init(cb);
  
                 currentMap = mapName;
-                //收拢线路
-                $('.mapRightWrap .collapse.in').collapse('hide');
             } else
                 alertErr('不存在的地图实例' + mapName);
         },
@@ -87,24 +80,19 @@ var gb_map_imap = (function () {
             case 0:
                 if (g.upDown == 0) {
                     //营运上行
-                    colours['bgColor'] = 'rgba(94, 150, 210, 1)';
+                    colours['bgColor'] = gb_map_config.getConfig().carIcon.color.up;
                     colours['shadow'] = 'rgba(94, 150, 210, 0.3)';
                 }
                 else if (g.upDown == 1) {
                     //营运下行
-                    colours['bgColor'] = 'rgba(201, 33, 33, 1)';
+                    colours['bgColor'] = gb_map_config.getConfig().carIcon.color.down;
                     colours['shadow'] = 'rgba(201, 33, 33, 0.3)';
                 }
-                else {
-                    //未知走向
-                    colours['bgColor'] = 'rgba(0, 0, 0, 1)';
-                    colours['shadow'] = 'rgba(0, 0, 0, 0.3)';
-                }
                 break;
  
             default:
                 //非营运
-                colours['bgColor'] = 'rgba(136, 133, 133, 1)';
+                colours['bgColor'] = gb_map_config.getConfig().carIcon.color.nonOperation;
                 colours['shadow'] = 'rgba(136, 133, 133, 0.3)';
                 break;
         }
@@ -13,7 +13,7 @@ var gb_map_baidu = (function(){
 	var buffAreas = {};
 	var baiduInstance = {
 		//初始化
-		init: function(){
+		init: function(cb){
 			if(!window.BMap){
 				alert('地图没有加载成功，请确认是否能正常连接外网！！');
 				return;
@@ -23,7 +23,9 @@ var gb_map_baidu = (function(){
 			map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 12);
 			map.enableScrollWheelZoom();
  
-			window.localStorage.setItem('real_map', 'baidu');
+
+
+			//window.localStorage.setItem('real_map', 'baidu');
  
 			// 路况控件
 /*			var ctrl = new BMapLib.TrafficControl();
@@ -52,11 +54,11 @@ var gb_map_baidu = (function(){
 		destroy: function(){
 			realMarkers = {};
 			linePolyline = [];
-		},
+		}/*,
 		clear: function(){
 			realMarkers = {};
 			map.clearOverlays();
-		},
+		}*/,
 		//画线路图层
 		drawLine: function(opt){
 			if(polylines[opt.id])
@@ -128,6 +130,13 @@ var gb_map_baidu = (function(){
 				}
 			});
 		},
+		clearAll: function () {
+			//清除所有覆盖物
+			realMarkers = {};
+			polylines={};
+			map.clearOverlays();
+
+		},
 		showGpsMarker:function (opt) {
 			var chs = opt.chs;
 			for(var device in realMarkers){
@@ -219,9 +228,9 @@ var gb_map_baidu = (function(){
 		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
 		marker.gpsData = gpsData;
 		//click
-		/*marker.addEventListener('click', function(){
+		marker.addEventListener('click', function(){
 			bdOpenWindow(this);
-		});*/
+		});
 		//mouseover
 		marker.addEventListener('mouseover', function(){
 			setTop(this);
@@ -273,9 +282,13 @@ var gb_map_baidu = (function(){
 	}
  
 	function bdOpenWindow(marker){
-		marker.gpsData.fromNow = moment(marker.gpsData.timestamp).fromNow();
+		var gps = marker.gpsData;
+		//线路名
+		gps.lineName = gb_data_basic.lineCode2NameAll()[gps.lineId];
+		//时间
+		gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
  
-		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(marker.gpsData));
+		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(gps));
 		map.openInfoWindow(marker.infoWindow, marker.point);
 	}
  
@@ -16,11 +16,11 @@ var gb_map_gaode = (function() {
 	var topMarkr;
 	var realMarkers = {};
 	//线路路由线条
-	var linePolyline;
+	var polylines={};
 	//实时路况是否显示
 	var traffVisible;
 	var gaodeInstance = {
-		init : function() {
+		init : function(cb) {
 			var $mapCon = $(gb_map_consts.mapContainer);
 			$mapCon.html(mapLoadAnim);
 			//设置样式
@@ -31,14 +31,14 @@ var gb_map_gaode = (function() {
 			map.setZoomAndCenter(14, [ gb_map_consts.center_point.lng, gb_map_consts.center_point.lat ]);
 			// 加载完成
 			AMap.event.addListener(map, 'complete', function() {
-				layer.closeAll();
-				window.localStorage.setItem('real_map', 'gaode');
+				//window.localStorage.setItem('real_map', 'gaode');
 				/*storage.setItem('real_map', REAL_GAODE_TEXT);
 				$('.sk-cube-grid._center').remove();*/
+				cb && cb();
 			});
  
 			// 实时路况图层
-			var trafficLayer = new AMap.TileLayer.Traffic();
+			/*var trafficLayer = new AMap.TileLayer.Traffic();
 			trafficLayer.setMap(map);
 			trafficLayer.hide();
  
@@ -54,7 +54,7 @@ var gb_map_gaode = (function() {
 					$(this).addClass('active');
 					hideLinePolyline();
 				}
-			});
+			});*/
 		},
 		setStyle : function() {
 			$('.mapRightWrap').addClass('gaode');
@@ -67,50 +67,88 @@ var gb_map_gaode = (function() {
 			$('.mapTools').removeClass('gaode');
 			$('.leftUtils').removeClass('gaode');
 		},
-		clear: function(){
+		clearAll: function () {
+			realMarkers = {};
+			polylines={};
+			map.clearMap();
+		}
+		/*clear: function(){
 			realMarkers = {};
 			map.clearMap();
 			linePolyline = [];
-		},
-		drawLine: function(opts){
-			linePolyline = [];
+		}*/,
+		drawLine: function(opt){
+			//linePolyline = [];
+			var pos = [], temps;
+			var route = opt.upDown==0?opt.route.up_gcj:opt.route.down_gcj;
  
-			map.clearMap();
+			$.each(route.split(','), function(){
+				temps = this.split(' ');
+				pos.push([temps[0], temps[1]]);
+			});
  
-			var upArr = [], downArr = [];
-			var upLineOps = {path: upArr, strokeColor:"blue", strokeWeight:6, strokeOpacity:0.5}
-				,downLineOps = {path: downArr, strokeColor:"red", strokeWeight:6, strokeOpacity:0.5};
-			var route = opts.route;
-			//上行
-			if(route.up){
-				$.each(route.up_gcj.split(','), function(){
-					tempArray = this.split(' ');
-					upArr.push([tempArray[0], tempArray[1]]);
-				});
-				 var upLine = new AMap.Polyline(upLineOps);
-				//保存线条引用
-				 linePolyline.push(upLine);
-				 upLine.setMap(map);
-	             map.setCenter(upArr[parseInt(upArr.length / 2)]);
+			opt.style.path=pos;
+			console.log('opt.style', opt.style);
+			var polyline = new AMap.Polyline(opt.style);
+			//根据ID保存映射
+			polylines[opt.id]=polyline;
+			if(opt.hide)
+				polyline.hide();
  
+			polyline.setMap(map);
+
+			map.setCenter(pos[parseInt(pos.length / 2)]);
+
+		},
+		//根据id 显示polyline
+		refreshPolyline: function (opt) {
+			var idx = opt.idx;
+			for(var id in polylines){
+				if(idx.indexOf(id) != -1)
+					polylines[id].show();
+				else
+					polylines[id].hide();
 			}
-			//下行
-			if(route.down){
-				$.each(route.down_gcj.split(','), function(){
-					tempArray = this.split(' ');
-					downArr.push([tempArray[0], tempArray[1]]);
-				});
-				 var downLine = new AMap.Polyline(downLineOps);
-				 //保存线条引用
-				 linePolyline.push(downLine);
-				 downLine.setMap(map);
-			}
-			//实时路况下不显示
-			if(traffVisible)
-				hideLinePolyline();
 		},
 		drawRealGpsMarker: function(opts){
-			var gpsArray = opts.gpsList;
+			gpsArray = opts.gpsList;
+			var coord;
+			$.each(gpsArray, function(i, gps){
+
+				marker = realMarkers[gps.deviceId];
+				if(marker && gps.timestamp == marker.gpsData.timestamp)
+					return;
+				else{
+					//转换坐标
+					transCoord(gps);
+
+					if(marker)
+						moveMarker(marker, gps);//移动marker
+					else {
+						//创建marker
+						marker = createGDMarkerByGps(gps);
+						realMarkers[gps.deviceId] = marker
+					}
+				}
+				
+				/*coord = TransGPS.transformFromWGSToGCJ(gps.lat, gps.lon);
+				gps.gcj_lat = coord.lat;
+				gps.gcj_lon = coord.lng;
+
+				marker = realMarkers[gps.deviceId];
+				if(marker){
+					if(gps.timestamp == marker.gpsData.timestamp)
+						return;
+					else
+						moveMarker(marker, gps);//移动marker
+				}
+				else{
+					var marker = createGDMarkerByGps(gps);
+					realMarkers[gps.deviceId] = marker
+				}*/
+			});
+
+			/*var gpsArray = opts.gpsList;
 			var coord;
 			$.each(gpsArray, function(i, gps){
 				if(opts.coordTransform){
@@ -130,7 +168,16 @@ var gb_map_gaode = (function() {
 					var marker = createGDMarkerByGps(gps);
 					realMarkers[gps.deviceId] = marker
 				}
-			});
+			});*/
+		},
+		showGpsMarker: function (opt) {
+			var chs = opt.chs;
+			for(var device in realMarkers){
+				if(chs[device])
+					realMarkers[device].show();
+				else
+					realMarkers[device].hide();
+			}
 		},
 		goToMarker: function(opts){
 			var deviceId = opts.deviceId
@@ -147,6 +194,12 @@ var gb_map_gaode = (function() {
 		}
 	};
  
+	function transCoord(gps) {
+		var coord = TransGPS.transformFromWGSToGCJ(gps.lat, gps.lon);
+		gps.gcj_lat = coord.lat;
+		gps.gcj_lon = coord.lng;
+	}
+
 	function createGDMarkerByGps(gps){
 		//根据编码长度 计算marker 宽度
 		var w = gps.nbbm.length * 10;
@@ -156,7 +209,7 @@ var gb_map_gaode = (function() {
 			position: [gps.gcj_lon, gps.gcj_lat],
 	        icon: new AMap.Icon({
 	            size: new AMap.Size(w, 25),  //图标大小
-	            image: iMap.createCarIcon(gps, w)
+	            image: gb_map_imap.createCarIcon(gps, w)
 	        }),
 	        offset: new AMap.Pixel(-35, -12)
 	    });
@@ -184,14 +237,14 @@ var gb_map_gaode = (function() {
 		var w = gps.nbbm.length * 10;
 		m.setIcon(new AMap.Icon({
             size: new AMap.Size(w, 25),
-            image: iMap.createCarIcon(gps, w)
+            image: gb_map_imap.createCarIcon(gps, w)
         }));
  
 		if(m.infoWindow.getIsOpen())
 			openWindow(m);
 	}
  
-	//隐藏线路线条
+/*	//隐藏线路线条
 	function hideLinePolyline(){
 		if(!linePolyline || linePolyline.length == 0)
 			return;
@@ -199,9 +252,9 @@ var gb_map_gaode = (function() {
 		$.each(linePolyline, function(){
 			this.setOptions({strokeOpacity: 0});
 		});
-	}
+	}*/
  
-	//显示线路线条
+/*	//显示线路线条
 	function showLinePolyline(){
 		if(!linePolyline || linePolyline.length == 0)
 			return;
@@ -210,14 +263,16 @@ var gb_map_gaode = (function() {
 		$.each(linePolyline, function(){
 			this.setOptions({strokeOpacity: 0.5});
 		});
-	}
+	}*/
  
 	function openWindow(marker){
-		marker.gpsData.fromNow = moment(marker.gpsData.timestamp).fromNow();
-		/*var infoWindow = new AMap.InfoWindow({
-            content: template('gps_info_win_temp', marker.gpsData)
-        });*/
-		marker.infoWindow.setContent(template('gps_info_win_temp', marker.gpsData));
+		var gps = marker.gpsData;
+		//线路名
+		gps.lineName = gb_data_basic.lineCode2NameAll()[gps.lineId];
+		//时间
+		gps.dateStr = moment(gps.timestamp).format('YYYY-MM-DD HH:mm:ss');
+//{size: AMap.Size(290,255)}
+		marker.infoWindow.setContent(gb_map_overlay_mge.map_gps_win_temp(gps));
 		marker.infoWindow.open(map, marker.getPosition());
 	}
  
@@ -8,6 +8,9 @@ var gb_map_overlay_mge = (function () {
     });
  
     var gpsRefresh = function (addArr, upArr, upDownChange) {
+        //如果地图正在重绘，暂时不刷新GPS
+        if(reDrawing)
+            return;
         var all = addArr.concat(upArr).concat(upDownChange);
         gpsRefreshAll(all);
  
@@ -32,7 +35,7 @@ var gb_map_overlay_mge = (function () {
             //上行
             gb_map_imap.call('drawLine', {
                 route: route,
-                style: {strokeWeight:6, strokeColor: 'blue'},
+                style: {strokeWeight:6, strokeColor: gb_map_config.getConfig().section.color.up},
                 id: lineCode+'_0',
                 upDown: 0,
                 hide: true
@@ -40,7 +43,7 @@ var gb_map_overlay_mge = (function () {
             //下行
             gb_map_imap.call('drawLine', {
                 route: route,
-                style: {strokeWeight:6, strokeColor: 'red'},
+                style: {strokeWeight:6, strokeColor: gb_map_config.getConfig().section.color.down},
                 id: lineCode+'_1',
                 upDown: 1,
                 hide: true
@@ -59,7 +62,13 @@ var gb_map_overlay_mge = (function () {
         gb_map_imap.call('refreshPolyline', {idx: gb_common.get_keys(idx)});
     };
  
-    var init = function () {
+
+    //是否正在重绘
+    var reDrawing;
+    var reDraw = function () {
+        reDrawing = true;
+
+        gb_map_imap.call('clearAll');
  
         drawAllSection();
         //初始绘制
@@ -68,6 +77,12 @@ var gb_map_overlay_mge = (function () {
         showOverlayByChecks();
         //显示路段
         showSection(gb_map_gps_tree.getChecked().filter(deviceFilter));
+
+        reDrawing = false;
+    }
+
+    var init = function () {
+        reDraw();
         //注册GPS刷新事件
         gb_data_gps.registerCallback(gpsRefresh);
     };
@@ -97,6 +112,7 @@ var gb_map_overlay_mge = (function () {
         _focus: _focus,
         map_gps_win_temp: function (data) {
             return temps['map-win-gps-detail-temp'](data);
-        }
+        },
+        reDraw: reDraw
     };
 })();
 \ No newline at end of file
@@ -184,7 +184,7 @@ var gb_map_baidu = (function(){
 	};
  
 	var bd_gps_info_win_opts = {
-	  		width : 190,
+	  		width : 150,
 	  		height: 255,
 	  		enableMessage:true
 	};