Merge remote-tracking branch 'origin/moly'

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

@@ -388,6 +388,8 @@
             if (pro > 0) {
                 if (initK >= pro) {
                     $(e).parent().prev()[0].innerHTML = parseFloat(pro.toFixed(2));
+                    var clz=$(e).parent().parent().attr("class");
+                    $(e).parent().parent()[0].setAttribute("class",clz.substring(0,clz.lastIndexOf('_')+1)+parseFloat(pro.toFixed(2)));
                     sumkpiWeightTdVal -= parseFloat(initK.toFixed(2));
                     sumkpiWeightTdVal += parseFloat(pro.toFixed(2));
                     var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
@@ -397,6 +399,8 @@
                     var k = sumkpiWeightTdVal - initK + pro;
                     if (k <= 1.00) {
                         $(e).parent().prev()[0].innerHTML = parseFloat(pro.toFixed(2));//.toFixed(2);
+                        var clz=$(e).parent().parent().attr("class");
+                        $(e).parent().parent()[0].setAttribute("class",clz.substring(0,clz.lastIndexOf('_')+1)+parseFloat(pro.toFixed(2)));
                         sumkpiWeightTdVal -= parseFloat(initK.toFixed(2));
                         sumkpiWeightTdVal += parseFloat(pro.toFixed(2));
                         var maxV = (1 - Number(sumkpiWeightTdVal)).toFixed(2);
@@ -415,7 +419,7 @@
     //删除一条参数
     function deleteRow(e) {
         var v = $(e).parent().prev().text();
-        sumkpiWeightTdVal = sumkpiWeightTdVal - parseFloat(Number(v).toFixed(2));
+        sumkpiWeightTdVal = parseFloat((sumkpiWeightTdVal - parseFloat(Number(v).toFixed(2))).toFixed(2));
         $("#kpiWeightTd").val((1.00 - sumkpiWeightTdVal) === 0?'':parseFloat((1.00 - sumkpiWeightTdVal).toFixed(2)));
         var id = Number(e.title);
         dimKpiSelected.splice($.inArray(id, dimKpiSelected), 1);

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

@@ -235,7 +235,7 @@
                                             </button>
                                             <button type="button" id="updateAnaInfo" class="btn btn-primary">更新</button>
                                             <button type="reset" class="btn btn-default" id="modelReset">取消</button>
-                                            <button type="button" id="deleteAnaInfo" class="btn btn-danger">删除</button>
+                                            <%--<button type="button" id="deleteAnaInfo" class="btn btn-danger">删除</button>--%>
                                             <button type="reset" class="btn btn-warning" id="modelBack">返回</button>
                                         </td>
                                     </tr>
@@ -350,7 +350,7 @@
     // 更新
     $("#updateAnaInfo").click(function () {
 
-        $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
+        $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
 
         var kk=parseFloat((sumkpiWeightTdVal).toFixed(2));
         if( kk <1.00){
@@ -704,9 +704,7 @@
                 var k=sumkpiWeightTdVal-initK;
                 k=k+pro;
                 if(k <= 1.00){
-//                    $(e).parent().prev()[0].innerHTML=pro.toFixed(2);
                     $(e).parent().prev()[0].innerHTML=parseFloat(pro.toFixed(2));
-//                    alert("---"+pro.toFixed(2));
                     sumkpiWeightTdVal-=initK;
                     sumkpiWeightTdVal+=pro;
                     $("#kpiWeightTd").val(parseFloat((1-sumkpiWeightTdVal).toFixed(2)) === 0?'':parseFloat((1-sumkpiWeightTdVal).toFixed(2)));
@@ -755,7 +753,6 @@
         var kpiId_Name=getkpiid_NameOfNamedimKpiCheck();
         for(var i=0;i<kpiId_Name.length;i++){
             var id_name=kpiId_Name[i];
-            //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);
             $("input[name='dimKpiCheck']").each(function (e) {