时刻表加入看实际排班

ljq
1 parent 22320eab
Showing 4 changed files with 211 additions and 65 deletions
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/echartsDrawGanTT.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
@@ -49,18 +49,22 @@
                 </div>
 				<!-- actions 组件START -->
 				<div class="actions">
-                    <div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
-                        <a class="btn btn-circle blue jhpbonsjpb" href="javascript:;" data-pjax><i class="fa fa-database"></i> 计划排班与实际班次</a>
+                    <div class="btn-group btn-group-devided " data-toggle="buttons">
+                        <a class="btn btn-circle blue parambtns" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 只看实际</a>
                     </div>
+               <!--     <div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
+                        <a class="btn btn-circle blue jhpbonsjpb" href="javascript:;" data-pjax><i class="fa fa-database"></i> 计划排班与实际班次</a>
+                    </div>-->
 					<div class="btn-group btn-group-devided countbtn" data-toggle="buttons">
 						<a class="btn btn-circle blue countAdd" href="javascript:;" data-pjax><i class="fa fa-database"></i> 排班统计</a>
 					</div>
                     <div class="btn-group btn-group-devided parambtn" data-toggle="buttons">
                         <a class="btn btn-circle blue paramAdd" href="javascript:;" data-pjax><i class="fa fa-list-ol" aria-hidden="true"></i> 重新生成</a>
                     </div>
-					<!--<div class="btn-group btn-group-devided checkbtn" data-toggle="buttons">-->
-						<!--<a class="btn btn-circle blue checkAdd" href="javascript:;" data-pjax><i class="fa fa-check"></i> 保存数据</a>-->
-					<!--</div>-->
+
+					<!--<div class="btn-group btn-group-devided checkbtn" data-toggle="buttons">
+						<a class="btn btn-circle blue checkAdd" href="javascript:;" data-pjax><i class="fa fa-check"></i> 保存数据</a>
+					</div>-->
                     <div class="btn-group exportbtn">
                         <a href="javascript:" class="btn red btn-outline btn-circle exportAdd" data-toggle="dropdown">
@@ -41,8 +41,8 @@ var echartsDrawGTT = function () {
     // 单个班次高度
     var height;
     // 坐标轴位置
-    var baseTop = 70;
-    var gridHeight = 60;
+    var baseTop = 50;
+    var gridHeight = 70;
     $("#bcContainer").bind("contextmenu", function(){
         return false;
@@ -111,9 +111,11 @@ var echartsDrawGTT = function () {
                         bcObj.qs,
                         //bcObj.isSwitchXl,
                         //bcObj.bz,
-                        bcObj.isjh ? 0:1,
-                        bcObj.fcsj,
-                        bcObj.ARRIVALTIME,
+                        bcObj.qs,
+                        bcObj.ttinfo,
+                        bcObj.qs,
+                        bcObj.fcsj_1,//开始时间//21 和 1对应
+                        bcObj.ARRIVALTIME_1,//结束时间
                     ],
                     itemStyle: {
                         normal: {
@@ -208,9 +210,8 @@ var echartsDrawGTT = function () {
                         +'<br>发车时间：' + getHoursAndMinutes(params.value[1])
                         +'<br>到站时间：' + getHoursAndMinutes(params.value[2])
                         +'<br>行驶时间：' + params.value[3]/60000 +'分钟'
-                        +'<br>停休时间：' + params.value[15] +'分钟'
+                     /*   +'<br>停休时间：' + params.value[15] +'分钟'*/
                         +'<br>班次类型：' + bcTypeStr
-                        +'<br>班次情况：' +(params.value[18] == 0 ? '调度': '计划');
                     return str;
                 },
             },
@@ -306,36 +307,49 @@ var echartsDrawGTT = function () {
                             lastStr = '',// 班次历时
                             stayStr = '',// 停站时间
                             timeStr = '',
+                            timeStr_1 = null,
                             bcTypeStr = '';
-                        if(type=='bd' || type=='lc' || type=='out' || type=='in')
-                            timeStr = getHoursAndMinutes(params.data.value[1]);
-                        else
-                            timeStr = getHoursAndMinutes(params.data.value[1])+'~'+getHoursAndMinutes(params.data.value[2]);
+                        if (type == 'bd' || type == 'lc' || type == 'out' || type == 'in') {
+                            debugger
+                            timeStr = getHoursAndMinutes(params.data.value[1]);
+                            timeStr_1 = params.data.value[21] !== undefined ? params.data.value[21] : null;
+                        } else {
+                            timeStr = getHoursAndMinutes(params.data.value[1]) + '~' + getHoursAndMinutes(params.data.value[2]);
+                            var t1 = params.data.value[21] !== undefined ? params.data.value[21] : null;
+                            var t2 = params.data.value[22] !== undefined ? params.data.value[22] : null;
+                            if (t1 != null && t2 != null)
+                                timeStr_1 = t1 + '~' + t2;
+                        }
                         var last = params.data.value[3] / 60000;
-                        if(last>0) {
-                            if(type=='bd' || type=='lc')
+                        if (last > 0) {
+                            if (type == 'bd' || type == 'lc')
                                 lastStr = "保:" + last;
-                            else if(type=='cf')
+                            else if (type == 'cf')
                                 lastStr = "吃:" + last;
                             else
                                 lastStr = "行:" + last;
                         }
                         // 除了早晚例保，和进出场班次其余类型班次有停站时间
-                        if(type!='bd' && type!='lc' && type!='out' && type!='in') {
+                        if (type != 'bd' && type != 'lc' && type != 'out' && type != 'in') {
                             //if(params.data.value[15]>=0)
                             stayStr = "停:" + params.data.value[15];
                         }
                         // 分班显示‘分’
-                        if(params.data.value[16] == 1)
+                        if (params.data.value[16] == 1)
                             bcTypeStr = "分";
                         else
                             bcTypeStr = bcType[type];
                         var arr = [
-                            '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
-                            '{left|' + lastStr + '}{left|' + stayStr + '}'
+                            '{left|' + timeStr + '}{type|' + ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') + '}',
                         ];
+                        timeStr_1 != null ? arr.push('{left|' + timeStr_1 + '}{type|' + '实' + '}') : null;
+                        var n ='';
+                        if (params.data.value[2] !== undefined && params.data.value[22] !== undefined)
+                            n = getHoursAndMinutes(params.data.value[2]) == params.data.value[22] ? '' : '偏差';
+
+                        arr.push('{left|' + lastStr + '}{left|' + n + '}');
                         return arr.join('\n');
                     },
                     rich: {
@@ -588,12 +602,18 @@ var echartsDrawGTT = function () {
                             var type = params.data.value[6],
                                 lastStr = '',// 班次历时
                                 stayStr = '',// 停站时间
-                                timeStr = '';
-                            if(type=='bd' || type=='lc' || type=='out' || type=='in')
+                                timeStr = '',
+                                timeStr_1 ;
+                            if (type == 'bd' || type == 'lc' || type == 'out' || type == 'in') {
                                 timeStr = getHoursAndMinutes(params.data.value[1]);
-                            else
-                                timeStr = getHoursAndMinutes(params.data.value[1])+'~'+getHoursAndMinutes(params.data.value[2]);
-
+                                timeStr_1 = params.data.value[21] != undefined? params.data.value[21] : null;
+                            } else {
+                                timeStr = getHoursAndMinutes(params.data.value[1]) + '~' + getHoursAndMinutes(params.data.value[2]);
+                                var t1 = params.data.value[21] !== undefined ? params.data.value[21]: null;
+                                var t2 = params.data.value[22] !== undefined ? params.data.value[22]: null;
+                                if (t1 != null && t2 != null)
+                                    timeStr_1 =t1+ '~' +t2;
+                            }
                             var last = params.data.value[3] / 60000;
                             if(last>0) {
                                 if(type=='bd' || type=='lc')
@@ -614,9 +634,14 @@ var echartsDrawGTT = function () {
                                 stayStr = "停:" + params.data.value[15];
                             }
                             var arr = [
-                                '{left|' + timeStr + '}{type|'+ ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') +'}',
-                                '{left|' + lastStr + '}{left|' + stayStr + '}'
+                                '{left|' + timeStr + '}{type|' + ((dataZoomEnd - dataZoomStart) <= 70 ? bcType[type] : '') + '}',
                             ];
+                            timeStr_1 != null ? arr.push('{left|' + timeStr_1 + '}{type|' + '实' + '}') : '';
+                            var n ='';
+                            if (params.data.value[2] !== undefined && params.data.value[22] !== undefined)
+                                n = getHoursAndMinutes(params.data.value[2]) == params.data.value[22] ? '' : '偏差';
+
+                            arr.push('{left|' + lastStr + '}{left|' + n + '}');
                             return arr.join('\n');
                         },
@@ -121,19 +121,18 @@
 			// 使用已有的时刻表明细数据渲染视图.
 			var rsjar = jsonA.rsD;
 			var rsLP = jsonA.rsLP;
-			debugger
+
 			//查询出当日所有班次,并加入data,json里面一块输送给
 			$.get('/logZndd/sch_qbc', {xl : rsjar[0].xl},function (data) {
 				for (let t in data){
 					var sch = data[t];
 					if (sch.status == -1)
 						continue;
-					for (let lp  in rsLP){
-						var lps = rsLP[lp];
+					for (let rs  in rsjar){
+						var rsj = rsjar[rs];
 						//相同路牌加入到rsjar里，并特殊标注一个，提高一点y坐标
-						if(sch.lpName == lps.lpName){
-							rsjar.push(schonmap(sch,lps));
-
+						if(sch.lpName == rsj.lpName && sch.fcsj == rsj.fcsj && sch.bcType == rsj.bcType){
+							schonmap(sch,rsj);
 						}
 					}
 				}
@@ -212,32 +211,23 @@
 	},500);
-	function schonmap(sch,lp){
-		var maps = {};
-		maps.ARRIVALTIME =  sch.zdsj;
-		maps.STOPTIME= 0;
-		maps.bcType =  sch.bcType;
-		maps.bcs = sch.bcs;
-		maps.bcsj= sch.bcsj;
-		maps.fcno= sch.fcno;
-		maps.fcsj= sch.fcsj;
-		maps.isSwitchXl=  0;
-		maps.isfb =0;
-		maps.jhlc = sch.jhlc;
-		maps.lp = lp.lp;
-		maps.lpName = sch.lpName;
-		maps.lpNo = lp.lpNo;
-		maps.lpType = lp.lpType;
-		maps.parent= 1;
-		maps.qdz= sch.qdzCode;
-		maps.tcc = 98;
-		//maps.ttinfo: 7061
-		maps.xl = sch.xlBm;
-		maps.xlDir= sch.xlDir == 0 ? "relationshipGraph-up" : "relationshipGraph-down";
-		maps.zdz= sch.zdzCode;
-		maps.isjh = true;
-		maps.lpName = sch.lpName + "_实际排班";
-		return maps;
+	function schonmap(sch,rsj){
+		rsj.ARRIVALTIME_1 =  sch.zdsjActual;
+		rsj.bcType_1 =  sch.bcType;
+		rsj.bcs_1 = sch.bcs;
+		rsj.bcsj_1= sch.bcsj;
+		rsj.fcno_1= sch.fcno;
+		rsj.fcsj_1= sch.fcsjActual;
+		rsj.isSwitchXl_1=  0;
+		rsj.isfb_1 =0;
+		rsj.jhlc_1 = sch.jhlc;
+		rsj.lpName_1 = sch.lpName;
+		rsj.parent_1= 1;
+		rsj.qdz_1= sch.qdzCode;
+		rsj.xl_1 = sch.xlBm;
+		rsj.xlDir_1= sch.xlDir == 0 ? "relationshipGraph-up" : "relationshipGraph-down";
+		rsj.zdz_1= sch.zdzCode;
+		rsj.isjh_1 = true;
 	}
 	/**
@@ -457,7 +457,7 @@ $(&#39;.jhpbonsjpb&#39;).on(&#39;click&#39;,function() {
         var lp = LpData[p];
         var m = {}; // 单个路牌统计数据
         var bcs = 0 ; //班次数
-        var yylc = 0.0; //营运里程
+        var yylc = 0; //营运里程
         var jclc = 0.0 ;//进场时间
         var cllc = 0.0; //出场时间
         var ksyyList = [];//开始营运时间
@@ -466,18 +466,28 @@ $(&#39;.jhpbonsjpb&#39;).on(&#39;click&#39;,function() {
             var bcObj = list[i].value;
             //相同路牌
             if (lp == bcObj[0]) {
-                bcs++;
-                yylc += bcObj[9];
+
                 if (bcObj[6] == "in") {
                     jclc +=  bcObj[3] /60000;
                 } else if (bcObj[6] == "out") {
                     cllc +=  bcObj[3] /60000;
+                }else {
+                    bcs++;
+
+                    yylc += bcObj[9];
                 }
                 ksyyList.push(bcObj[19]);
                 jsyyList.push(bcObj[20]);
             }
         }
+        ksyyList.sort(function(a,b){
+            return hhmmToTimestamp(a) - hhmmToTimestamp(b);
+        });
+        jsyyList.sort(function(a,b){
+            return hhmmToTimestamp(a) - hhmmToTimestamp(b);
+        });
+
         m.lp = lp;
         m.bcs = bcs;
         m.yylc = yylc;
@@ -498,6 +508,19 @@ $(&#39;.jhpbonsjpb&#39;).on(&#39;click&#39;,function() {
             LPGroupBy.push(lp);
     }
+
+    //转时间戳
+    function hhmmToTimestamp(hhmm, date = new Date()) {
+        // 分割小时和分钟
+        const [hours, minutes] = hhmm.split(':').map(Number);
+
+        // 设置日期对象的小时和分钟
+        date.setHours(hours, minutes, 0, 0); // 设置秒和毫秒为0
+
+        // 返回时间戳
+        return date.getTime();
+    }
+
     LPGroupBy.sort(function(a,b){
         return a - b;
     });
@@ -545,6 +568,110 @@ $(&#39;.jhpbonsjpb&#39;).on(&#39;click&#39;,function() {
 });
+
+$('.parambtns').on('click',function (){
+    var historyData = echartsDrawGTT.getHistoryData(),
+        list = historyData[0];
+    var rsLP = echartsDrawGTT.getLpData(),
+    rsjar = [];
+    debugger
+    rsLP.sort(function(m,n){return m-n})
+    //查询出当日所有班次,并加入data,json里面一块输送给
+    $.get('/logZndd/sch_qbc', {xl : list[0].value[12]},function (data) {
+        for (let t in data){
+            var sch = data[t];
+            if (sch.status == -1)
+                continue;
+            for (let lp  in rsLP){
+                var lps = rsLP[lp];
+                //相同路牌加入到rsjar里，并特殊标注一个，提高一点y坐标
+                if(sch.lpName == lps){
+                    rsjar.push(schonmap(sch));
+                }
+            }
+        }
+        // 2、重新刷新表单数据
+        echartsDrawGTT.init(rsjar,true,true);
+    })
+})
+
+/**
+ * @description : (TODO) 监听保存数据事件.
+ *
+ * @status OK.
+ ************************************************************************************************************************************************/
+$('.checkAdd').on('click',function() {
+    var historyData = echartsDrawGTT.getHistoryData(),
+        list = historyData[0];
+    var rsLP = echartsDrawGTT.getLpData(),
+
+     bcData = echartsDrawGTT.getHistoryData(),
+        bcData
+        rsjar = [];
+    debugger
+    var xl = list[0].value[12];
+    // 判断选择框是否存在.、
+        // 关闭所有提示弹出层.
+        layer.closeAll();
+        layer.confirm('您正处于【批量班次操作】过程中...是否确定退出当前操作进行【保存数据】!', {
+            btn : [ '确认提示并提交', '取消' ]
+        },function () {
+            // 关闭所有提示弹出层.
+            layer.closeAll();
+
+                layer.confirm('系统已存在-->线路【'+
+                    xl +'】-->时刻表明细!是否覆盖!', {
+                    btn : [ '确认并提交', '取消' ]
+                },function () {
+                    // 关闭所有提示弹出层.
+                    layer.closeAll();
+                    // 2、弹出提示层.
+                    var index = layer.load(1, {
+                        shade: [0.1,'#fff'] // 0.1透明度的白色背景
+                    });
+                    var skb = list[0].value[19];
+                    // 3、post请求保存数据.
+                    $post('/tidc/skbDetailMxSave',{'d':JSON.stringify(list), 'xl':xl, 'skb':skb},function(result) {
+                        // 3.1、关闭弹出层.
+                        layer.close(index);
+                        if(result){
+                            if(result.status=='SUCCESS') {
+                                layer.msg('保存成功...');// 弹出添加成功提示消息
+                            } else if(result.status=='ERROR') {
+                                layer.msg('保存失败...');// 弹出添加失败提示消息
+                            }
+                        }
+                        loadPage('index.html');// 返回index.html页面
+                    });
+                });
+        });
+});
+function schonmap(sch){
+    var maps = {};
+    maps.ARRIVALTIME =  sch.zdsjActual;
+    maps.STOPTIME= 0;
+    maps.bcType =  sch.bcType;
+    maps.bcs = sch.bcs;
+    maps.bcsj= sch.bcsj;
+    maps.fcno= sch.fcno;
+    maps.fcsj= sch.fcsjActual;
+    maps.isSwitchXl=  0;
+    maps.isfb =0;
+    maps.jhlc = sch.jhlc;
+    maps.lp = sch.lpName;
+    maps.lpNo = Math.max(sch.lpName);
+    maps.lpName = sch.lpName;
+    maps.lpType = '普通路牌';
+    maps.parent= 1;
+    maps.qdz= sch.qdzCode;
+    maps.tcc = 98;
+    //maps.ttinfo: 7061
+    maps.xl = sch.xlBm;
+    maps.xlDir= sch.xlDir == 0 ? "relationshipGraph-up" : "relationshipGraph-down";
+    maps.zdz= sch.zdzCode;
+    maps.isjh = true;
+    return maps;
+}
 /**
  * @description : (TODO) 重新生成事件.
  *