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

徐烜
1 parent 9f2038e8
Showing 4 changed files with 12 additions and 11 deletions
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
src/main/resources/static/pages/base/timesmodel/paramadd.html
src/main/resources/static/pages/scheduleApp/module/core/ttInfoManage/list.html
@@ -169,7 +169,6 @@
 <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/AdjustTrip2.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>
@@ -460,6 +460,6 @@ $(&#39;.parambtn&#39;).on(&#39;click&#39;, function() {
     $.get('/pages/base/timesmodel/paramadd.html', function(m){
         $(pjaxContainer).append(m);
         // 规定被选元素要触发的事件。可以使自定义事件（使用 bind() 函数来附加），或者任何标准事件。
-        $('#paramadd_mobal').trigger('paramAddMobal.show', Main_v2);
+        $('#paramadd_mobal').trigger('paramAddMobal.show', [Main_v2, Main_v2_2, InternalScheduleObj_v2_2]);
     });
 });
 \ No newline at end of file
@@ -552,17 +552,19 @@
                     _mainFun_v2_2.exportDataConfig(data.aInternalLpObj);
                 }
+                echartsDrawGTT.init(data.json,true,true);
+
                 // var data = obj.getDataArray();
                 // // 2、 调整路牌对应的班次总数
                 // updFormParams(params,data);
                 // 删除图形.
-                $('svg.svg-chart').remove();
-                // 重新创建图形.
-                var graph = d3.select('#ganttSvg').relationshipGraph(getGraphArgus(csMap, dataMap, data));
-                // 根据数据重新渲染图形.
-                graph.data(data.json);
-                // 记录早操.并保存历史班次数据
-                graph.addHistory();
+                // $('svg.svg-chart').remove();
+                // // 重新创建图形.
+                // var graph = d3.select('#ganttSvg').relationshipGraph(getGraphArgus(csMap, dataMap, data));
+                // // 根据数据重新渲染图形.
+                // graph.data(data.json);
+                // // 记录早操.并保存历史班次数据
+                // graph.addHistory();
                 // 隐藏错误提示
                 paramAlert.hide();
                 // 隐藏 reladplus_mobal 弹出层
@@ -176,8 +176,8 @@
                        <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑2 </a>-->
                     <a ui-sref="ttInfoDetailManage_edit3({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name, rflag : true, lineversion : info.lineVersion})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 编辑 </a>
-                    <!--<a ng-click="ctrl.toTtInfoDetailAuto(info.id)"-->
-                       <!--class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>-->
+                    <a ng-click="ctrl.toTtInfoDetailAuto(info.id)"
+                       class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 生成 </a>
                     <a ui-sref="ttInfoDetailManage_form({xlid: info.xl.id, ttid : info.id, xlname: info.xl.name, ttname : info.name})"
                        class="btn btn-info btn-sm" ng-if="info.isCancel == '0'"> 导入 </a>
                     <a href="javascript:" class="btn btn-info btn-sm" ng-click="ctrl.exportData(info.id)"> 导出 </a>