沟通记录字段修改

assets/js/controllers/customform/customformCtrl.js

@@ -13507,8 +13507,8 @@ appFormly.config(function config(formlyConfigProvider) {
               backdrop: "static",
               templateUrl: 'assets/views/incident/tpl/audio.html',
               controller: function($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
-                  // $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recordingFileName);
-                  $scope.audioUrl=$sce.trustAsResourceUrl('https://www.runoob.com/try/demo_source/horse.ogg');//暂时写死
+                  $scope.audioUrl=$sce.trustAsResourceUrl(callIp+data.recordingFileName);
+                  // $scope.audioUrl=$sce.trustAsResourceUrl('https://www.runoob.com/try/demo_source/horse.ogg');//暂时写死
                   $scope.cancel = function() {
                       $modalInstance.dismiss('cancel');
                   };

assets/js/controllers/incident/incidentCtrl.js

@@ -1093,48 +1093,26 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
     }
     //录音
     $scope.play = function (data) {
-        // console.log($scope.item.callID)
         var modalInstance = $modal.open({
             backdrop: "static",
             templateUrl: 'assets/views/incident/tpl/audio.html',
-            controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
-                $rootScope.setbusy();
-                $scope.datasurl = "";
-                $http({
-                    url: callIp + "/recording/recording?callID=" + data.callID,
-                    method: 'GET',
-                    headers: {},
-                }).success(function (data, status, headers, config) {
-                    $scope.data = {
-                        "name": "视频",
-                        "url": $sce.trustAsResourceUrl("http://" + data.rrpath)
-                    };
-                    $scope.datasurl = data.rrpath;
-                }).error(function (data, status, headers, config) { });
-                $scope.download = function (contentId, filename) {
-                    $http({
-                        url: "http://" + $scope.datasurl,
-                        method: 'GET',
-                        headers: {
-                            'Content-type': 'application/octet-stream',
-                        },
-                        responseType: 'arraybuffer'
-                    }).success(function (data, status, headers, config) {
-                        var file = new Blob([data], {
-                            type: 'application/octet-stream'
-                        });
-                        //trick to download store a file having its URL
-                        var fileURL = URL.createObjectURL(file);
-                        var a = document.createElement('a');
-                        a.href = fileURL;
-                        a.target = '_blank';
-                        a.download = filename;
-                        document.body.appendChild(a);
-                        a.click();
-                    }).error(function (data, status, headers, config) {
-                        // console.log(data);
-                    });
+            controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice, api_user_data) {
+                var postData = {
+                    idx:0,
+                    sum:1,
+                    callRecord: {
+                        callId: data.callID
+                    }
                 }
+                api_user_data.fetchDataList('callrecord', postData).then(function (response) {
+                    if (response) {
+                        if (response.status = 200) {
+                            if(response.list[0]){
+                                $scope.audioUrl=$sce.trustAsResourceUrl(callIp+response.list[0].recordingFileName);
+                            }
+                        }
+                    }
+                })
                 $scope.cancel = function () {
                     $modalInstance.dismiss('cancel');
                 };
@@ -1144,11 +1122,68 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
         modalInstance.result.then(function (result) {
-            // $rootScope.setidle();
         }, function (reason) {
             $rootScope.setidle();
         });
     };
+    //录音
+    // $scope.play = function (data) {
+    //     // console.log($scope.item.callID)
+    //     var modalInstance = $modal.open({
+    //         backdrop: "static",
+    //         templateUrl: 'assets/views/incident/tpl/audio.html',
+    //         controller: function ($rootScope, $scope, $modalInstance, $sce, $http, api_playservice) {
+    //             $rootScope.setbusy();
+    //             $scope.datasurl = "";
+    //             $http({
+    //                 url: callIp + "/recording/recording?callID=" + data.callID,
+    //                 method: 'GET',
+    //                 headers: {},
+    //             }).success(function (data, status, headers, config) {
+    //                 $scope.data = {
+    //                     "name": "视频",
+    //                     "url": $sce.trustAsResourceUrl("http://" + data.rrpath)
+    //                 };
+    //                 $scope.datasurl = data.rrpath;
+    //             }).error(function (data, status, headers, config) { });
+    //             $scope.download = function (contentId, filename) {
+    //                 $http({
+    //                     url: "http://" + $scope.datasurl,
+    //                     method: 'GET',
+    //                     headers: {
+    //                         'Content-type': 'application/octet-stream',
+    //                     },
+    //                     responseType: 'arraybuffer'
+    //                 }).success(function (data, status, headers, config) {
+    //                     var file = new Blob([data], {
+    //                         type: 'application/octet-stream'
+    //                     });
+    //                     //trick to download store a file having its URL
+    //                     var fileURL = URL.createObjectURL(file);
+    //                     var a = document.createElement('a');
+    //                     a.href = fileURL;
+    //                     a.target = '_blank';
+    //                     a.download = filename;
+    //                     document.body.appendChild(a);
+    //                     a.click();
+    //                 }).error(function (data, status, headers, config) {
+    //                     // console.log(data);
+    //                 });
+    //             }
+    //             $scope.cancel = function () {
+    //                 $modalInstance.dismiss('cancel');
+    //             };
+    //             $modalInstance.close();
+
+
+    //         }
+    //     });
+    //     modalInstance.result.then(function (result) {
+    //         // $rootScope.setidle();
+    //     }, function (reason) {
+    //         $rootScope.setidle();
+    //     });
+    // };
     $scope.jry_paging = "";
     //列表排序
     // sessionStorage.idx = 0;
@@ -2336,6 +2371,7 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
             }
         });
     }
+    
     // 新增沟通记录弹窗
     $scope.toHandlerLog = function (model) {
         console.log(model)
@@ -2352,6 +2388,17 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                     $scope.hdPhone = phone;
                 }
 
+                // 测试 start
+                // api_bpm_data.getCallRecordId({ano: '1501', bno: '13297968972', agentId: 46}).then(function(response){
+                //     console.log(response)
+                //     if (response.status == 200) {
+                //         $scope.callId = response.data || undefined;
+                //     } else {
+                //         $scope.callId = undefined;
+                //     }
+                // });
+                // 测试 end
+
                 $scope.dialout = function (teleno) {
                     $rootScope.callout = 2;
                     if (localStorage.getItem('fenjiNumber')) {
@@ -2367,10 +2414,10 @@ app.controller('incidentListCtrl', ["$scope", "$http", "i18nService", "$rootScop
                             $rootScope.isMask = false;
                             if (data.errno == 0) {
                                 $rootScope.status = 6;
-                                api_bpm_data.getCallRecordId('getCallRecordId',{ano: data.ano, bno: data.bno, agentId: data.agentID}).then(function(response){
+                                api_bpm_data.getCallRecordId({ano: data.ano, bno: data.bno, agentId: data.agentID}).then(function(response){
                                     console.log(response)
                                     if (response.status == 200) {
-                                        $scope.callId = response.data || undefined;//暂时写死
+                                        $scope.callId = response.data || undefined;
                                     } else {
                                         $scope.callId = undefined;
                                     }
@@ -3186,7 +3233,7 @@ app.directive('incidentoperator', function () {
             '<a ng-click="delSj()" ng-show="{{delFlag&&item.state.value!== \'deleted\'}}" class="assign" >删除</a>' +
             '<a ng-click="print()" ng-show="dayin" class="bianjifont" >打印</a>' +
             // '<a ng-click="jry_evaluate()"  ng-show="jry_evaluateShow()" class="luyinfont" >评价</a>' +
-            // '<a ng-click="record()"  ng-show="{{item.listen}}" class="luyinfont" >录音</a>' +
+            '<a ng-click="record()"  ng-show="{{item.callID}}" class="luyinfont" >录音</a>' +
             // '<a ng-click="rotate()" ng-show="{{item.state.id==4}}" class="rotate" >转派</a>' +
             // '<a ng-click="upgrade()" ng-show="{{up&&item.state.id==4&&item.currentRole!=' + "'incident manager'" + '}}" class="upgrade" >升级</a>' +
             // '<a ng-click="problem()" ng-show="{{item.state.id==5&&item.currentRole!=' + "'incident manager'" + '}}" class="upgrade" >问题升级</a>' +

assets/js/controllers/loginCtrl.js

@@ -5,9 +5,11 @@ app.controller('LoginCtrl', ['$rootScope', '$scope', '$state', '$translate', '$l
         //判断项目归属 start
         //因项目众多，前端为了加以区分，所以用域名加以判断，后期有更好的方式可以自行修改
         // 中南财大
-        $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+        // $rootScope.isZncd = document.domain === 'itsm.zuel.edu.cn';
+        $rootScope.isZncd = false;
         // 华科
-        $rootScope.isHk = document.domain === '192.168.3.110' || document.domain === '192.168.3.69' || document.domain === '172.16.7.91' || document.domain === '192.168.3.105' || document.domain === 'localhost' || document.domain === '192.168.77.59';
+        // $rootScope.isHk = document.domain === '192.168.3.110' || document.domain === '192.168.3.69' || document.domain === '172.16.7.91' || document.domain === '192.168.3.105' || document.domain === 'localhost' || document.domain === '192.168.77.59';
+        $rootScope.isHk = true;
         if($rootScope.isZncd){
             localStorage.setItem('version_qd','isZncd');
         }

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

@@ -655,6 +655,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         var filedata = { "incidentcategory": formdata }
         filedata.incidentcategory.branchType = Number(filedata.incidentcategory.branchType);
         console.log(filedata,$scope.userGroupChecked);
+        if(filedata.incidentcategory.branchUserGroups && Array.isArray(filedata.incidentcategory.branchUserGroups)){
+            filedata.incidentcategory.branchUserGroups = filedata.incidentcategory.branchUserGroups.filter(v => v.branchUserOrGroupType); 
+        }
         // return;
         api_bpm_data.updData('incidentcategory', filedata).then(function(response) {
             if (response) {
@@ -808,6 +811,9 @@ app.controller('incidentSetUp', ["$rootScope", "$scope", "$state", "$timeout", "
         
         
         var filedata = { "incidentcategory": formdata }
+        if(filedata.incidentcategory.branchUserGroups && Array.isArray(filedata.incidentcategory.branchUserGroups)){
+            filedata.incidentcategory.branchUserGroups = filedata.incidentcategory.branchUserGroups.filter(v => v.branchUserOrGroupType); 
+        }
         console.log(filedata);
         // return;
         api_bpm_data.addData('incidentcategory', filedata).then(function(response) {

assets/views/customform/tpl/ui-handlerLog.html

@@ -19,9 +19,9 @@
                             <td class="center">{{$index + 1}}</td>
                             <td class="center">{{item.opTime|date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td class="center">{{item.userName}}</td>
-                            <td class="center">暂时写死</td>
+                            <td class="center">{{item.callRecord?item.callRecord.destinationNumber:''}}</td>
                             <td class="center" style="white-space: normal;word-break:break-all">{{item.opValue}}</td>
-                            <td class="center"><a ng-click="recordcall(item)" ng-if="true" class="bianjifont">通话录音</a></td>
+                            <td class="center"><a ng-click="recordcall(item.callRecord)" ng-if="item.callRecord" class="bianjifont">通话录音</a></td>
                         </tr>
                     </tbody>
                 </table>