优化

assets/js/controllers/charts3.js

@@ -425,7 +425,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_allData = res.data[0].sum
         })
     }
-    getIncident_allData({});
+    // getIncident_allData({});
     // 结束
     // 获取及时响应数据
     // 开始
@@ -437,7 +437,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_responseData = res.data[0].sum
         })
     }
-    getIncident_responseData({})
+    // getIncident_responseData({})
     // 结束
     // 获取解决中数据
     // 开始
@@ -449,7 +449,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solveNowData = res.data[0].sum
         })
     }
-    getIncident_solveNowData({})
+    // getIncident_solveNowData({})
     // // 结束
     // // 获取已解决数据
     // // 开始
@@ -460,7 +460,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solvedData = res.data[0].sum
         })
     }
-    getIncident_solvedData({})
+    // getIncident_solvedData({})
     // 结束
 
     // // 获取近一年建单总数数据
@@ -472,10 +472,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_total = res.data[0].sum
         })
     }
-    getYear_incident_total({
-        "start": lastYear + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getYear_incident_total({
+    //     "start": lastYear + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
 
@@ -488,10 +488,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_total = res.data[0].sum
         })
     }
-    getYear_incident_total_month({
-        "start": lastMonth + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getYear_incident_total_month({
+    //     "start": lastMonth + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
 
@@ -504,10 +504,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solve_time = res.data[0].hour || 0
         })
     }
-    getIncident_solve_time({
-        "start": lastYear + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getIncident_solve_time({
+    //     "start": lastYear + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
     // // 获取近一个月事件解决总时长数据
@@ -519,10 +519,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solve_time = res.data[0].hour || 0
         })
     }
-    getIncident_solve_time_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"
+    // })
     // 结束
 
     // // 获取近一年已解决工单数据
@@ -534,10 +534,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solve_total = res.data[0].sum
         })
     }
-    getIncident_solve_total({
-        "start": lastYear + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getIncident_solve_total({
+    //     "start": lastYear + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
 
@@ -550,10 +550,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_solve_total = res.data[0].sum
         })
     }
-    getIncident_solve_total_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"
+    // })
     // 结束
 
 
@@ -566,10 +566,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_degree = res.data[0].degree || 0
         })
     }
-    getIncident_degree({
-        "start": lastYear + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getIncident_degree({
+    //     "start": lastYear + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
     // // 获取近一个月满意度数据
@@ -581,10 +581,10 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             $scope.incident_degree = res.data[0].degree || 0
         })
     }
-    getIncident_degree_month({
-        "start": lastMonth + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getIncident_degree_month({
+    //     "start": lastMonth + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
     // 结束
 
     // 获取呼叫中心来电趋势图数据
@@ -958,32 +958,32 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
     //     })
     // }
 
-    function getMonthMapData(time) {
-        api_hkreport.incidentreport(time, 'large_screen_map_data').then(function (res) {
-            $scope.monthMapDataList = res.data;
-        })
-    }
+    // function getMonthMapData(time) {
+    //     api_hkreport.incidentreport(time, 'large_screen_map_data').then(function (res) {
+    //         $scope.monthMapDataList = res.data;
+    //     })
+    // }
 
-    function getYearMapData(time) {
-        api_hkreport.incidentreport(time, 'large_screen_map_data').then(function (res) {
-            $scope.yearMapDataList = res.data;
-        })
-    }
+    // function getYearMapData(time) {
+    //     api_hkreport.incidentreport(time, 'large_screen_map_data').then(function (res) {
+    //         $scope.yearMapDataList = res.data;
+    //     })
+    // }
     // getMapData({
     //     sum: 100,
     //     "start": yesterDay + " 00:00:00",
     //     "end": yesterDay + " 23:59:59"
     // })
-    getMonthMapData({
-        sum: 10,
-        "start": lastMonth + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
-    getYearMapData({
-        sum: 20,
-        "start": lastYear + " 00:00:00",
-        "end": yesterDay + " 23:59:59"
-    })
+    // getMonthMapData({
+    //     sum: 10,
+    //     "start": lastMonth + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
+    // getYearMapData({
+    //     sum: 20,
+    //     "start": lastYear + " 00:00:00",
+    //     "end": yesterDay + " 23:59:59"
+    // })
 
 
 
@@ -1064,17 +1064,8 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             if($scope.slideBoxLeft3 == 6){
                 $scope.slideBoxLeft3 = 0;
             }
-            console.log($scope.slideBoxLeft3, '$scope.slideBoxLeft3')
-
-            // 聚合点信息获取
-            $scope.incident_allData = '';
-            $scope.incident_responseData = '';
-            $scope.incident_solveNowData = '';
-            $scope.incident_solvedData = '';
-            $scope.incident_total = '';
-            $scope.incident_solve_time = '';
-            $scope.incident_solve_total = '';
-            $scope.incident_degree = '';
+            console.log($scope.slideBoxLeft3, '$scope.slideBoxLeft3', moment(new Date()).format('YYYY-MM-DD HH:mm:ss'))
+
             // 实时信息
             if($scope.slideBoxLeft3 == 0 || $scope.slideBoxLeft3 == 3){
                 map_time_area({
@@ -1252,9 +1243,9 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
     setInterval(() => {
         move1()
     }, 15000); //15秒
-    $scope.timer = setTimeout(() => {
-        move2()
-    }, 15000); //15秒
+    // $scope.timer = setTimeout(() => {
+    //     move2()
+    // }, 15000); //15秒
 
     // 地图聚合点信息----------------------------------------start
     // // 获取近一个月建单总数数据
@@ -1274,52 +1265,76 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
 
     // // 开始
     function map_time_area(time, slideBoxLeft3) {
+        var branch = undefined;
+        if(slideBoxLeft3 == 0 || slideBoxLeft3 == 1 || slideBoxLeft3 == 2){
+            branch = 1;
+        }else if(slideBoxLeft3 == 3 || slideBoxLeft3 == 4 || slideBoxLeft3 == 5){
+            branch = 2;
+        }
         // 右侧数据
+        // 清空
+        $scope.incident_allData = '';
+        $scope.incident_responseData = '';
+        $scope.incident_solveNowData = '';
+        $scope.incident_solvedData = '';
+        $scope.incident_total = '';
+        $scope.incident_solve_time = '';
+        $scope.incident_solve_total = '';
+        $scope.incident_degree = '';
         // 实时信息
         if(slideBoxLeft3 == 0 || slideBoxLeft3 == 3){
-            getIncident_allData({});
-            getIncident_responseData({})
-            getIncident_solveNowData({})
-            getIncident_solvedData({})
+            getIncident_allData({branch: branch});
+            getIncident_responseData({branch: branch})
+            getIncident_solveNowData({branch: branch})
+            getIncident_solvedData({branch: branch})
         }
         // 30天信息
         if(slideBoxLeft3 == 1 || slideBoxLeft3 == 4){
             getYear_incident_total_month({
                 "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_solve_time_month({
                 "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_solve_total_month({
                 "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_degree_month({
                 "start": lastMonth + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
         }
         // 一年信息
         if(slideBoxLeft3 == 2 || slideBoxLeft3 == 5){
             getYear_incident_total({
                 "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_solve_time({
                 "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_solve_total({
                 "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
             getIncident_degree({
                 "start": lastYear + " 00:00:00",
-                "end": yesterDay + " 23:59:59"
+                "end": yesterDay + " 23:59:59",
+                branch: branch
             })
         }
+        time.branch = branch;
         api_newreport.fetchDataList('oneMapData', time).then(function (res) {
             console.log(res)
             if(res.status == 200){
@@ -1335,7 +1350,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
 
                 // 地址切换
                 if(slideBoxLeft3 === 0 || slideBoxLeft3 === 1 || slideBoxLeft3 === 2){
-                    $scope.cloudMap.goTo(114.41276, 30.51515, 1, 16);//主校区
+                    $scope.cloudMap && $scope.cloudMap.goTo(114.41276, 30.51515, 1, 16);//主校区
                     clearTimeout($scope.timer);
                     setTimeout(() => {
                         for (let name in res.data) {
@@ -1345,7 +1360,7 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
                     }, 15000); //15秒
                 }
                 if(slideBoxLeft3 === 3 || slideBoxLeft3 === 4 || slideBoxLeft3 === 5){
-                    $scope.cloudMap.goTo(114.254, 30.5855, 3, 16);//同济校区
+                    $scope.cloudMap && $scope.cloudMap.goTo(114.254, 30.5855, 3, 16);//同济校区
                     clearTimeout($scope.timer);
                     setTimeout(() => {
                         for (let name in res.data) {
@@ -1503,18 +1518,16 @@ app.controller('charts3Ctrl', ["$scope", "$rootScope", "$state", "$timeout", "$i
             // );
         });
 
-
-
         function mapReady() {
             $scope.cloudMap.changeLayerVisible('2.5D底图', false);
             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")
-            })
-            getIncident_allData({});
-            getIncident_responseData({})
-            getIncident_solveNowData({})
-            getIncident_solvedData({})
+            }, $scope.slideBoxLeft3)
+            // getIncident_allData({});
+            // getIncident_responseData({})
+            // getIncident_solveNowData({})
+            // getIncident_solvedData({})
             //cloudMap.changeLayerVisible('建筑物中心点', false);
             //地图加载成功
             // cloudMap.initLayerList("top-right"); //显示图层管理模块,位置top-right,top-left,bottom-right,bottom-right

assets/views/charts3.html

@@ -168,64 +168,8 @@
                 </div>
             </div>
             <div class="slidesRight">
-                <div class="slideBox3" ng-style="{'left':slideBoxLeft1}">
-                    <!-- 主校区 -->
-                    <div class="workNum">
-                        <div class="list">
-                            <p>实时工单<span class="size12">（件）</span></p>
-                            <p class="orange">{{incident_allData}}</p>
-                        </div>
-                        <div class="list">
-                            <p>及时响应工单<span class="size12">（件）</span></p>
-                            <p class="yellow">{{incident_responseData}}</p>
-                        </div>
-                        <div class="list">
-                            <p>处理中工单<span class="size12">（件）</span></p>
-                            <p class="green">{{incident_solveNowData}}</p>
-                        </div>
-                        <div class="list">
-                            <p>已解决工单<span class="size12">（件）</span></p>
-                            <p class="blue">{{incident_solvedData}}</p>
-                        </div>
-                    </div>
-                    <div class="workNum">
-                        <div class="list">
-                            <p>建单总数<span class="size12">（件）</span></p>
-                            <p class="orange">{{incident_total}}</p>
-                        </div>
-                        <div class="list">
-                            <p>事件解决总时长<span class="size12">（小时）</span></p>
-                            <p class="yellow">{{incident_solve_time}}</p>
-                        </div>
-                        <div class="list">
-                            <p>已解决工单<span class="size12">（件）</span></p>
-                            <p class="green">{{incident_solve_total}}</p>
-                        </div>
-                        <div class="list">
-                            <p>满意度</p>
-                            <p class="blue">{{incident_degree}}%</p>
-                        </div>
-                    </div>
-                    <div class="workNum">
-                        <div class="list">
-                            <p>建单总数<span class="size12">（件）</span></p>
-                            <p class="orange">{{incident_total}}</p>
-                        </div>
-                        <div class="list">
-                            <p>事件解决总时长<span class="size12">（小时）</span></p>
-                            <p class="yellow">{{incident_solve_time}}</p>
-                        </div>
-                        <div class="list">
-                            <p>已解决工单<span class="size12">（件）</span></p>
-                            <p class="green">{{incident_solve_total}}</p>
-                        </div>
-                        <div class="list">
-                            <p>满意度</p>
-                            <p class="blue">{{incident_degree}}%</p>
-                        </div>
-                    </div>
-                    <!-- 同济校区 -->
-                    <div class="workNum">
+                <div class="slideBox3">
+                    <div class="workNum" ng-if="slideBoxLeft3 == 0 || slideBoxLeft3 == 3">
                         <div class="list">
                             <p>实时工单<span class="size12">（件）</span></p>
                             <p class="orange">{{incident_allData}}</p>
@@ -243,7 +187,7 @@
                             <p class="blue">{{incident_solvedData}}</p>
                         </div>
                     </div>
-                    <div class="workNum">
+                    <div class="workNum" ng-if="slideBoxLeft3 == 1 || slideBoxLeft3 == 4">
                         <div class="list">
                             <p>建单总数<span class="size12">（件）</span></p>
                             <p class="orange">{{incident_total}}</p>
@@ -261,7 +205,7 @@
                             <p class="blue">{{incident_degree}}%</p>
                         </div>
                     </div>
-                    <div class="workNum">
+                    <div class="workNum" ng-if="slideBoxLeft3 == 2 || slideBoxLeft3 == 5">
                         <div class="list">
                             <p>建单总数<span class="size12">（件）</span></p>
                             <p class="orange">{{incident_total}}</p>