Commit dd89160840fd5d35e2fd5f2f1d44adddb95363c3
Merge branch 'qingpu' of http://222.66.0.204:8090/panzhaov5/bsth_control into qingpu
Showing
4 changed files
with
2 additions
and
2 deletions
src/main/resources/static/assets/img/login_bgcenter.png
src/main/resources/static/assets/img/logo_text.png
src/main/resources/static/pages/control/line/index.html
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | <div class="portlet-title banner" > | 18 | <div class="portlet-title banner" > |
| 19 | <div class="caption col_hide_1280" style="color: #FFF;"> | 19 | <div class="caption col_hide_1280" style="color: #FFF;"> |
| 20 | <i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span | 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 | </div> | 22 | </div> |
| 23 | <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;"> | 23 | <div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;"> |
| 24 | <span class="top_username"></span> <span class="operation_mode_text animated" ></span> | 24 | <span class="top_username"></span> <span class="operation_mode_text animated" ></span> |
src/main/resources/static/pages/control/line/js/webSocketHandle.js
| @@ -132,7 +132,7 @@ function appendLogItem(tempId, json, lineCode){ | @@ -132,7 +132,7 @@ function appendLogItem(tempId, json, lineCode){ | ||
| 132 | //语音播报 | 132 | //语音播报 |
| 133 | var text = $(htmlStr).find('.log-item-text').text(); | 133 | var text = $(htmlStr).find('.log-item-text').text(); |
| 134 | var lineName = _data.getLineIds()[lineCode]; | 134 | var lineName = _data.getLineIds()[lineCode]; |
| 135 | - h5Speech.speak(lineName.replace('闵行', '') + ' ' + text); | 135 | + h5Speech.speak(lineName + ' ' + text); |
| 136 | } | 136 | } |
| 137 | //重新计算未处理消息 | 137 | //重新计算未处理消息 |
| 138 | _messenger.setUntreatedNum(lineCode); | 138 | _messenger.setUntreatedNum(lineCode); |