潘钊 / bsth_control · Commits

Commit 64981b91fb4020d193535b26eb21ad94a889e1d9

Authored by 游瑞烽
1 parent 30a7e61c

人员表添加 金蝶工号字段

Inline Side-by-side
Showing 4 changed files with 9 additions and 7 deletions
src/main/resources/static/pages/base/line/editRoute.html
  View file @64981b9
... ... @@ -166,8 +166,8 @@ $('#edit_route_mobal').on('editRouteMobal.show', function(e,transGPS,editRoute,m
166 166 var sectionListTemp = arrayFormat.sectionList;
167 167 var sectionList = [];
168 168 // 隔30个取一个点（相当于30s）
169   - for(var i = 0; i*30 < sectionListTemp.length; i++) {
170   - sectionList[i] = sectionListTemp[i*30];
  169 + for(var i = 0; i < sectionListTemp.length; i++) {
  170 + sectionList[i] = sectionListTemp[i];
171 171 }
172 172 sectionList[sectionList.length] = sectionListTemp[sectionListTemp.length-1];
173 173  
... ...
src/main/resources/static/pages/base/lineversions/js/lineversions-list-table.js
  View file @64981b9
... ... @@ -343,9 +343,9 @@
343 343 closeOnConfirm: false },
344 344 function(isConfirm){
345 345 if(isConfirm){
346   - var win1 = window.open("http://114.80.178.12:29088/login2.html","线路信息编辑","false");
  346 + var win1 = window.open("http://114.80.178.12:59088/login2.html","线路信息编辑","false");
347 347 setTimeout(function(){
348   - window.open("http://114.80.178.12:29088/pages/base/stationroute/list.html?no="+lineId,"线路信息编辑","false");
  348 + window.open("http://114.80.178.12:59088/pages/base/stationroute/list.html?no="+lineId,"线路信息编辑","false");
349 349 },1500);
350 350 swal.close();
351 351 }
... ...
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @64981b9
... ... @@ -162,7 +162,7 @@
162 162 </div>
163 163  
164 164  
165   -<!-- echarts4 误删 -->
  165 +<!-- echarts4 -->
166 166 <script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
167 167  
168 168 <!-- row 组件END -->
... ...
src/main/resources/static/pages/base/timesmodel/js/gantt.js
  View file @64981b9
... ... @@ -17,7 +17,8 @@
17 17 echartsDrawGTT.resizeChart();
18 18 });
19 19 // 获取已存在的该时刻表明细数据.
20   - var objD = window.localStorage.isDoDate;
  20 + var objD = window.localStorage.isDoDate;
  21 + debugger;
21 22 // 获取表单参数配置数据.
22 23 var map = JSON.parse(window.localStorage.Gantt_AgursData);
23 24 $('.skmxTitle').text( '【' + map.skbmc + '】' + '时刻表明细模型');
... ... @@ -61,7 +62,7 @@
61 62  
62 63 // 创建ParameterObj
63 64 var _paramObj;
64   -
  65 +debugger;
65 66 if(map.baseRes== '0') {
66 67 CSMap = getMaxCarAndStopSpace0(map,seMap);
67 68 // 发车间隙
... ... @@ -133,6 +134,7 @@
133 134 }
134 135 data = {'json':rsjar,'bxrcgs':null};
135 136 }
  137 + debugger;
136 138 echartsDrawGTT.init(data.json,true,true);
137 139 // console.log(data.json);
138 140 // 创建甘特图对象.
... ...