BJ_web_developers / hsparkingcloud

Commit afdcc938208cbe543cf47ce30f94a3db79031af1

Authored by 王飞
1 parent b32fdbd8

停车时长-回退

Inline Side-by-side
Showing 1 changed file with 25 additions and 48 deletions
assets/pages/scripts/operationFile/lengthofParking/lengthofparking.js
  View file @afdcc93
... ... @@ -138,15 +138,8 @@ var parklenfun = {
138 138 ],
139 139 [
140 140 {
141   - field: 'dataOf0',
142   - title: '0-3m',
143   - width: '10%',
144   - align: "left",
145   - formatter: commonObj.replacenull
146   - },
147   - {
148 141 field: 'dataOf1',
149   - title: '3-15m',
  142 + title: '0-15m',
150 143 width: '10%',
151 144 align: "left",
152 145 formatter: commonObj.replacenull
... ... @@ -282,8 +275,7 @@ var parklenfun = {
282 275 var dateArray = parklenfun.getDateArray();
283 276 result['dateArray'] = dateArray;
284 277 // 0 - 15 分钟数据
285   - var $0_3 = [];
286   - var $3_15 = [];
  278 + var $0_15 = [];
287 279 var $15_30 = [];
288 280 var $30_1h = [];
289 281 var $1h_6h = [];
... ... @@ -296,14 +288,13 @@ var parklenfun = {
296 288 var dateDataTemp = {};
297 289 $.each(remoteData, function (index, item) {
298 290 var temp = [];
299   - temp[0] = (item['dataOf0'] == null ? 0 : item['dataOf0']);
300   - temp[1] = (item['dataOf1'] == null ? 0 : item['dataOf1']);
301   - temp[2] = (item['dataOf2'] == null ? 0 : item['dataOf2']);
302   - temp[3] = (item['dataOf3'] == null ? 0 : item['dataOf3']);
303   - temp[4] = (item['dataOf4'] == null ? 0 : item['dataOf4']);
304   - temp[5] = (item['dataOf5'] == null ? 0 : item['dataOf5']);
305   - temp[6] = (item['dataOf6'] == null ? 0 : item['dataOf6']);
306   - temp[7] = (item['dataOf7'] == null ? 0 : item['dataOf7']);
  291 + temp[0] = (item['dataOf1'] == null ? 0 : item['dataOf1']);
  292 + temp[1] = (item['dataOf2'] == null ? 0 : item['dataOf2']);
  293 + temp[2] = (item['dataOf3'] == null ? 0 : item['dataOf3']);
  294 + temp[3] = (item['dataOf4'] == null ? 0 : item['dataOf4']);
  295 + temp[4] = (item['dataOf5'] == null ? 0 : item['dataOf5']);
  296 + temp[5] = (item['dataOf6'] == null ? 0 : item['dataOf6']);
  297 + temp[6] = (item['dataOf7'] == null ? 0 : item['dataOf7']);
307 298 dateDataTemp[item.staticTimeStr] = temp;
308 299 })
309 300  
... ... @@ -314,17 +305,15 @@ var parklenfun = {
314 305  
315 306 var temp = dateDataTemp[dateItem]
316 307 if (null != temp) {
317   - $0_3.push(temp[0]);
318   - $3_15.push(temp[1]);
319   - $15_30.push(temp[2]);
320   - $30_1h.push(temp[3]);
321   - $1h_6h.push(temp[4]);
322   - $6h_12h.push(temp[5]);
323   - $12h_24h.push(temp[6]);
324   - $1dayup.push(temp[7]);
  308 + $0_15.push(temp[0]);
  309 + $15_30.push(temp[1]);
  310 + $30_1h.push(temp[2]);
  311 + $1h_6h.push(temp[3]);
  312 + $6h_12h.push(temp[4]);
  313 + $12h_24h.push(temp[5]);
  314 + $1dayup.push(temp[6]);
325 315 } else {
326   - $0_3.push(0);
327   - $3_15.push(0);
  316 + $0_15.push(0);
328 317 $15_30.push(0);
329 318 $30_1h.push(0);
330 319 $1h_6h.push(0);
... ... @@ -334,8 +323,8 @@ var parklenfun = {
334 323 }
335 324  
336 325 })
337   - result['$0_3'] = $0_3;
338   - result['$3_15'] = $3_15;
  326 +
  327 + result['$0_15'] = $0_15;
339 328 result['$15_30'] = $15_30;
340 329 result['$30_1h'] = $30_1h;
341 330 result['$1h_6h'] = $1h_6h;
... ... @@ -499,9 +488,7 @@ function chartDataHandel(data) {
499 488 $.each(data, function (index, item) {
500 489 if (item.plType == 1) {
501 490 //路侧
502   - if (item.dataOf0 == null) {
503   - lcArray.push(0);
504   - } else if (item.dataOf1 == null) {
  491 + if (item.dataOf1 == null) {
505 492 lcArray.push(0);
506 493 } else if (item.dataOf2 == null) {
507 494 lcArray.push(0);
... ... @@ -516,7 +503,6 @@ function chartDataHandel(data) {
516 503 } else if (item.dataOf7 == null) {
517 504 lcArray.push(0);
518 505 } else {
519   - lcArray.push(item.dataOf0);
520 506 lcArray.push(item.dataOf1);
521 507 lcArray.push(item.dataOf2);
522 508 lcArray.push(item.dataOf3);
... ... @@ -528,9 +514,7 @@ function chartDataHandel(data) {
528 514 }
529 515 else {
530 516 //封闭
531   - if (item.dataOf0 == null) {
532   - lcArray.push(0);
533   - } else if (item.dataOf1 == null) {
  517 + if (item.dataOf1 == null) {
534 518 fbArray.push(0);
535 519 } else if (item.dataOf2 == null) {
536 520 fbArray.push(0);
... ... @@ -620,7 +604,7 @@ function chartDataHandel(data) {
620 604 show: false
621 605 },
622 606 // data:[1,2,3,4,5,6,7],
623   - data: ['0-3m','3-15m', '15-30m', '30m-1h', '1-6h', '6-12h', '12-24h', '1天以上']
  607 + data: ['0-15m', '15-30m', '30m-1h', '1-6h', '6-12h', '12-24h', '1天以上']
624 608 }
625 609 ],
626 610 yAxis: [
... ... @@ -773,7 +757,7 @@ function fbchartDataHandel(remoteData) {
773 757 //停车分布 echarts
774 758 var mylineChart = echarts.init(document.getElementById('parklen-line-echarts'));
775 759 var lineoption = {
776   - color: ['#50c000','#50c0f5', '#5fe98f', '#fd8d6f', '#fdd471', '#7dcecf', '#a5dff3', '#fff1db'],
  760 + color: ['#50c0f5', '#5fe98f', '#fd8d6f', '#fdd471', '#7dcecf', '#a5dff3', '#fff1db'],
777 761 tooltip: {
778 762 trigger: 'axis',
779 763 axisPointer: {
... ... @@ -867,18 +851,11 @@ function fbchartDataHandel(remoteData) {
867 851 ],
868 852 series: [
869 853 {
870   - name: '0-3m',
871   - type: 'line',
872   - stack: '总量',
873   - areaStyle: {normal: {}},
874   - data: result['$0_3']
875   - },
876   - {
877   - name: '3-15m',
  854 + name: '0-15m',
878 855 type: 'line',
879 856 stack: '总量',
880 857 areaStyle: {normal: {}},
881   - data: result['$3_15']
  858 + data: result['$0_15']
882 859 },
883 860  
884 861 {
... ...