1.共和县

王通
1 parent bb5620c9
Showing 10 changed files with 9 additions and 75 deletions
src/main/java/com/bsth/service/forms/impl/BudgetServiceImpl.java
src/main/resources/rules/kBase1_core_plan.drl
src/main/resources/static/index.html
src/main/resources/static/login.html
src/main/resources/static/pages/base/stationroute/js/stationroute-ajax-getdata.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-events.js
src/main/resources/static/pages/base/stationroute/js/stationroute-list-reload.js
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/real_control_v2/js/safe_driv/safeDriv.js
src/main/resources/static/real_control_v2/main.html
@@ -3185,7 +3185,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			} else if("26".equals(sp[0])){
 				gs = "南汇公司";
 			} else if("all".equals(sp[0])){
-				gs = "滨海合计";
+				gs = "共和县公交合计";
 				num = "0";
 			}
 			if("1".equals(sp[1])){
@@ -3242,7 +3242,7 @@ public class BudgetServiceImpl extends BaseServiceImpl&lt;Budget, Integer&gt; implemen
 			} else if("26".equals(sp[0])){
 				gs = "南汇公司";
 			} else if("all".equals(sp[0])){
-				gs = "滨海合计";
+				gs = "共和县公交合计";
 				num = "0";
 			}
 			if("1".equals(sp[1])){
@@ -75,7 +75,7 @@ function Map gsMap(List gses) {
     for (int i = 0; i < gses.size(); i++) {
         Business gs = (Business) gses.get(i);
         if (StringUtils.isNotEmpty(gs.getBusinessCode())) {
-            if ("88".equals(gs.getUpCode())) { // 滨海
+            if ("88".equals(gs.getUpCode())) { // 共和县公交
                 gsMap.put(gs.getBusinessCode(), gs);
             }
             if (gs.getBusinessCode().equals(gs.getUpCode())) { // 闵行，青浦
@@ -220,7 +220,7 @@
 		<!-- LOGO -->
 		<div class="page-logo">
 			<a href="index.html" class="logo-default logo-default-text">
-				滨海调度系统 </a>
+				共和县公交调度系统 </a>
 			<div class="menu-toggler sidebar-toggler"></div>
 		</div>
 		<!-- END LOGO -->
@@ -181,7 +181,7 @@
 <div class="wrapper ng-scope">
     <div id="loginPanel" class="dialog dialog-shadow">
         <br>
-        <h3 class="logo-text">滨海调度系统</h3>
+        <h3 class="logo-text">共和县公交调度系统</h3>
         <hr>
         <form style="padding: 0px 35px;">
             <div class="form-group" style="margin-bottom: 0">
@@ -153,12 +153,6 @@ var GetAjaxData = function(){
 				callback && callback(result);
 			});
 		},
-		// 查询外部行业编码是否有更新
-		matchIndustryCode : function (lineId,callback) {
-			$post('/stationroute/matchIndustryCode' ,{"lineId":lineId}, function(result){
-				callback && callback(result);
-			});
-		},
 		// 查询站点信息
 		getStationRouteInfo : function(lineId,direction,callback) {
@@ -323,60 +323,6 @@ $(function(){
 		$('.defeat-scroll').css('overflow','hidden');
 	});
-	$(".match_station_bnt").on("click",function () {
-        var index = layer.open({
-            title: '提示',
-            content:'是否匹配外部上下行站点行业编码!',
-            // type: 1,
-            // area: ['600px', '360px'],
-            // scrollbar: false,
-
-            btn:['确定','取消'],
-            yes: function(index){
-                var lineId = LineObj.getLineObj().id;
-                GetAjaxData.matchIndustryCode(lineId,function (rs) {
-                // $post("/stationroute/matchIndustryCode",{"lineId":lineId},function (rs) {
-                    if(rs.status == "SUCCESS"){
-                        var map = new Map();
-                        var upMatch = rs.upMatch, downMatch = rs.downMatch;
-                    	if(upMatch !=null && upMatch.length>0){
-                            map.set("up",upMatch);
-						}
-						if(downMatch !=null && downMatch.length>0){
-                            map.set("down",downMatch);
-						}
-						if(map.size>0){
-                            $('.portlet-title .match_station').addClass('hidden');
-                            PublicFunctions.resjtreeDate(lineId,0,$("#versions").val());
-                            /** 查询上行路段信息 @param:<Line.id：线路Id；0：上行> @return：data：路段数据 */
-//                            GetAjaxData.getSectionRouteInfo(lineId,0,function(data) {
-//                                /** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
-//                                PublicFunctions.linePanlThree(lineId,data,0);
-//                            });
-                            $('#stationDown').removeClass('active');
-                            $('#stationDown').removeClass('in');
-                            $('#stationDown').addClass('fade');
-                            $('#stationUp').addClass('active in');
-                            $('#downLine').parent().removeClass('active');
-                            $('#upLine').parent().addClass('active');
-                            $.get('match_station_industryCode.html', function(m){
-                                $(pjaxContainer).append(m);
-                                $('#match_station_industryCode_mobal').trigger('match_station_industryCodeMobal.show', map);
-                            });
-                        } else {
-                    		layer.msg("没有匹配到外部站点数据，请手动添加！")
-						}
-                    } else
-                        layer.msg("匹配出错，请手动添加！")
-                });
-                layer.close(index);
-            },
-			btn2:function(){
-				layer.closeAll(index); //关闭当前窗口
-			}
-        });
-    })
-
 	// 进出场规划
 	$('#leftUpOrDown #inoutLine').on('click', function(){
 		var lineIdEvents = LineObj.getLineObj();
@@ -202,12 +202,6 @@ $(function() {
 			});
-			GetAjaxData.getLineMatchStationIsUpdate(Line.id, function(data) {
-				if (data.status == 'SUCCESS' && data.data == "1") {
-					$('.portlet-title .match_station').removeClass('hidden');
-				}
-			});
-
 			$('#esc_edit_div').on(
 					'click',
 					function() {
@@ -18,7 +18,7 @@
     <div class="portlet-title banner" >
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">滨海线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">共和县公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
 			<span class="top_username"></span> <span class="operation_mode_text animated" ></span> 
@@ -83,7 +83,7 @@ var gb_safe_driv = (function () {
                     $.post('/realSchedule/ackCp', {id : id}, function(res) {});
                 }
                 break;
-            // 滨海维修库
+            // 共和县公交维修库
             case 'mt':
                 var data = { zbh: $(this).data('zbh'), bydj: $(this).data('bydj'), bysj: $(this).data('bysj'), bydd: $(this).data('bydd')};
                 $(this).remove();
@@ -55,7 +55,7 @@
         <div class="uk-width-4-10">
             <div class="uk-panel">
                 <h2 class="north-logo">
-                    <!--<i class="uk-icon-life-ring"></i>--> 滨海线路调度
+                    <!--<i class="uk-icon-life-ring"></i>--> 共和县公交线路调度
                 </h2>
             </div>
         </div>
@@ -249,7 +249,7 @@
         <div>
             <span class="title">维修保养计划</span>
             <span class="text"> {{zbh}}&nbsp;&nbsp;{{timeStr}}&nbsp;&nbsp;进场保养</span>
-            <span class="desc">--滨海维修库</span>
+            <span class="desc">--共和县公交维修库</span>
         </div>
     </div>
 </script>