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