seimin %!s(int64=2) %!d(string=hai) anos
pai
achega
334a3d293d

+ 1 - 1
assets/js/controllers/desk/calllogCtrl.js

@@ -138,7 +138,7 @@ app.controller('calllogCtrl', ["$scope", "i18nService", "$rootScope", "$state",
138 138
     $scope.isHuibo=function(data){
139 139
         var phones = JSON.parse(sessionStorage.getItem('phones'));
140 140
         console.log(phones,data.callerIdNumber)
141
-        var isHuajihao = phones.length?phones.some(v=>v == data.callerIdNumber):false;
141
+        var isHuajihao = phones && phones.length?phones.some(v=>v == data.callerIdNumber):false;
142 142
         return !isHuajihao;
143 143
     }
144 144
     $scope.chuli=false;

+ 1 - 1
assets/js/controllers/desk/recordCtrl.js

@@ -851,7 +851,7 @@ app.controller("Recordoperator", [
851 851
     $scope.isHuibo = (function () {
852 852
       var phones = JSON.parse(sessionStorage.getItem("phones"));
853 853
       console.log(phones, $scope.item.ano);
854
-      var isHuajihao = phones.length
854
+      var isHuajihao = phones && phones.length
855 855
         ? phones.some((v) => v == $scope.item.ano)
856 856
         : false;
857 857
       return !isHuajihao;

+ 6 - 3
assets/js/controllers/report/chargingCtrl.js

@@ -171,9 +171,12 @@ app.controller("chartingCtrl", [
171 171
             if ((response.status = 200)) {
172 172
               $scope.isMaskground = false;
173 173
               $scope.charginrow = response.data;
174
-              // angular.forEach($scope.charginrow, function(item) {
175
-              //     sumChargin = sumChargin + item.complexity;
176
-              // })
174
+              var totalComplexity = 0;
175
+              totalComplexity = $scope.charginrow.reduce((pre,cur)=>pre + cur.complexity,0)
176
+              angular.forEach($scope.charginrow, function(item) {
177
+                  // sumChargin = sumChargin + item.complexity;
178
+                  item.complexityPercentage = (item.complexity / totalComplexity * 100).toFixed(2) + '%';
179
+              })
177 180
               if (response.list && response.list.length == 0) {
178 181
                 $scope.shows = true;
179 182
                 $scope.empty = "数据为空!";

+ 4 - 4
assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -21,7 +21,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
21 21
         {"name":"事件影响度"},
22 22
         {"name":"事件优先级"},
23 23
         {"name":"优先级规则"},
24
-        {"name":"工单权重"},
24
+        {"name":"工"},
25 25
         {"name":"服务级别协议"},
26 26
         {"name":"事件来源"},
27 27
         {"name":"关闭代码"},
@@ -51,7 +51,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
51 51
     api_wechatfile.getDictionary({"key":"incident_priority","type":"list"}).then(function(data){
52 52
         $scope.priority=data
53 53
     })
54
-    // 工单权重
54
+    // 工
55 55
     api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(data){
56 56
         $scope.complexity=data
57 57
     })
@@ -1154,7 +1154,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
1154 1154
         },2000)
1155 1155
     }
1156 1156
     // 事件优先级结束
1157
-    // 事件工单权重开始
1157
+    // 事件工开始
1158 1158
     $scope.incident_complexityData=[];
1159 1159
     $scope.getIncident_complexity=function(){
1160 1160
         var data={
@@ -1199,7 +1199,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
1199 1199
     //         $scope.getIncident_complexity();
1200 1200
     //     },2000)
1201 1201
     // }
1202
-    // 事件工单权重结束
1202
+    // 事件工结束
1203 1203
     // 服务级别协议开始
1204 1204
     $scope.incident_SLA_Data=[];
1205 1205
     $scope.getIncident_SLA=function(){

+ 1 - 1
assets/js/main.js

@@ -1,4 +1,4 @@
1
-console.info('v1.0.2');
1
+console.info('v1.0.3');
2 2
 var app = angular.module('itsmApp', ['itsm-dep']);
3 3
 var domainName = document.domain;//域名
4 4
 var protocolName = document.location.protocol;//http协议

+ 1 - 1
assets/views/incident/tpl/toIntegralMechanism.tpl.html

@@ -22,7 +22,7 @@
22 22
             </div>
23 23
         </div>
24 24
     </div>
25
-    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;">
25
+    <div class="form-group incidentsearch" style="margin:0 auto;width: 300px;" ng-if="complexityConfirm.complexity.value != complexity">
26 26
         <div class="input-group" style="margin:8px 0 0;">
27 27
             <div class="control-label pull-left margin-top-5 margin-right-5">
28 28
                 <label class="demoincident">升级原因<span class="red">*</span></label>:</div>

+ 2 - 2
assets/views/inspect/integral.html

@@ -36,8 +36,8 @@
36 36
       <!-- <i class="iconfont icon-bianji pull-left"></i> -->
37 37
       <div class="col-sm-8">
38 38
         <h1 class="mainTitle">
39
-          积分管理<i
40
-            tooltip="积分管理列表,可对巡检进行修改"
39
+          事件审核管理<i
40
+            tooltip="事件审核管理列表,可对巡检进行修改"
41 41
             tooltip-placement="right"
42 42
             class="fa ti-help-alt margin-left-10 fontcolor-five pointfont"
43 43
           ></i>

+ 11 - 7
assets/views/report/charging.html

@@ -54,12 +54,12 @@
54 54
                     <div class="col-xs-12 col-sm-12">
55 55
                         <span class="panel-title text-dark">日期选择:</span>
56 56
                         <div class="form-group">
57
-                            <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateFrom" max-date="parameters.paramDateTo" is-open="startOpened" hour-time=true ng-init="startOpened = false" close-text="关闭" ng-click="startOpen($event)"
57
+                            <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateFrom" max-date="parameters.paramDateTo" is-open="startOpened" hour-time=true ng-init="startOpened = false" show-button-bar="false" ng-click="startOpen($event)"
58 58
                             />
59 59
                         </div>
60 60
                         <span class="panel-title text-dark">至</span>
61 61
                         <div class="form-group">
62
-                            <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateTo" hour-time=true min-date="parameters.paramDateFrom" is-open="endOpened" ng-init="endOpened = false" close-text="关闭" ng-click="endOpen($event)" />
62
+                            <input type="text" class="form-control" datepicker-popuptime="yyyy-MM-dd" ng-model="parameters.paramDateTo" hour-time=true min-date="parameters.paramDateFrom" is-open="endOpened" ng-init="endOpened = false" show-button-bar="false" ng-click="endOpen($event)" />
63 63
                         </div>
64 64
                         <div class="form-group margin-right-5">
65 65
                             <span class="panel-title text-dark pull-left">工作组:</span>
@@ -109,22 +109,26 @@
109 109
                                     <tr class="grayground incidentsearchsize">
110 110
                                         <th ng-class="header.thclass" style="text-align: center;">处理人</th>
111 111
                                         <th ng-class="header.thclass" style="text-align: center;">事件数(条)</th>
112
-                                        <th ng-class="header.thclass" style="text-align: center;">复杂度</th>
112
+                                        <th ng-class="header.thclass" style="text-align: center;">工时</th>
113
+                                        <th ng-class="header.thclass" style="text-align: center;">工时占比</th>
113 114
                                         <th ng-class="header.thclass" style="text-align: center;">计费(元)</th>
114 115
                                     </tr>
115 116
                                 </thread>
116 117
                                 <tbody class="tbody-hover">
117 118
                                     <tr ng-repeat="rowData in charginrow">
118
-                                        <td ng-class="fieldData.thclass">
119
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
119 120
                                             {{rowData.name}}
120 121
                                         </td>
121
-                                        <td ng-class="fieldData.thclass">
122
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
122 123
                                             {{rowData.incidentCount}}
123 124
                                         </td>
124
-                                        <td ng-class="fieldData.thclass">
125
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
125 126
                                             {{rowData.complexity}}
126 127
                                         </td>
127
-                                        <td ng-class="fieldData.thclass">
128
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
129
+                                            {{rowData.complexityPercentage}}
130
+                                        </td>
131
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
128 132
                                             {{rowData.score||0}}
129 133
                                         </td>
130 134
                                     </tr>

+ 8 - 8
assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -539,7 +539,7 @@
539 539
                                     </ui-select>
540 540
                                 </div>
541 541
                                 <div class="tab-mainDiv-body-lineDiv-50">
542
-                                    <div class="tab-mainDiv-body-lable">工单权重:</div>
542
+                                    <div class="tab-mainDiv-body-lable">工:</div>
543 543
                                     <ui-select class="tab-mainDiv-body-content" ng-model="subdata.complexity"
544 544
                                         theme="bootstrap">
545 545
                                         <ui-select-match placeholder="">
@@ -754,7 +754,7 @@
754 754
                                         </ui-select>
755 755
                                     </div>
756 756
                                     <div class="tab-mainDiv-body-lineDiv-50">
757
-                                        <div class="tab-mainDiv-body-lable">工单权重:</div>
757
+                                        <div class="tab-mainDiv-body-lable">工:</div>
758 758
                                         <ui-select class="tab-mainDiv-body-content" ng-model="adddata.complexity"
759 759
                                             theme="bootstrap">
760 760
                                             <ui-select-match placeholder="">
@@ -1146,16 +1146,16 @@
1146 1146
                     </div>            
1147 1147
                 </div>
1148 1148
                 <!-- 服务级别协议结束 -->
1149
-                <!-- 工单权重开始 -->
1150
-                <div ng-if="leftListName=='工单权重'">
1149
+                <!-- 工开始 -->
1150
+                <div ng-if="leftListName=='工'">
1151 1151
                     <div class="col-xs-4">
1152
-                        <div class="contentName col-xs-12">工单权重</div>
1152
+                        <div class="contentName col-xs-12">工</div>
1153 1153
                         <div class="col-xs-12" ng-repeat="v in incident_complexityData">
1154 1154
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
1155 1155
                         </div> 
1156 1156
                     </div>              
1157 1157
                 </div>
1158
-                <!-- 工单权重结束 -->
1158
+                <!-- 工结束 -->
1159 1159
                 <!-- 事件来源开始 -->
1160 1160
                 <div ng-if="leftListName=='事件来源'">
1161 1161
                     <div class="col-xs-4">
@@ -1306,8 +1306,8 @@
1306 1306
             <div class="btn btn_search" ng-click="incident_prioritySave()">保存</div>
1307 1307
             <div class="btn btn_other" ng-click="incident_priorityReturn()">恢复默认</div>
1308 1308
         </div>
1309
-        <!-- 工单权重 -->
1310
-        <div class="col-xs-12 btn_box" ng-if="leftListName=='工单权重'&&bianji">
1309
+        <!-- 工 -->
1310
+        <div class="col-xs-12 btn_box" ng-if="leftListName=='工'&&bianji">
1311 1311
             <div class="btn btn_search" ng-click="incident_complexitySave()">保存</div>
1312 1312
             <!-- <div class="btn btn_other" ng-click="incident_complexityReturn()">恢复默认</div> -->
1313 1313
         </div>