update...

潘钊
1 parent d4c7e947
Showing 2 changed files with 45 additions and 41 deletions
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/main.html
@@ -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 -->