地图统计数量加载书讯

assets/js/controllers/charts3.js

@@ -124,8 +124,8 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                     // margin: 15,
                     align: 'center'
                 },
-                // margin:10,  
-                // rotate:40  
+                // margin:10,
+                // rotate:40
             },
             axisTick: {
                 show: false,
@@ -1065,7 +1065,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                 $scope.slideBoxLeft3 = 0;
             }
             console.log($scope.slideBoxLeft3, '$scope.slideBoxLeft3')
-            
+
             // 聚合点信息获取
             $scope.incident_allData = '';
             $scope.incident_responseData = '';
@@ -1108,7 +1108,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
     // 列表滚动
     // a:table body 的class名；b:滚动父盒子的id名；c:滚动盒子的id名；d:滚动项的class名；e:每页展示的条数；f：interval定时器开启1/关闭0
     $scope.slides = function (a, b, c, d, e, f) {
-        var speed = 45; //设置向上轮动的速度 
+        var speed = 45; //设置向上轮动的速度
         var list = $('.' + d).clone();
         if (list.length >= e) {
             var body1 = $('.' + a)[0];
@@ -1278,6 +1278,52 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
 
     // // 开始
     function map_time_area(time, slideBoxLeft3) {
+        // 右侧数据
+        // 实时信息
+        if(slideBoxLeft3 == 0 || slideBoxLeft3 == 3){
+            getIncident_allData({});
+            getIncident_responseData({})
+            getIncident_solveNowData({})
+            getIncident_solvedData({})
+        }
+        // 30天信息
+        if(slideBoxLeft3 == 1 || slideBoxLeft3 == 4){
+            getYear_incident_total_month({
+                "start": lastMonth + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_solve_time_month({
+                "start": lastMonth + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_solve_total_month({
+                "start": lastMonth + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_degree_month({
+                "start": lastMonth + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+        }
+        // 一年信息
+        if(slideBoxLeft3 == 2 || slideBoxLeft3 == 5){
+            getYear_incident_total({
+                "start": lastYear + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_solve_time({
+                "start": lastYear + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_solve_total({
+                "start": lastYear + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+            getIncident_degree({
+                "start": lastYear + " 00:00:00",
+                "end": yesterDay + " 23:59:59"
+            })
+        }
         api_newreport.fetchDataList('oneMapData', time).then(function (res) {
             console.log(res)
             if(res.status == 200){
@@ -1290,7 +1336,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                     })
                     $scope.addClusterLayer(GLIDList, dataList, name);
                 }
-                
+
                 // 地址切换
                 if(slideBoxLeft3 === 0 || slideBoxLeft3 === 1 || slideBoxLeft3 === 2){
                     $scope.cloudMap.goTo(114.41276, 30.51515, 1, 16);//主校区
@@ -1312,52 +1358,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                         move2()
                     }, 15000); //15秒
                 }
-                // 右侧数据
-                // 实时信息
-                if(slideBoxLeft3 == 0 || slideBoxLeft3 == 3){
-                    getIncident_allData({});
-                    getIncident_responseData({})
-                    getIncident_solveNowData({})
-                    getIncident_solvedData({})
-                }
-                // 30天信息
-                if(slideBoxLeft3 == 1 || slideBoxLeft3 == 4){
-                    getYear_incident_total_month({
-                        "start": lastMonth + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_solve_time_month({
-                        "start": lastMonth + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_solve_total_month({
-                        "start": lastMonth + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_degree_month({
-                        "start": lastMonth + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                }
-                // 一年信息
-                if(slideBoxLeft3 == 2 || slideBoxLeft3 == 5){
-                    getYear_incident_total({
-                        "start": lastYear + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_solve_time({
-                        "start": lastYear + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_solve_total({
-                        "start": lastYear + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                    getIncident_degree({
-                        "start": lastYear + " 00:00:00",
-                        "end": yesterDay + " 23:59:59"
-                    })
-                }
+
             }
         })
     }
@@ -1369,7 +1370,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
     //     "startTime": lastYear + " 00:00:00",
     //     "endTime": yesterDay + " 23:59:59"
     // })
-    
+
     // 结束
     // 地图聚合点信息----------------------------------------end
 
@@ -1402,12 +1403,12 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             floorMap: "dark",
         };
         // 清除聚合图层
-        $scope.delClusterLayer = function(name) { 
+        $scope.delClusterLayer = function(name) {
             $scope.cloudMap.removeClusterLayer(name);
         }
         //聚合图层
-        $scope.addClusterLayer = function(GLIDList, dataList, name) { 
-            console.log(GLIDList, dataList, name);	
+        $scope.addClusterLayer = function(GLIDList, dataList, name) {
+            console.log(GLIDList, dataList, name);
             // name = '风险点';
 		    //建筑物GLID
             // GLIDList =["10192","10195","10157","10114","10314","10101","10288","10394","10427"];
@@ -1506,7 +1507,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             // );
         });
 
-        
+
 
         function mapReady() {
             $scope.cloudMap.changeLayerVisible('2.5D底图', false);