湿度报警

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

@@ -215,12 +215,9 @@ angular.module('app.business')
 			data: {
 				title: '湿度报警'
 			},
-			params:{
-				showType : "WD"
-			},
 			views: {
 				"content@app": {
-					controller: 'humidityWarningThresholdCtrl',
+					controller: 'sptSdbjCtrl',
 					templateUrl: 'app/supervise/views/humidityWarningThreshold.html'
 				}
 			}

src/main/resources/static/app/supervise/controller/sptCtrl.js

@@ -83,6 +83,11 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function($scope, $ro
         $scope.loadData();
     }
     
+   // 打印
+    $scope.print = function () {
+        $("#print").printArea();
+    };
+    
 })
 
 .controller("sptJybgcqyjCtrl", function($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
@@ -164,4 +169,43 @@ angular.module('app.supervise').controller("sptSxtgzsCtrl", function($scope, $ro
     };
 
 })
+
+.controller("sptSdbjCtrl", function($scope, $rootScope, $state, $stateParams, APP_CONFIG, sptService) {
+
+	// 获取列表数据
+    $scope.pageInfo = {pageNum : 1, pageSize : 10};
+
+    $scope.search = {kqbm:$rootScope.orgInfo.kqbm,cfbm:""};
+    $scope.loadData = function() {
+    	$scope.search.searchStartDate = $("#startDate").val();
+    	$scope.search.searchEndDate = $("#endDate").val();
+    	
+		sptService.getHumidnessAlarmPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+			$scope.pageInfo = data;
+		}, function (data) {
+			console.log(data);
+		});
+    }
+    
+    $scope.loadData();
+
+    // 翻页
+    $scope.goPage = function(pageNum) {
+        $scope.pageInfo.pageNum = pageNum;
+        $scope.loadData();
+    };
+
+    $scope.emptyTime = function() {
+    	$("#startDate").val("");
+    	$("#endDate").val("");
+    	$scope.search.cfbm = "";
+        $scope.loadData();
+    }
+    
+    // 打印
+    $scope.print = function () {
+        $("#print").printArea();
+    };
+
+})
 ;

src/main/resources/static/app/supervise/service/sptService.js

@@ -75,6 +75,33 @@ angular.module('app.supervise').service("sptService", function($http, $q, APP_CO
         });
         return d.promise;
     }
+    
+    /**
+     * 湿度報警
+     */
+    this.getHumidnessAlarmPageInfo = function(pageNum, pageSize,search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/spt/getHumidnessAlarmList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : search.kqbm, 
+                cfbm : search.cfbm,
+                searchStartDate : search.searchStartDate,
+                searchEndDate : search.searchEndDate
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    }
+    
 
     /**
      * 获取市平台检验报告超期预警列表

src/main/resources/static/app/supervise/views/humidityWarningThreshold.html

@@ -9,7 +9,7 @@
 					data-widget-editbutton="true">
 					<header>
 						<span class="widget-icon"> <i class="fa fa-table"></i> </span>
-						<h2>报警列表</h2>
+						<h2>湿度报警列表</h2>
 					</header>
 					<div>
 						<div class="widget-body no-padding">
@@ -22,8 +22,8 @@
 											<span class="fa fa-print"></span>&nbsp;打&nbsp;印
 										</a>&emsp;
 										<label> 仓房名称:&emsp;
-											<select ng-model="search.storehouseName" class="form-control input-sm"
-												ng-options="store.storehouseName as store.storehouseName for store in storelist">
+											<select ng-model="search.cfbm" class="form-control input-sm"
+												ng-options="store.cfbm as store.storehouseName for store in storelist">
 												<option value="">请选择</option>
 											</select>&emsp;
 										</label>
@@ -58,10 +58,8 @@
 											<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;">预警值</th>
-												<th data-class="expand" style="text-align:center;">报警内容</th>
+												<th data-class="expand" style="text-align:center;">仓湿(%RH)</th>
+												<th data-class="expand" style="text-align:center;">预警值(%RH)</th>
 												<th data-class="expand" style="text-align:center;">报警时间</th>
 											</tr>
 										</thead>
@@ -70,22 +68,16 @@
 											<tr ng-repeat="warning in pageInfo.list">
 												<td style="text-align:center;">{{ $index + 1 }}</td>
 												<td style="text-align:center;">
-													{{ warning.storehouseName }}
+													{{ warning.chmc }}
 												</td>
 												<td style="text-align:center;">
-													{{ warning.moduleName }}
+													{{ warning.cs }}
 												</td>
 												<td style="text-align:center;">
-													{{ warning.alarmName }}
+													{{ warning.bjz }}
 												</td>
 												<td style="text-align:center;">
-													{{ warning.warningValue }}
-												</td>
-												<td style="text-align:center;">
-													{{ warning.alarmContent }}
-												</td>
-												<td style="text-align:center;">
-													{{ warning.alarmDate | date:'yyyy-MM-dd HH:mm:ss' }}
+													{{ warning.bjsj | date:'yyyy-MM-dd HH:mm:ss' }}
 												</td>
 											</tr>
 										</tbody>

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

@@ -68,10 +68,10 @@
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ storeHouseCodeObj[warning.ch].storehouseName }}</td>
+                                            <td style="text-align:center;">{{ warning.chmc }}</td>
                                             <td style="text-align:center;">{{ warning.cgw}}</td>
                                             <td style="text-align:center;">{{ warning.cdw}}</td>
-                                            <td style="text-align:center;">{{ warning.cAvg }}</td>
+                                            <td style="text-align:center;">{{ warning.cavg }}</td>
                                             <td style="text-align:center;">{{ warning.yjgx}}</td>
                                             <td style="text-align:center;">{{ warning.yjdx}}</td>
                                             <td style="text-align:center;">{{ warning.bjz}}</td>