潘钊 / bsth_control · Commits

Commit 790463e4bad8ce22bf900aad62ad7e06b3ec4465

Authored by 游瑞烽
1 parent 0a29b254
build: skipped

时刻表更新

Inline Side-by-side
Showing 6 changed files with 74 additions and 48 deletions
src/main/resources/static/index.html
  View file @790463e
... ... @@ -630,6 +630,8 @@
630 630 <script
631 631 src="http://webapi.amap.com/maps?v=1.3&key=16cb1c5043847e09ef9edafdd77befda"
632 632 data-exclude=1></script>
  633 +<!-- echarts4 误删 -->
  634 +<script src="/metronic_v4.5.4/plugins/echarts4/echarts.min.js"></script>
633 635  
634 636 </body>
635 637 </html>
636 638 \ No newline at end of file
... ...
src/main/resources/static/pages/base/timesmodel/fragments/addbc.html
  View file @790463e
... ... @@ -201,7 +201,7 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
201 201 // 'dir' : {required : true},
202 202 'fcsj' : {required : true},
203 203 'bcType' : {required : true},
204   - 'bcsj' : {number : true,required : true},
  204 + 'bcsj' : {min : 1, digits : true, required : true},
205 205 'isfb' : {required : true}
206 206 },
207 207 invalidHandler : function(event, validator) {
... ... @@ -224,50 +224,54 @@ $(&#39;#addBc_mobal&#39;).on(&#39;addBcMobal.show&#39;, function(e,lpData,lpDataCount,echartsDra
224 224 var fcsj = Date.parse(DateTimeTool.getDateTime(params.fcsj));
225 225 var ARRIVALTIME = fcsj + parseInt(params.bcsj)*60000 ;
226 226  
227   - for(var i=0; i<data.length-1; i++) {
228   - if(data[i].value[0] == params.lpName) {
229   - if(data[i].value[7] < params.fcno) {
230   - prevBcObj = data[i];
231   - bcObj = $.extend(true, {}, bcObj, data[i]);
232   - index = i+1;
233   - } else {
234   - if(type) {
235   - type = false;
236   - nextBcObj = data[i];
  227 + if(params.bcsj > 0){
  228 + for(var i=0; i<data.length-1; i++) {
  229 + if(data[i].value[0] == params.lpName) {
  230 + if(data[i].value[7] < params.fcno) {
  231 + prevBcObj = data[i];
  232 + bcObj = $.extend(true, {}, bcObj, data[i]);
  233 + index = i+1;
  234 + } else {
  235 + if(type) {
  236 + type = false;
  237 + nextBcObj = data[i];
  238 + }
  239 + data[i].value[7] += 1;
237 240 }
238   - data[i].value[7] += 1;
239 241 }
240 242 }
241   - }
242   - bcObj.value[1] = fcsj;
243   - bcObj.value[2] = ARRIVALTIME;
244   - bcObj.value[3] = params.bcsj*60000;
245   - // bcObj.value[4] = lpNo;
246   - bcObj.value[6] = params.bcType;
247   - bcObj.value[7] = parseInt(params.fcno);
248   - var dir = bcObj.value[8] == 1 ? 0:1;
249   - bcObj.value[8] = dir;
250   - bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
251   - // 起终点互换
252   - var station = bcObj.value[13];
253   - bcObj.value[13] = bcObj.value[14];
254   - bcObj.value[14] = station;
255   - bcObj.value[16] = parseInt(params.isfb);
256   - data.splice(index, 0 , bcObj);
  243 + bcObj.value[1] = fcsj;
  244 + bcObj.value[2] = ARRIVALTIME;
  245 + bcObj.value[3] = params.bcsj*60000;
  246 + // bcObj.value[4] = lpNo;
  247 + bcObj.value[6] = params.bcType;
  248 + bcObj.value[7] = parseInt(params.fcno);
  249 + var dir = bcObj.value[8] == 1 ? 0:1;
  250 + bcObj.value[8] = dir;
  251 + bcObj.itemStyle.normal.color = dir==0?"#ff2949":"#518fe3";
  252 + // 起终点互换
  253 + var station = bcObj.value[13];
  254 + bcObj.value[13] = bcObj.value[14];
  255 + bcObj.value[14] = station;
  256 + bcObj.value[16] = parseInt(params.isfb);
  257 + data.splice(index, 0 , bcObj);
257 258  
258   - if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
259   - layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
260   - btn : [ '添加','取消' ], icon: 3, title:'提示'
261   - }, function(){
  259 + if(nextBcObj != null && (nextBcObj.value[1] < ARRIVALTIME || prevBcObj.value[2] > fcsj)){
  260 + layer.confirm('添加的班次与前后班次有时间冲突，是否添加？', {
  261 + btn : [ '添加','取消' ], icon: 3, title:'提示'
  262 + }, function(){
  263 + echartsDrawGTT.init(data,false,true,false);
  264 + echartsDrawGTT.refreshDrag();
  265 + layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
  266 + });
  267 + } else {
262 268 echartsDrawGTT.init(data,false,true,false);
263 269 echartsDrawGTT.refreshDrag();
264   - layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功,注意修改冲突班次！');
265   - });
  270 + layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
  271 + }
266 272 } else {
267   - echartsDrawGTT.init(data,false,true,false);
268   - echartsDrawGTT.refreshDrag();
269   - layer.msg('路牌:'+params.lpName+' fnco:'+params.fcno+' 班次添加成功！');
270   - }
  273 + layer.msg('班次时间为0分钟，为无效班次添加失败！');
  274 + }
271 275 $('#addBc_mobal').modal('hide');
272 276 }
273 277 });
... ...
src/main/resources/static/pages/base/timesmodel/fragments/editbc.html
  View file @790463e
... ... @@ -162,7 +162,7 @@ $(&#39;#editBc_mobal&#39;).on(&#39;editBcMobal.show&#39;, function(e,index,echartsDrawGTT){
162 162 // 'dir' : {required : true},
163 163 'fcsj' : {required : true},
164 164 'bcType' : {required : true},
165   - 'bcsj' : {number : true,required : true},
  165 + 'bcsj' : {min : 1, digits : true,required : true},
166 166 'isfb' : {required : true}
167 167 },
168 168 invalidHandler : function(event, validator) {
... ...
src/main/resources/static/pages/base/timesmodel/gantt.html
  View file @790463e
... ... @@ -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 @790463e
... ... @@ -186,7 +186,7 @@
186 186 return _rtnBcArray;
187 187 };
188 188  
189   - Main_v2_2.exportExcelConfig(_dfun);
  189 + // Main_v2_2.exportExcelConfig(_dfun);
190 190 }
191 191  
192 192 // 关闭弹出层
... ...
src/main/resources/static/pages/base/timesmodel/js/systemTools.js
  View file @790463e
... ... @@ -112,8 +112,8 @@ $(&#39;#bcAdjustListSubmit&#39;).on(&#39;click&#39;,function() {
112 112 /* 右击菜单事件
113 113 * 1.修改 update
114 114 * 2.删除 delete
115   -* 3.设为上行 setUp
116   -* 4.设为下行 setDown
  115 +* 3.班次切换上下行 dropdownMenuSwitchUpDown
  116 +* 4.路牌切换上下行 dropdownMenuLpSwitchUpDown
117 117 * 5.设为正常 setNormal
118 118 * 6.设为区间 setRegion
119 119 * 7.设为分班 setFb
... ... @@ -145,12 +145,16 @@ function dropdownMenuDelete(dataIndex) {
145 145 // 关闭弹出层.
146 146 layer.closeAll();
147 147 data.splice(dataIndex,1);
  148 + $.each(data, function () {
  149 + if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
  150 + this.value[7] -= 1;
  151 + });
148 152 echartsDrawGTT.init(data,false,true,false);
149 153 layer.msg('删除成功！');
150 154 });
151 155 }
152 156 }
153   -// 切换上下行
  157 +// 班次切换上下行
154 158 function dropdownMenuSwitchUpDown(dataIndex) {
155 159 // 获取当前操作步数
156 160 var _keyIndex = echartsDrawGTT.get_keyIndex(),
... ... @@ -176,8 +180,17 @@ function dropdownMenuSwitchUpDown(dataIndex) {
176 180 data[dataIndex].value[3] = parseInt(dataMap.map.downInTimer)*60000;
177 181 data[dataIndex].value[2] = data[dataIndex].value[1] + data[dataIndex].value[3];
178 182 }
  183 + if(data[dataIndex].value[3] <= 0){
  184 + var bc = data[dataIndex];
  185 + data.splice(dataIndex,1);
  186 + $.each(data, function () {
  187 + if(bc.value[0] == this.value[0] && bc.value[7] < this.value[7])
  188 + this.value[7] -= 1;
  189 + });
  190 + layer.msg('班次切换上下行成功，切换后班次运送时间为0分钟，无意义所以删除改班次！',{time: 8000});
  191 + } else
  192 + layer.msg('班次切换上下行成功！');
179 193 echartsDrawGTT.init(data,false,true,false);
180   - layer.msg('设置为上行成功！');
181 194 }
182 195 // 路牌切换上下行
183 196 function dropdownMenuLpSwitchUpDown(dataIndex) {
... ... @@ -206,6 +219,13 @@ function dropdownMenuLpSwitchUpDown(dataIndex) {
206 219 data[i].value[3] = parseInt(dataMap.map.downInTimer)*60000;
207 220 data[i].value[2] = data[i].value[1] + data[i].value[3];
208 221 }
  222 + if(data[i].value[3] <= 0){
  223 + data.splice(i,1);
  224 + $.each(data, function () {
  225 + if(data[i].value[0] == this.value[0] && data[i].value[7] < this.value[7])
  226 + this.value[7] -= 1;
  227 + });
  228 + }
209 229 }
210 230 }
211 231 echartsDrawGTT.init(data,false,true,false);
... ...