潘钊 / bsth_control · Commits

Commit 4646ad5d8717ddca3fd6f7268a0fa9143fdded76

Authored by 徐烜
1 parent 9f2038e8
build: skipped

智能时刻表显示更新，修正echart和d3的整合问题

Inline Side-by-side
Showing 4 changed files with 12 additions and 11 deletions
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @4646ad5
... ... @@ -169,7 +169,6 @@
169 169 <script src="/pages/base/timesmodel/js/v1/lpFun.js"></script>
170 170 <script src="/pages/base/timesmodel/js/v1/scheduleInitialize.js"></script>
171 171 <script src="/pages/base/timesmodel/js/v1/AdjustTrip.js"></script>
172   -<script src="/pages/base/timesmodel/js/v1/AdjustTrip2.js"></script>
173 172 <script src="/pages/base/timesmodel/js/v2/ParameterObj.js"></script>
174 173 <script src="/pages/base/timesmodel/js/v2/core/InternalBcObj.js"></script>
175 174 <script src="/pages/base/timesmodel/js/v2/core/InternalGroupObj.js"></script>
... ...
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
  View file @4646ad5
... ... @@ -460,6 +460,6 @@ $(&#39;.parambtn&#39;).on(&#39;click&#39;, function() {
460 460 $.get('/pages/base/timesmodel/paramadd.html', function(m){
461 461 $(pjaxContainer).append(m);
462 462 // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
463   - $('#paramadd_mobal').trigger('paramAddMobal.show', Main_v2);
  463 + $('#paramadd_mobal').trigger('paramAddMobal.show', [Main_v2, Main_v2_2, InternalScheduleObj_v2_2]);
464 464 });
465 465 });
466 466 \ No newline at end of file
... ...
src/main/resources/static/pages/base/timesmodel/paramadd.html
  View file @4646ad5
... ... @@ -552,17 +552,19 @@
552 552 _mainFun_v2_2.exportDataConfig(data.aInternalLpObj);
553 553 }
554 554  
  555 + echartsDrawGTT.init(data.json,true,true);
  556 +
555 557 // var data = obj.getDataArray();
556 558 // // 2、 调整路牌对应的班次总数
557 559 // updFormParams(params,data);
558 560 // 删除图形.
559   - $('svg.svg-chart').remove();
560   - // 重新创建图形.
561   - var graph = d3.select('#ganttSvg').relationshipGraph(getGraphArgus(csMap, dataMap, data));
562   - // 根据数据重新渲染图形.
563   - graph.data(data.json);
564   - // 记录早操.并保存历史班次数据
565   - graph.addHistory();
  561 + // $('svg.svg-chart').remove();
  562 + // // 重新创建图形.
  563 + // var graph = d3.select('#ganttSvg').relationshipGraph(getGraphArgus(csMap, dataMap, data));
  564 + // // 根据数据重新渲染图形.
  565 + // graph.data(data.json);
  566 + // // 记录早操.并保存历史班次数据
  567 + // graph.addHistory();
566 568 // 隐藏错误提示
567 569 paramAlert.hide();
568 570 // 隐藏 reladplus_mobal 弹出层
... ...
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
  View file @4646ad5
... ... @@ -176,8 +176,8 @@
176 176 <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑2 </a>-->
177 177 <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
178 178 class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
179   - <!--<a ng-click="ctrl.toTtInfoDetailAuto(info.id)"-->
180   - <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>-->
  179 + <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
  180 + class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
181 181 <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
182 182 class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
183 183 <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>
... ...