潘钊 / bsth_control · Commits

Commit 820760dbf6ee9b90cf74145c063a3aa8f66498ad

Authored by 王通
1 parent bb5620c9
build: skipped

1.共和县

Inline Side-by-side
Showing 10 changed files with 9 additions and 75 deletions
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
  View file @820760d
... ... @@ -3185,7 +3185,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen
3185 3185 } else if("26".equals(sp[0])){
3186 3186 gs = "南汇公司";
3187 3187 } else if("all".equals(sp[0])){
3188   - gs = "滨海合计";
  3188 + gs = "共和县公交合计";
3189 3189 num = "0";
3190 3190 }
3191 3191 if("1".equals(sp[1])){
... ... @@ -3242,7 +3242,7 @@ public class BudgetServiceImpl extends BaseServiceImpl<Budget, Integer> implemen
3242 3242 } else if("26".equals(sp[0])){
3243 3243 gs = "南汇公司";
3244 3244 } else if("all".equals(sp[0])){
3245   - gs = "滨海合计";
  3245 + gs = "共和县公交合计";
3246 3246 num = "0";
3247 3247 }
3248 3248 if("1".equals(sp[1])){
... ...
src/main/resources/rules/kBase1_core_plan.drl
  View file @820760d
... ... @@ -75,7 +75,7 @@ function Map gsMap(List gses) {
75 75 for (int i = 0; i < gses.size(); i++) {
76 76 Business gs = (Business) gses.get(i);
77 77 if (StringUtils.isNotEmpty(gs.getBusinessCode())) {
78   - if ("88".equals(gs.getUpCode())) { // 滨海
  78 + if ("88".equals(gs.getUpCode())) { // 共和县公交
79 79 gsMap.put(gs.getBusinessCode(), gs);
80 80 }
81 81 if (gs.getBusinessCode().equals(gs.getUpCode())) { // 闵行，青浦
... ...
src/main/resources/static/index.html
  View file @820760d
... ... @@ -220,7 +220,7 @@
220 220 <!-- LOGO -->
221 221 <div class="page-logo">
222 222 <a href="index.html" class="logo-default logo-default-text">
223   - 滨海调度系统 </a>
  223 + 共和县公交调度系统 </a>
224 224 <div class="menu-toggler sidebar-toggler"></div>
225 225 </div>
226 226 <!-- END LOGO -->
... ...
src/main/resources/static/login.html
  View file @820760d
... ... @@ -181,7 +181,7 @@
181 181 <div class="wrapper ng-scope">
182 182 <div id="loginPanel" class="dialog dialog-shadow">
183 183 <br>
184   - <h3 class="logo-text">滨海调度系统</h3>
  184 + <h3 class="logo-text">共和县公交调度系统</h3>
185 185 <hr>
186 186 <form style="padding: 0px 35px;">
187 187 <div class="form-group" style="margin-bottom: 0">
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
  View file @820760d
... ... @@ -153,12 +153,6 @@ var GetAjaxData = function(){
153 153 callback && callback(result);
154 154 });
155 155 },
156   - // 查询外部行业编码是否有更新
157   - matchIndustryCode : function (lineId,callback) {
158   - $post('/stationroute/matchIndustryCode' ,{"lineId":lineId}, function(result){
159   - callback && callback(result);
160   - });
161   - },
162 156  
163 157 // 查询站点信息
164 158 getStationRouteInfo : function(lineId,direction,callback) {
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
  View file @820760d
... ... @@ -323,60 +323,6 @@ $(function(){
323 323 $('.defeat-scroll').css('overflow','hidden');
324 324 });
325 325  
326   - $(".match_station_bnt").on("click",function () {
327   - var index = layer.open({
328   - title: '提示',
329   - content:'是否匹配外部上下行站点行业编码!',
330   - // type: 1,
331   - // area: ['600px', '360px'],
332   - // scrollbar: false,
333   -
334   - btn:['确定','取消'],
335   - yes: function(index){
336   - var lineId = LineObj.getLineObj().id;
337   - GetAjaxData.matchIndustryCode(lineId,function (rs) {
338   - // $post("/stationroute/matchIndustryCode",{"lineId":lineId},function (rs) {
339   - if(rs.status == "SUCCESS"){
340   - var map = new Map();
341   - var upMatch = rs.upMatch, downMatch = rs.downMatch;
342   - if(upMatch !=null && upMatch.length>0){
343   - map.set("up",upMatch);
344   - }
345   - if(downMatch !=null && downMatch.length>0){
346   - map.set("down",downMatch);
347   - }
348   - if(map.size>0){
349   - $('.portlet-title .match_station').addClass('hidden');
350   - PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
351   - /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
352   -// GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
353   -// /** 在地图上画出线路走向 @param:<Line.id：线路Id；0：上行；data：路段数据> */
354   -// PublicFunctions.linePanlThree(lineId,data,0);
355   -// });
356   - $('#stationDown').removeClass('active');
357   - $('#stationDown').removeClass('in');
358   - $('#stationDown').addClass('fade');
359   - $('#stationUp').addClass('active in');
360   - $('#downLine').parent().removeClass('active');
361   - $('#upLine').parent().addClass('active');
362   - $.get('match_station_industryCode.html', function(m){
363   - $(pjaxContainer).append(m);
364   - $('#match_station_industryCode_mobal').trigger('match_station_industryCodeMobal.show', map);
365   - });
366   - } else {
367   - layer.msg("没有匹配到外部站点数据，请手动添加！")
368   - }
369   - } else
370   - layer.msg("匹配出错，请手动添加！")
371   - });
372   - layer.close(index);
373   - },
374   - btn2:function(){
375   - layer.closeAll(index); //关闭当前窗口
376   - }
377   - });
378   - })
379   -
380 326 // 进出场规划
381 327 $('#leftUpOrDown #inoutLine').on('click', function(){
382 328 var lineIdEvents = LineObj.getLineObj();
... ...
src/main/resources/static/pages/base/stationroute/js/stationroute-list-reload.js
  View file @820760d
... ... @@ -202,12 +202,6 @@ $(function() {
202 202  
203 203 });
204 204  
205   - GetAjaxData.getLineMatchStationIsUpdate(Line.id, function(data) {
206   - if (data.status == 'SUCCESS' && data.data == "1") {
207   - $('.portlet-title .match_station').removeClass('hidden');
208   - }
209   - });
210   -
211 205 $('#esc_edit_div').on(
212 206 'click',
213 207 function() {
... ...
src/main/resources/static/pages/control/line/index.html
  View file @820760d
... ... @@ -18,7 +18,7 @@
18 18 <div class="portlet-title banner" >
19 19 <div class="caption col_hide_1280" style="color: #FFF;">
20 20 <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
21   - class="caption-subject bold" style="font-size: 24px;">滨海线路调度系统</span>
  21 + class="caption-subject bold" style="font-size: 24px;">共和县公交线路调度系统</span>
22 22 </div>
23 23 <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
24 24 <span class="top_username"></span> <span class="operation_mode_text animated" ></span>
... ...
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
  View file @820760d
... ... @@ -83,7 +83,7 @@ var gb_safe_driv = (function () {
83 83 $.post('/realSchedule/ackCp', {id : id}, function(res) {});
84 84 }
85 85 break;
86   - // 滨海维修库
  86 + // 共和县公交维修库
87 87 case 'mt':
88 88 var data = { zbh: $(this).data('zbh'), bydj: $(this).data('bydj'), bysj: $(this).data('bysj'), bydd: $(this).data('bydd')};
89 89 $(this).remove();
... ...
src/main/resources/static/real_control_v2/main.html
  View file @820760d
... ... @@ -55,7 +55,7 @@
55 55 <div class="uk-width-4-10">
56 56 <div class="uk-panel">
57 57 <h2 class="north-logo">
58   - <!--<i class="uk-icon-life-ring"></i>--> 滨海线路调度
  58 + <!--<i class="uk-icon-life-ring"></i>--> 共和县公交线路调度
59 59 </h2>
60 60 </div>
61 61 </div>
... ... @@ -249,7 +249,7 @@
249 249 <div>
250 250 <span class="title">维修保养计划</span>
251 251 <span class="text"> {{zbh}}&nbsp;&nbsp;{{timeStr}}&nbsp;&nbsp;进场保养</span>
252   - <span class="desc">--滨海维修库</span>
  252 + <span class="desc">--共和县公交维修库</span>
253 253 </div>
254 254 </div>
255 255 </script>
... ...