Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

# Conflicts:
#	src/js/qcScore.js

src/css/qcListDept.less

@@ -46,6 +46,24 @@ table{
         font-weight: 500;
         white-space: nowrap;
     }
+    th[code]{
+        cursor: pointer;
+        &:after{
+            content:"";
+            display:inline-block;
+            width: 11px;
+            height: 14px;
+            margin-left: 4px;
+            vertical-align: middle;
+            background: url("../images/grey.png");
+        }
+        &.asc:after{
+            background: url("../images/up_blue.png");
+        }
+        &.desc:after{
+            background: url("../images/down_blue.png");
+        }
+    }
     td{
         font-size: 14px;
         font-weight: 400;

src/css/qcListPerson.less

@@ -46,6 +46,24 @@ table{
         font-weight: 500;
         white-space: nowrap;
     }
+    th[code]{
+        cursor: pointer;
+        &:after{
+            content:"";
+            display:inline-block;
+            width: 11px;
+            height: 14px;
+            margin-left: 4px;
+            vertical-align: middle;
+            background: url("../images/grey.png");
+        }
+        &.asc:after{
+            background: url("../images/up_blue.png");
+        }
+        &.desc:after{
+            background: url("../images/down_blue.png");
+        }
+    }
     td{
         font-size: 14px;
         font-weight: 400;

src/css/qcScore.less

@@ -188,10 +188,15 @@
     }
     .info-item{
       border-bottom: 1px @borderColor solid;
-      .cont,.contP{
+      .cont{
         display: inline-block;
         min-width: 33%;
         margin-bottom: 15px;
+        box-sizing: border-box;
+        padding-left: 5px;
+        &.active{
+          background: #FFF0DA;
+        }
         span{
           line-height: 20px;
           vertical-align: middle;
@@ -219,9 +224,6 @@
           }
         }
       }
-      .contP{
-        display: block;
-      }
       &.cont-2 .cont{
         min-width: 48%;
       }
@@ -259,7 +261,7 @@
       /*margin-bottom: 20px;*/
       span{
         font-size: 16px;
-        margin-left: 20px;
+        margin-left: 15px;
       }
       a{
         float: right;
@@ -282,11 +284,19 @@
     }
     .flaw-item{
       display: none;
-      margin: 0 20px 10px 30px ;
+      margin: 0 20px 10px 12px ;
       border-bottom:1px #E2E5EF solid;
       padding-bottom: 10px;
+      p{
+        text-indent: 5px;
+      }
       .title{
         margin-bottom: 10px;
+        box-sizing: border-box;
+        padding-left: 5px;
+        &.active{
+          background: #FFF0DA;
+        }
       }
     }
   }
@@ -339,51 +349,6 @@
     }
   }
 }
-.wardRoundWrap {
-  .container {
-    .lineBlock {
-      line-height: 22px;
-      padding: 3px 0;
-      .lineTitle {
-        color:#333;
-        font-weight: bold;
-      }
-    }
-    .contentH4 {
-      margin-top: 15px ;
-      margin-bottom: 5px ;
-    }
-    .contentDetail {
-      padding-left: 15px;
-    }
-    .wardRound {
-      margin-right: 40px;
-      padding: 7px  0;
-      display: inline-block;
-      i {
-        font-weight: bold;
-        color: #333333;
-      }
-    }
-    .cont {
-      margin-bottom: 35px;
-      .wardRound-table {
-        border: 0 none;
-        td {
-          border: 0 none;
-          text-align: left;
-          padding-left: 0;
-          color: #333333;
-          padding: 0 8px 3px 0;
-        }
-        .tdFstTitle {
-          vertical-align: top;
-          font-weight: bold;
-        }
-      }
-    }
-  }
-}
 /*******手术知情同意书*********/
 .surgery-book{
   .book-item{
@@ -411,22 +376,7 @@
 }
 
 /********术后首次病程记录及谈话记录*******/
-.surgery-af{
-  .af-title{
-    margin-bottom: 15px;
-    span {
-      display: inline-block;
-      width: 50%;
-      font-weight: bold;
-    }
-  }
-  .cont{
-    width: 100%;
-    &.fl,&.fr{
-      width: 30%;
-    }
-  }
-}
+
 .textR{
   text-align: right;
 }

src/html/qcList.html

@@ -16,7 +16,7 @@
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>病人住院序号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
+                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>

src/html/qcListDept.html

@@ -16,7 +16,7 @@
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>病人住院序号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
+                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>

src/html/qcListPerson.html

@@ -16,7 +16,7 @@
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>病人住院序号：</span>
-                    <input class="patientNumInp" type="text" placeholder="请输入病人住院序号">
+                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
                 </span>
                 <span class="filterItem typeFilter">
                     <span>病人姓名：</span>

src/js/qcListDept.js

@@ -104,9 +104,13 @@ $("th[code]").on("click",function(e){
   if(data_asc[0]===code){
     data_desc=[code];
     data_asc=[];
+    $("th[code]").removeClass("asc desc");
+    $(this).addClass("desc");
   }else{
     data_desc=[];
     data_asc=[code];
+    $("th[code]").removeClass("asc desc");
+    $(this).addClass("asc");
   }
   getTabData(1);
   console.log(code)

src/js/qcListPerson.js

@@ -106,9 +106,13 @@ $("th[code]").on("click",function(e){
   if(data_asc[0]===code){
     data_desc=[code];
     data_asc=[];
+    $("th[code]").removeClass("asc desc");
+    $(this).addClass("desc");
   }else{
     data_desc=[];
     data_asc=[code];
+    $("th[code]").removeClass("asc desc");
+    $(this).addClass("asc");
   }
   getTabData(1);
   console.log(code)

src/js/qcScore.js

@@ -194,6 +194,14 @@ function initScoreItem(data){
   })
   $(".edit-flaw").css("opacity",hasAu?"1":"0.5")
   $(".del-flaw").css("opacity",hasAu2?"1":"0.5")
+    showModal(isEdit?'0':'1',code,i);
+  });
+  $(".flaw-item .title a[href]").click(function(){
+    const id = $(this).attr("href");
+    $(".info-item .cont,.flaw-item .title").removeClass("active");
+    $(id).addClass("active");
+    $(this).parent().addClass("active");
+  });
 }
 
 //显示缺陷列表
@@ -341,7 +349,7 @@ function formatFlawKeys(data){
 //初始化模板
   function initModuleData(mid,n){
     const module=global_modules[mid].moduleDetail;
-    const key = global_modules[mid].modeName;
+    const key = global_modules[mid].modeName.replace(/[^\u4e00-\u9fa5|a-zA-Z0-9]+/g,'');
     let hml = '<div class="content-item" code="'+key+'">' +
       '<h2 class="title">'+key+'</h2>' +
       (n>1?'<div class="container">':'<div class="container content-ht">');
@@ -369,15 +377,15 @@ function formatFlawKeys(data){
 
   //基础类型结构生成
   function simpleStructure(data){
-    const {name, val,addLine,position,bold,retract,id} = data;
+    const {name, val,monoLine,addLine,position,bold,retract,id} = data;
     const posClass = position===1?'text-left':'';
     const boldClass = bold===1?'text-bold':'';
     const retractClass = retract===1?'text-indent':'';
     const lineHml = ('<p class="'+posClass+' '+boldClass+' '+retractClass+'">'+ extractVars(val)+'</p>');
-    const txtHml = ('<span class="'+posClass+' '+boldClass+' '+retractClass+'">'+ extractVars(val)+'</span>');
+    const txtHml = ('<p style="display: inline;vertical-align: middle;" class="'+posClass+' '+boldClass+' '+retractClass+'">'+ extractVars(val)+'</p>');
 
-    let hml = addLine?`<div class="cont" style="width: 100%;">`:`<div class="cont">`;
-    hml=hml+`<span class="label" id="anchor${id}">${name}</span>`+ (addLine?lineHml:txtHml)+ `</div>`;
+    let hml = addLine||monoLine?`<div class="cont" style="width: 100%;" id="anchor${id}">`:`<div class="cont" id="anchor${id}">`;
+    hml=hml+`<span class="label">${name}</span>`+ (addLine?lineHml:txtHml)+ `</div>`;
     return hml;
   }