修改

assets/js/controllers/charts3.js

@@ -1,5 +1,5 @@
 'use strict';
-app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "Restangular", "api_hkreport", "api_wechat_operate", function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, Restangular, api_hkreport, api_wechat_operate) {
+app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "Restangular", "api_hkreport", "api_wechat_operate", "api_newreport", function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, Restangular, api_hkreport, api_wechat_operate, api_newreport) {
     $scope.ceshi = ["110", "105", "84", "125", "110", "92", "98"];
     // 来电趋势图
     var dom_laidianqushitu = document.getElementById("laidianqushitu");
@@ -1061,18 +1061,36 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
         } else {
             $scope.slideBoxLeft2 = 0;
         }
-
+    }
+    function move2() {
         if ($scope.slideBoxLeft3 >= 0) {
             $scope.slideBoxLeft3++;
             if($scope.slideBoxLeft3 == 6){
                 $scope.slideBoxLeft3 = 0;
             }
-            // console.log($scope.slideBoxLeft3, '$scope.slideBoxLeft3')
-            if($scope.slideBoxLeft3 == 0 || $scope.slideBoxLeft3 == 1 || $scope.slideBoxLeft3 == 2){
-                $scope.cloudMap.goTo(114.41276, 30.51515, 1, 16);//主校区
+            console.log($scope.slideBoxLeft3, '$scope.slideBoxLeft3')
+            
+            // 聚合点信息获取
+            // 实时信息
+            if($scope.slideBoxLeft3 == 0 || $scope.slideBoxLeft3 == 3){
+                map_time_area({
+                    "startTime": moment(new Date().getTime()).format("YYYY-MM-DD") + ' 00:00:00',
+                    "endTime": moment(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+                }, $scope.slideBoxLeft3)
             }
-            if($scope.slideBoxLeft3 == 3 || $scope.slideBoxLeft3 == 4 || $scope.slideBoxLeft3 == 5){
-                $scope.cloudMap.goTo(114.254, 30.5855, 3, 16);//同济校区
+            // 30天信息
+            if($scope.slideBoxLeft3 == 1 || $scope.slideBoxLeft3 == 4){
+                map_time_area({
+                    "startTime": lastMonth + " 00:00:00",
+                    "endTime": yesterDay + " 23:59:59"
+                }, $scope.slideBoxLeft3)
+            }
+            // 一年信息
+            if($scope.slideBoxLeft3 == 2 || $scope.slideBoxLeft3 == 5){
+                map_time_area({
+                    "startTime": lastYear + " 00:00:00",
+                    "endTime": yesterDay + " 23:59:59"
+                }, $scope.slideBoxLeft3)
             }
         }
     }
@@ -1230,6 +1248,75 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
     setInterval(() => {
         move1()
     }, 15000); //15秒
+    $scope.timer = setTimeout(() => {
+        move2()
+    }, 15000); //15秒
+
+    // 地图聚合点信息----------------------------------------start
+    // // 获取近一个月建单总数数据
+    // // 开始
+    // $scope.incident_total_month = "";
+
+    // function getYear_incident_total_month(time) {
+    //     api_hkreport.incidentreport(time, 'large_screen_year_incident_total').then(function (res) {
+    //         $scope.incident_total_month = res.data[0].sum
+    //     })
+    // }
+    // getYear_incident_total_month({
+    //     "start": lastMonth + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
+    // 结束
+
+    // // 开始
+    function map_time_area(time, slideBoxLeft3) {
+        api_newreport.fetchDataList('oneMapData', time).then(function (res) {
+            console.log(res)
+            if(res.status == 200){
+                for (let name in res.data) {
+                    let GLIDList = [];
+                    let dataList = [];
+                    res.data[name].forEach(function(v){
+                        GLIDList.push(v[2]);
+                        dataList.push(v[3]);
+                    })
+                    $scope.addClusterLayer(GLIDList, dataList, name);
+                }
+                // 地址切换
+                if(slideBoxLeft3 === 0 || slideBoxLeft3 === 1 || slideBoxLeft3 === 2){
+                    $scope.cloudMap.goTo(114.41276, 30.51515, 1, 16);//主校区
+                    clearTimeout($scope.timer);
+                    setTimeout(() => {
+                        for (let name in res.data) {
+                            $scope.delClusterLayer(name);
+                        }
+                        move2()
+                    }, 15000); //15秒
+                }
+                if(slideBoxLeft3 === 3 || slideBoxLeft3 === 4 || slideBoxLeft3 === 5){
+                    $scope.cloudMap.goTo(114.254, 30.5855, 3, 16);//同济校区
+                    clearTimeout($scope.timer);
+                    setTimeout(() => {
+                        for (let name in res.data) {
+                            $scope.delClusterLayer(name);
+                        }
+                        move2()
+                    }, 15000); //15秒
+                }
+            }
+        })
+    }
+    // map_time_area({
+    //     "startTime": lastMonth + " 00:00:00",
+    //     "endTime": yesterDay + " 23:59:59"
+    // })
+    // map_time_area({
+    //     "startTime": lastYear + " 00:00:00",
+    //     "endTime": yesterDay + " 23:59:59"
+    // })
+    
+    // 结束
+    // 地图聚合点信息----------------------------------------end
 
     // 获取地图token
     api_wechat_operate.mapToken({active: 1}, 'mapToken').then(function (res) {
@@ -1259,6 +1346,20 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             baseMap: "dark",
             floorMap: "dark",
         };
+        // 清除聚合图层
+        $scope.delClusterLayer = function(name) { 
+            $scope.cloudMap.removeClusterLayer(name);
+        }
+        //聚合图层
+        $scope.addClusterLayer = function(GLIDList, dataList, name) { 
+            console.log(GLIDList, dataList, name);	
+            // name = '风险点';
+		    //建筑物GLID
+            // GLIDList =["10192","10195","10157","10114","10314","10101","10288","10394","10427"];
+			//建筑物对应的数值，dCount必须为正整数
+            // dataList =[ 23, 15, 5, 6,8,12, 35, 66,1];
+            $scope.cloudMap.addClusterLayer(GLIDList, dataList, name);
+        }
 
         $scope.$watch('$viewContentLoaded', function() {
             console.log('viewContentLoaded');
@@ -1350,7 +1451,13 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             // );
         });
 
+        
+
         function mapReady() {
+            map_time_area({
+                "startTime": moment(new Date().getTime()).format("YYYY-MM-DD") + ' 00:00:00',
+                "endTime": moment(new Date().getTime()).format("YYYY-MM-DD HH:mm:ss")
+            })
             //cloudMap.changeLayerVisible('建筑物中心点', false);
             //地图加载成功
             // cloudMap.initLayerList("top-right"); //显示图层管理模块,位置top-right,top-left,bottom-right,bottom-right

assets/js/main.js

@@ -163,7 +163,30 @@ app.config(['cfpLoadingBarProvider',
     }
 ]);
 
-
+// 首页仪表盘
+app.factory('ReportnewRestangular', function (Restangular) {
+    return Restangular.withConfig(function (RestangularConfigurer) {
+        RestangularConfigurer.setBaseUrl(serverIp + '/statistics');
+    });
+})
+// 首页仪表盘
+app.factory('api_newreport', ['ReportnewRestangular', function (ReportnewRestangular) {
+    var hcService = ReportnewRestangular.all("data");
+    return {
+        // 事件解决率
+        fetchDataList: function (model, data) {
+            return hcService.customPOST(data, 'fetchDataList/' + model, {})
+        },
+        // 首页仪表盘
+        addDictionary: function (data) {
+            return hcService.customPOST(data, 'addDictionary', {})
+        },
+        // 首页仪表盘
+        upDictionary: function (data) {
+            return hcService.customPOST(data, 'upDictionary', {})
+        },
+    }
+}]);
 
 /**
  * // http: //115.156.150.70:9680/api/webservice/data/fetchDataList/queryUser

index.html

@@ -156,7 +156,8 @@
     <script type="text/javascript" src="http://echarts.baidu.com/gallery/vendors/echarts/extension/bmap.min.js"></script>
     <script type="text/javascript" src="http://echarts.baidu.com/gallery/vendors/simplex.js"></script> -->
    <!-- 华科地图 -->
-   <script src="https://map.hust.edu.cn/CloudMapJS/5.0/mainmap.js"></script>
+   <!-- <script src="https://map.hust.edu.cn/CloudMapJS/5.0/mainmap.js"></script> -->
+   <script src="https://map.hust.edu.cn/CloudMapJS/5.1/mainmap.js"></script>
 </body>
 
 </html>