Merge branch 'master' of http://101.36.160.140:21044/depot-tianjin/depot-web-tianjin

src/main/resources/static/app/intelligent/grainDetection/views/insectPestDetection-edit.html

@@ -87,9 +87,11 @@
 											</th>
 											<th>
 												<section>
-													<label class="input">
-														<input class="form-control" type="text" ng-model="insectPests.cldjpd"
-															   name="cldjpd" validFrequency="true" required>
+													<label class="select">
+														<select ng-model="insectPests.cldjpd" name="cldjpd"
+																ng-options="enum.enumid as enum.enumname for enum in dicDataList[5281]" required>
+															<option value="">--请选择--</option>
+														</select><i></i>
 													</label>
 												</section>
 											</th>

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

@@ -26,6 +26,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
 		GrainAnalysisService.getInfo(id).then(function(data) {
 			console.log(data);
 			$scope.form = data
+			$scope.temperature = data.tTestdata
 		}, function(data){
 			console.log(data);
 		})
@@ -38,6 +39,8 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
 			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
 			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
 				$scope.wareList = data.wareList;  //下拉列表数据
+				
+				$scope.onTimeChange()
 			},function(data){
 				console.log(data);
 			});
@@ -84,7 +87,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
 				$scope.temperature = arr
 				var arr2 = []
 				for (var i = 0; i < arr.length; i++) {
-					var e = data[i];
+					var e = arr[i];
 					arr2.push({
 						ycqklx: '',
 						ycqkbw: '',

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

@@ -26,6 +26,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
 		GrainAnalysisService.getInfo(id).then(function(data) {
 			console.log(data);
 			$scope.form = data
+			$scope.temperature = data.tTestdata
 		}, function(data){
 			console.log(data);
 		})
@@ -38,6 +39,8 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
 			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
 			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
 				$scope.wareList = data.wareList;  //下拉列表数据
+
+				$scope.onTimeChange()
 			},function(data){
 				console.log(data);
 			});
@@ -84,7 +87,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
 				$scope.temperature = arr
 				var arr2 = []
 				for (var i = 0; i < arr.length; i++) {
-					var e = data[i];
+					var e = arr[i];
 					arr2.push({
 						ycqklx: '',
 						ycqkbw: '',

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

@@ -31,6 +31,8 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
 			$scope.form.houseType = $rootScope.storehouseObj[$scope.form.houseId].storehouseType
 			warehouseService.getStorehouse($rootScope.orgInfo.orgId, $scope.form.houseId, "0").then(function(data){
 				$scope.wareList = data.wareList;  //下拉列表数据
+				
+				$scope.onTimeChange()
 			},function(data){
 				console.log(data);
 			});

src/main/resources/static/app/storage/views/safeproduce/safeRiskLevelCtrl-edit.html

@@ -25,13 +25,13 @@
                                       <section class="col col-3">
                                           <label class="label">识别人<span style="color: red;">*</span></label>
                                           <label class="input">
-                                              <input type="text" ng-model="insertRisk.identifyPerson" name="operationTime" required>
+                                              <input type="text" ng-model="insertRisk.identifyPerson" name="operationTime" required ng-disabled="isNotEdit">
                                           </label>
                                       </section>
                                       <section class="col col-3">
                                           <label class="label">环节部位<span style="color: red;">*</span></label>
                                           <label class="input">
-                                              <input type="text" ng-model="insertRisk.linkPart" name="linkPart">
+                                              <input type="text" ng-model="insertRisk.linkPart" name="linkPart" required ng-disabled="isNotEdit">
                                           </label>
                                       </section>
                                       <section class="col col-3">
@@ -39,6 +39,7 @@
                                           <label class="select">
                                             <select 
                                                 ng-model="insertRisk.riskClassification"
+                                                ng-disabled="isNotEdit"
                                                 name="riskClassification" class="form-control input-sm"
                                                 ng-options="item.id as item.value for item in fxfjList"
                                                     ng-change="loadWare(houseId)" required>
@@ -53,6 +54,7 @@
                                           <label class="select">
                                             <select 
                                                 ng-model="insertRisk.riskTypeName"
+                                                ng-disabled="isNotEdit"
                                                 name="riskTypeName" class="form-control input-sm"
                                                 ng-options="item.id as item.value for item in fxlxList"
                                                     ng-change="loadWare(houseId)" required>
@@ -65,7 +67,8 @@
                                         <section class="col col-12" style="width: 100%;">
                                             <label class="label">风险识别</label>
                                             <label class="textarea textarea-resizable">
-                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskIdentification"  ng-disabled="isNotEdit" name="riskIdentification"></textarea>
+                                                <textarea rows="5" class="custom-scroll"  ng-model="insertRisk.riskIdentification"  
+                                                ng-disabled="isNotEdit" name="riskIdentification"></textarea>
                                             </label>
                                         </section>
                                     </div>