fix: 修复库存bug && 储存超限报警

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

@@ -13,4 +13,9 @@ angular.module('app.supervise')
 			});
 		};
 		$scope.loadData();
+
+		$scope.goPage = function(pageNum) {
+			$scope.pageInfo.pageNum = pageNum
+			$scope.loadData();
+		}
 	})

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

@@ -0,0 +1,28 @@
+"use strict";
+
+angular.module('app.supervise')
+	.controller("storeWarningThresholdCtrl", function ($scope, $rootScope, $state, overDueAlarmService) {
+		// 默认分页
+		$scope.pageInfo = {pageNum: 1, pageSize: 10};
+		// 加载列表
+		$scope.loadData = function () {
+			overDueAlarmService.getCcPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $rootScope.orgInfo.orgId).then(function (data) {
+				data.data.list.forEach(e => {
+					let fcTime = new Date(e.fcTime)
+					let cznxTime = new Date(e.fcTime)
+					cznxTime.setFullYear(fcTime.getFullYear() + e.limitYear)
+					e.cznx = cznxTime
+				});
+
+				$scope.pageInfo = data.data;
+			}, function (data) {
+				// console.log(data);
+			});
+		};
+		$scope.loadData();
+
+		$scope.goPage = function(pageNum) {
+			$scope.pageInfo.pageNum = pageNum
+			$scope.loadData();
+		}
+	})

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

@@ -251,6 +251,102 @@ angular.module('app.supervise', ['ui.router','app.basic','app.business','app.ala
                     }
                 }
             )
+			// 湿度报警
+            .state('app.supervise.situation.humidity', {
+				url: '/supervise/situation/humidity/:isShow/:houseId',
+				data: {
+					title: '湿度报警'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'humidityWarningThresholdCtrl',
+						templateUrl: 'app/supervise/views/humidityWarningThreshold.html'
+					}
+				}
+			})
+			// 库存超限报警
+            .state('app.supervise.situation.stock', {
+				url: '/supervise/situation/stock/:isShow/:houseId',
+				data: {
+					title: '库存超限报警'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'stockWarningThresholdCtrl',
+						templateUrl: 'app/supervise/views/stockWarningThreshold.html'
+					}
+				}
+			})
+			// 储存超限报警
+            .state('app.supervise.situation.store', {
+				url: '/supervise/situation/store/:isShow/:houseId',
+				data: {
+					title: '储存超限报警'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'storeWarningThresholdCtrl',
+						templateUrl: 'app/supervise/views/storeWarningThreshold.html'
+					}
+				}
+			})
+			// 内控预警列表
+            .state('app.supervise.situation.internalControl', {
+				url: '/supervise/situation/internalControl/:isShow/:houseId',
+				data: {
+					title: '内控预警列表'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'internalWarningListCtrl',
+						templateUrl: 'app/supervise/views/internalWarningList.html'
+					}
+				}
+			})
+			// 违规预警
+            .state('app.supervise.situation.violation', {
+				url: '/supervise/situation/violation/:isShow/:houseId',
+				data: {
+					title: '违规预警'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'violationWarningListCtrl',
+						templateUrl: 'app/supervise/views/violationWarningList.html'
+					}
+				}
+			})
+			// 违规预警详情页
+            .state('app.supervise.situation.violationDetail', {
+				url: '/supervise/situation/violationDetail/:isShow/:houseId',
+				data: {
+					title: '违规预警'
+				},
+				params:{
+					showType : "WD"
+				},
+				views: {
+					"content@app": {
+						controller: 'violationDetailCtrl',
+						templateUrl: 'app/supervise/views/violationDetail.html'
+					}
+				}
+			})
             //=======================粮情监测========================//
             //=======================仓储作业========================//
             .state('app.supervise.operation', {

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

@@ -0,0 +1,26 @@
+"use strict";
+
+angular.module('app.supervise').service("overDueAlarmService", function($http, $q, APP_CONFIG, $rootScope) {
+    /**
+     * 查询储存超限报警列表
+     */
+    this.getCcPageInfo = function(pageNum, pageSize, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.sharedUrl + '/overDueAlarm/getOverDueAlarmList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+				orgId: orgId,
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+});

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

@@ -1,11 +1,10 @@
 "use strict";
 
 angular.module('app.supervise').service("overRunAlarmService", function($http, $q, APP_CONFIG, $rootScope) {
-	console.log(APP_CONFIG, 9889);
     /**
      * 查询库存超限报警列表
      */
-    this.getKcPageInfo = function(pageNum, pageSize) {
+    this.getKcPageInfo = function(pageNum, pageSize, orgId) {
         var d = $q.defer();
         $http({
             method : 'GET',
@@ -13,7 +12,7 @@ angular.module('app.supervise').service("overRunAlarmService", function($http, $
             params : {
                 pageNum : pageNum,
                 pageSize : pageSize,
-				orgId: 68,
+				orgId: orgId,
             }
         }).then(function successCallback(response) {
             // 请求成功执行代码

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

@@ -0,0 +1,68 @@
+<!-- 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>储存超限报警</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">
+										
+									</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;">等级</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>
+												<td style="text-align:center;">{{ warning.storeHouseName }}</td>
+												<td style="text-align:center;">{{ warning.grainOilQuality }}</td>
+												<td style="text-align:center;">{{ warning.grainOilName }}</td>
+												<td style="text-align:center;">{{ warning.level }}</td>
+												<td style="text-align:center;">{{ warning.inventoryQuantity }}</td>
+												<td style="text-align:center;">
+													{{ warning.fcTime | date:'yyyy-MM-dd HH:mm:ss' }}
+												</td>
+												<td style="text-align:center;">{{ warning.limitYear }}</td>
+												<td style="text-align:center;">{{ warning.cznx | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+											</tr>
+										</tbody>
+									</table>
+								</div>
+								<div smart-include="app/layout/partials/page.tpl.html"></div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</article>
+		</div>
+	</section>
+</div>