Merge remote-tracking branch 'origin/master'

src/main/resources/static/app/intelligent/aeration/controller/aerationJobCtrl.js

@@ -6,7 +6,7 @@ angular.module('app.intelligent')
 
 	//通风作业数据查询
 	$scope.pageInfo = {pageNum : 1, pageSize : 10};
-	$scope.aerationJob = {cfbh: ""};
+	$scope.aerationJob = {cfmc: null};
 	$scope.isArchive = false;
 	$scope.isArchiveHouse = 0;
     $scope.loadData = function() {
@@ -34,7 +34,7 @@ angular.module('app.intelligent')
 				}
 				$scope.aerationJob.createTime = $filter('date')($scope.aerationJob.createTime, "yyyy-MM-dd HH:mm:ss");
 				//原来代码
-				aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, null).then(function (data) {
+				aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, $scope.aerationJob.cfmc).then(function (data) {
 					$scope.pageInfo = data.data;
 				}, function (data) {
 					console.log(data);
@@ -45,7 +45,7 @@ angular.module('app.intelligent')
 		}else {
 			$scope.aerationJob.funcType = $stateParams.funcType;//1：代表通风作业开始功能,2：代表通风作业结束功能
 			$scope.funcType = $stateParams.funcType;
-			aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, null).then(function (data) {
+			aerationJobService.getPageInfo($scope.pageInfo.pageNum, $scope.pageInfo.pageSize, $scope.aerationJob, $scope.aerationJob.cfmc).then(function (data) {
 				$scope.pageInfo = data.data;
 			}, function (data) {
 				console.log(data);

src/main/resources/static/app/intelligent/aeration/views/aerationJob-js-list.html

@@ -24,7 +24,7 @@
 <!-- 										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '2')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a> -->
 											&emsp;
 											<label> 仓房名称:&emsp;
-                                                <select ng-model="aerationJob.cfbh" 
+                                                <select ng-model="aerationJob.cfmc" 
                                                         ng-options="store.storehouseId as store.storehouseName for store in storelist"
                                                          class="form-control">
                                                     <option value="">--请选择--</option>

src/main/resources/static/app/intelligent/aeration/views/aerationJob-ks-list.html

@@ -24,7 +24,7 @@
 										    <a ng-hide="isArchive" has-permission="703" class="btn btn-primary btn-sm" ng-click="edit(null, 'add', '1')"><i class="fa fa-plus"></i>&nbsp;新&nbsp;增</a>
 											&emsp;
 											<label> 仓房名称:&emsp;
-                                                <select ng-model="aerationJob.cfbh" 
+                                                <select ng-model="aerationJob.cfmc" 
                                                         ng-options="store.storehouseCode as store.storehouseName for store in storelist"
                                                          class="form-control">
                                                     <option value="">--请选择--</option>

src/main/resources/static/app/synth/lifecycle/controller/grainAnalysisCtrl.js

@@ -1,4 +0,0 @@
-"use strict";
-angular.module('app.synth').controller("grainAnalysisCtrl",function ($scope, $rootScope, $state, $filter) {
-
-});