停车时长-回退

王飞
1 parent b32fdbd8
Showing 1 changed file with 25 additions and 48 deletions
assets/pages/scripts/operationFile/lengthofParking/lengthofparking.js
@@ -138,15 +138,8 @@ var parklenfun = {
                 ],
                 [
                     {
-                        field: 'dataOf0',
-                        title: '0-3m',
-                        width: '10%',
-                        align: "left",
-                        formatter: commonObj.replacenull
-                    },
-                    {
                         field: 'dataOf1',
-                        title: '3-15m',
+                        title: '0-15m',
                         width: '10%',
                         align: "left",
                         formatter: commonObj.replacenull
@@ -282,8 +275,7 @@ var parklenfun = {
         var dateArray = parklenfun.getDateArray();
         result['dateArray'] = dateArray;
         // 0 - 15 分钟数据
-        var $0_3 = [];
-        var $3_15 = [];
+        var $0_15 = [];
         var $15_30 = [];
         var $30_1h = [];
         var $1h_6h = [];
@@ -296,14 +288,13 @@ var parklenfun = {
         var dateDataTemp = {};
         $.each(remoteData, function (index, item) {
             var temp = [];
-            temp[0] = (item['dataOf0'] == null ? 0 : item['dataOf0']);
-            temp[1] = (item['dataOf1'] == null ? 0 : item['dataOf1']);
-            temp[2] = (item['dataOf2'] == null ? 0 : item['dataOf2']);
-            temp[3] = (item['dataOf3'] == null ? 0 : item['dataOf3']);
-            temp[4] = (item['dataOf4'] == null ? 0 : item['dataOf4']);
-            temp[5] = (item['dataOf5'] == null ? 0 : item['dataOf5']);
-            temp[6] = (item['dataOf6'] == null ? 0 : item['dataOf6']);
-            temp[7] = (item['dataOf7'] == null ? 0 : item['dataOf7']);
+            temp[0] = (item['dataOf1'] == null ? 0 : item['dataOf1']);
+            temp[1] = (item['dataOf2'] == null ? 0 : item['dataOf2']);
+            temp[2] = (item['dataOf3'] == null ? 0 : item['dataOf3']);
+            temp[3] = (item['dataOf4'] == null ? 0 : item['dataOf4']);
+            temp[4] = (item['dataOf5'] == null ? 0 : item['dataOf5']);
+            temp[5] = (item['dataOf6'] == null ? 0 : item['dataOf6']);
+            temp[6] = (item['dataOf7'] == null ? 0 : item['dataOf7']);
             dateDataTemp[item.staticTimeStr] = temp;
         })
@@ -314,17 +305,15 @@ var parklenfun = {
             var temp = dateDataTemp[dateItem]
             if (null != temp) {
-                $0_3.push(temp[0]);
-                $3_15.push(temp[1]);
-                $15_30.push(temp[2]);
-                $30_1h.push(temp[3]);
-                $1h_6h.push(temp[4]);
-                $6h_12h.push(temp[5]);
-                $12h_24h.push(temp[6]);
-                $1dayup.push(temp[7]);
+                $0_15.push(temp[0]);
+                $15_30.push(temp[1]);
+                $30_1h.push(temp[2]);
+                $1h_6h.push(temp[3]);
+                $6h_12h.push(temp[4]);
+                $12h_24h.push(temp[5]);
+                $1dayup.push(temp[6]);
             } else {
-                $0_3.push(0);
-                $3_15.push(0);
+                $0_15.push(0);
                 $15_30.push(0);
                 $30_1h.push(0);
                 $1h_6h.push(0);
@@ -334,8 +323,8 @@ var parklenfun = {
             }
         })
-        result['$0_3'] = $0_3;
-        result['$3_15'] = $3_15;
+
+        result['$0_15'] = $0_15;
         result['$15_30'] = $15_30;
         result['$30_1h'] = $30_1h;
         result['$1h_6h'] = $1h_6h;
@@ -499,9 +488,7 @@ function chartDataHandel(data) {
     $.each(data, function (index, item) {
         if (item.plType == 1) {
             //路侧
-            if (item.dataOf0 == null) {
-                lcArray.push(0);
-            } else if (item.dataOf1 == null) {
+            if (item.dataOf1 == null) {
                 lcArray.push(0);
             } else if (item.dataOf2 == null) {
                 lcArray.push(0);
@@ -516,7 +503,6 @@ function chartDataHandel(data) {
             } else if (item.dataOf7 == null) {
                 lcArray.push(0);
             } else {
-                lcArray.push(item.dataOf0);
                 lcArray.push(item.dataOf1);
                 lcArray.push(item.dataOf2);
                 lcArray.push(item.dataOf3);
@@ -528,9 +514,7 @@ function chartDataHandel(data) {
         }
         else {
             //封闭
-            if (item.dataOf0 == null) {
-                lcArray.push(0);
-            } else if (item.dataOf1 == null) {
+            if (item.dataOf1 == null) {
                 fbArray.push(0);
             } else if (item.dataOf2 == null) {
                 fbArray.push(0);
@@ -620,7 +604,7 @@ function chartDataHandel(data) {
                     show: false
                 },
                 // data:[1,2,3,4,5,6,7],
-                data: ['0-3m','3-15m', '15-30m', '30m-1h', '1-6h', '6-12h', '12-24h', '1天以上']
+                data: ['0-15m', '15-30m', '30m-1h', '1-6h', '6-12h', '12-24h', '1天以上']
             }
         ],
         yAxis: [
@@ -773,7 +757,7 @@ function fbchartDataHandel(remoteData) {
     //停车分布 echarts
     var mylineChart = echarts.init(document.getElementById('parklen-line-echarts'));
     var lineoption = {
-        color: ['#50c000','#50c0f5', '#5fe98f', '#fd8d6f', '#fdd471', '#7dcecf', '#a5dff3', '#fff1db'],
+        color: ['#50c0f5', '#5fe98f', '#fd8d6f', '#fdd471', '#7dcecf', '#a5dff3', '#fff1db'],
         tooltip: {
             trigger: 'axis',
             axisPointer: {
@@ -867,18 +851,11 @@ function fbchartDataHandel(remoteData) {
         ],
         series: [
             {
-                name: '0-3m',
-                type: 'line',
-                stack: '总量',
-                areaStyle: {normal: {}},
-                data: result['$0_3']
-            },
-            {
-                name: '3-15m',
+                name: '0-15m',
                 type: 'line',
                 stack: '总量',
                 areaStyle: {normal: {}},
-                data: result['$3_15']
+                data: result['$0_15']
             },
             {