时刻表更新

游瑞烽
1 parent 0a29b254
Showing 6 changed files with 74 additions and 48 deletions
src/main/resources/static/index.html
src/main/resources/static/pages/base/timesmodel/fragments/addbc.html
src/main/resources/static/pages/base/timesmodel/fragments/editbc.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
@@ -630,6 +630,8 @@
 <script
 		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
+<!-- echarts4 误删 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
 </body>
 </html>
 \ No newline at end of file
@@ -201,7 +201,7 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
 			// 'dir' : {required : true},
 			'fcsj' : {required : true},
 			'bcType' : {required : true},
-			'bcsj' : {number : true,required : true},
+			'bcsj' : {min : 1, digits : true, required : true},
 			'isfb' : {required : true}
 		},
 		invalidHandler : function(event, validator) {
@@ -224,50 +224,54 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
             var fcsj = Date.parse(DateTimeTool.getDateTime(params.fcsj));
             var ARRIVALTIME = fcsj + parseInt(params.bcsj)*60000 ;
-            for(var i=0; i<data.length-1; i++) {
-                if(data[i].value[0] == params.lpName) {
-                    if(data[i].value[7] < params.fcno) {
-                        prevBcObj = data[i];
-                        bcObj = $.extend(true, {}, bcObj, data[i]);
-                        index = i+1;
-                    } else {
-                        if(type) {
-                            type = false;
-                            nextBcObj = data[i];
+            if(params.bcsj > 0){
+                for(var i=0; i<data.length-1; i++) {
+                    if(data[i].value[0] == params.lpName) {
+                        if(data[i].value[7] < params.fcno) {
+                            prevBcObj = data[i];
+                            bcObj = $.extend(true, {}, bcObj, data[i]);
+                            index = i+1;
+                        } else {
+                            if(type) {
+                                type = false;
+                                nextBcObj = data[i];
+                            }
+                            data[i].value[7] += 1;
                         }
-                        data[i].value[7] += 1;
                     }
                 }
-            }
-            bcObj.value[1] = fcsj;
-            bcObj.value[2] = ARRIVALTIME;
-            bcObj.value[3] = params.bcsj*60000;
-            // bcObj.value[4] = lpNo;
-            bcObj.value[6] = params.bcType;
-            bcObj.value[7] = parseInt(params.fcno);
-            var dir = bcObj.value[8] == 1 ? 0:1;
-            bcObj.value[8] = dir;
-            bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
-            // 起终点互换
-            var station = bcObj.value[13];
-            bcObj.value[13] = bcObj.value[14];
-            bcObj.value[14] = station;
-            bcObj.value[16] = parseInt(params.isfb);
-            data.splice(index, 0 , bcObj);
+                bcObj.value[1] = fcsj;
+                bcObj.value[2] = ARRIVALTIME;
+                bcObj.value[3] = params.bcsj*60000;
+                // bcObj.value[4] = lpNo;
+                bcObj.value[6] = params.bcType;
+                bcObj.value[7] = parseInt(params.fcno);
+                var dir = bcObj.value[8] == 1 ? 0:1;
+                bcObj.value[8] = dir;
+                bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
+                // 起终点互换
+                var station = bcObj.value[13];
+                bcObj.value[13] = bcObj.value[14];
+                bcObj.value[14] = station;
+                bcObj.value[16] = parseInt(params.isfb);
+                data.splice(index, 0 , bcObj);
-            if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
-                layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
-                    btn : [ '添加','取消' ], icon: 3, title:'提示'
-                }, function(){
+                if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
+                    layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
+                        btn : [ '添加','取消' ], icon: 3, title:'提示'
+                    }, function(){
+                        echartsDrawGTT.init(data,false,true,false);
+                        echartsDrawGTT.refreshDrag();
+                        layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
+                    });
+                } else {
                     echartsDrawGTT.init(data,false,true,false);
                     echartsDrawGTT.refreshDrag();
-                    layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
-                });
+                    layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
+                }
             } else {
-                echartsDrawGTT.init(data,false,true,false);
-                echartsDrawGTT.refreshDrag();
-                layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
-            }
+                layer.msg('班次时间为0分钟，为无效班次添加失败！');
+			}
             $('#addBc_mobal').modal('hide');
         }
     });
@@ -162,7 +162,7 @@ $(&#39;#editBc_mobal&#39;).on(&#39;editBcMobal.show&#39;, function(e,index,echartsDrawGTT){
 			// 'dir' : {required : true},
 			'fcsj' : {required : true},
 			'bcType' : {required : true},
-			'bcsj' : {number : true,required : true},
+			'bcsj' : {min : 1, digits : true,required : true},
 			'isfb' : {required : true}
 		},
 		invalidHandler : function(event, validator) {
@@ -170,10 +170,10 @@
 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
 <script src="/pages/base/timesmodel/js/dateTimeTool.js"></script>
 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
-<!--<script src="/pages/base/timesmodel/js/v1/bcFun.js"></script>-->
-<!--<script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>-->
-<!--<script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>-->
-<!--<script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>-->
+<script src="/pages/base/timesmodel/js/v1/bcFun.js"></script>
+<script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>
+<script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>
+<script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>
 <script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
 <script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
@@ -186,7 +186,7 @@
                 return _rtnBcArray;
             };
-            Main_v2_2.exportExcelConfig(_dfun);
+            // Main_v2_2.exportExcelConfig(_dfun);
         }
         // 关闭弹出层
@@ -112,8 +112,8 @@ $(&#39;#bcAdjustListSubmit&#39;).on(&#39;click&#39;,function() {
 /* 右击菜单事件
 * 1.修改      update
 * 2.删除      delete
-* 3.设为上行  setUp
-* 4.设为下行  setDown
+* 3.班次切换上下行  dropdownMenuSwitchUpDown
+* 4.路牌切换上下行  dropdownMenuLpSwitchUpDown
 * 5.设为正常  setNormal
 * 6.设为区间  setRegion
 * 7.设为分班  setFb
@@ -145,12 +145,16 @@ function dropdownMenuDelete(dataIndex) {
             // 关闭弹出层.
             layer.closeAll();
             data.splice(dataIndex,1);
+            $.each(data, function () {
+                if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
+                    this.value[7] -= 1;
+            });
             echartsDrawGTT.init(data,false,true,false);
             layer.msg('删除成功！');
         });
     }
 }
-// 切换上下行
+// 班次切换上下行
 function dropdownMenuSwitchUpDown(dataIndex) {
     // 获取当前操作步数
     var _keyIndex = echartsDrawGTT.get_keyIndex(),
@@ -176,8 +180,17 @@ function dropdownMenuSwitchUpDown(dataIndex) {
             data[dataIndex].value[3] = parseInt(dataMap.map.downInTimer)*60000;
         data[dataIndex].value[2] = data[dataIndex].value[1] + data[dataIndex].value[3];
     }
+    if(data[dataIndex].value[3] <= 0){
+        var bc = data[dataIndex];
+        data.splice(dataIndex,1);
+        $.each(data, function () {
+            if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
+                this.value[7] -= 1;
+        });
+        layer.msg('班次切换上下行成功，切换后班次运送时间为0分钟，无意义所以删除改班次！',{time: 8000});
+    } else
+        layer.msg('班次切换上下行成功！');
     echartsDrawGTT.init(data,false,true,false);
-    layer.msg('设置为上行成功！');
 }
 // 路牌切换上下行
 function dropdownMenuLpSwitchUpDown(dataIndex) {
@@ -206,6 +219,13 @@ function dropdownMenuLpSwitchUpDown(dataIndex) {
                     data[i].value[3] = parseInt(dataMap.map.downInTimer)*60000;
                 data[i].value[2] = data[i].value[1] + data[i].value[3];
             }
+            if(data[i].value[3] <= 0){
+                data.splice(i,1);
+                $.each(data, function () {
+                    if(data[i].value[0] == this.value[0] && data[i].value[7] < this.value[7])
+                        this.value[7] -= 1;
+                });
+            }
         }
     }
     echartsDrawGTT.init(data,false,true,false);