擅自动用或置换预警-列表

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/controller/unauthorizedOperationListCtrl.js

@@ -1,129 +1,19 @@
 "use strict";
-angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', function ($scope, $rootScope) {
+angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', function ($scope, $rootScope, unauthorizedOperationService) {
 
     // 获取列表数据
     $scope.pageInfo = {pageNum: 1, pageSize: 10};
     // 初始化查询条件
-    $scope.search = {houseId: null, thresholdType: null};
+    $scope.search = {kqmc: null, yjsj: null};
     $scope.loadData = function () {
-        // 测试
-        $scope.pageInfo = {
-            "lastPage": 1,
-            "navigatepageNums": [
-                1
-            ],
-            "startRow": 1,
-            "hasNextPage": false,
-            "prePage": 0,
-            "nextPage": 0,
-            "endRow": 4,
-            "pageSize": 10,
-            "list": [
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-28",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 3,
-                    "clrmc": "自动",
-                    "id": "b3106a875b7e4d3281fdfb846ddb2f72"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-28",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-07-27",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "test",
-                    "cfmc": "107号仓",
-                    "clfs": 0,
-                    "bjlx": 3,
-                    "clrmc": "储备粮11",
-                    "id": "4e2697d5d0784da3872e6e681882aa45"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-05",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 1,
-                    "clrmc": "自动",
-                    "id": "8ae33c4f545347ea8f2762cf9deadd97"
-                },
-                {
-                    "ssjhh": "销2305-387",
-                    "pzbm": "1112001",
-                    "tzdid": "TZ202305251053182324907",
-                    "sskddm": "91120223104141086Y001",
-                    "jhsl": 1.0,
-                    "cfbh": "91120223104141086Y001109",
-                    "sskdmc": "天津利达粮油储运有限公司",
-                    "kssj": "2023-05-18",
-                    "clzt": 1,
-                    "clsj": "2023-07-30",
-                    "jssj": "2023-06-20",
-                    "bjsj": "2023-06-13",
-                    "pzmc": "澳大利亚标准白小麦",
-                    "clyj": "经系统检测，该报警内容已恢复正常",
-                    "cfmc": "107号仓",
-                    "clfs": 1,
-                    "bjlx": 2,
-                    "clrmc": "自动",
-                    "id": "ebf92d2fa5b24ca29d192352f74d9153"
-                }
-            ],
-            "pageNum": 1,
-            "navigatePages": 8,
-            "navigateFirstPage": 1,
-            "total": 4,
-            "pages": 1,
-            "firstPage": 1,
-            "size": 4,
-            "isLastPage": true,
-            "hasPreviousPage": false,
-            "navigateLastPage": 1,
-            "isFirstPage": true
-        };
+        unauthorizedOperationService.getPageList($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.search).then(function (data) {
+            $scope.pageInfo = data.data;
+        }, function (data) {
+            console.log(data);
+        });
     };
     $scope.loadData();
 
-    // 处理记录
-    $scope.showProcessDetectionList = function (id) {
-        console.log(id);
-    };
-
     // 翻页
     $scope.goPage = function (pageNum) {
         $scope.pageInfo.pageNum = pageNum;
@@ -132,7 +22,8 @@ angular.module('app.warnAndAlarm').controller('unauthorizedOperationListCtrl', f
 
     // 清空
     $scope.emptyTime = function () {
-        $scope.search.houseId = null;
+        $scope.search.kqmc = null;
+        $scope.search.yjsj = null;
         $scope.loadData();
     };
 });

src/main/resources/static/app/warnAndAlarm/unauthorizedOperation/service/unauthorizedOperationService.js

@@ -1,4 +1,24 @@
 "use strict";
 angular.module('app.warnAndAlarm').service("unauthorizedOperationService", function ($http, $q, APP_CONFIG, $rootScope) {
-
+    this.getPageList = function(pageNum, pageSize, search) {
+        var d = $q.defer();
+        $http({
+            method : 'GET',
+            url : APP_CONFIG.depotStorageUrl + '/replacementAlarm/getPageList',
+            params : {
+                pageNum : pageNum,
+                pageSize : pageSize,
+                kqbm : $rootScope.orgInfo.kqbm,
+                kqmc: search.kqmc,
+                yjsj: search.yjsj
+            }
+        }).then(function successCallback(response) {
+            // 请求成功执行代码
+            d.resolve(response.data);
+        }, function errorCallback(response) {
+            // 请求失败执行代码
+            d.reject("error");
+        });
+        return d.promise;
+    };
 });

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

@@ -17,10 +17,10 @@
                                 <div class="dt-toolbar">
                                     <div class="col-xs-12 col-sm-10">
                                         <label>承储企业:
-                                            <input class="form-control" type="text" ng-model="cfmc" name="cfmc" />&emsp;
+                                            <input class="form-control" type="text" ng-model="search.cfmc" name="cfmc" />&emsp;
                                         </label>
                                         <label>报警日期:
-                                            <input style="width: 100px;" class="form-control" type="text" ng-model="search.searchStartDate" name="searchStartDate" data-smart-datepicker>
+                                            <input style="width: 100px;" class="form-control" type="text" ng-model="search.yjsj" name="yjsj" data-smart-datepicker>
                                         </label>
                                         <a class="btn btn-default btn-sm" ng-click="loadData()">
                                             <i class="fa fa-search"></i>&nbsp;查&nbsp;询
@@ -55,11 +55,11 @@
                                         <tbody>
                                         <tr ng-repeat="warning in pageInfo.list">
                                             <td style="text-align:center;">{{ $index + 1 }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
+                                            <td style="text-align:center;">{{ warning.kqmc }}</td>
                                             <td style="text-align:center;">{{ warning.cfmc }}</td>
-                                            <td style="text-align:center;">{{ warning.ssjhh }}</td>
-                                            <td style="text-align:center;">{{ warning.jhsl }}</td>
-                                            <td style="text-align:center;">{{ warning.clfs }}</td>
+                                            <td style="text-align:center;">{{ warning.yjxx }}</td>
+                                            <td style="text-align:center;">{{ warning.yjsj }}</td>
+                                            <td style="text-align:center;">{{ warning.czr }}</td>
                                         </tr>
                                         </tbody>
                                     </table>