Merge branch 'jiading' of 192.168.168.201:panzhaov5/bsth_control into jiading

ljq
2 parents bd1fd5fe 98bf8115
Showing 2 changed files with 5 additions and 3 deletions
src/main/resources/static/pages/control/line/js/webSocketHandle.js
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -107,8 +107,9 @@ var msgHandle = {
 		$tr.find('td[data-name=clZbh]').attr('class', clazz);
 	},
 	// 站点道闸
-    // stationSigno: function(msg){
-    // },
+    stationSigno: function(msg){
+		// debugger;
+    },
 	refresh: function(msg){
 		//刷新
 		layer.msg('正在切换到 ' + msg.dateStr + '数据', {icon: 16, shade: 0.6, time: 0});
@@ -375,7 +375,8 @@ var gb_schedule_table = (function () {
             if(tag.sdTag == 1){
                 sch.sd_tag = tag.sdTag;
                 sch.sd_time = tag.sdTime;
-            } else  if(tag.out == 1){
+            }
+            if(tag.out == 1){
                 sch.sf_tag = tag.out;
                 sch.sf_time = tag.outTimeStr;
             }