熏蒸验证修改，弹窗视频播放问题

src/main/resources/static/app/home/controller/index-cangtCtrl.js

@@ -122,8 +122,8 @@ angular.module('app.dashboard').controller('cangtCtrl', function ($rootScope,$sc
             var tdh = 0;//通道号
             var zm = "";//字幕
             var winIndex = -1;//窗口索引
-            var err = playocx.DeviceLogin_NOPOINT(cameraVal[index].nvrIp,cameraVal[index].nvrPort*1,cameraVal[index].nvrName,cameraVal[index].nvrPassword,cameraVal[index].factory*1);
-            err = playocx.VideoPlay_NOPOINT(cameraVal[index].nvrIp,cameraVal[index].nvrPort*1,cameraVal[index].nvrName,cameraVal[index].nvrPassword,cameraVal[index].factory*1,cameraVal[index].channelNumber ,zm ,winIndex);
+            var err = playocx.DeviceLogin_NOPOINT(cameraVal[index].nvrIp,cameraVal[index].nvrPort*1,cameraVal[index].nvrName,cameraVal[index].nvrPassword,cameraVal[index].nvrFactory*1);
+            err = playocx.VideoPlay_NOPOINT(cameraVal[index].nvrIp,cameraVal[index].nvrPort*1,cameraVal[index].nvrName,cameraVal[index].nvrPassword,cameraVal[index].nvrFactory*1,cameraVal[index].channelNumber ,zm ,winIndex);
 
         },500)
     };

src/main/resources/static/app/intelligent/fumigation/controller/fumHomeWorkCtrl.js

@@ -465,6 +465,12 @@ angular.module('app.intelligent')
         return this.optional(element)||(checkNumber.test(value));
     },"请输入正确的数字类型，最多两位小数！");
 
+    // 自定义验证，验证熏蒸次数
+    $.validator.addMethod("validFrequency",function(value,element, params) {
+        var checkNumber = /^\+?[1-9]\d*$/;
+        return this.optional(element)||(checkNumber.test(value));
+    },"请输入大于0的整数！");
+
     // 自定义验证
     $.validator.addMethod("setState",function(value,element, params) {
         if(value == "无" || value == "暂无" || value == "空"){

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkAfter-edit.html

@@ -237,7 +237,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.czsjzyrs"
-                                                                   ng-readonly="isNotEdit" name="czsjzyrs" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="czsjzyrs" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -283,7 +283,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.czclzyrs"
-                                                                   ng-readonly="isNotEdit" name="czclzyrs" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="czclzyrs" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -422,7 +422,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationAfter.xzhckmd" ng-readonly="isNotEdit"
-                                                                   name="xzhckmd" validNumber="true">
+                                                                   name="xzhckmd" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>

src/main/resources/static/app/intelligent/fumigation/views/homework/fumHomeWorkProcess-edit.html

@@ -315,7 +315,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.totalSupplementDrugTimes" ng-readonly="isNotEdit"
-                                                                   name="totalSupplementDrugTimes" validNumber="true">
+                                                                   name="totalSupplementDrugTimes" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -622,7 +622,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.mbndwcts" ng-readonly="isNotEdit"
-                                                                   name="mbndwcts" placeholder="" validNumber="true">
+                                                                   name="mbndwcts" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -657,7 +657,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.mbsj" ng-readonly="isNotEdit"
-                                                                   name="mbsj" validNumber="true">
+                                                                   name="mbsj" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>
@@ -762,7 +762,7 @@
                                                     <section>
                                                         <label class="input">
                                                             <input class="form-control" type="text" ng-model="fumigationProcess.sqcsts"
-                                                                   ng-readonly="isNotEdit" name="sqcsts" validNumber="true">
+                                                                   ng-readonly="isNotEdit" name="sqcsts" validFrequency="true">
                                                         </label>
                                                     </section>
                                                 </th>

src/main/resources/static/app/intelligent/fumigation/views/plan/pesticidePlan-edit.html

@@ -267,7 +267,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.lddwyyl"
-																   name="lddwyyl" placeholder="">
+																   name="lddwyyl" validNumber="true">
 														</label>
 													</section>
 												</th>
@@ -278,7 +278,7 @@
 													<section>
 														<label class="input">
 															<input class="form-control" type="text" ng-model="pesticide.kjdwyyl"
-																   name="kjdwyyl" placeholder="">
+																   name="kjdwyyl" validNumber="true">
 														</label>
 													</section>
 												</th>

src/main/resources/static/app/supervise/controller/ptCtrl.js

@@ -302,8 +302,8 @@ angular.module('app.supervise')
                 var tdh = 0;//通道号
                 var zm = "";//字幕
                 var winIndex = -1;//窗口索引
-                playocx.DeviceLogin_NOPOINT(data.nvrIp,data.nvrPort,data.nvrName,data.nvrPassword,data.factory);
-                playocx.VideoPlay_NOPOINT(data.nvrIp,data.nvrPort,data.nvrName,data.nvrPassword,data.factory,data.channelNumber ,zm ,winIndex);
+                playocx.DeviceLogin_NOPOINT(data.nvrIp,data.nvrPort,data.nvrName,data.nvrPassword,data.nvrFactory);
+                playocx.VideoPlay_NOPOINT(data.nvrIp,data.nvrPort,data.nvrName,data.nvrPassword,data.nvrFactory,data.channelNumber ,zm ,winIndex);
             },1000)
         }