seimin vor 3 Jahren
Ursprung
Commit
c2721e4fed

+ 1 - 1
assets/css/styles.css

@@ -2043,7 +2043,7 @@ fieldset[disabled] .btn-statebutton.btn-o.active {
2043 2043
 }
2044 2044
 
2045 2045
 .pointfont {
2046
-    cursor: pointer;
2046
+    cursor: auto;
2047 2047
 }
2048 2048
 
2049 2049
 

+ 102 - 36
assets/js/controllers/report/deck_reportCtrl.js

@@ -1,5 +1,5 @@
1 1
 'use strict';
2
-app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "SweetAlert", "Restangular", "api_report", "api_statistic", "moment", 'api_user_data', function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, SweetAlert, Restangular, api_report, api_statistic, moment, api_user_data) {
2
+app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout", "$interval", "$http", "$cookieStore", "SweetAlert", "Restangular", "api_report", "api_statistic", "moment", 'api_user_data','api_deck_report', function ($scope, $rootScope, $state, $timeout, $interval, $http, $cookieStore, SweetAlert, Restangular, api_report, api_statistic, moment, api_user_data,api_deck_report) {
3 3
     $scope.tap = 'LDZS';
4 4
     // 选择日期:
5 5
     $scope.dateSelected = [{
@@ -28,6 +28,16 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
28 28
     }
29 29
     $scope.parameters.paramDateFrom = $scope.starttimes;
30 30
     $scope.parameters.paramDateTo = $scope.endtimes;
31
+    $scope.searchkeys = {
32
+        dateSelected: {id:-1,name:""}//选中
33
+    };
34
+    // 重置
35
+    $scope.reset = function(){
36
+        $scope.parameters.paramDateFrom = moment(new Date().getTime() - 86400000 * (weeks + 6)).format('YYYY-MM-DD');
37
+        $scope.parameters.paramDateTo = moment(new Date().getTime() - 86400000 * (weeks)).format('YYYY-MM-DD');
38
+        $scope.searchkeys.dateSelected = {id:-1,name:""}
39
+        $scope.getData();
40
+    }
31 41
     // n天前
32 42
     $scope.GetDateStr = function (AddDayCount) {
33 43
         var dd = new Date();
@@ -98,13 +108,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
98 108
     $scope.active = function (name) {
99 109
         $scope.tap = name
100 110
         if ($scope.tap == 'LDZS') {
101
-            setTimeout(function () {
102
-                barechart();
103
-                barechart1({id:"sjfx1",name:'来电数量',unit:'个'});
104
-                barechart1({id:"sjfx2",name:'接听通话时长',unit:'秒'});
105
-                barechart1({id:"sjfx3",name:'接听电话平均时长',unit:'秒'});
106
-                barechart1({id:"sjfx4",name:'未接电话',unit:'个'});
107
-            }, 500);
111
+            $scope.getData();
108 112
         } else {
109 113
             setTimeout(function () {
110 114
                 barechart2();
@@ -113,16 +117,92 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
113 117
         }
114 118
     }
115 119
     // 请求人
116
-    api_user_data.fetchDataList('requester', {
117
-        "idx": 0,
118
-        "sum": 10
119
-    }).then(function (response) {
120
-        if (response) {
121
-            if (response.status = 200) {
122
-                $scope.requester = response.list;
120
+    // api_user_data.fetchDataList('requester', {
121
+    //     "idx": 0,
122
+    //     "sum": 10
123
+    // }).then(function (response) {
124
+    //     if (response) {
125
+    //         if (response.status = 200) {
126
+    //             $scope.requester = response.list;
127
+    //         }
128
+    //     }
129
+    // })
130
+    //获取数据
131
+    $scope.total = 0;//来电总数
132
+    $scope.trans = 0;//建单总数
133
+    $scope.trans_percent = 0;//来电转换率
134
+    $scope.dataList = [];//柱状图-按月统计来电量
135
+    $scope.dataList_name = [];//横轴名称
136
+    $scope.dataList_totalNum = [];//来电总数
137
+    $scope.dataList_buildNum = [];//建单总数
138
+
139
+    $scope.hourList = [];//24小时来电趋势图-按小时统计来电量
140
+    $scope.hourList_name = [];
141
+    $scope.hourList_countNum = [];
142
+
143
+    $scope.timeList = [];//未接听数-按月统计
144
+    $scope.timeList_name = [];
145
+    $scope.timeList_sumNum = [];
146
+    $scope.timeList_avgNum = [];
147
+
148
+    $scope.missList = [];//接听通话时长和平均时长-按月统计
149
+    $scope.missList_name = [];
150
+    $scope.missList_countNum = [];
151
+    $scope.getData = function(){
152
+        api_deck_report.fetchLdzsNumList({
153
+            "startTime": $scope.parameters.paramDateFrom,
154
+            "endTime": $scope.parameters.paramDateTo,
155
+        }).then(function (res) {
156
+            if(res){
157
+                // 来电总数顶部数字
158
+                if(res.title){
159
+                    $scope.total = res.title.total || 0;
160
+                    $scope.trans = res.title.trans || 0;
161
+                    $scope.trans_percent = res.title.trans_percent || 0;
162
+                }
163
+                // 柱状图-按月统计来电量
164
+                if(res.dataList){
165
+                    var arr = Object.values(res.dataList);
166
+                    $scope.dataList = arr.map(ress=>{
167
+                        return {
168
+                            time:ress.time,
169
+                            total:ress.total || 0,
170
+                            trans:ress.trans || 0
171
+                        }
172
+                    })
173
+                    $scope.dataList_name = $scope.dataList.map(v=>v.time);//横轴名称
174
+                    $scope.dataList_totalNum = $scope.dataList.map(v=>v.total);//来电总数
175
+                    $scope.dataList_buildNum = $scope.dataList.map(v=>v.trans);//建单总数
176
+                }
177
+                // 24小时来电趋势图-按小时统计来电量
178
+                if(res.hourList){
179
+                    $scope.hourList = res.hourList || [];
180
+                    $scope.hourList_name = $scope.hourList.map(v=>v.time);//横轴名称
181
+                    $scope.hourList_countNum = $scope.hourList.map(v=>v.count);//数量
182
+                }
183
+                // 接听通话时长和平均时长-按月统计
184
+                if(res.timeList){
185
+                    $scope.timeList = res.timeList || [];
186
+                    $scope.timeList_name = $scope.timeList.map(v=>v.time);//横轴名称
187
+                    $scope.timeList_sumNum = $scope.timeList.map(v=>v.sum);//通话时长
188
+                    $scope.timeList_avgNum = $scope.timeList.map(v=>v.avg);//平均时长
189
+                }
190
+                // 未接听数-按月统计
191
+                if(res.missList){
192
+                    $scope.missList = res.missList || [];
193
+                    $scope.missList_name = $scope.missList.map(v=>v.time);//横轴名称
194
+                    $scope.missList_countNum = $scope.missList.map(v=>v.count);//未接听数
195
+                }
196
+                //渲染图表
197
+                barechart();
198
+                barechart1({id:"sjfx1",name:'来电数量',unit:'个',data:{x:$scope.hourList_name,y:$scope.hourList_countNum}});
199
+                barechart1({id:"sjfx2",name:'接听通话时长',unit:'秒',data:{x:$scope.timeList_name,y:$scope.timeList_sumNum}});
200
+                barechart1({id:"sjfx3",name:'接听电话平均时长',unit:'秒',data:{x:$scope.timeList_name,y:$scope.timeList_avgNum}});
201
+                barechart1({id:"sjfx4",name:'未接电话',unit:'个',data:{x:$scope.missList_name,y:$scope.missList_countNum}});
123 202
             }
124
-        }
125
-    })
203
+        })
204
+    }
205
+    $scope.getData();
126 206
     // 选择日期
127 207
     $scope.onChangeDate = function (s) {
128 208
         console.log(s)
@@ -203,7 +283,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
203 283
                         // type: 'dotted'
204 284
                     },
205 285
                 },
206
-                data: ['10-12', '10-12', '10-12', '10-12', '10-12', '10-12', '10-12', '10-12', '10-12']
286
+                data: $scope.dataList_name
207 287
             }],
208 288
             yAxis: [{
209 289
                     type: 'value',
@@ -257,7 +337,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
257 337
                             color: '#005395'
258 338
                         }
259 339
                     },
260
-                    data: [20, 12, 31, 23, 56, 78, 92, 12, 23]
340
+                    data: $scope.dataList_totalNum
261 341
                 }, {
262 342
                     name: '建单总数',
263 343
                     type: 'bar',
@@ -266,7 +346,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
266 346
                             color: '#1CA58F'
267 347
                         }
268 348
                     },
269
-                    data: [10, 20, 5, 5, 2, 32, 34, 56, 23]
349
+                    data: $scope.dataList_buildNum
270 350
                 }
271 351
             ]
272 352
         };
@@ -335,7 +415,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
335 415
                         // type: 'dotted'
336 416
                     },
337 417
                 },
338
-                data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
418
+                data: options.data.x
339 419
             }],
340 420
             yAxis: [{
341 421
                 type: 'value',
@@ -370,7 +450,7 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
370 450
                         color: '#005395'
371 451
                     }
372 452
                 },
373
-                data: [10, 20, 5, 23, 12, 3, 63, 12, 23, 34, 76, 45]
453
+                data: options.data.y
374 454
             }]
375 455
         };
376 456
         if (option1 && typeof option1 === "object") {
@@ -663,18 +743,4 @@ app.controller('deck_reportCtrl', ["$scope", "$rootScope", "$state", "$timeout",
663 743
             myChart.hideLoading();
664 744
         }
665 745
     }
666
-
667
-
668
-
669
-
670
-
671
-    setTimeout(function () {
672
-        barechart();
673
-        barechart1({id:"sjfx1",name:'来电数量',unit:'个'});
674
-        barechart1({id:"sjfx2",name:'接听通话时长',unit:'秒'});
675
-        barechart1({id:"sjfx3",name:'接听电话平均时长',unit:'秒'});
676
-        barechart1({id:"sjfx4",name:'未接电话',unit:'个'});
677
-    }, 1000);
678
-
679
-
680 746
 }])

+ 18 - 12
assets/js/controllers/report/event_formCtrl.js

@@ -211,9 +211,9 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
211 211
                 $scope.groupSelectedOne.value = $scope.groupSelected[0];//选择处理人/组
212 212
                 break;
213 213
             case 'SFGS'://三方公司
214
-                $scope.sortActive = 'sumtop';
215
-                $scope.name = 'sum';//表格排序,字段名称
216
-                $scope.mdxquery('sum', 'desc');
214
+                $scope.sortActive = 'i_totaltop';
215
+                $scope.name = 'i_total';//表格排序,字段名称
216
+                $scope.mdxquery('i_total', 'desc');
217 217
                 $scope.companySelectedOne.value = {id:-1,name:''};//选择三方公司
218 218
                 break;
219 219
             case 'QYDD'://区域地点
@@ -284,10 +284,10 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
284 284
     $scope.clrz_satisfactionRatio = 0;//满意度
285 285
     //三方公司
286 286
     $scope.sfgs_list = null;//表格列表
287
-    $scope.sfgs_num = 0;//公司总数
288
-    $scope.sfgs_num1 = 0;//人员总数
289
-    $scope.sfgs_num2 = 0;//解决事件总数
290
-    $scope.sfgs_resolvedTime = '0分';//平均解决时长
287
+    $scope.sfgs_c_total = 0;//公司总数
288
+    $scope.sfgs_u_total = 0;//人员总数
289
+    $scope.sfgs_p_total = 0;//解决事件总数
290
+    $scope.sfgs_p_time = '0分';//平均解决时长
291 291
     //区域地点
292 292
     $scope.qydd_list = null;//表格列表
293 293
     $scope.qydd_num = 0;//事件总数数量
@@ -302,7 +302,13 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
302 302
      */
303 303
     $scope.mdxquery = function (name, type) {
304 304
         if (!name) {
305
-            name = $scope.tap == 'SJZS' ? 'accdate' : 'sum';
305
+            if($scope.tap == 'SJZS'){
306
+                name = 'accdate';
307
+            }else if($scope.tap == 'SFGS'){
308
+                name = 'i_total';
309
+            }else{
310
+                name = 'sum';
311
+            }
306 312
         }
307 313
         type = type || 'desc';
308 314
         switch ($scope.tap) {
@@ -433,10 +439,10 @@ app.controller('event_formCtrl', ["$scope", "$rootScope", "$state", "$timeout",
433 439
                         api_event_form.fetchSfgsList(postData).then(function (res) {
434 440
                             if (res.stats == 200) {
435 441
                                 $scope.sfgs_list = res.dataList;//表格列表
436
-                                $scope.sfgs_num = res.sum;//公司总数
437
-                                $scope.sfgs_num1 = res.sum1;//人员总数
438
-                                $scope.sfgs_num2 = res.responseTime;//解决事件总数
439
-                                $scope.sfgs_resolvedTime = res.resolvedTime;//平均解决时长
442
+                                $scope.sfgs_c_total = res.title.c_total;//公司总数
443
+                                $scope.sfgs_u_total = res.title.u_total;//人员总数
444
+                                $scope.sfgs_p_total = res.title.p_total;//解决事件总数
445
+                                $scope.sfgs_p_time = res.title.p_time;//平均解决时长
440 446
                             }
441 447
                         })
442 448
                     }

+ 15 - 0
assets/js/main.js

@@ -2027,6 +2027,21 @@ app.factory('api_event_form', ['eventFormApi', function (eventFormApi) {
2027 2027
         }
2028 2028
     };
2029 2029
 }]);
2030
+// 服务台分析-seimin
2031
+app.factory('deckReportApi', function (Restangular) {
2032
+    return Restangular.withConfig(function (RestangularConfigurer) {
2033
+        RestangularConfigurer.setBaseUrl(serverIp + '/report');
2034
+    });
2035
+});
2036
+app.factory('api_deck_report', ['deckReportApi', function (deckReportApi) {
2037
+    var dataService = deckReportApi.all("data");
2038
+    return {
2039
+        // 来电总数
2040
+        fetchLdzsNumList: function (data) {
2041
+            return dataService.customPOST(data, 'service_phone_total');
2042
+        },
2043
+    };
2044
+}]);
2030 2045
 // 登录后判断版本-seimin
2031 2046
 app.factory('isCategoryApi', function (Restangular) {
2032 2047
     return Restangular.withConfig(function (RestangularConfigurer) {

+ 6 - 7
assets/views/report/deck_report.html

@@ -88,9 +88,8 @@
88 88
                         <div class="form-group pull-right " style="margin-right: 15px;">
89 89
                             <button class="btn btn-searchbutton steelbutton" ng-click="mdxquery('all')" type="button">搜索</button>
90 90
                         </div> -->
91
-                        <div class="btn btn_search" ng-click="mdxquery('all')">搜索</div>
92
-                        <div class="btn btn_clean" ng-click="reload()" id="exportToPdf"
93
-                            ng-disabled="disabledParentGroup">重置</div>
91
+                        <div class="btn btn_search" ng-click="getData()">搜索</div>
92
+                        <div class="btn btn_clean" ng-click="reset()" id="exportToPdf">重置</div>
94 93
                     </div>
95 94
                 </form>
96 95
             </div>
@@ -105,7 +104,7 @@
105 104
                             <div class="TB_head_L">
106 105
                                 <div class="TB_LDZH" tooltip='接听数 + 未接数' tooltip-placement="top">
107 106
                                     <p>来电总数 (个)</p>
108
-                                    <span>300</span>
107
+                                    <span>{{total}}</span>
109 108
                                 </div>
110 109
                                 <!-- <div class="TB_ITEMS">
111 110
                                     <div class="TB_ITEM">
@@ -125,13 +124,13 @@
125 124
                             <div class="TB_head_L noLeft">
126 125
                                 <div class="TB_LDZH" tooltip='通过来电转弹屏建单的工单总数' tooltip-placement="top">
127 126
                                     <p>建单总数 (个)</p>
128
-                                    <span>300</span>
127
+                                    <span>{{trans}}</span>
129 128
                                 </div>
130 129
                             </div>
131 130
                             <div class="TB_head_L noLeft">
132
-                                <div class="TB_LDZH" tooltip='建单总数\(来电总数\100)' tooltip-placement="top">
131
+                                <div class="TB_LDZH" tooltip='(建单总数/来电总数)*100' tooltip-placement="top">
133 132
                                     <p>来电转换率 (%)</p>
134
-                                    <span>300</span>
133
+                                    <span>{{trans_percent}}%</span>
135 134
                                 </div>
136 135
                             </div>
137 136
                             <!-- <div class="TB_head_R">

+ 28 - 29
assets/views/report/event_form.html

@@ -10,7 +10,7 @@
10 10
 </section>
11 11
 <div class="col-md-12 col-sm-12">
12 12
     <div class="row deck_body" ng-controller="event_formCtrl">
13
-        <div class="deck_head">
13
+        <div class="event_head">
14 14
             <div class="deck_head_L" ng-class="{ac:tap=='SJZS'}" ng-click="active('SJZS')">
15 15
                 <span>事件总数</span>
16 16
             </div>
@@ -20,7 +20,7 @@
20 20
             <div class="deck_head_L" ng-class="{ac:tap=='CLRZ'}" ng-click="active('CLRZ')">
21 21
                 <span>处理人/组</span>
22 22
             </div>
23
-            <div class="deck_head_L" ng-if="false" ng-class="{ac:tap=='SFGS'}" ng-click="active('SFGS')">
23
+            <div class="deck_head_L" ng-class="{ac:tap=='SFGS'}" ng-click="active('SFGS')">
24 24
                 <span>三方公司</span>
25 25
             </div>
26 26
             <div class="deck_head_L" ng-class="{ac:tap=='QYDD'}" ng-click="active('QYDD')">
@@ -539,20 +539,20 @@
539 539
                             <div class="TB_head_L">
540 540
                                 <div class="TB_LDZH fl" tooltip='第三方公司名称' tooltip-placement="top">
541 541
                                     <p>公司总数</p>
542
-                                    <span>{{sfgs_num}}</span>
542
+                                    <span>{{sfgs_c_total}}</span>
543 543
                                 </div>
544 544
                                 <div class="TB_ITEMS fl">
545 545
                                     <div class="TB_ITEM" tooltip='第三方公司下面的人员总数' tooltip-placement="top">
546 546
                                         <p>人员总数</p>
547
-                                        <span>{{sfgs_num1}}</span>
547
+                                        <span>{{sfgs_u_total}}</span>
548 548
                                     </div>
549 549
                                     <div class="TB_ITEM" tooltip='第三方公司人员处理事件总数。已关闭的单子' tooltip-placement="top">
550 550
                                         <p>解决事件总数</p>
551
-                                        <span>{{sfgs_num2}}</span>
551
+                                        <span>{{sfgs_p_total}}</span>
552 552
                                     </div>
553 553
                                     <div class="TB_ITEM" tooltip='每个单子的平均解决时长' tooltip-placement="top">
554 554
                                         <p>平均解决时长</p>
555
-                                        <span>{{sfgs_resolvedTime}}%</span>
555
+                                        <span>{{sfgs_p_time}}</span>
556 556
                                     </div>
557 557
                                 </div>
558 558
                             </div>
@@ -565,42 +565,42 @@
565 565
                                         <th style="width:6%">
566 566
                                             序号
567 567
                                         </th>
568
-                                        <th style="width:22%" ng-click="tableSort('accdate')" tooltip='第三方公司名称' tooltip-placement="top">
568
+                                        <th style="width:22%" ng-click="tableSort('userName')" tooltip='第三方公司名称' tooltip-placement="top">
569 569
                                             公司名称
570 570
                                         </th>
571
-                                        <th style="width:18%" ng-click="tableSort('sum')" tooltip='此公司下的人员数量' tooltip-placement="top">
571
+                                        <th style="width:18%" ng-click="tableSort('u_total')" tooltip='此公司下的人员数量' tooltip-placement="top">
572 572
                                             <strong>
573 573
                                                 人员总数
574 574
                                                 <em class="sort-wrap">
575
-                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'sumtop'}"></i>
576
-                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'sumbottom'}"></i>
575
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'u_totaltop'}"></i>
576
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'u_totalbottom'}"></i>
577 577
                                                 </em>
578 578
                                             </strong>
579 579
                                         </th>
580
-                                        <th style="width:18%" ng-click="tableSort('responseTime')" tooltip='此人员处理的工单数量' tooltip-placement="top">
580
+                                        <th style="width:18%" ng-click="tableSort('i_total')" tooltip='此人员处理的工单数量' tooltip-placement="top">
581 581
                                             <strong>
582 582
                                                 事件数量
583 583
                                                 <em class="sort-wrap">
584
-                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'responseTimetop'}"></i>
585
-                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'responseTimebottom'}"></i>
584
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'i_totaltop'}"></i>
585
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'i_totalbottom'}"></i>
586 586
                                                 </em>
587 587
                                             </strong>
588 588
                                         </th>
589
-                                        <th style="width:18%" ng-click="tableSort('resolvedTime')" tooltip='接单时间 – 建单时间' tooltip-placement="top">
589
+                                        <th style="width:18%" ng-click="tableSort('response_time')" tooltip='接单时间 – 建单时间' tooltip-placement="top">
590 590
                                             <strong>
591 591
                                                 平均响应时长
592 592
                                                 <em class="sort-wrap">
593
-                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'resolvedTimetop'}"></i>
594
-                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'resolvedTimebottom'}"></i>
593
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'response_timetop'}"></i>
594
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'response_timebottom'}"></i>
595 595
                                                 </em>
596 596
                                             </strong>
597 597
                                         </th>
598
-                                        <th style="width:18%" ng-click="tableSort('resolvedTime')" tooltip='处理完成时间 –  接单时间' tooltip-placement="top">
598
+                                        <th style="width:18%" ng-click="tableSort('resolved_time')" tooltip='处理完成时间 –  接单时间' tooltip-placement="top">
599 599
                                             <strong>
600 600
                                                 平均解决时长
601 601
                                                 <em class="sort-wrap">
602
-                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'resolvedTimetop'}"></i>
603
-                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'resolvedTimebottom'}"></i>
602
+                                                    <i class="sortItem iconfont icon-xiangshang" ng-class="{active:sortActive == 'resolved_timetop'}"></i>
603
+                                                    <i class="sortItem iconfont icon-xiangxia" ng-class="{active:sortActive == 'resolved_timebottom'}"></i>
604 604
                                                 </em>
605 605
                                             </strong>
606 606
                                         </th>
@@ -616,19 +616,19 @@
616 616
                                                 {{$index+1}}
617 617
                                             </td>
618 618
                                             <td style="width:22%">
619
-                                                {{rowData.accdate}}
619
+                                                {{rowData.userName}}
620 620
                                             </td>
621 621
                                             <td style="width:18%">
622
-                                                {{rowData.sum}}
622
+                                                {{rowData.u_total}}
623 623
                                             </td>
624 624
                                             <td style="width:18%">
625
-                                                {{rowData.responseTime}}
625
+                                                {{rowData.i_total}}
626 626
                                             </td>
627 627
                                             <td style="width:18%">
628
-                                                {{rowData.resolvedTime}}
628
+                                                {{rowData.response_time}}
629 629
                                             </td>
630 630
                                             <td style="width:18%">
631
-                                                {{rowData.allresult}}
631
+                                                {{rowData.resolved_time}}
632 632
                                             </td>
633 633
                                         </tr>
634 634
                                     </tbody>
@@ -799,15 +799,14 @@
799 799
         padding: 16px;
800 800
     }
801 801
 
802
-    .deck_head {
802
+    .event_head {
803 803
         height: 50px;
804 804
         width: 100%
805 805
     }
806 806
 
807
-    .deck_head .deck_head_L {
807
+    .event_head .deck_head_L {
808 808
         float: left;
809
-        /* width: 16.66%; */
810
-        width: 20%;
809
+        width: 16.66%;
811 810
         height: 100%;
812 811
         text-align: center;
813 812
         border-top: 5px solid #EAEAEA;
@@ -817,7 +816,7 @@
817 816
         cursor: pointer;
818 817
     }
819 818
 
820
-    .deck_head .deck_head_R {
819
+    .event_head .deck_head_R {
821 820
         float: left;
822 821
         width: 50%;
823 822
         height: 100%;

+ 4 - 4
assets/views/report/service_form.html

@@ -10,7 +10,7 @@
10 10
 </section>
11 11
 <div class="col-md-12 col-sm-12">
12 12
     <div class="row deck_body" ng-controller="service_formCtrl">
13
-        <div class="deck_head">
13
+        <div class="service_head">
14 14
             <div class="deck_head_L" ng-class="{ac:tap=='ZHTJ'}" ng-click="active('ZHTJ')">
15 15
                 <span>综合统计</span>
16 16
             </div>
@@ -651,12 +651,12 @@
651 651
         padding: 16px;
652 652
     }
653 653
 
654
-    .deck_head {
654
+    .service_head {
655 655
         height: 50px;
656 656
         width: 100%
657 657
     }
658 658
 
659
-    .deck_head .deck_head_L {
659
+    .service_head .deck_head_L {
660 660
         float: left;
661 661
         width: 25%;
662 662
         height: 100%;
@@ -668,7 +668,7 @@
668 668
         cursor: pointer;
669 669
     }
670 670
 
671
-    .deck_head .deck_head_R {
671
+    .service_head .deck_head_R {
672 672
         float: left;
673 673
         width: 50%;
674 674
         height: 100%;