优化

assets/js/controllers/desk/calllogCtrl.js

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

assets/js/controllers/desk/recordCtrl.js

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

assets/js/controllers/report/chargingCtrl.js

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

assets/js/controllers/system/processdesign/incidentplan/incidentSetUpCtrl.js

@@ -21,7 +21,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         {"name":"事件影响度"},
         {"name":"事件优先级"},
         {"name":"优先级规则"},
-        {"name":"工单权重"},
+        {"name":"工时"},
         {"name":"服务级别协议"},
         {"name":"事件来源"},
         {"name":"关闭代码"},
@@ -51,7 +51,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     api_wechatfile.getDictionary({"key":"incident_priority","type":"list"}).then(function(data){
         $scope.priority=data
     })
-    // 工单权重
+    // 工时
     api_wechatfile.getDictionary({"key":"incident_complexity","type":"list"}).then(function(data){
         $scope.complexity=data
     })
@@ -1154,7 +1154,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         },2000)
     }
     // 事件优先级结束
-    // 事件工单权重开始
+    // 事件工时开始
     $scope.incident_complexityData=[];
     $scope.getIncident_complexity=function(){
         var data={
@@ -1199,7 +1199,7 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
     //         $scope.getIncident_complexity();
     //     },2000)
     // }
-    // 事件工单权重结束
+    // 事件工时结束
     // 服务级别协议开始
     $scope.incident_SLA_Data=[];
     $scope.getIncident_SLA=function(){

assets/js/main.js

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

assets/views/incident/tpl/toIntegralMechanism.tpl.html

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

assets/views/inspect/integral.html

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

assets/views/report/charging.html

@@ -54,12 +54,12 @@
                     <div class="col-xs-12 col-sm-12">
                         <span class="panel-title text-dark">日期选择:</span>
                         <div class="form-group">
-                            <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)"
+                            <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)"
                             />
                         </div>
                         <span class="panel-title text-dark">至</span>
                         <div class="form-group">
-                            <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)" />
+                            <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)" />
                         </div>
                         <div class="form-group margin-right-5">
                             <span class="panel-title text-dark pull-left">工作组：</span>
@@ -109,22 +109,26 @@
                                     <tr class="grayground incidentsearchsize">
                                         <th ng-class="header.thclass" style="text-align: center;">处理人</th>
                                         <th ng-class="header.thclass" style="text-align: center;">事件数（条）</th>
-                                        <th ng-class="header.thclass" style="text-align: center;">复杂度</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">工时</th>
+                                        <th ng-class="header.thclass" style="text-align: center;">工时占比</th>
                                         <th ng-class="header.thclass" style="text-align: center;">计费（元）</th>
                                     </tr>
                                 </thread>
                                 <tbody class="tbody-hover">
                                     <tr ng-repeat="rowData in charginrow">
-                                        <td ng-class="fieldData.thclass">
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
                                             {{rowData.name}}
                                         </td>
-                                        <td ng-class="fieldData.thclass">
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
                                             {{rowData.incidentCount}}
                                         </td>
-                                        <td ng-class="fieldData.thclass">
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
                                             {{rowData.complexity}}
                                         </td>
-                                        <td ng-class="fieldData.thclass">
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
+                                            {{rowData.complexityPercentage}}
+                                        </td>
+                                        <td ng-class="fieldData.thclass" style="text-align: center">
                                             {{rowData.score||0}}
                                         </td>
                                     </tr>

assets/views/system/processdesign/incidentplan/incidentSetUp.html

@@ -539,7 +539,7 @@
                                     </ui-select>
                                 </div>
                                 <div class="tab-mainDiv-body-lineDiv-50">
-                                    <div class="tab-mainDiv-body-lable">工单权重:</div>
+                                    <div class="tab-mainDiv-body-lable">工时:</div>
                                     <ui-select class="tab-mainDiv-body-content" ng-model="subdata.complexity"
                                         theme="bootstrap">
                                         <ui-select-match placeholder="">
@@ -754,7 +754,7 @@
                                         </ui-select>
                                     </div>
                                     <div class="tab-mainDiv-body-lineDiv-50">
-                                        <div class="tab-mainDiv-body-lable">工单权重:</div>
+                                        <div class="tab-mainDiv-body-lable">工时:</div>
                                         <ui-select class="tab-mainDiv-body-content" ng-model="adddata.complexity"
                                             theme="bootstrap">
                                             <ui-select-match placeholder="">
@@ -1146,16 +1146,16 @@
                     </div>            
                 </div>
                 <!-- 服务级别协议结束 -->
-                <!-- 工单权重开始 -->
-                <div ng-if="leftListName=='工单权重'">
+                <!-- 工时开始 -->
+                <div ng-if="leftListName=='工时'">
                     <div class="col-xs-4">
-                        <div class="contentName col-xs-12">工单权重</div>
+                        <div class="contentName col-xs-12">工时</div>
                         <div class="col-xs-12" ng-repeat="v in incident_complexityData">
                             <input class="form-control inputcolor emergencyIptSize" style="border-color: #dedede;color: #93989e;" type="text" ng-model="v.name" placeholder="" />
                         </div> 
                     </div>              
                 </div>
-                <!-- 工单权重结束 -->
+                <!-- 工时结束 -->
                 <!-- 事件来源开始 -->
                 <div ng-if="leftListName=='事件来源'">
                     <div class="col-xs-4">
@@ -1306,8 +1306,8 @@
             <div class="btn btn_search" ng-click="incident_prioritySave()">保存</div>
             <div class="btn btn_other" ng-click="incident_priorityReturn()">恢复默认</div>
         </div>
-        <!-- 工单权重 -->
-        <div class="col-xs-12 btn_box" ng-if="leftListName=='工单权重'&&bianji">
+        <!-- 工时 -->
+        <div class="col-xs-12 btn_box" ng-if="leftListName=='工时'&&bianji">
             <div class="btn btn_search" ng-click="incident_complexitySave()">保存</div>
             <!-- <div class="btn btn_other" ng-click="incident_complexityReturn()">恢复默认</div> -->
         </div>