Browse Source

Merge branch 'test' into dev_zxc

zhangxc 5 years ago
parent
commit
c4398d2932
2 changed files with 13 additions and 1 deletions
  1. 2 0
      src/css/qcScore.less
  2. 11 1
      src/js/qcScore.js

+ 2 - 0
src/css/qcScore.less

@@ -433,12 +433,14 @@
   margin-right: 30px;
   .slide-up{
     cursor: pointer;
+    color: #5A8EEE;
     &:before{
       display: inline-block;
       width: 14px;
       content: "-";
       font-size: 18px;
       color: #5A8EEE;
+      text-align: center;
     }
     &.down:before{
       content: "+";

+ 11 - 1
src/js/qcScore.js

@@ -228,7 +228,8 @@ function showModal(flag,code,i){
   //事件解绑
   $("#delModal .confirm").off("click");
   $("#qcScore,#qcMsg").off("input");
-  const info = global_flawData[global_activeTab][i];
+  const flawsList = formatFlawKeys(global_flawData);
+  const info = flawsList[global_activeTab][i];
   if(flag==='0'){   //修改
     $("#delModal .title").text("修改");
     $("#editTmpl").tmpl(info).appendTo("#delModal .modal-body");
@@ -267,6 +268,15 @@ function showModal(flag,code,i){
     });
   }
 }
+//缺陷列表key值去掉特殊符号
+function formatFlawKeys(data){
+    const obj = {};
+    for(let k in data){
+      obj[k.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'')]=data[k];
+    }
+    return obj;
+  }
+
 //更新缺陷列表
   function updateFlaws(info){
   $("#patientInfo .level").text("质控等级:"+info.level);