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

娄高锋
2 parents 055c8d3e 337565f1
Showing 1 changed file with 61 additions and 49 deletions
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
@@ -222,13 +222,15 @@ var gb_schedule_table = (function () {
         // 道闸标记
         var tag = line2Schedule[sch.xlBm][sch.id];
-        if(tag.sd_tag == 1){
-            sch.sd_tag = sch.sd_tag;
-            sch.sd_time = sch.sd_time;
-        }
-        if(tag.sf_tag == 1){
-            sch.sf_tag = sch.sf_tag;
-            sch.sf_time = sch.sf_time;
+        if (tag) {
+        	if(tag.sd_tag == 1){
+        		sch.sd_tag = sch.sd_tag;
+        		sch.sd_time = sch.sd_time;
+        	}
+        	if(tag.sf_tag == 1){
+        		sch.sf_tag = sch.sf_tag;
+        		sch.sf_time = sch.sf_time;
+        	}
         }
         line2Schedule[sch.xlBm][sch.id] = sch;
         //update
@@ -237,13 +239,15 @@ var gb_schedule_table = (function () {
                 // 道闸标记
                 var sch = line2Schedule[this.xlBm][this.id];
-                if(sch.sd_tag == 1){
-                    this.sd_tag = sch.sd_tag;
-                    this.sd_time = sch.sd_time;
-                }
-                if(sch.sf_tag == 1){
-                    this.sf_tag = sch.sf_tag;
-                    this.sf_time = sch.sf_time;
+                if (sch) {
+                	if(sch.sd_tag == 1){
+                		this.sd_tag = sch.sd_tag;
+                		this.sd_time = sch.sd_time;
+                	}
+                	if(sch.sf_tag == 1){
+                		this.sf_tag = sch.sf_tag;
+                		this.sf_time = sch.sf_time;
+                	}
                 }
                 line2Schedule[this.xlBm][this.id] = this;
                 xls[this.xlBm] = 1;
@@ -376,16 +380,18 @@ var gb_schedule_table = (function () {
                 this.c_t_mileage_status = calcCTaskMileageStatus(this);
                 // 道闸标记
                 var sch = line2Schedule[this.xlBm][this.id];
-                if(sch.sd_tag == 1){
-                    this.sd_tag = sch.sd_tag;
-                    this.sd_time = sch.sd_time;
+                if (sch) {
+                	if(sch.sd_tag == 1){
+                		this.sd_tag = sch.sd_tag;
+                		this.sd_time = sch.sd_time;
+                	}
+                	if(sch.sf_tag == 1){
+                		this.sf_tag = sch.sf_tag;
+                		this.sf_time = sch.sf_time;
+                	}
+                	line2Schedule[this.xlBm][this.id] = this;
+                	updateDom(this);
                 }
-                if(sch.sf_tag == 1){
-                    this.sf_tag = sch.sf_tag;
-                    this.sf_time = sch.sf_time;
-                }
-                line2Schedule[this.xlBm][this.id] = this;
-                updateDom(this);
             }catch(e){}
         });
@@ -403,16 +409,18 @@ var gb_schedule_table = (function () {
     var updateScheduleSigno = function (tag) {
         if(tag){
             var sch = line2Schedule[tag.xlBm][tag.realId];
-            if(tag.sdTag == 1){
-                sch.sd_tag = tag.sdTag;
-                sch.sd_time = tag.sdTime;
+            if (sch) {
+            	if(tag.sdTag == 1){
+            		sch.sd_tag = tag.sdTag;
+            		sch.sd_time = tag.sdTime;
+            	}
+            	if(tag.out == 1){
+            		sch.sf_tag = tag.out;
+            		sch.sf_time = tag.outTimeStr;
+            	}
+            	line2Schedule[tag.xlBm][sch.id] = sch;
+            	updateDom(sch);
             }
-            if(tag.out == 1){
-                sch.sf_tag = tag.out;
-                sch.sf_time = tag.outTimeStr;
-            }
-            line2Schedule[tag.xlBm][sch.id] = sch;
-            updateDom(sch);
         }
     };
@@ -431,15 +439,17 @@ var gb_schedule_table = (function () {
             // 道闸标记
             var sch = line2Schedule[this.xlBm][this.id];
-            if(sch.sd_tag == 1){
-                this.sd_tag = sch.sd_tag;
-                this.sd_time = sch.sd_time;
-            }
-            if(sch.sf_tag == 1){
-                this.sf_tag = sch.sf_tag;
-                this.sf_time = sch.sf_time;
+            if (sch) {
+            	if(sch.sd_tag == 1){
+            		this.sd_tag = sch.sd_tag;
+            		this.sd_time = sch.sd_time;
+            	}
+            	if(sch.sf_tag == 1){
+            		this.sf_tag = sch.sf_tag;
+            		this.sf_time = sch.sf_time;
+            	}
+            	line2Schedule[this.xlBm][this.id] = this;
             }
-            line2Schedule[this.xlBm][this.id] = this;
         });
     };
@@ -878,16 +888,18 @@ var gb_schedule_table = (function () {
                     sch = rs.t;
                     // 道闸标记
                     var tag = line2Schedule[sch.xlBm][sch.id];
-                    if(tag.sd_tag == 1){
-                        sch.sd_tag = tag.sd_tag;
-                        sch.sd_time = tag.sd_time;
-                    }
-                    if(tag.sf_tag == 1){
-                        sch.sf_tag = tag.sf_tag;
-                        sch.sf_time = tag.sf_time;
+                    if (tag) {
+                    	if(tag.sd_tag == 1){
+                    		sch.sd_tag = tag.sd_tag;
+                    		sch.sd_time = tag.sd_time;
+                    	}
+                    	if(tag.sf_tag == 1){
+                    		sch.sf_tag = tag.sf_tag;
+                    		sch.sf_time = tag.sf_time;
+                    	}
+                    	line2Schedule[sch.xlBm][sch.id] = sch;
+                    	updateDom(sch);
                     }
-                    line2Schedule[sch.xlBm][sch.id] = sch;
-                    updateDom(sch);
                     i++;
                     f();
                 }