潘钊 / bsth_control · Commits

Commit 58044ae717651696ff3ad4b2422055b4c5df9a24

Authored by ljq
1 parent 26b86228
build: skipped

1

Inline Side-by-side
Showing 3 changed files with 23 additions and 22 deletions
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
  View file @58044ae
@@ -22,36 +22,34 @@ var gb_dataZndd = (function (){ @@ -22,36 +22,34 @@ var gb_dataZndd = (function (){
22 var sop = function (data) { 22 var sop = function (data) {
23 //时间格式化 23 //时间格式化
24 data.types = codes[data.type]; 24 data.types = codes[data.type];
  25 + var stm = moment(new Date());
  26 + data.uuid = data.uuid + "uuid";//会出现纯数字 key取不到
25 27
26 - if (data.type == 'SFTZ_1' && sf_tz(data.lineCode) == false){  
27 - return  
28 - }  
29 - 28 + data.datarq = stm.format('HH时mm分ss秒');
  29 + dataMap.set(data.uuid,data);
30 30
31 if ((data.type == 'WD' || data.type == 'FCJG' || data.type == 'DJG') && ycsf_sx(data.lineCode) == false){ 31 if ((data.type == 'WD' || data.type == 'FCJG' || data.type == 'DJG') && ycsf_sx(data.lineCode) == false){
32 return 32 return
33 } 33 }
34 34
35 -  
36 - var stm = moment(new Date());  
37 - data.uuid = data.uuid + "uuid";//会出现纯数字 key取不到  
38 -  
39 - data.datarq = stm.format('HH时mm分ss秒');  
40 - dataMap.set(data.uuid,data);  
41 if (data.type == 'DKL'){ 35 if (data.type == 'DKL'){
42 configureDkl(); 36 configureDkl();
43 return; 37 return;
44 } 38 }
45 //末二班车 39 //末二班车
46 - if (data.type == 'DESCTWO' && mo_two(data.lineCode) == false){  
47 - configurecell(); 40 + if (data.type == 'DESCTWO'){
  41 + if (mo_two(data.lineCode) == true){
  42 + configurecell();
  43 + }
48 return; 44 return;
49 } 45 }
50 //到站时间大于发车时间 46 //到站时间大于发车时间
51 - if (data.type == 'FCSJXZD' && zdsj_sx(data.lineCode) == false){  
52 - var sch =data.sch;  
53 - sch.ddtype = 0;  
54 - gb_schedule_table.updateSchedule(sch); 47 + if (data.type == 'FCSJXZD'){
  48 + if (zdsj_sx(data.lineCode) == true){
  49 + var sch =data.sch;
  50 + sch.ddtype = 0;
  51 + gb_schedule_table.updateSchedule(sch);
  52 + }
55 return; 53 return;
56 } 54 }
57 55
@@ -139,7 +137,7 @@ var gb_dataZndd = (function (){ @@ -139,7 +137,7 @@ var gb_dataZndd = (function (){
139 return false; 137 return false;
140 } 138 }
141 //末二班车、1009路，浦东33路、1096路 139 //末二班车、1009路，浦东33路、1096路
142 - function mo_two(){ 140 + function mo_two(line){
143 var t =['60019','80302','80301']; 141 var t =['60019','80302','80301'];
144 142
145 for (var lines in t){ 143 for (var lines in t){
@@ -151,7 +149,7 @@ var gb_dataZndd = (function (){ @@ -151,7 +149,7 @@ var gb_dataZndd = (function (){
151 149
152 //实发时间大于到站时间 150 //实发时间大于到站时间
153 //定制15线、申港3路、临港7路、新临专线、中运量3号线 151 //定制15线、申港3路、临港7路、新临专线、中运量3号线
154 - function zdsj_sx(){ 152 + function zdsj_sx(line){
155 var t =['230608','60033','210810','200828','230718']; 153 var t =['230608','60033','210810','200828','230718'];
156 154
157 for (var lines in t){ 155 for (var lines in t){
src/main/resources/static/real_control_v2/mapmonitor/js/spatial_data.js
  View file @58044ae
@@ -384,6 +384,9 @@ var gb_map_spatial_data = (function () { @@ -384,6 +384,9 @@ var gb_map_spatial_data = (function () {
384 getStationArray: function (lineCode) { 384 getStationArray: function (lineCode) {
385 return lineStationArr[lineCode]; 385 return lineStationArr[lineCode];
386 }, 386 },
  387 + getcurrentLineStationArr: function (lineCode) {
  388 + return currentLineStationArr[lineCode];
  389 + },
387 carparkArray: function () { 390 carparkArray: function () {
388 return carparkArr; 391 return carparkArr;
389 } 392 }
src/main/resources/static/real_control_v2/zndd/yanshi/static/css/sjz.css
  View file @58044ae
@@ -65,8 +65,8 @@ @@ -65,8 +65,8 @@
65 } 65 }
66 .history-date ul li h3 { 66 .history-date ul li h3 {
67 float:left; 67 float:left;
68 - /*width:20%;  
69 - text-align:right;*/ 68 + width:20%;
  69 + text-align:right;
70 padding-right:19px; 70 padding-right:19px;
71 color:#c3c3c3; 71 color:#c3c3c3;
72 font:normal 18px/16px Arial; 72 font:normal 18px/16px Arial;
@@ -77,9 +77,9 @@ @@ -77,9 +77,9 @@
77 font-size:12px; 77 font-size:12px;
78 } 78 }
79 .history-date ul li dl { 79 .history-date ul li dl {
80 - /*width: 70%;*/ 80 + width: 70%;
81 float:left; 81 float:left;
82 -/* padding-left:41px;*/ 82 + padding-left:41px;
83 margin-top:-5px; 83 margin-top:-5px;
84 font-family:微软雅黑; 84 font-family:微软雅黑;
85 } 85 }