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

src/html/deptConsole.html

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

src/js/singleVeto.js

@@ -56,8 +56,8 @@ $(function(){
         $(".partTitle a").attr("href","console.html").html("控制台 / ")
         $(".partTitle .pices span").html("条目缺陷占比")
     }
-    if(fromThree == 3){
-        deptName = deptList[0].deptName||'';
+    if(from == 2&&fromThree == 3){
+        deptName =  deptList[0]&&deptList[0].deptName||'';
     }
     $(".partTitle a").click(function(){
         //初始菜单选中