Merge remote-tracking branch 'origin/moly'

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

@@ -756,9 +756,9 @@
         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 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>
+            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]));
+            dimKpiSelected.push(Number(id_name.split("&")[0]));
         }
         // 指标项中 去除 已添加指标 已有的指标
         $("input[name='dimKpiCheck']").each(function (e) {
@@ -795,7 +795,7 @@
         $("input[name='dimKpiCheck']").each(function (e) {
             if ($(this).attr("checked")) {
                 //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;
+                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

@@ -580,7 +580,7 @@
                 var dimKpiHadCheckId = Number($(this).attr("id").split("_")[1]);
                 var dimKpiHadCheckCode = $(this).attr("title");
                 var dimKpiHadCheckName = $(this).next().text();
-                arr.push(dimKpiHadCheckId+"_"+dimKpiHadCheckName+"_"+dimKpiHadCheckCode);
+                arr.push(dimKpiHadCheckId+"&"+dimKpiHadCheckName+"&"+dimKpiHadCheckCode);
             }
         });
         return arr;
@@ -754,7 +754,7 @@
         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 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>
+            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")) {