Merge branch 'qingpu' of http://222.66.0.204:8090/panzhaov5/bsth_control into qingpu

徐烜
2 parents 9aa32b85 d1db0904
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
src/main/resources/static/pages/control/line/js/webSocketHandle.js
@@ -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> 
@@ -132,7 +132,7 @@ function appendLogItem(tempId, json, lineCode){
 		//语音播报
 		var text = $(htmlStr).find('.log-item-text').text();
 		var lineName = _data.getLineIds()[lineCode];
-		h5Speech.speak(lineName.replace('闵行', '') + '  ' + text);
+		h5Speech.speak(lineName + '  ' + text);
 	}
 	//重新计算未处理消息
 	_messenger.setUntreatedNum(lineCode);