ソースを参照

Merge branch 'byll' into test

luolei 5 年 前
コミット
83aef345b9
47 ファイル変更270 行追加221 行削除
  1. 7 6
      src/css/abnormal.less
  2. 8 6
      src/css/dayDetail.less
  3. 5 3
      src/css/deptConsole.less
  4. 8 6
      src/css/deptScoreDetail.less
  5. 8 6
      src/css/deptScoreDetailControl.less
  6. 18 9
      src/css/index.less
  7. 8 8
      src/css/itemManager.less
  8. 8 6
      src/css/jiaji.less
  9. 5 4
      src/css/login.less
  10. 2 2
      src/css/moduleManager.less
  11. 6 4
      src/css/mukuai.less
  12. 8 6
      src/css/partDetail.less
  13. 8 6
      src/css/partDetailControl.less
  14. 8 6
      src/css/payDetail.less
  15. 11 11
      src/css/qcList.less
  16. 13 11
      src/css/qcListDept.less
  17. 13 11
      src/css/qcListPerson.less
  18. 3 3
      src/css/qcScore.less
  19. 6 4
      src/css/quexianDetail.less
  20. 6 4
      src/css/quexianDetailControl.less
  21. 8 6
      src/css/quexianXQ.less
  22. 12 10
      src/css/reset.less
  23. 5 3
      src/css/roleManager.less
  24. 6 4
      src/css/tiaomu.less
  25. 2 2
      src/html/deptScoreDetail.html
  26. 2 2
      src/html/mukuai.html
  27. 2 2
      src/html/partDetail.html
  28. 1 0
      src/html/quexianDetail.html
  29. 1 0
      src/html/quexianDetailControl.html
  30. 2 2
      src/html/tiaomu.html
  31. 6 6
      src/js/abnormal.js
  32. 2 2
      src/js/console.js
  33. 4 4
      src/js/dayDetail.js
  34. 4 4
      src/js/deptConsole.js
  35. 4 4
      src/js/deptScoreDetail.js
  36. 4 4
      src/js/deptScoreDetailControl.js
  37. 4 4
      src/js/jiaji.js
  38. 4 4
      src/js/mukuai.js
  39. 4 4
      src/js/mukuaiControl.js
  40. 4 4
      src/js/partDetail.js
  41. 4 4
      src/js/partDetailControl.js
  42. 4 4
      src/js/payDetail.js
  43. 5 4
      src/js/quexianDetail.js
  44. 5 4
      src/js/quexianDetailControl.js
  45. 4 4
      src/js/quexianXQ.js
  46. 4 4
      src/js/tiaomu.js
  47. 4 4
      src/js/tiaomuControl.js

+ 7 - 6
src/css/abnormal.less

@@ -1,3 +1,4 @@
+@import './reset.less';
 .container{
     width: 100%;
     height: 100%;
@@ -99,7 +100,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -110,8 +111,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -185,7 +186,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -291,7 +292,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -335,7 +336,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 8 - 6
src/css/dayDetail.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -113,7 +115,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -124,8 +126,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -199,7 +201,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -305,7 +307,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -349,7 +351,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 5 - 3
src/css/deptConsole.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 body.console {
   overflow: auto;
   background-color: #f5f5f5;
@@ -117,7 +119,7 @@ body.console {
   .monthYear {
     float: right;
     margin-right: 20px;
-    border: 1px solid #5A8EEE;
+    border: 1px solid @activeColor;
     height: 28px;
     line-height: 28px;
     border-radius: 4px;
@@ -133,11 +135,11 @@ body.console {
       font-weight: normal;
     }
     .year {
-      background-color: #5A8EEE;
+      background-color: @activeColor;
       color: #fff;
     }
     .mon {
-      color: #5A8EEE;
+      color: @activeColor;
     }
   }
 }

+ 8 - 6
src/css/deptScoreDetail.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -112,7 +114,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -123,8 +125,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -198,7 +200,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -304,7 +306,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -348,7 +350,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 8 - 6
src/css/deptScoreDetailControl.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -112,7 +114,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -123,8 +125,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -198,7 +200,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -304,7 +306,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -348,7 +350,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 18 - 9
src/css/index.less

@@ -255,7 +255,7 @@
       }
       &.active{
         background-color: #EEF4FF;
-        border-left: 3px #5A8EEE solid;
+        border-left: 3px @activeColor solid;
       }
     }
   }
@@ -604,11 +604,11 @@
       }
     }
     input:focus{
-      border: 1px solid #5a8eee ;
+      border: 1px solid @activeColor ;
       outline: 0;
-      -webkit-box-shadow:#5a8eee  0px 0px 2px;
-      -moz-box-shadow: #5a8eee  0px 0px 2px;
-      box-shadow: #5a8eee  0px 0px 2px;
+      -webkit-box-shadow:@activeColor  0px 0px 2px;
+      -moz-box-shadow: @activeColor  0px 0px 2px;
+      box-shadow: @activeColor  0px 0px 2px;
     }
   }
   .itemContentBoxLisL {
@@ -661,11 +661,11 @@
       }
     }
     input:focus{
-      border: 1px solid #5a8eee ;
+      border: 1px solid @activeColor ;
       outline: 0;
-      -webkit-box-shadow:#5a8eee  0px 0px 2px;
-      -moz-box-shadow: #5a8eee  0px 0px 2px;
-      box-shadow: #5a8eee  0px 0px 2px;
+      -webkit-box-shadow:@activeColor  0px 0px 2px;
+      -moz-box-shadow: @activeColor  0px 0px 2px;
+      box-shadow: @activeColor  0px 0px 2px;
     }
   }
   .abnormalAll {
@@ -677,6 +677,14 @@
     display: inline-block;
     box-sizing: border-box;
     border-radius:4px;
+    position: relative;
+    img {
+      width: 10px;
+      float: left;
+      position: absolute;
+      top: 14px;
+      right: 7px;
+    }
   }
   .abnormalLeft {
     width: 100px !important;
@@ -720,4 +728,5 @@
   }
   .midifyMsgContentDel {
     height: 220px !important;
+    width: 300px !important;
   }

+ 8 - 8
src/css/itemManager.less

@@ -59,7 +59,7 @@
     .filterDropList{
         position: absolute;
         right: 0;
-        height: 200px;
+        max-height: 200px;
         overflow-y: auto;
         background: #fff;
         display: none;
@@ -111,11 +111,11 @@
         outline: none;
     }
     .moduleItemInp:focus{
-        border: 1px solid #5a8eee ;
+        border: 1px solid @activeColor ;
         outline: 0;
-        -webkit-box-shadow:#5a8eee  0px 0px 2px;
-        -moz-box-shadow: #5a8eee  0px 0px 2px;
-        box-shadow: #5a8eee  0px 0px 2px;
+        -webkit-box-shadow:@activeColor  0px 0px 2px;
+        -moz-box-shadow: @activeColor  0px 0px 2px;
+        box-shadow: @activeColor  0px 0px 2px;
       }
     .moduleTypeList{
          width: 160px;
@@ -134,7 +134,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -144,7 +144,7 @@
         cursor: pointer;
     }
     .editItem{
-       color: #5A8EEE;
+       color: @activeColor;
        cursor: pointer;
     }
     .editItemDis{
@@ -193,7 +193,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     input::-webkit-outer-spin-button,

+ 8 - 6
src/css/jiaji.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -115,7 +117,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -126,8 +128,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -201,7 +203,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -307,7 +309,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -351,7 +353,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 5 - 4
src/css/login.less

@@ -1,3 +1,4 @@
+@import './reset.less';
 body {
   background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
@@ -86,11 +87,11 @@ p.title {
     
   }
   .inputFocus{
-      border: 1px solid #5a8eee ;
+      border: 1px solid @activeColor ;
       outline: 0;
-      -webkit-box-shadow:#5a8eee  0px 0px 2px;
-      -moz-box-shadow: #5a8eee  0px 0px 2px;
-      box-shadow: #5a8eee  0px 0px 2px;
+      -webkit-box-shadow:@activeColor  0px 0px 2px;
+      -moz-box-shadow: @activeColor  0px 0px 2px;
+      box-shadow: @activeColor  0px 0px 2px;
   }
 
 .alertModal {

+ 2 - 2
src/css/moduleManager.less

@@ -76,7 +76,7 @@ table{
 .saveModule{
     display: inline-block;
     float: right;
-    background: #5A8EEE;
+    background: @activeColor;
     color:#fff;
     padding: 9px 16px;
     border-radius: 5px;
@@ -101,7 +101,7 @@ table{
     text-align: center;
 }
 .moduleOperaItem{
-    color: #5A8EEE;
+    color: @activeColor;
     cursor: pointer;
 }
 .moduleOperaItemDis{

+ 6 - 4
src/css/mukuai.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .mukuai{
     width: 100%;
     height: 100%;
@@ -130,7 +132,7 @@
     .filterDropList{
         position: absolute;
         right: 0;
-        height: 200px;
+        max-height: 200px;
         overflow-y: auto;
         background: #fff;
         display: none;
@@ -198,7 +200,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -208,7 +210,7 @@
         cursor: pointer;
     }
     .editItem{
-       color: #5A8EEE;
+       color: @activeColor;
        cursor: pointer;
     }
     .editItemDis{
@@ -257,7 +259,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     input::-webkit-outer-spin-button,

+ 8 - 6
src/css/partDetail.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -115,7 +117,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -126,8 +128,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -201,7 +203,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -307,7 +309,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -351,7 +353,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 8 - 6
src/css/partDetailControl.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -115,7 +117,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -126,8 +128,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -201,7 +203,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -307,7 +309,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -351,7 +353,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 8 - 6
src/css/payDetail.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -116,7 +118,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -127,8 +129,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -202,7 +204,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -308,7 +310,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -352,7 +354,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 11 - 11
src/css/qcList.less

@@ -86,7 +86,7 @@ table{
 
 .recordScoreOperaBtn{
     cursor: pointer;
-    color: #5A8EEE;
+    color: @activeColor;
 }
 .recordScoreBtn{
     cursor: pointer;
@@ -97,8 +97,8 @@ table{
     text-align: center;
     border-radius:4px;
     box-sizing: border-box;
-    border: 1px solid #5A8EEE;
-    color: #5A8EEE;
+    border: 1px solid @activeColor;
+    color: @activeColor;
 }
 /*.filterBox{
     margin-bottom: 15px;
@@ -126,11 +126,11 @@ table{
         box-sizing: border-box;
     }
     input:focus{
-        border: 1px solid #5a8eee ;
+        border: 1px solid @activeColor ;
         outline: 0;
-        -webkit-box-shadow:#5a8eee  0px 0px 2px;
-        -moz-box-shadow: #5a8eee  0px 0px 2px;
-        box-shadow: #5a8eee  0px 0px 2px;
+        -webkit-box-shadow:@activeColor  0px 0px 2px;
+        -moz-box-shadow: @activeColor  0px 0px 2px;
+        box-shadow: @activeColor  0px 0px 2px;
     }
 }
 
@@ -179,7 +179,7 @@ table{
     display: inline-block;
     width:60px;
     height:32px;
-    background:#5A8EEE;
+    background:@activeColor;
     border-radius:4px;
     color: #fff;
     text-align: center;
@@ -235,7 +235,7 @@ table{
     text-align: center;
 }
 .patientNameSpan{
-    color: #5A8EEE;
+    color: @activeColor;
     cursor: pointer;
 }
 
@@ -284,7 +284,7 @@ table{
     width: 6px;
 }
 .activePage{
-    color: #5A8EEE;
+    color: @activeColor;
 }
 
 
@@ -330,7 +330,7 @@ table{
     top: 5px;
 }
 .ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: #5a8eee !important;
+    background-color: @activeColor !important;
     color: #fff;
 }
 .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 13 - 11
src/css/qcListDept.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -96,7 +98,7 @@ table{
 
 .recordScoreOperaBtn{
     cursor: pointer;
-    color: #5A8EEE;
+    color: @activeColor;
 }
 .recordScoreBtn{
     cursor: pointer;
@@ -107,8 +109,8 @@ table{
     text-align: center;
     border-radius:4px;
     box-sizing: border-box;
-    border: 1px solid #5A8EEE;
-    color: #5A8EEE;
+    border: 1px solid @activeColor;
+    color: @activeColor;
 }
 .filterBox{
     margin-bottom: 15px;
@@ -136,11 +138,11 @@ table{
         box-sizing: border-box;
     }
     input:focus{
-        border: 1px solid #5a8eee ;
+        border: 1px solid @activeColor ;
         outline: 0;
-        -webkit-box-shadow:#5a8eee  0px 0px 2px;
-        -moz-box-shadow: #5a8eee  0px 0px 2px;
-        box-shadow: #5a8eee  0px 0px 2px;
+        -webkit-box-shadow:@activeColor  0px 0px 2px;
+        -moz-box-shadow: @activeColor  0px 0px 2px;
+        box-shadow: @activeColor  0px 0px 2px;
     }
 }
 
@@ -190,7 +192,7 @@ table{
     display: inline-block;
     width:60px;
     height:36px;
-    background:#5A8EEE;
+    background:@activeColor;
     border-radius:4px;
     color: #fff;
     text-align: center;
@@ -246,7 +248,7 @@ table{
     text-align: center;
 }
 .patientNameSpan{
-    color: #5A8EEE;
+    color: @activeColor;
     cursor: pointer;
 }
 
@@ -295,7 +297,7 @@ table{
     width: 6px;
 }
 .activePage{
-    color: #5A8EEE;
+    color: @activeColor;
 }
 
 
@@ -339,7 +341,7 @@ table{
     top: 5px;
 }
 .ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: #5a8eee !important;
+    background-color: @activeColor !important;
     color: #fff;
 }
 .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 13 - 11
src/css/qcListPerson.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -96,7 +98,7 @@ table{
 
 .recordScoreOperaBtn{
     cursor: pointer;
-    color: #5A8EEE;
+    color: @activeColor;
 }
 .recordScoreBtn{
     cursor: pointer;
@@ -107,8 +109,8 @@ table{
     text-align: center;
     border-radius:4px;
     box-sizing: border-box;
-    border: 1px solid #5A8EEE;
-    color: #5A8EEE;
+    border: 1px solid @activeColor;
+    color: @activeColor;
 }
 .filterBox{
     margin-bottom: 15px;
@@ -136,11 +138,11 @@ table{
         box-sizing: border-box;
     }
     input:focus{
-        border: 1px solid #5a8eee ;
+        border: 1px solid @activeColor ;
         outline: 0;
-        -webkit-box-shadow:#5a8eee  0px 0px 2px;
-        -moz-box-shadow: #5a8eee  0px 0px 2px;
-        box-shadow: #5a8eee  0px 0px 2px;
+        -webkit-box-shadow:@activeColor  0px 0px 2px;
+        -moz-box-shadow: @activeColor  0px 0px 2px;
+        box-shadow: @activeColor  0px 0px 2px;
     }
 }
 
@@ -202,7 +204,7 @@ table{
     display: inline-block;
     width:60px;
     height:36px;
-    background:#5A8EEE;
+    background:@activeColor;
     border-radius:4px;
     color: #fff;
     text-align: center;
@@ -258,7 +260,7 @@ table{
     text-align: center;
 }
 .patientNameSpan{
-    color: #5A8EEE;
+    color: @activeColor;
     cursor: pointer;
 }
 
@@ -307,7 +309,7 @@ table{
     width: 6px;
 }
 .activePage{
-    color: #5A8EEE;
+    color: @activeColor;
 }
 
 
@@ -351,7 +353,7 @@ table{
     top: 5px;
 }
 .ui-state-active, .ui-widget-content .ui-state-active {
-    background-color: #5a8eee !important;
+    background-color: @activeColor !important;
     color: #fff;
 }
 .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 3 - 3
src/css/qcScore.less

@@ -125,7 +125,7 @@
     }
     &.active{
       background-color: #EEF4FF;
-      border-left: 3px #5A8EEE solid;
+      border-left: 3px @activeColor solid;
     }
   }
 }
@@ -451,13 +451,13 @@
   margin-right: 30px;
   .slide-up{
     cursor: pointer;
-    color: #5A8EEE;
+    color: @activeColor;
     &:before{
       display: inline-block;
       width: 14px;
       content: "-";
       font-size: 18px;
-      color: #5A8EEE;
+      color: @activeColor;
       text-align: center;
     }
     &.down:before{

+ 6 - 4
src/css/quexianDetail.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .quexianDetail{
     width: 100%;
     height: 100%;
@@ -132,7 +134,7 @@
     .filterDropList{
         position: absolute;
         right: 0;
-        height: 200px;
+        max-height: 200px;
         overflow-y: auto;
         background: #fff;
         display: none;
@@ -200,7 +202,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -210,7 +212,7 @@
         cursor: pointer;
     }
     .editItem{
-       color: #5A8EEE;
+       color: @activeColor;
        cursor: pointer;
     }
     .editItemDis{
@@ -259,7 +261,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     input::-webkit-outer-spin-button,

+ 6 - 4
src/css/quexianDetailControl.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .quexianDetailControl{
     width: 100%;
     height: 100%;
@@ -132,7 +134,7 @@
     .filterDropList{
         position: absolute;
         right: 0;
-        height: 200px;
+        max-height: 200px;
         overflow-y: auto;
         background: #fff;
         display: none;
@@ -200,7 +202,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -210,7 +212,7 @@
         cursor: pointer;
     }
     .editItem{
-       color: #5A8EEE;
+       color: @activeColor;
        cursor: pointer;
     }
     .editItemDis{
@@ -259,7 +261,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     input::-webkit-outer-spin-button,

+ 8 - 6
src/css/quexianXQ.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .container{
     width: 100%;
     height: 100%;
@@ -116,7 +118,7 @@
     
     .recordScoreOperaBtn{
         cursor: pointer;
-        color: #5A8EEE;
+        color: @activeColor;
     }
     .recordScoreBtn{
         cursor: pointer;
@@ -127,8 +129,8 @@
         text-align: center;
         border-radius:4px;
         box-sizing: border-box;
-        border: 1px solid #5A8EEE;
-        color: #5A8EEE;
+        border: 1px solid @activeColor;
+        color: @activeColor;
     }
     .filterBox{
         margin-bottom: 15px;
@@ -202,7 +204,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -308,7 +310,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     
@@ -352,7 +354,7 @@
         top: 5px;
     }
     .ui-state-active, .ui-widget-content .ui-state-active {
-        background-color: #5a8eee !important;
+        background-color: @activeColor !important;
         color: #fff;
     }
     .ui-state-highlight, .ui-widget-content .ui-state-highlight {

+ 12 - 10
src/css/reset.less

@@ -250,7 +250,7 @@ textarea {
       text-decoration: none;
     }
     .sure {
-      background-color: #5A8EEE;
+      background-color: @activeColor;
       border-color: #1E9FFF;
       color: #fff;
     }
@@ -357,7 +357,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   .monthYear {
     float: right;
     margin-right: 20px;
-    border: 1px solid #5A8EEE;
+    border: 1px solid @activeColor;
     height: 28px;
     line-height: 28px;
     border-radius: 4px;
@@ -373,11 +373,11 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
       font-weight: normal;
     }
     .year {
-      background-color: #5A8EEE;
+      background-color: @activeColor;
       color: #fff;
     }
     .mon {
-      color: #5A8EEE;
+      color: @activeColor;
     }
   }
 }
@@ -387,7 +387,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
     display: inline-block;
     width:60px;
     height:36px;
-    background:#5A8EEE;
+    background:@activeColor;
     border-radius:4px;
     color: #fff;
     text-align: center;
@@ -411,12 +411,14 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
       cursor: pointer;
       margin-left: 5px;
   }
-  .filterclearT {
-    float: left;
-    top: 2px;
-  }
 }
-
+.filterclearT {
+  height: 30px !important;
+  line-height: 32px !important;
+  float: left;
+  position: relative;
+  top: 3px !important;
+}
 .goHomeDetail {
   color: #00A1F0;
   cursor: pointer;

+ 5 - 3
src/css/roleManager.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .leftMenu {
     border: 1px solid #E2E5EF;
     padding: 20px;
@@ -22,8 +24,8 @@
     //     width: 52px;
     //     height: 30px;
     //     line-height: 30px;
-    //     color: #5A8EEE;
-    //     border: 1px solid #5A8EEE;
+    //     color: @activeColor;
+    //     border: 1px solid @activeColor;
     //     border-radius: 4px;
     //     text-align: center;
     //     position: relative;
@@ -59,7 +61,7 @@
         height: 36px;
         line-height: 36px;
         text-align: center;
-        background-color: #5A8EEE;
+        background-color: @activeColor;
         color: #fff;
         float: right;
         margin-top: 10px;

+ 6 - 4
src/css/tiaomu.less

@@ -1,3 +1,5 @@
+@import './reset.less';
+
 .tiaomu{
     width: 100%;
     height: 100%;
@@ -132,7 +134,7 @@
     .filterDropList{
         position: absolute;
         right: 0;
-        height: 200px;
+        max-height: 200px;
         overflow-y: auto;
         background: #fff;
         display: none;
@@ -200,7 +202,7 @@
         display: inline-block;
         width:60px;
         height:36px;
-        background:#5A8EEE;
+        background:@activeColor;
         border-radius:4px;
         color: #fff;
         text-align: center;
@@ -210,7 +212,7 @@
         cursor: pointer;
     }
     .editItem{
-       color: #5A8EEE;
+       color: @activeColor;
        cursor: pointer;
     }
     .editItemDis{
@@ -259,7 +261,7 @@
         width: 6px;
     }
     .activePage{
-        color: #5A8EEE;
+        color: @activeColor;
     }
     
     input::-webkit-outer-spin-button,

+ 2 - 2
src/html/deptScoreDetail.html

@@ -29,8 +29,8 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室:</span>
-                    <span class="selectDept" data-id=" "><i>--</i></span>
+                    <span style="overflow:hidden">科室:</span>
+                    <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
                     </ul>

+ 2 - 2
src/html/mukuai.html

@@ -32,8 +32,8 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室:</span>
-                    <span class="selectDept" data-id=" "><i>--</i></span>
+                    <span style="overflow:hidden">科室:</span>
+                    <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
                     </ul>

+ 2 - 2
src/html/partDetail.html

@@ -29,8 +29,8 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室:</span>
-                    <span class="selectDept" data-id=""><i>--</i></span>
+                    <span style="overflow:hidden">科室:</span>
+                    <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
                     </ul>

+ 1 - 0
src/html/quexianDetail.html

@@ -38,6 +38,7 @@
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">缺陷名称</th>
+                    <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
                 <tbody>

+ 1 - 0
src/html/quexianDetailControl.html

@@ -38,6 +38,7 @@
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">缺陷名称</th>
+                    <th class="moduleItemName textCenter">数量</th>
                     <th class="moduleScore" style="width: 80px;">缺陷占比</th>
                 </thead>
                 <tbody>

+ 2 - 2
src/html/tiaomu.html

@@ -32,8 +32,8 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span>科室:</span>
-                    <span class="selectDept" data-id=" "><i>--</i></span>
+                    <span style="overflow:hidden">科室:</span>
+                    <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         
                     </ul>

+ 6 - 6
src/js/abnormal.js

@@ -39,10 +39,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         statisticsType = 1
@@ -50,10 +50,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         statisticsType = 2
@@ -158,7 +158,7 @@ function midifyMsgBox(item,type){
                 <p class="midifyMsgTitle">修改 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
                 <div class="itemMsgInfoBox">
                     <span class="itemMsgLab abnormalLeft">状态:</span> 
-                    <span class="abnormalAll" data-status="${itemCopy.status}">${itemCopy.status == 0?"未处理":"已处理"}</span>
+                    <span class="abnormalAll" data-status="${itemCopy.status}">${itemCopy.status == 0?"未处理":"已处理"}<img class="arrow" src=${iconDown} alt="下拉"></span>
                     <ul class="abnormalStatusLis">
                         <li data-status="0">未处理</li>
                         <li data-status="1">已处理</li>
@@ -180,7 +180,7 @@ function midifyMsgBox(item,type){
         msgBox = `<div class="midifyMsgBox">
             <div class="mask"></div>
             <div class="midifyMsgContent midifyMsgContentDel">
-                <p class="midifyMsgTitle">修改 <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
+                <p class="midifyMsgTitle">删除记录<img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></p>
                 <p class="delTips">确认要删除该条异常记录?</p>
                 <div class="midifyMsgBtn midifyMsgBtnDel">
                     <span class="midifyEdit midifyEditDel">删除</span>

+ 2 - 2
src/js/console.js

@@ -445,7 +445,7 @@ function lineChart(dataX,dataY){
         myCharts.resize()
     });
     option = {
-        color:"#5A8EEE",
+        color:"#00A1FF",
         tooltip: {
             trigger: 'axis',
             color:'#fff',
@@ -826,7 +826,7 @@ function barChart(data,type){
         data3.push(data[i].lastYearAverageValue)//去年本月
     }
     option = {
-        color: ['#5A8EEE', '#FAD336', '#37CBCB'],
+        color: ['#00A1FF', '#FAD336', '#37CBCB'],
         tooltip: {
             trigger: 'axis',
             axisPointer: {

+ 4 - 4
src/js/dayDetail.js

@@ -44,10 +44,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -57,10 +57,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/deptConsole.js

@@ -72,10 +72,10 @@ function resizeBox(){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         dateType = 1
@@ -83,10 +83,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         dateType = 2

+ 4 - 4
src/js/deptScoreDetail.js

@@ -58,10 +58,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -71,10 +71,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/deptScoreDetailControl.js

@@ -45,10 +45,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -58,10 +58,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/jiaji.js

@@ -44,10 +44,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -57,10 +57,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/mukuai.js

@@ -93,10 +93,10 @@ function hasData(data){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -104,10 +104,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2

+ 4 - 4
src/js/mukuaiControl.js

@@ -93,10 +93,10 @@ function hasData(data){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -104,10 +104,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2

+ 4 - 4
src/js/partDetail.js

@@ -61,10 +61,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -74,10 +74,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/partDetailControl.js

@@ -44,10 +44,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -57,10 +57,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/payDetail.js

@@ -44,10 +44,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -57,10 +57,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 5 - 4
src/js/quexianDetail.js

@@ -100,10 +100,10 @@ function getTabData(activePage){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -111,10 +111,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2
@@ -200,6 +200,7 @@ function renderTab(data,activePage){
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.name}</td>
+                <td class="textCenter">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
         `

+ 5 - 4
src/js/quexianDetailControl.js

@@ -100,10 +100,10 @@ function getTabData(activePage){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -111,10 +111,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2
@@ -200,6 +200,7 @@ function renderTab(data,activePage){
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.name}</td>
+                <td class="textCenter">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
         `

+ 4 - 4
src/js/quexianXQ.js

@@ -39,10 +39,10 @@ dateChange()
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","block")
@@ -52,10 +52,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         $(".dayDetail .deptListWrap").css("display","none")

+ 4 - 4
src/js/tiaomu.js

@@ -110,10 +110,10 @@ function getTabData(activePage){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -121,10 +121,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2

+ 4 - 4
src/js/tiaomuControl.js

@@ -110,10 +110,10 @@ function getTabData(activePage){
 function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 1
@@ -121,10 +121,10 @@ function dateChange(){
     })
     $(".monthYear .year").click(function(){
         $(this).css({
-            backgroundColor:'#5A8EEE',
+            backgroundColor:'#00A1FF',
             color:'#fff'
         }).siblings().css({
-            color:'#5A8EEE',
+            color:'#00A1FF',
             backgroundColor:'#fff'
         })
         isReject = 2