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

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/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>