.

src/main/resources/static/app/business/device/views/deviceStorage-edit.html

@@ -312,17 +312,17 @@
                                             </section>
                                             <section class="col col-3">
                                                 <label class="input">
-                                                    <label class="label">检定单位：<span style="color: red;">*</span></label>
+                                                    <label class="label">检定单位：</label>
                                                     <input type="text" ng-model="dSbxxsjy.jddw" name="jddw"
-                                                           placeholder="检定单位" ng-disabled="isNotEdit" required />
+                                                           placeholder="检定单位" ng-disabled="isNotEdit" />
                                                 </label>
                                             </section>
                                             <section class="col col-3">
-                                                <label class="label">检定时间：<span style="color: red;">*</span></label>
+                                                <label class="label">检定时间：</label>
                                                 <label class="input">
                                                     <input type="text" ng-model="dSbxxsjy.jdsj" name="jdsj" id="jdsj"
                                                            onClick="WdatePicker({lang:'zh-cn', dateFmt:'yyyy-MM-dd HH:mm:ss'})"
-                                                           ng-disabled="isNotEdit" required />
+                                                           ng-disabled="isNotEdit" />
                                                 </label>
                                             </section>
                                         </div>

src/main/resources/static/app/home/controller/liangspzCtrl.js

@@ -20,7 +20,7 @@ angular.module('app.system').controller("liangspzCtrl",
             var dadou=data.dadou;
 
             // 基于准备好的dom，初始化echarts实例
-            var myChart = echarts.init(document.getElementById('lspz'));
+            //var myChart = echarts.init(document.getElementById('lspz'));
             
             var labelOption = {
             	    normal: {
@@ -158,15 +158,15 @@ angular.module('app.system').controller("liangspzCtrl",
             
             option.grid.height = $("#lspz").height()/1.5-25;
 			option.grid.width = $("#lspz").width()*0.8;
-			
 
 			var lspz = echarts.init(document.getElementById('lspz'));
 	        lspz.setOption(option);
-	   setTimeout(function (){
-	    window.onresize = function () {
-	    	lspz.resize();
-	    }
-	},200)
+
+	        setTimeout(function (){
+			    window.onresize = function () {
+			    	lspz.resize();
+			    }
+			}, 200);
 
             // 使用刚指定的配置项和数据显示图表。
             //myChart.setOption(option);

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

@@ -185,14 +185,20 @@ angular.module('app.intelligent')
 
         var validator = $("#fumigationProcess-form").validate();
 
-        // 自定义验证，验证数字
-        $.validator.addMethod("validNumber",function(value,element, params) {
+        // 自定义验证，验证正数数字
+        $.validator.addMethod("positiveNumber",function(value,element, params) {
             //var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
             var checkNumber =/^(?!0+(?:\.0+)?$)(?:[1-9]\d*|0)(?:\.\d{1,2})?$/g;
             return this.optional(element)||(checkNumber.test(value));
         },"请输入大于0的数字，最多两位小数！");
 
         // 自定义验证，验证数字
+        $.validator.addMethod("validNumber",function(value,element, params) {
+            var checkNumber = /^\d*\.{0,1}\d{1,2}$/g;
+            return this.optional(element)||(checkNumber.test(value));
+        },"请输入正确的数字类型，最多两位小数！");
+
+        // 自定义验证，验证数字
         $.validator.addMethod("validInteger",function(value,element, params) {
             var checkNumber = /^[1-9]\d*$/g;
             return this.optional(element)||(checkNumber.test(value));

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

@@ -1054,7 +1054,7 @@
                           <section>
                             <label class="input">
                               <input class="form-control" type="text" ng-model="fumigationProcess.perforatedBefore"
-                                ng-readonly="isNotEdit" name="perforatedBefore" validNumber="true" />
+                                ng-readonly="isNotEdit" name="perforatedBefore" positiveNumber="true" />
                             </label>
                           </section>
                         </th>

src/main/resources/static/app/storage/controller/numberManage/numberManageCtrl.js

@@ -181,12 +181,6 @@ angular.module('app.numbermanage').controller("numberManageCtrl", function(APP_C
     //打印
 	$scope.print = function() {
 		$("#kcprint").printArea();
-//		kcswService.importList(null, null, $scope.kcswStr).then(function(data){
-//            //$scope.pageInfo = data;
-//            window.location.href=APP_CONFIG.agileUrl + "/agile/kcsw/importList?kcswStr=" + angular.toJson($scope.kcswStr);
-//        },function(data){
-//            //console.log(data);
-//        });
 	}
-     
+
 });