优化同步

assets/js/controllers/charts3.js

@@ -425,9 +425,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_allData = res.data[0].sum
         })
     }
-    getIncident_allData({
-
-    })
+    getIncident_allData({});
     // 结束
     // 获取及时响应数据
     // 开始
@@ -451,9 +449,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solveNowData = res.data[0].sum
         })
     }
-    getIncident_solveNowData({
-
-    })
+    getIncident_solveNowData({})
     // // 结束
     // // 获取已解决数据
     // // 开始
@@ -1179,42 +1175,42 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                 // "start": "2018-05-28 00:00:00",
                 "end": yesterDay + " 23:59:59"
             }, 0)
-            getIncident_allData({});
-            getIncident_responseData({});
-            getIncident_solveNowData({})
-            getIncident_solvedData({})
-            getYear_incident_total({
-                "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
-            getYear_incident_total_month({
-                "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
-            getIncident_solve_time({
-                "start": lastYear + " 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({
-                "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
-            getIncident_solve_total_month({
-                "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
-            getIncident_degree({
-                "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
-            getIncident_degree_month({
-                "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
-            })
+            // getIncident_allData({});
+            // getIncident_responseData({});
+            // getIncident_solveNowData({})
+            // getIncident_solvedData({})
+            // getYear_incident_total({
+            //     "start": lastYear + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
+            // getYear_incident_total_month({
+            //     "start": lastMonth + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
+            // getIncident_solve_time({
+            //     "start": lastYear + " 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({
+            //     "start": lastYear + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
+            // getIncident_solve_total_month({
+            //     "start": lastMonth + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
+            // getIncident_degree({
+            //     "start": lastYear + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
+            // getIncident_degree_month({
+            //     "start": lastMonth + " 00:00:00",
+            //     "end": yesterDay + " 23:59:59"
+            // })
             getCallPitData({
                 "start": yesterDay + " 08",
                 // "start": "2018-05-28 00",
@@ -1282,6 +1278,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);//主校区
@@ -1303,6 +1300,52 @@ 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"
+                    })
+                }
             }
         })
     }
@@ -1459,6 +1502,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                 "startTime": moment(new Date().getTime()).format("YYYY-MM-DD") + ' 00:00:00',
                 "endTime": moment(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
             })
+            getIncident_allData({});
+            getIncident_responseData({})
+            getIncident_solveNowData({})
+            getIncident_solvedData({})
             //cloudMap.changeLayerVisible('建筑物中心点', false);
             //地图加载成功
             // cloudMap.initLayerList("top-right"); //显示图层管理模块,位置top-right,top-left,bottom-right,bottom-right