Merge branch 'minhang' into pudong

潘钊
2 parents 2393a013 b2e023d3
Showing 13 changed files with 294 additions and 215 deletions
src/main/java/com/bsth/controller/realcontrol/anomalyCheckController.java
src/main/java/com/bsth/entity/mcy_forms/Shiftuehiclemanth.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/package.json
src/main/resources/fatso/start.js
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_tzrc.html
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/main.html
src/main/resources/static/real_control_v2/mapmonitor/real.html
-package com.bsth.controller.realcontrol;
-
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * 相关数据异常检测
- * Created by panzhao on 2017/4/14.
- */
-@RestController
-@RequestMapping("anomalyCheck")
-public class anomalyCheckController {
-
-
-    Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    @Autowired
-    DayOfSchedule dayOfSchedule;
-    /**
-     * 出现重复班次的车辆
-     * @param nbbm
-     */
-    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
-    public void schRepeat(@RequestParam String nbbm){
-        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
-        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
-
-        Set<ScheduleRealInfo> set = new HashSet<>();
-        for(ScheduleRealInfo sch : list){
-            if(!set.add(sch)){
-                logger.info("出现一次重复班次，班次ID：" + sch.getId());
-            }
-        }
-
-        if(set.size() > 0){
-            dayOfSchedule.replaceByNbbm(nbbm, set);
-        }
-    }
-}
+package com.bsth.controller.realcontrol;
+
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 相关数据异常检测
+ * Created by panzhao on 2017/4/14.
+ */
+@RestController
+@RequestMapping("anomalyCheck")
+public class anomalyCheckController {
+
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+    /**
+     * 出现重复班次的车辆
+     * @param nbbm
+     */
+    @RequestMapping(value = "/schRepeat", method = RequestMethod.POST)
+    public void schRepeat(@RequestParam String nbbm){
+        logger.info("前端通知，车辆 " + nbbm + "出现重复班次，开始检测...");
+        List<ScheduleRealInfo> list = dayOfSchedule.findByNbbm(nbbm);
+
+        Set<ScheduleRealInfo> set = new HashSet<>();
+        for(ScheduleRealInfo sch : list){
+            if(!set.add(sch)){
+                logger.info("出现一次重复班次，班次ID：" + sch.getId());
+            }
+        }
+
+        if(set.size() > 0){
+            dayOfSchedule.replaceByNbbm(nbbm, set);
+        }
+    }
+}
@@ -22,6 +22,17 @@ public class Shiftuehiclemanth {
 	private String jgh;
 	private String zbh;
+	public String getSgh() {
+		return sgh;
+	}
+
+	public void setSgh(String sgh) {
+		this.sgh = sgh;
+	}
+
+	private String sgh;
+	
+	
 	public String getJgh() {
 		return jgh;
 	}
@@ -156,7 +156,10 @@ public class FormsServiceImpl implements FormsService {
 		if(map.containsKey("fgsdmManth")){
 			fgsdmManth=map.get("fgsdmManth").toString();
 		}
-		String sql = "select r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name " 
+		String sql = "select"
+				+ " r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name "
+//				+ "r.gs_bm,r.gs_name,"
+//				+ " r.fgs_bm,r.fgs_name,r.bc_type,r.lp_name " 
 		        + " from bsth_c_s_sp_info_real r "
 		    	+ " where 1=1  ";
 		if(map.get("startDate")!=null&&!map.get("startDate").equals("")){
@@ -169,19 +172,23 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("line")!=null&&!map.get("line").equals("")){
 			sql+=" and r.xl_bm='"+ map.get("line").toString() + "' ";
 		}
-			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
-		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
-			sql+=" and r.gs_bm='"+map.get("gsdmManth").toString()+"' ";
-		}
+//			sql+= " AND r.gs_bm is not null and r.bc_type not in('in','out')";
+//		if(map.get("gsdmManth")!=null&&!map.get("gsdmManth").equals("")){
+			sql+=" and r.gs_bm like'%"+gsdmManth+"%' ";
+//		}
 		if(map.get("fgsdmManth")!=null&&!map.get("fgsdmManth").equals("")){
-			sql+=" and r.fgs_bm='"+map.get("fgsdmManth").toString()+"' ";
+			sql+=" and r.fgs_bm like'%"+fgsdmManth+"%' ";
 		}	
 		if(empnames.equals("售票员")){
 			sql+="and r.s_name is not null AND r.s_name !=''";
 		}
-			sql	+= " GROUP BY r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,r.fgs_bm,r.fgs_name,r.bc_type ";
+			sql	+= " GROUP BY "
+					+ "r.j_name, r.cl_zbh,r.j_gh,r.s_gh,r.s_name ";
+//					+ ",r.gs_bm,r.gs_name,"
+//					+ "r.fgs_bm,r.fgs_name,r.bc_type ";
-	
+//			r.j_name,r.cl_zbh,r.j_gh,r.gs_bm,r.gs_name,"
+//					+ " r.fgs_bm,r.fgs_name,r.bc_type,r.s_name,r.lp_name
 		List<Shiftuehiclemanth> list = jdbcTemplate.query(sql, new RowMapper<Shiftuehiclemanth>() {
 			@Override
@@ -191,12 +198,13 @@ public class FormsServiceImpl implements FormsService {
 					shif.setjName(arg0.getString("j_name"));
 				}else if(empnames.equals("售票员")){
 					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name"));
+			        shif.setSgh(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				}else if(empnames.equals("车辆自编号")){
 					shif.setjName(arg0.getString("cl_zbh"));
 				}
-				
 				shif.setJgh(arg0.getString("j_gh"));
 		        shif.setZbh(arg0.getString("cl_zbh"));
+//		        shif.setjName(arg0.getString("s_gh")==null ? "":arg0.getString("s_gh"));
 				return shif;
 			}
 		});
@@ -208,9 +216,26 @@ public class FormsServiceImpl implements FormsService {
 			Shiftuehiclemanth d=list.get(i);
 			for (int j = 0; j < lists.size(); j++) {
 				ScheduleRealInfo s=lists.get(j);
-				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
-					sList.add(s);
+//				if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+//					sList.add(s);
+//				}
+				
+				if(empnames.equals("驾驶员")){
+					if(d.getJgh().equals(s.getjGh()) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("售票员")){
+//					shif.setjName(arg0.getString("s_name")==null ? "":arg0.getString("s_name")); 
+					String sgh=s.getsGh()==null?"":s.getsGh();
+					if(d.getSgh().equals(sgh) && d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
+				}else if(empnames.equals("车辆自编号")){
+					if(d.getZbh().equals(s.getClZbh())){
+						sList.add(s);
+					}
 				}
+				
 			}
 			double ksgl=culateMileageService.culateKsgl(sList);
@@ -258,13 +283,16 @@ public class FormsServiceImpl implements FormsService {
 		if(map.get("fgsdmShif")!=null&&!map.get("fgsdmShif").equals("")){
 			fgsdmShif =map.get("fgsdmShif").toString();
 		}
-		String sql ="select t.* from (select r.schedule_date,r.j_name,IFNULL(r.s_name,'')as s_name,"
-				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name FROM bsth_c_s_sp_info_real r  where 1=1  "
+		String sql ="select t.* from (select r.schedule_date,r.j_name,"
+				+ "IFNULL(r.s_name,'')as s_name,"
+				+ " r.cl_zbh,r.xl_bm, r.j_gh,r.gs_bm,r.fgs_bm,r.lp_name "
+				+ "FROM bsth_c_s_sp_info_real r  where 1=1  "
 				+ " and to_days(r.schedule_date)=to_days('"+date + "')  "
 				+ " and r.xl_bm like '%"+line+"%' "
 				+ " and r.gs_bm  like '%"+gsdmShif+"%' "
 				+ " and r.fgs_bm  like '%"+fgsdmShif+"%' ) t"
-				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm  ";
+				+ " GROUP BY t.schedule_date,t.j_name,t.s_name, "
+				+ "t.cl_zbh,t.xl_bm,t.j_gh,t.gs_bm,t.fgs_bm,t.lp_name  ";
 		List<Shifday> list = jdbcTemplate.query(sql, new RowMapper<Shifday>() {
@@ -806,7 +834,7 @@ public class FormsServiceImpl implements FormsService {
 				+ " and  y.ssgsdm like '%"+gsbm+"%' "
 				+ " and y.fgsdm like '%"+fgsbm+"%'"
 				+ " ) x"
-				+ " on t.cl_zbh = x.nbbm ";
+				+ " on t.cl_zbh = x.nbbm and t.j_gh=x.jsy";
 		List<Daily> list = jdbcTemplate.query(sql, new RowMapper<Daily>() {
 			@Override
@@ -400,25 +400,33 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         Map<String, Object> rs = new HashMap<>();
         rs.put("status", ResponseCode.ERROR);
-        ScheduleRealInfo sch = dayOfSchedule.get(id);
-        if (sch == null) {
-            rs.put("msg", "无效的id号");
-            return rs;
-        }
+        try {
+            ScheduleRealInfo sch = dayOfSchedule.get(id);
+            if (sch == null) {
+                rs.put("msg", "无效的id号");
+                return rs;
+            }
-        if (!sch.isSflj()) {
-            rs.put("msg", "你只能删除临加班次");
-            return rs;
-        }
+            if (!sch.isSflj()) {
+                rs.put("msg", "你只能删除临加班次");
+                return rs;
+            }
-        //数据库删除
-        rs = super.delete(id);
-        if(rs.get("status").equals(ResponseCode.SUCCESS)){
-            dayOfSchedule.delete(sch);
-            //更新起点应到时间
-            List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
-            rs.put("ts", ts);
-            rs.put("delete", sch);
+            //解除和调度指令的外键约束
+            jdbcTemplate.update("update bsth_v_directive_60 set sch=NULL where sch=" + id);
+
+            //数据库删除
+            rs = super.delete(id);
+            if(rs.get("status").equals(ResponseCode.SUCCESS)){
+                dayOfSchedule.delete(sch);
+                //更新起点应到时间
+                List<ScheduleRealInfo> ts = dayOfSchedule.updateQdzTimePlan(sch.getClZbh());
+                rs.put("ts", ts);
+                rs.put("delete", sch);
+            }
+        }catch (Exception e){
+            logger.error("", e);
+            rs.put("msg", e.getMessage());
         }
         return rs;
@@ -1400,14 +1408,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     	double ljgl=culateService.culateLjgl(lists);
     	 map.put("jhlc", culateService.culateJhgl(list)); //计划里程
-         map.put("remMileage", culateService.culateLbgl(lists)); //烂班公里
+         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
          map.put("addMileage", ljgl); //临加公里
          map.put("yygl",Arith.add(sjgl,ljgl)); //实际公里
          map.put("ksgl", ksgl);//空驶公里
          map.put("realMileage",Arith.add(Arith.add(ksgl,jccgl ),Arith.add(sjgl,ljgl)));
 //         map.put("realMileage", format.format(yygl + ksgl + jcclc+addMileage));
          map.put("jhbc", culateService.culateJhbc(list,""));
-         map.put("cjbc", culateService.culateLbbc(lists));
+         map.put("cjbc", culateService.culateLbbc(list));
          map.put("ljbc", culateService.culateLjbc(lists,""));
          map.put("sjbc", culateService.culateJhbc(lists,"") -  culateService.culateLbbc(lists) + culateService.culateLjbc(lists,""));
          map.put("jcclc", jccgl);
@@ -2,35 +2,50 @@
  * 处理线调文件
  */
 var fs = require('fs')
-    ,cheerio = require('cheerio')
-    ,minifier = require('./minifier')
-    ,crypto = require("crypto")
-    ,CleanCSS = require('clean-css')
-    ,UglifyJS = require("uglify-js");;
+    , cheerio = require('cheerio')
+    , minifier = require('./minifier')
+    , crypto = require("crypto")
+    , CleanCSS = require('clean-css')
+    , UglifyJS = require("uglify-js");
+;
 //不参与的目录
 var pName = 'bsth_control'
-    ,path = process.cwd()
+    , path = process.cwd()
     //根目录
-    ,root = path.substr(0, path.indexOf('\\src\\main'))
-    ,workspace = root.substr(0, root.indexOf('\\' + pName))
+    , root = path.substr(0, path.indexOf('\\src\\main'))
+    , workspace = root.substr(0, root.indexOf('\\' + pName))
     //临时目录
-    ,dest = (workspace + '\\' + pName+'@fatso_copy').replace(/\//g,'\\')
-    ,_static = '\\src\\main\\resources\\static';
+    , dest = (workspace + '\\' + pName + '@fatso_copy').replace(/\//g, '\\')
+    , _static = '\\src\\main\\resources\\static';
 var mainFile = dest + _static + '\\real_control_v2\\main.html';
+var mapFile = dest + _static + '\\real_control_v2\\mapmonitor\\real.html';
 var realCtl = {
     /**
      * 处理线调首页
      */
-    handleMain: function(cb){
+    handleMain: function (cb) {
         //读取文件
         var data = fs.readFileSync(mainFile, 'utf-8')
-            ,$ = cheerio.load(data);
+            , $ = cheerio.load(data);
         handleCss($, function () {
-            handleJs($, cb);
+            handleJs($, mainFile, cb);
+        });
+    },
+    /**
+     * 处理地图模块
+     * @param cb
+     */
+    handleMap: function (cb) {
+        //读取文件
+        var data = fs.readFileSync(mapFile, 'utf-8')
+            , $ = cheerio.load(data);
+
+        handleCss($, function () {
+            handleJs($, mapFile, cb);
         });
     }
 };
@@ -43,23 +58,23 @@ var handleCss = function ($, cb) {
     var cssArray = $('link[rel=stylesheet][merge]');
     //按 merge 值分组
     var cssMap = {}, mergeName;
-    for(var i = 0, c; c = cssArray[i++];){
+    for (var i = 0, c; c = cssArray[i++];) {
         mergeName = $(c).attr('merge');
-        if(!cssMap[mergeName])
+        if (!cssMap[mergeName])
             cssMap[mergeName] = [];
         cssMap[mergeName].push(dest + _static + $(c).attr('href'));
         //remove
         $(c).remove();
     }
     //按 merge 合并压缩css
-    var ks = get_keys(cssMap), index=0;
+    var ks = get_keys(cssMap), index = 0;
     (function () {
-        if(index >= ks.length){
+        if (index >= ks.length) {
             cb && cb();
             return;
         }
         var k = ks[index];
-        index ++;
+        index++;
         var f = arguments.callee;
         //合并css
         new CleanCSS().minify(cssMap[k], function (error, out) {
@@ -67,10 +82,16 @@ var handleCss = function ($, cb) {
             var fName = (k + '_' + md5(data)) + '.css';
             //写入 assets css 目录下
             var descFile = dest + _static + '\\real_control_v2\\assets\\css\\' + fName;
-            fs.open(descFile, 'a',  function(err, fd){
+            fs.open(descFile, 'a', function (err, fd) {
-                fs.write(fd, data, function(){
-                    $('head').append('<link rel="stylesheet" href="/real_control_v2/assets/css/'+fName+'"/>');
+                fs.write(fd, data, function () {
+                    var tag = '<link rel="stylesheet" href="/real_control_v2/assets/css/' + fName + '"/>';
+                    if ($('head').length > 0)
+                        $('head').append(tag);
+                    else {
+                        //没有head 就将css写在头部
+                        $('div').first().before(tag);
+                    }
                     console.log(k + ' css', '结束，下一个');
                     f();
                 });
@@ -82,13 +103,13 @@ var handleCss = function ($, cb) {
 /**
  * 处理js
  */
-var handleJs = function ($, cb) {
+var handleJs = function ($, file, cb) {
     var scriptArray = $('script[merge]');
     //按 merge 值分组
     var jsMap = {}, mergeName;
-    for(var i = 0, s; s = scriptArray[i++];){
+    for (var i = 0, s; s = scriptArray[i++];) {
         mergeName = $(s).attr('merge');
-        if(!jsMap[mergeName])
+        if (!jsMap[mergeName])
             jsMap[mergeName] = [];
         jsMap[mergeName].push(dest + _static + $(s).attr('src'));
         //remove
@@ -96,16 +117,16 @@ var handleJs = function ($, cb) {
     }
     //按 merge 合并压缩js
-    var ks = get_keys(jsMap), index=0;
+    var ks = get_keys(jsMap), index = 0;
     (function () {
-        if(index >= ks.length){
-            write(mainFile, $.html());
-            console.log('线调处理结束'.green);
+        if (index >= ks.length) {
+            write(file, $.html());
+            console.log(file + ' 结束'.green);
             cb && cb();
             return;
         }
         var k = ks[index];
-        index ++;
+        index++;
         var f = arguments.callee;
         //合并压缩js
         var result = UglifyJS.minify(jsMap[k]);
@@ -113,10 +134,16 @@ var handleJs = function ($, cb) {
         var fName = (k + '_' + md5(data)) + '.js';
         //写入 assets js 目录下
         var descFile = dest + _static + '\\real_control_v2\\assets\\js\\' + fName;
-        fs.open(descFile, 'a',  function(err, fd){
+        fs.open(descFile, 'a', function (err, fd) {
-            fs.write(fd, data, function(){
-                $('body').append('<script src="/real_control_v2/assets/js/'+fName+'"></script>');
+            fs.write(fd, data, function () {
+                var tag = '<script src="/real_control_v2/assets/js/' + fName + '"></script>';
+                if ($('body').length > 0)
+                    $('body').append(tag);
+                else {
+                    //没有body 就写在尾部
+                    $('*').last().after(tag);
+                }
                 console.log(k + ' js', '结束，下一个');
                 f();
             });
@@ -132,13 +159,13 @@ var get_keys = function (json) {
     return array;
 };
-function md5(text){
+function md5(text) {
     return crypto.createHash("md5").update(text).digest("hex");
 }
-function write(file, text){
+function write(file, text) {
     fs.writeFile(file, text, function (err) {
-        if (err){
+        if (err) {
             console.log(err.toString().red);
             process.exit();
         }
@@ -146,5 +173,4 @@ function write(file, text){
     });
 }
-
 module.exports = realCtl;
 \ No newline at end of file
-{
-  "name": "fatso",
-  "version": "1.0.0",
-  "description": "子页面js检查、合并、压缩等处理",
-  "main": "start.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "panzhaov5",
-  "license": "ISC",
-  "dependencies": {
-    "cheerio": "^0.20.0",
-    "clean-css": "^4.0.12",
-    "colors": "^1.1.2",
-    "eventproxy": "^0.3.4",
-    "uglify-js": "^2.6.2"
-  }
-}
+{
+  "name": "fatso",
+  "version": "1.0.0",
+  "description": "子页面js检查、合并、压缩等处理",
+  "main": "start.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "panzhaov5",
+  "license": "ISC",
+  "dependencies": {
+    "cheerio": "^0.20.0",
+    "clean-css": "^4.0.12",
+    "colors": "^1.1.2",
+    "eventproxy": "^0.3.4",
+    "uglify-js": "^2.6.2"
+  }
+}
@@ -83,9 +83,12 @@ ep.tail(&#39;minifier-js&#39;, function(){
 			ep.emit('handle-fragment', item);
 		},
 		function(){
-			//处理线调
+			//处理线调首页
 			handle_real_ctl.handleMain(function () {
-				ep.emit('package-jar');
+				//处理线调地图
+				handle_real_ctl.handleMap(function () {
+					ep.emit('package-jar');
+				});
 			});
 		});
 	});
@@ -239,5 +239,4 @@
 			<td colspan="10"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
-</script>
 </script>
 \ No newline at end of file
@@ -295,7 +295,7 @@
                 var sch = getActiveSch();
                 if (!sch || !sch.sflj)
                     return notify_err('只能删除临加班次！');
-                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3>';
+                var str = '<h3>确定要删除临加班次<span style="color:red;margin: 0 5px;">' + sch.clZbh + '( ' + sch.dfsj + ' )</span>?</h3><h5 style="color: #6c6c6c;font-size: 12px;">如果删除失败，可能正处于调度指令下行上达瞬间，等几秒再删即可。班次删除后，调度指令会保留</h5>';
                 alt_confirm(str, function () {
                     gb_common.$del('/realSchedule/' + sch.id, function (rs) {
                         //前端数据更新
-<div class="uk-modal ct_move_modal" id="schedule-multi-tzrc-modal">
+<div class="uk-modal" id="schedule-multi-tzrc-modal">
     <div class="drag-container"></div>
     <div class="uk-modal-dialog" style="width: 860px;">
         <a href="" class="uk-modal-close uk-close"></a>
@@ -16,18 +16,22 @@ var gb_schedule_table = (function () {
      * @param list
      */
     var isRepeatData = function (list) {
-        var map = {}, reps = [];
-        for(var i = 0,sch;sch=list[i++];){
-            if(map[sch.id]){
-                reps.push(sch.clZbh);
+        try {
+            var map = {}, reps = [];
+            for(var i = 0,sch;sch=list[i++];){
+                if(map[sch.id]){
+                    reps.push(sch.clZbh);
+                }
+                map[sch.id] = sch;
             }
-            map[sch.id] = sch;
-        }
-        //通知服务端数据有异常
-        $.each(reps, function () {
-            $.post('/anomalyCheck/schRepeat', {nbbm: this});
-        });
+            //通知服务端数据有异常
+            $.each(reps, function () {
+                $.post('/anomalyCheck/schRepeat', {nbbm: this});
+            });
+        }catch (e){
+            return list;
+        }
         return gb_common.get_vals(map);
     };
@@ -38,12 +42,12 @@ var gb_schedule_table = (function () {
             lines: gb_data_basic.line_idx
         }, function (rs) {
             for (var lineCode in rs) {
-                //排序
-                rs[lineCode].sort(schedule_sort);
                 line2Schedule[lineCode] = {};
                 //------是否有重复班次 #临时代码，为服务端提供诊断信息已解决这个问题
-                rs[lineCode] = isRepeatData(line2Schedule[lineCode]);
+                rs[lineCode] = isRepeatData(rs[lineCode]);
+                //排序
+                rs[lineCode].sort(schedule_sort);
                 //calc shift
                 $.each(rs[lineCode], function () {
                     calc_sch_real_shift(this);
@@ -178,26 +182,26 @@ var gb_schedule_table = (function () {
         //重新渲染表格
         reRenderTable(sch.xlBm);
         /*//重新渲染表格
-        var data = gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort),
-            dirData = gb_common.groupBy(data, 'xlDir'),
-            tabCont = $('li.line_schedule[data-id=' + sch.xlBm + ']');
-
-        for (var upDown in dirData) {
-            htmlStr = temps['line-schedule-table-temp']({
-                dir: upDown,
-                line: gb_data_basic.codeToLine[sch.xlBm],
-                list: dirData[upDown]
-            });
-            $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
-        }
-        //图例相关
-        gb_sch_legend.init(tabCont);
-        //标记末班
-        markerLastByLine(sch.xlBm);
-        //计算应发未发
-        calc_yfwf_num(sch.xlBm);
-        //重新固定表头
-        gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));*/
+         var data = gb_common.get_vals(line2Schedule[sch.xlBm]).sort(schedule_sort),
+         dirData = gb_common.groupBy(data, 'xlDir'),
+         tabCont = $('li.line_schedule[data-id=' + sch.xlBm + ']');
+
+         for (var upDown in dirData) {
+         htmlStr = temps['line-schedule-table-temp']({
+         dir: upDown,
+         line: gb_data_basic.codeToLine[sch.xlBm],
+         list: dirData[upDown]
+         });
+         $('.schedule-wrap .card-panel:eq(' + upDown + ')', tabCont).html(htmlStr);
+         }
+         //图例相关
+         gb_sch_legend.init(tabCont);
+         //标记末班
+         markerLastByLine(sch.xlBm);
+         //计算应发未发
+         calc_yfwf_num(sch.xlBm);
+         //重新固定表头
+         gb_ct_table.fixedHead($('.line_schedule .ct_table_wrap'));*/
         //定位到新添加的班次
         scroToDl(sch);
     };
@@ -542,7 +546,7 @@ var gb_schedule_table = (function () {
             }
         }
     };
-    
+
     /** 添加备注信息 */
     var addRemarks = function (list, remarks) {
         //if(!list || list)
@@ -5,16 +5,16 @@
     <meta charset="UTF-8">
     <title>线路调度 v2.0</title>
     <!-- uikit  core style-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="uikit"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/css/uikit.gradient.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/notify.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/tooltip.gradient.min.css" merge="plugins"/>
     <link rel="stylesheet"
-          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="uikit"/>
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="uikit"/>
+          href="/real_control_v2/assets/plugins/uikit-2.27.1/components/autocomplete.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/accordion.gradient.min.css" merge="plugins"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/slidenav.gradient.min.css" merge="plugins"/>
     <!-- main style -->
-    <link rel="stylesheet" href="/real_control_v2/css/main.css" merge="custom_style"/>
+    <link rel="stylesheet" href="/real_control_v2/css/main.css" />
     <!-- north style -->
     <link rel="stylesheet" href="/real_control_v2/css/north.css" merge="custom_style"/>
     <!-- home style -->
@@ -25,14 +25,14 @@
     <!-- custom table -->
     <link rel="stylesheet" href="/real_control_v2/css/ct_table.css" merge="custom_style"/>
     <!-- jquery contextMenu style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css" />
+    <link rel="stylesheet" href="/real_control_v2/assets/css/jquery.contextMenu.min.css"  merge="plugins"/>
     <!-- formvalidation style -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/formvalidation/formValidation.min.css"  merge="plugins"/>
     <!-- js tree -->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/jstree/default/style.min.css"  merge="plugins"/>
     <!-- tooltip css-->
-    <link rel="stylesheet" href="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.css"/>
-    <link rel="stylesheet" href="/real_control_v2/css/pace.css" merge="custom_style"/>
+    <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"/>
 </head>
@@ -93,8 +93,8 @@
 <!-- 地图相关 -->
 <script src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
 <script src="http://api.map.baidu.com/library/TrafficControl/1.4/src/TrafficControl_min.js"></script>
-<script src="/assets/js/baidu//MarkerClusterer.js"></script>
-<script src="/assets/js/TransGPS.js"></script>
+<script src="/assets/js/baidu//MarkerClusterer.js" merge="plugins"></script>
+<script src="/assets/js/TransGPS.js" merge="plugins"></script>
 <!-- 高德  -->
 <script src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"></script>
 <!-- jquery -->
@@ -108,7 +108,7 @@
 <!-- common js -->
 <script src="/real_control_v2/js/common.js"></script>
 <!-- art-template 模版引擎 -->
-<script src="/assets/plugins/template.js"></script>
+<script src="/assets/plugins/template.js" merge="plugins"></script>
 <!-- d3 -->
 <script src="/assets/js/d3.min.js"></script>
 <!-- EventProxy  -->
@@ -135,7 +135,7 @@
 <!-- js tree -->
 <script src="/real_control_v2/assets/plugins/jstree/jstree.min.js"  merge="plugins"></script>
 <!-- simple pinyin -->
-<script src="/assets/plugins/pinyin.js"></script>
+<script src="/assets/plugins/pinyin.js" merge="plugins"></script>
 <!-- qtip -->
 <script src="/real_control_v2/assets/plugins/qtip/jquery.qtip.min.js" merge="plugins"></script>
@@ -175,9 +175,9 @@
 <script src="/real_control_v2/js/utils/tts.js" merge="custom_js"></script>
 <!-- echart -->
-<script src="/real_control_v2/assets/echarts-3/echarts.js"></script>
+<script src="/real_control_v2/assets/echarts-3/echarts.js" merge="plugins"></script>
 <!-- Geolib -->
-<script src="/real_control_v2/geolib/geolib.js"></script>
+<script src="/real_control_v2/geolib/geolib.js" merge="plugins"></script>
 <script src="/real_control_v2/js/signal_state/signal_state.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/utils/dispatch_pattern.js" merge="custom_js"></script>
-<link href="/assets/css/TrafficControl.css" rel="stylesheet"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css"/>
+<link href="/assets/css/TrafficControl.css" rel="stylesheet" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/jquery.ui/themes/base/all.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/spectrum/spectrum.css" merge="map_plugins"/>
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/form-advanced.gradient.min.css" merge="map_plugins"/>
 <link rel="stylesheet" href="/real_control_v2/mapmonitor/css/real.css"/>
-<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css">
+<link rel="stylesheet" href="/real_control_v2/assets/plugins/uikit-2.27.1/components/progress.gradient.min.css" merge="map_plugins">
 <div class="map-system-msg flex-left">
     <a class="z-depth-2" href="/pages/mapmonitor/alone/wrap.html" target="_blank"></a>
@@ -50,21 +50,21 @@
     </div>
 </div>
-<script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
-<script src="/real_control_v2/mapmonitor/js/config.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/real.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="custom_map_js"></script>
-<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="custom_map_js"></script>
+<script src="/real_control_v2/assets/js/GeoUtils_min.js" merge="map_plugins"></script>
+<script src="/real_control_v2/mapmonitor/js/config.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/gps_tree.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/spatial_data.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map_overlay_manager.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/real.js" ></script>
+<script src="/real_control_v2/mapmonitor/js/map/iMap.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/baidu.js" merge="map_custom_js"></script>
+<script src="/real_control_v2/mapmonitor/js/map/platform/gaode.js" merge="map_custom_js"></script>
 <!-- jquery ui -->
-<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"></script>
-<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/core.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/widget.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/mouse.js"  merge="map_plugins"></script>
+<script src="/real_control_v2/assets/plugins/jquery.ui/resizable.js"  merge="map_plugins"></script>
 <!-- 颜色选择器 -->
-<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"></script>
+<script src="/real_control_v2/assets/plugins/spectrum/spectrum.js"  merge="map_plugins"></script>
 <!-- play back -->
-<script src="/real_control_v2/mapmonitor/js/playback.js" merge="custom_map_js"></script>
 \ No newline at end of file
+<script src="/real_control_v2/mapmonitor/js/playback.js" merge="map_custom_js"></script>
 \ No newline at end of file