状态

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/controller/temperatureFaultListCtrl.js

@@ -6,59 +6,11 @@ angular.module('app.warnAndAlarm').controller('temperatureFaultListCtrl', functi
 
     // 列表
     $scope.loadData = function () {
-        /*deviceAbnormalAlarmService.getSetUpPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize).then(function (data) {
+        deviceAbnormalAlarmService.getSetUpPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
         }, function (data) {
             console.log(data);
-        });*/
-
-        // 测试
-        $scope.pageInfo = {
-            "pageNum": 1,
-            "pageSize": 10,
-            "size": 2,
-            "startRow": 1,
-            "endRow": 2,
-            "total": 2,
-            "pages": 1,
-            "list": [
-                {
-                    "id": "cafad3641c6e4c238f7afe5bb577eb5e",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680135",
-                    "ch": "309号仓",
-                    "gzcwdsl": 756,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-29 23:09:01"
-                },
-                {
-                    "id": "66d83e5bc77c42d3ac7b1785efc10d81",
-                    "kqbm": "91120223104141086Y068",
-                    "cfbm": "91120223104141086Y0680010",
-                    "ch": "10号仓",
-                    "gzcwdsl": 720,
-                    "bjsj": "2023-07-25 12:58:58",
-                    "createTime": "2023-07-25 12:58:58",
-                    "updateTime": "2020-10-30 00:00:36"
-                }
-            ],
-            "prePage": 0,
-            "nextPage": 0,
-            "isFirstPage": true,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "hasNextPage": false,
-            "navigatePages": 8,
-            "navigatepageNums": [
-                1
-            ],
-            "navigateFirstPage": 1,
-            "navigateLastPage": 1,
-            "firstPage": 1,
-            "lastPage": 1
-        };
-
+        });
     };
     $scope.loadData();
 

src/main/resources/static/app/warnAndAlarm/deviceAbnormalAlarm/service/deviceAbnormalAlarmService.js

@@ -1,4 +1,25 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("deviceAbnormalAlarmService", function ($http, $q, APP_CONFIG, $rootScope) {
 
+    this.getCwdgzsPageInfo = function(pageNum, pageSize, kqbm, bjsj) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getCwdgzsList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : kqbm,
+                bjsj : bjsj
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+
 });

src/main/resources/static/app/warnAndAlarm/tempWet/controller/tempAlarmCtrl.js

@@ -22,6 +22,24 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
         $scope.search.thresholdType = $stateParams.thresholdType;
         tempWarnService.getTempAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
+            if ($scope.pageInfo.list.length > 0) {
+                for (let i = 0; i < $scope.pageInfo.list.length; i++) {
+                    let approvalStatus = $scope.pageInfo.list[i].approvalStatus;
+                    let processStatus = $scope.pageInfo.list[i].processStatus;
+                    let supervisionStatus = $scope.pageInfo.list[i].supervisionStatus;
+                    if(approvalStatus === '999999') {
+                        $scope.pageInfo.list[i].alarmStatus = '完成';
+                    } else if ((processStatus === '100201' || processStatus === null)) {
+                        $scope.pageInfo.list[i].alarmStatus = '待处理';
+                    } else if (supervisionStatus === null && processStatus !== '100201') {
+                        $scope.pageInfo.list[i].alarmStatus = '处理中';
+                    } else if ((processStatus === null || processStatus !== '100201') && supervisionStatus !== null) {
+                        $scope.pageInfo.list[i].alarmStatus = '待处理 督办中';
+                    } else if (processStatus !== '100201' && supervisionStatus !== null) {
+                        $scope.pageInfo.list[i].alarmStatus = '督办中';
+                    }
+                }
+            }
         }, function (data) {
             console.log(data);
         });

src/main/resources/static/app/warnAndAlarm/tempWet/views/tempAlarm-list.html

@@ -69,13 +69,7 @@
                                             <td style="text-align:center;">{{ warning.alarmTime}}</td>
                                             <td style="text-align:center;">{{ warning.restoreTime}}</td>
                                             <td style="text-align:center;">{{ warning.durationDays }}</td>
-                                            <td style="text-align:center;" >
-                                                <span ng-if="warning.processStatus == null || warning.processStatus == '100201'">待处理</span>
-                                                <span ng-if="warning.supervisionStatus == null && warning.processStatus != '100202'">处理中</span>
-                                                <span ng-if="(warning.processStatus == null || warning.processStatus == '100203') && warning.supervisionStatus != null">待处理 督办中</span>
-                                                <span ng-if="warning.processStatus != null && warning.supervisionStatus != null">督办中</span>
-                                                <span ng-if="warning.approvalStatus == '999999'">完成</span>
-                                            </td>
+                                            <td style="text-align:center;">{{ warning.alarmStatus }}</td>
                                             <td style="text-align:center;">
                                                 <a href-void ng-click="showGrainDetectionList(warning)"><i class=""></i>检测记录</a>&emsp;
                                                 <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>处理记录</a>