Browse Source

fix: select value改为数字,粮情分析时间修复

maopixin 2 years ago
parent
commit
eec59e5ba6

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

@@ -96,7 +96,7 @@ angular.module('app.storage').controller("monthDetailCtrl", function ($scope, $r
96
 						swjcbzqk: '',
96
 						swjcbzqk: '',
97
 						swjcsgqk: '',
97
 						swjcsgqk: '',
98
 						clfahclxg: '',
98
 						clfahclxg: '',
99
-						jcsj: e.updatetime
99
+						jcsj: e.tTime
100
 					})
100
 					})
101
 				}
101
 				}
102
 				$scope.form.grainAnalysisAbnormalList = arr2
102
 				$scope.form.grainAnalysisAbnormalList = arr2

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

@@ -96,7 +96,7 @@ angular.module('app.storage').controller("quarterDetailCtrl", function ($scope,
96
 						swjcbzqk: '',
96
 						swjcbzqk: '',
97
 						swjcsgqk: '',
97
 						swjcsgqk: '',
98
 						clfahclxg: '',
98
 						clfahclxg: '',
99
-						jcsj: e.updatetime
99
+						jcsj: e.tTime
100
 					})
100
 					})
101
 				}
101
 				}
102
 				$scope.form.grainAnalysisAbnormalList = arr2
102
 				$scope.form.grainAnalysisAbnormalList = arr2

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

@@ -87,7 +87,7 @@ angular.module('app.storage').controller("weekDetailCtrl", function ($scope, $ro
87
 						swjcbzqk: '',
87
 						swjcbzqk: '',
88
 						swjcsgqk: '',
88
 						swjcsgqk: '',
89
 						clfahclxg: '',
89
 						clfahclxg: '',
90
-						jcsj: e.updatetime
90
+						jcsj: e.tTime
91
 					})
91
 					})
92
 				}
92
 				}
93
 				$scope.form.grainAnalysisAbnormalList = arr
93
 				$scope.form.grainAnalysisAbnormalList = arr

+ 1 - 2
src/main/resources/static/app/storage/foodstuffAnalysis/views/monthDetail.html

@@ -234,8 +234,7 @@
234
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
234
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
235
 												<th>
235
 												<th>
236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
237
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
238
-														2019-10-06
237
+														{{ item.jcsj }}
239
 													</label>
238
 													</label>
240
 												</th>
239
 												</th>
241
 												<th>
240
 												<th>

+ 1 - 2
src/main/resources/static/app/storage/foodstuffAnalysis/views/quarterDetail.html

@@ -234,8 +234,7 @@
234
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
234
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
235
 												<th>
235
 												<th>
236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
236
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
237
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
238
-														2019-10-06
237
+														{{ item.jcsj }}
239
 													</label>
238
 													</label>
240
 												</th>
239
 												</th>
241
 												<th>
240
 												<th>

+ 1 - 2
src/main/resources/static/app/storage/foodstuffAnalysis/views/weekDetail.html

@@ -250,8 +250,7 @@
250
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
250
 											<tr ng-repeat="item in form.grainAnalysisAbnormalList" class="ng-scope">
251
 												<th>
251
 												<th>
252
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
252
 													<label class="label ng-binding" style="margin-top: 9px;text-align: center;width: 80px;">
253
-														<input type="hidden" ng-model="item.jcsj" ng-disabled="true" name="jcsj" required="" class="form-control datepicker ng-pristine ng-untouched ng-valid ng-isolate-scope hasDatepicker ng-valid-required" data-smart-datepicker="" autocomplete="off" id="dp1650105345692" disabled="disabled">
254
-														2019-10-06
253
+														{{ item.jcsj }}
255
 													</label>
254
 													</label>
256
 												</th>
255
 												</th>
257
 												<th>
256
 												<th>

+ 1 - 1
src/main/resources/static/app/supervise/controller/violationWarningListCtrl.js

@@ -6,7 +6,7 @@ angular.module('app.supervise')
6
 		$scope.search = {
6
 		$scope.search = {
7
 			startDate: '',
7
 			startDate: '',
8
 			endDate: '',
8
 			endDate: '',
9
-			violationType: '疑转圈粮预警',
9
+			violationType: 1,
10
 		}
10
 		}
11
 		// 默认分页
11
 		// 默认分页
12
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};
12
 		$scope.pageInfo = {pageNum: 1, pageSize: 10};

+ 1 - 1
src/main/resources/static/app/supervise/views/violationDetail.html

@@ -47,7 +47,7 @@
47
 										<section class="col col-3">
47
 										<section class="col col-3">
48
                                             <label class="label">违规类型:<span style="color: red;">*</span></label> 
48
                                             <label class="label">违规类型:<span style="color: red;">*</span></label> 
49
                                             <label class="select"> 
49
                                             <label class="select"> 
50
-                                                <select ng-model="form.violationType" name="violationType" ng-options="item for item in ['疑转圈粮预警']" required>
50
+                                                <select ng-model="form.violationType" name="violationType" ng-options="item.value as item.label for item in [{value: 1, label:'疑转圈粮预警'}]" required>
51
                                                 </select><i></i>
51
                                                 </select><i></i>
52
                                             </label>
52
                                             </label>
53
                                         </section>
53
                                         </section>

+ 1 - 2
src/main/resources/static/app/supervise/views/violationWarningList.html

@@ -19,9 +19,8 @@
19
 										<label>
19
 										<label>
20
 											违规类型:
20
 											违规类型:
21
 											<select ng-model="search.violationType"
21
 											<select ng-model="search.violationType"
22
-											ng-options="num as num for num in ['疑转圈粮预警']"
22
+											ng-options="item.value as item.label for item in [{value: 1, label:'疑转圈粮预警'}]"
23
 											class="form-control input-sm">
23
 											class="form-control input-sm">
24
-											
25
 										</select>
24
 										</select>
26
 										</label>
25
 										</label>
27
 										&nbsp;&nbsp;
26
 										&nbsp;&nbsp;