Skip to content

C
cmszMonitorAnalysis
Commit 4a7df7e1 authored by 莫林毅's avatar 莫林毅
Browse files
Options

监控运营 ->告警关联诊断 '创建'&'修改'关联配置 界面

修改 '数值控制' bug
parent a1e0ac68
Show whitespace changes
Inline Side-by-side
Showing with 55 additions and 54 deletions
src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java
View file @ 4a7df7e1
...@@ -137,7 +137,6 @@ public class AssociateDiagosisDetailController { ...@@ -137,7 +137,6 @@ public class AssociateDiagosisDetailController {
format.parse(warnEndTime); format.parse(warnEndTime);
} catch (Exception e) { } catch (Exception e) {
e.getMessage(); e.getMessage();
System.out.println(e.getMessage());
return str; return str;
} }
List<AssociateDiagosisDetail> diagosisDetails = associateDiagosisDetailService. List<AssociateDiagosisDetail> diagosisDetails = associateDiagosisDetailService.
...@@ -192,8 +191,7 @@ public class AssociateDiagosisDetailController { ...@@ -192,8 +191,7 @@ public class AssociateDiagosisDetailController {
findXcdWorkingOrderInfoByEventHappenTimeAndBusinessRecoveryTimeAndProvinceId(eventHappenTime,businessRecoveryTime,provinceId); findXcdWorkingOrderInfoByEventHappenTimeAndBusinessRecoveryTimeAndProvinceId(eventHappenTime,businessRecoveryTime,provinceId);
List<XcdChangeOrder> xcdChangeOrders=xcdChangeOrderDao. List<XcdChangeOrder> xcdChangeOrders=xcdChangeOrderDao.
findXcdChangeOrderListByChangeStartTimeAndChangeEndTimeAndProvinceId(eventHappenTime,businessRecoveryTime,provinceId); findXcdChangeOrderListByChangeStartTimeAndChangeEndTimeAndProvinceId(eventHappenTime,businessRecoveryTime,provinceId);
System.out.println("xcdChangeOrders len ="+xcdChangeOrders.size());
System.out.println("xcdWorkingOrderInfos len ="+xcdWorkingOrderInfos.size());
map.put("xcdWorkingOrderInfos",xcdWorkingOrderInfos); map.put("xcdWorkingOrderInfos",xcdWorkingOrderInfos);
map.put("xcdChangeOrders",xcdChangeOrders); map.put("xcdChangeOrders",xcdChangeOrders);
......
src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisConfiguration.jsp
View file @ 4a7df7e1
...@@ -100,12 +100,7 @@ ...@@ -100,12 +100,7 @@
data-placement="bottom"></span> data-placement="bottom"></span>
</div> </div>
<%--<div class="bt-list-import">
<a href="#" id="downloadEecel" class="">
<span class="glyphicon glyphicon-import"></span>
<span class="glyphicon-class">导出Excel</span>
</a>
</div>--%>
</div> </div>
<div class="row"> <div class="row">
......
src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp
View file @ 4a7df7e1
...@@ -383,8 +383,8 @@ ...@@ -383,8 +383,8 @@
//修改一条参数 //修改一条参数
function updateRow(e) { function updateRow(e) {
var pro = prompt("请输入", $(e).parent().prev()[0].innerHTML);
var initK = Number($(e).parent().prev()[0].innerHTML); var initK = Number($(e).parent().prev()[0].innerHTML);
var pro = prompt("请输入 0~"+initK, $(e).parent().prev()[0].innerHTML);
pro = $.trim(pro); pro = $.trim(pro);
if ($.isNumeric(pro)) { if ($.isNumeric(pro)) {
pro = parseFloat(pro); pro = parseFloat(pro);
...@@ -392,21 +392,27 @@ ...@@ -392,21 +392,27 @@
if (pro > 0) { if (pro > 0) {
if (initK >= pro) { if (initK >= pro) {
$(e).parent().prev()[0].innerHTML = parseFloat(pro); $(e).parent().prev()[0].innerHTML = parseFloat(pro).toFixed(2);
sumkpiWeightTdVal -= initK; sumkpiWeightTdVal -= initK;
sumkpiWeightTdVal += pro; sumkpiWeightTdVal += pro;
var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2); var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
$("#kpiWeightTd").val(maxV); $("#kpiWeightTd").val(maxV === '0.00'?'':maxV);
} else { }
else {
var k = sumkpiWeightTdVal - initK + pro; var k = sumkpiWeightTdVal - initK + pro;
if (k <= 1.00) { if (k <= 1.00) {
$(e).parent().prev()[0].innerHTML = parseFloat(pro); $(e).parent().prev()[0].innerHTML = parseFloat(pro).toFixed(2);
sumkpiWeightTdVal -= initK; sumkpiWeightTdVal -= initK;
sumkpiWeightTdVal += pro; sumkpiWeightTdVal += pro;
var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2); var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
$("#kpiWeightTd").val(maxV); $("#kpiWeightTd").val(maxV === '0.00'?'':maxV);
}else{
$.alert("输入值过大，请输入0~"+initK);
} }
} }
}else{
$.alert("请输入 大于 0 的值");
} }
} }
} }
...@@ -415,7 +421,7 @@ ...@@ -415,7 +421,7 @@
function deleteRow(e) { function deleteRow(e) {
var v = $(e).parent().prev().text(); var v = $(e).parent().prev().text();
sumkpiWeightTdVal = sumkpiWeightTdVal - v; sumkpiWeightTdVal = sumkpiWeightTdVal - v;
$("#kpiWeightTd").val((1.00 - sumkpiWeightTdVal).toFixed(2)); $("#kpiWeightTd").val((1.00 - sumkpiWeightTdVal) === 0?'':parseFloat(1.00 - sumkpiWeightTdVal).toFixed(2));
var id = Number(e.title); var id = Number(e.title);
dimKpiSelected.splice($.inArray(id, dimKpiSelected), 1); dimKpiSelected.splice($.inArray(id, dimKpiSelected), 1);
$(e).parent().parent().remove(); $(e).parent().parent().remove();
...@@ -442,8 +448,11 @@ ...@@ -442,8 +448,11 @@
//form表单提交 //form表单提交
$("#modelSubmit").click(function () { $("#modelSubmit").click(function () {
//sumkpiWeightTdVal=sumkpiWeightTdVal.toFixed(2); /*sumkpiWeightTdVal=sumkpiWeightTdVal.toFixed(2);
sumkpiWeightTdVal = parseFloat(2); sumkpiWeightTdVal =parseFloat(sumkpiWeightTdVal);*/
// alert("sumkpiWeightTdVal "+sumkpiWeightTdVal);
// alert("sumkpiWeightTdVal "+typeof sumkpiWeightTdVal);
// return;
if (sumkpiWeightTdVal < 1.00) { if (sumkpiWeightTdVal < 1.00) {
$.alert("权限总和需 为 1"); $.alert("权限总和需 为 1");
return; return;
...@@ -633,7 +642,7 @@ ...@@ -633,7 +642,7 @@
// 业务 复选框 点击事件 // 业务 复选框 点击事件
function BusinessCheckClick() { function BusinessCheckClick() {
//$("#dimKpiListTd").empty();
// 重置 指标 一栏 筛选保留原有的 和已选择的 指标 // 重置 指标 一栏 筛选保留原有的 和已选择的 指标
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if (!$(this).attr("checked")) { if (!$(this).attr("checked")) {
...@@ -731,12 +740,14 @@ ...@@ -731,12 +740,14 @@
var kpiWeightTdVal = $.trim($("#kpiWeightTd").val()); var kpiWeightTdVal = $.trim($("#kpiWeightTd").val());
if (kpiWeightTdVal == "" || kpiWeightTdVal == 0) { if (kpiWeightTdVal == "" || kpiWeightTdVal == 0) {
$.alert("权重不能为空"); $.alert("权重不能为空");
var mmm_1 = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
$("#kpiWeightTd").val(mmm_1 === '0.00'?'':mmm_1);
return; return;
} }
if (kpiWeightTdVal < 0) { if (kpiWeightTdVal < 0) {
$.alert("权重不能为负"); $.alert("权重不能为负");
var mmm = (1 - Number(sumkpiWeightTdVal)).toFixed(2); var mmm = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
$("#kpiWeightTd").val(mmm); $("#kpiWeightTd").val(mmm === '0.00'?'':mmm);
return; return;
} }
if (kpiWeightTdVal > 1.00) { if (kpiWeightTdVal > 1.00) {
...@@ -761,6 +772,7 @@ ...@@ -761,6 +772,7 @@
var arrDimKpiidAndNameChecked = getArrDimKpiidAndNameChecked(); var arrDimKpiidAndNameChecked = getArrDimKpiidAndNameChecked();
//向 已添加指标 添加 //向 已添加指标 添加
kpiWeightTdVal=Number(kpiWeightTdVal).toFixed(2);
for (var i = 0; i < arrDimKpiidAndNameChecked.length; i++) { for (var i = 0; i < arrDimKpiidAndNameChecked.length; i++) {
var id_name = arrDimKpiidAndNameChecked[i]; var id_name = arrDimKpiidAndNameChecked[i];
var addRow = $("<tr class='" + id_name.split("_")[0] + "_" + kpiWeightTdVal + "'><td>" + id_name.split("_")[1] + "</td><td>" + kpiWeightTdVal + "</td><td><a href='javascript:;' title='" + id_name.split("_")[0] + "' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>"); var addRow = $("<tr class='" + id_name.split("_")[0] + "_" + kpiWeightTdVal + "'><td>" + id_name.split("_")[1] + "</td><td>" + kpiWeightTdVal + "</td><td><a href='javascript:;' title='" + id_name.split("_")[0] + "' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
...@@ -779,11 +791,9 @@ ...@@ -779,11 +791,9 @@
} }
}); });
//sumkpiWeightTdVal+=Number(kpiWeightTdVal);
sumkpiWeightTdVal += tt; sumkpiWeightTdVal += tt;
var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2); var maxV = 1 - Number(sumkpiWeightTdVal);
$("#kpiWeightTd").val(maxV); $("#kpiWeightTd").val(maxV === 0?'':maxV.toFixed(2));
//$("#kpiWeightTd").attr("max",maxV);
}); });
dimKpiSelected = new Array(); dimKpiSelected = new Array();
...@@ -797,14 +807,7 @@ ...@@ -797,14 +807,7 @@
return anainfoShallSaveArr; return anainfoShallSaveArr;
} }
/*curTotlakpiWeigh=0.00;
function getCurTotlakpiWeight(){
$("#addTr").find("tr").each(function(){
var weight=$(this).children().eq(1);
alert('weight'+weight);
alert('type weight'+typeof weight);
});
}*/
// 获取勾选指标的 数据 格式 id_名称 // 获取勾选指标的 数据 格式 id_名称
function getArrDimKpiidAndNameChecked() { function getArrDimKpiidAndNameChecked() {
......
src/main/webapp/WEB-INF/views/MonitorOperation/UpdateAnaInfo.jsp
View file @ 4a7df7e1
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
$("#updateAnaInf").click(function () {//跟新指标按钮 $("#updateAnaInf").click(function () {//跟新指标按钮
$(this).hide(); $(this).hide();
// $("#kpiWeightTd").val(1-Number(sumkpiWeightTdVal)); // $("#kpiWeightTd").val(1-Number(sumkpiWeightTdVal));
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat(1-sumkpiWeightTdVal).toFixed(2));
$("#tr_id_dimkpi").show(); $("#tr_id_dimkpi").show();
$("#tr_id_weight").show(); $("#tr_id_weight").show();
$("#addAnaInfo").show(); $("#addAnaInfo").show();
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
var jsonDa = eval('(' + data + ')'); var jsonDa = eval('(' + data + ')');
var strcheckBox = ""; var strcheckBox = "";
for (var i = 0; i < jsonDa.length; i++) { for (var i = 0; i < jsonDa.length; i++) {
var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + " value='" + jsonDa[i].businessId + "'/><font>" + jsonDa[i].businessName + "</font>" ; var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + "' value=" + jsonDa[i].businessId + "'/><font>" + jsonDa[i].businessName + "</font>" ;
strcheckBox += strInput; strcheckBox += strInput;
} }
...@@ -436,7 +436,6 @@ ...@@ -436,7 +436,6 @@
} }
}); });
}, },
okValue: "确定", okValue: "确定",
cancel: function () { cancel: function () {
...@@ -553,7 +552,7 @@ ...@@ -553,7 +552,7 @@
if(arrdimKpiChecked.indexOf(jsonDa[i].kpiId) >= 0){ if(arrdimKpiChecked.indexOf(jsonDa[i].kpiId) >= 0){
continue; continue;
} }
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); $("#dimKpiListTd").append(strInput);
} }
} }
...@@ -629,7 +628,7 @@ ...@@ -629,7 +628,7 @@
var jsonDa = eval('(' + data + ')'); var jsonDa = eval('(' + data + ')');
var strcheckBox = ""; var strcheckBox = "";
for (var i = 0; i < jsonDa.length; i++) { for (var i = 0; i < jsonDa.length; i++) {
var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + " value='" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName; var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + "' value=" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
strcheckBox += strInput; strcheckBox += strInput;
} }
$("#businessActivedListTd").append(strcheckBox); $("#businessActivedListTd").append(strcheckBox);
...@@ -672,7 +671,7 @@ ...@@ -672,7 +671,7 @@
var jsonDa = eval('(' + data + ')'); var jsonDa = eval('(' + data + ')');
var strcheckBox = ""; var strcheckBox = "";
for (var i = 0; i < jsonDa.length; i++) { for (var i = 0; i < jsonDa.length; i++) {
var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + " value='" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName; var strInput = "<input type='checkbox' id=BusinessCheck_" + jsonDa[i].businessId + " name='BusinessCheck' onClick='BusinessCheckClick()' class='provinceDetail' title='" + jsonDa[i].businessName + "' value=" + jsonDa[i].businessId + "'/>" + jsonDa[i].businessName;
strcheckBox += strInput; strcheckBox += strInput;
} }
$("#businessActivedListTd").append(strcheckBox); $("#businessActivedListTd").append(strcheckBox);
...@@ -685,14 +684,13 @@ ...@@ -685,14 +684,13 @@
function deleteRow(e) { function deleteRow(e) {
var initK=Number($(e).parent().prev()[0].innerHTML).toFixed(2); var initK=Number($(e).parent().prev()[0].innerHTML).toFixed(2);
sumkpiWeightTdVal-=initK; sumkpiWeightTdVal-=initK;
// $("#kpiWeightTd").val(1-Number(sumkpiWeightTdVal)); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)).toFixed(2));
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
$(e).parent().parent().remove(); $(e).parent().parent().remove();
} }
// sumkpiWeightTdVal=1.00; // sumkpiWeightTdVal=1.00;
function updateRow(e){ function updateRow(e){
var initK=Number($(e).parent().prev()[0].innerHTML).toFixed(2); var initK=Number($(e).parent().prev()[0].innerHTML).toFixed(2);
var pro=prompt("请输入",$(e).parent().prev()[0].innerHTML); var pro=prompt("请输入 0~"+initK,$(e).parent().prev()[0].innerHTML);
pro=$.trim(pro); pro=$.trim(pro);
if($.isNumeric(pro)){ if($.isNumeric(pro)){
pro=Number(pro); pro=Number(pro);
...@@ -700,13 +698,16 @@ ...@@ -700,13 +698,16 @@
var k=sumkpiWeightTdVal-initK; var k=sumkpiWeightTdVal-initK;
k=k+pro; k=k+pro;
if(k <= 1.00){ if(k <= 1.00){
$(e).parent().prev()[0].innerHTML=parseFloat(pro); $(e).parent().prev()[0].innerHTML=pro.toFixed(2);
// alert("---"+pro.toFixed(2));
sumkpiWeightTdVal-=initK; sumkpiWeightTdVal-=initK;
sumkpiWeightTdVal+=pro; sumkpiWeightTdVal+=pro;
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)).toFixed(2));
//$("#kpiWeightTd").text((1-Number(sumkpiWeightTdVal)).toFixed(2)); }else{
$.alert("输入值过大，请输入0~"+initK);
} }
}else{
$.alert("请输入 大于 0 的值");
} }
} }
...@@ -722,14 +723,18 @@ ...@@ -722,14 +723,18 @@
} }
id_kpiWeightTd_value=getValueBykpiWeightTd(); id_kpiWeightTd_value=getValueBykpiWeightTd();
if(id_kpiWeightTd_value == 0){ if(id_kpiWeightTd_value == 0||isNaN(id_kpiWeightTd_value)){
$.alert("权值不能为空"); $.alert("权值不能为空 或 0");
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
return; return;
} }
if(id_kpiWeightTd_value <0){
$.alert("权值不能 小于 0");
return;
}
//id_kpiWeightTd_value=Number(id_kpiWeightTd_value);
var curm01=0.00; var curm01=0.00;
for(var jj=0;jj<arrdimKpiChecked.length;jj++){ for(var jj=0;jj<arrdimKpiChecked.length;jj++){
curm01+=Number(id_kpiWeightTd_value); curm01+=Number(id_kpiWeightTd_value);
...@@ -739,22 +744,22 @@ ...@@ -739,22 +744,22 @@
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
return; return;
} }
id_kpiWeightTd_value=id_kpiWeightTd_value.toFixed(2);
var kpiId_Name=getkpiid_NameOfNamedimKpiCheck(); var kpiId_Name=getkpiid_NameOfNamedimKpiCheck();
for(var i=0;i<kpiId_Name.length;i++){ for(var i=0;i<kpiId_Name.length;i++){
var id_name=kpiId_Name[i]; var id_name=kpiId_Name[i];
var addRow = $("<tr class='"+id_name.split("_")[0]+"' id='dimKpiCheck_"+id_name.split("_")[0]+"'><td>"+id_name.split("_")[1]+"</td><td>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>"); //alert("id_name "+id_name);
var addRow = $("<tr class='"+id_name.split("_")[0]+"' id='dimKpiCheck_"+id_name.split("_")[0]+"'><td>"+id_name.split("_")[1].split(" ")[0]+"</td><td>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;<a href='javascript:;' onclick='updateRow(this)'>修改</a></td></tr>");
$("#addTr").append(addRow); $("#addTr").append(addRow);
$("input[name='dimKpiCheck']").each(function (e) { $("input[name='dimKpiCheck']").each(function (e) {
if ($(this).attr("checked")) { if ($(this).attr("checked")) {
$(this).next().remove(); $(this).next().remove();
$(this).remove(); $(this).remove();
} }
}); });
} }
sumkpiWeightTdVal=curm01+Number(sumkpiWeightTdVal); sumkpiWeightTdVal=curm01+Number(sumkpiWeightTdVal);
$("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))); $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2))===0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
}); });
......
src/main/webapp/static/js/associatediagosisconfiguration.js
View file @ 4a7df7e1
...@@ -244,7 +244,7 @@ table_pagging.prototype={ ...@@ -244,7 +244,7 @@ table_pagging.prototype={
if(k==4){ if(k==4){
var items=this.getData(this.objectlist[i],this.header[k][1]); var items=this.getData(this.objectlist[i],this.header[k][1]);
// alert(items); // alert(items);
tdContext="<a name='"+this.getData(this.objectlist[i],this.header[0][1])+"' onclick='aClick(this)'>详情</a>"; tdContext="<a name='"+this.getData(this.objectlist[i],this.header[0][1])+"' onclick='aClick(this)'>详-情</a>";
} }
} else { } else {
......
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