Merge remote-tracking branch 'origin/qc_zn' into test

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/qcScore.js

@@ -46,7 +46,7 @@ function initMenu(data){
     const code=$(this).attr("code");
     global_activeTab=code;
     //initModuleData();
-    $(".content-item,.flaw-item").hide();
+    $(".content-item,.flaw-item").hide();console.log(code)
     $(".content-item[code='"+code+"']").show();
     showFlawList();
   });
@@ -325,7 +325,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">');
@@ -353,15 +353,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-block" 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;
   }