潘钊 / bsth_control · Commits

Commit db3adef52572d2e2a6d756d1a8b327a3ad911407

Authored by 王通
1 parent 6ebe171a
build: skipped

1.临港公交调度

Inline Side-by-side
Showing 8 changed files with 10 additions and 8 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @db3adef
@@ -1408,7 +1408,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1408,7 +1408,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1408 */ 1408 */
1409 private void setCompanyName(String company){ 1409 private void setCompanyName(String company){
1410 if(company.equals("闵行公司")){ 1410 if(company.equals("闵行公司")){
1411 - company = "浦东闵行公交公司"; 1411 + company = "浦东临港公交公司";
1412 }else if(company.equals("杨高公司")){ 1412 }else if(company.equals("杨高公司")){
1413 company = "浦东杨高公交公司"; 1413 company = "浦东杨高公交公司";
1414 }else if(company.equals("上南公司")){ 1414 }else if(company.equals("上南公司")){
@@ -1419,6 +1419,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{ @@ -1419,6 +1419,8 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1419 company = "浦东南汇公交公司"; 1419 company = "浦东南汇公交公司";
1420 }else if(company.equals("青浦公交")){ 1420 }else if(company.equals("青浦公交")){
1421 company = "浦东青浦公交公司"; 1421 company = "浦东青浦公交公司";
  1422 + } else if (company.equals("临港公交")) {
  1423 + company = "上海临港交通有限公司";
1422 } 1424 }
1423 } 1425 }
1424 /** 1426 /**
src/main/resources/static/index.html
  View file @db3adef
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 <!-- LOGO --> 220 <!-- LOGO -->
221 <div class="page-logo"> 221 <div class="page-logo">
222 <a href="index.html" class="logo-default logo-default-text"> 222 <a href="index.html" class="logo-default logo-default-text">
223 - 闵行公交调度系统 </a> 223 + 临港公交调度系统 </a>
224 <div class="menu-toggler sidebar-toggler"></div> 224 <div class="menu-toggler sidebar-toggler"></div>
225 </div> 225 </div>
226 <!-- END LOGO --> 226 <!-- END LOGO -->
src/main/resources/static/login.html
  View file @db3adef
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <div class="wrapper ng-scope"> 181 <div class="wrapper ng-scope">
182 <div id="loginPanel" class="dialog dialog-shadow"> 182 <div id="loginPanel" class="dialog dialog-shadow">
183 <br> 183 <br>
184 - <h3 class="logo-text">闵行公交调度系统</h3> 184 + <h3 class="logo-text">临港公交调度系统</h3>
185 <hr> 185 <hr>
186 <form style="padding: 0px 35px;"> 186 <form style="padding: 0px 35px;">
187 <div class="form-group" style="margin-bottom: 0"> 187 <div class="form-group" style="margin-bottom: 0">
src/main/resources/static/pages/scheduleApp/module/core/busConfig/dataExport.html
  View file @db3adef
@@ -8,7 +8,7 @@ ttinfoname=85路0328平表 @@ -8,7 +8,7 @@ ttinfoname=85路0328平表
8 8
9 xlname=85路 9 xlname=85路
10 10
11 -filepath=/Users/xu/resource/project/bsth_control_etl/闵行公交/85路0328平表-测试1-时刻明细.xls 11 +filepath=/Users/xu/resource/project/bsth_control_etl/临港公交/85路0328平表-测试1-时刻明细.xls
12 12
13 erroroutputdir=/Users/xu/resource/project/bsth_control_u_d_files/erroroutput 13 erroroutputdir=/Users/xu/resource/project/bsth_control_u_d_files/erroroutput
14 14
src/main/resources/static/real_control_v2/main.html
  View file @db3adef
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 <div class="uk-width-4-10"> 59 <div class="uk-width-4-10">
60 <div class="uk-panel"> 60 <div class="uk-panel">
61 <h2 class="north-logo"> 61 <h2 class="north-logo">
62 - <!--<i class="uk-icon-life-ring"></i>--> 闵行公交线路调度 62 + <!--<i class="uk-icon-life-ring"></i>--> 临港公交线路调度
63 </h2> 63 </h2>
64 </div> 64 </div>
65 </div> 65 </div>
src/main/resources/static/real_control_v2/sch_manage/sch_imitate.html
  View file @db3adef
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 <div class="uk-width-4-10"> 164 <div class="uk-width-4-10">
165 <div class="uk-panel"> 165 <div class="uk-panel">
166 <h2 class="north-logo" style="color: #f1f1f1;"> 166 <h2 class="north-logo" style="color: #f1f1f1;">
167 - <i class="uk-icon-life-ring"></i> 闵行公交线路调度班次管理 167 + <i class="uk-icon-life-ring"></i> 临港公交线路调度班次管理
168 </h2> 168 </h2>
169 </div> 169 </div>
170 </div> 170 </div>
src/main/resources/static/real_control_v2_mobile/main.html
  View file @db3adef
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <div class="uk-width-4-10"> 56 <div class="uk-width-4-10">
57 <div class="uk-panel"> 57 <div class="uk-panel">
58 <h2 class="north-logo"> 58 <h2 class="north-logo">
59 - <!--<i class="uk-icon-life-ring"></i>--> 闵行公交线路调度 59 + <!--<i class="uk-icon-life-ring"></i>--> 临港公交线路调度
60 </h2> 60 </h2>
61 </div> 61 </div>
62 </div> 62 </div>
src/main/resources/static/real_control_v2_mobile/sch_manage/sch_imitate.html
  View file @db3adef
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 <div class="uk-width-4-10"> 164 <div class="uk-width-4-10">
165 <div class="uk-panel"> 165 <div class="uk-panel">
166 <h2 class="north-logo" style="color: #f1f1f1;"> 166 <h2 class="north-logo" style="color: #f1f1f1;">
167 - <i class="uk-icon-life-ring"></i> 闵行公交线路调度班次管理 167 + <i class="uk-icon-life-ring"></i> 临港公交线路调度班次管理
168 </h2> 168 </h2>
169 </div> 169 </div>
170 </div> 170 </div>