Skip to content

C
cmszMonitorAnalysis
Commit a00e2703 authored by 胡斌's avatar 胡斌
Browse files
Options

Merge remote-tracking branch 'origin/moly'

parents c18b9c9e c7cfe40d
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 14 deletions
src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp
View file @ a00e2703
......@@ -267,8 +267,10 @@
var detailtime=getPeriodString();
if(detailtime == "" || detailtime == null||detailtime.length <2){
$.alert("时间范围不能为空");
return ;
}else if(detailProvinceSum==0) {
$.alert("省份的选择不能为空");
return ;
}else{
var detailProvince = getDetailProvinceCheckedValueString();
var dimension=getDetailCheckeddDimension();
......
src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp
View file @ a00e2703
......@@ -63,11 +63,9 @@
<tr>
<td>省份：</td>
<td>
<%--<select class="form-control" name="proviceTd" id="proviceTd" >
<c:forEach var="provice" items="${proviceList}">
<option value="${provice.provinceId}">${provice.provinceName}</option>
</c:forEach>
</select>--%>
<div class="checkbox-inline">
<input type="checkbox" name="" id="provinceDetailAll" title="" value="" />全选
</div>
<c:forEach var="provice" items="${proviceList}">
<div class="checkbox-inline">
<label>
......@@ -213,6 +211,19 @@
}
});
//全选和不全选所有的省
$("#provinceDetailAll").click(function () {
if($("#provinceDetailAll").attr("checked") == "checked"){//全选
$("provinceDetail").attr("checked","checked");
$("input[name='provinceDetail']").attr("checked","checked");
}else{//不全选
$("input[name='provinceDetail']").attr("checked",false);
$("input[name='provinceDetail']").attr("disabled",false);
}
});
//模型名称是否重复判断
var isDouble = true;
$("#dataModelName").blur(function(){
......@@ -377,6 +388,7 @@
var kpiWeightTdV=$("#kpiWeightTd").val();
$("#modelSubmit").attr("disabled","disabled");
$.ajax({
type : 'GET',
async : true,
......@@ -473,7 +485,7 @@
// var jsonDa=data;
var strcheckBox="";
for(var i=0;i<jsonDa.length;i++){
var strInput="<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_"+jsonDa[i].businessId+" name='BusinessCheck' class='provinceDetail' title='"+jsonDa[i].businessName+" value='"+jsonDa[i].businessId+"'/>"+jsonDa[i].businessName;
var strInput="<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_"+jsonDa[i].businessId+" name='BusinessCheck' class='provinceDetail' title='"+jsonDa[i].businessName+"' value='"+jsonDa[i].businessId+"'/>"+jsonDa[i].businessName;
strcheckBox+=strInput;
}
$("#businessActivedListTd").append(strcheckBox);
......@@ -523,7 +535,7 @@
var jsonDa=eval('('+data+')');
var strcheckBox="";
for(var i=0;i<jsonDa.length;i++){
var strInput="<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_"+jsonDa[i].businessId+" name='BusinessCheck' class='provinceDetail' title='"+jsonDa[i].businessName+" value='"+jsonDa[i].businessId+"'/>"+jsonDa[i].businessName;
var strInput="<input type='checkbox' onClick='BusinessCheckClick()' id=BusinessCheck_"+jsonDa[i].businessId+" name='BusinessCheck' class='provinceDetail' title='"+jsonDa[i].businessName+"' value='"+jsonDa[i].businessId+"'/>"+jsonDa[i].businessName;
strcheckBox+=strInput;
}
$("#businessActivedListTd").append(strcheckBox);
......@@ -568,7 +580,7 @@
for(var i=0;i<jsonDa.length;i++){
if($.inArray(jsonDa[i].kpiId,dimKpiSelected) < 0){
var strInput="<input type='checkbox' id=dimKpiCheck_"+jsonDa[i].kpiId+" name='dimKpiCheck' class='provinceDetail' title='"+jsonDa[i].name+"' value='"+jsonDa[i].kpiId+"'/><font>"+jsonDa[i].name+"</font>";
var strInput="<input type='checkbox' id=dimKpiCheck_"+jsonDa[i].kpiId+" name='dimKpiCheck' class='provinceDetail' title='"+jsonDa[i].name+" "+jsonDa[i].code+"' value='"+jsonDa[i].kpiId+"'/><font>"+jsonDa[i].name+"</font>";
$("#dimKpiListTd").append(strInput);
}
......@@ -685,7 +697,7 @@
var arrDimKpiChecked=[];
$("input[name='dimKpiCheck']").each(function(e){
if($(this).attr("checked")){
var id_name=$(this).context.id.split("_")[1]+"_"+$(this).context.title;
var id_name=$(this).context.id.split("_")[1]+"_"+$(this).context.title.split(" ")[0];
arrDimKpiChecked.push(id_name);
}
});
......
src/main/webapp/WEB-INF/views/MonitorOperation/UpdateAnaInfo.jsp
View file @ a00e2703
......@@ -82,7 +82,7 @@
<form action="#" class="form-horizontal" id="modelMaintainForm" method="post"
enctype="multipart/form-data">
<table id="modelMaintainTable" class="table-null">
<input type="text" id="associationId" value="${anaInfo.associationId}">
<input type="hidden" id="associationId" value="${anaInfo.associationId}">
<input type="hidden" id="dimKpiSelectedList" value="${dimKpiSelectedList}">
<tr>
<td>省份：</td>
......@@ -243,7 +243,7 @@
</div>
</div>
</div>
${anaInfo}
<%--${anaInfo}--%>
<script type="text/javascript">
......
src/main/webapp/static/js/associatediagosisdetail.js
View file @ a00e2703
......@@ -8,9 +8,9 @@ function initTable(){
header[2] = ["结束时间","failureTitle","10%","16"];
header[3] = ["省份","provinceName","5%",""];
header[4] = ["类型","channelName","8%",""];
header[5] = ["名称告警个数","dataSourceName","8%",""];
header[6] = ["异常种类","warningSourceName","8%",""];
header[7] = ["商标告警明细","providerName","8%",""];
header[5] = ["名称","dataSourceName","8%",""];
header[6] = ["告警个数","warningSourceName","8%",""];
header[7] = ["指标告警明细","providerName","8%",""];
/*header[8] = ["发生时间","happenTime","10%",""];
header[9] = ["结束时间","closeTime","10%",""];
header[10] = ["详细原因","failureReason","14%","20"];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment