2 Commits 81fc2ff973 ... 1905cb620e

Auteur SHA1 Bericht Datum
  82064491C07A712AE32B5B57EC6EF136 1905cb620e Merge branch 'master' of http://39.98.153.250:9080/bowintek/GHSCPartyBuild 4 maanden geleden
  82064491C07A712AE32B5B57EC6EF136 56bc6627bf 调整大数据可视化样式 4 maanden geleden

+ 2 - 2
src/main/resources/static/app/main/bigdata/showDjdsj/css/style.css

@@ -29,8 +29,8 @@
 	box-shadow:inset 0 0 1px #FFF3B3,inset 0 0 20px rgba(248,181,81,.2);
 	position: relative;
 }
-.b-1{ height: 540px; overflow: hidden;}
-.b-2{ height: 450px; top:90px; }
+.b-1{ height: 500px; overflow: hidden;}
+.b-2{ height: 410px; top:90px; }
 
 .box-header{ width:300px; height: 82px; background: url(../images/icon-1.png) no-repeat 0 center; position: relative; left: 50%; margin: 20px 0 30px -150px;}
 .bh-2{ background: url(../images/icon-2.png) no-repeat 0 center; }

+ 3 - 3
src/main/resources/static/app/main/bigdata/showDjdsj/home.html

@@ -86,7 +86,7 @@
                 <div e-chart ec-data="dzzfbqk_barOption" class="charts2"></div>
             </div>
         </div>
-        <div class="box b-3" style="height: calc(100% - 545px);">
+        <div class="box b-3" style="height: calc(100% - 510px);">
             <h1>三会一课</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="shyk_pieOption" class="charts2"></div>
@@ -120,7 +120,7 @@
             </div>
         </div>
 
-        <div class="bottom" style="height: calc(100% - 175px);">
+        <div class="bottom" style="height: calc(100% - 150px);">
             <div class="box b-5 b-all" style="width: 100%;margin: 0px;">
                 <h1>发展党员</h1>
                 <div class="text-all">
@@ -178,7 +178,7 @@
                 </table>
             </div>
         </div>
-        <div class="box b-3" style="height: calc(100% - 545px);">
+        <div class="box b-3" style="height: calc(100% - 510px);">
             <h1>性别情况</h1>
             <!-- 图表容器 -->
             <div e-chart ec-data="dyxb_pieOption" class="charts2"></div>

+ 2 - 2
src/main/resources/static/app/main/bigdata/showDjdsj/home.js

@@ -123,13 +123,13 @@
                     name: '党员数量',
                     type: 'bar',
                     data: [],
-                    color: '#5186f8'
+                    color: '#F8B551'
                 },
                 {
                     name: '发展党员数量',
                     type: 'bar',
                     data: [],
-                    color: '#fff'
+                    color: '#918879'
                 }
             ];
             $scope.dyTotal_legend = ['党员数量', '发展党员数量'];