Merge remote-tracking branch 'origin/qc_zn' into version1.2.1

# Conflicts:
#	src/html/qcScore.html

src/css/deptConsole.less

@@ -28,7 +28,7 @@ body.console {
 .partWrap {
   // overflow: auto;
   height: auto;
-  background: @themeBorderClr;
+  background: @activeBg;
   min-width: 1080px;
   ul {
     padding: 0 40px;
@@ -83,7 +83,7 @@ body.console {
 }
 .grayLine {
   height: 10px;
-  background-color: @themeBorderClr;
+  background-color: @activeBg;
 }
 .partTitleT {
   height: 44px;
@@ -162,15 +162,15 @@ body.console {
   display: inline-block;
   margin-bottom: 10px;
   background-color: #fff;
-  border-top: 10px solid @themeBorderClr;
+  border-top: 10px solid @activeBg;
 }
 .pubEchartB {
   width: 55%;
   display: inline-block;
   margin-bottom: 10px;
   background-color: #fff;
-  border-top: 10px solid @themeBorderClr;
-  border-left: 10px solid @themeBorderClr;
+  border-top: 10px solid @activeBg;
+  border-left: 10px solid @activeBg;
   box-sizing: border-box;
 }
 .paymoney {
@@ -194,7 +194,7 @@ body.console {
   display: inline-block;
   background-color: @themeColor;
   box-sizing: border-box;
-  border-top: 10px solid @themeBorderClr;
+  border-top: 10px solid @activeBg;
   position: relative;
   .title {
     cursor: pointer;
@@ -272,11 +272,11 @@ body.console {
 .part01 {
   width: 38%;
   background-color: @themeColor;
-  border-right: 10px solid @themeBorderClr;
+  border-right: 10px solid @activeBg;
   box-sizing: border-box;
   ul {
     padding: 40px 20px;
-    border-bottom: 10px solid @themeBorderClr;
+    border-bottom: 10px solid @activeBg;
     li {
       width: 50%;
       float: left;
@@ -298,7 +298,7 @@ body.console {
     background-color: @themeColor;
     height: 452px;
     overflow: hidden;
-    border-bottom: 10px solid @themeBorderClr;
+    border-bottom: 10px solid @activeBg;
     .list {
       padding: 15px 5px;
       width: 100%;
@@ -517,7 +517,7 @@ body.console {
   position: relative;
   .homePage {
     width: 45%;
-    border-right: 10px solid @themeBorderClr;
+    border-right: 10px solid @activeBg;
     box-sizing: border-box;
   }
   .homePageNo {

src/js/deptConsole.js

@@ -480,7 +480,14 @@ function part02pan(data,dom){
             type: 'pie',
             radius: ['70%', '90%'],
             data: echartData,
-            hoverAnimation:false,
+            hoverAnimation:true,
+            hoverOffset:3,
+            itemStyle: {
+              normal: {
+                borderColor: '#203463',
+                borderWidth: 3
+              }
+            },
             label: {
                 normal: {
                     show:false,
@@ -642,7 +649,7 @@ function emptyCircleBc(data){
             hoverOffset:5,
             itemStyle: {
                 normal: {
-                    // borderColor: bgColor,
+                    borderColor:  '#203463',
                     borderWidth: 2
                 }
             },