时刻表v2_2.3.4_fix

智能时刻表导出方法里，修改从新甘特图里获取班次数据，只改了根据间隔生成班次的获取方式，根据班型生成班次的获取方式暂时没改

时刻表v2_2.3.4_fix
智能时刻表导出方法里，修改从新甘特图里获取班次数据，只改了根据间隔生成班次的获取方式，根据班型生成班次的获取方式暂时没改
徐烜
1 parent 3a45f8f9
Showing 3 changed files with 92 additions and 10 deletions
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/paramadd.html
@@ -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>
@@ -131,7 +131,7 @@
 			data = {'json':rsjar,'bxrcgs':null};
 		}
         echartsDrawGTT.init(data.json,true,true);
-		console.log(data.json);
+		// console.log(data.json);
         // 创建甘特图对象.
         // var graph = d3.select('#ganttSvg').relationshipGraph(
 			// 	getGraphArgus({'ganttInitParams': map,'yAxisCarArray':CSMap.maxCar,
@@ -143,9 +143,50 @@
         // // 初始化右键菜单.
         // contextInit(graph);
-        if (map.baseRes == '3') {
+        if (map.baseRes == '3' || map.baseRes == '1') {
             // 导入导出设置
-            Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
+            // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
+
+            var _dfun = function() {
+                // fix，从新的甘特图中获取数据
+                var _keyIndex = echartsDrawGTT.get_keyIndex();
+                var historyData = echartsDrawGTT.getHistoryData();
+                var _data = $.extend(true, [], data, historyData[_keyIndex]);
+
+                var _i;
+                var _j;
+                var _gObj;
+
+                var _rtnBcArray = [];
+                for (_i = 0; _i < _data.length; _i++) {
+                    _gObj = _data[_i].value;
+                    _rtnBcArray.push({
+                        lpName : _gObj[0],
+                        fcsj: moment(_gObj[1]).format("HH:mm"),
+                        ARRIVALTIME: moment(_gObj[2]).format("HH:mm"),
+                        bcsj: _gObj[3] / 60000,
+                        lpNo: _gObj[4],
+                        lpType: _gObj[5],
+                        bcType: _gObj[6],
+                        fcno: _gObj[7],
+                        xlDir: (_gObj[8] == 0 ? "relationshipGraph-up" : "relationshipGraph-down"),
+                        jhlc: _gObj[9],
+                        tcc: _gObj[10],
+                        ttinfo: _gObj[11],
+                        xl: _gObj[12],
+                        qdz: _gObj[13],
+                        zdz: _gObj[14],
+                        STOPTIME: _gObj[15],
+                        isfb: _gObj[16]
+                    });
+                }
+
+                console.log("重组前数据=" + _data);
+                console.log("重组后数据=" + _rtnBcArray);
+                return _rtnBcArray;
+            };
+
+            Main_v2_2.exportExcelConfig(_dfun);
         }
         // 关闭弹出层
@@ -553,9 +553,50 @@
                 echartsDrawGTT.init(data.json,true,true);
-                if (ganttMap.baseRes == "3") {
+                if (ganttMap.baseRes == "3" || ganttMap.baseRes == "1") {
                     // 导入导出设置
-                    _mainFun_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
+                    // _mainFun_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
+
+                    var _dfun = function() {
+                        // fix，从新的甘特图中获取数据
+                        var _keyIndex = echartsDrawGTT.get_keyIndex();
+                        var historyData = echartsDrawGTT.getHistoryData();
+                        var _data = $.extend(true, [], data, historyData[_keyIndex]);
+
+                        var _i;
+                        var _j;
+                        var _gObj;
+
+                        var _rtnBcArray = [];
+                        for (_i = 0; _i < _data.length; _i++) {
+                            _gObj = _data[_i].value;
+                            _rtnBcArray.push({
+                                lpName : _gObj[0],
+                                fcsj: moment(_gObj[1]).format("HH:mm"),
+                                ARRIVALTIME: moment(_gObj[2]).format("HH:mm"),
+                                bcsj: _gObj[3] / 60000,
+                                lpNo: _gObj[4],
+                                lpType: _gObj[5],
+                                bcType: _gObj[6],
+                                fcno: _gObj[7],
+                                xlDir: (_gObj[8] == 0 ? "relationshipGraph-up" : "relationshipGraph-down"),
+                                jhlc: _gObj[9],
+                                tcc: _gObj[10],
+                                ttinfo: _gObj[11],
+                                xl: _gObj[12],
+                                qdz: _gObj[13],
+                                zdz: _gObj[14],
+                                STOPTIME: _gObj[15],
+                                isfb: _gObj[16]
+                            });
+                        }
+
+                        console.log("重组前数据=" + _data);
+                        console.log("重组后数据=" + _rtnBcArray);
+                        return _rtnBcArray;
+                    };
+
+                    Main_v2_2.exportExcelConfig(_dfun);
                 }
                 // var data = obj.getDataArray();
@@ -874,7 +915,7 @@
             var _paramObj = _mainFun.getFactory().createParameterObj(map, dataMap);
             if (!_paramObj.isTwoWayStop()) { // 主站停站使用v2_2版本
-                map.clzs = _oSchedule_v2_2.calcuClzx(_paramObj);
+                map.clzs = InternalScheduleObj.calcuClzx(_paramObj);
             } else {
                 map.clzs = _paramObj.calcuClzx();
             }