echarts4复用：误删

游瑞烽
1 parent bafa0eaa
Showing 3 changed files with 9 additions and 4 deletions
src/main/resources/static/index.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
@@ -630,7 +630,8 @@
 <script
 		src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
 		data-exclude=1></script>
-
+<!-- echarts4 误删 -->
+<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
 <script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js"  merge="plugins"></script>
 </body>
@@ -126,7 +126,7 @@
                                 </a>
                             </li>
                             <li>
-                                <a href="javascript:" class="tool-action upDownRead">
+                                <a href="javascript:" class="tool-action balanceBc">
                                     <i class="fa fa-arrows-h"></i>&nbsp;均匀发车
                                 </a>
                             </li>
@@ -181,7 +181,7 @@
 <script src="/pages/base/timesmodel/js/v2/strategy/adjust/AdjustTripS4.js"></script>
 <script src="/pages/base/timesmodel/js/v2/strategy/StrategyUtils.js"></script>
 <script src="/pages/base/timesmodel/js/v2/main_v2.js"></script>
-<script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>
+<!--<script src="/pages/base/timesmodel/js/d3.relationshipgraph.js"></script>-->
 <script src="/pages/base/timesmodel/js/errorinfo.js"></script>
 <script src="/pages/base/timesmodel/js/parameters.js"></script>
 <script src="/pages/base/timesmodel/js/systemTools.js"></script>
@@ -68,6 +68,10 @@ $(&#39;.deleteLp&#39;).on(&#39;click&#39;,function() {
         $('#deletelp_mobal').trigger('deletelpMobal.show',[lpData,echartsDrawGTT]);
     });
 });
+/** 监听均匀发车事件.（点击） **/
+$('.balanceBc').on('click',function() {
+    layer.msg('功能暂未开放');
+});
 /** 监听班次调整事件.（点击） **/
 $('.bcAdjust').on('click',function() {
     var lpData = echartsDrawGTT.getLpData();
@@ -268,7 +272,7 @@ function dropdownMenuSetNoFb(dataIndex) {
     var _keyIndex = echartsDrawGTT.get_keyIndex(),
         historyData = echartsDrawGTT.getHistoryData(),
         data = $.extend(true, [], data, historyData[_keyIndex]);
-    if(!isType(data[dataIndex].value[16],0,'不是分班班次')) {
+    if(!isType(data[dataIndex].value[6],'取消分班') && !isType(data[dataIndex].value[16],0,'不是分班班次')) {
         data[dataIndex].value[16] = 0;
         historyData.push(data);
         echartsDrawGTT.set_keyIndex(++_keyIndex);