Merge remote-tracking branch 'origin/version1.3.3'

src/css/common.less

@@ -178,4 +178,20 @@ input::-webkit-inner-spin-button {
 }
 input[type="number"] {
     -moz-appearance: textfield;
+}
+input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
+    /* WebKit browsers */
+    color: #aaa;
+}
+input:-moz-placeholder, textarea:-moz-placeholder {
+    /* Mozilla Firefox 4 to 18 */
+    color: #aaa;
+}
+input::-moz-placeholder, textarea::-moz-placeholder {
+    /* Mozilla Firefox 19+ */
+    color: #aaa;
+}
+input:-ms-input-placeholder, textarea:-ms-input-placeholder {
+    /* Internet Explorer 10+ */
+    color: #aaa;
 }

src/css/qcScore.less

@@ -334,6 +334,9 @@
           width: 100px;
           padding-left: 0;
         }
+        &.active{
+          background: @anchorBg;
+        }
       }
     }
     .embed-table{
@@ -382,7 +385,7 @@
         box-sizing: border-box;
         padding-left: 5px;
         &.active{
-          background: #FEE6C4;
+          background: @anchorBg;
         }
         span{
           line-height: 20px;
@@ -506,7 +509,7 @@
         }
       }
       &.active .title{
-        background: #FEE6C4;
+        background: @anchorBg;
       }
     }
   }

src/css/reset.less

@@ -141,6 +141,7 @@ textarea {
 @disColor:#EFF1F6;  /**背景颜色**/
 @trHeight:30px;   /**表格行高**/
 @highlighBg:#F4C9C3;/**单选否决高亮**/
+@anchorBg:#FEE6C4;//定位高亮背景颜色
 .h2{
   width: 100%;
   /*box-sizing: border-box;*/

src/html/console.html

@@ -105,7 +105,7 @@
         <div class="pubEchart paymoney">
           <p class="title"><span>各科室病历评分占比</span> <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide">
-            <p><span>甲级</span><img src="../images/arrow_down.png" alt=""> </p>
+            <p><span>甲级</span><img src="../images/arrow_down1.png" alt=""> </p>
             <ul>
               <li class="toggleAverge toggleSlide1" data-str="甲级" data-level="甲" data-type="1">甲级</li>
               <li class="toggleAverge toggleSlide2" data-str="乙级" data-level="乙" data-type="2">乙级</li>
@@ -118,7 +118,7 @@
         <!-- <div class="pubEchart paymoney">
           <p class="title"><span>科室平均住院天数柱状图</span> <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide">
-            <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
+            <p><span>平均住院天数</span><img src="../images/arrow_down1.png" alt=""> </p>
             <ul>
               <li class="toggleAverge toggleSlide1" data-str="平均住院天数" data-type="1">平均住院天数</li>
               <li class="toggleAverge toggleSlide2" data-str="平均住院花费" data-type="2">平均住院花费</li>
@@ -133,7 +133,7 @@
           <span class="name">病案首页合格率占比</span> <img class="detailGo" src="../images/details.png" alt="">
         </p>
         <div class="toggleSlide">
-          <p><span>合格率</span><img src="../images/arrow_down.png" alt=""> </p>
+          <p><span>合格率</span><img src="../images/arrow_down1.png" alt=""> </p>
           <ul>
             <li class="toggleAverge toggleSlide1" data-str="合格率" data-level="合格率" data-type="7">合格率</li>
             <li class="toggleAverge toggleSlide2" data-str="完整率" data-level="完整率" data-type="8">完整率</li>
@@ -178,7 +178,7 @@
         <div class="pubEchartB paymoney">
           <p class="title">各科室质控平均分柱状图 <img src="../images/details.png" alt=""></p>
           <div class="toggleSlide innerOuter">
-            <p data-str="内科" data-type="3"><span>内科系统</span><img src="../images/arrow_down.png" alt=""> </p>
+            <p data-str="内科" data-type="3"><span>内科系统</span><img src="../images/arrow_down1.png" alt=""> </p>
             <ul>
               <li class="toggleAverge toggleSlide1" data-str="内科" data-type="3">内科系统</li>
               <li class="toggleAverge toggleSlide2" data-str="外科" data-type="4">外科系统</li>

src/html/deptConsole.html

@@ -18,7 +18,7 @@
       <span class="year">本年</span>
     </div> 
     <div class="toggleSlide deptConsoleLis fr">
-      <p><span>平均住院天数</span><img src="../images/arrow_down.png" alt=""> </p>
+      <p><span>平均住院天数</span><img src="../images/arrow_down1.png" alt=""> </p>
       <ul>
         <li class="toggleAverge toggleSlide1" data-str="平均住院天数" data-type="1">平均住院天数</li>
         <li class="toggleAverge toggleSlide2" data-str="平均住院花费" data-type="2">平均住院花费</li>

src/js/qcScore.js

@@ -172,13 +172,15 @@ function formatInfoData(k,data){
       $(".sub-menu .page[code="+pCode+"]").parents(".list-1").click();
       $(".sub-menu .page[code="+pCode+"],.menu-mini .page[code="+pCode+"").click();
       //缺陷定位
-      $(".info-item .cont,.flaw-item").removeClass("active");
+      $(".info-item .cont,.flaw-item,td").removeClass("active");
       const flawItem=$(".flaw-item .title a[code="+code+"]");
       if(!flawItem.length){
         $.alerModal({"message":'模块数据缺失~',type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
         return;
       }
       $(".flaw-item .title a[code="+code+"]").click();
+      const anch=$(".flaw-item .title a[code="+code+"]").attr("href");
+      $('#contentInfo').scrollTop($(anch).offset().top-60);
     });
   }
 
@@ -552,19 +554,19 @@ function formatFlawKeys(data){
 
   //组合类型结构生成
   function combineStructure(data){
-    const {name,questionMapping} = data;
+    const {name,questionMapping,id} = data;
     let hml='<div class="inner-table"><table>';
     const colNum = Math.ceil(questionMapping.length/2);
     let tdVal='';
     const regexp = /(【(.+?)】)/g;
     for(let i=0;i<questionMapping.length;){
       if(questionMapping[i+1]){
-        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td>"+questionMapping[i+1].name+extractVars(questionMapping[i+1].val)+"</td>";
+        tdVal="<td id='anchor"+questionMapping[i].id+"'>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td id='anchor"+questionMapping[i+1].id+"'>"+questionMapping[i+1].name+extractVars(questionMapping[i+1].val)+"</td>";
       }else{
-        tdVal="<td>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td></td>";
+        tdVal="<td id='anchor"+questionMapping[i].id+"'>"+questionMapping[i].name+extractVars(questionMapping[i].val)+"</td><td></td>";
       }
       if(i==0){
-        hml=hml+`<tr><td rowspan="${colNum}">${name}</td>${tdVal}`;
+        hml=hml+`<tr><td rowspan="${colNum}"><div id='anchor${id}'>${name}</div></td>${tdVal}`;
       }else{
         hml=hml+`<tr>${tdVal}`;
       }

src/js/utils.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.236:5858"
+const baseUrl = "http://192.168.2.121:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',