Merge remote-tracking branch 'origin/master'

src/main/resources/static/app/main/bigdata/showDjdsj/css/reset.css

@@ -69,15 +69,15 @@ body, html { font-size: 100%; width:100%; height: 100%; min-width: 1920px; overf
 }
 
 body{
-	background: #060815 url(../images/bg.jpg) no-repeat center top;
+	background: #fff url(../images/bg.jpg) no-repeat center top;
 	background-size: 100%;
-	color: #2ff5ff;
+	color: #fff;
 	font-family: "Microsoft YaHei", Helvetica, Arial,sans-serif, FreeSans, Arimo;
 	line-height: normal;
 	overflow: hidden;
 }
 
-a{color: #4466f4; text-decoration: none; outline: none; cursor: pointer; transition: all 0.25s ease-in-out;}
+a{color: #fff; text-decoration: none; outline: none; cursor: pointer; transition: all 0.25s ease-in-out;}
 
 img, object, embed, video {
 	max-width: 100%;
@@ -99,8 +99,8 @@ input[type="checkbox"] {
 /*table*/
 table {width:100%; float:left;}
 table th,td{text-align:center;border:none;vertical-align:middle;}	
-table th{font-weight:normal; color:#6c799c;}
-table td{color:#2ff5ff;}
+table th{font-weight:normal; color:#fff;}
+table td{color:#FFF3B3;}
 table tr{transition: all 0.25s ease-in-out;}
 
 /*font*/
@@ -119,16 +119,16 @@ table tr{transition: all 0.25s ease-in-out;}
 }
 /*---滚动条默认显示样式--*/
 ::-webkit-scrollbar-thumb{
-    background:#1f2d3b;
+    background:#fff;
     border-radius:8px;
 }
 /*---鼠标经过显示样式--*/
 ::-webkit-scrollbar-thumb:hover{
-	background-color:#34495e;
+	background-color:#F8B551;
 }
 /*---鼠标点击样式--*/ 
 ::-webkit-scrollbar-thumb:active{
-	background-color:#1c2835;
+	background-color:#F8B551;
 } 
 /*---滚动条两端的按钮样式--*/
 ::-webkit-scrollbar-button{

src/main/resources/static/app/main/bigdata/showDjdsj/css/style.css

@@ -1,15 +1,15 @@
 /* -------------------------------- 公用 -------------------------------- */
 .head-nav{ width:100%; padding: 10px; position: absolute; left: 0; top: 5px; z-index: 100;}
 .head-nav ul{ position: relative;}
-.head-nav ul li{ width: 236px; height: 70px; font-size: 22px; color: #2ff5ff; line-height: 70px; text-align: center; text-shadow: 0 0 20px #7c2bff; background: url(../images/navbg-normal.png)no-repeat center center;  transition: all 0.25s ease-in-out;}
-.head-nav ul li:hover{ color: #ffc196; text-shadow: 0 0 20px #f90;}
-.head-nav ul li.active { color: #ffc196; text-shadow: 0 0 20px #f90; background: url(../images/navbg-on.png)no-repeat center center; }
+.head-nav ul li{ width: 236px; height: 70px; font-size: 22px; color: #F8B551; line-height: 70px; text-align: center; text-shadow: 0 0 20px #F8B551; background: url(../images/navbg-normal.png)no-repeat center center;  transition: all 0.25s ease-in-out;}
+.head-nav ul li:hover{ color: #FFF3B3; text-shadow: 0 0 20px #FFF3B3;}
+.head-nav ul li.active { color: #ffc196; text-shadow: 0 0 20px #FFF3B3; background: url(../images/navbg-on.png)no-repeat center center; }
 .head-nav ul a.l-li{ margin-left: 2%; float: left;}
 .head-nav ul a.r-li{ margin-right: 2%;float: right; transform: rotateY(180deg);}
 .head-nav ul a.r-li li h2{transform:rotateY(180deg);}
 
-.title{ width:775px; height: 123px; text-align:center; background: url(../images/title-bg.png) no-repeat center center; position: absolute; top:0; left: 50%; margin-left: -387px; text-shadow: 0 0 60px #7c2bff;}
-.title h1{ font-size: 36px; color:#2ff5ff; font-weight:600; text-indent: 60px; letter-spacing:8px; margin-top: 10px; background: url(../images/d-logo.svg) no-repeat 34% bottom;}
+.title{ width:775px; height: 123px; text-align:center; background: url(../images/title-bg.png) no-repeat center center; position: absolute; top:0; left: 50%; margin-left: -387px; text-shadow: 0 0 60px #F8B551;}
+.title h1{ font-size: 36px; color:#F8B551; font-weight:600; text-indent: 60px; letter-spacing:8px; margin-top: 10px; background: url(../images/d-logo.png) no-repeat 34% bottom;font-weight: bold;}
 
 .container{ width: 100%; height: 100%; padding: 90px 10px 10px 10px; display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between; position: absolute; }
 .content{ padding: 10px; overflow: hidden;  }
@@ -20,13 +20,13 @@
 /* -------------------------------- 左 -------------------------------- */
 .box{ 
 	width:100%;	
-	background-image: linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff);
+	background-image: linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3);
     background-repeat: no-repeat;
     background-size: 12px 1px, 12px 1px, 12px 1px, 12px 1px, 1px 12px, 1px 12px, 1px 12px, 1px 12px;
     background-position: 0 0, 100% 0, 0 100%, 100% 100%;
 	padding: 20px 25px;
 	background-color: rgba(0,0,0,.1);
-	box-shadow:inset 0 0 1px #00f0ff,inset 0 0 20px rgba(124,43,255,.2);
+	box-shadow:inset 0 0 1px #FFF3B3,inset 0 0 20px rgba(248,181,81,.2);
 	position: relative;
 }
 .b-1{ height: 570px; overflow: hidden;}
@@ -38,8 +38,8 @@
 .box-header h2{ font-family: Gotham, "Helvetica Neue", Helvetica, Arial, "sans-serif"; font-size: 36px; color: #ffc196; line-height: 82px; float: left;}
 .box-1-list{ width:100%; background: rgba(255,255,255,.05); padding: 13px 20px; float: left; margin-bottom: 10px; border-radius: 3px;}
 .box-1-list table th{ width:70px; font-size: 16px; color: #fff; text-align: left;}
-.box-1-list table td{ font-size: 16px; color: #597ca1; text-align: left; padding: 2px 0;}
-.box-1-list table td.t-number{ font-family: Gotham, "Helvetica Neue", Helvetica, Arial, "sans-serif"; font-size: 26px; color: #2ff5ff;}
+.box-1-list table td{ font-size: 16px; color: #fff; text-align: left; padding: 2px 0;}
+.box-1-list table td.t-number{ font-family: Gotham, "Helvetica Neue", Helvetica, Arial, "sans-serif"; font-size: 26px; color: #FFC196;}
 .list-2 table td{ width:33.33%;}
 
 .b-3{ margin-top: 15px; float: left; overflow: hidden;}
@@ -56,21 +56,21 @@
 .mid-nav-content{ margin: 0 4%; position: relative;}
 
 .nav-title{ font-size: 20px; color: #fff; text-align: center;}
-.nav-number{ 
+.nav-number{
 	font-family: Gotham, "Helvetica Neue", Helvetica, Arial, "sans-serif";
 	font-size: 36px;
 	color: #ffc196;
 	text-align: center;
 	text-shadow: 0 0 20px #f90;
 	min-width: 160px;
-	background-image: linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff), linear-gradient(#01ffff, #01ffff);
+	background-image: linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3), linear-gradient(#FFF3B3, #FFF3B3);
     background-repeat: no-repeat;
     background-size: 10px 1px, 10px 1px, 10px 1px, 10px 1px, 1px 10px, 1px 10px, 1px 10px, 1px 10px;
     background-position: 0 0, 100% 0, 0 100%, 100% 100%;
 	padding: 5px 20px;
 	margin: 15px 0;
-	background-color: #112854;
-	box-shadow:inset 0 0 1px #00f0ff,inset 0 0 20px rgba(124,43,255,.1);
+	background-color: #841B0C;
+	box-shadow:inset 0 0 1px #FFF3B3,inset 0 0 20px rgba(124,43,255,.1);
 	position: relative;
 }
 .nav-number:before{ content: ""; width:15px; height: 1px; background: #01ffff; position: absolute; top:50%; left: -15px; margin-top: -1px;}
@@ -80,9 +80,9 @@
 .map-content .map-box{ width:33.33%; padding: 0 3%; }
 .map-content .map-box h3{ font-size: 18px; text-align: center;}
 .map-content .map-box .map{ width:100%; height: 230px;}
-.map-content .map-box .guangdong{ background: url(../images/guangdong.svg)no-repeat center center; background-size: 95%;}
-.map-content .map-box .hunan{ background: url(../images/hunan.svg)no-repeat center center; background-size: 70%;}
-.map-content .map-box .hainan{ background: url(../images/hainan.svg)no-repeat center center; background-size: 75%;}
+.map-content .map-box .guangdong{ background: url(../images/guangdong.png)no-repeat center center; background-size: 95%;}
+.map-content .map-box .hunan{ background: url(../images/hunan.png)no-repeat center center; background-size: 70%;}
+.map-content .map-box .hainan{ background: url(../images/hainan.png)no-repeat center center; background-size: 75%;}
 .map-items{ width:100%; display: flex; flex-direction: row; flex-wrap: nowrap; justify-content: space-between; }
 .map-items li span{ font-size: 16px; }
 .map-items li h1{width:100%; font-size: 30px; color: #ffc196; padding: 6px 0; }

src/main/resources/static/app/main/bigdata/showDjdsj/dwdt.js

@@ -16,19 +16,19 @@
                     name: '先进基层党组织',
                     type: 'bar',
                     data: [],
-                    color: '#4565f4'
+                    color: '#fff'
                 },
                 {
                     name: '优秀共产党员',
                     type: 'bar',
                     data: [],
-                    color: '#c4cffd'
+                    color: '#fff'
                 },
                 {
                     name: '优秀党务工作者',
                     type: 'bar',
                     data: [],
-                    color: '#01588d'
+                    color: '#fff'
                 }
             ];
             $scope.pxpy_legend = ['先进基层党组织', '优秀共产党员', '优秀党务工作者'];
@@ -45,20 +45,20 @@
                     data: $scope.pxpy_legend,
                     icon: "circle",
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 xAxis: {
                     type: "category",
                     data: $scope.pxpy_x_dataList,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 yAxis: {
                     type: "value",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick: {       //y轴刻度线
                         show: false
@@ -108,14 +108,14 @@
                 xAxis: {
                     type: "category",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.cgjq_nameList
                 },
                 yAxis: {
                     type: "value",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick: {       //y轴刻度线
                         show: false
@@ -133,7 +133,7 @@
                         itemStyle: {
                             normal: {
                                 color: function (params) {
-                                    var colorList = ['#4565f4', '#c4cffd', '#4565f4', '#c4cffd'];
+                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
                                     return colorList[params.dataIndex];
                                 }
                             }
@@ -185,7 +185,7 @@
                     data: $scope.dnpp_legend_dataList,
                     icon: "circle",
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 tooltip: {
@@ -244,7 +244,7 @@
                     url: '../../api/bigdata/getDjkpxxTotalList',
                     params: {}
                 }).then(function (result) {
-                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97', '#00736c', '#005983'];
+                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983'];
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (item, index) {
                             $scope.dnpp_dataList.push($scope.getPieData(item.COUNT, item.NAME, colorList[index < colorList.length ? index : (colorList.length - 1)]));
@@ -263,21 +263,21 @@
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#4565f4'
+                    color: '#fff'
                 },
                 {
                     name: '转出党员人数',
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#c4cffd'
+                    color: '#fff'
                 },
                 {
                     name: '内部接转人数',
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#01588d'
+                    color: '#fff'
                 }
             ];
             $scope.nydt_lineOption = {
@@ -292,7 +292,7 @@
                     y: 'bottom',
                     data: ['转入党员人数', '转出党员人数', '内部接转人数'],
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 xAxis: {
@@ -300,13 +300,13 @@
                     boundaryGap: false,
                     data: $scope.nydt_x_dataList,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 yAxis: {
                     type: 'value',
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick: {       //y轴刻度线
                         show: false
@@ -391,20 +391,20 @@
                     data: $scope.czqk_legend,
                     icon: "circle",
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 xAxis: {
                     type: "category",
                     data: $scope.czqk_x_dataList,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 yAxis: {
                     type: "value",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick: {       //y轴刻度线
                         show: false
@@ -443,7 +443,7 @@
                     url: '../../api/bigdata/getJlcfxxTotalList',
                     params: {}
                 }).then(function (result) {
-                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97', '#00736c', '#005983'];
+                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983'];
                     if (result.data != null && result.data.length > 0) {
                         /*angular.forEach(result.data, function (item, index) {
                             $scope.czqk_x_dataList.push(item.YEAR);

src/main/resources/static/app/main/bigdata/showDjdsj/dwgzz.js

@@ -35,7 +35,7 @@
             navSelected: '',
             curl: './bigdata/showDjdsj/css/party-tree.css',
             treeheight: '85vh',
-            colors: ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97', '#00736c', '#005983']
+            colors: ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983']
         };
 
         $scope.navClick = function (id) {
@@ -71,7 +71,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -150,7 +150,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -229,7 +229,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -294,7 +294,7 @@
             $scope.zgzw_dataList = [];
             $scope.zgzw_nameList = [];
             $scope.zgzw_barOption = {
-                color: ['#c4cffd'],
+                color: ['#fff'],
                 tooltip: {
                     trigger: 'axis',
                     axisPointer: {            // 坐标轴指示器，坐标轴触发有效
@@ -305,14 +305,14 @@
                 xAxis: {
                     type: "category",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.zgzw_nameList
                 },
                 yAxis: {
                     type: "value",
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick:{       //y轴刻度线
                         show:false
@@ -368,7 +368,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;

src/main/resources/static/app/main/bigdata/showDjdsj/home.js

@@ -188,7 +188,7 @@
                     name: '数量',
                     axisLabel: {
                         formatter: '{value}',
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick:{       //y轴刻度线
                         show:false
@@ -201,7 +201,7 @@
                     type: 'category',
                     inverse: true,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.dzzfbqk_nameList
                 },
@@ -214,7 +214,7 @@
                         itemStyle: {
                             normal: {
                                 color: function (params) {
-                                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#4565f4', '#c4cffd'];
+                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF'];
                                     return colorList[params.dataIndex];
                                 }
                             }
@@ -255,7 +255,7 @@
                     data: $scope.ndkpjg_nameList,
                     icon: "circle",
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 tooltip: {
@@ -300,7 +300,7 @@
                         year: $scope.selectparam.ndkpjg_nd
                     }
                 }).then(function (result) {
-                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97', '#00736c', '#005983'];
+                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983'];
                     if (result.data != null && result.data.length > 0) {
                         angular.forEach(result.data, function (item, index) {
                             $scope.ndkpjg_dataList.push($scope.getPieData(item.COUNT, item.NAME, colorList[index < colorList.length ? index : (colorList.length - 1)]));
@@ -325,21 +325,21 @@
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#4566f3'
+                    color: '#F8B551'
                 },
                 {
                     name: '转出党员人数',
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#c4d1fe'
+                    color: '#918879'
                 },
                 {
                     name: '内部接转人数',
                     type: 'line',
                     stack: '总量',
                     data: [],
-                    color: '#01588d'
+                    color: '#EFF0C7'
                 }
             ];
             $scope.nydt_nameList = [];
@@ -355,7 +355,7 @@
                     y: 'bottom',
                     data: ['转入党员人数', '转出党员人数', '内部接转人数'],
                     textStyle: {
-                        color: '#597ca4'
+                        color: '#fff'
                     }
                 },
                 /*grid: {
@@ -373,14 +373,14 @@
                     type: 'category',
                     boundaryGap: false,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.nydt_x_dataList
                 },
                 yAxis: {
                     type: 'value',
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#EFF0C7'
                     },
                     axisTick:{       //y轴刻度线
                         show:false
@@ -433,7 +433,7 @@
                     name: '数量',
                     axisLabel: {
                         formatter: '{value}',
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick:{       //y轴刻度线
                         show:false
@@ -446,7 +446,7 @@
                     type: 'category',
                     inverse: true,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.fzdyqk_nameList
                 },
@@ -459,7 +459,7 @@
                         itemStyle: {
                             normal: {
                                 color: function (params) {
-                                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8'];
+                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
                                     return colorList[params.dataIndex];
                                 }
                             }

src/main/resources/static/app/main/bigdata/showDjdsj/images/d-logo.svg

@@ -36,7 +36,7 @@
       }
     </style>
     <filter id="filter" x="836" y="19" width="36" height="36" filterUnits="userSpaceOnUse">
-      <feFlood result="flood" flood-color="#2ff5ff"/>
+      <feFlood result="flood" flood-color="#fff"/>
       <feComposite result="composite" operator="in" in2="SourceGraphic"/>
       <feBlend result="blend" in2="SourceGraphic"/>
     </filter>

src/main/resources/static/app/main/bigdata/showDjdsj/teams.js

@@ -30,7 +30,7 @@
                 {id: 1, text: '在岗'}
             ],
             navSelected: '',
-            colors: ['#4565f4', '#c4cffd', '#01588d', '#84cac8', '#019e97', '#00736c', '#005983']
+            colors: ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983']
         };
 
         $scope.navClick = function (id) {
@@ -60,7 +60,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -120,7 +120,7 @@
                     }
                 }).then(function (result) {
                     if (result.data != null && result.data.length > 0) {
-                        var colors = ['#4565f4', '#c4cffd'];
+                        var colors = ['#F8B551', '#918879'];
                         angular.forEach(result.data, function (val, index) {
                             $scope.dyxb_dataList.push($scope.getPieData(val.NUM, val.SEXNAME, colors[index]));
                         });
@@ -140,7 +140,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -220,7 +220,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -321,7 +321,7 @@
                     name: '数量',
                     axisLabel: {
                         formatter: '{value}',
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     axisTick:{       //y轴刻度线
                         show:false
@@ -334,7 +334,7 @@
                     type: 'category',
                     inverse: true,
                     axisLabel: {
-                        color: '#597ca4'
+                        color: '#fff'
                     },
                     data: $scope.fzdyqk_nameList
                 },
@@ -347,7 +347,7 @@
                         itemStyle: {
                             normal: {
                                 color: function (params) {
-                                    var colorList = ['#4565f4', '#c4cffd', '#01588d', '#84cac8'];
+                                    var colorList = ['#F8B551', '#918879', '#EFF0C7', '#91C7AE'];
                                     return colorList[params.dataIndex];
                                 }
                             }
@@ -374,7 +374,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;
@@ -454,7 +454,7 @@
                     top: '10%',
                     icon: "circle",
                     textStyle: {
-                        color: '#8B8682'
+                        color: '#fff'
                     },
                     formatter: function (name) {
                         var target = 0;