优化

assets/js/controllers/charts4.js

@@ -932,8 +932,8 @@ function getiIncidentFiveAllData(time){
                 res.quantityStatistics[i].category="信息系统"
             }
         }
-        $scope.fenlei=res.quantityStatistics;
-        var pieData=res.quantityStatisticsList;
+        $scope.fenlei=res.quantityStatistics || [];
+        var pieData=res.quantityStatisticsList || [];
         // 近五年事件统计
         option_incidentFiveAll.xAxis[0].data=[];
         option_incidentFiveAll.series[0].data=[];
@@ -949,46 +949,45 @@ function getiIncidentFiveAllData(time){
         option_classification.legend.data=[];
         option_classification.radar.indicator=[];
         option_classification.series[0].data=[];
-        var all_category0=0;
-        var all_category1=0;
-        var all_category2=0;
-        var all_category3=0;
-        var all_category4=0;
+        var all_category = $scope.fenlei.map(function(v){return 0});
         for(var i=0;i<pieData.length;i++){
             // all_category0+=Number(pieData[i].category0);
             // all_category1+=Number(pieData[i].category1);
             // all_category2+=Number(pieData[i].category2);
             // all_category3+=Number(pieData[i].category3);
             // all_category4+=Number(pieData[i].category4);
-            if(all_category0 < Number(pieData[i].category0)){
-                all_category0 = Number(pieData[i].category0)
-            }
-            if(all_category1 <  Number(pieData[i].category1)){
-                all_category1 =  Number(pieData[i].category1)
-            }
-            if(all_category2 <  Number(pieData[i].category2)){
-                all_category2 =  Number(pieData[i].category2)
-            }
-            if(all_category3 <  Number(pieData[i].category3)){
-                all_category3 =  Number(pieData[i].category3)
-            }
-            if(all_category4 <  Number(pieData[i].category4)){
-                all_category4=  Number(pieData[i].category4)
-            }
+            if(all_category[i] < Number(pieData[i]['category' + i])){
+                all_category[i] = Number(pieData[i]['category' + i]);
+            }
+            // if(all_category1 <  Number(pieData[i].category1)){
+            //     all_category1 =  Number(pieData[i].category1)
+            // }
+            // if(all_category2 <  Number(pieData[i].category2)){
+            //     all_category2 =  Number(pieData[i].category2)
+            // }
+            // if(all_category3 <  Number(pieData[i].category3)){
+            //     all_category3 =  Number(pieData[i].category3)
+            // }
+            // if(all_category4 <  Number(pieData[i].category4)){
+            //     all_category4=  Number(pieData[i].category4)
+            // }
         }
-        console.log(all_category0);
-        console.log(all_category1);
-        console.log(all_category2);
-        console.log(all_category3);
-        console.log(all_category4);
+        // console.log(all_category0);
+        // console.log(all_category1);
+        // console.log(all_category2);
+        // console.log(all_category3);
+        // console.log(all_category4);
         for(var i=0;i<pieData.length;i++){
             option_classification.legend.data.push(pieData[i].date)
         }
-        option_classification.radar.indicator.push({"name":$scope.fenlei[0].category,"max":all_category0});
-        option_classification.radar.indicator.push({"name":$scope.fenlei[1].category,"max":all_category1});
-        option_classification.radar.indicator.push({"name":$scope.fenlei[2].category,"max":all_category2});
-        option_classification.radar.indicator.push({"name":$scope.fenlei[3].category,"max":all_category3});
-        option_classification.radar.indicator.push({"name":$scope.fenlei[4].category,"max":all_category4});
+        for(var i=0;i<$scope.fenlei.length;i++){
+            option_classification.radar.indicator.push({"name":$scope.fenlei[i].category,"max":all_category[i]});
+        }
+        // option_classification.radar.indicator.push({"name":$scope.fenlei[0].category,"max":all_category0});
+        // option_classification.radar.indicator.push({"name":$scope.fenlei[1].category,"max":all_category1});
+        // option_classification.radar.indicator.push({"name":$scope.fenlei[2].category,"max":all_category2});
+        // option_classification.radar.indicator.push({"name":$scope.fenlei[3].category,"max":all_category3});
+        // option_classification.radar.indicator.push({"name":$scope.fenlei[4].category,"max":all_category4});
         for(var i=0;i<pieData.length;i++){
             option_classification.series[0].data.push({value:[pieData[i].category0,pieData[i].category1,pieData[i].category2,pieData[i].category3,pieData[i].category4],"name":pieData[i].date})
         }