潘钊 / bsth_control · Commits

Commit 0a29b254af28d4c4aeb9fd59627f0906a6a0a9b4

Authored by 徐烜
1 parent 3a45f8f9
build: skipped

时刻表v2_2.3.4_fix 

智能时刻表导出方法里，修改从新甘特图里获取班次数据，只改了根据间隔生成班次的获取方式，根据班型生成班次的获取方式暂时没改
Inline Side-by-side
Showing 3 changed files with 92 additions and 10 deletions
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @0a29b25
... ... @@ -170,10 +170,10 @@
170 170 <script src="/pages/base/timesmodel/js/ContextJS/js/context.js"></script>
171 171 <script src="/pages/base/timesmodel/js/dateTimeTool.js"></script>
172 172 <script src="/pages/base/timesmodel/js/base-fun.js"></script>
173   -<script src="/pages/base/timesmodel/js/v1/bcFun.js"></script>
174   -<script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>
175   -<script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>
176   -<script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>
  173 +<!--<script src="/pages/base/timesmodel/js/v1/bcFun.js"></script>-->
  174 +<!--<script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>-->
  175 +<!--<script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>-->
  176 +<!--<script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>-->
177 177 <script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
178 178 <script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
179 179 <script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
... ...
src/main/resources/static/pages/base/timesmodel/js/gantt.js
  View file @0a29b25
... ... @@ -131,7 +131,7 @@
131 131 data = {'json':rsjar,'bxrcgs':null};
132 132 }
133 133 echartsDrawGTT.init(data.json,true,true);
134   - console.log(data.json);
  134 + // console.log(data.json);
135 135 // 创建甘特图对象.
136 136 // var graph = d3.select('#ganttSvg').relationshipGraph(
137 137 // getGraphArgus({'ganttInitParams': map,'yAxisCarArray':CSMap.maxCar,
... ... @@ -143,9 +143,50 @@
143 143 // // 初始化右键菜单.
144 144 // contextInit(graph);
145 145  
146   - if (map.baseRes == '3') {
  146 + if (map.baseRes == '3' || map.baseRes == '1') {
147 147 // 导入导出设置
148   - Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
  148 + // Main_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
  149 +
  150 + var _dfun = function() {
  151 + // fix，从新的甘特图中获取数据
  152 + var _keyIndex = echartsDrawGTT.get_keyIndex();
  153 + var historyData = echartsDrawGTT.getHistoryData();
  154 + var _data = $.extend(true, [], data, historyData[_keyIndex]);
  155 +
  156 + var _i;
  157 + var _j;
  158 + var _gObj;
  159 +
  160 + var _rtnBcArray = [];
  161 + for (_i = 0; _i < _data.length; _i++) {
  162 + _gObj = _data[_i].value;
  163 + _rtnBcArray.push({
  164 + lpName : _gObj[0],
  165 + fcsj: moment(_gObj[1]).format("HH:mm"),
  166 + ARRIVALTIME: moment(_gObj[2]).format("HH:mm"),
  167 + bcsj: _gObj[3] / 60000,
  168 + lpNo: _gObj[4],
  169 + lpType: _gObj[5],
  170 + bcType: _gObj[6],
  171 + fcno: _gObj[7],
  172 + xlDir: (_gObj[8] == 0 ? "relationshipGraph-up" : "relationshipGraph-down"),
  173 + jhlc: _gObj[9],
  174 + tcc: _gObj[10],
  175 + ttinfo: _gObj[11],
  176 + xl: _gObj[12],
  177 + qdz: _gObj[13],
  178 + zdz: _gObj[14],
  179 + STOPTIME: _gObj[15],
  180 + isfb: _gObj[16]
  181 + });
  182 + }
  183 +
  184 + console.log("重组前数据=" + _data);
  185 + console.log("重组后数据=" + _rtnBcArray);
  186 + return _rtnBcArray;
  187 + };
  188 +
  189 + Main_v2_2.exportExcelConfig(_dfun);
149 190 }
150 191  
151 192 // 关闭弹出层
... ...
src/main/resources/static/pages/base/timesmodel/paramadd.html
  View file @0a29b25
... ... @@ -553,9 +553,50 @@
553 553  
554 554 echartsDrawGTT.init(data.json,true,true);
555 555  
556   - if (ganttMap.baseRes == "3") {
  556 + if (ganttMap.baseRes == "3" || ganttMap.baseRes == "1") {
557 557 // 导入导出设置
558   - _mainFun_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
  558 + // _mainFun_v2_2.exportExcelConfig($_GlobalGraph.getDataArray);
  559 +
  560 + var _dfun = function() {
  561 + // fix，从新的甘特图中获取数据
  562 + var _keyIndex = echartsDrawGTT.get_keyIndex();
  563 + var historyData = echartsDrawGTT.getHistoryData();
  564 + var _data = $.extend(true, [], data, historyData[_keyIndex]);
  565 +
  566 + var _i;
  567 + var _j;
  568 + var _gObj;
  569 +
  570 + var _rtnBcArray = [];
  571 + for (_i = 0; _i < _data.length; _i++) {
  572 + _gObj = _data[_i].value;
  573 + _rtnBcArray.push({
  574 + lpName : _gObj[0],
  575 + fcsj: moment(_gObj[1]).format("HH:mm"),
  576 + ARRIVALTIME: moment(_gObj[2]).format("HH:mm"),
  577 + bcsj: _gObj[3] / 60000,
  578 + lpNo: _gObj[4],
  579 + lpType: _gObj[5],
  580 + bcType: _gObj[6],
  581 + fcno: _gObj[7],
  582 + xlDir: (_gObj[8] == 0 ? "relationshipGraph-up" : "relationshipGraph-down"),
  583 + jhlc: _gObj[9],
  584 + tcc: _gObj[10],
  585 + ttinfo: _gObj[11],
  586 + xl: _gObj[12],
  587 + qdz: _gObj[13],
  588 + zdz: _gObj[14],
  589 + STOPTIME: _gObj[15],
  590 + isfb: _gObj[16]
  591 + });
  592 + }
  593 +
  594 + console.log("重组前数据=" + _data);
  595 + console.log("重组后数据=" + _rtnBcArray);
  596 + return _rtnBcArray;
  597 + };
  598 +
  599 + Main_v2_2.exportExcelConfig(_dfun);
559 600 }
560 601  
561 602 // var data = obj.getDataArray();
... ... @@ -874,7 +915,7 @@
874 915 var _paramObj = _mainFun.getFactory().createParameterObj(map, dataMap);
875 916  
876 917 if (!_paramObj.isTwoWayStop()) { // 主站停站使用v2_2版本
877   - map.clzs = _oSchedule_v2_2.calcuClzx(_paramObj);
  918 + map.clzs = InternalScheduleObj.calcuClzx(_paramObj);
878 919 } else {
879 920 map.clzs = _paramObj.calcuClzx();
880 921 }
... ...