Commit 85d43ece1b4c1a521b20cee4af3b00cf5af79107

Authored by ljq
1 parent e3e011f6

1

src/main/resources/static/real_control_v2/js/stationcf/stationcf.js
@@ -6,7 +6,7 @@ var gb_stationcf = (function () { @@ -6,7 +6,7 @@ var gb_stationcf = (function () {
6 var max = 5; 6 var max = 5;
7 7
8 var popcf = function (data) { 8 var popcf = function (data) {
9 - //时间格式化 9 + /* //时间格式化
10 var stm = moment(data.instructionsTime); 10 var stm = moment(data.instructionsTime);
11 data.timeStr = stm.format('HH时mm分ss秒'); 11 data.timeStr = stm.format('HH时mm分ss秒');
12 data.type = 'cp'; 12 data.type = 'cp';
@@ -20,11 +20,11 @@ var gb_stationcf = (function () { @@ -20,11 +20,11 @@ var gb_stationcf = (function () {
20 if (len >= max) 20 if (len >= max)
21 $wrap.find('.multi_plat_msg_pops:lt(' + (len - max) + ')').remove(); 21 $wrap.find('.multi_plat_msg_pops:lt(' + (len - max) + ')').remove();
22 22
23 - $wrap.append(htmlStr); 23 + $wrap.append(htmlStr);*/
24 }; 24 };
25 25
26 26
27 - $wrap.on('click', '.all', function () { 27 + /*$wrap.on('click', '.all', function () {
28 var type = $(this).data('ip'); 28 var type = $(this).data('ip');
29 let pageUrl ="/real_control_v2/call/index.html"; 29 let pageUrl ="/real_control_v2/call/index.html";
30 //将片段路径写入 localStorage 30 //将片段路径写入 localStorage
@@ -45,11 +45,10 @@ var gb_stationcf = (function () { @@ -45,11 +45,10 @@ var gb_stationcf = (function () {
45 } 45 }
46 }); 46 });
47 //layer.full(index);//全屏 47 //layer.full(index);//全屏
  48 + });*/
48 49
49 - });  
50 50
51 -  
52 - $wrap.on('click', '.images', function () { 51 + /*$wrap.on('click', '.images', function () {
53 debugger 52 debugger
54 var image = $(this).data('image'); 53 var image = $(this).data('image');
55 var imgHtml = "<img src='" + image + "' style='width: " + 600 + "px;height:" + 300 + "px'/>"; 54 var imgHtml = "<img src='" + image + "' style='width: " + 600 + "px;height:" + 300 + "px'/>";
@@ -66,7 +65,7 @@ var gb_stationcf = (function () { @@ -66,7 +65,7 @@ var gb_stationcf = (function () {
66 } 65 }
67 }) 66 })
68 67
69 - }); 68 + });*/
70 69
71 return { 70 return {
72 popcf: popcf 71 popcf: popcf
src/main/resources/static/real_control_v2/js/zndd/data_zndd.js
@@ -12,7 +12,9 @@ var gb_dataZndd = (function (){ @@ -12,7 +12,9 @@ var gb_dataZndd = (function (){
12 'YCSF':'异常实发', 12 'YCSF':'异常实发',
13 'SFTZ_1': '实发未发,信号异常', 13 'SFTZ_1': '实发未发,信号异常',
14 }; 14 };
15 - let timelist = [],interval; 15 +
  16 +
  17 + var timelist = [],interval;
16 var dataMap = new Map(); 18 var dataMap = new Map();
17 var leftTime = 1000 * 40;//剩余的毫秒数 19 var leftTime = 1000 * 40;//剩余的毫秒数
18 var timeType = false 20 var timeType = false
@@ -25,7 +27,7 @@ var gb_dataZndd = (function (){ @@ -25,7 +27,7 @@ var gb_dataZndd = (function (){
25 return; 27 return;
26 } 28 }
27 29
28 - for (let scp in switchmap){ 30 + for (var scp in switchmap){
29 if (data.type.includes(scp)){ 31 if (data.type.includes(scp)){
30 if(switchmap[scp] == 0) 32 if(switchmap[scp] == 0)
31 return; 33 return;
@@ -62,7 +64,7 @@ var gb_dataZndd = (function (){ @@ -62,7 +64,7 @@ var gb_dataZndd = (function (){
62 } 64 }
63 timelist.push({ele:data.uuid,time:leftTime}) //自动调度定时器 65 timelist.push({ele:data.uuid,time:leftTime}) //自动调度定时器
64 $pop.append(htmlStr); 66 $pop.append(htmlStr);
65 - let msg ='检测到'+data.lineName+' '+(data.dir==0 ?'上行':'下行') 67 + var msg ='检测到'+data.lineName+' '+(data.dir==0 ?'上行':'下行')
66 +data.datarq+'出现'+data.types+'事件'+'请尽快处理,否则40秒后自动选择最优方案处理。'; 68 +data.datarq+'出现'+data.types+'事件'+'请尽快处理,否则40秒后自动选择最优方案处理。';
67 69
68 //gb_tts.audition(msg, 1.2); //语音播报 70 //gb_tts.audition(msg, 1.2); //语音播报
@@ -73,7 +75,7 @@ var gb_dataZndd = (function (){ @@ -73,7 +75,7 @@ var gb_dataZndd = (function (){
73 75
74 }; 76 };
75 77
76 - let close = true; //关闭弹出框的时候不弹出 78 + var close = true; //关闭弹出框的时候不弹出
77 $pop.on('click', '.multi_plat_config .msg-times', function () { 79 $pop.on('click', '.multi_plat_config .msg-times', function () {
78 $(this).parent().parent().remove(); 80 $(this).parent().parent().remove();
79 if (close) close = false 81 if (close) close = false
@@ -87,7 +89,7 @@ var gb_dataZndd = (function (){ @@ -87,7 +89,7 @@ var gb_dataZndd = (function (){
87 //撤销实发 89 //撤销实发
88 $pop.on('click', '.colsebc', function () { 90 $pop.on('click', '.colsebc', function () {
89 if (close) close = false 91 if (close) close = false
90 - let that = $(this); 92 + var that = $(this);
91 93
92 var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + that.data('clzbh') + '( ' + that.data('fcsj') + ' )</span>的实发时间?</h3>' 94 var content = '<h3>确定要撤销<span style="color:red;margin: 0 5px;">' + that.data('clzbh') + '( ' + that.data('fcsj') + ' )</span>的实发时间?</h3>'
93 alt_confirm(content, function () { 95 alt_confirm(content, function () {
@@ -105,7 +107,7 @@ var gb_dataZndd = (function (){ @@ -105,7 +107,7 @@ var gb_dataZndd = (function (){
105 //车辆掉线后-未实发 修改实发 107 //车辆掉线后-未实发 修改实发
106 $pop.on('click', '.sfTzbc', function () { 108 $pop.on('click', '.sfTzbc', function () {
107 if (close) close = false 109 if (close) close = false
108 - let that = $(this); 110 + var that = $(this);
109 111
110 var content = '<h3>确定要调整<span style="color:red;margin: 0 5px;">' + that.data('clzbh') + '( ' + that.data('fcsj') + ' )</span>的实发时间?</h3>' 112 var content = '<h3>确定要调整<span style="color:red;margin: 0 5px;">' + that.data('clzbh') + '( ' + that.data('fcsj') + ' )</span>的实发时间?</h3>'
111 alt_confirm(content, function () { 113 alt_confirm(content, function () {
@@ -126,10 +128,10 @@ var gb_dataZndd = (function (){ @@ -126,10 +128,10 @@ var gb_dataZndd = (function (){
126 //临加班次 128 //临加班次
127 $pop.on('click', '.multi_plat_config', function () { 129 $pop.on('click', '.multi_plat_config', function () {
128 if (!close) {close = true;return;} 130 if (!close) {close = true;return;}
129 - let that = $(this);  
130 - let data = returnDate(that);  
131 - let sch = dataMap.get(that.data('uuid'));  
132 - let typeindex = typesx(data.type); 131 + var that = $(this);
  132 + var data = returnDate(that);
  133 + var sch = dataMap.get(that.data('uuid'));
  134 + var typeindex = typesx(data.type);
133 if (typeindex == null) 135 if (typeindex == null)
134 return; 136 return;
135 137
@@ -187,8 +189,8 @@ var gb_dataZndd = (function (){ @@ -187,8 +189,8 @@ var gb_dataZndd = (function (){
187 var regionStopid = thisall.data('regionstopid'); 189 var regionStopid = thisall.data('regionstopid');
188 var ids = thisall.data('ids'); 190 var ids = thisall.data('ids');
189 var lgtype = thisall.data('lgtype'); 191 var lgtype = thisall.data('lgtype');
190 - let selctype = $('#selc').val();  
191 - let date = { 192 + var selctype = $('#selc').val();
  193 + var date = {
192 selctype : selctype, 194 selctype : selctype,
193 lineCode : lineCode, 195 lineCode : lineCode,
194 lineName : lineName, 196 lineName : lineName,
@@ -239,7 +241,7 @@ var gb_dataZndd = (function (){ @@ -239,7 +241,7 @@ var gb_dataZndd = (function (){
239 241
240 //对比是哪个div需要减少时间 242 //对比是哪个div需要减少时间
241 function chenckdiv(divs,ids){ 243 function chenckdiv(divs,ids){
242 - for (let t in divs){ 244 + for (var t in divs){
243 if (ids == divs[t].data('ids')){ 245 if (ids == divs[t].data('ids')){
244 return divs[t]; 246 return divs[t];
245 } 247 }
@@ -250,10 +252,10 @@ var gb_dataZndd = (function (){ @@ -250,10 +252,10 @@ var gb_dataZndd = (function (){
250 function TimeChick(ele,type){ 252 function TimeChick(ele,type){
251 debugger 253 debugger
252 var thisall= $("#"+ele).parent(); 254 var thisall= $("#"+ele).parent();
253 - let sch = dataMap.get(thisall.data('uuid')); 255 + var sch = dataMap.get(thisall.data('uuid'));
254 256
255 if (thisall.length == 0) return; 257 if (thisall.length == 0) return;
256 - let date = returnDate(thisall); 258 + var date = returnDate(thisall);
257 if (date == null) 259 if (date == null)
258 return 260 return
259 if (type == "DJG"){ 261 if (type == "DJG"){
@@ -293,7 +295,7 @@ var gb_dataZndd = (function (){ @@ -293,7 +295,7 @@ var gb_dataZndd = (function (){
293 } 295 }
294 296
295 if (type == "WD"){ 297 if (type == "WD"){
296 - let minute = 6; 298 + var minute = 6;
297 gb_common.$post_arr('/realSchedule/lateAdjust', {idx: sch.sch.id, minute: minute}, function (rs) { 299 gb_common.$post_arr('/realSchedule/lateAdjust', {idx: sch.sch.id, minute: minute}, function (rs) {
298 console.log('误点调整rs', rs); 300 console.log('误点调整rs', rs);
299 if(rs.ts){ 301 if(rs.ts){
@@ -317,7 +319,7 @@ var gb_dataZndd = (function (){ @@ -317,7 +319,7 @@ var gb_dataZndd = (function (){
317 //定时器自动提交 319 //定时器自动提交
318 function TimeChickConfig(){ 320 function TimeChickConfig(){
319 var thisall= $('.multi_plat_msg_pop_zndd .multi_plat_config #submitTwo'); 321 var thisall= $('.multi_plat_msg_pop_zndd .multi_plat_config #submitTwo');
320 - let date = returnDate(thisall); 322 + var date = returnDate(thisall);
321 date.selctype = $('#configSelect').val(); 323 date.selctype = $('#configSelect').val();
322 324
323 if (date.selctype == 'X1'){ 325 if (date.selctype == 'X1'){