预警报警顶部导航-初始化

src/main/resources/static/app/app.js

@@ -68,7 +68,8 @@ angular.module('app', [
     'app.log',
     'app.additionalHome',
     'app.registrationTable',
-    'app.archive'
+    'app.archive',
+    'app.warnAndAlarm'
     //'app.risk',
     //'app.cstj',
     //'app.jczcsupervise'

src/main/resources/static/app/business/module.js

@@ -195,20 +195,6 @@ angular.module('app.business')
                 title: '预警报警'
             }
         })
-        // 温湿度报警设置
-        .state('app.business.warning.temperatureHumidity', {
-                url: '/business/warning/temperatureHumidity',
-                data: {
-                    title: '温湿度报警设置'
-                },
-                views: {
-                    "content@app": {
-                        controller: 'tempWarnCtrl',
-                        templateUrl: 'app/business/warning/views/tempWarn-list.html'
-                    }
-                }
-            }
-        )
         // 温度报警
         /*.state('app.business.warning.temperature', {
                 url: '/business/warning/temperature',
@@ -224,7 +210,7 @@ angular.module('app.business')
             }
         )*/
 		// 湿度报警
-        .state('app.business.warning.humidity', {
+        /*.state('app.business.warning.humidity', {
 			url: '/business/warning/humidity',
 			data: {
 				title: '湿度报警'
@@ -235,7 +221,7 @@ angular.module('app.business')
 					templateUrl: 'app/supervise/views/humidityWarningThreshold.html'
 				}
 			}
-		})
+		})*/
 		// 结露报警
         .state('app.business.warning.dewing', {
 			url: '/business/warning/dewing',

src/main/resources/static/app/layout/partials/header.tpl.html

@@ -31,6 +31,7 @@
 					<a href-void data-slide="prev"><i class="nav-prev"></i></a>
                     <i class="nav-feng-line"></i>
 				</div>
+				<!--static/styles/css/home/reset-default.css 38 行-->
 				<div class="carousel-inner">
 					<!-- Slide 1 -->
 					<div class="nav-item">
@@ -46,6 +47,12 @@
 								综合业务</a>
 							<i class="nav-feng-line"></i>
 						</div>
+						<div has-func="517" ng-hide="isEmergency" class="nav-li" role="presentation" ng-class="{true:'active'}[childSysId==517]">
+							<a href-void ng-click="switchTopMenu(517, 'app.warnAndAlarm.temperatureHumidity.threshold')">
+								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/zhinaf-icon.png" /></i>
+								预警报警</a>
+							<i class="nav-feng-line"></i>
+						</div>
 						<div has-func="124" class="nav-li" role="presentation">
 							<a href="javaScript:void(0)" ng-click="crk()">
 								<i class="nav-icon"><img src="styles/img/home-1/nav-icon/churk-icon.png" /></i>

src/main/resources/static/app/layout/partials/navigation.tpl.html

@@ -508,9 +508,6 @@
 							<li has-func="450">
 								<a data-ui-sref="app.business.warning.humidity">湿度报警</a>
 							</li>-->
-                            <li has-func="301">
-                                <a data-ui-sref="app.business.warning.temperatureHumidity">温湿度报警设置</a>
-                            </li>
 							<li has-func="450">
 								<a data-ui-sref="app.business.warning.dewing">结露预警</a>
 							</li>
@@ -627,6 +624,35 @@
 
                 </ul>
             </li>
+            <!----------------------------------预警报警 start ------------------------------------->
+            <li data-menu-collapse id="menu-517" ng-show="childSysId==517">
+                <a href="#" style="background: #2259a5 !important">
+                    <i class="nav-icon"><img style="margin-bottom: -12px;" src="styles/img/home-1/nav-icon/zhinaf-icon.png"/></i>
+                    <span class="menu-item-parent" style="color:#fff;background: #2259a5 !important">预警报警</span>
+                </a>
+                <!--温湿度 start-->
+                <ul>
+                    <li data-menu-collapse>
+                        <a has-func="518" href="#">
+                            <i class="fa fa-fw fa-folder-open"></i>温湿度报警
+                        </a>
+                        <ul>
+                            <li has-func="519">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.threshold">温湿度报警设置</a>
+                            </li>
+                            <li has-func="520">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.humidity">温度报警</a>
+                            </li>
+                            <li has-func="521">
+                                <a data-ui-sref="app.warnAndAlarm.temperatureHumidity.temperature">湿度报警</a>
+                            </li>
+                        </ul>
+                    </li>
+                </ul>
+                <!--温湿度 end-->
+
+            </li>
+            <!----------------------------------预警报警 end ------------------------------------->
             <li data-menu-collapse id="menu-17" ng-show="childSysId==17">
                 <a href="#" style="background: #2259a5;">
                     <i class="nav-icon"><img style="margin-bottom: -12px;"

src/main/resources/static/app/warnAndAlarm/module.js

@@ -0,0 +1,67 @@
+"use strict";
+angular.module('app.warnAndAlarm', ['ui.router', 'ui.bootstrap', 'datatables', 'datatables.bootstrap']);
+angular.module('app.warnAndAlarm').config(function ($stateProvider) {
+    $stateProvider
+        .state('app.warnAndAlarm', {
+            abstract: true,
+            data: {
+                title: '预警报警'
+            }
+        })
+        //----------------------温湿度-----------------
+        .state('app.warnAndAlarm.temperatureHumidity', {
+            abstract: true,
+            data: {
+                title: '温湿度报警'
+            }
+        })
+        // 温湿度报警设置
+        .state('app.warnAndAlarm.temperatureHumidity.threshold', {
+                url: '/warnAndAlarm/temperatureHumidity/threshold',
+                data: {
+                    title: '温湿度报警设置'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'tempWarnCtrl',
+                        templateUrl: 'app/warnAndAlarm/tempWet/views/tempWarn-list.html'
+                    }
+                }
+            }
+        )
+        // 温度报警
+        .state('app.warnAndAlarm.temperatureHumidity.temperature', {
+                url: '/warnAndAlarm/temperatureHumidity/temperature',
+                data: {
+                    title: '温度报警列表'
+                },
+                params:{
+                    thresholdType : 0,
+                    titleName: '温度报警列表'
+                },
+                views: {
+                    "content@app": {
+                        controller: 'tempAlarmCtrl',
+                        templateUrl: 'app/warnAndAlarm/tempWet/views/tempAlarm-list.html'
+                    }
+                }
+            }
+        )
+        // 湿度报警
+        .state('app.warnAndAlarm.temperatureHumidity.humidity', {
+            url: '/warnAndAlarm/temperatureHumidity/humidity',
+            data: {
+                title: '湿度报警列表'
+            },
+            params:{
+                thresholdType : 1,
+                titleName: '湿度报警列表'
+            },
+            views: {
+                "content@app": {
+                    controller: 'tempAlarmCtrl',
+                    templateUrl: 'app/warnAndAlarm/tempWet/views/tempAlarm-list.html'
+                }
+            }
+        })
+});

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

@@ -0,0 +1,66 @@
+"use strict";
+angular.module('app.warnAndAlarm').controller("tempAlarmCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, tempWarnService, $uibModal) {
+    // 获取列表数据
+    $scope.pageInfo = {pageNum: 1, pageSize: 10};
+
+    // 初始化查询条件
+    $scope.search = {houseId: null, thresholdType: null};
+
+    // 判断温湿度页面
+    $scope.titleName = $stateParams.titleName;
+    if ($stateParams.thresholdType) {
+        // 湿度列表
+        $scope.tempValueTitle = '报警湿度%';
+        $scope.thresholdValueTitle = '设置湿度%';
+    } else {
+        // 温度列表
+        $scope.tempValueTitle = '报警温度℃';
+        $scope.thresholdValueTitle = '设置温度℃';
+    }
+
+    $scope.loadData = function () {
+        $scope.search.thresholdType = $stateParams.thresholdType;
+        tempWarnService.getTempAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
+    };
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function (pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+    $scope.emptyTime = function () {
+        $scope.search.houseId = null;
+        $scope.loadData();
+    };
+
+    // 检测列表
+    $scope.showGrainDetectionList = function (vCfCode) {
+        // 初始参数
+        var params = [];
+        params.vCfCode = vCfCode;
+        $uibModal.open({
+            size: 'lg',
+            templateUrl: 'app/warnAndAlarm/tempWet/views/tempAlarm-modal-list.html',
+            controller: 'tempAlarmModalListCtrl',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+
+    /*
+    // 打印
+    $scope.print = function () {
+        $("#print").printArea();
+    };*/
+});

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

@@ -0,0 +1,70 @@
+"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'
+    $scope.loadData = function () {
+        /*$scope.search.thresholdType = $stateParams.thresholdType;
+        tempWarnService.getTempAlarmPageInfo($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();
+
+    // 加载测温预警,报警阀值
+    $scope.getWarningValue = function () {
+        basicThresholdSetService.getValueByOrgIdOrCfCode().then(function (data) {
+            $rootScope.warningValueList = data.data;
+        }, function (data) {
+            console.log(data);
+        });
+    };
+
+    // 查看
+    $scope.showView = function(thermometryData) {
+        $scope.getWarningValue();
+        var params = [];
+        params.vCfCode = thermometryData.storehouse; // 仓房编码
+        params.time = thermometryData.time; // 检测时间
+        params.intemp = thermometryData.intemp; // 仓内温
+        params.inh = thermometryData.inh; // 仓内湿
+        params.outtemp = thermometryData.outtemp; // 仓外温
+        params.outh = thermometryData.outh; // 仓外湿
+        params.max = thermometryData.max; // 最高粮温
+        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',
+            controller: 'humitureDetectionModel',
+            resolve: {
+                // 传入参数
+                items: function () {
+                    // 这个值会被模态框的控制器获取到
+                    return params;
+                }
+            }
+        });
+    };
+
+    // 关闭模态窗口
+    $scope.cancel = function() {
+        $uibModalInstance.close();
+    };
+});

src/main/resources/static/app/business/warning/controller/tempWarnCtrl.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.business').controller("tempWarnCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, tempWarnService) {
+angular.module('app.warnAndAlarm').controller("tempWarnCtrl", function ($scope, $rootScope, $state, $stateParams, APP_CONFIG, tempWarnService) {
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 保持在已选类型列表-初始化
     let flag = 0;

src/main/resources/static/app/business/warning/service/tempWarnService.js

@@ -1,5 +1,5 @@
 "use strict";
-angular.module('app.business').service("tempWarnService", function ($http, $q, APP_CONFIG, $rootScope) {
+angular.module('app.warnAndAlarm').service("tempWarnService", function ($http, $q, APP_CONFIG, $rootScope) {
     this.getPageList = function(pageNum, pageSize, thresholdType) {
         var d = $q.defer();
         $http({
@@ -38,4 +38,27 @@ angular.module('app.business').service("tempWarnService", function ($http, $q, A
         });
         return d.promise;
     };
+
+    // 温湿度报警数据列表
+    this.getTempAlarmPageInfo = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/tempWetAlarm/getPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                orgId : $rootScope.userInfo.orgId,
+                houseId: search.houseId,
+                thresholdType: search.thresholdType
+            }
+        }).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/tempAlarm-list.html

@@ -0,0 +1,89 @@
+<!-- MAIN CONTENT -->
+<div id="content">
+    <!-- widget grid -->
+    <section widget-grid id="widget-grid">
+        <div class="row">
+            <article class="col-sm-12">
+
+                <div jarvis-widget id="standard-datatable-widget" data-widget-color="darken"
+                     data-widget-editbutton="true">
+                    <header>
+                        <span class="widget-icon"> <i class="fa fa-table"></i> </span>
+                        <h2>{{titleName}}</h2>
+                    </header>
+                    <div>
+                        <div class="widget-body no-padding">
+                            <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
+                                <div class="dt-toolbar">
+                                    <div class="col-xs-12 col-sm-10">
+                                        <label> 仓房名称:&emsp;
+                                            <select ng-model="search.houseId" class="form-control input-sm"
+                                                    ng-options="store.storehouseId as store.storehouseName for store in storelist">
+                                                <option value="">请选择</option>
+                                            </select>&emsp;
+                                        </label>
+                                        <a class="btn btn-default btn-sm" ng-click="loadData()"> <i
+                                                class="fa fa-search"></i>&nbsp;查&nbsp;询</a>
+                                        <a class="btn btn-default btn-sm" ng-click="emptyTime()"> <i class=""></i>&nbsp;清&nbsp;空</a>
+                                        &emsp;
+                                        <label style="color: blue;">请登录企业服务平台填写处理情况</label>
+                                    </div>
+                                    <div class="col-sm-2 col-xs-2 hidden-xs">
+                                        <div class="dataTables_length">
+                                            <label>每页显示 <select ng-model="pageInfo.pageSize" ng-change="loadData()"
+                                                                ng-options="num as num for num in [10,25,50,100]"
+                                                                class="form-control input-sm"></select> 条
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div id="print">
+                                    <table class="table table-striped table-bordered table-hover" width="100%"
+                                           border="1" style="border-collapse:collapse;border:none;">
+                                        <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>
+                                            <th data-class="expand" style="text-align:center;">粮食品种</th>
+                                            <th data-class="expand" style="text-align:center;">{{tempValueTitle}}</th>
+                                            <th data-class="expand" style="text-align:center;">{{thresholdValueTitle}}</th>
+                                            <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>
+                                            <th data-class="expand" style="text-align:center;">状态</th>
+                                            <th data-class="expand" style="text-align:center;">操作</th>
+                                        </tr>
+                                        </thead>
+
+                                        <tbody>
+                                        <tr ng-repeat="warning in pageInfo.list">
+                                            <td style="text-align:center;">{{ $index + 1 }}</td>
+                                            <!--编码翻译:storeHouseCodeObj[cainfo.vcfcode].storehouseName-->
+                                            <!--id翻译:storehouseObj[gainCard.storehouseId].storehouseName-->
+                                            <td style="text-align:center;">{{ storeHouseCodeObj[warning.houseCode].storehouseName }}</td>
+                                            <td style="text-align:center;">{{ dicData[warning.hwxz]}}</td>
+                                            <td style="text-align:center;">{{ dicData[warning.pz]}}</td>
+                                            <td style="text-align:center;">{{ warning.tempValue }}</td>
+                                            <td style="text-align:center;">{{ warning.thresholdValue}}</td>
+                                            <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;">
+                                                <a href-void ng-click="showGrainDetectionList(warning.id)"><i class=""></i>检测记录</a>&emsp;
+                                                <a href-void ng-click="showProcessDetectionList(warning.id)"><i class=""></i>处理记录</a>
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div smart-include="app/layout/partials/page.tpl.html"></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </article>
+        </div>
+    </section>
+</div>

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

@@ -0,0 +1,34 @@
+<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 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>
+
+                    <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>
+            </div>
+        </div>
+    </div>
+</div>
+