Browse Source

提交熏蒸相关

lvzhikai 4 years ago
parent
commit
34be6ec536

+ 1 - 1
depot-basic/src/main/resources/bootstrap.yml

@@ -17,7 +17,7 @@ spring:
17 17
   # 数据库配置
18 18
   datasource:
19 19
     driver-class-name: com.mysql.jdbc.Driver
20
-    url: jdbc:mysql://10.10.1.25:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
20
+    url: jdbc:mysql://10.10.1.25:3306/depot?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
21 21
     username: root
22 22
     password: 123456
23 23
   # 缓存配置

+ 4 - 4
depot-web/src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -323,24 +323,24 @@
323 323
 
324 324
                                             <tr>
325 325
                                                 <th>
326
-                                                    <label class="label" style="margin-top: 9px;text-align: center;">计算补药量(kg)<span style="color: red;">*</span></label>
326
+                                                    <label class="label" style="margin-top: 9px;text-align: center;">计算补药量(kg)</label>
327 327
                                                 </th>
328 328
                                                 <th>
329 329
                                                     <section>
330 330
                                                         <label class="input">
331 331
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.jsbyl" ng-readonly="isNotEdit"
332
-                                                                   name="jsbyl" validNumber="true" required>
332
+                                                                   name="jsbyl" validNumber="true">
333 333
                                                         </label>
334 334
                                                     </section>
335 335
                                                 </th>
336 336
                                                 <th>
337
-                                                    <label class="label" style="margin-top: 9px;text-align: center;">总补药量(kg)<span style="color: red;">*</span></label>
337
+                                                    <label class="label" style="margin-top: 9px;text-align: center;">总补药量(kg)</label>
338 338
                                                 </th>
339 339
                                                 <th>
340 340
                                                     <section>
341 341
                                                         <label class="input">
342 342
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.totalSupplementDrugCount" ng-readonly="isNotEdit"
343
-                                                                   name="totalSupplementDrugCount" validNumber="true" required>
343
+                                                                   name="totalSupplementDrugCount" validNumber="true">
344 344
                                                         </label>
345 345
                                                     </section>
346 346
                                                 </th>

+ 2 - 2
depot-web/src/main/resources/static/app/storage/fumigation/fumigationProcess/views/fumigationProcess-edit.html

@@ -354,13 +354,13 @@
354 354
 										
355 355
 										<tr>
356 356
 											<th>
357
-												<label class="label" style="margin-top: 9px;text-align: center;">总补药量(kg)<span style="color: red;">*</span></label>
357
+												<label class="label" style="margin-top: 9px;text-align: center;">总补药量(kg)</label>
358 358
 											</th>
359 359
 											<th>
360 360
 												<section>
361 361
 		                                            <label class="input"> 
362 362
 		                                                <input class="form-control" type="text" ng-model="fumigationProcess.totalSupplementDrugCount" ng-readonly="isNotEdit" 
363
-		                                                name="totalSupplementDrugCount" validNumber="true" required>
363
+		                                                name="totalSupplementDrugCount" validNumber="true">
364 364
 		                                            </label>
365 365
 		                                        </section>
366 366
 											</th>