Browse Source

巡检文字修改

seimin 3 years ago
parent
commit
003d618405

+ 3 - 0
assets/css/styles.css

@@ -61,6 +61,9 @@
61
     text-overflow: ellipsis;
61
     text-overflow: ellipsis;
62
     white-space: nowrap;
62
     white-space: nowrap;
63
 }
63
 }
64
+.i_big{
65
+    font-size: 18px;
66
+}
64
 
67
 
65
 
68
 
66
 /*.printheight{
69
 /*.printheight{

+ 489 - 210
assets/js/controllers/report/incident_reportCtrl.js

@@ -71,8 +71,45 @@ app.controller("incident_reportCtrl", [
71
     $scope.changeTo = function (paramDateTo) {
71
     $scope.changeTo = function (paramDateTo) {
72
       $scope.endtimes = moment(paramDateTo).format("YYYY-MM-DD");
72
       $scope.endtimes = moment(paramDateTo).format("YYYY-MM-DD");
73
     };
73
     };
74
-    $scope.searchkeys.startTime = $scope.starttimes;
75
-    $scope.searchkeys.endTime = $scope.endtimes;
74
+    // 日期重置
75
+    $scope.dateReset = function () {
76
+      if ($scope.tap == "QSFX") {
77
+        $scope.searchkeys.startTime = moment(new Date())
78
+          .subtract(6, "months")
79
+          .startOf("month")
80
+          .format("YYYY-MM-DD 00:00:00");
81
+        $scope.searchkeys.endTime = moment(new Date())
82
+          .subtract(1, "months")
83
+          .endOf("month")
84
+          .format("YYYY-MM-DD 23:59:59");
85
+      } else if ($scope.tap == "YWBB") {
86
+        $scope.searchkeys.startTime = moment(new Date())
87
+          .subtract(30, "days")
88
+          .format("YYYY-MM-DD 00:00:00");
89
+        $scope.searchkeys.endTime = moment(new Date())
90
+          .subtract(1, "days")
91
+          .format("YYYY-MM-DD 23:59:59");
92
+        $scope.YWBB_searchKeys.startTime = $scope.searchkeys.startTime;
93
+        $scope.YWBB_searchKeys.endTime = $scope.searchkeys.endTime;
94
+      } else if ($scope.tap == "FLBB") {
95
+        $scope.searchkeys.startTime = moment(
96
+          new Date().getTime() - 86400000 * (weeks + 6 - 1)
97
+        ).format("YYYY-MM-DD 00:00:00");
98
+        $scope.searchkeys.endTime = moment(
99
+          new Date().getTime() - 86400000 * (weeks - 1)
100
+        ).format("YYYY-MM-DD 23:59:59");
101
+      } else if ($scope.tap == "LYBB") {
102
+        $scope.searchkeys.startTime = moment(
103
+          new Date().getTime() - 86400000 * (weeks + 6 - 1)
104
+        ).format("YYYY-MM-DD 00:00:00");
105
+        $scope.searchkeys.endTime = moment(
106
+          new Date().getTime() - 86400000 * (weeks - 1)
107
+        ).format("YYYY-MM-DD 23:59:59");
108
+      }
109
+    };
110
+    // $scope.searchkeys.startTime = $scope.starttimes;
111
+    // $scope.searchkeys.endTime = $scope.endtimes;
112
+    $scope.dateReset();
76
     console.log($scope.searchkeys.startTime, $scope.searchkeys.endTime);
113
     console.log($scope.searchkeys.startTime, $scope.searchkeys.endTime);
77
     // 运维报表搜索条件:
114
     // 运维报表搜索条件:
78
     $scope.YWBB_searchKeys = {
115
     $scope.YWBB_searchKeys = {
@@ -154,8 +191,14 @@ app.controller("incident_reportCtrl", [
154
       $scope.endOpened = false;
191
       $scope.endOpened = false;
155
       $scope.startOpened = !$scope.startOpened;
192
       $scope.startOpened = !$scope.startOpened;
156
     };
193
     };
194
+    
157
     //选择类型
195
     //选择类型
158
     $scope.active = function (name) {
196
     $scope.active = function (name) {
197
+      $scope.dateChoose.dateSelected = {};
198
+      $scope.deleteKey($scope.select_treedata);
199
+      $scope.deleteKey($scope.my_data);
200
+      $scope.select_treedata = angular.copy($scope.select_treedata);
201
+      $scope.my_data = angular.copy($scope.my_data);
159
       console.log($scope.searchkeys);
202
       console.log($scope.searchkeys);
160
       if ($scope.searchkeys.placeId) {
203
       if ($scope.searchkeys.placeId) {
161
         delete $scope.searchkeys.placeId;
204
         delete $scope.searchkeys.placeId;
@@ -164,12 +207,13 @@ app.controller("incident_reportCtrl", [
164
         delete $scope.searchkeys.areaId;
207
         delete $scope.searchkeys.areaId;
165
       }
208
       }
166
       $scope.tap = name;
209
       $scope.tap = name;
167
-      $scope.searchkeys.startTime = moment($scope.searchkeys.startTime).format(
168
-        "YYYY-MM-DD 00:00:00"
169
-      );
170
-      $scope.searchkeys.endTime = moment($scope.searchkeys.endTime).format(
171
-        "YYYY-MM-DD 23:59:59"
172
-      );
210
+      // $scope.searchkeys.startTime = moment($scope.searchkeys.startTime).format(
211
+      //   "YYYY-MM-DD 00:00:00"
212
+      // );
213
+      // $scope.searchkeys.endTime = moment($scope.searchkeys.endTime).format(
214
+      //   "YYYY-MM-DD 23:59:59"
215
+      // );
216
+      $scope.dateReset();
173
       if ($scope.tap == "QSFX") {
217
       if ($scope.tap == "QSFX") {
174
         $scope.tap1 = "flqs";
218
         $scope.tap1 = "flqs";
175
         $scope.area_place = {};
219
         $scope.area_place = {};
@@ -423,6 +467,7 @@ app.controller("incident_reportCtrl", [
423
       $scope.YWBB_searchKeys.categoryId = item.id;
467
       $scope.YWBB_searchKeys.categoryId = item.id;
424
     };
468
     };
425
     $scope.onFilterGroup = function (item) {
469
     $scope.onFilterGroup = function (item) {
470
+      console.log(item);
426
       $scope.YWBB_searchKeys.groupId = item.id;
471
       $scope.YWBB_searchKeys.groupId = item.id;
427
     };
472
     };
428
     // 图表1、事件运维效率
473
     // 图表1、事件运维效率
@@ -445,7 +490,7 @@ app.controller("incident_reportCtrl", [
445
           // 解决饼图
490
           // 解决饼图
446
           barechart7(data.solve);
491
           barechart7(data.solve);
447
           // 柱状图
492
           // 柱状图
448
-          barechart8(data.barGraph);
493
+          //   barechart8(data.barGraph);
449
           if (data.barGraph) {
494
           if (data.barGraph) {
450
             data.barGraph.ontimesolvePercentage = []; //按时解决率seimin
495
             data.barGraph.ontimesolvePercentage = []; //按时解决率seimin
451
             data.barGraph.overtimesolvePercentage = []; //逾期解决率seimin
496
             data.barGraph.overtimesolvePercentage = []; //逾期解决率seimin
@@ -458,7 +503,10 @@ app.controller("incident_reportCtrl", [
458
                 (data.barGraph.ontimesolve[i] + data.barGraph.overtimesolve[i]);
503
                 (data.barGraph.ontimesolve[i] + data.barGraph.overtimesolve[i]);
459
             });
504
             });
460
           }
505
           }
506
+          console.log(data.barGraph);
461
           barechart8_1(data.barGraph);
507
           barechart8_1(data.barGraph);
508
+          barechart8_2(data.barGraph);
509
+          barechart8_3(data.barGraph);
462
         });
510
         });
463
     };
511
     };
464
 
512
 
@@ -654,15 +702,36 @@ app.controller("incident_reportCtrl", [
654
         $scope.FLQS_Data1($scope.searchkeys);
702
         $scope.FLQS_Data1($scope.searchkeys);
655
       }
703
       }
656
       if ($scope.tap == "FLBB") {
704
       if ($scope.tap == "FLBB") {
657
-        $scope.FLTJ_Data($scope.searchkeys);
658
-        $scope.FLQST_Data($scope.searchkeys);
659
-        $scope.QYFL_Data($scope.searchkeys);
705
+        var flbbData = angular.copy($scope.searchkeys);
706
+        if ($scope.YWBB_searchKeys.categoryId) {
707
+          flbbData.categoryId = $scope.YWBB_searchKeys.categoryId;
708
+        }
709
+        $scope.FLTJ_Data(flbbData);
710
+        $scope.FLQST_Data(flbbData);
711
+        $scope.QYFL_Data(flbbData);
660
       }
712
       }
661
     };
713
     };
714
+    //多选下拉框重置方法
715
+    $scope.deleteKey = function (arr) {
716
+      arr.forEach((v) => {
717
+        delete v.selected;
718
+        v.isExpanded = false;
719
+        if (v.children && v.children.length) {
720
+          $scope.deleteKey(v.children);
721
+        }
722
+      });
723
+    };
662
     //重置
724
     //重置
663
     $scope.report_Reset = function () {
725
     $scope.report_Reset = function () {
664
-      $scope.select_treedata = [];
665
-      $scope.my_data = [];
726
+      // $scope.select_treedata = [];
727
+      // $scope.my_data = [];
728
+      $scope.deleteKey($scope.select_treedata);
729
+      $scope.deleteKey($scope.my_data);
730
+      $scope.select_treedata = angular.copy($scope.select_treedata);
731
+      $scope.my_data = angular.copy($scope.my_data);
732
+      // --------------------------
733
+      console.log($scope.my_data);
734
+      console.log($scope.select_treedata);
666
       $scope.dateChoose.dateSelected = {};
735
       $scope.dateChoose.dateSelected = {};
667
       if ($scope.searchkeys.placeId) {
736
       if ($scope.searchkeys.placeId) {
668
         delete $scope.searchkeys.placeId;
737
         delete $scope.searchkeys.placeId;
@@ -681,9 +750,9 @@ app.controller("incident_reportCtrl", [
681
       $scope.searchkeys.endTime = $scope.endtimes;
750
       $scope.searchkeys.endTime = $scope.endtimes;
682
       console.log($scope);
751
       console.log($scope);
683
       $scope.YWBB_searchKeys = {
752
       $scope.YWBB_searchKeys = {
684
-        startTime:$scope.searchkeys.startTime,
685
-        endTime:$scope.searchkeys.endTime
686
-      }
753
+        startTime: $scope.searchkeys.startTime,
754
+        endTime: $scope.searchkeys.endTime,
755
+      };
687
       if ($scope.tap == "YWBB") {
756
       if ($scope.tap == "YWBB") {
688
         $scope.YWXL_Data();
757
         $scope.YWXL_Data();
689
         $scope.YWXQ_Data();
758
         $scope.YWXQ_Data();
@@ -741,7 +810,7 @@ app.controller("incident_reportCtrl", [
741
           },
810
           },
742
           grid: {
811
           grid: {
743
             top: "8%",
812
             top: "8%",
744
-            left: ".5%",
813
+            left: "2%",
745
             right: "0%",
814
             right: "0%",
746
             bottom: "15%",
815
             bottom: "15%",
747
             containLabel: true,
816
             containLabel: true,
@@ -789,28 +858,28 @@ app.controller("incident_reportCtrl", [
789
                 },
858
                 },
790
               },
859
               },
791
             },
860
             },
792
-            {
793
-              type: "value",
794
-              scale: true,
795
-              name: "环比增幅  (%)",
796
-              min: 0,
797
-              max: 100,
798
-              boundaryGap: [0.2, 0.2],
799
-              axisLabel: {
800
-                formatter: "{value} %",
801
-                textStyle: {
802
-                  color: "#7B7B7B",
803
-                  // fontSize: '14',
804
-                },
805
-              },
806
-              axisLine: {
807
-                show: true,
808
-                lineStyle: {
809
-                  color: "#7B7B7B",
810
-                  // type: 'dotted'
811
-                },
812
-              },
813
-            },
861
+            // {
862
+            //   type: "value",
863
+            //   scale: true,
864
+            //   name: "环比增幅  (%)",
865
+            //   min: 0,
866
+            //   max: 100,
867
+            //   boundaryGap: [0.2, 0.2],
868
+            //   axisLabel: {
869
+            //     formatter: "{value} %",
870
+            //     textStyle: {
871
+            //       color: "#7B7B7B",
872
+            //       // fontSize: '14',
873
+            //     },
874
+            //   },
875
+            //   axisLine: {
876
+            //     show: true,
877
+            //     lineStyle: {
878
+            //       color: "#7B7B7B",
879
+            //       // type: 'dotted'
880
+            //     },
881
+            //   },
882
+            // },
814
           ],
883
           ],
815
           series: [
884
           series: [
816
             {
885
             {
@@ -824,21 +893,21 @@ app.controller("incident_reportCtrl", [
824
               },
893
               },
825
               data: datas.data,
894
               data: datas.data,
826
             },
895
             },
827
-            {
828
-              name: "环比增幅",
829
-              type: "line",
830
-              itemStyle: {
831
-                normal: {
832
-                  color: "#1CA58F",
833
-                },
834
-              },
835
-              lineStyle: {
836
-                normal: {
837
-                  color: "#1CA58F",
838
-                },
839
-              },
840
-              data: datas.per,
841
-            },
896
+            // {
897
+            //   name: "环比增幅",
898
+            //   type: "line",
899
+            //   itemStyle: {
900
+            //     normal: {
901
+            //       color: "#1CA58F",
902
+            //     },
903
+            //   },
904
+            //   lineStyle: {
905
+            //     normal: {
906
+            //       color: "#1CA58F",
907
+            //     },
908
+            //   },
909
+            //   data: datas.per,
910
+            // },
842
           ],
911
           ],
843
         };
912
         };
844
         if (option && typeof option === "object") {
913
         if (option && typeof option === "object") {
@@ -1454,7 +1523,7 @@ app.controller("incident_reportCtrl", [
1454
                   label: {
1523
                   label: {
1455
                     normal: {
1524
                     normal: {
1456
                       show: true,
1525
                       show: true,
1457
-                      formatter: "{c}%",
1526
+                      formatter: "{c}",
1458
                       textStyle: {
1527
                       textStyle: {
1459
                         fontSize: 14,
1528
                         fontSize: 14,
1460
                       },
1529
                       },
@@ -1712,25 +1781,15 @@ app.controller("incident_reportCtrl", [
1712
       var myChart = echarts.init(dom);
1781
       var myChart = echarts.init(dom);
1713
       var data = datas.pieChart;
1782
       var data = datas.pieChart;
1714
       option = {
1783
       option = {
1715
-        color: [
1716
-          "#005395",
1717
-          "#1EA58F",
1718
-          "#87C966",
1719
-          "#FFCD61",
1720
-          "#585247",
1721
-          "#49A9EE",
1722
-          "#009D85",
1723
-          "rgba(250,250,250,0.3)",
1724
-        ],
1725
-        // backgroundColor: '#000',
1784
+        color: ["#91c7ae", "#61a0a8", "#2f4554", "#c23531", "#d48265"],
1726
         title: {
1785
         title: {
1727
-          text: "响应事件总数 (件)",
1728
-          subtext: datas.pieChartSum,
1786
+          text: "微信用户评价\n\n满意度占比",
1787
+          // subtext: datas.pieChartSum,
1729
           textAlign: "center",
1788
           textAlign: "center",
1730
           textStyle: {
1789
           textStyle: {
1731
             color: "#333",
1790
             color: "#333",
1732
             fontSize: 16,
1791
             fontSize: 16,
1733
-            // align: 'center'
1792
+            // align: 'center',
1734
           },
1793
           },
1735
           subtextStyle: {
1794
           subtextStyle: {
1736
             fontSize: 14,
1795
             fontSize: 14,
@@ -1910,10 +1969,205 @@ app.controller("incident_reportCtrl", [
1910
       // }
1969
       // }
1911
     }
1970
     }
1912
     //图表 事件运维详情柱状图seimin-1
1971
     //图表 事件运维详情柱状图seimin-1
1913
-    function barechart8(datas) {
1914
-      // console.log(datas);
1915
-      var datas = datas;
1916
-      var dom = document.getElementById("JJSJZZ");
1972
+    // function barechart8(datas) {
1973
+    //   var datas = datas;
1974
+    //   var dom = document.getElementById("JJSJZZ");
1975
+    //   var myChart = echarts.init(dom);
1976
+    //   var option = null;
1977
+    //   myChart.showLoading({
1978
+    //     text: "数据加载中...",
1979
+    //     color: "#c23531",
1980
+    //     textColor: "#fff",
1981
+    //     maskColor: "rgba(255,255,255,0)",
1982
+    //     zlevel: 0,
1983
+    //   });
1984
+    //   myChart.hideLoading();
1985
+    //   option = {
1986
+    //     tooltip: {
1987
+    //       trigger: "axis",
1988
+    //       axisPointer: {
1989
+    //         // 坐标轴指示器,坐标轴触发有效
1990
+    //         type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
1991
+    //       },
1992
+    //     },
1993
+    //     legend: {
1994
+    //       data: [
1995
+    //         "按时响应",
1996
+    //         "逾期响应",
1997
+    //         "响应平均时间",
1998
+    //         "按时解决",
1999
+    //         "逾期解决",
2000
+    //         "解决平均时间",
2001
+    //       ],
2002
+    //       align: "left",
2003
+    //       // itemWidth:10,
2004
+    //       // itemHeight:10,
2005
+    //       bottom: 0,
2006
+    //     },
2007
+    //     grid: {
2008
+    //       top: "10%",
2009
+    //       left: "1.5%",
2010
+    //       right: "1.5%",
2011
+    //       bottom: "15%",
2012
+    //       containLabel: true,
2013
+    //     },
2014
+    //     xAxis: [
2015
+    //       {
2016
+    //         type: "category",
2017
+    //         // axisTick: {
2018
+    //         //     alignWithLabel: true
2019
+    //         // },
2020
+    //         axisLabel: {
2021
+    //           textStyle: {
2022
+    //             color: "#7B7B7B",
2023
+    //             // fontSize: '14',
2024
+    //           },
2025
+    //         },
2026
+    //         axisLine: {
2027
+    //           show: true,
2028
+    //           lineStyle: {
2029
+    //             color: "#7B7B7B",
2030
+    //             // type: 'dotted'
2031
+    //           },
2032
+    //         },
2033
+    //         data: datas.name,
2034
+    //       },
2035
+    //     ],
2036
+    //     yAxis: [
2037
+    //       {
2038
+    //         type: "value",
2039
+    //         scale: true,
2040
+    //         name: "事件数量  (件)",
2041
+    //         min: 0,
2042
+    //         boundaryGap: [0.2, 0.2],
2043
+    //         axisLabel: {
2044
+    //           formatter: "{value}",
2045
+    //           textStyle: {
2046
+    //             color: "#7B7B7B",
2047
+    //             // fontSize: '14',
2048
+    //           },
2049
+    //         },
2050
+    //         axisLine: {
2051
+    //           show: true,
2052
+    //           lineStyle: {
2053
+    //             color: "#7B7B7B",
2054
+    //             // type: 'dotted'
2055
+    //           },
2056
+    //         },
2057
+    //       },
2058
+    //       {
2059
+    //         type: "value",
2060
+    //         scale: true,
2061
+    //         name: "按时解决率/逾期解决率",
2062
+    //         min: 0,
2063
+    //         max: 100,
2064
+    //         boundaryGap: [0.2, 0.2],
2065
+    //         axisLabel: {
2066
+    //           textStyle: {
2067
+    //             color: "#7B7B7B",
2068
+    //             // fontSize: '14',
2069
+    //           },
2070
+    //           formatter: "{value} %",
2071
+    //         },
2072
+    //         axisLine: {
2073
+    //           show: true,
2074
+    //           lineStyle: {
2075
+    //             color: "#7B7B7B",
2076
+    //             // type: 'dotted'
2077
+    //           },
2078
+    //         },
2079
+    //       },
2080
+    //     ],
2081
+    //     series: [
2082
+    //       {
2083
+    //         name: "逾期响应",
2084
+    //         type: "bar",
2085
+    //         stack: "1",
2086
+    //         barWidth: 30,
2087
+    //         itemStyle: {
2088
+    //           normal: {
2089
+    //             color: "#005395",
2090
+    //           },
2091
+    //         },
2092
+    //         data: datas.overtimeresponse,
2093
+    //       },
2094
+    //       {
2095
+    //         name: "按时响应",
2096
+    //         type: "bar",
2097
+    //         barWidth: 30,
2098
+    //         stack: "1",
2099
+    //         itemStyle: {
2100
+    //           normal: {
2101
+    //             color: "#E6EEF4",
2102
+    //           },
2103
+    //         },
2104
+    //         data: datas.ontimeresponse,
2105
+    //       },
2106
+    //       {
2107
+    //         name: "逾期解决",
2108
+    //         type: "bar",
2109
+    //         barWidth: 30,
2110
+    //         stack: "2",
2111
+    //         itemStyle: {
2112
+    //           normal: {
2113
+    //             color: "#1CA58F",
2114
+    //           },
2115
+    //         },
2116
+    //         data: datas.overtimesolve,
2117
+    //       },
2118
+    //       {
2119
+    //         name: "按时解决",
2120
+    //         type: "bar",
2121
+    //         barWidth: 30,
2122
+    //         stack: "2",
2123
+    //         itemStyle: {
2124
+    //           normal: {
2125
+    //             color: "#87C966",
2126
+    //           },
2127
+    //         },
2128
+    //         data: datas.ontimesolve,
2129
+    //       },
2130
+    //       {
2131
+    //         name: "解决平均时间",
2132
+    //         type: "line",
2133
+    //         itemStyle: {
2134
+    //           normal: {
2135
+    //             color: "#EF665C",
2136
+    //           },
2137
+    //         },
2138
+    //         lineStyle: {
2139
+    //           normal: {
2140
+    //             color: "#EF665C",
2141
+    //           },
2142
+    //         },
2143
+    //         data: datas.solvetime,
2144
+    //       },
2145
+    //       {
2146
+    //         name: "响应平均时间",
2147
+    //         type: "line",
2148
+    //         itemStyle: {
2149
+    //           normal: {
2150
+    //             color: "#FFA35E",
2151
+    //           },
2152
+    //         },
2153
+    //         lineStyle: {
2154
+    //           normal: {
2155
+    //             color: "#FFA35E",
2156
+    //           },
2157
+    //         },
2158
+    //         data: datas.responsetime,
2159
+    //       },
2160
+    //     ],
2161
+    //   };
2162
+    //   if (option && typeof option === "object") {
2163
+    //     myChart.setOption(option);
2164
+    //     myChart.hideLoading();
2165
+    //   }
2166
+    // }
2167
+    //图表 按时解决率、逾期解决率seimin-1
2168
+    function barechart8_1(datas) {
2169
+      console.log(datas, "barechart8_1");
2170
+      var dom = document.getElementById("JJSJZZ_1");
1917
       var myChart = echarts.init(dom);
2171
       var myChart = echarts.init(dom);
1918
       var option = null;
2172
       var option = null;
1919
       myChart.showLoading({
2173
       myChart.showLoading({
@@ -1929,27 +2183,36 @@ app.controller("incident_reportCtrl", [
1929
           trigger: "axis",
2183
           trigger: "axis",
1930
           axisPointer: {
2184
           axisPointer: {
1931
             // 坐标轴指示器,坐标轴触发有效
2185
             // 坐标轴指示器,坐标轴触发有效
1932
-            type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
2186
+            // type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
2187
+            lineStyle: {
2188
+              color: "#49A9EE",
2189
+              type: "dotted",
2190
+            },
2191
+          },
2192
+          formatter: function (params) {
2193
+            var result = params[0].name + "<br>";
2194
+            params.forEach(function (item) {
2195
+              result +=
2196
+                item.marker +
2197
+                " " +
2198
+                item.seriesName +
2199
+                " : " +
2200
+                item.value +
2201
+                "%</br>";
2202
+            });
2203
+            return result;
1933
           },
2204
           },
1934
         },
2205
         },
1935
         legend: {
2206
         legend: {
1936
-          data: [
1937
-            "按时响应",
1938
-            "逾期响应",
1939
-            "响应平均时间",
1940
-            "按时解决",
1941
-            "逾期解决",
1942
-            "解决平均时间",
1943
-          ],
2207
+          data: ["按时解决率", "逾期解决率"],
1944
           align: "left",
2208
           align: "left",
1945
           // itemWidth:10,
2209
           // itemWidth:10,
1946
           // itemHeight:10,
2210
           // itemHeight:10,
1947
           bottom: 0,
2211
           bottom: 0,
1948
         },
2212
         },
1949
         grid: {
2213
         grid: {
1950
-          top: "10%",
1951
-          left: "1.5%",
1952
-          right: "1.5%",
2214
+          left: "1%",
2215
+          right: "0%",
1953
           bottom: "15%",
2216
           bottom: "15%",
1954
           containLabel: true,
2217
           containLabel: true,
1955
         },
2218
         },
@@ -1979,37 +2242,16 @@ app.controller("incident_reportCtrl", [
1979
           {
2242
           {
1980
             type: "value",
2243
             type: "value",
1981
             scale: true,
2244
             scale: true,
1982
-            name: "事件数量  (件)",
1983
-            min: 0,
1984
-            boundaryGap: [0.2, 0.2],
1985
-            axisLabel: {
1986
-              formatter: "{value}",
1987
-              textStyle: {
1988
-                color: "#7B7B7B",
1989
-                // fontSize: '14',
1990
-              },
1991
-            },
1992
-            axisLine: {
1993
-              show: true,
1994
-              lineStyle: {
1995
-                color: "#7B7B7B",
1996
-                // type: 'dotted'
1997
-              },
1998
-            },
1999
-          },
2000
-          {
2001
-            type: "value",
2002
-            scale: true,
2003
-            name: "按时解决率/逾期解决率",
2245
+            name: "解决率(%)",
2004
             min: 0,
2246
             min: 0,
2005
             max: 100,
2247
             max: 100,
2006
             boundaryGap: [0.2, 0.2],
2248
             boundaryGap: [0.2, 0.2],
2007
             axisLabel: {
2249
             axisLabel: {
2250
+              formatter: "{value}%",
2008
               textStyle: {
2251
               textStyle: {
2009
                 color: "#7B7B7B",
2252
                 color: "#7B7B7B",
2010
                 // fontSize: '14',
2253
                 // fontSize: '14',
2011
               },
2254
               },
2012
-              formatter: "{value} %",
2013
             },
2255
             },
2014
             axisLine: {
2256
             axisLine: {
2015
               show: true,
2257
               show: true,
@@ -2022,82 +2264,40 @@ app.controller("incident_reportCtrl", [
2022
         ],
2264
         ],
2023
         series: [
2265
         series: [
2024
           {
2266
           {
2025
-            name: "逾期响应",
2026
-            type: "bar",
2027
-            stack: "1",
2028
-            barWidth: 30,
2029
-            itemStyle: {
2030
-              normal: {
2031
-                color: "#005395",
2032
-              },
2033
-            },
2034
-            data: datas.overtimeresponse,
2035
-          },
2036
-          {
2037
-            name: "按时响应",
2038
-            type: "bar",
2039
-            barWidth: 30,
2040
-            stack: "1",
2041
-            itemStyle: {
2042
-              normal: {
2043
-                color: "#E6EEF4",
2044
-              },
2045
-            },
2046
-            data: datas.ontimeresponse,
2047
-          },
2048
-          {
2049
-            name: "逾期解决",
2050
-            type: "bar",
2051
-            barWidth: 30,
2052
-            stack: "2",
2053
-            itemStyle: {
2054
-              normal: {
2055
-                color: "#1CA58F",
2056
-              },
2057
-            },
2058
-            data: datas.overtimesolve,
2059
-          },
2060
-          {
2061
-            name: "按时解决",
2062
-            type: "bar",
2063
-            barWidth: 30,
2064
-            stack: "2",
2065
-            itemStyle: {
2066
-              normal: {
2067
-                color: "#87C966",
2068
-              },
2069
-            },
2070
-            data: datas.ontimesolve,
2071
-          },
2072
-          {
2073
-            name: "解决平均时间",
2267
+            name: "按时解决率",
2074
             type: "line",
2268
             type: "line",
2075
             itemStyle: {
2269
             itemStyle: {
2076
               normal: {
2270
               normal: {
2077
-                color: "#EF665C",
2271
+                lineStyle: {
2272
+                  color: "#91c7ae",
2273
+                },
2274
+                color: "#91c7ae",
2078
               },
2275
               },
2079
             },
2276
             },
2080
             lineStyle: {
2277
             lineStyle: {
2081
               normal: {
2278
               normal: {
2082
-                color: "#EF665C",
2279
+                color: "#91c7ae",
2083
               },
2280
               },
2084
             },
2281
             },
2085
-            data: datas.solvetime,
2282
+            data: datas.ontimesolvePercentage,
2086
           },
2283
           },
2087
           {
2284
           {
2088
-            name: "响应平均时间",
2285
+            name: "逾期解决率",
2089
             type: "line",
2286
             type: "line",
2090
             itemStyle: {
2287
             itemStyle: {
2091
               normal: {
2288
               normal: {
2092
-                color: "#FFA35E",
2289
+                lineStyle: {
2290
+                  color: "#d48265",
2291
+                },
2292
+                color: "#d48265",
2093
               },
2293
               },
2094
             },
2294
             },
2095
             lineStyle: {
2295
             lineStyle: {
2096
               normal: {
2296
               normal: {
2097
-                color: "#FFA35E",
2297
+                color: "#d48265",
2098
               },
2298
               },
2099
             },
2299
             },
2100
-            data: datas.responsetime,
2300
+            data: datas.overtimesolvePercentage,
2101
           },
2301
           },
2102
         ],
2302
         ],
2103
       };
2303
       };
@@ -2106,10 +2306,24 @@ app.controller("incident_reportCtrl", [
2106
         myChart.hideLoading();
2306
         myChart.hideLoading();
2107
       }
2307
       }
2108
     }
2308
     }
2109
-    //图表 按时解决率、逾期解决率seimin-2
2110
-    function barechart8_1(datas) {
2111
-      console.log(datas, "barechart8_1");
2112
-      var dom = document.getElementById("JJSJZZ_1");
2309
+    //图表 按时响应逾期响应柱状图seimin-2
2310
+    function barechart8_2(datas) {
2311
+      var series = [];
2312
+      var arrName = ["按时响应", "逾期响应"];
2313
+      var arrObj = [datas.ontimeresponse, datas.overtimeresponse];
2314
+      arrName.forEach((v, i) => {
2315
+        series.push({
2316
+          name: v,
2317
+          type: "bar",
2318
+          stack: "1",
2319
+          barWidth: 40,
2320
+          itemStyle: {
2321
+            normal: {},
2322
+          },
2323
+          data: arrObj[i],
2324
+        });
2325
+      });
2326
+      var dom = document.getElementById("JJSJZZ_2");
2113
       var myChart = echarts.init(dom);
2327
       var myChart = echarts.init(dom);
2114
       var option = null;
2328
       var option = null;
2115
       myChart.showLoading({
2329
       myChart.showLoading({
@@ -2121,34 +2335,25 @@ app.controller("incident_reportCtrl", [
2121
       });
2335
       });
2122
       myChart.hideLoading();
2336
       myChart.hideLoading();
2123
       option = {
2337
       option = {
2338
+        color: ["#91c7ae", "#d48265"],
2124
         tooltip: {
2339
         tooltip: {
2125
-            trigger: "axis",
2126
-            axisPointer: {
2127
-                // 坐标轴指示器,坐标轴触发有效
2128
-                // type: 'shadow' // 默认为直线,可选为:'line' | 'shadow'
2129
-                lineStyle: {
2130
-                color: "#49A9EE",
2131
-                type: "dotted",
2132
-                },
2133
-            },
2134
-            formatter: function(params) {
2135
-                var result = params[0].name + "<br>";
2136
-                params.forEach(function(item) {
2137
-                    result += item.marker + " " + item.seriesName + " : " + item.value + "%</br>";
2138
-                });
2139
-                return result;
2140
-            }
2340
+          trigger: "axis",
2341
+          axisPointer: {
2342
+            // 坐标轴指示器,坐标轴触发有效
2343
+            type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
2344
+          },
2141
         },
2345
         },
2142
         legend: {
2346
         legend: {
2143
-          data: ["按时解决率", "逾期解决率"],
2347
+          data: arrName,
2144
           align: "left",
2348
           align: "left",
2145
           // itemWidth:10,
2349
           // itemWidth:10,
2146
           // itemHeight:10,
2350
           // itemHeight:10,
2147
           bottom: 0,
2351
           bottom: 0,
2148
         },
2352
         },
2149
         grid: {
2353
         grid: {
2150
-          left: "1%",
2151
-          right: "0%",
2354
+          top: "15%",
2355
+          left: "3%",
2356
+          right: "1.5%",
2152
           bottom: "15%",
2357
           bottom: "15%",
2153
           containLabel: true,
2358
           containLabel: true,
2154
         },
2359
         },
@@ -2178,12 +2383,12 @@ app.controller("incident_reportCtrl", [
2178
           {
2383
           {
2179
             type: "value",
2384
             type: "value",
2180
             scale: true,
2385
             scale: true,
2181
-            name: "解决率(%)",
2386
+            name: "事件数量  (件)",
2182
             min: 0,
2387
             min: 0,
2183
-            max: 100,
2388
+            minInterval: 1,
2184
             boundaryGap: [0.2, 0.2],
2389
             boundaryGap: [0.2, 0.2],
2185
             axisLabel: {
2390
             axisLabel: {
2186
-              formatter: "{value}%",
2391
+              formatter: "{value}",
2187
               textStyle: {
2392
               textStyle: {
2188
                 color: "#7B7B7B",
2393
                 color: "#7B7B7B",
2189
                 // fontSize: '14',
2394
                 // fontSize: '14',
@@ -2198,38 +2403,111 @@ app.controller("incident_reportCtrl", [
2198
             },
2403
             },
2199
           },
2404
           },
2200
         ],
2405
         ],
2201
-        series: [
2406
+        series: series,
2407
+      };
2408
+      if (option && typeof option === "object") {
2409
+        myChart.setOption(option);
2410
+        myChart.hideLoading();
2411
+      }
2412
+    }
2413
+    //图表 按时解决逾期解决柱状图seimin-3
2414
+    function barechart8_3(datas) {
2415
+      var series = [];
2416
+      var arrName = ["按时解决", "逾期解决"];
2417
+      var arrObj = [datas.ontimesolve, datas.overtimesolve];
2418
+      arrName.forEach((v, i) => {
2419
+        series.push({
2420
+          name: v,
2421
+          type: "bar",
2422
+          stack: "1",
2423
+          barWidth: 40,
2424
+          itemStyle: {
2425
+            normal: {},
2426
+          },
2427
+          data: arrObj[i],
2428
+        });
2429
+      });
2430
+      var dom = document.getElementById("JJSJZZ_3");
2431
+      var myChart = echarts.init(dom);
2432
+      var option = null;
2433
+      myChart.showLoading({
2434
+        text: "数据加载中...",
2435
+        color: "#c23531",
2436
+        textColor: "#fff",
2437
+        maskColor: "rgba(255,255,255,0)",
2438
+        zlevel: 0,
2439
+      });
2440
+      myChart.hideLoading();
2441
+      option = {
2442
+        color: ["#91c7ae", "#d48265"],
2443
+        tooltip: {
2444
+          trigger: "axis",
2445
+          axisPointer: {
2446
+            // 坐标轴指示器,坐标轴触发有效
2447
+            type: "shadow", // 默认为直线,可选为:'line' | 'shadow'
2448
+          },
2449
+        },
2450
+        legend: {
2451
+          data: arrName,
2452
+          align: "left",
2453
+          // itemWidth:10,
2454
+          // itemHeight:10,
2455
+          bottom: 0,
2456
+        },
2457
+        grid: {
2458
+          top: "15%",
2459
+          left: "3%",
2460
+          right: "1.5%",
2461
+          bottom: "15%",
2462
+          containLabel: true,
2463
+        },
2464
+        xAxis: [
2202
           {
2465
           {
2203
-            name: "按时解决率",
2204
-            type: "line",
2205
-            itemStyle: {
2206
-              normal: {
2207
-                color: "#49A9EE",
2466
+            type: "category",
2467
+            // axisTick: {
2468
+            //     alignWithLabel: true
2469
+            // },
2470
+            axisLabel: {
2471
+              textStyle: {
2472
+                color: "#7B7B7B",
2473
+                // fontSize: '14',
2208
               },
2474
               },
2209
             },
2475
             },
2210
-            lineStyle: {
2211
-              normal: {
2212
-                color: "#49A9EE",
2476
+            axisLine: {
2477
+              show: true,
2478
+              lineStyle: {
2479
+                color: "#7B7B7B",
2480
+                // type: 'dotted'
2213
               },
2481
               },
2214
             },
2482
             },
2215
-            data: datas.ontimesolvePercentage,
2483
+            data: datas.name,
2216
           },
2484
           },
2485
+        ],
2486
+        yAxis: [
2217
           {
2487
           {
2218
-            name: "逾期解决率",
2219
-            type: "line",
2220
-            itemStyle: {
2221
-              normal: {
2222
-                color: "#87C966",
2488
+            type: "value",
2489
+            scale: true,
2490
+            name: "事件数量  (件)",
2491
+            min: 0,
2492
+            minInterval: 1,
2493
+            boundaryGap: [0.2, 0.2],
2494
+            axisLabel: {
2495
+              formatter: "{value}",
2496
+              textStyle: {
2497
+                color: "#7B7B7B",
2498
+                // fontSize: '14',
2223
               },
2499
               },
2224
             },
2500
             },
2225
-            lineStyle: {
2226
-              normal: {
2227
-                color: "#87C966",
2501
+            axisLine: {
2502
+              show: true,
2503
+              lineStyle: {
2504
+                color: "#7B7B7B",
2505
+                // type: 'dotted'
2228
               },
2506
               },
2229
             },
2507
             },
2230
-            data: datas.overtimesolvePercentage,
2231
           },
2508
           },
2232
         ],
2509
         ],
2510
+        series: series,
2233
       };
2511
       };
2234
       if (option && typeof option === "object") {
2512
       if (option && typeof option === "object") {
2235
         myChart.setOption(option);
2513
         myChart.setOption(option);
@@ -2238,6 +2516,7 @@ app.controller("incident_reportCtrl", [
2238
     }
2516
     }
2239
     //图表 事件运维满意度柱状图
2517
     //图表 事件运维满意度柱状图
2240
     function barechart9(datas) {
2518
     function barechart9(datas) {
2519
+      console.log(datas);
2241
       var name = [];
2520
       var name = [];
2242
       var series = [];
2521
       var series = [];
2243
       for (var key in datas) {
2522
       for (var key in datas) {

+ 5 - 5
assets/views/report/deck_report.html

@@ -96,7 +96,7 @@
96
             <div class="deck_cont_body" ng-if="tap=='LDZS'">
96
             <div class="deck_cont_body" ng-if="tap=='LDZS'">
97
                 <div class="deck_cont_body_TB1">
97
                 <div class="deck_cont_body_TB1">
98
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计的,来电总数和建单总数</div>' tooltip-placement="right">
98
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计的,来电总数和建单总数</div>' tooltip-placement="right">
99
-                        来电总数
99
+                        <strong class="i_big">来电总数</strong>
100
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
100
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
101
                     </span>
101
                     </span>
102
                     <div class="TB">
102
                     <div class="TB">
@@ -150,7 +150,7 @@
150
                 </div>
150
                 </div>
151
                 <div class="deck_cont_body_TB2">
151
                 <div class="deck_cont_body_TB2">
152
                     <span tooltip-html-unsafe='<div class="slf">根据小时统计,来电数量趋势</div>' tooltip-placement="right">
152
                     <span tooltip-html-unsafe='<div class="slf">根据小时统计,来电数量趋势</div>' tooltip-placement="right">
153
-                        24小时来电趋势图
153
+                        <strong class="i_big">24小时来电趋势图</strong>
154
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
154
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
155
                     </span>
155
                     </span>
156
                     <div class="TB">
156
                     <div class="TB">
@@ -163,7 +163,7 @@
163
                 </div>
163
                 </div>
164
                 <div class="deck_cont_body_TB2">
164
                 <div class="deck_cont_body_TB2">
165
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,接听后,通话总时长趋势</div>' tooltip-placement="right">
165
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,接听后,通话总时长趋势</div>' tooltip-placement="right">
166
-                        通话总时长趋势图
166
+                        <strong class="i_big">通话总时长趋势图</strong>
167
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
167
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
168
                     </span>
168
                     </span>
169
                     <div class="TB">
169
                     <div class="TB">
@@ -176,7 +176,7 @@
176
                 </div>
176
                 </div>
177
                 <div class="deck_cont_body_TB2">
177
                 <div class="deck_cont_body_TB2">
178
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,接听后,通话平均时长趋势</div>' tooltip-placement="right">
178
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,接听后,通话平均时长趋势</div>' tooltip-placement="right">
179
-                        通话平均时长趋势图
179
+                        <strong class="i_big">通话平均时长趋势图</strong>
180
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
180
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
181
                     </span>
181
                     </span>
182
                     <div class="TB">
182
                     <div class="TB">
@@ -189,7 +189,7 @@
189
                 </div>
189
                 </div>
190
                 <div class="deck_cont_body_TB2">
190
                 <div class="deck_cont_body_TB2">
191
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,未接听数量趋势</div>' tooltip-placement="right">
191
                     <span tooltip-html-unsafe='<div class="slf">根据月份统计,未接听数量趋势</div>' tooltip-placement="right">
192
-                        通话未接听数量趋势图
192
+                        <strong class="i_big">通话未接听数量趋势图</strong>
193
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
193
                         <i class="fa ti-help-alt fontcolor-five pointfont"></i>
194
                     </span>
194
                     </span>
195
                     <div class="TB">
195
                     <div class="TB">

File diff suppressed because it is too large
+ 23 - 13
assets/views/report/incident_report.html