Merge branch 'scrollBar' into test

src/css/itemManager.less

@@ -89,7 +89,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleItemInp:focus{

src/css/mukuai.less

@@ -159,7 +159,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetail.less

@@ -206,7 +206,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailControl.less

@@ -205,7 +205,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailControlHome.less

@@ -209,7 +209,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/quexianDetailHome.less

@@ -92,6 +92,7 @@
     .main-body{
         // margin: 20px 40px;
         padding-bottom: 0px !important;
+        margin-top: 0;
     }
     table{
         width: 100%;
@@ -124,9 +125,9 @@
             }
         }
         th,td{
-            height: 40px;
+            height: 30px;
             box-sizing: border-box;
-            padding: 10px;
+            // padding: 10px;
             border:1px solid #E2E5EF;
             border-collapse: collapse;
         }
@@ -205,7 +206,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/css/single.less

@@ -162,7 +162,7 @@
         right: 10px;
     }
     .moduleItemInp{
-        cursor: default;
+        cursor: text;
         outline: none;
     }
     .moduleTypeList{

src/html/qcScore.html

@@ -226,7 +226,7 @@
     <script type="text/html" id="appointBookTmpl">
         <div class="page-item" code="${title}">
             <h2 class="title" code="${title}">${title}</h2>
-            {{if !data}}
+            {{if !data || data&&data.length === 0}}
             <div class="empty">
                 <img src="../images/empty.png" alt="空"/>
                 <p>暂无信息～</p>

src/js/console.js

@@ -1746,11 +1746,11 @@ function dateConsole(dateType,flg){
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
         ownSelectDate = 3
-        // $(".monthYear .year").css({
-        //     "border-color":'#A5ADBF',
-        //     color:'#A5ADBF',
-        //     backgroundColor:'#203463'
-        // })
+        $(".monthYear .year").css({
+            "border-color":'#A5ADBF',
+            color:'#A5ADBF',
+            backgroundColor:'#203463'
+        })
         $(".monthYear .mon").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',

src/js/deptConsole.js

@@ -857,11 +857,11 @@ function dateConsole(dateType,flg){
         ownSelectDate = 3
         startDate = new Date(getCookie("behosDateStart"))
         endDate = new Date(getCookie("behosDateEnd"))
-        // $(".monthYear .year").css({
-        //     "border-color":'#A5ADBF',
-        //     color:'#A5ADBF',
-        //     backgroundColor:'#203463'
-        // })
+        $(".monthYear .year").css({
+            "border-color":'#A5ADBF',
+            color:'#A5ADBF',
+            backgroundColor:'#203463'
+        })
         $(".monthYear .mon").css({
             "border-color":'#A5ADBF',
             color:'#A5ADBF',