update

潘钊
1 parent ce644985
Showing 4 changed files with 48 additions and 44 deletions
src/main/resources/application.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/pages/forecast/sample/js/svg.js
src/main/resources/static/pages/forecast/sample/modal.html
 spring.profiles: dev,prod
-spring.profiles.active: prod
+spring.profiles.active: dev
  
 spring.view.suffix=.html
 server.session-timeout=-1
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
-#ms.mysql.username= root
-#ms.mysql.password= panzhao
-
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.url= jdbc:mysql://127.0.0.1:3306/ms?useUnicode=true&characterEncoding=utf-8
 ms.mysql.username= root
-ms.mysql.password= root2jsp
+ms.mysql.password= panzhao
+
+#ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://192.168.168.171:3306/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= root2jsp
@@ -247,34 +247,5 @@ var sampleSvg = (function(){
 		return cp;
 	}
  
-	/**
-	 * 自定义表单校验
-	 */
-	function customFormValidate(f){
-		var rs = true;
-		//所有可见的项
-		var es = $('input,select', f);
-		
-		for(var i = 0, e; e = es[i++];){
-			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
-				if($(e).hasClass('select2-hidden-accessible'))
-					$(e).next().find('.select2-selection').addClass('custom-val-error');
-				else
-					$(e).addClass('custom-val-error');
-				rs = false;
-			}
-			else{
-				if($(e).hasClass('select2-hidden-accessible'))
-					$(e).next().find('.select2-selection').removeClass('custom-val-error');
-				else
-					$(e).removeClass('custom-val-error');
-			}
-		}
-		
-		if(!rs){
-			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
-		}
-		return rs;
-	}
 	return drawObject;
 })();
 \ No newline at end of file
@@ -20,6 +20,7 @@
 {{each data as obj i}}
 	<div class="tab-pane" id="tab_sample_{{i}}">
 		<form class="form-horizontal" role="form" style="padding: 35px 25px;" id="addSampleForm">
+			<input type="hidden" name="id" value="{{obj.d.id}}"/>
 			<input type="hidden" name="sStation" value="{{obj.d.sid}}"/>
 			<input type="hidden" name="eStation" value="{{obj.d.eid}}"/>
 		    <div class="form-body">
@@ -157,13 +158,15 @@
  
 		toCenter(layero);
  
-		//currentData = searchData(sid, eid)[rs.tag];
-		
-		//console.log('当前站点： ' , getById(id));
-		//console.log('上一个站点： ' , prve(id));
-		//console.log('当前数据：', currentData);
-		
-		//forecast_sample_tab_detail_temp
+		$('#addSampleForm .confirm').on('click', function(){
+			if(customFormValidate('#addSampleForm')){
+				console.log(_opt);
+				var param = $('#addSampleForm').serializeJSON();
+				param.lineCode = _opt.lineCode;
+				param.updown = _opt.updown;
+				$post('/sample', param, function(){layer.close(index);});
+			}
+		});
 	});
  
  
@@ -237,5 +240,35 @@
 		else
 			firstTab.click();
 	}
+	
+	/**
+	 * 自定义表单校验
+	 */
+	function customFormValidate(f){
+		var rs = true;
+		//所有可见的项
+		var es = $('input,select', f);
+		
+		for(var i = 0, e; e = es[i++];){
+			if($(e).attr('required') && ( $(e).val() == null || $(e).val() == '')){
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').addClass('custom-val-error');
+				else
+					$(e).addClass('custom-val-error');
+				rs = false;
+			}
+			else{
+				if($(e).hasClass('select2-hidden-accessible'))
+					$(e).next().find('.select2-selection').removeClass('custom-val-error');
+				else
+					$(e).removeClass('custom-val-error');
+			}
+		}
+		
+		if(!rs){
+			layer.alert('数据完整性校验失败，请检查输入项', {icon: 2, title: '操作失败',  shift: 5});    
+		}
+		return rs;
+	}
 }();
 </script>
 \ No newline at end of file