gaodd преди 2 години
родител
ревизия
ff43ab799e

+ 1 - 4
src/main/resources/static/app/intelligent/aeration/controller/aerationJobCtrl.js

@@ -137,10 +137,7 @@ angular.module('app.intelligent')
137 137
 
138 138
     $scope.lwChange = function(){
139 139
     	if($scope.aerationJob.tfhpjlw!=null && $scope.aerationJob.tfqpjlw!=null){
140
-    		if($scope.aerationJob.tfhpjlw*100 >= $scope.aerationJob.tfqpjlw*100 ){
141
-    			alert("通风后平均粮温必须小于通风前平均粮温");
142
-    			$scope.aerationJob.tfhpjlw = null;
143
-    		}
140
+    		
144 141
 			//降温幅度
145 142
 			var jwl = parseFloat($scope.aerationJob.tfqpjlw) - parseFloat($scope.aerationJob.tfhpjlw);
146 143
 			$scope.aerationJob.jwfd = jwl.toFixed(1);

+ 4 - 4
src/main/resources/static/app/intelligent/aeration/views/aerationJob-edit.html

@@ -813,7 +813,7 @@
813 813
 											<th>
814 814
 												<label class="input">
815 815
 													<input type="text" ng-model="aerationJob.tfqpjlw" ng-change="lwChange()" required
816
-														ng-disabled="isNotEdit" name="tfqpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
816
+														ng-disabled="isNotEdit" name="tfqpjlw" onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''"
817 817
 														class="form-control" />
818 818
 												</label>
819 819
 											</th>
@@ -827,7 +827,7 @@
827 827
 											<th>
828 828
 												<label class="input">
829 829
 														<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()" required
830
-															ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
830
+															ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''"
831 831
 															class="form-control" />
832 832
 												</label>
833 833
 											</th>
@@ -1451,7 +1451,7 @@
1451 1451
 											<th>
1452 1452
 												<label class="input">
1453 1453
 													<input type="text" ng-model="aerationJob.tfqpjlw" ng-change="lwChange()" required
1454
-														ng-disabled="isNotEdit" name="tfqpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1454
+														ng-disabled="isNotEdit" name="tfqpjlw" onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''"
1455 1455
 														class="form-control">
1456 1456
 												</label>
1457 1457
 											</th>
@@ -1462,7 +1462,7 @@
1462 1462
 											<th>
1463 1463
 												<label class="input">
1464 1464
 													<input type="text" ng-model="aerationJob.tfhpjlw" ng-change="lwChange()" required
1465
-														ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/\d+(\.\d{0,2})?/) ? this.value.match(/\d+(\.\d{0,2})?/)[0] : ''"
1465
+														ng-disabled="isNotEdit" name="tfhpjlw" onblur="this.value= this.value.match(/(\-)?\d+(\.\d{0,2})?/) ? this.value.match(/(\-)?\d+(\.\d{0,2})?/)[0] : ''"
1466 1466
 														class="form-control">
1467 1467
 												</label>
1468 1468
 											</th>