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

src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisConfiguration.jsp

@@ -106,7 +106,7 @@
                                     <div class="row">
                                         <div class="col-xs-12">
                                             <div class="table-header">
-                                                关联诊断结果查询
+                                                关联诊断配置查询
                                                 <shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
                                                     <div id="time_div"
                                                          style="top: -6px;float: right;height: 0px;position: relative;">

src/main/webapp/WEB-INF/views/MonitorOperation/AssociateDiagosisDetail.jsp

@@ -134,7 +134,7 @@
                                     <div class="row">
                                         <div class="col-xs-12">
                                             <div class="table-header">
-                                                关联诊断结果查询
+                                                关联诊断明细查询
                                             </div>
                                             <!--写故障明细列表处-->
                                             <table class="table table-hover table-striped"

src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp

@@ -517,7 +517,7 @@
 
                 var jsonDa = eval('(' + data + ')');
                 for (var i = 0; i < jsonDa.length; i++) {
-                    var strInput = "<input type='checkbox' id=dimKpiCheck_" + jsonDa[i].kpiId + " name='dimKpiCheck' class='provinceDetail' title='" + jsonDa[i].name + " value='" + jsonDa[i].kpiId + "'>" + jsonDa[i].name + "</input>";
+                    var strInput = "<input type='checkbox' id=dimKpiCheck_" + jsonDa[i].kpiId + " name='dimKpiCheck' class='provinceDetail' title='" + jsonDa[i].name + " value='" + jsonDa[i].kpiId + "'><span>" + jsonDa[i].name + "</span>";
                     $("#dimKpiListTd").append(strInput);
                 }
             }
@@ -656,7 +656,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 + "  " + jsonDa[i].code + "' 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].code + "' value='" + jsonDa[i].kpiId + "'/><font>" + jsonDa[i].name + "</font>";
                         $("#dimKpiListTd").append(strInput);
                     }
 
@@ -756,7 +756,7 @@
         kpiWeightTdVal=parseFloat(Number(kpiWeightTdVal).toFixed(2));
         for (var i = 0; i < arrDimKpiidAndNameChecked.length; i++) {
             var id_name = arrDimKpiidAndNameChecked[i];
-            var addRow = $("<tr class='" + id_name.split("_")[0] + "_" + kpiWeightTdVal + "'><td>" + id_name.split("_")[1] + "</td><td style='display:none;'>" + kpiWeightTdVal + "</td><td><a href='javascript:;' title='" + id_name.split("_")[0] + "' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
+            var addRow = $("<tr class='" + id_name.split("_")[0] + "_" + kpiWeightTdVal + "'><td title="+id_name.split("_")[2]+">" + id_name.split("_")[1] + "</td><td style='display:none;'>" + kpiWeightTdVal + "</td><td><a href='javascript:;' title='" + id_name.split("_")[0] + "' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
             $("#addTr").append(addRow);
             dimKpiSelected.push(Number(id_name.split("_")[0]));
         }
@@ -765,7 +765,6 @@
 
             var id = Number($(this).context.id.split("_")[1]);
 
-
             if ($.inArray(id, dimKpiSelected) >= 0) {
                 $(this).next().remove();
                 $(this).remove();
@@ -795,7 +794,9 @@
         var arrDimKpiChecked = [];
         $("input[name='dimKpiCheck']").each(function (e) {
             if ($(this).attr("checked")) {
-                var id_name = $(this).context.id.split("_")[1] + "_" + $(this).context.title.split("  ")[0];
+                //var id_name = $(this).context.id.split("_")[1] + "_" + $(this).context.title.split("  ")[0]+"_"+$(this).context.title.split("  ")[1];
+                var id_name = $(this).context.id.split("_")[1] + "_" + $(this).next().text()+"_"+$(this).context.title;
+
                 arrDimKpiChecked.push(id_name);
             }
         });

src/main/webapp/WEB-INF/views/MonitorOperation/UpdateAnaInfo.jsp

@@ -146,7 +146,7 @@
                                             <tbody id="addTr">
                                                 <c:forEach items="${dimKpiSelectedList}" var="dimKpi">
                                                     <tr class="${dimKpi.kpiId}"  id='dimKpiCheck_${dimKpi.kpiId}'>
-                                                        <td>${dimKpi.name}</td>
+                                                        <td title="${dimKpi.code}">${dimKpi.name}</td>
                                                         <c:forEach items="${anaInfo.items}" var="ite">
                                                             <c:if test="${ite.kpiId == dimKpi.kpiId}">
                                                                 <%--<td>${ite.kpiWeight}</td>--%>
@@ -555,7 +555,7 @@
                     if(arrdimKpiChecked.indexOf(jsonDa[i].kpiId) >= 0){
                         continue;
                     }
-                    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>";
+                    var strInput = "<input type='checkbox' id=dimKpiCheck_" + jsonDa[i].kpiId + " name='dimKpiCheck' class='provinceDetail' title='"+jsonDa[i].code+ "' value=" + jsonDa[i].kpiId + "'/><font>" + jsonDa[i].name + "</font>";
                     $("#dimKpiListTd").append(strInput);
                 }
             }
@@ -578,8 +578,9 @@
         $("input[name='dimKpiCheck']").each(function (e) {
             if ($(this).attr("checked")) {
                 var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]);
-                var dimKpiHadCheckName = $(this).attr("title");
-                arr.push(dimKpiHadCheckId+"_"+dimKpiHadCheckName);
+                var dimKpiHadCheckCode = $(this).attr("title");
+                var dimKpiHadCheckName = $(this).next().text();
+                arr.push(dimKpiHadCheckId+"_"+dimKpiHadCheckName+"_"+dimKpiHadCheckCode);
             }
         });
         return arr;
@@ -752,7 +753,8 @@
         var kpiId_Name=getkpiid_NameOfNamedimKpiCheck();
         for(var i=0;i<kpiId_Name.length;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].split(" ")[0]+"</td><td style='display: none'>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
+            //var addRow = $("<tr class='"+id_name.split("_")[0]+"' id='dimKpiCheck_"+id_name.split("_")[0]+"'><td title='"+id_name.split("_")[1].split(" ")[1]+"'>"+id_name.split("_")[1].split(" ")[0]+"</td><td style='display: none'>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
+            var addRow = $("<tr class='"+id_name.split("_")[0]+"' id='dimKpiCheck_"+id_name.split("_")[0]+"'><td title='"+id_name.split("_")[2]+"'>"+id_name.split("_")[1]+"</td><td style='display: none'>"+id_kpiWeightTd_value+"</td><td><a href='javascript:;' onclick='deleteRow(this)'>删除</a>&nbsp;&nbsp;</td></tr>");//<a href='javascript:;' onclick='updateRow(this)'>修改</a>
             $("#addTr").append(addRow);
             $("input[name='dimKpiCheck']").each(function (e) {
                 if ($(this).attr("checked")) {

src/main/webapp/static/js/associatediagosisconfiguration.js

@@ -5,7 +5,7 @@ function initTable(){
     var header = new Array();
 
     //provinceToArr();
-    header[0] = ["","associationId","1%",""];
+    header[0] = ["选择","associationId","1%",""];
     header[1] = ["省份","provinceId","10%",""];
     header[2] = ["维度","AssociationType","10%","16"];
     header[3] = ["描述","AssoicationDesc","5%",""];