'4.10'

src/assets/js/httpApi.js

@@ -37,8 +37,8 @@ var reqApis = function(){
 				var item = baseInfo[key];
 				if(item.must){
 					var typeStr = item.type ? '请选择' : '请输入';
-					var rule = {required: true, message:item.ruleTip || typeStr+item.name, trigger:'blur'};
-					item.ruleType && (rule.type = item.ruleType)
+					var rule = {required: true, message:item.ruleTip || typeStr+item.name, trigger:'blur',};
+					item.pattern ? rule.pattern = item.pattern : item.ruleType && (rule.type = item.ruleType);
 					rules[key] = [rule];
 				};
 			};return Object.keys(rules)[0] ? rules : void 0;
@@ -235,6 +235,7 @@ var reqApis = function(){
 				this.form.visible = true;
 				this.form.reqType = 'add';
 				var item = {}, Dict = this.Dict;
+
 				for(var key in Dict.baseInfo){
 					var obj = Dict.baseInfo[key];
 					item[key] = obj.default || obj.dataType || '';
@@ -1735,7 +1736,7 @@ var reqApis = function(){
 						"content":{name:"说明", type:'text', style:'display:flex;width:100%;',},
 						"implement":{name:"仪器", type:'text', style:'display:flex;width:100%;',},
 						"precision":{name:"精度", type:'text', style:'display:flex;width:100%;',},
-						"value":{name:"人工监测值", must:true, ruleTip:'监测值必须为数字类型!', ruleType:'number'},
+						"value":{name:"人工监测值", must:true, ruleTip:'监测值必须为数字类型!',pattern:/^(\-|\+)?\d+(\.\d+)?$/},
 						"time":{name:"添加时间", must:true, type:'datetime', format:'yyyy-MM-dd HH:mm:ss'},
 						"sjvalue":{name:"系统监测值", type:'text', style:'display:flex;width:100%;',},
 						"sjtime":{name:"系统监测时间", type:'text', style:'display:flex;width:100%;',},

src/views/personMonitor/valueInput/index.vue

@@ -70,9 +70,6 @@ export default {
 				total: 0,
 				loading: false,
 				dataList:[],
-			},
-			rules:{
-         // value:[{required: true, message: '监测值必须为数字类型!', trigger: 'blur'}]
 			},
 			form: {
 				title:'', visible:false, reqType:'add', historyDialog:false,