温湿度

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

@@ -0,0 +1,48 @@
+"use strict";
+angular.module('app.warnAndAlarm').controller("alarmRecordModalCtrl", function ($scope, $rootScope, $state, $stateParams, tempWarnService, $uibModal, $uibModalInstance, items) {
+
+    // 测试数据
+    /*$scope.recordVOList = [
+        {
+            id: "",
+            alarmId: "",
+            processType: 1,
+            processTitle: "标题-1",
+            processSituation: "处理情况内容-1",
+            fileUrls: "文件.pdf,文件-1.pdf",
+            username: "张三",
+            processTime: "2024-12-06"
+        },
+        {
+            id: "",
+            alarmId: "",
+            processType: 1,
+            processTitle: "标题-2",
+            processSituation: "处理情况内容-2",
+            fileUrls: "文件.pdf,文件-1.pdf",
+            username: "李四",
+            processTime: "2024-12-06"
+        }
+    ];*/
+    // 表单
+    $scope.loadData = function () {
+        tempWarnService.getRecordList(items.id).then(function (data) {
+            $scope.recordVOList = data.data;
+            // 处理多个文件
+            for (let i = 0; i < $scope.recordVOList.length; i++) {
+                if ($scope.recordVOList[i].fileUrls !== null) {
+                    $scope.recordVOList[i].fileUrls = $scope.recordVOList[i].fileUrls.split(",");
+                }
+            }
+        }, function (data) {
+            console.log(data);
+        });
+    };
+    $scope.loadData();
+
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    };
+
+});

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

@@ -40,10 +40,13 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
     };
 
     // 检测列表
-    $scope.showGrainDetectionList = function (vCfCode) {
+    $scope.showGrainDetectionList = function (data) {
         // 初始参数
         var params = [];
-        params.vCfCode = vCfCode;
+        params.houseCode = data.houseCode;
+        params.alarmTime = data.alarmTime;
+        params.restoreTime = data.restoreTime;
+        params.orgId = data.orgId;
         $uibModal.open({
             size: 'lg',
             templateUrl: 'app/warnAndAlarm/tempWet/views/tempAlarm-modal-list.html',
@@ -58,6 +61,25 @@ angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope,
         });
     };
 
+    // 处理记录
+    $scope.showProcessDetectionList = function (id) {
+        // 初始参数
+        var params = [];
+        params.id = id;
+        $uibModal.open({
+            size: 'md',
+            templateUrl: 'app/warnAndAlarm/tempWet/views/alarmRecord-modal.html',
+            controller: 'alarmRecordModalCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+
     /*
     // 打印
     $scope.print = function () {

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

@@ -1,27 +1,17 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller("tempAlarmModalListCtrl", function ($scope, $rootScope, $state, $stateParams, tempWarnService, $uibModal, $uibModalInstance, basicThresholdSetService) {
-    // org_id,storehouse,t_time,ilq_yq='0'
+angular.module('app.warnAndAlarm').controller("tempAlarmModalListCtrl", function ($scope, $rootScope, $state, $stateParams, tempWarnService, $uibModal, $uibModalInstance, basicThresholdSetService, items) {
+    // 获取列表数据
+    $scope.pageInfo = {pageNum: 1, pageSize: 10};
+    // 初始参数
+    $scope.search = {orgId: items.orgId, houseCode: items.houseCode, startTime: '2024-10-08', endTime: "2024-11-11", ilqYq: '0'};
+    console.log($scope.search)
     $scope.loadData = function () {
-        /*$scope.search.thresholdType = $stateParams.thresholdType;
-        tempWarnService.getTempAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+        $scope.search.thresholdType = $stateParams.thresholdType;
+        tempWarnService.getCheckRecordPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
             $scope.pageInfo = data.data;
         }, function (data) {
             console.log(data);
-        });*/
-        $scope.pageList = [
-            {
-                id:'f1f5addeef7b475782d862a8ef17c0b1',
-                storehouse:"001",
-                time:'2024-10-13 23:00:00',
-                intemp:17.1,
-                inh:42.9,
-                outtemp:11.8,
-                outh:52.4,
-                max:7.7,
-                min:28.2,
-                avg:17.2
-            }
-            ]
+        });
     };
     $scope.loadData();
 
@@ -48,7 +38,6 @@ angular.module('app.warnAndAlarm').controller("tempAlarmModalListCtrl", function
         params.min = thermometryData.min; // 最低粮温
         params.avg = thermometryData.avg; // 平均粮温
         params.id = thermometryData.id;
-        console.log("params", params)
         $uibModal.open({
             size:'lg',
             templateUrl: 'app/intelligent/grainDetection/views/humitureDetection-model.html',

src/main/resources/static/app/warnAndAlarm/tempWet/service/tempWarnService.js

@@ -61,4 +61,45 @@ angular.module('app.warnAndAlarm').service("tempWarnService", function ($http, $
         });
         return d.promise;
     };
+
+    // 温湿度报警数据列表
+    this.getCheckRecordPageInfo = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/tempWetAlarm/getModalPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : search.orgId,
+                houseCode: search.houseCode,
+                startTime: search.startTime,
+                endTime: search.endTime,
+                ilqYq: search.ilqYq
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
+    // 处理记录
+    this.getRecordList = function(alarmId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/tempWetAlarm/getRecordList/' + alarmId
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

src/main/resources/static/app/warnAndAlarm/tempWet/views/alarmRecord-modal.html

@@ -0,0 +1,23 @@
+<div class="modal-content">
+    <div class="modal-header">
+        <button type="button" class="close" ng-click="cancel()">
+            &times;
+        </button>
+        <h4 class="modal-title" id="myModalLabel">处理记录</h4>
+    </div>
+    <div class="modal-body">
+        <div ng-repeat="recordVO in recordVOList" style="border: 1px solid black;">
+            <div style="color: blue;">&nbsp;{{recordVO.processTitle}}</div>
+            <div style="margin-top: 15px;">&nbsp;处理情况:&emsp;<span>{{recordVO.processSituation}}</span></div>
+            <div style="margin-top: 15px;">&nbsp;附件:&emsp;
+                <span ng-repeat="fileUrl in recordVO.fileUrls">
+                    <a href="{{fileUrl}}" target="_blank">{{fileUrl}}</a>
+                </span>
+            </div>
+            <div style="display: flex;">
+                <div style="margin-top: 15px; flex: 1;">&nbsp;处理人:&emsp;<span>{{recordVO.username}}</span></div>
+                <div style="margin-top: 15px; text-align: right; flex: 1;">&nbsp;处理时间:&emsp;<span>{{recordVO.processTime}}&nbsp;</span></div>
+            </div>
+        </div>
+    </div>
+</div>

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

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

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

@@ -8,26 +8,29 @@
     <div class="modal-body">
         <div class="widget-body no-padding">
             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
-                <table class="table table-striped table-bordered table-hover" width="100%">
-                    <thead>
-                    <tr>
-                        <th data-class="expand" style="text-align:center;">序号</th>
-                        <th data-class="expand" style="text-align:center;">检测记录日期</th>
-                        <th data-class="expand" style="text-align:center;">操作</th>
-                    </tr>
-                    </thead>
+                <div class="dt-toolbar">
+                    <table class="table table-striped table-bordered table-hover" width="100%">
+                        <thead>
+                        <tr>
+                            <th data-class="expand" style="text-align:center;">序号</th>
+                            <th data-class="expand" style="text-align:center;">检测记录日期</th>
+                            <th data-class="expand" style="text-align:center;">操作</th>
+                        </tr>
+                        </thead>
 
-                    <tbody>
-                    <tr ng-repeat="temWet in pageList">
-                        <td style="text-align:center;">{{ $index + 1 }}</td>
-                        <td style="text-align:center;">{{ temWet.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
-                        <td style="text-align:center;">
-                            <a href-void ng-click="showView(temWet)"><i class=""></i>查看</a>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
+                        <tbody>
+                        <tr ng-repeat="temWet in pageInfo.list">
+                            <td style="text-align:center;">{{ $index + 1 }}</td>
+                            <td style="text-align:center;">{{ temWet.time | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+                            <td style="text-align:center;">
+                                <a href-void ng-click="showView(temWet)"><i class=""></i>查看</a>
+                            </td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
             </div>
+            <div smart-include="app/layout/partials/page.tpl.html"></div>
         </div>
     </div>
 </div>