seimin 3 years ago
parent
commit
ac95e27504

+ 10 - 8
assets/js/controllers/report/incident_reportCtrl.js

@@ -680,9 +680,11 @@ app.controller("incident_reportCtrl", [
680
       $scope.searchkeys.startTime = $scope.starttimes;
680
       $scope.searchkeys.startTime = $scope.starttimes;
681
       $scope.searchkeys.endTime = $scope.endtimes;
681
       $scope.searchkeys.endTime = $scope.endtimes;
682
       console.log($scope);
682
       console.log($scope);
683
+      $scope.YWBB_searchKeys = {
684
+        startTime:$scope.searchkeys.startTime,
685
+        endTime:$scope.searchkeys.endTime
686
+      }
683
       if ($scope.tap == "YWBB") {
687
       if ($scope.tap == "YWBB") {
684
-        $scope.YWBB_searchKeys.startTime = $scope.searchkeys.startTime;
685
-        $scope.YWBB_searchKeys.endTime = $scope.searchkeys.endTime;
686
         $scope.YWXL_Data();
688
         $scope.YWXL_Data();
687
         $scope.YWXQ_Data();
689
         $scope.YWXQ_Data();
688
         $scope.YWMYD_Data();
690
         $scope.YWMYD_Data();
@@ -1737,7 +1739,7 @@ app.controller("incident_reportCtrl", [
1737
             // align: 'center'
1739
             // align: 'center'
1738
           },
1740
           },
1739
           x: "34.5%",
1741
           x: "34.5%",
1740
-          y: "40%",
1742
+          y: "50%",
1741
         },
1743
         },
1742
         tooltip: {
1744
         tooltip: {
1743
           trigger: "item",
1745
           trigger: "item",
@@ -1767,8 +1769,8 @@ app.controller("incident_reportCtrl", [
1767
         series: [
1769
         series: [
1768
           // 主要展示层的
1770
           // 主要展示层的
1769
           {
1771
           {
1770
-            radius: ["65%", "85%"],
1771
-            center: ["35%", "50%"],
1772
+            radius: ["50%", "65%"],
1773
+            center: ["35%", "60%"],
1772
             type: "pie",
1774
             type: "pie",
1773
             label: {
1775
             label: {
1774
               normal: {
1776
               normal: {
@@ -1838,7 +1840,7 @@ app.controller("incident_reportCtrl", [
1838
             // align: 'center'
1840
             // align: 'center'
1839
           },
1841
           },
1840
           x: "34.5%",
1842
           x: "34.5%",
1841
-          y: "40%",
1843
+          y: "50%",
1842
         },
1844
         },
1843
         tooltip: {
1845
         tooltip: {
1844
           // show: false,
1846
           // show: false,
@@ -1870,8 +1872,8 @@ app.controller("incident_reportCtrl", [
1870
         series: [
1872
         series: [
1871
           // 主要展示层的
1873
           // 主要展示层的
1872
           {
1874
           {
1873
-            radius: ["65%", "85%"],
1874
-            center: ["35%", "50%"],
1875
+            radius: ["50%", "65%"],
1876
+            center: ["35%", "60%"],
1875
             type: "pie",
1877
             type: "pie",
1876
             label: {
1878
             label: {
1877
               normal: {
1879
               normal: {

+ 1 - 1
assets/views/report/incident_report.html

@@ -77,7 +77,7 @@
77
                         <p class="">区域选择 :</p>
77
                         <p class="">区域选择 :</p>
78
                         <div class="form-group">
78
                         <div class="form-group">
79
                             <div class="">
79
                             <div class="">
80
-                                <ui-select class="selectzise wt_width1 wt_width3" ng-model="area_place.areaId" theme="bootstrap"
80
+                            <ui-select class="selectzise wt_width1 wt_width3" ng-model="area_place.areaId" theme="bootstrap"
81
                                 ng-change="onChangearea(area_place)">
81
                                 ng-change="onChangearea(area_place)">
82
                                 <ui-select-match placeholder="请选择区域">
82
                                 <ui-select-match placeholder="请选择区域">
83
                                     {{$select.selected.area}}
83
                                     {{$select.selected.area}}