src/main/resources/static/app/storage/foodstuffAnalysis/controller/monthCtrl.js

@@ -44,7 +44,6 @@ angular.module('app.storage').controller("monthCtrl", function ($scope, $rootSco
 	};
 	// 查看
 	$scope.handleLook = function (info) {
-		console.log(info);
 		$state.go("app.storage.foodstuffAnalysis.month-detail", {
 			id: info.id,
 			disabled: 1

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

@@ -1,16 +1,37 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("internalWarningListCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
+	.controller("internalWarningListCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, contentPreControlAlarmService, APP_CONFIG, alertService) {
+		// 搜索条件
+		$scope.search = {
+			startDate: '',
+			endDate: '',
+		}
 		// 默认分页
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};
 		// 加载列表
 		$scope.loadData = function () {
-			warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
+
+			$scope.search.startDate = $("input[name='startDate']").val(); // 时间控件获取值
+			$scope.search.endDate = $("input[name='endDate']").val(); // 时间控件获取值
+			contentPreControlAlarmService.getNkList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search, $rootScope.orgInfo.orgId).then(function (data) {
 				$scope.pageInfo = data.data;
+
 			}, function (data) {
 				// console.log(data);
 			});
 		};
 		$scope.loadData();
+
+		$scope.emptyTime = function () {
+			$("input[name='startDate']").val('')
+			$("input[name='endDate']").val('')
+		}
+
+		$scope.goPage = function(pageNum) {
+			if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+				$scope.pageInfo.pageNum = pageNum;
+				$scope.loadData();
+			}
+		}
 	})

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

@@ -1,41 +1,57 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("violationDetailCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
+	.controller("violationDetailCtrl", function ($scope, $rootScope, $state, violationWarningAlarmService, APP_CONFIG, alertService, $stateParams) {
 		// 返回
 		$scope.retList = function () {
-			$rootScope.back();
+			if ($rootScope.previousState_name != '') {
+				$rootScope.back();
+			} else {
+				$state.go("app.supervise.situation.violation");
+			}
 		}
-		// 表单信息
-		$scope.form = {
-			yjfbsj: '', // 预警发布时间
-			wgztlx: '', // 违规主体类型
-			wgxwr: '', // 违规行为人
-			sjkd: '', // 涉及库点
-			wglx: '疑转圈粮预警', // 违规类型
-			wgxq: '', // 违规详情
-			cznr: '', // 处置内容
-			czr: '', // 处置人
-			czsj: '', // 处置时间
+
+		$scope.loadDataById = function(id) {
+			violationWarningAlarmService.getInfoById(id).then(function(data) {
+				$scope.form = data.data
+			}, function(data){
+				console.log(data);
+			})
 		}
+
+		// 表单信息
+		$scope.form = {}
 		// 校验
 		var validator = $("#violation-form").validate();
 
+		//说明是的查看和修改
+		if ($stateParams.id != 0) {
+			$scope.loadDataById($stateParams.id);
+			// 查看时禁用表单
+			$scope.disabled = Boolean(Number($stateParams.disabled));
+		}else {
+			
+		}
+		var validator = $("#violation-form").validate();
+
 		$scope.save = function() {
 			if (!$scope.saveFlag) {
 				if (validator.form()) {
-					// $scope.saveFlag = true;
-					// basicGasSetService.save($scope.form).then(function(data){
-					// 	if (data.message == 'success' && data.retCode == '200') {
-					// 		alert('保存成功!');
-					// 		$scope.retList();
-					// 	} else {
-					// 		alert("保存失败！");
-					// 		$scope.saveFlag = false;
-					// 	}
-					// },function(data){
-					// 	console.log(data);
-					// });
+					// 设置saveFlag为true,防止重复提交.
+					$scope.saveFlag = true;
+					$scope.form.orgId = $rootScope.orgInfo.orgId
+					$scope.form.disposeTime = $("input[name='disposeTime']").val(); // 时间控件获取值
+					violationWarningAlarmService.updateWarningInfo($scope.form).then(function(data){
+						if (data.status == 'success') {
+							alert("保存成功！");
+							$scope.retList();
+						} else {
+							alert(data.msg);
+							$scope.saveFlag = false;
+						}
+					},function(data){
+						console.log(data);
+					});
 				}
 			}
 		}

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

@@ -1,31 +1,57 @@
 "use strict";
 
 angular.module('app.supervise')
-	.controller("violationWarningListCtrl", function ($scope, $rootScope, $state, StorehouseService, enumService, warningThresholdService, APP_CONFIG, alertService) {
+	.controller("violationWarningListCtrl", function ($scope, $rootScope, $state, violationWarningAlarmService, APP_CONFIG, alertService) {
+		// 搜索条件
+		$scope.search = {
+			startDate: '',
+			endDate: '',
+			violationType: '疑转圈粮预警',
+		}
 		// 默认分页
-		$scope.pageInfo = {pageNum: 1, pageSize: 10, list: [
-			{
-				wTime: 1650014854788,
-				wRemark: 'wRemark',
-				wState: 0,
-			}
-		]};
+		$scope.pageInfo = {pageNum: 1, pageSize: 10};
 		// 加载列表
 		$scope.loadData = function () {
-			warningThresholdService.getInsectPestDetectionPageInfo($scope.pageInfo).then(function (data) {
+			$scope.search.startDate = $("input[name='startDate']").val(); // 时间控件获取值
+			$scope.search.endDate = $("input[name='endDate']").val(); // 时间控件获取值
+			violationWarningAlarmService.getWgList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search, $rootScope.orgInfo.orgId).then(function (data) {
 				$scope.pageInfo = data.data;
+
 			}, function (data) {
 				// console.log(data);
 			});
 		};
-		// $scope.loadData();
+		$scope.loadData();
 
-		$scope.handleEditor = function () {
-			console.log('handleEditor');
-			$state.go("app.supervise.situation.violationDetail");
-		};
+		$scope.emptyTime = function () {
+			$("input[name='startDate']").val('')
+			$("input[name='endDate']").val('')
+		}
 
 		$scope.handleLook = function () {
 			console.log('handleLook');
+			$
+		};
+
+		$scope.goPage = function(pageNum) {
+			if ($scope.pageInfo.pageNum != pageNum && pageNum > 0) {
+				$scope.pageInfo.pageNum = pageNum;
+				$scope.loadData();
+			}
+		}
+
+		// 编辑
+		$scope.handleEditor = function (info) {
+			$state.go("app.supervise.situation.violationDetail", {
+				id: info.id,
+				disabled: 0
+			});
+		};
+		// 查看
+		$scope.handleLook = function (info) {
+			$state.go("app.supervise.situation.violationDetail", {
+				id: info.id,
+				disabled: 1
+			});
 		};
 	})

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

@@ -317,7 +317,7 @@ angular.module('app.supervise', ['ui.router','app.basic','app.business','app.ala
 			})
 			// 违规预警
             .state('app.supervise.situation.violation', {
-				url: '/supervise/situation/violation/:isShow/:houseId',
+				url: '/supervise/situation/violation',
 				data: {
 					title: '违规预警'
 				},
@@ -333,7 +333,7 @@ angular.module('app.supervise', ['ui.router','app.basic','app.business','app.ala
 			})
 			// 违规预警详情页
             .state('app.supervise.situation.violationDetail', {
-				url: '/supervise/situation/violationDetail/:isShow/:houseId',
+				url: '/supervise/situation/violationDetail/:id/:disabled',
 				data: {
 					title: '违规预警'
 				},

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

@@ -0,0 +1,29 @@
+"use strict";
+
+angular.module('app.supervise').service("contentPreControlAlarmService", function($http, $q, APP_CONFIG, $rootScope) {
+
+    /**
+     * 查询内控预警信息列表，支持分页
+     */
+    this.getNkList = function(pageNum, pageSize, search, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/contentPreControlAlarm/getList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                startDate : search==undefined?"":search.startDate,
+                endDate : search==undefined?"":search.endDate,
+                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/violationWarningAlarmService.js

@@ -0,0 +1,72 @@
+"use strict";
+
+angular.module('app.supervise').service("violationWarningAlarmService", function($http, $q, APP_CONFIG, $rootScope) {
+
+    /**
+     * 查询违规预警信息列表，支持分页
+     */
+    this.getWgList = function(pageNum, pageSize, search, orgId) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/violationWarningAlarm/getList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                startDate : search==undefined?"":search.startDate,
+                endDate : search==undefined?"":search.endDate,
+                violationType : search==undefined?"":search.violationType,
+                orgId : orgId
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
+	/**
+     * 根据id加载对应数据
+     */
+	 this.getInfoById = function(id) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/violationWarningAlarm/queryById',
+            params : {
+                id: id,
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+
+	/**
+     * 更新违规预警
+     */
+	 this.updateWarningInfo = function(data) {
+        var d = $q.defer();
+        $http({
+            method : 'POST',
+            url : APP_CONFIG.depotStorageUrl + '/violationWarningAlarm/updateData',
+            data : {
+				riskJson: angular.toJson(data)
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
+});

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

@@ -17,10 +17,10 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <label>日期：<input style="width: 100px;" class="form-control" type="text"
-                                                           ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+                                                           ng-model="search.startDate" name="startDate" id="startDate"
                                                            onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
                                             --&nbsp;<input style="width: 100px;" class="form-control" type="text" ng-disabled="isArchive"
-                                                           ng-model="search.searchEndDate" name="searchEndDate" id="endDate"
+                                                           ng-model="search.endDate" name="endDate" id="endDate"
                                                            onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()"> <i
@@ -54,16 +54,13 @@
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ storeHouseCodeObj[warning.vCfCode].storehouseName }}
+                                            <td style="text-align:center;">{{ warning.carNumber }}
                                             </td>
                                             <td style="text-align:center;">
-                                                <div ng-if="warning.threshold==250">
-                                                    <span style="color: red;">设备异常</span>
-                                                </div>
-                                                <div ng-if="warning.threshold!=250">{{ warning.threshold}}</div>
+                                                {{ warning.alarmType }}
                                             </td>
-                                            <td style="text-align:center;">{{ warning.wRemark }}</td>
-                                            <td style="text-align:center;">{{ warning.wTime | date:'yyyy-MM-dd HH:mm:ss' }}
+                                            <td style="text-align:center;">{{ warning.alarmContent }}</td>
+                                            <td style="text-align:center;">{{ warning.createTime | date:'yyyy-MM-dd HH:mm:ss' }}
                                             </td>
                                             <!--<td style="text-align:center;">-->
                                             <!--<span ng-if="warning.wState=='0'">未处理</span>-->

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

@@ -21,25 +21,25 @@
                                         <section class="col col-3">
                                             <label class="label">预警发布时间：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.yjfbsj" name="codeName" required>
+                                                <input class="form-control" type="text" ng-model="form.alarmPublishTime" name="alarmPublishTime" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">违规主体类型：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.wgztlx" name="wgztlx" required>
+                                                <input class="form-control" type="text" ng-model="form.violationSubjectType" name="violationSubjectType" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">违规行为人：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.wgxwr" name="spacer" required>
+                                                <input class="form-control" type="text" ng-model="form.offender" name="offender" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label">涉及库点：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.sjkd" name="sjkd" required>
+                                                <input class="form-control" type="text" ng-model="form.involvingLibraryPoints" name="involvingLibraryPoints" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                     </div>
@@ -47,8 +47,7 @@
 										<section class="col col-3">
                                             <label class="label">违规类型：<span style="color: red;">*</span></label> 
                                             <label class="select"> 
-                                                <select ng-model="form.wglx" name="codeType" ng-options="item for item in ['疑转圈粮预警']" required>
-                                                    <option value="">--请选择--</option>
+                                                <select ng-model="form.violationType" name="violationType" ng-options="item for item in ['疑转圈粮预警']" required>
                                                 </select><i></i>
                                             </label>
                                         </section>
@@ -57,7 +56,7 @@
 										<section class="col col-md-12">
                                             <label class="label">违规详情：</label> 
                                             <label class="textarea"> 
-                                                <textarea auto-focus class="form-control" ng-model="form.wgxq" style="width:100%; height:100%;"/>
+                                                <textarea auto-focus class="form-control" ng-model="form.violationDetail" name="violationDetail" style="width:100%; height:100%;" ng-disabled="disabled"/>
                                             </label>
                                         </section>
 									</div>
@@ -65,7 +64,7 @@
 										<section class="col col-md-12">
                                             <label class="label">处置内容：<span style="color: red;">*</span></label> 
                                             <label class="textarea"> 
-                                                <textarea auto-focus class="form-control" ng-model="form.cznr" name="cznr" style="width:100%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px" required/>
+                                                <textarea auto-focus class="form-control" ng-model="form.disposeContent" name="disposeContent" style="width:100%; height:100%; max-width: 100%; max-height: 100%; min-height: 100px" required ng-disabled="disabled"/>
                                             </label>
                                         </section>
 									</div>
@@ -73,20 +72,29 @@
                                         <section class="col col-3">
                                             <label class="label">处置人：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.czr" name="czr" required>
+                                                <input class="form-control" type="text" ng-model="form.disposer" name="disposer" required ng-disabled="disabled">
                                             </label>
                                         </section>
                                         <section class="col col-3">
                                             <label class="label txt-bg-red">处置时间：<span style="color: red;">*</span></label> 
                                             <label class="input"> 
-                                                <input class="form-control" type="text" ng-model="form.czsj" name="czsj" required>
+												<input 
+													class="form-control"
+													type="text"
+													ng-model="form.disposeTime"
+													name="disposeTime"
+													id="disposeTime"
+													onClick="WdatePicker({lang:'zh-cn'})"
+													required
+													ng-disabled="disabled"
+												>
                                             </label>
                                         </section>
                                     </div>
                                 </fieldset>
                                 <div>
                                     <footer class="text-align-center">
-										<button type="button" class="btn btn-primary" ng-hide="isNotEdit" ng-click="save()">提交</button>
+										<button type="button" class="btn btn-primary" ng-hide="disabled" ng-click="save()">提交</button>
                                         <button type="button" class="btn btn-default" ng-click="retList()">取消</button>
                                     </footer>
                                </div>

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

@@ -18,17 +18,19 @@
 									<div class="col-xs-12 col-sm-10">
 										<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>
+											<select ng-model="search.violationType"
+											ng-options="num as num for num in ['疑转圈粮预警']"
+											class="form-control input-sm">
+											
+										</select>
 										</label>
 										&nbsp;&nbsp;
 										<label>预警时间:从 <input style="width: 100px;" class="form-control" type="text"
-												ng-model="search.searchStartDate" name="searchStartDate" id="startDate"
+												ng-model="search.startDate" name="startDate" id="startDate"
 												onClick="WdatePicker({lang:'zh-cn',maxDate:'#F{$dp.$D(\'endDate\')}'})">
 											至&nbsp;<input style="width: 100px;" class="form-control" type="text"
-												ng-disabled="isArchive" ng-model="search.searchEndDate"
-												name="searchEndDate" id="endDate"
+												ng-disabled="isArchive" ng-model="search.endDate"
+												name="endDate" id="endDate"
 												onClick="WdatePicker({lang:'zh-cn',minDate:'#F{$dp.$D(\'startDate\')}'})">
 										</label>
 										<a class="btn btn-default btn-sm" ng-click="loadData()"> <i
@@ -66,22 +68,21 @@
 										<tbody>
 											<tr ng-repeat="warning in pageInfo.list">
 												<td style="text-align:center;">
-													{{ warning.wTime | date:'yyyy-MM-dd HH:mm:ss' }}
+													{{ warning.alarmPublishTime | date:'yyyy-MM-dd HH:mm:ss' }}
 												</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
-												<td style="text-align:center;">{{ warning.wRemark }}</td>
+												<td style="text-align:center;">{{ warning.violationSubjectType }}</td>
+												<td style="text-align:center;">{{ warning.offender }}</td>
+												<td style="text-align:center;">{{ warning.involvingLibraryPoints }}</td>
+												<td style="text-align:center;">{{ warning.violationType }}</td>
+												<td style="text-align:center;">{{ warning.violationDetail }}</td>
 												<td style="text-align:center;">
-													<span ng-if="warning.wState=='0'">未处理</span>
-													<span ng-if="warning.wState=='1'">处理中</span>
-													<span ng-if="warning.wState=='2'">已处理</span>
+													<span ng-if="warning.currentStatus=='0'">未处置</span>
+													<span ng-if="warning.currentStatus=='1'">已处置</span>
 												</td>
 												<td style="text-align:center;">
 													<!-- <i class="fa fa-edit"></i> -->
-													<a href-void ng-click="handleEditor()">编辑</a>
-													<a href-void ng-click="handleLook()" style="margin-left: 10px;">查看</a>
+													<a href-void ng-click="handleEditor(warning)">编辑</a>
+													<a href-void ng-click="handleLook(warning)" style="margin-left: 10px;">查看</a>
 												</td>
 											</tr>
 										</tbody>