BJ_web_developers / hsparkingcloud

Commit b32fdbd84ede1623ff4f9deb588501896879410d

Authored by 王飞
1 parent d4144fa9

停车时长

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