Merge remote-tracking branch 'origin/liuna'

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleConfiguration.jsp

@@ -105,7 +105,7 @@
 
 											</td>
 										</tr>
-										<tr><td>指标监控时间（<font color="red">必填</font>）：</td>
+										<tr><td>监控延迟时间（<font color="red">必填</font>）：</td>
 											<td>
 												<input type="text" style="width:200px" name="frequencyValue" id="frequencyValue" />
 												<select style="width:200px" name="frequencyType" id="frequencyType">
@@ -270,7 +270,7 @@
         //form表单提交
         $("#ruleSubmit").click(function(){
             if($.trim($("#frequencyValue").val())==""){
-                $.alert("指标监控时间不能为空");
+                $.alert("监控延迟时间不能为空");
             }else if($("#businessTime").val()==""){
                 $.alert("指标业务时间不能为空");
             }else if($("#ruleCrtTime").val()==""){

src/main/webapp/WEB-INF/views/AnalysisSupport/QualityRuleMaintain.jsp

@@ -100,7 +100,7 @@
 
 										</td>
 									</tr>
-									<tr><td>指标监控时间（<font color="red">必填</font>）：</td>
+									<tr><td>监控延迟时间（<font color="red">必填</font>）：</td>
 										<td>
 										<input type="text" name="frequencyValue" id="frequencyValue" style="display: inline;" />
 										<select name="frequencyType" id="frequencyType">
@@ -265,7 +265,7 @@ $("#addParam").click(function(){
 	//form表单提交
 	$("#ruleSubmit").click(function(){
 		if($.trim($("#frequencyValue").val())==""){
-			$.alert("指标监控时间不能为空");
+			$.alert("监控延迟时间不能为空");
 		}else if($("#businessTime").val()==""){
 			$.alert("指标业务时间不能为空");
 		}else if($("#ruleCrtTime").val()==""){

src/main/webapp/static/js/ruleOperationDetailTable.js

@@ -533,7 +533,7 @@ function selectRule(qualityRuleId){
             $.ajax({
                 type : 'GET',
                 contentType : 'application/json',
-                url: "/AnalysisSupport/QualityRuleOperation/findQuality?qualityRuleId="+qualityRuleId,
+                url: "${ctx}/AnalysisSupport/QualityRuleOperation/findQuality?qualityRuleId="+qualityRuleId,
                 dataType : 'text',
                 beforeSend: function(data) {
                 },

src/main/webapp/static/js/ruleResultDetailTable.js

@@ -136,7 +136,7 @@ function ruleResultDetailTable(){
 	 header[7] = ["指标编码","kpiCode","7%","15"];
 	 header[8] = ["数据类型","kpiTypeName","7%","15"];
 	 header[9] = ["数据采集频率","calCycle","7%","15"];
-	 header[10] = ["指标监控范围","kpiMonitorTime","7%","15"];
+	 header[10] = ["监控延迟时间","kpiMonitorTime","7%","15"];
 	 header[11] = ["指标采集时间","businessTime","7%","15"];
 	 header[12] = ["准确性规则","accuracyRuleId","7%","15"];
 	 
@@ -554,7 +554,7 @@ function selectRule(qualityRuleId){
             $.ajax({
                 type : 'GET',
                 contentType : 'application/json',
-                url: "/AnalysisSupport/QualityRuleResult/findAccuracy?qualityRuleId="+qualityRuleId,
+                url: "${ctx}/AnalysisSupport/QualityRuleResult/findAccuracy?qualityRuleId="+qualityRuleId,
                 dataType : 'text',
                 beforeSend: function(data) {
                 },