党员队伍大数据

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

@@ -28,9 +28,9 @@
 
 <!-- 右内容区 -->
 <div class="right-content boxheight">
-    <div class="right-nav">
+    <!--<div class="right-nav">
         <div class="rn" ng-class="{active:nav.id==selectparams.navSelected}" ng-repeat="nav in selectparams.navs" ng-click="navClick(nav.id)">{{nav.text}}</div>
-    </div>
+    </div>-->
     <div class="right-container">
         <div class="box b-5">
             <h1>性别情况</h1>
@@ -68,7 +68,7 @@
                 <p>入党申请人数：<h2>{{dyxx.RDSQRS}}</h2></p>
             </div>
             <!-- 图表容器 -->
-            <div e-chart ec-data="fzdyqk_barOption" class="charts3"></div>
+            <div e-chart ec-data="fzdyqk_barOption" class="charts3 charts3_1"></div>
         </div>
     </div>
 </div>

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

@@ -33,10 +33,10 @@
             colors: ['#F8B551', '#918879', '#EFF0C7', '#91C7AE', '#DCDCDC', '#F0FFFF', '#005983']
         };
 
-        $scope.navClick = function (id) {
+        /*$scope.navClick = function (id) {
             $scope.selectparams.navSelected = id;
             $scope.GetPageData();
-        };
+        };*/
 
         //树选择机构变化
         $scope.$watch('selectparams.selectdzzdm', function (newVal) {
@@ -102,11 +102,11 @@
                     }
                 ],
                 tooltip: {
-            trigger: 'item',
-                formatter:function (data) {
-                return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
-            }
-        }
+                    trigger: 'item',
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
+                    }
+                }
             };
             $scope.load_dyxb = function () {
                 $scope.dyxb_dataList.length = 0;
@@ -182,8 +182,8 @@
                 ],
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
             };
@@ -262,8 +262,8 @@
                 ],
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
             };
@@ -323,8 +323,8 @@
                         formatter: '{value}',
                         color: '#fff'
                     },
-                    axisTick:{       //y轴刻度线
-                        show:false
+                    axisTick: {       //y轴刻度线
+                        show: false
                     },
                     splitLine: {     //网格线
                         show: false
@@ -416,8 +416,8 @@
                 ],
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
             };
@@ -450,7 +450,7 @@
                     orient: 'vertical',
                     right: 0,
                     bottom: 5,
-                    data: ["正式党员","预备党员"],
+                    data: ["正式党员", "预备党员"],
                     top: '10%',
                     icon: "circle",
                     textStyle: {
@@ -496,14 +496,15 @@
                 ],
                 tooltip: {
                     trigger: 'item',
-                    formatter:function (data) {
-                        return data.seriesName + "<br/>"+ data.name+ " : " + data.value + " ("+data.percent.toFixed(0)+"%)";
+                    formatter: function (data) {
+                        return data.seriesName + "<br/>" + data.name + " : " + data.value + " (" + data.percent.toFixed(0) + "%)";
                     }
                 }
             };
 
 
             $scope.load_fzdyqk = function () {
+
                 $http
                 ({
                     method: 'get', url: '../../api/partyExpand/getJoinUserTotalList', params: {
@@ -515,6 +516,7 @@
                 }).then(function (result) {
                     if (result.data.item.list.length > 0) {
                         var data = result.data.item.list[0];
+                        $scope.fzdyqk_dataList.length = 0;
                         $scope.fzdyqk_dataList.push(data.YBDY);
                         $scope.fzdyqk_dataList.push(data.SQRD);
                         $scope.fzdyqk_dataList.push(data.JJFZ);

src/main/resources/static/app/main/index-dsj.html

@@ -115,6 +115,7 @@
                     var $cbox = $('.charts');
                     var $cbox2 = $('.charts2');
                     var $cbox3 = $('.charts3');
+                    var $cbox3_1 = $('.charts3_1');
                     var $cbox4 = $('.charts4');
                     var $cbox5 = $('.charts5');
                     var $cbox6 = $('.boxheight');
@@ -123,6 +124,7 @@
                     $cbox.css({'height': '' + WindoHeit-775 + 'px'});
                     $cbox2.css({'height': '' + WindoHeit-706 + 'px'});
                     $cbox3.css({'height': '' + WindoHeit/3-156 + 'px'});
+                    $cbox3_1.css({'height': '' + WindoHeit/3-156+46 + 'px'});
                     $cbox4.css({'height': '' + WindoHeit-750 + 'px'});
                     $cbox5.css({'height': '' + WindoHeit/3-155 + 'px'});
                     $cbox6.css({'height': '' + WindoHeit-110 + 'px'});