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

src/css/abnormal.less

@@ -139,6 +139,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+        }
     }
     
     .filterDropList{

src/css/console.less

@@ -165,11 +165,9 @@ body.console {
   min-width: 100px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @fstColor;
     span {
       color: @fstColor;
-      font-size: 16px;
     }
   }
   .dateDetail {
@@ -181,7 +179,6 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    border: 1px solid #00A1FF;
     height: 30px;
     line-height: 30px;
     cursor: pointer;

src/css/dayDetail.less

@@ -139,6 +139,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+          }
     }
     
     .filterDropList{

src/css/deptConsole.less

@@ -133,11 +133,9 @@ body.console {
   letter-spacing: 1px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @fstColor;
     span,i {
       color: @fstColor;
-      font-size: 16px;
     }
   }
   .dateDetail {

src/css/deptScoreDetail.less

@@ -138,6 +138,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+        }
     }
     
     .filterDropList{
@@ -356,6 +363,7 @@
         -moz-appearance: textfield;
     }
 }
+
 .abnormalClear {
     top: 2px !important;
 }

src/css/deptScoreDetailControl.less

@@ -139,6 +139,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+          }
     }
     
     .filterDropList{

src/css/index.less

@@ -409,12 +409,16 @@
         width: 100px;
         box-sizing: border-box;
         border:  1px solid #E2E5EF;
-        height: 40px;
-        line-height: 40px;
+        height: 34px;
+        line-height: 34px;
         border-radius: 2px;
         padding: 0 10px;
         &:focus{
           border-color: @activeColor;
+          outline: 0;
+          -webkit-box-shadow:@activeColor  0px 0px 2px;
+          -moz-box-shadow: @activeColor  0px 0px 2px;
+          box-shadow: @activeColor  0px 0px 2px;
         }
       }
     }
@@ -461,7 +465,7 @@
       left: 50%;
       top: 50%;
       width: 500px;
-      height:468px;
+      height:458px;
       margin: -234px 0 0 -250px;
       background: #fff;
       border-radius:4px;
@@ -482,7 +486,7 @@
       cursor: pointer;
     }
     .itemMsgContentBox{
-      margin: 20px 0 0 0;
+      margin: 30px 0 0 0;
     }
     .itemMsgInfoBox{
       line-height: 40px;
@@ -496,12 +500,16 @@
         width: 280px;
         box-sizing: border-box;
         border:  1px solid #E2E5EF;
-        height: 40px;
-        line-height: 40px;
+        height: 34px;
+        line-height: 34px;
         border-radius: 2px;
         padding: 0 10px;
         &:focus{
           border-color: @activeColor;
+          outline: 0;
+          -webkit-box-shadow:@activeColor  0px 0px 2px;
+          -moz-box-shadow: @activeColor  0px 0px 2px;
+          box-shadow: @activeColor  0px 0px 2px;
         }
       }
     }
@@ -533,7 +541,7 @@
     .confirmEditBox{
       position: relative;
       text-align: center;
-      top: 30px;
+      top: 20px;
     }
     .confirmEdit{
       display: inline-block;
@@ -732,6 +740,13 @@
     padding: 10px;
     box-sizing: border-box;
   }
+  textarea:focus{
+    border: 1px solid @activeColor ;
+    outline: 0;
+    -webkit-box-shadow:@activeColor  0px 0px 2px;
+    -moz-box-shadow: @activeColor  0px 0px 2px;
+    box-shadow: @activeColor  0px 0px 2px;
+}
   .midifyMsgContent.abnormal {
     height: 320px;
   }

src/css/jiaji.less

@@ -141,6 +141,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+          }
     }
     
     .filterDropList{

src/css/partDetail.less

@@ -141,6 +141,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+        }
     }
     
     .filterDropList{
@@ -359,6 +366,7 @@
         -moz-appearance: textfield;
     }
 }
+
 .abnormalClear {
     top: 2px !important;
 }

src/css/partDetailControl.less

@@ -141,6 +141,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+          }
     }
     
     .filterDropList{

src/css/payDetail.less

@@ -142,6 +142,13 @@
             padding: 0 10px;
             box-sizing: border-box;
         }
+        input:focus{
+            border: 1px solid @activeColor ;
+            outline: 0;
+            -webkit-box-shadow:@activeColor  0px 0px 2px;
+            -moz-box-shadow: @activeColor  0px 0px 2px;
+            box-shadow: @activeColor  0px 0px 2px;
+          }
     }
     
     .filterDropList{

src/css/qcScore.less

@@ -14,7 +14,7 @@
 .patient-info{
   /*height: 50px;*/
   line-height: 50px;
-  border-bottom: 10px #F5F6FA solid;
+  border-bottom: 10px #EFF1F6 solid;
   text-align: center;
   /*margin-bottom: 20px;*/
   span{
@@ -170,7 +170,7 @@
     height: 100%;
     position: relative;
     overflow-y: auto;
-    border-right: 10px #F5F6FA solid;
+    border-right: 10px #EFF1F6 solid;
   }
   .content-item{
     display: none;
@@ -440,6 +440,17 @@
   .drop-box{
     position: relative;
     margin-bottom: 10px;
+    &:after{
+      content: "";
+      display: inline-block;
+      width: 13px;
+      height: 7px;
+      background: url("../images/arrow_down.png") no-repeat;
+      background-size: 13px 7px;
+      position: absolute;
+      left: 365px;
+      top: 16px;
+    }
   }
   ul{
     display: none;
@@ -461,7 +472,14 @@
         background: @tableBorderColor;
       }
     }
-
+  }
+  .show{
+    ul{
+      display: block;
+    }
+    &:after{
+      background-image: url("../images/arrow_up.png");
+    }
   }
 }
 .standard_table {
@@ -553,6 +571,11 @@
       text-indent: 20px;
     }
   }
+  .interval-color{
+    tr:nth-child(2n){
+      background: #EFF1F6;
+    }
+  }
   table{
     width: 97%;
     border:1px solid #E2E5EF;

src/css/reset.less

@@ -71,6 +71,9 @@ table {
   thead{
     background: #EFF0F9;
   }
+  tr:nth-child(2n){
+    background: #EFF1F6;
+  }
   th,td{
     height: @trHeight;
     box-sizing: border-box;
@@ -94,6 +97,7 @@ textarea {
   padding: 0;
   outline: none;
 }
+
 .clearfix:after{
   content: ""; 
   display: block; 
@@ -142,8 +146,8 @@ textarea {
   height: 44px;
   line-height: 44px;
   /*padding: 0 0 0 15px;*/
-  border-bottom: 10px solid #F5F6FA;
-  font-size: 16px;
+  border-bottom: 10px solid #EFF1F6;
+  font-size: 14px;
   text-indent: 20px;
   font-weight: normal;
   letter-spacing: 1px;
@@ -341,7 +345,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
 
 .grayLine {
   height: 10px;
-  background-color: #f5f5f5;
+  background-color: #EFF1F6;
 }
 .partTitleT {
   height: 44px;
@@ -363,16 +367,13 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   min-width: 100px;
   p {
     display: inline-block;
-    font-size: 16px;
     color: @themeColor;
     a {
-      font-size: 16px;
       color: @themeColor;
       opacity: 70%;
     }
     span {
       color: @themeColor;
-      font-size: 16px;
     }
     i {
       color: @themeColor;

src/html/qcScore.html

@@ -246,7 +246,7 @@
                 {{/each}}
                 </tbody>
             </table>
-            {{else}}<table code="${title}">
+            {{else}}<table code="${title}" class="interval-color">
             <thead>
             <tr>
                 <th width="100" align="center">序号</th>

src/js/qcList.js

@@ -35,7 +35,12 @@ if(chengdu){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
-    $('.selectDept ').html(deptNamePram)
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }

src/js/qcListDept.js

@@ -41,7 +41,12 @@ if(chengdu){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
-    $('.selectDept ').html(deptNamePram)
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }

src/js/qcListPerson.js

@@ -44,7 +44,12 @@ if(chengdu){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
-    $('.selectDept ').html(deptNamePram)
+    if(deptNamePram.length > 10){
+        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+    }else{
+        $('.selectDept').html(deptNamePram)
+    }
+    $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }

src/js/qcScore.js

@@ -241,9 +241,20 @@ function editScore(info){
 }
 //添加评分项
 function addScore(info){
+  const optResultAlgVO = {
+    "casesEntryId": info.casesEntryId,
+    "casesId": info.casesId,
+    "casesScore": info.caseScore,
+    "code": info.code || "",
+    "id": info.id || "",
+    "info":info.info || "",
+    "isReject": info.isReject,
+    "msg": info.msg || "",
+    "score": info.score
+  }
   const param={
     "behospitalCode": global_id,
-    "optResultAlgVO": info
+    "optResultAlgVO": optResultAlgVO
   };
   post(api.addScore,param).then(function(res){
     if(res.data.code==='0'){
@@ -264,7 +275,7 @@ function showModal(flag,code,i){
   $("#delModal .confirm").off("click");
   $("#qcScore,#qcMsg").off("input");
   const flawsList = formatFlawKeys(global_flawData);
-  const info = flawsList[global_activeTab][i];
+  const info = flawsList[global_activeTab]&&flawsList[global_activeTab][i];
   if(flag==='0'){   //修改
     $("#delModal .title").text("修改");
     $("#delModal .confirm").text("保存");
@@ -328,7 +339,7 @@ function showModal(flag,code,i){
         return;
       }
       const msg=$("#delModal #addQcMsg").val();
-      const score=$("#delModal #addQcScore").val();
+      const score=Number($("#delModal #addQcScore").val());
       if($(".add-box .warning").is(":visible")||!msg.trim()||!score){
         return;
       }
@@ -379,11 +390,11 @@ function formatFlawKeys(data){
 //增加条目弹窗元素事件
   function addFlawEvent(){
     $(".add-box .flaw-drop-input").off("click").on("click",function(){
-      $(".add-box .drop-box ul").show();
+      $(".add-box .drop-box").addClass("show");
     });
     $(".add-box .flaw-drop-input").off("blur").on("blur",function(){
       setTimeout(function(){
-        $(".add-box .drop-box ul").hide();
+        $(".add-box .drop-box").removeClass("show");
       },300)
 
     });
@@ -400,7 +411,7 @@ function formatFlawKeys(data){
       $("#addQcMsg").val(msg);
       $("#addQcScore").val(score);
       $(".add-box .warning").hide();
-      $(".add-box .drop-box ul").hide();
+      $(".add-box .drop-box").removeClass("show");
     });
   }
 
@@ -482,14 +493,14 @@ function formatFlawKeys(data){
     const {name, val,monoLine,addLine,position,bold,retract,id} = data;
     if(name==="手术记录表格-1"){
       const value = val.replace("【","").replace("】","");
-      const diag = JSON.parse(obj[0][value]);
+      const diag = obj[0][value]?JSON.parse(obj[0][value]):"";
       let thml=`<div class="cont" style="width: 100%;" id="anchor${id}">`;
       thml+=$("#tableTmpl").tmpl({k:"手术信息",data:diag})[0].outerHTML+"</div>";
       return thml;
     }
     if(name==="出院诊断表格-1"){
       const value = val.replace("【","").replace("】","");
-      const diag = JSON.parse(obj[0][value]);
+      const diag = obj[0][value]?JSON.parse(obj[0][value]):"";
 
       let thml=`<div class="cont" style="width: 100%;" id="anchor${id}">`;
       thml+=$("#tableTmpl").tmpl({k:"出院诊断",data:diag})[0].outerHTML+"</div>";