浏览代码

小数点保留一位(3694)

zhangxc 5 年之前
父节点
当前提交
cc7c82c769
共有 3 个文件被更改,包括 41 次插入11 次删除
  1. 17 4
      src/css/index.less
  2. 11 6
      src/js/itemManager.js
  3. 13 1
      src/js/moduleManager.js

+ 17 - 4
src/css/index.less

@@ -220,8 +220,8 @@
     left: 50%;
     top: 50%;
     width: 400px;
-    height:208px;
-    margin: -104px 0 0 -200px;
+    height:236px;
+    margin: -118px 0 0 -200px;
     background: #fff;
     border-radius:4px;
   }
@@ -263,11 +263,18 @@
     right: 0;
     cursor: pointer;
   }
- 
+  .itemMsgInfoTips{
+    color: red;
+    font-size: 14px;
+    text-align: center;
+    display: none;
+    position: absolute;
+    width: 100%;
+  }
   .midifyMsgBtn{
     position: relative;
     text-align: center;
-    top: 15px;
+    top: 36px;
   }
   .midifyEdit{
     display: inline-block;
@@ -333,6 +340,12 @@
     text-align: right;
     color: #777;
   }
+  .itemMsgInfoTips{
+    color: red;
+    font-size: 14px;
+    text-align: center;
+    display: none;
+  }
   .switchImg{
     position: relative;
     top: 2px;

+ 11 - 6
src/js/itemManager.js

@@ -143,7 +143,7 @@ function editItem(item,activePage){
                     <div class="itemMsgInfoBox"><span class="itemMsgLab">单项否决:</span><span class="itemInfoRight itemReject">${item.isReject == '1' ? `<img class="switchImg" src=${switchIconOpen} />`:`<img class="switchImg" src=${switchIconClose} />`}</span></div>
                     <div class="itemMsgInfoBox"><span class="itemMsgLab">启用:</span><span class=" temInfoRight itemUsed">${item.isUsed == '1' ? `<img class="switchImg" src=${switchIconOpen} />`:`<img class="switchImg" src=${switchIconClose} />`}</span></div>
                 </div>
-                
+                <div  class="itemMsgInfoTips">分值小数点后最多保留一位!</div>
                 <div class="confirmEditBox"><span class="confirmEdit">保存</span></div>
             </div>
         </div>
@@ -158,7 +158,7 @@ function editItem(item,activePage){
         itemCpoy.msg = val
     })
     $("#mainBox .itemMsgBox .itemScore", parent.document).on("keypress", function(e){
-        return (/[[0-9]\.]/.test(String.fromCharCode(event.keyCode)))
+        return (/[0-9\.]/.test(String.fromCharCode(e.keyCode)))
     })
     $("#mainBox .itemMsgBox .itemScore", parent.document).on("input", function(e){
         const val = $(this).val()
@@ -176,13 +176,18 @@ function editItem(item,activePage){
     })
     
     $("#mainBox .itemMsgBox .confirmEdit", parent.document).on("click", function(){
-        var reg = new RegExp(/^\d{1,2}(\.\d)?$/);
+        var reg = new RegExp(/^\d+(\.\d)?$/);
         if(reg.test(itemCpoy.score)){
-            console.lohg('aaaaaaaaaaaaaa')
+            saveEdit(itemCpoy,activePage)
+            $("#mainBox .itemMsgBox .itemMsgInfoTips", parent.document).css("display","none")
+            $('#mainBox .itemMsgBox', parent.document).remove()
             return 
+        }else{
+            $("#mainBox .itemMsgBox .itemMsgInfoTips", parent.document).css("display","block")
+            
+            return
         }
-        saveEdit(itemCpoy,activePage)
-        $('#mainBox .itemMsgBox', parent.document).remove()
+      
     })
    
     

+ 13 - 1
src/js/moduleManager.js

@@ -106,6 +106,7 @@ function midifyMsgBox(item){
             <p class="midifyMsgTitle">修改 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
             <div class="itemMsgInfoBox"><span class="itemMsgLab">模块名称:</span> <span class="itemInfoRight">${itemCopy.name}</span></div>
             <div class="itemMsgInfoBox"><span class="itemMsgLab">分值:</span> <span class="itemInfoRight"> <input class="itemScore" type="number" min="0" value=${itemCopy.score} /></span></div>
+            <div  class="itemMsgInfoTips">分值小数点后最多保留一位!</div>
             <div class="midifyMsgBtn">
                 <span class="midifyEdit">保存</span>
             </div>
@@ -123,7 +124,18 @@ function midifyMsgBox(item){
        itemCopy.score = val
     })
     $("#mainBox .midifyMsgBox .midifyEdit", parent.document).on("click", function(e){
-        saveModifyOne(itemCopy)
+        var reg = new RegExp(/^\d+(\.\d)?$/);
+        if(reg.test(itemCopy.score)){
+            saveModifyOne(itemCopy)
+            $("#mainBox .midifyMsgBox .itemMsgInfoTips", parent.document).css("display","none")
+            $("#mainBox .midifyMsgBox", parent.document).remove()
+            return 
+        }else{
+            $("#mainBox .midifyMsgBox .itemMsgInfoTips", parent.document).css("display","block")
+            
+            return
+        }
+        
         $("#mainBox .midifyMsgBox", parent.document).remove()
     })
 }