事件实时播报

assets/js/controllers/bigScreen/realtimeBroadcastCtrl.js

@@ -6,8 +6,8 @@ app.controller('realtimeBroadcastCtrl', ['$scope', '$modal', '$timeout', 'SweetA
       rotationIntervals: [3, 5, 10, 15, 20, 25, 30, 35, 40, 45],
       logTimeConst: 60,
       logTimeConsts: [30, 60, 90, 120, 150, 180, 210, 240, 270, 300],
-    }  
-    console.log($scope.intervalTime);  
+    }
+    console.log($scope.intervalTime);
     $scope.logTimer = null; //定时器
     $scope.logTime = 0; //自动刷新秒数
     $scope.logTimeConst = $scope.intervalTime.logTimeConst; //自动刷新秒数
@@ -71,14 +71,13 @@ app.controller('realtimeBroadcastCtrl', ['$scope', '$modal', '$timeout', 'SweetA
         break;
     }
     let postData = {
-      "assignee": $scope.user.id,
-      "candidateGroups": $scope.user.group.map(v=>v.id).toString(),
-      "searchType": "all",
       "idx": 0,
       "sum": 9999,
       "incident": {
-          "deleted": false,
-          "statusId": statusId,
+        "assignee": $scope.user.id,
+        "candidateGroups": $scope.user.group.map(v=>v.id).toString(),
+        "statusId": statusId,
+        "queryTask": "all",
       }
     };
     if($scope.user.duty){
@@ -99,7 +98,6 @@ app.controller('realtimeBroadcastCtrl', ['$scope', '$modal', '$timeout', 'SweetA
           $scope.loading1 = false;
           data.list.forEach(v => {
             v.acceptDate = v.acceptDate ? moment(v.acceptDate).format('MM-DD HH:mm') : '';
-            v.handlerLogs = v.handlerLogs.length ? v.handlerLogs.reverse().slice(0, 1) : [];
           })
           $scope.waitingOrderList = _.chunk(data.list, $scope.sum);
           console.log($scope.waitingOrderList);
@@ -108,7 +106,6 @@ app.controller('realtimeBroadcastCtrl', ['$scope', '$modal', '$timeout', 'SweetA
           $scope.loading2 = false;
           data.list.forEach(v => {
             v.acceptDate = v.acceptDate ? moment(v.acceptDate).format('MM-DD HH:mm') : '';
-            v.handlerLogs = v.handlerLogs.length ? v.handlerLogs.reverse().slice(0, 1) : [];
           })
           $scope.inProcessList = _.chunk(data.list, $scope.sum);
           break;
@@ -125,14 +122,26 @@ app.controller('realtimeBroadcastCtrl', ['$scope', '$modal', '$timeout', 'SweetA
     });
   }
 
-    // 初始化
-    $(function(){
-      // 待接单列表
-      $scope.getPharmacyList(1, true);
-      // 处理中列表
-      $scope.getPharmacyList(2, true);
-      // 自动刷新倒计时 start
-      $scope.autoUpdate();
-      // 自动刷新倒计时 end
-    })
+  $scope.transferHandlerLog = function (currentLog) {
+    if(!currentLog){
+        return '无';
+    }
+    currentLog = angular.copy(currentLog);
+    if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
+        return currentLog.extra1DTO.name+" "+ moment(currentLog.startTime).add(+currentLog.extra2, 'days').format('MM月DD日前完成');
+    }else{
+        return '无';
+    }
+  }
+
+  // 初始化
+  $(function(){
+    // 待接单列表
+    $scope.getPharmacyList(1, true);
+    // 处理中列表
+    $scope.getPharmacyList(2, true);
+    // 自动刷新倒计时 start
+    $scope.autoUpdate();
+    // 自动刷新倒计时 end
+  })
 }])

assets/views/bigScreen/realtimeBroadcast.html

@@ -61,12 +61,7 @@
                 </div>
                 <div class="pharmacy-main__selectionItem">
                   <span>{{ (item.place ? (item.place.area ? item.place.area.area : '') : '') + (item.place ? (item.place.place ? item.place.place : '') : '') + (item.houseNumber ? item.houseNumber : '') }}</span>
-                  <ng-container ng-if="item.handlerLogs.length">
-                    <span ng-repeat="log in item.handlerLogs">{{ log.expectedDate | date:'MM' }}月{{ log.expectedDate | date:'dd' }}日前完成 {{ log.repairType ? log.repairType.name : '无' }}</span>
-                  </ng-container>
-                  <ng-container ng-if="item.handlerLogs.length === 0">
-                    <span>暂无维修记录</span>
-                  </ng-container>
+                  <span>{{ transferHandlerLog(item.currentLog) }}</span>
                 </div>
                 <div class="pharmacy-main__selectionItem">
                   <span>{{ item.groupORHandlerUser }}</span>
@@ -125,12 +120,7 @@
                 </div>
                 <div class="pharmacy-main__selectionItem">
                   <span>{{ (item.place ? (item.place.area ? item.place.area.area : '') : '') + (item.place ? (item.place.place ? item.place.place : '') : '') + (item.houseNumber ? item.houseNumber : '') }}</span>
-                  <ng-container ng-if="item.handlerLogs.length">
-                    <span ng-repeat="log in item.handlerLogs">{{ log.expectedDate | date:'MM' }}月{{ log.expectedDate | date:'dd' }}日前完成 {{ log.repairType ? log.repairType.name : '无' }}</span>
-                  </ng-container>
-                  <ng-container ng-if="item.handlerLogs.length === 0">
-                    <span>暂无维修记录</span>
-                  </ng-container>
+                  <span>{{ transferHandlerLog(item.currentLog) }}</span>
                 </div>
                 <div class="pharmacy-main__selectionItem">
                   <span>{{ item.groupORHandlerUser }}</span>